[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:44:47 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 7b5bc0deb6353834d1c8e66684ccf332bbd5272c
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Sep 10 19:05:11 2001 +0000
More work on code cleanup
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@126 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQKCharsets.h b/WebCore/kwq/KWQKCharsets.h
index 4dc04f5..a489c07 100644
--- a/WebCore/kwq/KWQKCharsets.h
+++ b/WebCore/kwq/KWQKCharsets.h
@@ -45,8 +45,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KCharsets();
-
- ~KCharsets();
+ virtual ~KCharsets();
// member functions --------------------------------------------------------
@@ -64,9 +63,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KCharsets(const KCharsets &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KCharsets &operator=(const KCharsets &);
+#endif
}; // class KCharsets ==========================================================
diff --git a/WebCore/kwq/KWQKConfigBase.h b/WebCore/kwq/KWQKConfigBase.h
index 9a9dc94..6363563 100644
--- a/WebCore/kwq/KWQKConfigBase.h
+++ b/WebCore/kwq/KWQKConfigBase.h
@@ -51,8 +51,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KConfigBase();
-
- ~KConfigBase();
+ virtual ~KConfigBase();
// member functions --------------------------------------------------------
@@ -76,9 +75,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KConfigBase(const KConfigBase &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KConfigBase &operator=(const KConfigBase &);
+#endif
}; // class KConfigBase ========================================================
@@ -97,8 +105,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KConfig(const QString &, bool bReadOnly=false);
-
- ~KConfig();
+ virtual ~KConfig();
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -107,9 +114,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KConfig(const KConfig &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KConfig &operator=(const KConfig &);
+#endif
}; // class KConfig ============================================================
diff --git a/WebCore/kwq/KWQKDebug.h b/WebCore/kwq/KWQKDebug.h
index ddc597e..139ae65 100644
--- a/WebCore/kwq/KWQKDebug.h
+++ b/WebCore/kwq/KWQKDebug.h
@@ -47,7 +47,10 @@ public:
kdbgstream(unsigned int area, unsigned int level, bool print=true);
- ~kdbgstream();
+// add no-op destructor
+#ifdef _KWQ_PEDANTIC_
+ ~kdbgstream() {}
+#endif
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -63,9 +66,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
kdbgstream(const kdbgstream &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
kdbgstream &operator=(const kdbgstream &);
+#endif
}; // class kdbgstream =========================================================
diff --git a/WebCore/kwq/KWQKGlobal.h b/WebCore/kwq/KWQKGlobal.h
index 0d25c19..a56df0a 100644
--- a/WebCore/kwq/KWQKGlobal.h
+++ b/WebCore/kwq/KWQKGlobal.h
@@ -58,11 +58,17 @@ public:
static const QString &staticQString(const QString &);
// constructors, copy constructors, and destructors ------------------------
-
+
+// add no-op constructor
+#ifdef _KWQ_PEDANTIC_
KGlobal();
-
+#endif
+
+// add no-op destructor
+#ifdef _KWQ_PEDANTIC_
~KGlobal();
-
+#endif
+
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -70,9 +76,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KGlobal(const KGlobal &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KGlobal &operator=(const KGlobal &);
+#endif
}; // class KGlobal ============================================================
diff --git a/WebCore/kwq/KWQKGlobalSettings.h b/WebCore/kwq/KWQKGlobalSettings.h
index 0e27710..f28e2a2 100644
--- a/WebCore/kwq/KWQKGlobalSettings.h
+++ b/WebCore/kwq/KWQKGlobalSettings.h
@@ -48,10 +48,16 @@ public:
// constructors, copy constructors, and destructors ------------------------
- KGlobalSettings();
-
- ~KGlobalSettings();
-
+// add no-op constructor
+#ifdef _KWQ_PEDANTIC_
+ KGlobalSettings() {}
+#endif
+
+// add no-op destructor
+#ifdef _KWQ_PEDANTIC_
+ ~KGlobalSettings() {}
+#endif
+
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -59,9 +65,17 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KGlobalSettings(const KGlobalSettings &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KGlobalSettings &operator=(const KGlobalSettings &);
+#endif
}; // class KGlobalSettings ====================================================
diff --git a/WebCore/kwq/KWQKIconLoader.h b/WebCore/kwq/KWQKIconLoader.h
index a342a74..9ca3b40 100644
--- a/WebCore/kwq/KWQKIconLoader.h
+++ b/WebCore/kwq/KWQKIconLoader.h
@@ -49,8 +49,11 @@ public:
// constructors, copy constructors, and destructors ------------------------
KIcon();
-
- ~KIcon();
+
+// add no-op destructor
+#ifdef _KWQ_PEDANTIC_
+ ~KIcon() {}
+#endif
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -59,9 +62,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KIcon(const KIcon &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KIcon &operator=(const KIcon &);
+#endif
}; // class KIcon ==============================================================
@@ -80,7 +92,6 @@ public:
// constructors, copy constructors, and destructors ------------------------
KIconLoader();
-
~KIconLoader();
// member functions --------------------------------------------------------
@@ -95,9 +106,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KIconLoader(const KIconLoader &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KIconLoader &operator=(const KIconLoader &);
+#endif
}; // class KIconLoader ========================================================
diff --git a/WebCore/kwq/KWQKInstance.h b/WebCore/kwq/KWQKInstance.h
index 5c216a0..bf9ce7b 100644
--- a/WebCore/kwq/KWQKInstance.h
+++ b/WebCore/kwq/KWQKInstance.h
@@ -43,7 +43,6 @@ public:
// constructors, copy constructors, and destructors ------------------------
KInstance(const QCString &);
-
virtual ~KInstance();
// member functions --------------------------------------------------------
@@ -56,9 +55,15 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+ // no copying
+ // note that this is "standard" (no pendantic stuff needed)
KInstance(const KInstance &);
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KInstance &operator=(const KInstance &);
+#endif
}; // class KInstance ==========================================================
diff --git a/WebCore/kwq/KWQKLocale.h b/WebCore/kwq/KWQKLocale.h
index 7c39380..fa5efd5 100644
--- a/WebCore/kwq/KWQKLocale.h
+++ b/WebCore/kwq/KWQKLocale.h
@@ -44,7 +44,6 @@ public:
// constructors, copy constructors, and destructors ------------------------
KLocale();
-
~KLocale();
// member functions --------------------------------------------------------
@@ -58,6 +57,7 @@ public:
private:
// no copying or assignment
+ // note that these are "standard" (no pendantic stuff needed)
KLocale(const KLocale &);
KLocale &operator=(const KLocale &);
diff --git a/WebCore/kwq/KWQKStaticDeleter.h b/WebCore/kwq/KWQKStaticDeleter.h
index a8b1fc8..187f6ab 100644
--- a/WebCore/kwq/KWQKStaticDeleter.h
+++ b/WebCore/kwq/KWQKStaticDeleter.h
@@ -42,7 +42,7 @@ public:
KStaticDeleter() {}
// add no-op destructor
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
~KStaticDeleter() {}
#endif
@@ -56,9 +56,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KStaticDeleter(const KStaticDeleter &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KStaticDeleter &operator=(const KStaticDeleter &);
+#endif
}; // class KStaticDeleter =====================================================
diff --git a/WebCore/kwq/KWQKStringHandler.h b/WebCore/kwq/KWQKStringHandler.h
index 9d6a99b..95caba6 100644
--- a/WebCore/kwq/KWQKStringHandler.h
+++ b/WebCore/kwq/KWQKStringHandler.h
@@ -45,12 +45,12 @@ public:
// constructors, copy constructors, and destructors ------------------------
// add no-op constructor
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
KStringHandler() {}
#endif
// add no-op destructor
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
~KStringHandler() {}
#endif
@@ -64,13 +64,13 @@ private:
// add copy constructor
// this private declaration prevents copying
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
KStringHandler(const KStringHandler &);
#endif
// add assignment operator
// this private declaration prevents assignment
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
KStringHandler &operator=(const KStringHandler &);
#endif
diff --git a/WebCore/kwq/KWQKWin.h b/WebCore/kwq/KWQKWin.h
index e75911b..072b29f 100644
--- a/WebCore/kwq/KWQKWin.h
+++ b/WebCore/kwq/KWQKWin.h
@@ -54,12 +54,12 @@ public:
// constructors, copy constructors, and destructors ------------------------
// add no-op constructor
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
KWin() {}
#endif
// add no-op destructor
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
~KWin() {}
#endif
@@ -73,13 +73,13 @@ private:
// add copy constructor
// this private declaration prevents copying
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
KWin(const KWin &);
#endif
// add assignment operator
// this private declaration prevents assignment
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
KWin &operator=(const KWin &);
#endif
diff --git a/WebCore/kwq/KWQKWinModule.h b/WebCore/kwq/KWQKWinModule.h
index d86d503..341752f 100644
--- a/WebCore/kwq/KWQKWinModule.h
+++ b/WebCore/kwq/KWQKWinModule.h
@@ -60,13 +60,13 @@ private:
// add copy constructor
// this private declaration prevents copying
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
KWinModule(const KWinModule &);
#endif
// add assignment operator
// this private declaration prevents assignment
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
KWinModule &operator=(const KWinModule &);
#endif
diff --git a/WebCore/kwq/kdecore/kapp.h b/WebCore/kwq/kdecore/kapp.h
index 9386278..dca9736 100644
--- a/WebCore/kwq/kdecore/kapp.h
+++ b/WebCore/kwq/kdecore/kapp.h
@@ -52,8 +52,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KApplication();
-
- ~KApplication();
+ virtual ~KApplication();
// member functions --------------------------------------------------------
@@ -70,6 +69,7 @@ protected:
private:
// no copying or assignment
+ // note that these are "standard" (no pendantic stuff needed)
KApplication(const KApplication &);
KApplication &operator=(const KApplication &);
diff --git a/WebCore/kwq/kdecore/kcharsets.h b/WebCore/kwq/kdecore/kcharsets.h
index 4dc04f5..a489c07 100644
--- a/WebCore/kwq/kdecore/kcharsets.h
+++ b/WebCore/kwq/kdecore/kcharsets.h
@@ -45,8 +45,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KCharsets();
-
- ~KCharsets();
+ virtual ~KCharsets();
// member functions --------------------------------------------------------
@@ -64,9 +63,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KCharsets(const KCharsets &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KCharsets &operator=(const KCharsets &);
+#endif
}; // class KCharsets ==========================================================
diff --git a/WebCore/kwq/kdecore/kconfig.h b/WebCore/kwq/kdecore/kconfig.h
index 9a9dc94..6363563 100644
--- a/WebCore/kwq/kdecore/kconfig.h
+++ b/WebCore/kwq/kdecore/kconfig.h
@@ -51,8 +51,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KConfigBase();
-
- ~KConfigBase();
+ virtual ~KConfigBase();
// member functions --------------------------------------------------------
@@ -76,9 +75,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KConfigBase(const KConfigBase &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KConfigBase &operator=(const KConfigBase &);
+#endif
}; // class KConfigBase ========================================================
@@ -97,8 +105,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KConfig(const QString &, bool bReadOnly=false);
-
- ~KConfig();
+ virtual ~KConfig();
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -107,9 +114,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KConfig(const KConfig &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KConfig &operator=(const KConfig &);
+#endif
}; // class KConfig ============================================================
diff --git a/WebCore/kwq/kdecore/kdebug.h b/WebCore/kwq/kdecore/kdebug.h
index ddc597e..139ae65 100644
--- a/WebCore/kwq/kdecore/kdebug.h
+++ b/WebCore/kwq/kdecore/kdebug.h
@@ -47,7 +47,10 @@ public:
kdbgstream(unsigned int area, unsigned int level, bool print=true);
- ~kdbgstream();
+// add no-op destructor
+#ifdef _KWQ_PEDANTIC_
+ ~kdbgstream() {}
+#endif
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -63,9 +66,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
kdbgstream(const kdbgstream &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
kdbgstream &operator=(const kdbgstream &);
+#endif
}; // class kdbgstream =========================================================
diff --git a/WebCore/kwq/kdecore/kglobal.h b/WebCore/kwq/kdecore/kglobal.h
index 0d25c19..a56df0a 100644
--- a/WebCore/kwq/kdecore/kglobal.h
+++ b/WebCore/kwq/kdecore/kglobal.h
@@ -58,11 +58,17 @@ public:
static const QString &staticQString(const QString &);
// constructors, copy constructors, and destructors ------------------------
-
+
+// add no-op constructor
+#ifdef _KWQ_PEDANTIC_
KGlobal();
-
+#endif
+
+// add no-op destructor
+#ifdef _KWQ_PEDANTIC_
~KGlobal();
-
+#endif
+
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -70,9 +76,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KGlobal(const KGlobal &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KGlobal &operator=(const KGlobal &);
+#endif
}; // class KGlobal ============================================================
diff --git a/WebCore/kwq/kdecore/kglobalsettings.h b/WebCore/kwq/kdecore/kglobalsettings.h
index 0e27710..f28e2a2 100644
--- a/WebCore/kwq/kdecore/kglobalsettings.h
+++ b/WebCore/kwq/kdecore/kglobalsettings.h
@@ -48,10 +48,16 @@ public:
// constructors, copy constructors, and destructors ------------------------
- KGlobalSettings();
-
- ~KGlobalSettings();
-
+// add no-op constructor
+#ifdef _KWQ_PEDANTIC_
+ KGlobalSettings() {}
+#endif
+
+// add no-op destructor
+#ifdef _KWQ_PEDANTIC_
+ ~KGlobalSettings() {}
+#endif
+
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -59,9 +65,17 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KGlobalSettings(const KGlobalSettings &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KGlobalSettings &operator=(const KGlobalSettings &);
+#endif
}; // class KGlobalSettings ====================================================
diff --git a/WebCore/kwq/kdecore/kiconloader.h b/WebCore/kwq/kdecore/kiconloader.h
index a342a74..9ca3b40 100644
--- a/WebCore/kwq/kdecore/kiconloader.h
+++ b/WebCore/kwq/kdecore/kiconloader.h
@@ -49,8 +49,11 @@ public:
// constructors, copy constructors, and destructors ------------------------
KIcon();
-
- ~KIcon();
+
+// add no-op destructor
+#ifdef _KWQ_PEDANTIC_
+ ~KIcon() {}
+#endif
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -59,9 +62,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KIcon(const KIcon &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KIcon &operator=(const KIcon &);
+#endif
}; // class KIcon ==============================================================
@@ -80,7 +92,6 @@ public:
// constructors, copy constructors, and destructors ------------------------
KIconLoader();
-
~KIconLoader();
// member functions --------------------------------------------------------
@@ -95,9 +106,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KIconLoader(const KIconLoader &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KIconLoader &operator=(const KIconLoader &);
+#endif
}; // class KIconLoader ========================================================
diff --git a/WebCore/kwq/kdecore/kinstance.h b/WebCore/kwq/kdecore/kinstance.h
index 5c216a0..bf9ce7b 100644
--- a/WebCore/kwq/kdecore/kinstance.h
+++ b/WebCore/kwq/kdecore/kinstance.h
@@ -43,7 +43,6 @@ public:
// constructors, copy constructors, and destructors ------------------------
KInstance(const QCString &);
-
virtual ~KInstance();
// member functions --------------------------------------------------------
@@ -56,9 +55,15 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+ // no copying
+ // note that this is "standard" (no pendantic stuff needed)
KInstance(const KInstance &);
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KInstance &operator=(const KInstance &);
+#endif
}; // class KInstance ==========================================================
diff --git a/WebCore/kwq/kdecore/klocale.h b/WebCore/kwq/kdecore/klocale.h
index 7c39380..fa5efd5 100644
--- a/WebCore/kwq/kdecore/klocale.h
+++ b/WebCore/kwq/kdecore/klocale.h
@@ -44,7 +44,6 @@ public:
// constructors, copy constructors, and destructors ------------------------
KLocale();
-
~KLocale();
// member functions --------------------------------------------------------
@@ -58,6 +57,7 @@ public:
private:
// no copying or assignment
+ // note that these are "standard" (no pendantic stuff needed)
KLocale(const KLocale &);
KLocale &operator=(const KLocale &);
diff --git a/WebCore/kwq/kdecore/kprocess.h b/WebCore/kwq/kdecore/kprocess.h
index c8a48d3..55f6326 100644
--- a/WebCore/kwq/kdecore/kprocess.h
+++ b/WebCore/kwq/kdecore/kprocess.h
@@ -51,8 +51,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KProcess();
-
- ~KProcess();
+ virtual ~KProcess();
// member functions --------------------------------------------------------
@@ -73,6 +72,7 @@ public:
private:
// no copying or assignment
+ // note that these are "standard" (no pendantic stuff needed)
KProcess(const KProcess &);
KProcess &operator=(const KProcess &);
diff --git a/WebCore/kwq/kdecore/kstaticdeleter.h b/WebCore/kwq/kdecore/kstaticdeleter.h
index a8b1fc8..187f6ab 100644
--- a/WebCore/kwq/kdecore/kstaticdeleter.h
+++ b/WebCore/kwq/kdecore/kstaticdeleter.h
@@ -42,7 +42,7 @@ public:
KStaticDeleter() {}
// add no-op destructor
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
~KStaticDeleter() {}
#endif
@@ -56,9 +56,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KStaticDeleter(const KStaticDeleter &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KStaticDeleter &operator=(const KStaticDeleter &);
+#endif
}; // class KStaticDeleter =====================================================
diff --git a/WebCore/kwq/kdecore/kstringhandler.h b/WebCore/kwq/kdecore/kstringhandler.h
index 9d6a99b..95caba6 100644
--- a/WebCore/kwq/kdecore/kstringhandler.h
+++ b/WebCore/kwq/kdecore/kstringhandler.h
@@ -45,12 +45,12 @@ public:
// constructors, copy constructors, and destructors ------------------------
// add no-op constructor
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
KStringHandler() {}
#endif
// add no-op destructor
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
~KStringHandler() {}
#endif
@@ -64,13 +64,13 @@ private:
// add copy constructor
// this private declaration prevents copying
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
KStringHandler(const KStringHandler &);
#endif
// add assignment operator
// this private declaration prevents assignment
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
KStringHandler &operator=(const KStringHandler &);
#endif
diff --git a/WebCore/kwq/kdecore/kwin.h b/WebCore/kwq/kdecore/kwin.h
index e75911b..072b29f 100644
--- a/WebCore/kwq/kdecore/kwin.h
+++ b/WebCore/kwq/kdecore/kwin.h
@@ -54,12 +54,12 @@ public:
// constructors, copy constructors, and destructors ------------------------
// add no-op constructor
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
KWin() {}
#endif
// add no-op destructor
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
~KWin() {}
#endif
@@ -73,13 +73,13 @@ private:
// add copy constructor
// this private declaration prevents copying
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
KWin(const KWin &);
#endif
// add assignment operator
// this private declaration prevents assignment
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
KWin &operator=(const KWin &);
#endif
diff --git a/WebCore/kwq/kdecore/kwinmodule.h b/WebCore/kwq/kdecore/kwinmodule.h
index d86d503..341752f 100644
--- a/WebCore/kwq/kdecore/kwinmodule.h
+++ b/WebCore/kwq/kdecore/kwinmodule.h
@@ -60,13 +60,13 @@ private:
// add copy constructor
// this private declaration prevents copying
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
KWinModule(const KWinModule &);
#endif
// add assignment operator
// this private declaration prevents assignment
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
KWinModule &operator=(const KWinModule &);
#endif
diff --git a/WebCore/src/kwq/kdecore/kapp.h b/WebCore/src/kwq/kdecore/kapp.h
index 9386278..dca9736 100644
--- a/WebCore/src/kwq/kdecore/kapp.h
+++ b/WebCore/src/kwq/kdecore/kapp.h
@@ -52,8 +52,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KApplication();
-
- ~KApplication();
+ virtual ~KApplication();
// member functions --------------------------------------------------------
@@ -70,6 +69,7 @@ protected:
private:
// no copying or assignment
+ // note that these are "standard" (no pendantic stuff needed)
KApplication(const KApplication &);
KApplication &operator=(const KApplication &);
diff --git a/WebCore/src/kwq/kdecore/kcharsets.h b/WebCore/src/kwq/kdecore/kcharsets.h
index 4dc04f5..a489c07 100644
--- a/WebCore/src/kwq/kdecore/kcharsets.h
+++ b/WebCore/src/kwq/kdecore/kcharsets.h
@@ -45,8 +45,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KCharsets();
-
- ~KCharsets();
+ virtual ~KCharsets();
// member functions --------------------------------------------------------
@@ -64,9 +63,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KCharsets(const KCharsets &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KCharsets &operator=(const KCharsets &);
+#endif
}; // class KCharsets ==========================================================
diff --git a/WebCore/src/kwq/kdecore/kconfig.h b/WebCore/src/kwq/kdecore/kconfig.h
index 9a9dc94..6363563 100644
--- a/WebCore/src/kwq/kdecore/kconfig.h
+++ b/WebCore/src/kwq/kdecore/kconfig.h
@@ -51,8 +51,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KConfigBase();
-
- ~KConfigBase();
+ virtual ~KConfigBase();
// member functions --------------------------------------------------------
@@ -76,9 +75,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KConfigBase(const KConfigBase &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KConfigBase &operator=(const KConfigBase &);
+#endif
}; // class KConfigBase ========================================================
@@ -97,8 +105,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KConfig(const QString &, bool bReadOnly=false);
-
- ~KConfig();
+ virtual ~KConfig();
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -107,9 +114,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KConfig(const KConfig &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KConfig &operator=(const KConfig &);
+#endif
}; // class KConfig ============================================================
diff --git a/WebCore/src/kwq/kdecore/kdebug.h b/WebCore/src/kwq/kdecore/kdebug.h
index ddc597e..139ae65 100644
--- a/WebCore/src/kwq/kdecore/kdebug.h
+++ b/WebCore/src/kwq/kdecore/kdebug.h
@@ -47,7 +47,10 @@ public:
kdbgstream(unsigned int area, unsigned int level, bool print=true);
- ~kdbgstream();
+// add no-op destructor
+#ifdef _KWQ_PEDANTIC_
+ ~kdbgstream() {}
+#endif
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -63,9 +66,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
kdbgstream(const kdbgstream &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
kdbgstream &operator=(const kdbgstream &);
+#endif
}; // class kdbgstream =========================================================
diff --git a/WebCore/src/kwq/kdecore/kglobal.h b/WebCore/src/kwq/kdecore/kglobal.h
index 0d25c19..a56df0a 100644
--- a/WebCore/src/kwq/kdecore/kglobal.h
+++ b/WebCore/src/kwq/kdecore/kglobal.h
@@ -58,11 +58,17 @@ public:
static const QString &staticQString(const QString &);
// constructors, copy constructors, and destructors ------------------------
-
+
+// add no-op constructor
+#ifdef _KWQ_PEDANTIC_
KGlobal();
-
+#endif
+
+// add no-op destructor
+#ifdef _KWQ_PEDANTIC_
~KGlobal();
-
+#endif
+
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -70,9 +76,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KGlobal(const KGlobal &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KGlobal &operator=(const KGlobal &);
+#endif
}; // class KGlobal ============================================================
diff --git a/WebCore/src/kwq/kdecore/kglobalsettings.h b/WebCore/src/kwq/kdecore/kglobalsettings.h
index 0e27710..f28e2a2 100644
--- a/WebCore/src/kwq/kdecore/kglobalsettings.h
+++ b/WebCore/src/kwq/kdecore/kglobalsettings.h
@@ -48,10 +48,16 @@ public:
// constructors, copy constructors, and destructors ------------------------
- KGlobalSettings();
-
- ~KGlobalSettings();
-
+// add no-op constructor
+#ifdef _KWQ_PEDANTIC_
+ KGlobalSettings() {}
+#endif
+
+// add no-op destructor
+#ifdef _KWQ_PEDANTIC_
+ ~KGlobalSettings() {}
+#endif
+
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -59,9 +65,17 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KGlobalSettings(const KGlobalSettings &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KGlobalSettings &operator=(const KGlobalSettings &);
+#endif
}; // class KGlobalSettings ====================================================
diff --git a/WebCore/src/kwq/kdecore/kiconloader.h b/WebCore/src/kwq/kdecore/kiconloader.h
index a342a74..9ca3b40 100644
--- a/WebCore/src/kwq/kdecore/kiconloader.h
+++ b/WebCore/src/kwq/kdecore/kiconloader.h
@@ -49,8 +49,11 @@ public:
// constructors, copy constructors, and destructors ------------------------
KIcon();
-
- ~KIcon();
+
+// add no-op destructor
+#ifdef _KWQ_PEDANTIC_
+ ~KIcon() {}
+#endif
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -59,9 +62,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KIcon(const KIcon &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KIcon &operator=(const KIcon &);
+#endif
}; // class KIcon ==============================================================
@@ -80,7 +92,6 @@ public:
// constructors, copy constructors, and destructors ------------------------
KIconLoader();
-
~KIconLoader();
// member functions --------------------------------------------------------
@@ -95,9 +106,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KIconLoader(const KIconLoader &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KIconLoader &operator=(const KIconLoader &);
+#endif
}; // class KIconLoader ========================================================
diff --git a/WebCore/src/kwq/kdecore/kinstance.h b/WebCore/src/kwq/kdecore/kinstance.h
index 5c216a0..bf9ce7b 100644
--- a/WebCore/src/kwq/kdecore/kinstance.h
+++ b/WebCore/src/kwq/kdecore/kinstance.h
@@ -43,7 +43,6 @@ public:
// constructors, copy constructors, and destructors ------------------------
KInstance(const QCString &);
-
virtual ~KInstance();
// member functions --------------------------------------------------------
@@ -56,9 +55,15 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+ // no copying
+ // note that this is "standard" (no pendantic stuff needed)
KInstance(const KInstance &);
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KInstance &operator=(const KInstance &);
+#endif
}; // class KInstance ==========================================================
diff --git a/WebCore/src/kwq/kdecore/klocale.h b/WebCore/src/kwq/kdecore/klocale.h
index 7c39380..fa5efd5 100644
--- a/WebCore/src/kwq/kdecore/klocale.h
+++ b/WebCore/src/kwq/kdecore/klocale.h
@@ -44,7 +44,6 @@ public:
// constructors, copy constructors, and destructors ------------------------
KLocale();
-
~KLocale();
// member functions --------------------------------------------------------
@@ -58,6 +57,7 @@ public:
private:
// no copying or assignment
+ // note that these are "standard" (no pendantic stuff needed)
KLocale(const KLocale &);
KLocale &operator=(const KLocale &);
diff --git a/WebCore/src/kwq/kdecore/kprocess.h b/WebCore/src/kwq/kdecore/kprocess.h
index c8a48d3..55f6326 100644
--- a/WebCore/src/kwq/kdecore/kprocess.h
+++ b/WebCore/src/kwq/kdecore/kprocess.h
@@ -51,8 +51,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KProcess();
-
- ~KProcess();
+ virtual ~KProcess();
// member functions --------------------------------------------------------
@@ -73,6 +72,7 @@ public:
private:
// no copying or assignment
+ // note that these are "standard" (no pendantic stuff needed)
KProcess(const KProcess &);
KProcess &operator=(const KProcess &);
diff --git a/WebCore/src/kwq/kdecore/kstaticdeleter.h b/WebCore/src/kwq/kdecore/kstaticdeleter.h
index a8b1fc8..187f6ab 100644
--- a/WebCore/src/kwq/kdecore/kstaticdeleter.h
+++ b/WebCore/src/kwq/kdecore/kstaticdeleter.h
@@ -42,7 +42,7 @@ public:
KStaticDeleter() {}
// add no-op destructor
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
~KStaticDeleter() {}
#endif
@@ -56,9 +56,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KStaticDeleter(const KStaticDeleter &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KStaticDeleter &operator=(const KStaticDeleter &);
+#endif
}; // class KStaticDeleter =====================================================
diff --git a/WebCore/src/kwq/kdecore/kstringhandler.h b/WebCore/src/kwq/kdecore/kstringhandler.h
index 9d6a99b..95caba6 100644
--- a/WebCore/src/kwq/kdecore/kstringhandler.h
+++ b/WebCore/src/kwq/kdecore/kstringhandler.h
@@ -45,12 +45,12 @@ public:
// constructors, copy constructors, and destructors ------------------------
// add no-op constructor
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
KStringHandler() {}
#endif
// add no-op destructor
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
~KStringHandler() {}
#endif
@@ -64,13 +64,13 @@ private:
// add copy constructor
// this private declaration prevents copying
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
KStringHandler(const KStringHandler &);
#endif
// add assignment operator
// this private declaration prevents assignment
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
KStringHandler &operator=(const KStringHandler &);
#endif
diff --git a/WebCore/src/kwq/kdecore/kwin.h b/WebCore/src/kwq/kdecore/kwin.h
index e75911b..072b29f 100644
--- a/WebCore/src/kwq/kdecore/kwin.h
+++ b/WebCore/src/kwq/kdecore/kwin.h
@@ -54,12 +54,12 @@ public:
// constructors, copy constructors, and destructors ------------------------
// add no-op constructor
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
KWin() {}
#endif
// add no-op destructor
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
~KWin() {}
#endif
@@ -73,13 +73,13 @@ private:
// add copy constructor
// this private declaration prevents copying
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
KWin(const KWin &);
#endif
// add assignment operator
// this private declaration prevents assignment
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
KWin &operator=(const KWin &);
#endif
diff --git a/WebCore/src/kwq/kdecore/kwinmodule.h b/WebCore/src/kwq/kdecore/kwinmodule.h
index d86d503..341752f 100644
--- a/WebCore/src/kwq/kdecore/kwinmodule.h
+++ b/WebCore/src/kwq/kdecore/kwinmodule.h
@@ -60,13 +60,13 @@ private:
// add copy constructor
// this private declaration prevents copying
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
KWinModule(const KWinModule &);
#endif
// add assignment operator
// this private declaration prevents assignment
-#ifdef KWQ_PEDANTIC
+#ifdef _KWQ_PEDANTIC_
KWinModule &operator=(const KWinModule &);
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list