[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:48 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit def7496c4da54733f8ce556a4f5a1df1197595ea
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Sep 10 19:19:19 2001 +0000
More header cleanups
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@127 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQDCOPClient.h b/WebCore/kwq/KWQDCOPClient.h
index 470177e..8e0d76d 100644
--- a/WebCore/kwq/KWQDCOPClient.h
+++ b/WebCore/kwq/KWQDCOPClient.h
@@ -68,10 +68,15 @@ public:
private:
-// add copy constructor and assignment operator
-#ifdef KWQ_PEDANTIC
- // no copying or assignment
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
DCOPClient(const DCOPClient &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
DCOPClient &operator=(const DCOPClient &);
#endif
diff --git a/WebCore/kwq/KWQKComboBox.h b/WebCore/kwq/KWQKComboBox.h
index c3d3816..e13018f 100644
--- a/WebCore/kwq/KWQKComboBox.h
+++ b/WebCore/kwq/KWQKComboBox.h
@@ -45,6 +45,7 @@ public:
KComboBox(QWidget *parent=0, const char *name=0);
KComboBox(bool rw, QWidget *parent=0, const char *name=0);
+ virtual ~KComboBox();
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -53,9 +54,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KComboBox(const KComboBox &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KComboBox &operator=(const KComboBox &);
+#endif
}; // class KComboBox ==========================================================
diff --git a/WebCore/kwq/KWQKCompletionBox.h b/WebCore/kwq/KWQKCompletionBox.h
index ac4bad4..0d29237 100644
--- a/WebCore/kwq/KWQKCompletionBox.h
+++ b/WebCore/kwq/KWQKCompletionBox.h
@@ -42,8 +42,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KCompletionBox();
-
- ~KCompletionBox();
+ virtual ~KCompletionBox();
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -52,9 +51,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KCompletionBox(const KCompletionBox &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KCompletionBox &operator=(const KCompletionBox &);
+#endif
}; // class KCompletionBox =====================================================
diff --git a/WebCore/kwq/KWQKCursor.h b/WebCore/kwq/KWQKCursor.h
index c9ac35f..19acee2 100644
--- a/WebCore/kwq/KWQKCursor.h
+++ b/WebCore/kwq/KWQKCursor.h
@@ -46,7 +46,10 @@ public:
KCursor();
- ~KCursor();
+// add no-op destructor
+#ifdef _KWQ_PEDANTIC_
+ ~KCursor() {}
+#endif
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -55,9 +58,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KCursor(const KCursor &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KCursor &operator=(const KCursor &);
+#endif
}; // class KCursor ============================================================
diff --git a/WebCore/kwq/KWQKFileDialog.h b/WebCore/kwq/KWQKFileDialog.h
index 2bb00c1..b0e1221 100644
--- a/WebCore/kwq/KWQKFileDialog.h
+++ b/WebCore/kwq/KWQKFileDialog.h
@@ -48,7 +48,6 @@ public:
// constructors, copy constructors, and destructors ------------------------
KFileDialog();
-
~KFileDialog();
// member functions --------------------------------------------------------
@@ -59,6 +58,7 @@ public:
private:
// no copying or assignment
+ // note that these are "standard" (no pendantic stuff needed)
KFileDialog(const KFileDialog &);
KFileDialog &operator=(const KFileDialog &);
diff --git a/WebCore/kwq/KWQKKAction.h b/WebCore/kwq/KWQKKAction.h
index aac8106..1e06c54 100644
--- a/WebCore/kwq/KWQKKAction.h
+++ b/WebCore/kwq/KWQKKAction.h
@@ -42,8 +42,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KAction();
-
- ~KAction();
+ virtual ~KAction();
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -52,9 +51,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KAction(const KAction &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KAction &operator=(const KAction &);
+#endif
}; // class KAction ============================================================
diff --git a/WebCore/kwq/KWQKLineEdit.h b/WebCore/kwq/KWQKLineEdit.h
index d48868e..320c1c4 100644
--- a/WebCore/kwq/KWQKLineEdit.h
+++ b/WebCore/kwq/KWQKLineEdit.h
@@ -46,8 +46,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KLineEdit(QWidget *parent=0, const char *name=0);
-
- ~KLineEdit();
+ virtual ~KLineEdit();
// member functions --------------------------------------------------------
@@ -61,9 +60,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KLineEdit(const KLineEdit &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KLineEdit &operator=(const KLineEdit &);
+#endif
}; // class __class_name__ =====================================================
diff --git a/WebCore/kwq/KWQKListBox.h b/WebCore/kwq/KWQKListBox.h
index fe29dc8..af27e08 100644
--- a/WebCore/kwq/KWQKListBox.h
+++ b/WebCore/kwq/KWQKListBox.h
@@ -45,6 +45,11 @@ public:
KListBox();
KListBox(QWidget *);
+// add no-op destructor
+#ifdef _KWQ_PEDANTIC_
+ ~KListBox() {}
+#endif
+
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -52,9 +57,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KListBox(const KListBox &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KListBox &operator=(const KListBox &);
+#endif
}; // class KListBox ===========================================================
diff --git a/WebCore/kwq/dcop/dcopclient.h b/WebCore/kwq/dcop/dcopclient.h
index 470177e..8e0d76d 100644
--- a/WebCore/kwq/dcop/dcopclient.h
+++ b/WebCore/kwq/dcop/dcopclient.h
@@ -68,10 +68,15 @@ public:
private:
-// add copy constructor and assignment operator
-#ifdef KWQ_PEDANTIC
- // no copying or assignment
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
DCOPClient(const DCOPClient &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
DCOPClient &operator=(const DCOPClient &);
#endif
diff --git a/WebCore/kwq/kdeui/kaction.h b/WebCore/kwq/kdeui/kaction.h
index aac8106..1e06c54 100644
--- a/WebCore/kwq/kdeui/kaction.h
+++ b/WebCore/kwq/kdeui/kaction.h
@@ -42,8 +42,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KAction();
-
- ~KAction();
+ virtual ~KAction();
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -52,9 +51,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KAction(const KAction &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KAction &operator=(const KAction &);
+#endif
}; // class KAction ============================================================
diff --git a/WebCore/kwq/kdeui/kcombobox.h b/WebCore/kwq/kdeui/kcombobox.h
index c3d3816..e13018f 100644
--- a/WebCore/kwq/kdeui/kcombobox.h
+++ b/WebCore/kwq/kdeui/kcombobox.h
@@ -45,6 +45,7 @@ public:
KComboBox(QWidget *parent=0, const char *name=0);
KComboBox(bool rw, QWidget *parent=0, const char *name=0);
+ virtual ~KComboBox();
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -53,9 +54,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KComboBox(const KComboBox &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KComboBox &operator=(const KComboBox &);
+#endif
}; // class KComboBox ==========================================================
diff --git a/WebCore/kwq/kdeui/kcompletionbox.h b/WebCore/kwq/kdeui/kcompletionbox.h
index ac4bad4..0d29237 100644
--- a/WebCore/kwq/kdeui/kcompletionbox.h
+++ b/WebCore/kwq/kdeui/kcompletionbox.h
@@ -42,8 +42,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KCompletionBox();
-
- ~KCompletionBox();
+ virtual ~KCompletionBox();
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -52,9 +51,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KCompletionBox(const KCompletionBox &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KCompletionBox &operator=(const KCompletionBox &);
+#endif
}; // class KCompletionBox =====================================================
diff --git a/WebCore/kwq/kdeui/kcursor.h b/WebCore/kwq/kdeui/kcursor.h
index c9ac35f..19acee2 100644
--- a/WebCore/kwq/kdeui/kcursor.h
+++ b/WebCore/kwq/kdeui/kcursor.h
@@ -46,7 +46,10 @@ public:
KCursor();
- ~KCursor();
+// add no-op destructor
+#ifdef _KWQ_PEDANTIC_
+ ~KCursor() {}
+#endif
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -55,9 +58,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KCursor(const KCursor &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KCursor &operator=(const KCursor &);
+#endif
}; // class KCursor ============================================================
diff --git a/WebCore/kwq/kdeui/keditcl.h b/WebCore/kwq/kdeui/keditcl.h
index 6f80853..9022359 100644
--- a/WebCore/kwq/kdeui/keditcl.h
+++ b/WebCore/kwq/kdeui/keditcl.h
@@ -53,7 +53,6 @@ public:
// constructors, copy constructors, and destructors ------------------------
QTableView();
-
~QTableView();
// member functions --------------------------------------------------------
@@ -70,9 +69,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
QTableView(const QTableView &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
QTableView &operator=(const QTableView &);
+#endif
}; // class QTableView =========================================================
@@ -98,7 +106,6 @@ public:
// constructors, copy constructors, and destructors ------------------------
QMultiLineEdit();
-
~QMultiLineEdit();
// member functions --------------------------------------------------------
@@ -123,6 +130,7 @@ public:
private:
// no copying or assignment
+ // note that these are "standard" (no pendantic stuff needed)
QMultiLineEdit(const QMultiLineEdit &);
QMultiLineEdit &operator=(const QMultiLineEdit &);
@@ -144,7 +152,6 @@ public:
KEdit();
KEdit(QWidget *);
-
~KEdit();
// member functions --------------------------------------------------------
@@ -154,9 +161,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KEdit(const KEdit &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KEdit &operator=(const KEdit &);
+#endif
}; // class KEdit ==============================================================
diff --git a/WebCore/kwq/kdeui/klineedit.h b/WebCore/kwq/kdeui/klineedit.h
index d48868e..320c1c4 100644
--- a/WebCore/kwq/kdeui/klineedit.h
+++ b/WebCore/kwq/kdeui/klineedit.h
@@ -46,8 +46,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KLineEdit(QWidget *parent=0, const char *name=0);
-
- ~KLineEdit();
+ virtual ~KLineEdit();
// member functions --------------------------------------------------------
@@ -61,9 +60,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KLineEdit(const KLineEdit &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KLineEdit &operator=(const KLineEdit &);
+#endif
}; // class __class_name__ =====================================================
diff --git a/WebCore/kwq/kdeui/klistbox.h b/WebCore/kwq/kdeui/klistbox.h
index fe29dc8..af27e08 100644
--- a/WebCore/kwq/kdeui/klistbox.h
+++ b/WebCore/kwq/kdeui/klistbox.h
@@ -45,6 +45,11 @@ public:
KListBox();
KListBox(QWidget *);
+// add no-op destructor
+#ifdef _KWQ_PEDANTIC_
+ ~KListBox() {}
+#endif
+
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -52,9 +57,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KListBox(const KListBox &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KListBox &operator=(const KListBox &);
+#endif
}; // class KListBox ===========================================================
diff --git a/WebCore/kwq/kdeui/kmessagebox.h b/WebCore/kwq/kdeui/kmessagebox.h
index 5a8516d..686167b 100644
--- a/WebCore/kwq/kdeui/kmessagebox.h
+++ b/WebCore/kwq/kdeui/kmessagebox.h
@@ -64,10 +64,16 @@ public:
// constructors, copy constructors, and destructors ------------------------
- KMessageBox();
-
- ~KMessageBox();
-
+// add no-op constructor
+#ifdef _KWQ_PEDANTIC_
+ KMessageBox() {}
+#endif
+
+// add no-op destructor
+#ifdef _KWQ_PEDANTIC_
+ ~KMessageBox() {}
+#endif
+
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -75,9 +81,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KMessageBox(const KMessageBox &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KMessageBox &operator=(const KMessageBox &);
+#endif
}; // class KMessageBox ========================================================
diff --git a/WebCore/kwq/kfile/kfiledialog.h b/WebCore/kwq/kfile/kfiledialog.h
index 2bb00c1..b0e1221 100644
--- a/WebCore/kwq/kfile/kfiledialog.h
+++ b/WebCore/kwq/kfile/kfiledialog.h
@@ -48,7 +48,6 @@ public:
// constructors, copy constructors, and destructors ------------------------
KFileDialog();
-
~KFileDialog();
// member functions --------------------------------------------------------
@@ -59,6 +58,7 @@ public:
private:
// no copying or assignment
+ // note that these are "standard" (no pendantic stuff needed)
KFileDialog(const KFileDialog &);
KFileDialog &operator=(const KFileDialog &);
diff --git a/WebCore/src/kwq/dcop/dcopclient.h b/WebCore/src/kwq/dcop/dcopclient.h
index 470177e..8e0d76d 100644
--- a/WebCore/src/kwq/dcop/dcopclient.h
+++ b/WebCore/src/kwq/dcop/dcopclient.h
@@ -68,10 +68,15 @@ public:
private:
-// add copy constructor and assignment operator
-#ifdef KWQ_PEDANTIC
- // no copying or assignment
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
DCOPClient(const DCOPClient &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
DCOPClient &operator=(const DCOPClient &);
#endif
diff --git a/WebCore/src/kwq/kdeui/kaction.h b/WebCore/src/kwq/kdeui/kaction.h
index aac8106..1e06c54 100644
--- a/WebCore/src/kwq/kdeui/kaction.h
+++ b/WebCore/src/kwq/kdeui/kaction.h
@@ -42,8 +42,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KAction();
-
- ~KAction();
+ virtual ~KAction();
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -52,9 +51,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KAction(const KAction &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KAction &operator=(const KAction &);
+#endif
}; // class KAction ============================================================
diff --git a/WebCore/src/kwq/kdeui/kcombobox.h b/WebCore/src/kwq/kdeui/kcombobox.h
index c3d3816..e13018f 100644
--- a/WebCore/src/kwq/kdeui/kcombobox.h
+++ b/WebCore/src/kwq/kdeui/kcombobox.h
@@ -45,6 +45,7 @@ public:
KComboBox(QWidget *parent=0, const char *name=0);
KComboBox(bool rw, QWidget *parent=0, const char *name=0);
+ virtual ~KComboBox();
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -53,9 +54,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KComboBox(const KComboBox &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KComboBox &operator=(const KComboBox &);
+#endif
}; // class KComboBox ==========================================================
diff --git a/WebCore/src/kwq/kdeui/kcompletionbox.h b/WebCore/src/kwq/kdeui/kcompletionbox.h
index ac4bad4..0d29237 100644
--- a/WebCore/src/kwq/kdeui/kcompletionbox.h
+++ b/WebCore/src/kwq/kdeui/kcompletionbox.h
@@ -42,8 +42,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KCompletionBox();
-
- ~KCompletionBox();
+ virtual ~KCompletionBox();
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -52,9 +51,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KCompletionBox(const KCompletionBox &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KCompletionBox &operator=(const KCompletionBox &);
+#endif
}; // class KCompletionBox =====================================================
diff --git a/WebCore/src/kwq/kdeui/kcursor.h b/WebCore/src/kwq/kdeui/kcursor.h
index c9ac35f..19acee2 100644
--- a/WebCore/src/kwq/kdeui/kcursor.h
+++ b/WebCore/src/kwq/kdeui/kcursor.h
@@ -46,7 +46,10 @@ public:
KCursor();
- ~KCursor();
+// add no-op destructor
+#ifdef _KWQ_PEDANTIC_
+ ~KCursor() {}
+#endif
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -55,9 +58,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KCursor(const KCursor &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KCursor &operator=(const KCursor &);
+#endif
}; // class KCursor ============================================================
diff --git a/WebCore/src/kwq/kdeui/keditcl.h b/WebCore/src/kwq/kdeui/keditcl.h
index 6f80853..9022359 100644
--- a/WebCore/src/kwq/kdeui/keditcl.h
+++ b/WebCore/src/kwq/kdeui/keditcl.h
@@ -53,7 +53,6 @@ public:
// constructors, copy constructors, and destructors ------------------------
QTableView();
-
~QTableView();
// member functions --------------------------------------------------------
@@ -70,9 +69,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
QTableView(const QTableView &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
QTableView &operator=(const QTableView &);
+#endif
}; // class QTableView =========================================================
@@ -98,7 +106,6 @@ public:
// constructors, copy constructors, and destructors ------------------------
QMultiLineEdit();
-
~QMultiLineEdit();
// member functions --------------------------------------------------------
@@ -123,6 +130,7 @@ public:
private:
// no copying or assignment
+ // note that these are "standard" (no pendantic stuff needed)
QMultiLineEdit(const QMultiLineEdit &);
QMultiLineEdit &operator=(const QMultiLineEdit &);
@@ -144,7 +152,6 @@ public:
KEdit();
KEdit(QWidget *);
-
~KEdit();
// member functions --------------------------------------------------------
@@ -154,9 +161,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KEdit(const KEdit &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KEdit &operator=(const KEdit &);
+#endif
}; // class KEdit ==============================================================
diff --git a/WebCore/src/kwq/kdeui/klineedit.h b/WebCore/src/kwq/kdeui/klineedit.h
index d48868e..320c1c4 100644
--- a/WebCore/src/kwq/kdeui/klineedit.h
+++ b/WebCore/src/kwq/kdeui/klineedit.h
@@ -46,8 +46,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KLineEdit(QWidget *parent=0, const char *name=0);
-
- ~KLineEdit();
+ virtual ~KLineEdit();
// member functions --------------------------------------------------------
@@ -61,9 +60,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KLineEdit(const KLineEdit &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KLineEdit &operator=(const KLineEdit &);
+#endif
}; // class __class_name__ =====================================================
diff --git a/WebCore/src/kwq/kdeui/klistbox.h b/WebCore/src/kwq/kdeui/klistbox.h
index fe29dc8..af27e08 100644
--- a/WebCore/src/kwq/kdeui/klistbox.h
+++ b/WebCore/src/kwq/kdeui/klistbox.h
@@ -45,6 +45,11 @@ public:
KListBox();
KListBox(QWidget *);
+// add no-op destructor
+#ifdef _KWQ_PEDANTIC_
+ ~KListBox() {}
+#endif
+
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -52,9 +57,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KListBox(const KListBox &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KListBox &operator=(const KListBox &);
+#endif
}; // class KListBox ===========================================================
diff --git a/WebCore/src/kwq/kdeui/kmessagebox.h b/WebCore/src/kwq/kdeui/kmessagebox.h
index 5a8516d..686167b 100644
--- a/WebCore/src/kwq/kdeui/kmessagebox.h
+++ b/WebCore/src/kwq/kdeui/kmessagebox.h
@@ -64,10 +64,16 @@ public:
// constructors, copy constructors, and destructors ------------------------
- KMessageBox();
-
- ~KMessageBox();
-
+// add no-op constructor
+#ifdef _KWQ_PEDANTIC_
+ KMessageBox() {}
+#endif
+
+// add no-op destructor
+#ifdef _KWQ_PEDANTIC_
+ ~KMessageBox() {}
+#endif
+
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -75,9 +81,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef _KWQ_PEDANTIC_
KMessageBox(const KMessageBox &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef _KWQ_PEDANTIC_
KMessageBox &operator=(const KMessageBox &);
+#endif
}; // class KMessageBox ========================================================
diff --git a/WebCore/src/kwq/kfile/kfiledialog.h b/WebCore/src/kwq/kfile/kfiledialog.h
index 2bb00c1..b0e1221 100644
--- a/WebCore/src/kwq/kfile/kfiledialog.h
+++ b/WebCore/src/kwq/kfile/kfiledialog.h
@@ -48,7 +48,6 @@ public:
// constructors, copy constructors, and destructors ------------------------
KFileDialog();
-
~KFileDialog();
// member functions --------------------------------------------------------
@@ -59,6 +58,7 @@ public:
private:
// no copying or assignment
+ // note that these are "standard" (no pendantic stuff needed)
KFileDialog(const KFileDialog &);
KFileDialog &operator=(const KFileDialog &);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list