Commit 7b5bc0de authored by kocienda's avatar kocienda

More work on code cleanup


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@126 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent c395009a
......@@ -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 ==========================================================
......
......@@ -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 ============================================================
......
......@@ -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 =========================================================
......
......@@ -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 ============================================================
......
......@@ -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 ====================================================
......
......@@ -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 ========================================================
......
......@@ -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 ==========================================================
......
......@@ -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 &);
......
......@@ -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 =====================================================
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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 &);
......
......@@ -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 ==========================================================
......
......@@ -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 ============================================================
......
......@@ -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 =========================================================
......
......@@ -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 ============================================================
......
......@@ -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 ====================================================
......
......@@ -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