[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:27 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 6f8636669bd4db87e0e785598cd291fccf269b47
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 6 22:11:42 2001 +0000
First pass at code cleanup: Added constructors, copy constructors,
destructors, assignment operators, etc.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@114 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQApplication.h b/WebCore/kwq/KWQApplication.h
index b4e8c40..1775340 100644
--- a/WebCore/kwq/KWQApplication.h
+++ b/WebCore/kwq/KWQApplication.h
@@ -26,19 +26,46 @@
#ifndef QAPPLICATION_H_
#define QAPPLICATION_H_
-#include "qpalette.h"
#include "qwidget.h"
+#include "qpalette.h"
#include "qsize.h"
+// class QApplication ==========================================================
+
class QApplication {
public:
- static QPalette palette(const QWidget* = 0);
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+
+ // static member functions -------------------------------------------------
+
+ static QPalette palette(const QWidget *p=0);
static QWidget *desktop();
static int startDragDistance();
static QSize globalStrut();
static void setOverrideCursor(const QCursor &);
static void restoreOverrideCursor();
- static bool sendEvent(QObject *receiver, QEvent *event);
-};
+ static bool sendEvent(QObject *, QEvent *);
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QApplication();
+ virtual ~QApplication();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QApplication(const QApplication &);
+ QApplication &operator=(const QApplication &);
+
+}; // class QApplication =======================================================
#endif
diff --git a/WebCore/kwq/KWQAsyncIO.h b/WebCore/kwq/KWQAsyncIO.h
index 6f1116b..242460e 100644
--- a/WebCore/kwq/KWQAsyncIO.h
+++ b/WebCore/kwq/KWQAsyncIO.h
@@ -28,20 +28,74 @@
#include <KWQDef.h>
-class QAsynchIO {
+// class QAsyncIO ==============================================================
+
+class QAsyncIO {
+
+// Note : all class members in protected scope
protected:
+
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ virtual ~QAsyncIO();
+
+ // member functions --------------------------------------------------------
+
void ready();
-};
-class QDataSource : public QAsynchIO {
+ // operators ---------------------------------------------------------------
+
+// private ---------------------------------------------------------------------
+
+}; // class QAsyncIO ===========================================================
+
+
+// class QDataSource ===========================================================
+
+class QDataSource : public QAsyncIO {
public:
+
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ // member functions --------------------------------------------------------
+
virtual void rewind();
void maybeReady();
-};
-class QDataSink : public QAsynchIO {
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // end class QDataSource ====================================================
+
+
+// class QDataSink =============================================================
+
+class QDataSink : public QAsyncIO {
public:
+
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ // member functions --------------------------------------------------------
+
virtual void receive(const uchar*, int count)=0;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QDataSink ==========================================================
#endif
diff --git a/WebCore/kwq/KWQBrush.h b/WebCore/kwq/KWQBrush.h
index 10b9de4..ccbdf24 100644
--- a/WebCore/kwq/KWQBrush.h
+++ b/WebCore/kwq/KWQBrush.h
@@ -29,11 +29,38 @@
#include "qcolor.h"
#include "qnamespace.h"
+// class QBrush ================================================================
+
class QBrush : public Qt {
friend class QPainter;
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QBrush();
QBrush(const QColor &);
-};
+ QBrush(const QBrush &);
+
+ QBrush &operator=(const QBrush &);
+
+ ~QBrush();
+
+ // member functions --------------------------------------------------------
+
+ // operators ---------------------------------------------------------------
+
+ bool operator==(const QBrush &) const;
+ bool operator!=(const QBrush &) const;
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+
+}; // class QBrush =============================================================
#endif
diff --git a/WebCore/kwq/KWQBuffer.h b/WebCore/kwq/KWQBuffer.h
index 8a4781e..45a8aa1 100644
--- a/WebCore/kwq/KWQBuffer.h
+++ b/WebCore/kwq/KWQBuffer.h
@@ -28,17 +28,44 @@
#include <KWQDef.h>
+#include "qarray.h"
#include "qstring.h"
+// class QBuffer ===============================================================
+
class QBuffer {
public:
- QByteArray buffer() const;
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QBuffer();
+
+ ~QBuffer();
+
+ // member functions --------------------------------------------------------
+
+ QByteArray buffer() const;
uint size() const;
bool isOpen();
bool open(int);
void close();
int writeBlock(const char *, uint);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QBuffer(const QBuffer &);
+ QBuffer &operator=(const QBuffer &);
+
+}; // class QBuffer ============================================================
#endif
diff --git a/WebCore/kwq/KWQButton.h b/WebCore/kwq/KWQButton.h
index 898bab3..d337499 100644
--- a/WebCore/kwq/KWQButton.h
+++ b/WebCore/kwq/KWQButton.h
@@ -27,16 +27,40 @@
#define QBUTTON_H_
#include "qwidget.h"
-
-class QString;
+#include "qstring.h"
+
+// class QButton ===============================================================
class QButton : public QWidget {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QButton();
QButton(QWidget *);
+ virtual ~QButton();
+
+ // member functions --------------------------------------------------------
+
virtual void setText(const QString &);
QString text() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QButton(const QButton &);
+ QButton &operator=(const QButton &);
+
+}; // class QButton ============================================================
#endif
diff --git a/WebCore/kwq/KWQCString.h b/WebCore/kwq/KWQCString.h
index 5fd1d9c..d049e3e 100644
--- a/WebCore/kwq/KWQCString.h
+++ b/WebCore/kwq/KWQCString.h
@@ -36,31 +36,50 @@
typedef QArray<char> QByteArray;
-// added to help in compilation of khtml/dom/html_documnent.cpp:182
+// class QCString ==============================================================
+
class QCString : public QByteArray {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QCString();
QCString(int);
QCString(const char *);
QCString(const char *, uint);
QCString(const QCString&);
- QCString mid(uint index, uint len=0xffffffff) const;
-
- int find(const char *str, int index=0, bool cs=TRUE) const;
- int contains(char) const;
+ // member functions --------------------------------------------------------
+
bool isEmpty() const;
bool isNull() const;
+ int find(const char *str, int index=0, bool cs=TRUE) const;
+ int contains(char) const;
uint length() const;
bool truncate(uint);
QCString lower() const;
+ QCString mid(uint index, uint len=0xffffffff) const;
+
+ // operators ---------------------------------------------------------------
operator const char *() const;
QCString &operator=(const QCString&);
QCString &operator=(const char *);
QCString &operator+=(const char *);
QCString &operator+=(const QCString&);
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QCString ===========================================================
+
+
+// operators associated with QCString ==========================================
bool operator==(const char *, const QCString &);
bool operator==(const QCString &, const char *);
diff --git a/WebCore/kwq/KWQCheckBox.h b/WebCore/kwq/KWQCheckBox.h
index e0f0327..ba756de 100644
--- a/WebCore/kwq/KWQCheckBox.h
+++ b/WebCore/kwq/KWQCheckBox.h
@@ -28,12 +28,35 @@
#include <KWQButton.h>
+// class QCheckBox =============================================================
+
class QCheckBox : public QButton {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QCheckBox();
- QCheckBox(QWidget *parent);
+ QCheckBox(QWidget *);
+
+ // member functions --------------------------------------------------------
void setChecked(bool);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+
+// private ---------------------------------------------------------------------
+
+private:
+ QCheckBox(const QCheckBox &);
+ QCheckBox &operator=(const QCheckBox &);
+
+}; // class QCheckBox ==========================================================
#endif
diff --git a/WebCore/kwq/KWQColor.h b/WebCore/kwq/KWQColor.h
index 7e675a9..82bd4a7 100644
--- a/WebCore/kwq/KWQColor.h
+++ b/WebCore/kwq/KWQColor.h
@@ -28,18 +28,33 @@
#include "qstring.h"
+// class QColor ================================================================
+
class QColor {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QColor();
QColor(int,int,int);
QColor(const char *);
+ QColor(const QColor &);
+
+ // member functions --------------------------------------------------------
QString name() const;
void setNamedColor(const QString&);
+
+ bool isValid() const;
+
int red() const;
int green() const;
int blue() const;
- bool isValid() const;
void setRgb(int,int,int);
void setRgb(int);
@@ -48,10 +63,15 @@ public:
QColor light(int f = 150) const;
QColor dark(int f = 200) const;
+ // operators ---------------------------------------------------------------
+
QColor &operator=(const QColor &);
bool operator==(const QColor &x) const;
bool operator!=(const QColor &x) const;
-};
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QColor =============================================================
#endif
diff --git a/WebCore/kwq/KWQComboBox.h b/WebCore/kwq/KWQComboBox.h
index 401358d..1e4f557 100644
--- a/WebCore/kwq/KWQComboBox.h
+++ b/WebCore/kwq/KWQComboBox.h
@@ -29,10 +29,24 @@
#include <KWQListBox.h>
#include "qwidget.h"
+// class QComboBox =============================================================
+
class QComboBox : public QWidget {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QComboBox(QWidget *parent=0, const char *name=0);
QComboBox(bool rw, QWidget *parent=0, const char *name=0);
+
+ ~QComboBox();
+
+ // member functions --------------------------------------------------------
int count() const;
QListBox *listBox() const;
@@ -41,6 +55,18 @@ public:
void insertItem(const QString &text, int index=-1);
void clear();
virtual void setCurrentItem(int);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QComboBox(const QComboBox &);
+ QComboBox &operator=(const QComboBox &);
+
+}; // class QComboBox ==========================================================
#endif
diff --git a/WebCore/kwq/KWQCursor.h b/WebCore/kwq/KWQCursor.h
index ebf8cb5..7bdec14 100644
--- a/WebCore/kwq/KWQCursor.h
+++ b/WebCore/kwq/KWQCursor.h
@@ -26,7 +26,33 @@
#ifndef QCURSOR_H
#define QCURSOR_H
+// class QCursor ===============================================================
+
class QCursor {
-};
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QCursor();
+
+ QCursor(const QCursor &);
+
+ ~QCursor();
+
+ // member functions --------------------------------------------------------
+
+ // operators ---------------------------------------------------------------
+
+ QCursor &operator=(const QCursor &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QCursor ============================================================
#endif
diff --git a/WebCore/kwq/KWQDateTime.h b/WebCore/kwq/KWQDateTime.h
index a20a495..e3de5b7 100644
--- a/WebCore/kwq/KWQDateTime.h
+++ b/WebCore/kwq/KWQDateTime.h
@@ -26,32 +26,96 @@
#ifndef QDATETIME_H_
#define QDATETIME_H_
+// class QTime =================================================================
+
class QTime {
public:
+
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QTime();
- QTime(int h, int m);
- QTime(const QTime &other);
+ QTime(int, int);
+ QTime(const QTime &);
+
+ // member functions --------------------------------------------------------
bool isNull() const;
void start();
int msec() const;
int elapsed() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QTime &operator=(const QTime &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QTime ==============================================================
+
+
+// class QDate =================================================================
class QDate {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QDate(int y, int m, int d);
-};
+
+ QDate(const QDate &);
+
+ // member functions --------------------------------------------------------
+
+ // operators ---------------------------------------------------------------
+
+ QDate &operator=(const QDate &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QDate ==============================================================
+
+
+// class QDateTime =============================================================
class QDateTime {
public:
+
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ static QDateTime currentDateTime();
+
+ // constructors, copy constructors, and destructors ------------------------
+
QDateTime();
QDateTime(QDate date, QTime time);
- static QDateTime currentDateTime();
+ QDateTime(const QDateTime &);
+
+ // member functions --------------------------------------------------------
int secsTo(const QDateTime &) const;
QTime time() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QDateTime &operator=(const QDateTime &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QDateTime ==========================================================
#endif
diff --git a/WebCore/kwq/KWQDict.h b/WebCore/kwq/KWQDict.h
index 82ad4b2..27c50f0 100644
--- a/WebCore/kwq/KWQDict.h
+++ b/WebCore/kwq/KWQDict.h
@@ -29,25 +29,75 @@
#include <KWQCollection.h>
#include "qstring.h"
+// class QDict =================================================================
+
template <class T> class QDict : public QCollection {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QDict(int size=17, bool caseSensitive=TRUE);
+
+ QDict(const QDict<T> &);
+
+ ~QDict();
+
+ // member functions --------------------------------------------------------
void insert(const QString &, const T *);
bool remove(const QString &);
T *find(const QString &) const;
uint count() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QDict<T> &operator=(const QDict<T> &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QDict ==============================================================
+
+
+// class QDictIterator =========================================================
template<class T> class QDictIterator {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QDictIterator(const QDict<T> &);
+
+ ~QDictIterator();
+
+ // member functions --------------------------------------------------------
uint count() const;
T *current() const;
T *toFirst();
+ // operators ---------------------------------------------------------------
+
T *operator++();
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QDictIterator(const QDictIterator &);
+ QDictIterator &operator=(const QDictIterator &);
+
+}; // class QDictIterator ======================================================
#endif
diff --git a/WebCore/kwq/KWQEvent.h b/WebCore/kwq/KWQEvent.h
index 5233a8b..92686f1 100644
--- a/WebCore/kwq/KWQEvent.h
+++ b/WebCore/kwq/KWQEvent.h
@@ -30,9 +30,16 @@
#include "qregion.h"
#include "qpoint.h"
+// class QEvent ================================================================
+
class QEvent : public Qt {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+
enum Type {
+ Timer,
MouseButtonPress,
MouseButtonRelease,
MouseButtonDblClick,
@@ -42,13 +49,48 @@ public:
AccelAvailable,
KeyPress,
};
+
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ QEvent(Type);
+
+ virtual ~QEvent();
+
+ // member functions --------------------------------------------------------
+
Type type() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QEvent(const QEvent &);
+ QEvent &operator=(const QEvent &);
+
+}; // class QEvent =============================================================
+
+
+// class QMouseEvent ===========================================================
class QMouseEvent : public QEvent {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QMouseEvent(Type type, const QPoint &pos, int button, int state);
+ // member functions --------------------------------------------------------
+
int x();
int y();
int globalX();
@@ -56,27 +98,221 @@ public:
const QPoint &pos() const;
ButtonState button();
ButtonState state();
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QMouseEvent(const QMouseEvent &);
+ QMouseEvent &operator=(const QMouseEvent &);
+
+}; // class QMouseEvent ========================================================
+
+
+// class QTimerEvent ===========================================================
class QTimerEvent : public QEvent {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QTimerEvent(int timerId);
+
+ // member functions --------------------------------------------------------
+
int timerId() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QTimerEvent(const QTimerEvent &);
+ QTimerEvent &operator=(const QTimerEvent &);
+
+}; // class QTimerEvent ========================================================
+
+
+// class QKeyEvent =============================================================
class QKeyEvent : public QEvent {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
QKeyEvent();
QKeyEvent(Type, Key, int, int);
+
+ // member functions --------------------------------------------------------
+
int key() const;
ButtonState state() const;
void accept();
-};
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QKeyEvent(const QKeyEvent &);
+ QKeyEvent &operator=(const QKeyEvent &);
+
+}; // class QKeyEvent ==========================================================
+
+
+// class QFocusEvent ===========================================================
+
+class QFocusEvent : public QEvent {
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QFocusEvent();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QFocusEvent(const QFocusEvent &);
+ QFocusEvent &operator=(const QFocusEvent &);
+
+}; // class QFocusEvent ========================================================
+
+
+// class QHideEvent ============================================================
+
+class QHideEvent : public QEvent {
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QHideEvent();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QHideEvent(const QHideEvent &);
+ QHideEvent &operator=(const QHideEvent &);
+
+}; // class QHideEvent =========================================================
+
+
+// class QResizeEvent ==========================================================
+
+class QResizeEvent : public QEvent {
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QResizeEvent();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QResizeEvent(const QResizeEvent &);
+ QResizeEvent &operator=(const QResizeEvent &);
+
+}; // class QResizeEvent =======================================================
+
+
+// class QShowEvent ============================================================
+
+class QShowEvent : public QEvent {
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QShowEvent();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QShowEvent(const QShowEvent &);
+ QShowEvent &operator=(const QShowEvent &);
+
+}; // class QShowEvent =========================================================
+
+
+// class QWheelEvent ===========================================================
+
+class QWheelEvent : public QEvent {
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QWheelEvent();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QWheelEvent(const QWheelEvent &);
+ QWheelEvent &operator=(const QWheelEvent &);
-class QFocusEvent : public QEvent {};
-class QHideEvent : public QEvent {};
-class QResizeEvent : public QEvent {};
-class QShowEvent : public QEvent {};
-class QWheelEvent : public QEvent {};
+}; // class QWheelEvent ========================================================
#endif
diff --git a/WebCore/kwq/KWQFile.h b/WebCore/kwq/KWQFile.h
index a3f66d7..08a520f 100644
--- a/WebCore/kwq/KWQFile.h
+++ b/WebCore/kwq/KWQFile.h
@@ -28,17 +28,42 @@
#include "qstring.h"
+// class QFile =================================================================
+
class QFile {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QFile();
QFile(const QString &);
+ ~QFile();
+
+ // member functions --------------------------------------------------------
+
bool exists() const;
static bool exists(const QString &);
bool open(int);
void close();
uint size() const;
int readBlock(char *, uint);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QFile(const QFile &);
+ QFile &operator=(const QFile &);
+
+}; // class QFile ==============================================================
#endif
diff --git a/WebCore/kwq/KWQFont.h b/WebCore/kwq/KWQFont.h
index 87444d8..688a260 100644
--- a/WebCore/kwq/KWQFont.h
+++ b/WebCore/kwq/KWQFont.h
@@ -28,12 +28,31 @@
class QString;
+// class QFont =================================================================
+
class QFont {
+friend class QPainter;
public:
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+
enum CharSet { Latin1, Unicode };
enum Weight { Normal = 50, Bold = 63 };
-
+
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QFont();
+
+ QFont(const QFont &);
+
+ ~QFont();
+
+ // member functions --------------------------------------------------------
+
int pixelSize() const;
QString family() const;
void setFamily(const QString &);
@@ -43,11 +62,16 @@ public:
bool setItalic(bool);
bool italic() const;
bool bold() const;
+
+ // operators ---------------------------------------------------------------
+
+ QFont &operator=(const QFont &);
bool operator==(const QFont &x) const;
bool operator!=(const QFont &x) const;
-private:
- friend class QPainter;
-};
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QFont ==============================================================
#endif
diff --git a/WebCore/kwq/KWQFontInfo.h b/WebCore/kwq/KWQFontInfo.h
index 26f87ca..bd24c56 100644
--- a/WebCore/kwq/KWQFontInfo.h
+++ b/WebCore/kwq/KWQFontInfo.h
@@ -28,12 +28,34 @@
#include "qfont.h"
+// class QFontInfo =============================================================
+
class QFontInfo {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QFontInfo(const QFont &);
- QFontInfo( const QFontInfo & );
+ QFontInfo(const QFontInfo &);
+
+ ~QFontInfo();
+
+ // member functions --------------------------------------------------------
bool fixedPitch() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QFontInfo &operator=(const QFontInfo &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QFontInfo ==========================================================
#endif
diff --git a/WebCore/kwq/KWQFontMetrics.h b/WebCore/kwq/KWQFontMetrics.h
index 976043c..f652f09 100644
--- a/WebCore/kwq/KWQFontMetrics.h
+++ b/WebCore/kwq/KWQFontMetrics.h
@@ -26,28 +26,51 @@
#ifndef QFONTMETRICS_H_
#define QFONTMETRICS_H_
-class QRect;
-class QChar;
-class QFont;
-class QSize;
-class QString;
+#include "qrect.h"
+#include "qsize.h"
+#include "qstring.h"
+#include "qfont.h"
+
+// class QFontMetrics ==========================================================
class QFontMetrics {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QFontMetrics();
- QFontMetrics(const QFont&);
+ QFontMetrics(const QFont &);
+ QFontMetrics(const QFontMetrics &);
+
+ ~QFontMetrics();
+
+ // member functions --------------------------------------------------------
int ascent() const;
int height() const;
int width(QChar) const;
int width(char) const;
- int width(const QString &, int len = -1) const;
+ int width(const QString &, int len=-1) const;
int descent() const;
- QRect boundingRect( const QString &, int len = -1 ) const;
+ QRect boundingRect(const QString &, int len=-1) const;
QRect boundingRect(QChar) const;
- QSize size(int flags, const QString& str, int len=-1, int tabstops=0, int *tabarray=0, char **intern=0 ) const;
+ QSize size(int, const QString &, int len=-1, int tabstops=0,
+ int *tabarray=0, char **intern=0 ) const;
int rightBearing(QChar) const;
int leftBearing(QChar) const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QFontMetrics &operator=(const QFontMetrics &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QFontMetrics =======================================================
#endif
diff --git a/WebCore/kwq/KWQGuardedPtr.h b/WebCore/kwq/KWQGuardedPtr.h
index 4a5938d..ad31dde 100644
--- a/WebCore/kwq/KWQGuardedPtr.h
+++ b/WebCore/kwq/KWQGuardedPtr.h
@@ -28,16 +28,36 @@
#include "qobject.h"
-template <class T> class QGuardedPtr {
+// class QGuardedPtr ===========================================================
+
+template <class T> class QGuardedPtr : public QObject {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QGuardedPtr();
- QGuardedPtr(T* o);
- QGuardedPtr(const QGuardedPtr<T> &p);
+ QGuardedPtr(T *o);
+ QGuardedPtr(const QGuardedPtr<T> &);
+
+ ~QGuardedPtr();
+
+ // member functions --------------------------------------------------------
bool isNull() const;
-
- operator T*() const;
- T* operator->() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ operator T *() const;
+ T *operator->() const;
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QGuardedPtr ========================================================
#endif
diff --git a/WebCore/kwq/KWQImage.h b/WebCore/kwq/KWQImage.h
index d824748..5361bc8 100644
--- a/WebCore/kwq/KWQImage.h
+++ b/WebCore/kwq/KWQImage.h
@@ -26,14 +26,37 @@
#ifndef QIMAGE_H_
#define QIMAGE_H_
+// class QImage ================================================================
+
class QImage {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QImage();
+ QImage(const QImage &);
+
+ // member functions --------------------------------------------------------
+
int width() const;
int height() const;
int depth() const;
int pixelIndex(int,int) const;
QImage createAlphaMask(int conversion_flags=0) const;
bool hasAlphaBuffer() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QImage &operator=(const QImage &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QImage =============================================================
#endif
diff --git a/WebCore/kwq/KWQLabel.h b/WebCore/kwq/KWQLabel.h
index 5eb95b4..4679fbb 100644
--- a/WebCore/kwq/KWQLabel.h
+++ b/WebCore/kwq/KWQLabel.h
@@ -30,13 +30,38 @@
#include "qwidget.h"
#include "qstring.h"
+// class QLabel ================================================================
+
class QLabel : public QFrame {
public:
- QLabel(QWidget *parent);
- QLabel(const QString &, QWidget *);
- virtual void setText(const QString &);
- virtual void setAlignment(int);
-};
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QLabel(QWidget *parent);
+ QLabel(const QString &, QWidget *);
+
+ virtual ~QLabel();
+
+ // member functions --------------------------------------------------------
+
+ virtual void setText(const QString &);
+ virtual void setAlignment(int);
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QLabel(const QLabel &);
+ QLabel &operator=(const QLabel &);
+
+}; // class QLabel =============================================================
#endif
diff --git a/WebCore/kwq/KWQLineEdit.h b/WebCore/kwq/KWQLineEdit.h
index 0535ccf..a95ddd1 100644
--- a/WebCore/kwq/KWQLineEdit.h
+++ b/WebCore/kwq/KWQLineEdit.h
@@ -30,23 +30,50 @@
#include "qevent.h"
#include "qstring.h"
+// class QLineEdit =============================================================
+
class QLineEdit : public QWidget {
public:
+
+ // typedefs ----------------------------------------------------------------
+
+ // enums -------------------------------------------------------------------
+
enum EchoMode { Normal, NoEcho, Password };
+
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ QLineEdit(QWidget *parent=0, const char *name=0);
+
+ virtual ~QLineEdit();
- QLineEdit(QWidget *parent=0, const char *name=0 );
+ // member functions --------------------------------------------------------
virtual void setEchoMode(EchoMode);
+ virtual void setCursorPosition(int);
+ virtual void setText(const QString &);
+ virtual void setMaxLength(int);
+
bool isReadOnly() const;
+ void setReadOnly(bool);
bool event(QEvent *);
bool frame() const;
- virtual void setCursorPosition(int);
int cursorPosition() const;
- virtual void setText(const QString &);
int maxLength() const;
- virtual void setMaxLength(int);
- void setReadOnly(bool);
void selectAll();
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QLineEdit(const QLineEdit &);
+ QLineEdit &operator=(const QLineEdit &);
+
+}; // class QLineEdit ==========================================================
#endif
diff --git a/WebCore/kwq/KWQMap.h b/WebCore/kwq/KWQMap.h
index 600ff07..c005b2a 100644
--- a/WebCore/kwq/KWQMap.h
+++ b/WebCore/kwq/KWQMap.h
@@ -28,47 +28,120 @@
#include <KWQDef.h>
+// class QMapIterator ==========================================================
+
template<class K, class T> class QMapIterator {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QMapIterator();
QMapIterator(const QMapIterator<K,T>& it);
+ // member functions --------------------------------------------------------
+
const K& key() const;
const T& data() const;
+ // operators ---------------------------------------------------------------
+
+ QMapIterator<K,T> &operator=(const QMapIterator<K,T> &);
+ bool operator==(const QMapIterator<K,T>&) const;
bool operator!=(const QMapIterator<K,T>&) const;
T& operator*();
const T& operator*() const;
QMapIterator<K,T>& operator++();
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QMapIterator =======================================================
+
+
+// class QMapConstIterator =====================================================
template<class K, class T> class QMapConstIterator {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QMapConstIterator();
+ QMapConstIterator(const QMapConstIterator<K,T>&);
QMapConstIterator(const QMapIterator<K,T>&);
+
+ // member functions --------------------------------------------------------
+
const K& key() const;
const T& data() const;
+ // operators ---------------------------------------------------------------
+
+ QMapConstIterator<K,T> &operator=(const QMapConstIterator<K,T> &);
+ bool operator==(const QMapConstIterator<K,T>&) const;
bool operator!=(const QMapConstIterator<K,T>&) const;
const T &operator*() const;
QMapConstIterator<K,T>& operator++();
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QMapConstIterator ==================================================
+
+
+// class QMap ==================================================================
template <class K, class T> class QMap {
public:
+
+ // typedefs ----------------------------------------------------------------
+
typedef QMapIterator<K, T> Iterator;
typedef QMapConstIterator< K, T> ConstIterator;
+
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ QMap();
+ QMap(const QMap<K,T>&);
+
+ ~QMap();
+
+ // member functions --------------------------------------------------------
+
+ void clear();
+ uint count() const;
+
Iterator begin();
Iterator end();
+
ConstIterator begin() const;
ConstIterator end() const;
+
Iterator insert(const K&, const T&);
- ConstIterator find (const K &) const;
void remove(const K&);
- void clear();
- uint count() const;
-
+
+ ConstIterator find (const K &) const;
+
+ // operators ---------------------------------------------------------------
+
+ QMap<K,T>& operator=(const QMap<K,T>&);
T& operator[](const K& k);
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QMap ===============================================================
#endif
diff --git a/WebCore/kwq/KWQMemArray.h b/WebCore/kwq/KWQMemArray.h
index d39605d..eba6a2f 100644
--- a/WebCore/kwq/KWQMemArray.h
+++ b/WebCore/kwq/KWQMemArray.h
@@ -28,20 +28,45 @@
#include <KWQDef.h>
+// class QArray ================================================================
+
template <class T> class QArray {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QArray();
QArray(int);
+ QArray(const QArray<T> &);
+
+ QArray<T> &operator=(const QArray<T> &);
+
+ ~QArray();
+
+ // member functions --------------------------------------------------------
+
T &at(uint) const;
T *data() const;
-
uint size() const;
uint count() const;
bool resize(uint size);
QArray<T>& duplicate(const T*, int);
- bool fill(const T &d, int size = -1);
-
+ bool fill(const T &, int size=-1);
+
+ // operators ---------------------------------------------------------------
+
T &operator[](int) const;
-};
+ bool operator==(const QArray<T> &);
+ bool operator!=(const QArray<T> &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QArray =============================================================
#endif
diff --git a/WebCore/kwq/KWQMovie.h b/WebCore/kwq/KWQMovie.h
index d62934e..7843d88 100644
--- a/WebCore/kwq/KWQMovie.h
+++ b/WebCore/kwq/KWQMovie.h
@@ -32,13 +32,30 @@
#include "qimage.h"
#include "qrect.h"
+// class QMovie ================================================================
+
class QMovie {
public:
+
+ // typedefs ----------------------------------------------------------------
+
+ // enums -------------------------------------------------------------------
+
enum Status { EndOfFrame, EndOfMovie };
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QMovie();
QMovie(QDataSource*, int bufsize=1024);
+ QMovie(const QMovie &);
+ ~QMovie();
+
+ // member functions --------------------------------------------------------
+
void unpause();
void pause();
void restart();
@@ -57,6 +74,14 @@ public:
void disconnectResize(QObject* receiver, const char *member=0);
void disconnectUpdate(QObject* receiver, const char *member=0);
void disconnectStatus(QObject* receiver, const char *member=0);
-};
+
+ // operators ---------------------------------------------------------------
+
+ QMovie &operator=(const QMovie &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QMovie =============================================================
#endif
diff --git a/WebCore/kwq/KWQNamespace.h b/WebCore/kwq/KWQNamespace.h
index 5309336..60202fe 100644
--- a/WebCore/kwq/KWQNamespace.h
+++ b/WebCore/kwq/KWQNamespace.h
@@ -29,9 +29,16 @@
class QColor;
class QCursor;
+// class Qt ====================================================================
+
class Qt {
public:
- enum ButtonState {
+
+ // typedefs ----------------------------------------------------------------
+
+ // enums -------------------------------------------------------------------
+
+ enum ButtonState {
LeftButton,
MidButton,
RightButton,
@@ -67,10 +74,12 @@ public:
};
enum Key {
- Key_Escape = 0x1000, // misc keys
+ Key_Escape = 0x1000,
Key_Tab = 0x1001,
- Key_Backtab = 0x1002, Key_BackTab = Key_Backtab,
- Key_Backspace = 0x1003, Key_BackSpace = Key_Backspace,
+ Key_Backtab = 0x1002,
+ Key_BackTab = Key_Backtab,
+ Key_Backspace = 0x1003,
+ Key_BackSpace = Key_Backspace,
Key_Return = 0x1004,
Key_Enter = 0x1005,
Key_Insert = 0x1006,
@@ -78,7 +87,7 @@ public:
Key_Pause = 0x1008,
Key_Print = 0x1009,
Key_SysReq = 0x100a,
- Key_Home = 0x1010, // cursor movement
+ Key_Home = 0x1010,
Key_End = 0x1011,
Key_Left = 0x1012,
Key_Up = 0x1013,
@@ -92,6 +101,8 @@ public:
XorROP,
};
+ // constants ---------------------------------------------------------------
+
static const QColor &black;
static const QColor &white;
static const QColor &darkGray;
@@ -99,6 +110,24 @@ public:
static const QCursor &sizeAllCursor;
static const QCursor &splitHCursor;
static const QCursor &splitVCursor;
-};
+
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ Qt();
+ ~Qt();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ Qt(const Qt &);
+ Qt &operator=(const Qt &);
+
+}; // class Qt =================================================================
#endif
diff --git a/WebCore/kwq/KWQObject.h b/WebCore/kwq/KWQObject.h
index 2c59c3d..09bfb8a 100644
--- a/WebCore/kwq/KWQObject.h
+++ b/WebCore/kwq/KWQObject.h
@@ -63,23 +63,54 @@ class QTimer;
class QImage;
class QVariant;
+// class QObject ===============================================================
class QObject : public Qt {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ static bool connect(const QObject *, const char *, const QObject *,
+ const char *);
+
+ static bool disconnect( const QObject *, const char *, const QObject *,
+ const char *);
+
+ // constructors, copy constructors, and destructors ------------------------
+
QObject(QObject *parent=0, const char *name=0);
+
+ // member functions --------------------------------------------------------
+
const char *name() const;
virtual void setName(const char *);
+
QVariant property(const char *name) const;
bool inherits(const char *) const;
- static bool connect(const QObject *, const char *, const QObject *, const char *);
bool connect(const QObject *, const char *, const char *) const;
- static bool disconnect( const QObject *, const char *, const QObject *, const char *);
+
int startTimer(int);
void killTimer(int);
void killTimers();
+
void installEventFilter(const QObject *);
void removeEventFilter(const QObject *);
+
void blockSignals(bool);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QObject(const QObject &);
+ QObject &operator=(const QObject &);
+
+}; // class QObject ============================================================
#endif
diff --git a/WebCore/kwq/KWQPaintDevice.h b/WebCore/kwq/KWQPaintDevice.h
index b988007..327cb1d 100644
--- a/WebCore/kwq/KWQPaintDevice.h
+++ b/WebCore/kwq/KWQPaintDevice.h
@@ -26,10 +26,28 @@
#ifndef QPAINTDEVICE_H_
#define QPAINTDEVICE_H_
-#include "qrect.h"
+// class QPaintDevice ==========================================================
class QPaintDevice {
- friend class QPaintDeviceMetrics;
-};
+friend class QPaintDeviceMetrics;
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QPaintDevice(const QPaintDevice &);
+ QPaintDevice &operator=(const QPaintDevice &);
+
+}; // class QPaintDevice =======================================================
#endif
diff --git a/WebCore/kwq/KWQPaintDeviceMetrics.h b/WebCore/kwq/KWQPaintDeviceMetrics.h
index d61dbd9..f9161d5 100644
--- a/WebCore/kwq/KWQPaintDeviceMetrics.h
+++ b/WebCore/kwq/KWQPaintDeviceMetrics.h
@@ -28,11 +28,35 @@
class QPaintDevice;
+// class QPaintDeviceMetrics ===================================================
+
class QPaintDeviceMetrics {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QPaintDeviceMetrics(const QPaintDevice *);
+
+ // member functions --------------------------------------------------------
+
int logicalDpiY() const;
int depth() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QPaintDeviceMetrics(const QPaintDeviceMetrics &);
+ QPaintDeviceMetrics &operator=(const QPaintDeviceMetrics &);
+
+}; // class QPaintDeviceMetrics ================================================
#endif
diff --git a/WebCore/kwq/KWQPainter.h b/WebCore/kwq/KWQPainter.h
index ebab5a6..13afc1a 100644
--- a/WebCore/kwq/KWQPainter.h
+++ b/WebCore/kwq/KWQPainter.h
@@ -39,16 +39,53 @@
class QFont;
class QPixmap;
+// class QWMatrix ==============================================================
+
class QWMatrix {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QWMatrix();
+
+ ~QWMatrix();
+
+ // member functions --------------------------------------------------------
+
QWMatrix &scale(double, double);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QWMatrix ===========================================================
+
+
+// class QPainter ==============================================================
class QPainter : public Qt {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QPainter();
QPainter(const QPaintDevice *);
+ ~QPainter();
+
+ // member functions --------------------------------------------------------
+
const QFont &font() const;
void setFont(const QFont &);
QFontMetrics fontMetrics() const;
@@ -64,19 +101,21 @@ public:
void restore();
void drawRect(int, int, int, int);
- void fillRect(int, int, int, int, const QBrush &);
void drawLine(int, int, int, int);
void drawEllipse(int, int, int, int);
void drawArc(int, int, int, int, int, int);
- void drawPolyline(const QPointArray &, int index = 0, int npoints = -1);
- void drawPolygon(const QPointArray &, bool winding = FALSE, int index = 0,
- int npoints = -1);
+ void drawPolyline(const QPointArray &, int index=0, int npoints=-1);
+ void drawPolygon(const QPointArray &, bool winding=FALSE, int index=0,
+ int npoints=-1);
void drawPixmap(const QPoint &, const QPixmap &);
void drawPixmap(const QPoint &, const QPixmap &, const QRect &);
- void drawTiledPixmap(int, int, int, int, const QPixmap &, int sx = 0, int sy = 0);
- void drawText(int x, int y, const QString &, int len = -1);
+ void drawTiledPixmap(int, int, int, int, const QPixmap &, int sx=0,
+ int sy=0);
+ void drawText(int x, int y, const QString &, int len=-1);
void drawText(int, int, int, int, AlignmentFlags, const QString &);
- void drawText(int, int, int, int, int flags, const QString&, int len = -1, QRect *br=0, char **internal=0);
+ void drawText(int, int, int, int, int flags, const QString&, int len=-1,
+ QRect *br=0, char **internal=0);
+ void fillRect(int, int, int, int, const QBrush &);
void setClipping(bool);
void setClipRegion(const QRegion &);
@@ -84,6 +123,21 @@ public:
bool hasClipping() const;
RasterOp rasterOp() const;
void setRasterOp(RasterOp);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QPainter(const QPainter &);
+ QPainter &operator=(const QPainter &);
+
+
+}; // end class QPainter
+
+// =============================================================================
#endif
diff --git a/WebCore/kwq/KWQPalette.h b/WebCore/kwq/KWQPalette.h
index 201d3b9..bf95e0a 100644
--- a/WebCore/kwq/KWQPalette.h
+++ b/WebCore/kwq/KWQPalette.h
@@ -28,12 +28,42 @@
class QColor;
+// class QColorGroup ===========================================================
+
class QColorGroup {
public:
- enum ColorRole { Foreground, Shadow, Light, Mid, Midlight, Dark, Base, ButtonText, Button, Background, Text };
+
+ // typedefs ----------------------------------------------------------------
+
+ enum ColorRole {
+ Foreground,
+ Shadow,
+ Light,
+ Mid,
+ Midlight,
+ Dark,
+ Base,
+ ButtonText,
+ Button,
+ Background,
+ Text
+ };
+
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ QColorGroup();
+ QColorGroup(const QColorGroup &);
+
+ ~QColorGroup();
+
+ // member functions --------------------------------------------------------
const QColor &color(ColorRole) const;
void setColor(ColorRole, const QColor &);
+
const QColor &foreground() const;
const QColor &shadow() const;
const QColor &light() const;
@@ -44,18 +74,52 @@ public:
const QColor &button() const;
const QColor &text() const;
const QColor &background() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QColorGroup &operator=(const QColorGroup &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QColorGroup ========================================================
+
+
+// class QPalette ==============================================================
class QPalette {
public:
+
+ // typedefs ----------------------------------------------------------------
+
+ // enums -------------------------------------------------------------------
+
enum ColorGroup { Active, Inactive, Disabled };
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QPalette();
+ QPalette(const QPalette &);
+
+ ~QPalette();
+
+ // member functions --------------------------------------------------------
+
void setColor(ColorGroup, QColorGroup::ColorRole role, const QColor &color);
const QColorGroup &active() const;
const QColorGroup &inactive() const;
const QColorGroup &disabled() const;
const QColorGroup &normal() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QPalette ===========================================================
#endif
diff --git a/WebCore/kwq/KWQPen.h b/WebCore/kwq/KWQPen.h
index 822e8a4..fe659bd 100644
--- a/WebCore/kwq/KWQPen.h
+++ b/WebCore/kwq/KWQPen.h
@@ -29,12 +29,35 @@
#include "qnamespace.h"
#include "qcolor.h"
+// class QPen ==================================================================
+
class QPen : public Qt {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QPen();
QPen(const QColor &color, uint width=0, PenStyle style=SolidLine);
+ QPen(const QPen &);
+
+ ~QPen();
+
+ // member functions --------------------------------------------------------
const QColor &color() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QPen &operator=(const QPen &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QPen ===============================================================
#endif
diff --git a/WebCore/kwq/KWQPixmap.h b/WebCore/kwq/KWQPixmap.h
index 56db9a3..0edfdac 100644
--- a/WebCore/kwq/KWQPixmap.h
+++ b/WebCore/kwq/KWQPixmap.h
@@ -31,28 +31,55 @@
#include "qstring.h"
#include "qnamespace.h"
#include "qimage.h"
+#include "qsize.h"
+#include "qrect.h"
class QBitmap;
class QWMatrix;
-class QPixmap : public QPaintDevice {
+// class QPixmap ===============================================================
+
+class QPixmap : public QPaintDevice, public Qt {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QPixmap();
QPixmap(const QSize&);
QPixmap(const QByteArray&);
QPixmap(int,int);
+ QPixmap(const QPixmap &);
+
+ ~QPixmap();
+
+ // member functions --------------------------------------------------------
void setMask(const QBitmap &);
const QBitmap *mask() const;
+ bool isNull() const;
+
QSize size() const;
QRect rect() const;
int width() const;
int height() const;
- bool isNull() const;
void resize(const QSize &);
+
QPixmap xForm(const QWMatrix &) const;
QImage convertToImage() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QPixmap &operator=(const QPixmap &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QPixmap ============================================================
#endif
diff --git a/WebCore/kwq/KWQPointArray.h b/WebCore/kwq/KWQPointArray.h
index 7d19a03..87c9373 100644
--- a/WebCore/kwq/KWQPointArray.h
+++ b/WebCore/kwq/KWQPointArray.h
@@ -28,28 +28,75 @@
#include <KWQDef.h>
+// class QPoint ================================================================
+
class QPoint {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QPoint();
QPoint(int, int);
QPoint(const QPoint &);
-
+
+ ~QPoint();
+
+ // member functions --------------------------------------------------------
+
int x() const;
int y() const;
int manhattanLength() const;
+ // operators ---------------------------------------------------------------
+
+ QPoint &operator=(const QPoint &);
+
friend QPoint operator+(const QPoint &, const QPoint &);
friend QPoint operator-(const QPoint &, const QPoint &);
-};
-// FIXME: QPointArray here to workaround bug in khtml/html/html_imageimpl.cpp
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QPoint =============================================================
+
+
+// class QPointArray ===========================================================
+
class QPointArray {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
QPointArray(int);
QPointArray(int, const QCOORD *);
+
+ ~QPointArray();
+
+ // member functions --------------------------------------------------------
+
void setPoint(uint, int, int);
- bool setPoints(int, int, int, ... );
-};
+ bool setPoints(int, int, int, ...);
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QPointArray(const QPointArray &);
+ QPointArray &operator=(const QPointArray &);
+
+}; // class QPointArray ========================================================
-#endif
+#endif
\ No newline at end of file
diff --git a/WebCore/kwq/KWQPtrDict.h b/WebCore/kwq/KWQPtrDict.h
index 090fec5..95ea99f 100644
--- a/WebCore/kwq/KWQPtrDict.h
+++ b/WebCore/kwq/KWQPtrDict.h
@@ -29,27 +29,75 @@
#include <KWQDef.h>
#include <KWQCollection.h>
+// class QPtrDict ==============================================================
+
template <class T> class QPtrDict : public QCollection {
public:
- QPtrDict(int size=13);
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QPtrDict(int size=17);
+ QPtrDict(const QPtrDict<T> &);
+
+ ~QPtrDict();
+
+ // member functions --------------------------------------------------------
uint count() const;
T *at(uint);
T *take(void *);
+
void append(const T *);
void insert(void *, const T *);
void remove(void *);
+
+ // operators ---------------------------------------------------------------
+
+ QPtrDict<T> &operator=(const QPtrDict<T> &);
T *operator[](void *) const;
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QPtrDict ===========================================================
+
+
+// class QPtrDictIterator ======================================================
template<class T> class QPtrDictIterator {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QPtrDictIterator(const QPtrDict<T> &);
+ // member functions --------------------------------------------------------
+
T *current() const;
void *currentKey() const;
+ // operators ---------------------------------------------------------------
+
T *operator++();
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QPtrDictIterator(const QPtrDictIterator &);
+ QPtrDictIterator &operator=(const QPtrDictIterator &);
+
+}; // class QPtrDictIterator ===================================================
#endif
diff --git a/WebCore/kwq/KWQPtrList.h b/WebCore/kwq/KWQPtrList.h
index 00c0be9..ab2fe7e 100644
--- a/WebCore/kwq/KWQPtrList.h
+++ b/WebCore/kwq/KWQPtrList.h
@@ -29,44 +29,96 @@
#include <KWQDef.h>
#include <KWQCollection.h>
+// class QList =================================================================
+
template <class T> class QList : public QCollection {
public:
- // FIXME: should any of these functions be moved into a base collection
- // class implementation?
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ QList();
+ QList(const QList<T> &);
+
+ // member functions --------------------------------------------------------
+
+ bool isEmpty() const;
uint count() const;
+ void clear();
+ void sort();
+
T *at(uint);
- void append(const T *);
+
void setAutoDelete(bool);
+
bool insert(uint i, const T *);
bool remove();
bool remove(const T *);
bool removeFirst();
bool removeLast();
+ bool removeRef(const T *);
+
T *getLast() const;
T *current() const;
- T *prev() const;
- void prepend(const T *);
- T *take(uint i);
T *first();
- T *next();
T *last();
- void clear();
- bool isEmpty() const;
- bool removeRef(const T *);
+ T *next();
+ T *prev();
+ T *take(uint i);
+
+ void append(const T *);
+ void prepend(const T *);
+
uint containsRef(const T *) const;
- void sort();
-};
+
+ // operators ---------------------------------------------------------------
+
+ QList<T> &operator=(const QList<T> &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QList ==============================================================
+
+
+// class QListIterator =========================================================
template <class T> class QListIterator {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QListIterator(const QList<T> &);
+
+ // member functions --------------------------------------------------------
+
uint count() const;
T *toFirst();
T *toLast();
T *current() const;
+
+ // operators ---------------------------------------------------------------
+
operator T *() const;
T *operator--();
T *operator++();
-};
+ QListIterator<T> &operator=(const QListIterator<T> &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying
+ QListIterator<T>(const QListIterator<T> &);
+
+}; // class QListIterator ======================================================
#endif
diff --git a/WebCore/kwq/KWQPtrStack.h b/WebCore/kwq/KWQPtrStack.h
index 38fa256..3570460 100644
--- a/WebCore/kwq/KWQPtrStack.h
+++ b/WebCore/kwq/KWQPtrStack.h
@@ -26,11 +26,35 @@
#ifndef QSTACK_H_
#define QSTACK_H_
+// class QStack ================================================================
+
template<class T> class QStack {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ QStack();
+ QStack(const QStack<T> &);
+
+ ~QStack();
+
+ // member functions --------------------------------------------------------
+
bool isEmpty() const;
- void push(const T *d);
+ void push(const T *);
T *pop();
-};
+
+ // operators ---------------------------------------------------------------
+
+ QStack<T> &operator=(const QStack<T> &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QStack =============================================================
#endif
diff --git a/WebCore/kwq/KWQPtrVector.h b/WebCore/kwq/KWQPtrVector.h
index 405765a..c742154 100644
--- a/WebCore/kwq/KWQPtrVector.h
+++ b/WebCore/kwq/KWQPtrVector.h
@@ -31,15 +31,56 @@
typedef void *Item;
+// class QGVector ==============================================================
+
class QGVector : public QCollection {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+
+ // static member functions -------------------------------------------------
+
virtual int compareItems(Item, Item);
-};
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QGVector();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QGVector(const QGVector &);
+ QGVector &operator=(const QGVector &);
+
+}; // class QGVector ===========================================================
+
+
+// class QVector ===============================================================
template<class T> class QVector : public QGVector {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QVector();
QVector(uint);
+ QVector(const QVector &);
+
+ ~QVector();
+
+ // member functions --------------------------------------------------------
bool isEmpty() const;
uint count() const;
@@ -49,7 +90,14 @@ public:
bool insert(uint, const T *);
T *at(int) const;
+ // operators ---------------------------------------------------------------
+
T *operator[](int) const;
-};
+ QVector &operator=(const QVector &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QVector ============================================================
#endif
diff --git a/WebCore/kwq/KWQPushButton.h b/WebCore/kwq/KWQPushButton.h
index 328a391..c81de3b 100644
--- a/WebCore/kwq/KWQPushButton.h
+++ b/WebCore/kwq/KWQPushButton.h
@@ -31,11 +31,35 @@
#include "qwidget.h"
#include "qstring.h"
+// class QPushButton ===========================================================
+
class QPushButton : public QButton {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QPushButton();
QPushButton(QWidget *);
QPushButton(const QString &text, QWidget *parent, const char* name=0);
-};
+
+ ~QPushButton();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QPushButton(const QPushButton &);
+ QPushButton &operator=(const QPushButton &);
+
+}; // class QPushButton ========================================================
#endif
diff --git a/WebCore/kwq/KWQRadioButton.h b/WebCore/kwq/KWQRadioButton.h
index 521e2f8..f5b269c 100644
--- a/WebCore/kwq/KWQRadioButton.h
+++ b/WebCore/kwq/KWQRadioButton.h
@@ -30,12 +30,37 @@
#include "qwidget.h"
+// class QRadioButton ==========================================================
+
class QRadioButton : public QButton {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QRadioButton();
QRadioButton(QWidget *);
+
+ ~QRadioButton();
+
+ // member functions --------------------------------------------------------
void setChecked(bool);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QRadioButton(const QRadioButton &);
+ QRadioButton &operator=(const QRadioButton &);
+
+}; // class QRadioButton =======================================================
#endif
diff --git a/WebCore/kwq/KWQRect.h b/WebCore/kwq/KWQRect.h
index 546ffea..6cdc4df 100644
--- a/WebCore/kwq/KWQRect.h
+++ b/WebCore/kwq/KWQRect.h
@@ -28,10 +28,28 @@
#include "qsize.h"
+// class QRect =================================================================
+
class QRect {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QRect();
QRect(int l, int t, int w, int h);
+ QRect(const QRect &);
+
+ ~QRect();
+
+ // member functions --------------------------------------------------------
+
+ bool isNull() const;
+ bool isValid() const;
int x() const;
int y() const;
@@ -41,14 +59,20 @@ public:
int bottom() const;
int width() const;
int height() const;
- bool isNull() const;
- bool isValid() const;
QSize size() const;
void setWidth(int);
void setHeight(int);
QRect intersect(const QRect &) const;
bool intersects(const QRect &) const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QRect &operator=(const QRect &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QRect ==============================================================
#endif
diff --git a/WebCore/kwq/KWQRegExp.h b/WebCore/kwq/KWQRegExp.h
index ec1c524..b567d65 100644
--- a/WebCore/kwq/KWQRegExp.h
+++ b/WebCore/kwq/KWQRegExp.h
@@ -28,10 +28,31 @@
#include "qstring.h"
+// class QRegExp ===============================================================
+
class QRegExp {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QRegExp();
QRegExp(const QString &);
QRegExp(const QRegExp &);
-};
+
+ // member functions --------------------------------------------------------
+
+ // operators ---------------------------------------------------------------
+
+ QRegExp &operator=(const QRegExp &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QRegExp ============================================================
#endif
diff --git a/WebCore/kwq/KWQRegion.h b/WebCore/kwq/KWQRegion.h
index 35d02ab..b087686 100644
--- a/WebCore/kwq/KWQRegion.h
+++ b/WebCore/kwq/KWQRegion.h
@@ -27,25 +27,46 @@
#define QREGION_H_
#include "qpoint.h"
-
-// FIXME: workaround for error on line 58 of khtml/html/html_imageimpl.h
#include "qimage.h"
-
#include "qrect.h"
+// class QRegion ===============================================================
+
class QRegion {
public:
+
+ // typedefs ----------------------------------------------------------------
+
// NOTE: alphabetical order
enum RegionType { Ellipse, Rectangle };
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QRegion();
QRegion(const QRect &);
QRegion(int, int, int, int, RegionType = Rectangle);
QRegion(const QPointArray &);
+ QRegion(const QRegion &);
+
+ ~QRegion();
+
+ // member functions --------------------------------------------------------
QRegion intersect(const QRegion &) const;
bool contains(const QPoint &) const;
bool isNull() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QRegion &operator=(const QRegion &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QRegion ============================================================
#endif
diff --git a/WebCore/kwq/KWQScrollView.h b/WebCore/kwq/KWQScrollView.h
index 41cab1f..2114443 100644
--- a/WebCore/kwq/KWQScrollView.h
+++ b/WebCore/kwq/KWQScrollView.h
@@ -30,9 +30,28 @@
#include <KWQFrame.h>
#include "qwidget.h"
+// class QScrollView ===========================================================
+
class QScrollView : public QFrame {
public:
+
+ // typedefs ----------------------------------------------------------------
+
+ // enums -------------------------------------------------------------------
+
+ // NOTE: alphabetical order
+ enum ScrollBarMode { AlwaysOff, AlwaysOn, Auto };
+
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QScrollView();
+ virtual ~QScrollView();
+
+ // member functions --------------------------------------------------------
+
QWidget* viewport() const;
int visibleWidth() const;
int visibleHeight() const;
@@ -40,18 +59,32 @@ public:
int contentsX() const;
int contentsY() const;
void scrollBy(int dx, int dy);
+
virtual void setContentsPos(int x, int y);
- // NOTE: alphabetical order
- enum ScrollBarMode { AlwaysOff, AlwaysOn, Auto };
+
QScrollBar *horizontalScrollBar() const;
QScrollBar *verticalScrollBar() const;
+
virtual void setVScrollBarMode(ScrollBarMode);
virtual void setHScrollBarMode(ScrollBarMode);
+
virtual void addChild(QWidget* child, int x=0, int y=0);
void removeChild(QWidget* child);
+
virtual void resizeContents(int w, int h);
void updateContents(int x, int y, int w, int h);
void repaintContents(int x, int y, int w, int h, bool erase=TRUE);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QScrollView(const QScrollView &);
+ QScrollView &operator=(const QScrollView &);
+
+}; // class QScrollView ========================================================
#endif
diff --git a/WebCore/kwq/KWQSize.h b/WebCore/kwq/KWQSize.h
index 34a7141..195708a 100644
--- a/WebCore/kwq/KWQSize.h
+++ b/WebCore/kwq/KWQSize.h
@@ -26,11 +26,26 @@
#ifndef QSIZE_H_
#define QSIZE_H_
+// class QSize =================================================================
+
class QSize {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QSize();
QSize(int,int);
-
+ QSize(const QSize &);
+
+ ~QSize();
+
+ // member functions --------------------------------------------------------
+
bool isValid() const;
int width() const;
int height() const;
@@ -38,9 +53,17 @@ public:
void setHeight(int);
QSize expandedTo(const QSize &) const;
+ // operators ---------------------------------------------------------------
+
+ QSize &operator=(const QSize &);
+
friend inline QSize operator+(const QSize &, const QSize &);
friend inline bool operator==(const QSize &, const QSize &);
friend inline bool operator!=(const QSize &, const QSize &);
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QSize ==============================================================
#endif
diff --git a/WebCore/kwq/KWQSortedList.h b/WebCore/kwq/KWQSortedList.h
index 1e5f26e..caa9d38 100644
--- a/WebCore/kwq/KWQSortedList.h
+++ b/WebCore/kwq/KWQSortedList.h
@@ -28,7 +28,32 @@
#include "qlist.h"
+// class QSortedList ===========================================================
+
template<class T> class QSortedList : public QList<T> {
-};
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QSortedList();
+ QSortedList(const QSortedList<T> &);
+
+ ~QSortedList();
+
+ // member functions --------------------------------------------------------
+
+ // operators ---------------------------------------------------------------
+
+ QSortedList<T> &operator=(const QSortedList<T> &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QSortedList ========================================================
#endif
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index 3bb1d8a..cfa8684 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -31,14 +31,14 @@
class QString;
class QRegExp;
-// =============================================================================
-// QChar class
+// QChar class =================================================================
class QChar {
public:
- // -------------------------------------------------------------------------
- // enums
+ // typedefs ----------------------------------------------------------------
+
+ // enums -------------------------------------------------------------------
enum Direction {
// NOTE: alphabetical order
@@ -46,13 +46,13 @@ public:
DirLRO, DirNSM, DirON, DirPDF, DirR, DirRLE, DirRLO, DirS, DirWS
};
- // -------------------------------------------------------------------------
- // constants
+ // constants ---------------------------------------------------------------
static const QChar null;
- // -------------------------------------------------------------------------
- // constructors, copy constructors, and destructors
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
QChar();
QChar(char);
@@ -63,11 +63,7 @@ public:
QChar(uint);
QChar(int);
- // -------------------------------------------------------------------------
- // static member functions
-
- // -------------------------------------------------------------------------
- // member functions
+ // member functions --------------------------------------------------------
QChar lower() const;
QChar upper() const;
@@ -85,8 +81,7 @@ public:
QChar mirroredChar() const;
ushort unicode() const;
- // -------------------------------------------------------------------------
- // operators
+ // operators ---------------------------------------------------------------
friend int operator==(char, QChar);
friend int operator==(QChar, char);
@@ -96,48 +91,46 @@ public:
friend int operator!=(QChar, char);
operator char() const;
-}; // end class QChar
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QChar ==============================================================
+
-// =============================================================================
-// QString class
+// QString class ===============================================================
class QString {
public:
- static QString fromLatin1(const char*, int len = -1);
+ static QString fromLatin1(const char*, int len=-1);
- // -------------------------------------------------------------------------
- // enums
-
- // -------------------------------------------------------------------------
- // constants
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
static const QString null;
- // -------------------------------------------------------------------------
- // constructors, copy constructors, and destructors
+ // static member functions -------------------------------------------------
+
+ static QString number(long, int base=10);
+
+ // constructors, copy constructors, and destructors ------------------------
QString();
QString(QChar);
- QString(const QString&);
- QString(const QByteArray&);
+ QString(const QString &);
+ QString(const QByteArray &);
QString(const QChar *, uint);
QString(const char *);
- QString &operator=(const QString&);
- QString &operator=(const char *);
- QString &operator=(const QCString&);
QString &operator=(QChar);
+ QString &operator=(const QString &);
+ QString &operator=(const char *);
+ QString &operator=(const QCString &);
QString &operator=(char);
~QString();
- // -------------------------------------------------------------------------
- // static member functions
-
- static QString number(long, int base = 10);
-
- // -------------------------------------------------------------------------
- // member functions
+ // member functions --------------------------------------------------------
bool isNull() const;
bool isEmpty() const;
@@ -146,9 +139,9 @@ public:
int toInt() const;
int toInt(bool *, int base=10) const;
- uint toUInt(bool *ok = 0, int base = 10) const;
- long toLong(bool *ok = 0, int base = 10) const;
- float toFloat(bool *b = 0) const;
+ uint toUInt(bool *ok=0, int base=10) const;
+ long toLong(bool *ok=0, int base=10) const;
+ float toFloat(bool *b=0) const;
QString &prepend(const QString &);
QString &append(const char *);
@@ -159,25 +152,25 @@ public:
int contains(char) const;
int find(char, int index=0) const;
- int find(const char *, int index = 0, bool b = 0) const;
- int find(const QString &, int index = 0, bool b = 0) const;
- int find(const QRegExp &, int index = 0, bool b = 0) const;
- int findRev(char, int index = 0) const;
- int findRev(const char *, int index = 0) const;
+ int find(const char *, int index=0, bool b=0) const;
+ int find(const QString &, int index=0, bool b=0) const;
+ int find(const QRegExp &, int index=0, bool b=0) const;
+ int findRev(char, int index=0) const;
+ int findRev(const char *, int index=0) const;
QString &remove(uint, uint);
QString &replace(const QRegExp &, const QString &);
QString &insert(uint, char);
void truncate(uint pos);
- void fill(QChar, int len = -1);
+ void fill(QChar, int len=-1);
QString arg (int &);
QString arg(int a, int fieldwidth=0, int base=10) const;
- QString arg(const QString&, int fieldwidth = 0) const;
+ QString arg(const QString &, int fieldwidth = 0) const;
QString left(uint) const;
QString right(uint) const;
- QString mid(int, int len = 0xffffffff) const;
+ QString mid(int, int len=0xffffffff) const;
const char* latin1() const;
const char *ascii() const;
@@ -186,16 +179,15 @@ public:
QCString local8Bit() const;
QString &setUnicode(const QChar *, uint);
- QString &setNum(int, int base = 10);
+ QString &setNum(int, int base=10);
QString &sprintf(const char *, ...);
QString lower() const;
QString stripWhiteSpace() const;
QString simplifyWhiteSpace() const;
void compose();
- QString visual(int index = 0, int len = -1);
+ QString visual(int index=0, int len=-1);
- // -------------------------------------------------------------------------
- // operators
+ // operators ---------------------------------------------------------------
bool operator!() const;
operator const char *() const;
@@ -207,11 +199,14 @@ public:
QString &operator+=(QChar);
QString &operator+=(const QString &);
operator QChar () const;
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
-}; // end class QString
+}; // class QString ============================================================
-// =============================================================================
-// operators associated with QChar and QString
+
+// operators associated with QChar and QString =================================
QString &operator+(const char *, const QString &);
QString &operator+(QChar, const QString &);
@@ -225,36 +220,30 @@ bool operator!=(const QString &, const char *);
bool operator!=(const char *, const QString &);
QString operator+(char, const QString &);
-// =============================================================================
-// QConstString class
+
+// class QConstString ==========================================================
class QConstString {
public:
- // -------------------------------------------------------------------------
- // enums
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
- // -------------------------------------------------------------------------
- // constants
-
- // -------------------------------------------------------------------------
- // static member functions
+ // static member functions -------------------------------------------------
const QString string() const;
- // -------------------------------------------------------------------------
- // constructors, copy constructors, and destructors
+ // constructors, copy constructors, and destructors ------------------------
QConstString(QChar *, uint);
- // -------------------------------------------------------------------------
- // member functions
-
- // -------------------------------------------------------------------------
- // operators
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
-}; // end class QConstString
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
-// =============================================================================
+}; // class QConstString =======================================================
#endif
diff --git a/WebCore/kwq/KWQStringList.h b/WebCore/kwq/KWQStringList.h
index 662588a..a697574 100644
--- a/WebCore/kwq/KWQStringList.h
+++ b/WebCore/kwq/KWQStringList.h
@@ -29,11 +29,40 @@
#include "qstring.h"
#include "qvaluelist.h"
+// class QStringList ===========================================================
+
class QStringList : public QValueList<QString> {
public:
- static QStringList split(const QString &sep, const QString &str, bool allowEmptyEntries = FALSE );
- static QStringList split(const QChar &sep, const QString &str, bool allowEmptyEntries = FALSE );
- QString join(const QString &sepx ) const;
-};
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+
+ // static member functions -------------------------------------------------
+
+ static QStringList split(const QString &, const QString &,
+ bool allowEmptyEntries = FALSE );
+ static QStringList split(const QChar &, const QString &,
+ bool allowEmptyEntries = FALSE );
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QStringList();
+ QStringList(const QStringList &);
+
+ ~QStringList();
+
+ // member functions --------------------------------------------------------
+
+ QString join(const QString &) const;
+
+ // operators ---------------------------------------------------------------
+
+ QStringList &operator=(const QStringList &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QStringList ========================================================
#endif
diff --git a/WebCore/kwq/KWQTextCodec.h b/WebCore/kwq/KWQTextCodec.h
index 5ea5020..8689bb8 100644
--- a/WebCore/kwq/KWQTextCodec.h
+++ b/WebCore/kwq/KWQTextCodec.h
@@ -29,24 +29,81 @@
#include "qstring.h"
#include "qcstring.h"
+// class QTextDecoder ==========================================================
+
class QTextDecoder {
public:
- virtual QString toUnicode(const char *, int) = 0;
-};
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QTextDecoder();
+
+ virtual ~QTextDecoder();
+
+ // member functions --------------------------------------------------------
+
+ virtual QString toUnicode(const char *, int)=0;
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QTextDecoder(const QTextDecoder &);
+ QTextDecoder &operator=(const QTextDecoder &);
+
+}; // class QTextDecoder =======================================================
+
+
+// class QTextCodec ============================================================
class QTextCodec {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+
+ // static member functions -------------------------------------------------
+
static QTextCodec *codecForMib(int);
- static QTextCodec *codecForName(const char *, int accuracy = 0);
+ static QTextCodec *codecForName(const char *, int accuracy=0);
static QTextCodec *codecForLocale();
- virtual const char* name() const = 0;
- virtual int mibEnum() const = 0;
+ // constructors, copy constructors, and destructors ------------------------
+
+ QTextCodec();
+
+ virtual ~QTextCodec();
+
+ // member functions --------------------------------------------------------
+
+ virtual const char* name() const=0;
+ virtual int mibEnum() const=0;
virtual QTextDecoder *makeDecoder() const;
QCString fromUnicode(const QString &) const;
+
virtual QString toUnicode(const char *, int) const;
QString toUnicode(const QByteArray &, int) const;
QString toUnicode(const char *) const;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QTextCodec(const QTextCodec &);
+ QTextCodec &operator=(const QTextCodec &);
+
+}; // class QTextCodec =========================================================
#endif
diff --git a/WebCore/kwq/KWQTextStream.h b/WebCore/kwq/KWQTextStream.h
index eb94205..7024dcf 100644
--- a/WebCore/kwq/KWQTextStream.h
+++ b/WebCore/kwq/KWQTextStream.h
@@ -28,26 +28,106 @@
#include "qstring.h"
+// class QTextStream ===========================================================
+
class QTextStream {
public:
- QTextStream();
- QTextStream(QByteArray, int);
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QTextStream();
+ QTextStream(QByteArray, int);
+
+ virtual ~QTextStream();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
QTextStream &operator<<(char);
QTextStream &operator<<(const char *);
- QTextStream &operator<<(const QCString&);
- QTextStream &operator<<(const QString&);
-};
+ QTextStream &operator<<(const QCString &);
+ QTextStream &operator<<(const QString &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QTextStream(const QTextStream &);
+ QTextStream &operator=(const QTextStream &);
+
+}; // class QTextStream ========================================================
+
+
+// class QTextIStream ==========================================================
class QTextIStream : public QTextStream {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QTextIStream(QString *);
+
+ virtual ~QTextIStream();
+
+ // member functions --------------------------------------------------------
+
QString readLine();
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QTextIStream(const QTextIStream &);
+ QTextIStream &operator=(const QTextIStream &);
+
+}; // class QTextIStream =======================================================
+
+
+// class QTextOStream ==========================================================
class QTextOStream : public QTextStream {
public:
- QTextOStream(QByteArray ba);
-};
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QTextOStream(QString *);
+ QTextOStream(QByteArray);
+
+ virtual ~QTextOStream();
+
+ // member functions --------------------------------------------------------
+
+ QString readLine();
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QTextOStream(const QTextOStream &);
+ QTextOStream &operator=(const QTextOStream &);
+
+}; // class QTextOStream =======================================================
#endif
diff --git a/WebCore/kwq/KWQTimer.h b/WebCore/kwq/KWQTimer.h
index aa069b9..52e0b25 100644
--- a/WebCore/kwq/KWQTimer.h
+++ b/WebCore/kwq/KWQTimer.h
@@ -28,9 +28,36 @@
#include "qobject.h"
+// class QTimer ================================================================
+
class QTimer : public QObject {
public:
- static void singleShot(int msec, QObject *receiver, const char *member);
-};
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+
+ // static member functions -------------------------------------------------
+
+ static void singleShot(int, QObject *, const char *);
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QTimer();
+
+ ~QTimer();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QTimer(const QTimer &);
+ QTimer &operator=(const QTimer &);
+
+}; // class QTimer =============================================================
#endif
diff --git a/WebCore/kwq/KWQToolTip.h b/WebCore/kwq/KWQToolTip.h
index 7c024a6..5ee206f 100644
--- a/WebCore/kwq/KWQToolTip.h
+++ b/WebCore/kwq/KWQToolTip.h
@@ -26,11 +26,40 @@
#ifndef QTOOLTIP_H_
#define QTOOLTIP_H_
-class QPalette;
+#include "qnamespace.h"
+#include "qpalette.h"
+#include "qwidget.h"
-class QToolTip {
+// class QToolTip ==============================================================
+
+class QToolTip : public Qt {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+
+ // static member functions -------------------------------------------------
+
static QPalette palette();
-};
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QToolTip(QWidget *);
+
+ ~QToolTip();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QToolTip(const QToolTip &);
+ QToolTip &operator=(const QToolTip &);
+
+}; // class QToolTip ===========================================================
#endif
diff --git a/WebCore/kwq/KWQValueList.h b/WebCore/kwq/KWQValueList.h
index 904fa88..fdc3446 100644
--- a/WebCore/kwq/KWQValueList.h
+++ b/WebCore/kwq/KWQValueList.h
@@ -28,48 +28,128 @@
#include <KWQDef.h>
+// class QValueListIterator ====================================================
+
template<class T> class QValueListIterator {
public:
- bool operator!=(const QValueListIterator<T>& it);
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QValueListIterator();
+ QValueListIterator(const QValueListIterator<T>&);
+
+ ~QValueListIterator();
+
+ // member functions --------------------------------------------------------
+
+ // operators ---------------------------------------------------------------
+
+ bool operator==(const QValueListIterator<T>&);
+ bool operator!=(const QValueListIterator<T>&);
T& operator*();
const T& operator*() const;
QValueListIterator<T>& operator++();
QValueListIterator<T>& operator++(int);
QValueListIterator<T>& operator--();
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QValueListIterator =================================================
+
+
+// class QValueListConstIterator ===============================================
template<class T> class QValueListConstIterator {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QValueListConstIterator();
- QValueListConstIterator(const QValueListIterator<T>& it);
+ QValueListConstIterator(const QValueListIterator<T>&);
+
+ ~QValueListConstIterator();
+
+ // member functions --------------------------------------------------------
+
+ // operators ---------------------------------------------------------------
+
+ bool operator==(const QValueListConstIterator<T>&);
+ bool operator!=(const QValueListConstIterator<T>&);
+ T& operator*();
QValueListConstIterator operator++();
QValueListConstIterator operator++(int);
- bool operator!=(const QValueListConstIterator<T>& it);
- T& operator*();
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QValueListConstIterator ============================================
+
+
+// class QValueList ============================================================
template <class T> class QValueList {
public:
+
+ // typedefs ----------------------------------------------------------------
+
typedef QValueListIterator<T> Iterator;
typedef QValueListConstIterator<T> ConstIterator;
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QValueList();
+ QValueList(const QValueList<T>&);
+
+ ~QValueList();
+
+ // member functions --------------------------------------------------------
+
void clear();
uint count() const;
bool isEmpty() const;
+
void append(const T&);
void remove(const T&);
+
uint contains(const T&);
+
Iterator remove(Iterator);
Iterator fromLast();
+
const T& first() const;
const T& last() const;
+
Iterator begin();
Iterator end();
+
ConstIterator begin() const;
ConstIterator end() const;
+
+ // operators ---------------------------------------------------------------
+
+ QValueList<T>& operator=(const QValueList<T>&);
T& operator[] (uint);
const T& operator[] (uint) const;
QValueList<T> &operator+=(const T &);
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QValueList =========================================================
#endif
diff --git a/WebCore/kwq/KWQVariant.h b/WebCore/kwq/KWQVariant.h
index 9f39241..279fb8b 100644
--- a/WebCore/kwq/KWQVariant.h
+++ b/WebCore/kwq/KWQVariant.h
@@ -30,24 +30,45 @@ typedef unsigned int uint;
class QString;
-// this isn't used in this class, but it other classes expect the forward decl
-class QImage;
+// class QVariant ==============================================================
class QVariant {
public:
+
+ // typedefs ----------------------------------------------------------------
+
enum Type {
UInt,
Bool
};
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QVariant();
QVariant(bool, int);
QVariant(double);
- QVariant(const QString&);
+ QVariant(const QString &);
+ QVariant(const QVariant &);
+
+ ~QVariant();
+ // member functions --------------------------------------------------------
+
Type type() const;
bool toBool() const;
uint toUInt() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QVariant &operator=(const QVariant &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QVariant ===========================================================
#endif
diff --git a/WebCore/kwq/KWQWidget.h b/WebCore/kwq/KWQWidget.h
index 664d621..f0c2191 100644
--- a/WebCore/kwq/KWQWidget.h
+++ b/WebCore/kwq/KWQWidget.h
@@ -37,9 +37,15 @@
#include "qevent.h"
#include <KWQStyle.h>
+// class QWidget ===============================================================
+
class QWidget : public QObject, public QPaintDevice {
public:
+ // typedefs ----------------------------------------------------------------
+
+ // enums -------------------------------------------------------------------
+
enum FocusPolicy {
NoFocus = 0,
TabFocus = 0x1,
@@ -48,46 +54,75 @@ public:
WheelFocus = 0x7
};
- // FIXME: do any of these methods need to be virtual?
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ QWidget(QWidget *parent=0, const char *name=0, WFlags f=0);
+
+ virtual ~QWidget();
+
+ // member functions --------------------------------------------------------
+
+ virtual QSize sizeHint() const;
+ virtual void resize(int,int);
+ virtual void setActiveWindow();
+ virtual void setEnabled(bool);
+ virtual void setAutoMask(bool);
+ virtual void setMouseTracking(bool);
+
int winId() const;
int x() const;
int y() const;
int width() const;
int height() const;
QSize size() const;
- virtual QSize sizeHint() const;
- virtual void resize(int,int);
void resize(const QSize &);
QPoint pos() const;
- virtual void move(const QPoint &);
void move(int, int);
+ virtual void move(const QPoint &);
+
QWidget *topLevelWidget() const;
+
QPoint mapToGlobal(const QPoint &) const;
+
void setFocus();
void clearFocus();
FocusPolicy focusPolicy() const;
virtual void setFocusPolicy(FocusPolicy);
virtual void setFocusProxy( QWidget * );
- virtual void setActiveWindow();
- virtual void setEnabled(bool);
+
const QPalette& palette() const;
virtual void setPalette(const QPalette &);
void unsetPalette();
- virtual void setAutoMask(bool);
- virtual void setMouseTracking(bool);
+
QStyle &style() const;
void setStyle(QStyle *);
+
QFont font() const;
virtual void setFont(const QFont &);
+
void constPolish() const;
virtual QSize minimumSizeHint() const;
bool isVisible() const;
virtual void setCursor(const QCursor &);
bool event(QEvent *);
bool focusNextPrevChild(bool);
+ bool hasMouseTracking() const;
+
virtual void show();
virtual void hide();
- bool hasMouseTracking() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QWidget(const QWidget &);
+ QWidget &operator=(const QWidget &);
+
+}; // class QWidget ============================================================
#endif
diff --git a/WebCore/kwq/KWQXml.h b/WebCore/kwq/KWQXml.h
index e328792..5935eb0 100644
--- a/WebCore/kwq/KWQXml.h
+++ b/WebCore/kwq/KWQXml.h
@@ -28,52 +28,161 @@
class QString;
+// class QXmlAttributes ========================================================
+
class QXmlAttributes {
public:
- QString value(const QString& qName) const;
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QXmlAttributes();
+ QXmlAttributes(const QXmlAttributes &);
+
+ virtual ~QXmlAttributes();
+
+ // member functions --------------------------------------------------------
+
+ QString value(const QString &) const;
int length() const;
QString localName(int index) const;
QString value(int index) const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QXmlAttributes &operator=(const QXmlAttributes &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QXmlAttributes =====================================================
+
+
+// class QXmlInputSource ========================================================
class QXmlInputSource {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QXmlInputSource();
+
+ virtual ~QXmlInputSource();
+
+ // member functions --------------------------------------------------------
+
virtual void setData(const QString& data);
-};
-class QXmlDTDHandler {
-};
+ // operators ---------------------------------------------------------------
-class QXmlDeclHandler {
-};
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
-class QXmlErrorHandler {
-};
+private:
+ // no copying or assignment
+ QXmlInputSource(const QXmlInputSource &);
+ QXmlInputSource &operator=(const QXmlInputSource &);
-class QXmlLexicalHandler {
-};
+}; // class QXmlInputSource =====================================================
-class QXmlContentHandler {
-};
-class QXmlDefaultHandler : public QXmlContentHandler, public QXmlLexicalHandler, public QXmlErrorHandler, public QXmlDeclHandler, public QXmlDTDHandler {
+class QXmlDTDHandler {};
+
+class QXmlDeclHandler {};
+
+class QXmlErrorHandler {};
+
+class QXmlLexicalHandler {};
+
+class QXmlContentHandler {};
+
+class QXmlDefaultHandler :
+ public QXmlContentHandler,
+ public QXmlLexicalHandler,
+ public QXmlErrorHandler,
+ public QXmlDeclHandler,
+ public QXmlDTDHandler {
};
+
+// class QXmlSimpleReader ======================================================
+
class QXmlSimpleReader {
public:
- void setContentHandler(QXmlContentHandler* handler);
- bool parse(const QXmlInputSource& input);
- void setLexicalHandler(QXmlLexicalHandler* handler);
- void setDTDHandler(QXmlDTDHandler* handler);
- void setDeclHandler(QXmlDeclHandler* handler);
- void setErrorHandler(QXmlErrorHandler* handler);
-};
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ QXmlSimpleReader();
+
+ ~QXmlSimpleReader();
+
+ // member functions --------------------------------------------------------
+
+ void setContentHandler(QXmlContentHandler *handler);
+ bool parse(const QXmlInputSource &input);
+ void setLexicalHandler(QXmlLexicalHandler *handler);
+ void setDTDHandler(QXmlDTDHandler *handler);
+ void setDeclHandler(QXmlDeclHandler *handler);
+ void setErrorHandler(QXmlErrorHandler *handler);
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QXmlSimpleReader(const QXmlSimpleReader &);
+ QXmlSimpleReader &operator=(const QXmlSimpleReader &);
+
+}; // class QXmlSimpleReader ===================================================
+
+
+// class QXmlParseException ====================================================
class QXmlParseException {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QXmlParseException();
+
+ ~QXmlParseException();
+
+ // member functions --------------------------------------------------------
+
QString message() const;
int columnNumber() const;
int lineNumber() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QXmlParseException(const QXmlParseException &);
+ QXmlParseException &operator=(const QXmlParseException &);
+
+}; // class QXmlParseException =================================================
#endif
diff --git a/WebCore/kwq/qt/qapplication.h b/WebCore/kwq/qt/qapplication.h
index b4e8c40..1775340 100644
--- a/WebCore/kwq/qt/qapplication.h
+++ b/WebCore/kwq/qt/qapplication.h
@@ -26,19 +26,46 @@
#ifndef QAPPLICATION_H_
#define QAPPLICATION_H_
-#include "qpalette.h"
#include "qwidget.h"
+#include "qpalette.h"
#include "qsize.h"
+// class QApplication ==========================================================
+
class QApplication {
public:
- static QPalette palette(const QWidget* = 0);
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+
+ // static member functions -------------------------------------------------
+
+ static QPalette palette(const QWidget *p=0);
static QWidget *desktop();
static int startDragDistance();
static QSize globalStrut();
static void setOverrideCursor(const QCursor &);
static void restoreOverrideCursor();
- static bool sendEvent(QObject *receiver, QEvent *event);
-};
+ static bool sendEvent(QObject *, QEvent *);
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QApplication();
+ virtual ~QApplication();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QApplication(const QApplication &);
+ QApplication &operator=(const QApplication &);
+
+}; // class QApplication =======================================================
#endif
diff --git a/WebCore/kwq/qt/qarray.h b/WebCore/kwq/qt/qarray.h
index d39605d..eba6a2f 100644
--- a/WebCore/kwq/qt/qarray.h
+++ b/WebCore/kwq/qt/qarray.h
@@ -28,20 +28,45 @@
#include <KWQDef.h>
+// class QArray ================================================================
+
template <class T> class QArray {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QArray();
QArray(int);
+ QArray(const QArray<T> &);
+
+ QArray<T> &operator=(const QArray<T> &);
+
+ ~QArray();
+
+ // member functions --------------------------------------------------------
+
T &at(uint) const;
T *data() const;
-
uint size() const;
uint count() const;
bool resize(uint size);
QArray<T>& duplicate(const T*, int);
- bool fill(const T &d, int size = -1);
-
+ bool fill(const T &, int size=-1);
+
+ // operators ---------------------------------------------------------------
+
T &operator[](int) const;
-};
+ bool operator==(const QArray<T> &);
+ bool operator!=(const QArray<T> &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QArray =============================================================
#endif
diff --git a/WebCore/kwq/qt/qasyncimageio.h b/WebCore/kwq/qt/qasyncimageio.h
index 7dd40a5..253181e 100644
--- a/WebCore/kwq/qt/qasyncimageio.h
+++ b/WebCore/kwq/qt/qasyncimageio.h
@@ -28,9 +28,37 @@
#include <KWQDef.h>
+// =============================================================================
+// class QImageDecoder
+
class QImageDecoder {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+
+ // static member functions -------------------------------------------------
+
static const char* formatName(const uchar* buffer, int length);
-};
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ ~QImageDecoder();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QImageDecoder(const QImageDecoder &);
+ QImageDecoder &operator=(const QImageDecoder &);
+
+}; // end class QImageDecoder
+
+// =============================================================================
#endif
diff --git a/WebCore/kwq/qt/qasyncio.h b/WebCore/kwq/qt/qasyncio.h
index 6f1116b..242460e 100644
--- a/WebCore/kwq/qt/qasyncio.h
+++ b/WebCore/kwq/qt/qasyncio.h
@@ -28,20 +28,74 @@
#include <KWQDef.h>
-class QAsynchIO {
+// class QAsyncIO ==============================================================
+
+class QAsyncIO {
+
+// Note : all class members in protected scope
protected:
+
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ virtual ~QAsyncIO();
+
+ // member functions --------------------------------------------------------
+
void ready();
-};
-class QDataSource : public QAsynchIO {
+ // operators ---------------------------------------------------------------
+
+// private ---------------------------------------------------------------------
+
+}; // class QAsyncIO ===========================================================
+
+
+// class QDataSource ===========================================================
+
+class QDataSource : public QAsyncIO {
public:
+
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ // member functions --------------------------------------------------------
+
virtual void rewind();
void maybeReady();
-};
-class QDataSink : public QAsynchIO {
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // end class QDataSource ====================================================
+
+
+// class QDataSink =============================================================
+
+class QDataSink : public QAsyncIO {
public:
+
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ // member functions --------------------------------------------------------
+
virtual void receive(const uchar*, int count)=0;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QDataSink ==========================================================
#endif
diff --git a/WebCore/kwq/qt/qbitmap.h b/WebCore/kwq/qt/qbitmap.h
index ee89f3a..676f7fb 100644
--- a/WebCore/kwq/qt/qbitmap.h
+++ b/WebCore/kwq/qt/qbitmap.h
@@ -27,11 +27,32 @@
#define QBITMAP_H_
#include "qpixmap.h"
+#include "qimage.h"
+
+// class QBitmap ===============================================================
class QBitmap : public QPixmap {
public:
+
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QBitmap();
QBitmap(int,int);
-};
+
+ QBitmap &operator=(const QBitmap &);
+ QBitmap &operator=(const QPixmap &);
+ QBitmap &operator=(const QImage &);
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QBitmap ============================================================
#endif
diff --git a/WebCore/kwq/qt/qbrush.h b/WebCore/kwq/qt/qbrush.h
index 10b9de4..ccbdf24 100644
--- a/WebCore/kwq/qt/qbrush.h
+++ b/WebCore/kwq/qt/qbrush.h
@@ -29,11 +29,38 @@
#include "qcolor.h"
#include "qnamespace.h"
+// class QBrush ================================================================
+
class QBrush : public Qt {
friend class QPainter;
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QBrush();
QBrush(const QColor &);
-};
+ QBrush(const QBrush &);
+
+ QBrush &operator=(const QBrush &);
+
+ ~QBrush();
+
+ // member functions --------------------------------------------------------
+
+ // operators ---------------------------------------------------------------
+
+ bool operator==(const QBrush &) const;
+ bool operator!=(const QBrush &) const;
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+
+}; // class QBrush =============================================================
#endif
diff --git a/WebCore/kwq/qt/qbuffer.h b/WebCore/kwq/qt/qbuffer.h
index 8a4781e..45a8aa1 100644
--- a/WebCore/kwq/qt/qbuffer.h
+++ b/WebCore/kwq/qt/qbuffer.h
@@ -28,17 +28,44 @@
#include <KWQDef.h>
+#include "qarray.h"
#include "qstring.h"
+// class QBuffer ===============================================================
+
class QBuffer {
public:
- QByteArray buffer() const;
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QBuffer();
+
+ ~QBuffer();
+
+ // member functions --------------------------------------------------------
+
+ QByteArray buffer() const;
uint size() const;
bool isOpen();
bool open(int);
void close();
int writeBlock(const char *, uint);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QBuffer(const QBuffer &);
+ QBuffer &operator=(const QBuffer &);
+
+}; // class QBuffer ============================================================
#endif
diff --git a/WebCore/kwq/qt/qbutton.h b/WebCore/kwq/qt/qbutton.h
index 898bab3..d337499 100644
--- a/WebCore/kwq/qt/qbutton.h
+++ b/WebCore/kwq/qt/qbutton.h
@@ -27,16 +27,40 @@
#define QBUTTON_H_
#include "qwidget.h"
-
-class QString;
+#include "qstring.h"
+
+// class QButton ===============================================================
class QButton : public QWidget {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QButton();
QButton(QWidget *);
+ virtual ~QButton();
+
+ // member functions --------------------------------------------------------
+
virtual void setText(const QString &);
QString text() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QButton(const QButton &);
+ QButton &operator=(const QButton &);
+
+}; // class QButton ============================================================
#endif
diff --git a/WebCore/kwq/qt/qcheckbox.h b/WebCore/kwq/qt/qcheckbox.h
index e0f0327..ba756de 100644
--- a/WebCore/kwq/qt/qcheckbox.h
+++ b/WebCore/kwq/qt/qcheckbox.h
@@ -28,12 +28,35 @@
#include <KWQButton.h>
+// class QCheckBox =============================================================
+
class QCheckBox : public QButton {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QCheckBox();
- QCheckBox(QWidget *parent);
+ QCheckBox(QWidget *);
+
+ // member functions --------------------------------------------------------
void setChecked(bool);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+
+// private ---------------------------------------------------------------------
+
+private:
+ QCheckBox(const QCheckBox &);
+ QCheckBox &operator=(const QCheckBox &);
+
+}; // class QCheckBox ==========================================================
#endif
diff --git a/WebCore/kwq/qt/qcolor.h b/WebCore/kwq/qt/qcolor.h
index 7e675a9..82bd4a7 100644
--- a/WebCore/kwq/qt/qcolor.h
+++ b/WebCore/kwq/qt/qcolor.h
@@ -28,18 +28,33 @@
#include "qstring.h"
+// class QColor ================================================================
+
class QColor {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QColor();
QColor(int,int,int);
QColor(const char *);
+ QColor(const QColor &);
+
+ // member functions --------------------------------------------------------
QString name() const;
void setNamedColor(const QString&);
+
+ bool isValid() const;
+
int red() const;
int green() const;
int blue() const;
- bool isValid() const;
void setRgb(int,int,int);
void setRgb(int);
@@ -48,10 +63,15 @@ public:
QColor light(int f = 150) const;
QColor dark(int f = 200) const;
+ // operators ---------------------------------------------------------------
+
QColor &operator=(const QColor &);
bool operator==(const QColor &x) const;
bool operator!=(const QColor &x) const;
-};
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QColor =============================================================
#endif
diff --git a/WebCore/kwq/qt/qcombobox.h b/WebCore/kwq/qt/qcombobox.h
index 401358d..1e4f557 100644
--- a/WebCore/kwq/qt/qcombobox.h
+++ b/WebCore/kwq/qt/qcombobox.h
@@ -29,10 +29,24 @@
#include <KWQListBox.h>
#include "qwidget.h"
+// class QComboBox =============================================================
+
class QComboBox : public QWidget {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QComboBox(QWidget *parent=0, const char *name=0);
QComboBox(bool rw, QWidget *parent=0, const char *name=0);
+
+ ~QComboBox();
+
+ // member functions --------------------------------------------------------
int count() const;
QListBox *listBox() const;
@@ -41,6 +55,18 @@ public:
void insertItem(const QString &text, int index=-1);
void clear();
virtual void setCurrentItem(int);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QComboBox(const QComboBox &);
+ QComboBox &operator=(const QComboBox &);
+
+}; // class QComboBox ==========================================================
#endif
diff --git a/WebCore/kwq/qt/qcstring.h b/WebCore/kwq/qt/qcstring.h
index 5fd1d9c..d049e3e 100644
--- a/WebCore/kwq/qt/qcstring.h
+++ b/WebCore/kwq/qt/qcstring.h
@@ -36,31 +36,50 @@
typedef QArray<char> QByteArray;
-// added to help in compilation of khtml/dom/html_documnent.cpp:182
+// class QCString ==============================================================
+
class QCString : public QByteArray {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QCString();
QCString(int);
QCString(const char *);
QCString(const char *, uint);
QCString(const QCString&);
- QCString mid(uint index, uint len=0xffffffff) const;
-
- int find(const char *str, int index=0, bool cs=TRUE) const;
- int contains(char) const;
+ // member functions --------------------------------------------------------
+
bool isEmpty() const;
bool isNull() const;
+ int find(const char *str, int index=0, bool cs=TRUE) const;
+ int contains(char) const;
uint length() const;
bool truncate(uint);
QCString lower() const;
+ QCString mid(uint index, uint len=0xffffffff) const;
+
+ // operators ---------------------------------------------------------------
operator const char *() const;
QCString &operator=(const QCString&);
QCString &operator=(const char *);
QCString &operator+=(const char *);
QCString &operator+=(const QCString&);
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QCString ===========================================================
+
+
+// operators associated with QCString ==========================================
bool operator==(const char *, const QCString &);
bool operator==(const QCString &, const char *);
diff --git a/WebCore/kwq/qt/qcursor.h b/WebCore/kwq/qt/qcursor.h
index ebf8cb5..7bdec14 100644
--- a/WebCore/kwq/qt/qcursor.h
+++ b/WebCore/kwq/qt/qcursor.h
@@ -26,7 +26,33 @@
#ifndef QCURSOR_H
#define QCURSOR_H
+// class QCursor ===============================================================
+
class QCursor {
-};
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QCursor();
+
+ QCursor(const QCursor &);
+
+ ~QCursor();
+
+ // member functions --------------------------------------------------------
+
+ // operators ---------------------------------------------------------------
+
+ QCursor &operator=(const QCursor &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QCursor ============================================================
#endif
diff --git a/WebCore/kwq/qt/qdatetime.h b/WebCore/kwq/qt/qdatetime.h
index a20a495..e3de5b7 100644
--- a/WebCore/kwq/qt/qdatetime.h
+++ b/WebCore/kwq/qt/qdatetime.h
@@ -26,32 +26,96 @@
#ifndef QDATETIME_H_
#define QDATETIME_H_
+// class QTime =================================================================
+
class QTime {
public:
+
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QTime();
- QTime(int h, int m);
- QTime(const QTime &other);
+ QTime(int, int);
+ QTime(const QTime &);
+
+ // member functions --------------------------------------------------------
bool isNull() const;
void start();
int msec() const;
int elapsed() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QTime &operator=(const QTime &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QTime ==============================================================
+
+
+// class QDate =================================================================
class QDate {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QDate(int y, int m, int d);
-};
+
+ QDate(const QDate &);
+
+ // member functions --------------------------------------------------------
+
+ // operators ---------------------------------------------------------------
+
+ QDate &operator=(const QDate &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QDate ==============================================================
+
+
+// class QDateTime =============================================================
class QDateTime {
public:
+
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ static QDateTime currentDateTime();
+
+ // constructors, copy constructors, and destructors ------------------------
+
QDateTime();
QDateTime(QDate date, QTime time);
- static QDateTime currentDateTime();
+ QDateTime(const QDateTime &);
+
+ // member functions --------------------------------------------------------
int secsTo(const QDateTime &) const;
QTime time() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QDateTime &operator=(const QDateTime &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QDateTime ==========================================================
#endif
diff --git a/WebCore/kwq/qt/qdict.h b/WebCore/kwq/qt/qdict.h
index 82ad4b2..27c50f0 100644
--- a/WebCore/kwq/qt/qdict.h
+++ b/WebCore/kwq/qt/qdict.h
@@ -29,25 +29,75 @@
#include <KWQCollection.h>
#include "qstring.h"
+// class QDict =================================================================
+
template <class T> class QDict : public QCollection {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QDict(int size=17, bool caseSensitive=TRUE);
+
+ QDict(const QDict<T> &);
+
+ ~QDict();
+
+ // member functions --------------------------------------------------------
void insert(const QString &, const T *);
bool remove(const QString &);
T *find(const QString &) const;
uint count() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QDict<T> &operator=(const QDict<T> &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QDict ==============================================================
+
+
+// class QDictIterator =========================================================
template<class T> class QDictIterator {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QDictIterator(const QDict<T> &);
+
+ ~QDictIterator();
+
+ // member functions --------------------------------------------------------
uint count() const;
T *current() const;
T *toFirst();
+ // operators ---------------------------------------------------------------
+
T *operator++();
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QDictIterator(const QDictIterator &);
+ QDictIterator &operator=(const QDictIterator &);
+
+}; // class QDictIterator ======================================================
#endif
diff --git a/WebCore/kwq/qt/qdir.h b/WebCore/kwq/qt/qdir.h
index 4e0978d..e9dc236 100644
--- a/WebCore/kwq/qt/qdir.h
+++ b/WebCore/kwq/qt/qdir.h
@@ -30,16 +30,36 @@
#include "qstringlist.h"
#include "qfile.h"
+// class QDir ==================================================================
+
class QDir {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
QDir();
- QDir(const QString&);
+ QDir(const QString &);
+ QDir(const QDir &);
+
+ virtual ~QDir();
+
+ // member functions --------------------------------------------------------
virtual QString absPath() const;
virtual QString absFilePath( const QString &fileName) const;
virtual bool cdUp();
virtual bool exists(const QString&) const;
virtual QStringList entryList(const QString &nameFilter);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QDir ===============================================================
#endif
diff --git a/WebCore/kwq/qt/qevent.h b/WebCore/kwq/qt/qevent.h
index 5233a8b..92686f1 100644
--- a/WebCore/kwq/qt/qevent.h
+++ b/WebCore/kwq/qt/qevent.h
@@ -30,9 +30,16 @@
#include "qregion.h"
#include "qpoint.h"
+// class QEvent ================================================================
+
class QEvent : public Qt {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+
enum Type {
+ Timer,
MouseButtonPress,
MouseButtonRelease,
MouseButtonDblClick,
@@ -42,13 +49,48 @@ public:
AccelAvailable,
KeyPress,
};
+
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ QEvent(Type);
+
+ virtual ~QEvent();
+
+ // member functions --------------------------------------------------------
+
Type type() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QEvent(const QEvent &);
+ QEvent &operator=(const QEvent &);
+
+}; // class QEvent =============================================================
+
+
+// class QMouseEvent ===========================================================
class QMouseEvent : public QEvent {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QMouseEvent(Type type, const QPoint &pos, int button, int state);
+ // member functions --------------------------------------------------------
+
int x();
int y();
int globalX();
@@ -56,27 +98,221 @@ public:
const QPoint &pos() const;
ButtonState button();
ButtonState state();
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QMouseEvent(const QMouseEvent &);
+ QMouseEvent &operator=(const QMouseEvent &);
+
+}; // class QMouseEvent ========================================================
+
+
+// class QTimerEvent ===========================================================
class QTimerEvent : public QEvent {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QTimerEvent(int timerId);
+
+ // member functions --------------------------------------------------------
+
int timerId() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QTimerEvent(const QTimerEvent &);
+ QTimerEvent &operator=(const QTimerEvent &);
+
+}; // class QTimerEvent ========================================================
+
+
+// class QKeyEvent =============================================================
class QKeyEvent : public QEvent {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
QKeyEvent();
QKeyEvent(Type, Key, int, int);
+
+ // member functions --------------------------------------------------------
+
int key() const;
ButtonState state() const;
void accept();
-};
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QKeyEvent(const QKeyEvent &);
+ QKeyEvent &operator=(const QKeyEvent &);
+
+}; // class QKeyEvent ==========================================================
+
+
+// class QFocusEvent ===========================================================
+
+class QFocusEvent : public QEvent {
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QFocusEvent();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QFocusEvent(const QFocusEvent &);
+ QFocusEvent &operator=(const QFocusEvent &);
+
+}; // class QFocusEvent ========================================================
+
+
+// class QHideEvent ============================================================
+
+class QHideEvent : public QEvent {
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QHideEvent();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QHideEvent(const QHideEvent &);
+ QHideEvent &operator=(const QHideEvent &);
+
+}; // class QHideEvent =========================================================
+
+
+// class QResizeEvent ==========================================================
+
+class QResizeEvent : public QEvent {
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QResizeEvent();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QResizeEvent(const QResizeEvent &);
+ QResizeEvent &operator=(const QResizeEvent &);
+
+}; // class QResizeEvent =======================================================
+
+
+// class QShowEvent ============================================================
+
+class QShowEvent : public QEvent {
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QShowEvent();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QShowEvent(const QShowEvent &);
+ QShowEvent &operator=(const QShowEvent &);
+
+}; // class QShowEvent =========================================================
+
+
+// class QWheelEvent ===========================================================
+
+class QWheelEvent : public QEvent {
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QWheelEvent();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QWheelEvent(const QWheelEvent &);
+ QWheelEvent &operator=(const QWheelEvent &);
-class QFocusEvent : public QEvent {};
-class QHideEvent : public QEvent {};
-class QResizeEvent : public QEvent {};
-class QShowEvent : public QEvent {};
-class QWheelEvent : public QEvent {};
+}; // class QWheelEvent ========================================================
#endif
diff --git a/WebCore/kwq/qt/qfile.h b/WebCore/kwq/qt/qfile.h
index a3f66d7..08a520f 100644
--- a/WebCore/kwq/qt/qfile.h
+++ b/WebCore/kwq/qt/qfile.h
@@ -28,17 +28,42 @@
#include "qstring.h"
+// class QFile =================================================================
+
class QFile {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QFile();
QFile(const QString &);
+ ~QFile();
+
+ // member functions --------------------------------------------------------
+
bool exists() const;
static bool exists(const QString &);
bool open(int);
void close();
uint size() const;
int readBlock(char *, uint);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QFile(const QFile &);
+ QFile &operator=(const QFile &);
+
+}; // class QFile ==============================================================
#endif
diff --git a/WebCore/kwq/qt/qfont.h b/WebCore/kwq/qt/qfont.h
index 87444d8..688a260 100644
--- a/WebCore/kwq/qt/qfont.h
+++ b/WebCore/kwq/qt/qfont.h
@@ -28,12 +28,31 @@
class QString;
+// class QFont =================================================================
+
class QFont {
+friend class QPainter;
public:
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+
enum CharSet { Latin1, Unicode };
enum Weight { Normal = 50, Bold = 63 };
-
+
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QFont();
+
+ QFont(const QFont &);
+
+ ~QFont();
+
+ // member functions --------------------------------------------------------
+
int pixelSize() const;
QString family() const;
void setFamily(const QString &);
@@ -43,11 +62,16 @@ public:
bool setItalic(bool);
bool italic() const;
bool bold() const;
+
+ // operators ---------------------------------------------------------------
+
+ QFont &operator=(const QFont &);
bool operator==(const QFont &x) const;
bool operator!=(const QFont &x) const;
-private:
- friend class QPainter;
-};
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QFont ==============================================================
#endif
diff --git a/WebCore/kwq/qt/qfontdatabase.h b/WebCore/kwq/qt/qfontdatabase.h
index 51f6f35..4c32ad9 100644
--- a/WebCore/kwq/qt/qfontdatabase.h
+++ b/WebCore/kwq/qt/qfontdatabase.h
@@ -30,12 +30,41 @@
#include "qfont.h"
#include "qstring.h"
+// class QFontDatabase =========================================================
+
class QFontDatabase {
public:
- QFont font(const QString familyName, const QString &style, int pointSize, const QString charSetName = QString::null);
- bool isSmoothlyScalable(const QString &family, const QString &style = QString::null, const QString &charSet = QString::null) const;
- QValueList<int> smoothSizes(const QString &family, const QString &style, const QString &charSet = QString::null);
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QFontDatabase();
+
+ // member functions --------------------------------------------------------
+
+ QFont font(const QString, const QString &, int,
+ const QString charSetName = QString::null);
+ bool isSmoothlyScalable(const QString &family,
+ const QString &style=QString::null,
+ const QString &charSet=QString::null) const;
+ QValueList<int> smoothSizes(const QString &, const QString &,
+ const QString &charSet = QString::null);
QString styleString(const QFont &);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QFontDatabase(const QFontDatabase &);
+ QFontDatabase &operator=(const QFontDatabase &);
+
+}; // class QFontDatabase ======================================================
#endif
diff --git a/WebCore/kwq/qt/qfontinfo.h b/WebCore/kwq/qt/qfontinfo.h
index 26f87ca..bd24c56 100644
--- a/WebCore/kwq/qt/qfontinfo.h
+++ b/WebCore/kwq/qt/qfontinfo.h
@@ -28,12 +28,34 @@
#include "qfont.h"
+// class QFontInfo =============================================================
+
class QFontInfo {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QFontInfo(const QFont &);
- QFontInfo( const QFontInfo & );
+ QFontInfo(const QFontInfo &);
+
+ ~QFontInfo();
+
+ // member functions --------------------------------------------------------
bool fixedPitch() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QFontInfo &operator=(const QFontInfo &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QFontInfo ==========================================================
#endif
diff --git a/WebCore/kwq/qt/qfontmetrics.h b/WebCore/kwq/qt/qfontmetrics.h
index 976043c..f652f09 100644
--- a/WebCore/kwq/qt/qfontmetrics.h
+++ b/WebCore/kwq/qt/qfontmetrics.h
@@ -26,28 +26,51 @@
#ifndef QFONTMETRICS_H_
#define QFONTMETRICS_H_
-class QRect;
-class QChar;
-class QFont;
-class QSize;
-class QString;
+#include "qrect.h"
+#include "qsize.h"
+#include "qstring.h"
+#include "qfont.h"
+
+// class QFontMetrics ==========================================================
class QFontMetrics {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QFontMetrics();
- QFontMetrics(const QFont&);
+ QFontMetrics(const QFont &);
+ QFontMetrics(const QFontMetrics &);
+
+ ~QFontMetrics();
+
+ // member functions --------------------------------------------------------
int ascent() const;
int height() const;
int width(QChar) const;
int width(char) const;
- int width(const QString &, int len = -1) const;
+ int width(const QString &, int len=-1) const;
int descent() const;
- QRect boundingRect( const QString &, int len = -1 ) const;
+ QRect boundingRect(const QString &, int len=-1) const;
QRect boundingRect(QChar) const;
- QSize size(int flags, const QString& str, int len=-1, int tabstops=0, int *tabarray=0, char **intern=0 ) const;
+ QSize size(int, const QString &, int len=-1, int tabstops=0,
+ int *tabarray=0, char **intern=0 ) const;
int rightBearing(QChar) const;
int leftBearing(QChar) const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QFontMetrics &operator=(const QFontMetrics &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QFontMetrics =======================================================
#endif
diff --git a/WebCore/kwq/qt/qguardedptr.h b/WebCore/kwq/qt/qguardedptr.h
index 4a5938d..ad31dde 100644
--- a/WebCore/kwq/qt/qguardedptr.h
+++ b/WebCore/kwq/qt/qguardedptr.h
@@ -28,16 +28,36 @@
#include "qobject.h"
-template <class T> class QGuardedPtr {
+// class QGuardedPtr ===========================================================
+
+template <class T> class QGuardedPtr : public QObject {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QGuardedPtr();
- QGuardedPtr(T* o);
- QGuardedPtr(const QGuardedPtr<T> &p);
+ QGuardedPtr(T *o);
+ QGuardedPtr(const QGuardedPtr<T> &);
+
+ ~QGuardedPtr();
+
+ // member functions --------------------------------------------------------
bool isNull() const;
-
- operator T*() const;
- T* operator->() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ operator T *() const;
+ T *operator->() const;
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QGuardedPtr ========================================================
#endif
diff --git a/WebCore/kwq/qt/qhbox.h b/WebCore/kwq/qt/qhbox.h
index cfdd7d7..f21d07f 100644
--- a/WebCore/kwq/qt/qhbox.h
+++ b/WebCore/kwq/qt/qhbox.h
@@ -29,12 +29,35 @@
#include "qwidget.h"
#include <KWQFrame.h>
+// class QHBox =================================================================
+
class QHBox : public QFrame {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QHBox();
QHBox(QWidget *);
+ // member functions --------------------------------------------------------
+
bool setStretchFactor(QWidget*, int stretch);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QHBox(const QHBox &);
+ QHBox &operator=(const QHBox &);
+
+}; // class QHBox ==============================================================
#endif
diff --git a/WebCore/kwq/qt/qimage.h b/WebCore/kwq/qt/qimage.h
index d824748..5361bc8 100644
--- a/WebCore/kwq/qt/qimage.h
+++ b/WebCore/kwq/qt/qimage.h
@@ -26,14 +26,37 @@
#ifndef QIMAGE_H_
#define QIMAGE_H_
+// class QImage ================================================================
+
class QImage {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QImage();
+ QImage(const QImage &);
+
+ // member functions --------------------------------------------------------
+
int width() const;
int height() const;
int depth() const;
int pixelIndex(int,int) const;
QImage createAlphaMask(int conversion_flags=0) const;
bool hasAlphaBuffer() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QImage &operator=(const QImage &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QImage =============================================================
#endif
diff --git a/WebCore/kwq/qt/qinputdialog.h b/WebCore/kwq/qt/qinputdialog.h
index d7c5140..e7fc142 100644
--- a/WebCore/kwq/qt/qinputdialog.h
+++ b/WebCore/kwq/qt/qinputdialog.h
@@ -27,12 +27,35 @@
#define QINPUTDIALOG_H_
#include "qstring.h"
-class QWidget;
+#include "qwidget.h"
+
+// class QInputDialog ==========================================================
class QInputDialog {
public:
- static QString getText( const QString &caption, const QString &label, const QString &text = QString::null,
- bool *ok = 0, QWidget *parent = 0, const char *name = 0 );
-};
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+
+ // static member functions -------------------------------------------------
+
+ static QString getText(const QString &, const QString &,
+ const QString &text=QString::null, bool *ok=0, QWidget *parent=0,
+ const char *name=0);
+
+ // constructors, copy constructors, and destructors ------------------------
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QInputDialog(const QInputDialog &);
+ QInputDialog &operator=(const QInputDialog &);
+
+}; // class QInputDialog =======================================================
#endif
diff --git a/WebCore/kwq/qt/qlabel.h b/WebCore/kwq/qt/qlabel.h
index 5eb95b4..4679fbb 100644
--- a/WebCore/kwq/qt/qlabel.h
+++ b/WebCore/kwq/qt/qlabel.h
@@ -30,13 +30,38 @@
#include "qwidget.h"
#include "qstring.h"
+// class QLabel ================================================================
+
class QLabel : public QFrame {
public:
- QLabel(QWidget *parent);
- QLabel(const QString &, QWidget *);
- virtual void setText(const QString &);
- virtual void setAlignment(int);
-};
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QLabel(QWidget *parent);
+ QLabel(const QString &, QWidget *);
+
+ virtual ~QLabel();
+
+ // member functions --------------------------------------------------------
+
+ virtual void setText(const QString &);
+ virtual void setAlignment(int);
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QLabel(const QLabel &);
+ QLabel &operator=(const QLabel &);
+
+}; // class QLabel =============================================================
#endif
diff --git a/WebCore/kwq/qt/qlineedit.h b/WebCore/kwq/qt/qlineedit.h
index 0535ccf..a95ddd1 100644
--- a/WebCore/kwq/qt/qlineedit.h
+++ b/WebCore/kwq/qt/qlineedit.h
@@ -30,23 +30,50 @@
#include "qevent.h"
#include "qstring.h"
+// class QLineEdit =============================================================
+
class QLineEdit : public QWidget {
public:
+
+ // typedefs ----------------------------------------------------------------
+
+ // enums -------------------------------------------------------------------
+
enum EchoMode { Normal, NoEcho, Password };
+
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ QLineEdit(QWidget *parent=0, const char *name=0);
+
+ virtual ~QLineEdit();
- QLineEdit(QWidget *parent=0, const char *name=0 );
+ // member functions --------------------------------------------------------
virtual void setEchoMode(EchoMode);
+ virtual void setCursorPosition(int);
+ virtual void setText(const QString &);
+ virtual void setMaxLength(int);
+
bool isReadOnly() const;
+ void setReadOnly(bool);
bool event(QEvent *);
bool frame() const;
- virtual void setCursorPosition(int);
int cursorPosition() const;
- virtual void setText(const QString &);
int maxLength() const;
- virtual void setMaxLength(int);
- void setReadOnly(bool);
void selectAll();
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QLineEdit(const QLineEdit &);
+ QLineEdit &operator=(const QLineEdit &);
+
+}; // class QLineEdit ==========================================================
#endif
diff --git a/WebCore/kwq/qt/qlist.h b/WebCore/kwq/qt/qlist.h
index 00c0be9..ab2fe7e 100644
--- a/WebCore/kwq/qt/qlist.h
+++ b/WebCore/kwq/qt/qlist.h
@@ -29,44 +29,96 @@
#include <KWQDef.h>
#include <KWQCollection.h>
+// class QList =================================================================
+
template <class T> class QList : public QCollection {
public:
- // FIXME: should any of these functions be moved into a base collection
- // class implementation?
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ QList();
+ QList(const QList<T> &);
+
+ // member functions --------------------------------------------------------
+
+ bool isEmpty() const;
uint count() const;
+ void clear();
+ void sort();
+
T *at(uint);
- void append(const T *);
+
void setAutoDelete(bool);
+
bool insert(uint i, const T *);
bool remove();
bool remove(const T *);
bool removeFirst();
bool removeLast();
+ bool removeRef(const T *);
+
T *getLast() const;
T *current() const;
- T *prev() const;
- void prepend(const T *);
- T *take(uint i);
T *first();
- T *next();
T *last();
- void clear();
- bool isEmpty() const;
- bool removeRef(const T *);
+ T *next();
+ T *prev();
+ T *take(uint i);
+
+ void append(const T *);
+ void prepend(const T *);
+
uint containsRef(const T *) const;
- void sort();
-};
+
+ // operators ---------------------------------------------------------------
+
+ QList<T> &operator=(const QList<T> &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QList ==============================================================
+
+
+// class QListIterator =========================================================
template <class T> class QListIterator {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QListIterator(const QList<T> &);
+
+ // member functions --------------------------------------------------------
+
uint count() const;
T *toFirst();
T *toLast();
T *current() const;
+
+ // operators ---------------------------------------------------------------
+
operator T *() const;
T *operator--();
T *operator++();
-};
+ QListIterator<T> &operator=(const QListIterator<T> &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying
+ QListIterator<T>(const QListIterator<T> &);
+
+}; // class QListIterator ======================================================
#endif
diff --git a/WebCore/kwq/qt/qmap.h b/WebCore/kwq/qt/qmap.h
index 600ff07..c005b2a 100644
--- a/WebCore/kwq/qt/qmap.h
+++ b/WebCore/kwq/qt/qmap.h
@@ -28,47 +28,120 @@
#include <KWQDef.h>
+// class QMapIterator ==========================================================
+
template<class K, class T> class QMapIterator {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QMapIterator();
QMapIterator(const QMapIterator<K,T>& it);
+ // member functions --------------------------------------------------------
+
const K& key() const;
const T& data() const;
+ // operators ---------------------------------------------------------------
+
+ QMapIterator<K,T> &operator=(const QMapIterator<K,T> &);
+ bool operator==(const QMapIterator<K,T>&) const;
bool operator!=(const QMapIterator<K,T>&) const;
T& operator*();
const T& operator*() const;
QMapIterator<K,T>& operator++();
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QMapIterator =======================================================
+
+
+// class QMapConstIterator =====================================================
template<class K, class T> class QMapConstIterator {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QMapConstIterator();
+ QMapConstIterator(const QMapConstIterator<K,T>&);
QMapConstIterator(const QMapIterator<K,T>&);
+
+ // member functions --------------------------------------------------------
+
const K& key() const;
const T& data() const;
+ // operators ---------------------------------------------------------------
+
+ QMapConstIterator<K,T> &operator=(const QMapConstIterator<K,T> &);
+ bool operator==(const QMapConstIterator<K,T>&) const;
bool operator!=(const QMapConstIterator<K,T>&) const;
const T &operator*() const;
QMapConstIterator<K,T>& operator++();
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QMapConstIterator ==================================================
+
+
+// class QMap ==================================================================
template <class K, class T> class QMap {
public:
+
+ // typedefs ----------------------------------------------------------------
+
typedef QMapIterator<K, T> Iterator;
typedef QMapConstIterator< K, T> ConstIterator;
+
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ QMap();
+ QMap(const QMap<K,T>&);
+
+ ~QMap();
+
+ // member functions --------------------------------------------------------
+
+ void clear();
+ uint count() const;
+
Iterator begin();
Iterator end();
+
ConstIterator begin() const;
ConstIterator end() const;
+
Iterator insert(const K&, const T&);
- ConstIterator find (const K &) const;
void remove(const K&);
- void clear();
- uint count() const;
-
+
+ ConstIterator find (const K &) const;
+
+ // operators ---------------------------------------------------------------
+
+ QMap<K,T>& operator=(const QMap<K,T>&);
T& operator[](const K& k);
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QMap ===============================================================
#endif
diff --git a/WebCore/kwq/qt/qmovie.h b/WebCore/kwq/qt/qmovie.h
index d62934e..7843d88 100644
--- a/WebCore/kwq/qt/qmovie.h
+++ b/WebCore/kwq/qt/qmovie.h
@@ -32,13 +32,30 @@
#include "qimage.h"
#include "qrect.h"
+// class QMovie ================================================================
+
class QMovie {
public:
+
+ // typedefs ----------------------------------------------------------------
+
+ // enums -------------------------------------------------------------------
+
enum Status { EndOfFrame, EndOfMovie };
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QMovie();
QMovie(QDataSource*, int bufsize=1024);
+ QMovie(const QMovie &);
+ ~QMovie();
+
+ // member functions --------------------------------------------------------
+
void unpause();
void pause();
void restart();
@@ -57,6 +74,14 @@ public:
void disconnectResize(QObject* receiver, const char *member=0);
void disconnectUpdate(QObject* receiver, const char *member=0);
void disconnectStatus(QObject* receiver, const char *member=0);
-};
+
+ // operators ---------------------------------------------------------------
+
+ QMovie &operator=(const QMovie &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QMovie =============================================================
#endif
diff --git a/WebCore/kwq/qt/qnamespace.h b/WebCore/kwq/qt/qnamespace.h
index 5309336..60202fe 100644
--- a/WebCore/kwq/qt/qnamespace.h
+++ b/WebCore/kwq/qt/qnamespace.h
@@ -29,9 +29,16 @@
class QColor;
class QCursor;
+// class Qt ====================================================================
+
class Qt {
public:
- enum ButtonState {
+
+ // typedefs ----------------------------------------------------------------
+
+ // enums -------------------------------------------------------------------
+
+ enum ButtonState {
LeftButton,
MidButton,
RightButton,
@@ -67,10 +74,12 @@ public:
};
enum Key {
- Key_Escape = 0x1000, // misc keys
+ Key_Escape = 0x1000,
Key_Tab = 0x1001,
- Key_Backtab = 0x1002, Key_BackTab = Key_Backtab,
- Key_Backspace = 0x1003, Key_BackSpace = Key_Backspace,
+ Key_Backtab = 0x1002,
+ Key_BackTab = Key_Backtab,
+ Key_Backspace = 0x1003,
+ Key_BackSpace = Key_Backspace,
Key_Return = 0x1004,
Key_Enter = 0x1005,
Key_Insert = 0x1006,
@@ -78,7 +87,7 @@ public:
Key_Pause = 0x1008,
Key_Print = 0x1009,
Key_SysReq = 0x100a,
- Key_Home = 0x1010, // cursor movement
+ Key_Home = 0x1010,
Key_End = 0x1011,
Key_Left = 0x1012,
Key_Up = 0x1013,
@@ -92,6 +101,8 @@ public:
XorROP,
};
+ // constants ---------------------------------------------------------------
+
static const QColor &black;
static const QColor &white;
static const QColor &darkGray;
@@ -99,6 +110,24 @@ public:
static const QCursor &sizeAllCursor;
static const QCursor &splitHCursor;
static const QCursor &splitVCursor;
-};
+
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ Qt();
+ ~Qt();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ Qt(const Qt &);
+ Qt &operator=(const Qt &);
+
+}; // class Qt =================================================================
#endif
diff --git a/WebCore/kwq/qt/qobject.h b/WebCore/kwq/qt/qobject.h
index 2c59c3d..09bfb8a 100644
--- a/WebCore/kwq/qt/qobject.h
+++ b/WebCore/kwq/qt/qobject.h
@@ -63,23 +63,54 @@ class QTimer;
class QImage;
class QVariant;
+// class QObject ===============================================================
class QObject : public Qt {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ static bool connect(const QObject *, const char *, const QObject *,
+ const char *);
+
+ static bool disconnect( const QObject *, const char *, const QObject *,
+ const char *);
+
+ // constructors, copy constructors, and destructors ------------------------
+
QObject(QObject *parent=0, const char *name=0);
+
+ // member functions --------------------------------------------------------
+
const char *name() const;
virtual void setName(const char *);
+
QVariant property(const char *name) const;
bool inherits(const char *) const;
- static bool connect(const QObject *, const char *, const QObject *, const char *);
bool connect(const QObject *, const char *, const char *) const;
- static bool disconnect( const QObject *, const char *, const QObject *, const char *);
+
int startTimer(int);
void killTimer(int);
void killTimers();
+
void installEventFilter(const QObject *);
void removeEventFilter(const QObject *);
+
void blockSignals(bool);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QObject(const QObject &);
+ QObject &operator=(const QObject &);
+
+}; // class QObject ============================================================
#endif
diff --git a/WebCore/kwq/qt/qpaintdevice.h b/WebCore/kwq/qt/qpaintdevice.h
index b988007..327cb1d 100644
--- a/WebCore/kwq/qt/qpaintdevice.h
+++ b/WebCore/kwq/qt/qpaintdevice.h
@@ -26,10 +26,28 @@
#ifndef QPAINTDEVICE_H_
#define QPAINTDEVICE_H_
-#include "qrect.h"
+// class QPaintDevice ==========================================================
class QPaintDevice {
- friend class QPaintDeviceMetrics;
-};
+friend class QPaintDeviceMetrics;
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QPaintDevice(const QPaintDevice &);
+ QPaintDevice &operator=(const QPaintDevice &);
+
+}; // class QPaintDevice =======================================================
#endif
diff --git a/WebCore/kwq/qt/qpaintdevicemetrics.h b/WebCore/kwq/qt/qpaintdevicemetrics.h
index d61dbd9..f9161d5 100644
--- a/WebCore/kwq/qt/qpaintdevicemetrics.h
+++ b/WebCore/kwq/qt/qpaintdevicemetrics.h
@@ -28,11 +28,35 @@
class QPaintDevice;
+// class QPaintDeviceMetrics ===================================================
+
class QPaintDeviceMetrics {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QPaintDeviceMetrics(const QPaintDevice *);
+
+ // member functions --------------------------------------------------------
+
int logicalDpiY() const;
int depth() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QPaintDeviceMetrics(const QPaintDeviceMetrics &);
+ QPaintDeviceMetrics &operator=(const QPaintDeviceMetrics &);
+
+}; // class QPaintDeviceMetrics ================================================
#endif
diff --git a/WebCore/kwq/qt/qpainter.h b/WebCore/kwq/qt/qpainter.h
index ebab5a6..13afc1a 100644
--- a/WebCore/kwq/qt/qpainter.h
+++ b/WebCore/kwq/qt/qpainter.h
@@ -39,16 +39,53 @@
class QFont;
class QPixmap;
+// class QWMatrix ==============================================================
+
class QWMatrix {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QWMatrix();
+
+ ~QWMatrix();
+
+ // member functions --------------------------------------------------------
+
QWMatrix &scale(double, double);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QWMatrix ===========================================================
+
+
+// class QPainter ==============================================================
class QPainter : public Qt {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QPainter();
QPainter(const QPaintDevice *);
+ ~QPainter();
+
+ // member functions --------------------------------------------------------
+
const QFont &font() const;
void setFont(const QFont &);
QFontMetrics fontMetrics() const;
@@ -64,19 +101,21 @@ public:
void restore();
void drawRect(int, int, int, int);
- void fillRect(int, int, int, int, const QBrush &);
void drawLine(int, int, int, int);
void drawEllipse(int, int, int, int);
void drawArc(int, int, int, int, int, int);
- void drawPolyline(const QPointArray &, int index = 0, int npoints = -1);
- void drawPolygon(const QPointArray &, bool winding = FALSE, int index = 0,
- int npoints = -1);
+ void drawPolyline(const QPointArray &, int index=0, int npoints=-1);
+ void drawPolygon(const QPointArray &, bool winding=FALSE, int index=0,
+ int npoints=-1);
void drawPixmap(const QPoint &, const QPixmap &);
void drawPixmap(const QPoint &, const QPixmap &, const QRect &);
- void drawTiledPixmap(int, int, int, int, const QPixmap &, int sx = 0, int sy = 0);
- void drawText(int x, int y, const QString &, int len = -1);
+ void drawTiledPixmap(int, int, int, int, const QPixmap &, int sx=0,
+ int sy=0);
+ void drawText(int x, int y, const QString &, int len=-1);
void drawText(int, int, int, int, AlignmentFlags, const QString &);
- void drawText(int, int, int, int, int flags, const QString&, int len = -1, QRect *br=0, char **internal=0);
+ void drawText(int, int, int, int, int flags, const QString&, int len=-1,
+ QRect *br=0, char **internal=0);
+ void fillRect(int, int, int, int, const QBrush &);
void setClipping(bool);
void setClipRegion(const QRegion &);
@@ -84,6 +123,21 @@ public:
bool hasClipping() const;
RasterOp rasterOp() const;
void setRasterOp(RasterOp);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QPainter(const QPainter &);
+ QPainter &operator=(const QPainter &);
+
+
+}; // end class QPainter
+
+// =============================================================================
#endif
diff --git a/WebCore/kwq/qt/qpalette.h b/WebCore/kwq/qt/qpalette.h
index 201d3b9..bf95e0a 100644
--- a/WebCore/kwq/qt/qpalette.h
+++ b/WebCore/kwq/qt/qpalette.h
@@ -28,12 +28,42 @@
class QColor;
+// class QColorGroup ===========================================================
+
class QColorGroup {
public:
- enum ColorRole { Foreground, Shadow, Light, Mid, Midlight, Dark, Base, ButtonText, Button, Background, Text };
+
+ // typedefs ----------------------------------------------------------------
+
+ enum ColorRole {
+ Foreground,
+ Shadow,
+ Light,
+ Mid,
+ Midlight,
+ Dark,
+ Base,
+ ButtonText,
+ Button,
+ Background,
+ Text
+ };
+
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ QColorGroup();
+ QColorGroup(const QColorGroup &);
+
+ ~QColorGroup();
+
+ // member functions --------------------------------------------------------
const QColor &color(ColorRole) const;
void setColor(ColorRole, const QColor &);
+
const QColor &foreground() const;
const QColor &shadow() const;
const QColor &light() const;
@@ -44,18 +74,52 @@ public:
const QColor &button() const;
const QColor &text() const;
const QColor &background() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QColorGroup &operator=(const QColorGroup &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QColorGroup ========================================================
+
+
+// class QPalette ==============================================================
class QPalette {
public:
+
+ // typedefs ----------------------------------------------------------------
+
+ // enums -------------------------------------------------------------------
+
enum ColorGroup { Active, Inactive, Disabled };
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QPalette();
+ QPalette(const QPalette &);
+
+ ~QPalette();
+
+ // member functions --------------------------------------------------------
+
void setColor(ColorGroup, QColorGroup::ColorRole role, const QColor &color);
const QColorGroup &active() const;
const QColorGroup &inactive() const;
const QColorGroup &disabled() const;
const QColorGroup &normal() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QPalette ===========================================================
#endif
diff --git a/WebCore/kwq/qt/qpen.h b/WebCore/kwq/qt/qpen.h
index 822e8a4..fe659bd 100644
--- a/WebCore/kwq/qt/qpen.h
+++ b/WebCore/kwq/qt/qpen.h
@@ -29,12 +29,35 @@
#include "qnamespace.h"
#include "qcolor.h"
+// class QPen ==================================================================
+
class QPen : public Qt {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QPen();
QPen(const QColor &color, uint width=0, PenStyle style=SolidLine);
+ QPen(const QPen &);
+
+ ~QPen();
+
+ // member functions --------------------------------------------------------
const QColor &color() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QPen &operator=(const QPen &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QPen ===============================================================
#endif
diff --git a/WebCore/kwq/qt/qpixmap.h b/WebCore/kwq/qt/qpixmap.h
index 56db9a3..0edfdac 100644
--- a/WebCore/kwq/qt/qpixmap.h
+++ b/WebCore/kwq/qt/qpixmap.h
@@ -31,28 +31,55 @@
#include "qstring.h"
#include "qnamespace.h"
#include "qimage.h"
+#include "qsize.h"
+#include "qrect.h"
class QBitmap;
class QWMatrix;
-class QPixmap : public QPaintDevice {
+// class QPixmap ===============================================================
+
+class QPixmap : public QPaintDevice, public Qt {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QPixmap();
QPixmap(const QSize&);
QPixmap(const QByteArray&);
QPixmap(int,int);
+ QPixmap(const QPixmap &);
+
+ ~QPixmap();
+
+ // member functions --------------------------------------------------------
void setMask(const QBitmap &);
const QBitmap *mask() const;
+ bool isNull() const;
+
QSize size() const;
QRect rect() const;
int width() const;
int height() const;
- bool isNull() const;
void resize(const QSize &);
+
QPixmap xForm(const QWMatrix &) const;
QImage convertToImage() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QPixmap &operator=(const QPixmap &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QPixmap ============================================================
#endif
diff --git a/WebCore/kwq/qt/qpoint.h b/WebCore/kwq/qt/qpoint.h
index 7d19a03..87c9373 100644
--- a/WebCore/kwq/qt/qpoint.h
+++ b/WebCore/kwq/qt/qpoint.h
@@ -28,28 +28,75 @@
#include <KWQDef.h>
+// class QPoint ================================================================
+
class QPoint {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QPoint();
QPoint(int, int);
QPoint(const QPoint &);
-
+
+ ~QPoint();
+
+ // member functions --------------------------------------------------------
+
int x() const;
int y() const;
int manhattanLength() const;
+ // operators ---------------------------------------------------------------
+
+ QPoint &operator=(const QPoint &);
+
friend QPoint operator+(const QPoint &, const QPoint &);
friend QPoint operator-(const QPoint &, const QPoint &);
-};
-// FIXME: QPointArray here to workaround bug in khtml/html/html_imageimpl.cpp
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QPoint =============================================================
+
+
+// class QPointArray ===========================================================
+
class QPointArray {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
QPointArray(int);
QPointArray(int, const QCOORD *);
+
+ ~QPointArray();
+
+ // member functions --------------------------------------------------------
+
void setPoint(uint, int, int);
- bool setPoints(int, int, int, ... );
-};
+ bool setPoints(int, int, int, ...);
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QPointArray(const QPointArray &);
+ QPointArray &operator=(const QPointArray &);
+
+}; // class QPointArray ========================================================
-#endif
+#endif
\ No newline at end of file
diff --git a/WebCore/kwq/qt/qpopupmenu.h b/WebCore/kwq/qt/qpopupmenu.h
index cd231d0..f186004 100644
--- a/WebCore/kwq/qt/qpopupmenu.h
+++ b/WebCore/kwq/qt/qpopupmenu.h
@@ -26,7 +26,33 @@
#ifndef QPOPUPMENU_H_
#define QPOPUPMENU_H_
+// class QPopupMenu ============================================================
+
class QPopupMenu {
-};
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QPopupMenu();
+
+ ~QPopupMenu();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QPopupMenu(const QPopupMenu &);
+ QPopupMenu &operator=(const QPopupMenu &);
+
+}; // class QPopupMenu =========================================================
#endif
diff --git a/WebCore/kwq/qt/qptrdict.h b/WebCore/kwq/qt/qptrdict.h
index 090fec5..95ea99f 100644
--- a/WebCore/kwq/qt/qptrdict.h
+++ b/WebCore/kwq/qt/qptrdict.h
@@ -29,27 +29,75 @@
#include <KWQDef.h>
#include <KWQCollection.h>
+// class QPtrDict ==============================================================
+
template <class T> class QPtrDict : public QCollection {
public:
- QPtrDict(int size=13);
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QPtrDict(int size=17);
+ QPtrDict(const QPtrDict<T> &);
+
+ ~QPtrDict();
+
+ // member functions --------------------------------------------------------
uint count() const;
T *at(uint);
T *take(void *);
+
void append(const T *);
void insert(void *, const T *);
void remove(void *);
+
+ // operators ---------------------------------------------------------------
+
+ QPtrDict<T> &operator=(const QPtrDict<T> &);
T *operator[](void *) const;
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QPtrDict ===========================================================
+
+
+// class QPtrDictIterator ======================================================
template<class T> class QPtrDictIterator {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QPtrDictIterator(const QPtrDict<T> &);
+ // member functions --------------------------------------------------------
+
T *current() const;
void *currentKey() const;
+ // operators ---------------------------------------------------------------
+
T *operator++();
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QPtrDictIterator(const QPtrDictIterator &);
+ QPtrDictIterator &operator=(const QPtrDictIterator &);
+
+}; // class QPtrDictIterator ===================================================
#endif
diff --git a/WebCore/kwq/qt/qpushbutton.h b/WebCore/kwq/qt/qpushbutton.h
index 328a391..c81de3b 100644
--- a/WebCore/kwq/qt/qpushbutton.h
+++ b/WebCore/kwq/qt/qpushbutton.h
@@ -31,11 +31,35 @@
#include "qwidget.h"
#include "qstring.h"
+// class QPushButton ===========================================================
+
class QPushButton : public QButton {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QPushButton();
QPushButton(QWidget *);
QPushButton(const QString &text, QWidget *parent, const char* name=0);
-};
+
+ ~QPushButton();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QPushButton(const QPushButton &);
+ QPushButton &operator=(const QPushButton &);
+
+}; // class QPushButton ========================================================
#endif
diff --git a/WebCore/kwq/qt/qradiobutton.h b/WebCore/kwq/qt/qradiobutton.h
index 521e2f8..f5b269c 100644
--- a/WebCore/kwq/qt/qradiobutton.h
+++ b/WebCore/kwq/qt/qradiobutton.h
@@ -30,12 +30,37 @@
#include "qwidget.h"
+// class QRadioButton ==========================================================
+
class QRadioButton : public QButton {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QRadioButton();
QRadioButton(QWidget *);
+
+ ~QRadioButton();
+
+ // member functions --------------------------------------------------------
void setChecked(bool);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QRadioButton(const QRadioButton &);
+ QRadioButton &operator=(const QRadioButton &);
+
+}; // class QRadioButton =======================================================
#endif
diff --git a/WebCore/kwq/qt/qrect.h b/WebCore/kwq/qt/qrect.h
index 546ffea..6cdc4df 100644
--- a/WebCore/kwq/qt/qrect.h
+++ b/WebCore/kwq/qt/qrect.h
@@ -28,10 +28,28 @@
#include "qsize.h"
+// class QRect =================================================================
+
class QRect {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QRect();
QRect(int l, int t, int w, int h);
+ QRect(const QRect &);
+
+ ~QRect();
+
+ // member functions --------------------------------------------------------
+
+ bool isNull() const;
+ bool isValid() const;
int x() const;
int y() const;
@@ -41,14 +59,20 @@ public:
int bottom() const;
int width() const;
int height() const;
- bool isNull() const;
- bool isValid() const;
QSize size() const;
void setWidth(int);
void setHeight(int);
QRect intersect(const QRect &) const;
bool intersects(const QRect &) const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QRect &operator=(const QRect &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QRect ==============================================================
#endif
diff --git a/WebCore/kwq/qt/qregexp.h b/WebCore/kwq/qt/qregexp.h
index ec1c524..b567d65 100644
--- a/WebCore/kwq/qt/qregexp.h
+++ b/WebCore/kwq/qt/qregexp.h
@@ -28,10 +28,31 @@
#include "qstring.h"
+// class QRegExp ===============================================================
+
class QRegExp {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QRegExp();
QRegExp(const QString &);
QRegExp(const QRegExp &);
-};
+
+ // member functions --------------------------------------------------------
+
+ // operators ---------------------------------------------------------------
+
+ QRegExp &operator=(const QRegExp &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QRegExp ============================================================
#endif
diff --git a/WebCore/kwq/qt/qregion.h b/WebCore/kwq/qt/qregion.h
index 35d02ab..b087686 100644
--- a/WebCore/kwq/qt/qregion.h
+++ b/WebCore/kwq/qt/qregion.h
@@ -27,25 +27,46 @@
#define QREGION_H_
#include "qpoint.h"
-
-// FIXME: workaround for error on line 58 of khtml/html/html_imageimpl.h
#include "qimage.h"
-
#include "qrect.h"
+// class QRegion ===============================================================
+
class QRegion {
public:
+
+ // typedefs ----------------------------------------------------------------
+
// NOTE: alphabetical order
enum RegionType { Ellipse, Rectangle };
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QRegion();
QRegion(const QRect &);
QRegion(int, int, int, int, RegionType = Rectangle);
QRegion(const QPointArray &);
+ QRegion(const QRegion &);
+
+ ~QRegion();
+
+ // member functions --------------------------------------------------------
QRegion intersect(const QRegion &) const;
bool contains(const QPoint &) const;
bool isNull() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QRegion &operator=(const QRegion &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QRegion ============================================================
#endif
diff --git a/WebCore/kwq/qt/qscrollview.h b/WebCore/kwq/qt/qscrollview.h
index 41cab1f..2114443 100644
--- a/WebCore/kwq/qt/qscrollview.h
+++ b/WebCore/kwq/qt/qscrollview.h
@@ -30,9 +30,28 @@
#include <KWQFrame.h>
#include "qwidget.h"
+// class QScrollView ===========================================================
+
class QScrollView : public QFrame {
public:
+
+ // typedefs ----------------------------------------------------------------
+
+ // enums -------------------------------------------------------------------
+
+ // NOTE: alphabetical order
+ enum ScrollBarMode { AlwaysOff, AlwaysOn, Auto };
+
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QScrollView();
+ virtual ~QScrollView();
+
+ // member functions --------------------------------------------------------
+
QWidget* viewport() const;
int visibleWidth() const;
int visibleHeight() const;
@@ -40,18 +59,32 @@ public:
int contentsX() const;
int contentsY() const;
void scrollBy(int dx, int dy);
+
virtual void setContentsPos(int x, int y);
- // NOTE: alphabetical order
- enum ScrollBarMode { AlwaysOff, AlwaysOn, Auto };
+
QScrollBar *horizontalScrollBar() const;
QScrollBar *verticalScrollBar() const;
+
virtual void setVScrollBarMode(ScrollBarMode);
virtual void setHScrollBarMode(ScrollBarMode);
+
virtual void addChild(QWidget* child, int x=0, int y=0);
void removeChild(QWidget* child);
+
virtual void resizeContents(int w, int h);
void updateContents(int x, int y, int w, int h);
void repaintContents(int x, int y, int w, int h, bool erase=TRUE);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QScrollView(const QScrollView &);
+ QScrollView &operator=(const QScrollView &);
+
+}; // class QScrollView ========================================================
#endif
diff --git a/WebCore/kwq/qt/qsize.h b/WebCore/kwq/qt/qsize.h
index 34a7141..195708a 100644
--- a/WebCore/kwq/qt/qsize.h
+++ b/WebCore/kwq/qt/qsize.h
@@ -26,11 +26,26 @@
#ifndef QSIZE_H_
#define QSIZE_H_
+// class QSize =================================================================
+
class QSize {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QSize();
QSize(int,int);
-
+ QSize(const QSize &);
+
+ ~QSize();
+
+ // member functions --------------------------------------------------------
+
bool isValid() const;
int width() const;
int height() const;
@@ -38,9 +53,17 @@ public:
void setHeight(int);
QSize expandedTo(const QSize &) const;
+ // operators ---------------------------------------------------------------
+
+ QSize &operator=(const QSize &);
+
friend inline QSize operator+(const QSize &, const QSize &);
friend inline bool operator==(const QSize &, const QSize &);
friend inline bool operator!=(const QSize &, const QSize &);
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QSize ==============================================================
#endif
diff --git a/WebCore/kwq/qt/qsortedlist.h b/WebCore/kwq/qt/qsortedlist.h
index 1e5f26e..caa9d38 100644
--- a/WebCore/kwq/qt/qsortedlist.h
+++ b/WebCore/kwq/qt/qsortedlist.h
@@ -28,7 +28,32 @@
#include "qlist.h"
+// class QSortedList ===========================================================
+
template<class T> class QSortedList : public QList<T> {
-};
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QSortedList();
+ QSortedList(const QSortedList<T> &);
+
+ ~QSortedList();
+
+ // member functions --------------------------------------------------------
+
+ // operators ---------------------------------------------------------------
+
+ QSortedList<T> &operator=(const QSortedList<T> &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QSortedList ========================================================
#endif
diff --git a/WebCore/kwq/qt/qstack.h b/WebCore/kwq/qt/qstack.h
index 38fa256..3570460 100644
--- a/WebCore/kwq/qt/qstack.h
+++ b/WebCore/kwq/qt/qstack.h
@@ -26,11 +26,35 @@
#ifndef QSTACK_H_
#define QSTACK_H_
+// class QStack ================================================================
+
template<class T> class QStack {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ QStack();
+ QStack(const QStack<T> &);
+
+ ~QStack();
+
+ // member functions --------------------------------------------------------
+
bool isEmpty() const;
- void push(const T *d);
+ void push(const T *);
T *pop();
-};
+
+ // operators ---------------------------------------------------------------
+
+ QStack<T> &operator=(const QStack<T> &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QStack =============================================================
#endif
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index 3bb1d8a..cfa8684 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -31,14 +31,14 @@
class QString;
class QRegExp;
-// =============================================================================
-// QChar class
+// QChar class =================================================================
class QChar {
public:
- // -------------------------------------------------------------------------
- // enums
+ // typedefs ----------------------------------------------------------------
+
+ // enums -------------------------------------------------------------------
enum Direction {
// NOTE: alphabetical order
@@ -46,13 +46,13 @@ public:
DirLRO, DirNSM, DirON, DirPDF, DirR, DirRLE, DirRLO, DirS, DirWS
};
- // -------------------------------------------------------------------------
- // constants
+ // constants ---------------------------------------------------------------
static const QChar null;
- // -------------------------------------------------------------------------
- // constructors, copy constructors, and destructors
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
QChar();
QChar(char);
@@ -63,11 +63,7 @@ public:
QChar(uint);
QChar(int);
- // -------------------------------------------------------------------------
- // static member functions
-
- // -------------------------------------------------------------------------
- // member functions
+ // member functions --------------------------------------------------------
QChar lower() const;
QChar upper() const;
@@ -85,8 +81,7 @@ public:
QChar mirroredChar() const;
ushort unicode() const;
- // -------------------------------------------------------------------------
- // operators
+ // operators ---------------------------------------------------------------
friend int operator==(char, QChar);
friend int operator==(QChar, char);
@@ -96,48 +91,46 @@ public:
friend int operator!=(QChar, char);
operator char() const;
-}; // end class QChar
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QChar ==============================================================
+
-// =============================================================================
-// QString class
+// QString class ===============================================================
class QString {
public:
- static QString fromLatin1(const char*, int len = -1);
+ static QString fromLatin1(const char*, int len=-1);
- // -------------------------------------------------------------------------
- // enums
-
- // -------------------------------------------------------------------------
- // constants
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
static const QString null;
- // -------------------------------------------------------------------------
- // constructors, copy constructors, and destructors
+ // static member functions -------------------------------------------------
+
+ static QString number(long, int base=10);
+
+ // constructors, copy constructors, and destructors ------------------------
QString();
QString(QChar);
- QString(const QString&);
- QString(const QByteArray&);
+ QString(const QString &);
+ QString(const QByteArray &);
QString(const QChar *, uint);
QString(const char *);
- QString &operator=(const QString&);
- QString &operator=(const char *);
- QString &operator=(const QCString&);
QString &operator=(QChar);
+ QString &operator=(const QString &);
+ QString &operator=(const char *);
+ QString &operator=(const QCString &);
QString &operator=(char);
~QString();
- // -------------------------------------------------------------------------
- // static member functions
-
- static QString number(long, int base = 10);
-
- // -------------------------------------------------------------------------
- // member functions
+ // member functions --------------------------------------------------------
bool isNull() const;
bool isEmpty() const;
@@ -146,9 +139,9 @@ public:
int toInt() const;
int toInt(bool *, int base=10) const;
- uint toUInt(bool *ok = 0, int base = 10) const;
- long toLong(bool *ok = 0, int base = 10) const;
- float toFloat(bool *b = 0) const;
+ uint toUInt(bool *ok=0, int base=10) const;
+ long toLong(bool *ok=0, int base=10) const;
+ float toFloat(bool *b=0) const;
QString &prepend(const QString &);
QString &append(const char *);
@@ -159,25 +152,25 @@ public:
int contains(char) const;
int find(char, int index=0) const;
- int find(const char *, int index = 0, bool b = 0) const;
- int find(const QString &, int index = 0, bool b = 0) const;
- int find(const QRegExp &, int index = 0, bool b = 0) const;
- int findRev(char, int index = 0) const;
- int findRev(const char *, int index = 0) const;
+ int find(const char *, int index=0, bool b=0) const;
+ int find(const QString &, int index=0, bool b=0) const;
+ int find(const QRegExp &, int index=0, bool b=0) const;
+ int findRev(char, int index=0) const;
+ int findRev(const char *, int index=0) const;
QString &remove(uint, uint);
QString &replace(const QRegExp &, const QString &);
QString &insert(uint, char);
void truncate(uint pos);
- void fill(QChar, int len = -1);
+ void fill(QChar, int len=-1);
QString arg (int &);
QString arg(int a, int fieldwidth=0, int base=10) const;
- QString arg(const QString&, int fieldwidth = 0) const;
+ QString arg(const QString &, int fieldwidth = 0) const;
QString left(uint) const;
QString right(uint) const;
- QString mid(int, int len = 0xffffffff) const;
+ QString mid(int, int len=0xffffffff) const;
const char* latin1() const;
const char *ascii() const;
@@ -186,16 +179,15 @@ public:
QCString local8Bit() const;
QString &setUnicode(const QChar *, uint);
- QString &setNum(int, int base = 10);
+ QString &setNum(int, int base=10);
QString &sprintf(const char *, ...);
QString lower() const;
QString stripWhiteSpace() const;
QString simplifyWhiteSpace() const;
void compose();
- QString visual(int index = 0, int len = -1);
+ QString visual(int index=0, int len=-1);
- // -------------------------------------------------------------------------
- // operators
+ // operators ---------------------------------------------------------------
bool operator!() const;
operator const char *() const;
@@ -207,11 +199,14 @@ public:
QString &operator+=(QChar);
QString &operator+=(const QString &);
operator QChar () const;
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
-}; // end class QString
+}; // class QString ============================================================
-// =============================================================================
-// operators associated with QChar and QString
+
+// operators associated with QChar and QString =================================
QString &operator+(const char *, const QString &);
QString &operator+(QChar, const QString &);
@@ -225,36 +220,30 @@ bool operator!=(const QString &, const char *);
bool operator!=(const char *, const QString &);
QString operator+(char, const QString &);
-// =============================================================================
-// QConstString class
+
+// class QConstString ==========================================================
class QConstString {
public:
- // -------------------------------------------------------------------------
- // enums
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
- // -------------------------------------------------------------------------
- // constants
-
- // -------------------------------------------------------------------------
- // static member functions
+ // static member functions -------------------------------------------------
const QString string() const;
- // -------------------------------------------------------------------------
- // constructors, copy constructors, and destructors
+ // constructors, copy constructors, and destructors ------------------------
QConstString(QChar *, uint);
- // -------------------------------------------------------------------------
- // member functions
-
- // -------------------------------------------------------------------------
- // operators
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
-}; // end class QConstString
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
-// =============================================================================
+}; // class QConstString =======================================================
#endif
diff --git a/WebCore/kwq/qt/qstringlist.h b/WebCore/kwq/qt/qstringlist.h
index 662588a..a697574 100644
--- a/WebCore/kwq/qt/qstringlist.h
+++ b/WebCore/kwq/qt/qstringlist.h
@@ -29,11 +29,40 @@
#include "qstring.h"
#include "qvaluelist.h"
+// class QStringList ===========================================================
+
class QStringList : public QValueList<QString> {
public:
- static QStringList split(const QString &sep, const QString &str, bool allowEmptyEntries = FALSE );
- static QStringList split(const QChar &sep, const QString &str, bool allowEmptyEntries = FALSE );
- QString join(const QString &sepx ) const;
-};
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+
+ // static member functions -------------------------------------------------
+
+ static QStringList split(const QString &, const QString &,
+ bool allowEmptyEntries = FALSE );
+ static QStringList split(const QChar &, const QString &,
+ bool allowEmptyEntries = FALSE );
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QStringList();
+ QStringList(const QStringList &);
+
+ ~QStringList();
+
+ // member functions --------------------------------------------------------
+
+ QString join(const QString &) const;
+
+ // operators ---------------------------------------------------------------
+
+ QStringList &operator=(const QStringList &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QStringList ========================================================
#endif
diff --git a/WebCore/kwq/qt/qtextcodec.h b/WebCore/kwq/qt/qtextcodec.h
index 5ea5020..8689bb8 100644
--- a/WebCore/kwq/qt/qtextcodec.h
+++ b/WebCore/kwq/qt/qtextcodec.h
@@ -29,24 +29,81 @@
#include "qstring.h"
#include "qcstring.h"
+// class QTextDecoder ==========================================================
+
class QTextDecoder {
public:
- virtual QString toUnicode(const char *, int) = 0;
-};
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QTextDecoder();
+
+ virtual ~QTextDecoder();
+
+ // member functions --------------------------------------------------------
+
+ virtual QString toUnicode(const char *, int)=0;
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QTextDecoder(const QTextDecoder &);
+ QTextDecoder &operator=(const QTextDecoder &);
+
+}; // class QTextDecoder =======================================================
+
+
+// class QTextCodec ============================================================
class QTextCodec {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+
+ // static member functions -------------------------------------------------
+
static QTextCodec *codecForMib(int);
- static QTextCodec *codecForName(const char *, int accuracy = 0);
+ static QTextCodec *codecForName(const char *, int accuracy=0);
static QTextCodec *codecForLocale();
- virtual const char* name() const = 0;
- virtual int mibEnum() const = 0;
+ // constructors, copy constructors, and destructors ------------------------
+
+ QTextCodec();
+
+ virtual ~QTextCodec();
+
+ // member functions --------------------------------------------------------
+
+ virtual const char* name() const=0;
+ virtual int mibEnum() const=0;
virtual QTextDecoder *makeDecoder() const;
QCString fromUnicode(const QString &) const;
+
virtual QString toUnicode(const char *, int) const;
QString toUnicode(const QByteArray &, int) const;
QString toUnicode(const char *) const;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QTextCodec(const QTextCodec &);
+ QTextCodec &operator=(const QTextCodec &);
+
+}; // class QTextCodec =========================================================
#endif
diff --git a/WebCore/kwq/qt/qtextstream.h b/WebCore/kwq/qt/qtextstream.h
index eb94205..7024dcf 100644
--- a/WebCore/kwq/qt/qtextstream.h
+++ b/WebCore/kwq/qt/qtextstream.h
@@ -28,26 +28,106 @@
#include "qstring.h"
+// class QTextStream ===========================================================
+
class QTextStream {
public:
- QTextStream();
- QTextStream(QByteArray, int);
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QTextStream();
+ QTextStream(QByteArray, int);
+
+ virtual ~QTextStream();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
QTextStream &operator<<(char);
QTextStream &operator<<(const char *);
- QTextStream &operator<<(const QCString&);
- QTextStream &operator<<(const QString&);
-};
+ QTextStream &operator<<(const QCString &);
+ QTextStream &operator<<(const QString &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QTextStream(const QTextStream &);
+ QTextStream &operator=(const QTextStream &);
+
+}; // class QTextStream ========================================================
+
+
+// class QTextIStream ==========================================================
class QTextIStream : public QTextStream {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QTextIStream(QString *);
+
+ virtual ~QTextIStream();
+
+ // member functions --------------------------------------------------------
+
QString readLine();
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QTextIStream(const QTextIStream &);
+ QTextIStream &operator=(const QTextIStream &);
+
+}; // class QTextIStream =======================================================
+
+
+// class QTextOStream ==========================================================
class QTextOStream : public QTextStream {
public:
- QTextOStream(QByteArray ba);
-};
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QTextOStream(QString *);
+ QTextOStream(QByteArray);
+
+ virtual ~QTextOStream();
+
+ // member functions --------------------------------------------------------
+
+ QString readLine();
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QTextOStream(const QTextOStream &);
+ QTextOStream &operator=(const QTextOStream &);
+
+}; // class QTextOStream =======================================================
#endif
diff --git a/WebCore/kwq/qt/qtimer.h b/WebCore/kwq/qt/qtimer.h
index aa069b9..52e0b25 100644
--- a/WebCore/kwq/qt/qtimer.h
+++ b/WebCore/kwq/qt/qtimer.h
@@ -28,9 +28,36 @@
#include "qobject.h"
+// class QTimer ================================================================
+
class QTimer : public QObject {
public:
- static void singleShot(int msec, QObject *receiver, const char *member);
-};
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+
+ // static member functions -------------------------------------------------
+
+ static void singleShot(int, QObject *, const char *);
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QTimer();
+
+ ~QTimer();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QTimer(const QTimer &);
+ QTimer &operator=(const QTimer &);
+
+}; // class QTimer =============================================================
#endif
diff --git a/WebCore/kwq/qt/qtooltip.h b/WebCore/kwq/qt/qtooltip.h
index 7c024a6..5ee206f 100644
--- a/WebCore/kwq/qt/qtooltip.h
+++ b/WebCore/kwq/qt/qtooltip.h
@@ -26,11 +26,40 @@
#ifndef QTOOLTIP_H_
#define QTOOLTIP_H_
-class QPalette;
+#include "qnamespace.h"
+#include "qpalette.h"
+#include "qwidget.h"
-class QToolTip {
+// class QToolTip ==============================================================
+
+class QToolTip : public Qt {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+
+ // static member functions -------------------------------------------------
+
static QPalette palette();
-};
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QToolTip(QWidget *);
+
+ ~QToolTip();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QToolTip(const QToolTip &);
+ QToolTip &operator=(const QToolTip &);
+
+}; // class QToolTip ===========================================================
#endif
diff --git a/WebCore/kwq/qt/qvaluelist.h b/WebCore/kwq/qt/qvaluelist.h
index 904fa88..fdc3446 100644
--- a/WebCore/kwq/qt/qvaluelist.h
+++ b/WebCore/kwq/qt/qvaluelist.h
@@ -28,48 +28,128 @@
#include <KWQDef.h>
+// class QValueListIterator ====================================================
+
template<class T> class QValueListIterator {
public:
- bool operator!=(const QValueListIterator<T>& it);
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QValueListIterator();
+ QValueListIterator(const QValueListIterator<T>&);
+
+ ~QValueListIterator();
+
+ // member functions --------------------------------------------------------
+
+ // operators ---------------------------------------------------------------
+
+ bool operator==(const QValueListIterator<T>&);
+ bool operator!=(const QValueListIterator<T>&);
T& operator*();
const T& operator*() const;
QValueListIterator<T>& operator++();
QValueListIterator<T>& operator++(int);
QValueListIterator<T>& operator--();
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QValueListIterator =================================================
+
+
+// class QValueListConstIterator ===============================================
template<class T> class QValueListConstIterator {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QValueListConstIterator();
- QValueListConstIterator(const QValueListIterator<T>& it);
+ QValueListConstIterator(const QValueListIterator<T>&);
+
+ ~QValueListConstIterator();
+
+ // member functions --------------------------------------------------------
+
+ // operators ---------------------------------------------------------------
+
+ bool operator==(const QValueListConstIterator<T>&);
+ bool operator!=(const QValueListConstIterator<T>&);
+ T& operator*();
QValueListConstIterator operator++();
QValueListConstIterator operator++(int);
- bool operator!=(const QValueListConstIterator<T>& it);
- T& operator*();
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QValueListConstIterator ============================================
+
+
+// class QValueList ============================================================
template <class T> class QValueList {
public:
+
+ // typedefs ----------------------------------------------------------------
+
typedef QValueListIterator<T> Iterator;
typedef QValueListConstIterator<T> ConstIterator;
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QValueList();
+ QValueList(const QValueList<T>&);
+
+ ~QValueList();
+
+ // member functions --------------------------------------------------------
+
void clear();
uint count() const;
bool isEmpty() const;
+
void append(const T&);
void remove(const T&);
+
uint contains(const T&);
+
Iterator remove(Iterator);
Iterator fromLast();
+
const T& first() const;
const T& last() const;
+
Iterator begin();
Iterator end();
+
ConstIterator begin() const;
ConstIterator end() const;
+
+ // operators ---------------------------------------------------------------
+
+ QValueList<T>& operator=(const QValueList<T>&);
T& operator[] (uint);
const T& operator[] (uint) const;
QValueList<T> &operator+=(const T &);
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QValueList =========================================================
#endif
diff --git a/WebCore/kwq/qt/qvariant.h b/WebCore/kwq/qt/qvariant.h
index 9f39241..279fb8b 100644
--- a/WebCore/kwq/qt/qvariant.h
+++ b/WebCore/kwq/qt/qvariant.h
@@ -30,24 +30,45 @@ typedef unsigned int uint;
class QString;
-// this isn't used in this class, but it other classes expect the forward decl
-class QImage;
+// class QVariant ==============================================================
class QVariant {
public:
+
+ // typedefs ----------------------------------------------------------------
+
enum Type {
UInt,
Bool
};
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QVariant();
QVariant(bool, int);
QVariant(double);
- QVariant(const QString&);
+ QVariant(const QString &);
+ QVariant(const QVariant &);
+
+ ~QVariant();
+ // member functions --------------------------------------------------------
+
Type type() const;
bool toBool() const;
uint toUInt() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QVariant &operator=(const QVariant &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QVariant ===========================================================
#endif
diff --git a/WebCore/kwq/qt/qvector.h b/WebCore/kwq/qt/qvector.h
index 405765a..c742154 100644
--- a/WebCore/kwq/qt/qvector.h
+++ b/WebCore/kwq/qt/qvector.h
@@ -31,15 +31,56 @@
typedef void *Item;
+// class QGVector ==============================================================
+
class QGVector : public QCollection {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+
+ // static member functions -------------------------------------------------
+
virtual int compareItems(Item, Item);
-};
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QGVector();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QGVector(const QGVector &);
+ QGVector &operator=(const QGVector &);
+
+}; // class QGVector ===========================================================
+
+
+// class QVector ===============================================================
template<class T> class QVector : public QGVector {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QVector();
QVector(uint);
+ QVector(const QVector &);
+
+ ~QVector();
+
+ // member functions --------------------------------------------------------
bool isEmpty() const;
uint count() const;
@@ -49,7 +90,14 @@ public:
bool insert(uint, const T *);
T *at(int) const;
+ // operators ---------------------------------------------------------------
+
T *operator[](int) const;
-};
+ QVector &operator=(const QVector &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QVector ============================================================
#endif
diff --git a/WebCore/kwq/qt/qwidget.h b/WebCore/kwq/qt/qwidget.h
index 664d621..f0c2191 100644
--- a/WebCore/kwq/qt/qwidget.h
+++ b/WebCore/kwq/qt/qwidget.h
@@ -37,9 +37,15 @@
#include "qevent.h"
#include <KWQStyle.h>
+// class QWidget ===============================================================
+
class QWidget : public QObject, public QPaintDevice {
public:
+ // typedefs ----------------------------------------------------------------
+
+ // enums -------------------------------------------------------------------
+
enum FocusPolicy {
NoFocus = 0,
TabFocus = 0x1,
@@ -48,46 +54,75 @@ public:
WheelFocus = 0x7
};
- // FIXME: do any of these methods need to be virtual?
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ QWidget(QWidget *parent=0, const char *name=0, WFlags f=0);
+
+ virtual ~QWidget();
+
+ // member functions --------------------------------------------------------
+
+ virtual QSize sizeHint() const;
+ virtual void resize(int,int);
+ virtual void setActiveWindow();
+ virtual void setEnabled(bool);
+ virtual void setAutoMask(bool);
+ virtual void setMouseTracking(bool);
+
int winId() const;
int x() const;
int y() const;
int width() const;
int height() const;
QSize size() const;
- virtual QSize sizeHint() const;
- virtual void resize(int,int);
void resize(const QSize &);
QPoint pos() const;
- virtual void move(const QPoint &);
void move(int, int);
+ virtual void move(const QPoint &);
+
QWidget *topLevelWidget() const;
+
QPoint mapToGlobal(const QPoint &) const;
+
void setFocus();
void clearFocus();
FocusPolicy focusPolicy() const;
virtual void setFocusPolicy(FocusPolicy);
virtual void setFocusProxy( QWidget * );
- virtual void setActiveWindow();
- virtual void setEnabled(bool);
+
const QPalette& palette() const;
virtual void setPalette(const QPalette &);
void unsetPalette();
- virtual void setAutoMask(bool);
- virtual void setMouseTracking(bool);
+
QStyle &style() const;
void setStyle(QStyle *);
+
QFont font() const;
virtual void setFont(const QFont &);
+
void constPolish() const;
virtual QSize minimumSizeHint() const;
bool isVisible() const;
virtual void setCursor(const QCursor &);
bool event(QEvent *);
bool focusNextPrevChild(bool);
+ bool hasMouseTracking() const;
+
virtual void show();
virtual void hide();
- bool hasMouseTracking() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QWidget(const QWidget &);
+ QWidget &operator=(const QWidget &);
+
+}; // class QWidget ============================================================
#endif
diff --git a/WebCore/kwq/qt/qxml.h b/WebCore/kwq/qt/qxml.h
index e328792..5935eb0 100644
--- a/WebCore/kwq/qt/qxml.h
+++ b/WebCore/kwq/qt/qxml.h
@@ -28,52 +28,161 @@
class QString;
+// class QXmlAttributes ========================================================
+
class QXmlAttributes {
public:
- QString value(const QString& qName) const;
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QXmlAttributes();
+ QXmlAttributes(const QXmlAttributes &);
+
+ virtual ~QXmlAttributes();
+
+ // member functions --------------------------------------------------------
+
+ QString value(const QString &) const;
int length() const;
QString localName(int index) const;
QString value(int index) const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QXmlAttributes &operator=(const QXmlAttributes &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QXmlAttributes =====================================================
+
+
+// class QXmlInputSource ========================================================
class QXmlInputSource {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QXmlInputSource();
+
+ virtual ~QXmlInputSource();
+
+ // member functions --------------------------------------------------------
+
virtual void setData(const QString& data);
-};
-class QXmlDTDHandler {
-};
+ // operators ---------------------------------------------------------------
-class QXmlDeclHandler {
-};
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
-class QXmlErrorHandler {
-};
+private:
+ // no copying or assignment
+ QXmlInputSource(const QXmlInputSource &);
+ QXmlInputSource &operator=(const QXmlInputSource &);
-class QXmlLexicalHandler {
-};
+}; // class QXmlInputSource =====================================================
-class QXmlContentHandler {
-};
-class QXmlDefaultHandler : public QXmlContentHandler, public QXmlLexicalHandler, public QXmlErrorHandler, public QXmlDeclHandler, public QXmlDTDHandler {
+class QXmlDTDHandler {};
+
+class QXmlDeclHandler {};
+
+class QXmlErrorHandler {};
+
+class QXmlLexicalHandler {};
+
+class QXmlContentHandler {};
+
+class QXmlDefaultHandler :
+ public QXmlContentHandler,
+ public QXmlLexicalHandler,
+ public QXmlErrorHandler,
+ public QXmlDeclHandler,
+ public QXmlDTDHandler {
};
+
+// class QXmlSimpleReader ======================================================
+
class QXmlSimpleReader {
public:
- void setContentHandler(QXmlContentHandler* handler);
- bool parse(const QXmlInputSource& input);
- void setLexicalHandler(QXmlLexicalHandler* handler);
- void setDTDHandler(QXmlDTDHandler* handler);
- void setDeclHandler(QXmlDeclHandler* handler);
- void setErrorHandler(QXmlErrorHandler* handler);
-};
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ QXmlSimpleReader();
+
+ ~QXmlSimpleReader();
+
+ // member functions --------------------------------------------------------
+
+ void setContentHandler(QXmlContentHandler *handler);
+ bool parse(const QXmlInputSource &input);
+ void setLexicalHandler(QXmlLexicalHandler *handler);
+ void setDTDHandler(QXmlDTDHandler *handler);
+ void setDeclHandler(QXmlDeclHandler *handler);
+ void setErrorHandler(QXmlErrorHandler *handler);
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QXmlSimpleReader(const QXmlSimpleReader &);
+ QXmlSimpleReader &operator=(const QXmlSimpleReader &);
+
+}; // class QXmlSimpleReader ===================================================
+
+
+// class QXmlParseException ====================================================
class QXmlParseException {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QXmlParseException();
+
+ ~QXmlParseException();
+
+ // member functions --------------------------------------------------------
+
QString message() const;
int columnNumber() const;
int lineNumber() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QXmlParseException(const QXmlParseException &);
+ QXmlParseException &operator=(const QXmlParseException &);
+
+}; // class QXmlParseException =================================================
#endif
diff --git a/WebCore/src/kwq/qt/qapplication.h b/WebCore/src/kwq/qt/qapplication.h
index b4e8c40..1775340 100644
--- a/WebCore/src/kwq/qt/qapplication.h
+++ b/WebCore/src/kwq/qt/qapplication.h
@@ -26,19 +26,46 @@
#ifndef QAPPLICATION_H_
#define QAPPLICATION_H_
-#include "qpalette.h"
#include "qwidget.h"
+#include "qpalette.h"
#include "qsize.h"
+// class QApplication ==========================================================
+
class QApplication {
public:
- static QPalette palette(const QWidget* = 0);
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+
+ // static member functions -------------------------------------------------
+
+ static QPalette palette(const QWidget *p=0);
static QWidget *desktop();
static int startDragDistance();
static QSize globalStrut();
static void setOverrideCursor(const QCursor &);
static void restoreOverrideCursor();
- static bool sendEvent(QObject *receiver, QEvent *event);
-};
+ static bool sendEvent(QObject *, QEvent *);
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QApplication();
+ virtual ~QApplication();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QApplication(const QApplication &);
+ QApplication &operator=(const QApplication &);
+
+}; // class QApplication =======================================================
#endif
diff --git a/WebCore/src/kwq/qt/qarray.h b/WebCore/src/kwq/qt/qarray.h
index d39605d..eba6a2f 100644
--- a/WebCore/src/kwq/qt/qarray.h
+++ b/WebCore/src/kwq/qt/qarray.h
@@ -28,20 +28,45 @@
#include <KWQDef.h>
+// class QArray ================================================================
+
template <class T> class QArray {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QArray();
QArray(int);
+ QArray(const QArray<T> &);
+
+ QArray<T> &operator=(const QArray<T> &);
+
+ ~QArray();
+
+ // member functions --------------------------------------------------------
+
T &at(uint) const;
T *data() const;
-
uint size() const;
uint count() const;
bool resize(uint size);
QArray<T>& duplicate(const T*, int);
- bool fill(const T &d, int size = -1);
-
+ bool fill(const T &, int size=-1);
+
+ // operators ---------------------------------------------------------------
+
T &operator[](int) const;
-};
+ bool operator==(const QArray<T> &);
+ bool operator!=(const QArray<T> &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QArray =============================================================
#endif
diff --git a/WebCore/src/kwq/qt/qasyncimageio.h b/WebCore/src/kwq/qt/qasyncimageio.h
index 7dd40a5..253181e 100644
--- a/WebCore/src/kwq/qt/qasyncimageio.h
+++ b/WebCore/src/kwq/qt/qasyncimageio.h
@@ -28,9 +28,37 @@
#include <KWQDef.h>
+// =============================================================================
+// class QImageDecoder
+
class QImageDecoder {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+
+ // static member functions -------------------------------------------------
+
static const char* formatName(const uchar* buffer, int length);
-};
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ ~QImageDecoder();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QImageDecoder(const QImageDecoder &);
+ QImageDecoder &operator=(const QImageDecoder &);
+
+}; // end class QImageDecoder
+
+// =============================================================================
#endif
diff --git a/WebCore/src/kwq/qt/qasyncio.h b/WebCore/src/kwq/qt/qasyncio.h
index 6f1116b..242460e 100644
--- a/WebCore/src/kwq/qt/qasyncio.h
+++ b/WebCore/src/kwq/qt/qasyncio.h
@@ -28,20 +28,74 @@
#include <KWQDef.h>
-class QAsynchIO {
+// class QAsyncIO ==============================================================
+
+class QAsyncIO {
+
+// Note : all class members in protected scope
protected:
+
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ virtual ~QAsyncIO();
+
+ // member functions --------------------------------------------------------
+
void ready();
-};
-class QDataSource : public QAsynchIO {
+ // operators ---------------------------------------------------------------
+
+// private ---------------------------------------------------------------------
+
+}; // class QAsyncIO ===========================================================
+
+
+// class QDataSource ===========================================================
+
+class QDataSource : public QAsyncIO {
public:
+
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ // member functions --------------------------------------------------------
+
virtual void rewind();
void maybeReady();
-};
-class QDataSink : public QAsynchIO {
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // end class QDataSource ====================================================
+
+
+// class QDataSink =============================================================
+
+class QDataSink : public QAsyncIO {
public:
+
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ // member functions --------------------------------------------------------
+
virtual void receive(const uchar*, int count)=0;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QDataSink ==========================================================
#endif
diff --git a/WebCore/src/kwq/qt/qbitmap.h b/WebCore/src/kwq/qt/qbitmap.h
index ee89f3a..676f7fb 100644
--- a/WebCore/src/kwq/qt/qbitmap.h
+++ b/WebCore/src/kwq/qt/qbitmap.h
@@ -27,11 +27,32 @@
#define QBITMAP_H_
#include "qpixmap.h"
+#include "qimage.h"
+
+// class QBitmap ===============================================================
class QBitmap : public QPixmap {
public:
+
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QBitmap();
QBitmap(int,int);
-};
+
+ QBitmap &operator=(const QBitmap &);
+ QBitmap &operator=(const QPixmap &);
+ QBitmap &operator=(const QImage &);
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QBitmap ============================================================
#endif
diff --git a/WebCore/src/kwq/qt/qbrush.h b/WebCore/src/kwq/qt/qbrush.h
index 10b9de4..ccbdf24 100644
--- a/WebCore/src/kwq/qt/qbrush.h
+++ b/WebCore/src/kwq/qt/qbrush.h
@@ -29,11 +29,38 @@
#include "qcolor.h"
#include "qnamespace.h"
+// class QBrush ================================================================
+
class QBrush : public Qt {
friend class QPainter;
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QBrush();
QBrush(const QColor &);
-};
+ QBrush(const QBrush &);
+
+ QBrush &operator=(const QBrush &);
+
+ ~QBrush();
+
+ // member functions --------------------------------------------------------
+
+ // operators ---------------------------------------------------------------
+
+ bool operator==(const QBrush &) const;
+ bool operator!=(const QBrush &) const;
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+
+}; // class QBrush =============================================================
#endif
diff --git a/WebCore/src/kwq/qt/qbuffer.h b/WebCore/src/kwq/qt/qbuffer.h
index 8a4781e..45a8aa1 100644
--- a/WebCore/src/kwq/qt/qbuffer.h
+++ b/WebCore/src/kwq/qt/qbuffer.h
@@ -28,17 +28,44 @@
#include <KWQDef.h>
+#include "qarray.h"
#include "qstring.h"
+// class QBuffer ===============================================================
+
class QBuffer {
public:
- QByteArray buffer() const;
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QBuffer();
+
+ ~QBuffer();
+
+ // member functions --------------------------------------------------------
+
+ QByteArray buffer() const;
uint size() const;
bool isOpen();
bool open(int);
void close();
int writeBlock(const char *, uint);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QBuffer(const QBuffer &);
+ QBuffer &operator=(const QBuffer &);
+
+}; // class QBuffer ============================================================
#endif
diff --git a/WebCore/src/kwq/qt/qbutton.h b/WebCore/src/kwq/qt/qbutton.h
index 898bab3..d337499 100644
--- a/WebCore/src/kwq/qt/qbutton.h
+++ b/WebCore/src/kwq/qt/qbutton.h
@@ -27,16 +27,40 @@
#define QBUTTON_H_
#include "qwidget.h"
-
-class QString;
+#include "qstring.h"
+
+// class QButton ===============================================================
class QButton : public QWidget {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QButton();
QButton(QWidget *);
+ virtual ~QButton();
+
+ // member functions --------------------------------------------------------
+
virtual void setText(const QString &);
QString text() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QButton(const QButton &);
+ QButton &operator=(const QButton &);
+
+}; // class QButton ============================================================
#endif
diff --git a/WebCore/src/kwq/qt/qcheckbox.h b/WebCore/src/kwq/qt/qcheckbox.h
index e0f0327..ba756de 100644
--- a/WebCore/src/kwq/qt/qcheckbox.h
+++ b/WebCore/src/kwq/qt/qcheckbox.h
@@ -28,12 +28,35 @@
#include <KWQButton.h>
+// class QCheckBox =============================================================
+
class QCheckBox : public QButton {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QCheckBox();
- QCheckBox(QWidget *parent);
+ QCheckBox(QWidget *);
+
+ // member functions --------------------------------------------------------
void setChecked(bool);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+
+// private ---------------------------------------------------------------------
+
+private:
+ QCheckBox(const QCheckBox &);
+ QCheckBox &operator=(const QCheckBox &);
+
+}; // class QCheckBox ==========================================================
#endif
diff --git a/WebCore/src/kwq/qt/qcolor.h b/WebCore/src/kwq/qt/qcolor.h
index 7e675a9..82bd4a7 100644
--- a/WebCore/src/kwq/qt/qcolor.h
+++ b/WebCore/src/kwq/qt/qcolor.h
@@ -28,18 +28,33 @@
#include "qstring.h"
+// class QColor ================================================================
+
class QColor {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QColor();
QColor(int,int,int);
QColor(const char *);
+ QColor(const QColor &);
+
+ // member functions --------------------------------------------------------
QString name() const;
void setNamedColor(const QString&);
+
+ bool isValid() const;
+
int red() const;
int green() const;
int blue() const;
- bool isValid() const;
void setRgb(int,int,int);
void setRgb(int);
@@ -48,10 +63,15 @@ public:
QColor light(int f = 150) const;
QColor dark(int f = 200) const;
+ // operators ---------------------------------------------------------------
+
QColor &operator=(const QColor &);
bool operator==(const QColor &x) const;
bool operator!=(const QColor &x) const;
-};
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QColor =============================================================
#endif
diff --git a/WebCore/src/kwq/qt/qcombobox.h b/WebCore/src/kwq/qt/qcombobox.h
index 401358d..1e4f557 100644
--- a/WebCore/src/kwq/qt/qcombobox.h
+++ b/WebCore/src/kwq/qt/qcombobox.h
@@ -29,10 +29,24 @@
#include <KWQListBox.h>
#include "qwidget.h"
+// class QComboBox =============================================================
+
class QComboBox : public QWidget {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QComboBox(QWidget *parent=0, const char *name=0);
QComboBox(bool rw, QWidget *parent=0, const char *name=0);
+
+ ~QComboBox();
+
+ // member functions --------------------------------------------------------
int count() const;
QListBox *listBox() const;
@@ -41,6 +55,18 @@ public:
void insertItem(const QString &text, int index=-1);
void clear();
virtual void setCurrentItem(int);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QComboBox(const QComboBox &);
+ QComboBox &operator=(const QComboBox &);
+
+}; // class QComboBox ==========================================================
#endif
diff --git a/WebCore/src/kwq/qt/qcstring.h b/WebCore/src/kwq/qt/qcstring.h
index 5fd1d9c..d049e3e 100644
--- a/WebCore/src/kwq/qt/qcstring.h
+++ b/WebCore/src/kwq/qt/qcstring.h
@@ -36,31 +36,50 @@
typedef QArray<char> QByteArray;
-// added to help in compilation of khtml/dom/html_documnent.cpp:182
+// class QCString ==============================================================
+
class QCString : public QByteArray {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QCString();
QCString(int);
QCString(const char *);
QCString(const char *, uint);
QCString(const QCString&);
- QCString mid(uint index, uint len=0xffffffff) const;
-
- int find(const char *str, int index=0, bool cs=TRUE) const;
- int contains(char) const;
+ // member functions --------------------------------------------------------
+
bool isEmpty() const;
bool isNull() const;
+ int find(const char *str, int index=0, bool cs=TRUE) const;
+ int contains(char) const;
uint length() const;
bool truncate(uint);
QCString lower() const;
+ QCString mid(uint index, uint len=0xffffffff) const;
+
+ // operators ---------------------------------------------------------------
operator const char *() const;
QCString &operator=(const QCString&);
QCString &operator=(const char *);
QCString &operator+=(const char *);
QCString &operator+=(const QCString&);
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QCString ===========================================================
+
+
+// operators associated with QCString ==========================================
bool operator==(const char *, const QCString &);
bool operator==(const QCString &, const char *);
diff --git a/WebCore/src/kwq/qt/qcursor.h b/WebCore/src/kwq/qt/qcursor.h
index ebf8cb5..7bdec14 100644
--- a/WebCore/src/kwq/qt/qcursor.h
+++ b/WebCore/src/kwq/qt/qcursor.h
@@ -26,7 +26,33 @@
#ifndef QCURSOR_H
#define QCURSOR_H
+// class QCursor ===============================================================
+
class QCursor {
-};
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QCursor();
+
+ QCursor(const QCursor &);
+
+ ~QCursor();
+
+ // member functions --------------------------------------------------------
+
+ // operators ---------------------------------------------------------------
+
+ QCursor &operator=(const QCursor &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QCursor ============================================================
#endif
diff --git a/WebCore/src/kwq/qt/qdatetime.h b/WebCore/src/kwq/qt/qdatetime.h
index a20a495..e3de5b7 100644
--- a/WebCore/src/kwq/qt/qdatetime.h
+++ b/WebCore/src/kwq/qt/qdatetime.h
@@ -26,32 +26,96 @@
#ifndef QDATETIME_H_
#define QDATETIME_H_
+// class QTime =================================================================
+
class QTime {
public:
+
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QTime();
- QTime(int h, int m);
- QTime(const QTime &other);
+ QTime(int, int);
+ QTime(const QTime &);
+
+ // member functions --------------------------------------------------------
bool isNull() const;
void start();
int msec() const;
int elapsed() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QTime &operator=(const QTime &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QTime ==============================================================
+
+
+// class QDate =================================================================
class QDate {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QDate(int y, int m, int d);
-};
+
+ QDate(const QDate &);
+
+ // member functions --------------------------------------------------------
+
+ // operators ---------------------------------------------------------------
+
+ QDate &operator=(const QDate &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QDate ==============================================================
+
+
+// class QDateTime =============================================================
class QDateTime {
public:
+
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ static QDateTime currentDateTime();
+
+ // constructors, copy constructors, and destructors ------------------------
+
QDateTime();
QDateTime(QDate date, QTime time);
- static QDateTime currentDateTime();
+ QDateTime(const QDateTime &);
+
+ // member functions --------------------------------------------------------
int secsTo(const QDateTime &) const;
QTime time() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QDateTime &operator=(const QDateTime &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QDateTime ==========================================================
#endif
diff --git a/WebCore/src/kwq/qt/qdict.h b/WebCore/src/kwq/qt/qdict.h
index 82ad4b2..27c50f0 100644
--- a/WebCore/src/kwq/qt/qdict.h
+++ b/WebCore/src/kwq/qt/qdict.h
@@ -29,25 +29,75 @@
#include <KWQCollection.h>
#include "qstring.h"
+// class QDict =================================================================
+
template <class T> class QDict : public QCollection {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QDict(int size=17, bool caseSensitive=TRUE);
+
+ QDict(const QDict<T> &);
+
+ ~QDict();
+
+ // member functions --------------------------------------------------------
void insert(const QString &, const T *);
bool remove(const QString &);
T *find(const QString &) const;
uint count() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QDict<T> &operator=(const QDict<T> &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QDict ==============================================================
+
+
+// class QDictIterator =========================================================
template<class T> class QDictIterator {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QDictIterator(const QDict<T> &);
+
+ ~QDictIterator();
+
+ // member functions --------------------------------------------------------
uint count() const;
T *current() const;
T *toFirst();
+ // operators ---------------------------------------------------------------
+
T *operator++();
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QDictIterator(const QDictIterator &);
+ QDictIterator &operator=(const QDictIterator &);
+
+}; // class QDictIterator ======================================================
#endif
diff --git a/WebCore/src/kwq/qt/qdir.h b/WebCore/src/kwq/qt/qdir.h
index 4e0978d..e9dc236 100644
--- a/WebCore/src/kwq/qt/qdir.h
+++ b/WebCore/src/kwq/qt/qdir.h
@@ -30,16 +30,36 @@
#include "qstringlist.h"
#include "qfile.h"
+// class QDir ==================================================================
+
class QDir {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
QDir();
- QDir(const QString&);
+ QDir(const QString &);
+ QDir(const QDir &);
+
+ virtual ~QDir();
+
+ // member functions --------------------------------------------------------
virtual QString absPath() const;
virtual QString absFilePath( const QString &fileName) const;
virtual bool cdUp();
virtual bool exists(const QString&) const;
virtual QStringList entryList(const QString &nameFilter);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QDir ===============================================================
#endif
diff --git a/WebCore/src/kwq/qt/qevent.h b/WebCore/src/kwq/qt/qevent.h
index 5233a8b..92686f1 100644
--- a/WebCore/src/kwq/qt/qevent.h
+++ b/WebCore/src/kwq/qt/qevent.h
@@ -30,9 +30,16 @@
#include "qregion.h"
#include "qpoint.h"
+// class QEvent ================================================================
+
class QEvent : public Qt {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+
enum Type {
+ Timer,
MouseButtonPress,
MouseButtonRelease,
MouseButtonDblClick,
@@ -42,13 +49,48 @@ public:
AccelAvailable,
KeyPress,
};
+
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ QEvent(Type);
+
+ virtual ~QEvent();
+
+ // member functions --------------------------------------------------------
+
Type type() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QEvent(const QEvent &);
+ QEvent &operator=(const QEvent &);
+
+}; // class QEvent =============================================================
+
+
+// class QMouseEvent ===========================================================
class QMouseEvent : public QEvent {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QMouseEvent(Type type, const QPoint &pos, int button, int state);
+ // member functions --------------------------------------------------------
+
int x();
int y();
int globalX();
@@ -56,27 +98,221 @@ public:
const QPoint &pos() const;
ButtonState button();
ButtonState state();
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QMouseEvent(const QMouseEvent &);
+ QMouseEvent &operator=(const QMouseEvent &);
+
+}; // class QMouseEvent ========================================================
+
+
+// class QTimerEvent ===========================================================
class QTimerEvent : public QEvent {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QTimerEvent(int timerId);
+
+ // member functions --------------------------------------------------------
+
int timerId() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QTimerEvent(const QTimerEvent &);
+ QTimerEvent &operator=(const QTimerEvent &);
+
+}; // class QTimerEvent ========================================================
+
+
+// class QKeyEvent =============================================================
class QKeyEvent : public QEvent {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
QKeyEvent();
QKeyEvent(Type, Key, int, int);
+
+ // member functions --------------------------------------------------------
+
int key() const;
ButtonState state() const;
void accept();
-};
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QKeyEvent(const QKeyEvent &);
+ QKeyEvent &operator=(const QKeyEvent &);
+
+}; // class QKeyEvent ==========================================================
+
+
+// class QFocusEvent ===========================================================
+
+class QFocusEvent : public QEvent {
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QFocusEvent();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QFocusEvent(const QFocusEvent &);
+ QFocusEvent &operator=(const QFocusEvent &);
+
+}; // class QFocusEvent ========================================================
+
+
+// class QHideEvent ============================================================
+
+class QHideEvent : public QEvent {
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QHideEvent();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QHideEvent(const QHideEvent &);
+ QHideEvent &operator=(const QHideEvent &);
+
+}; // class QHideEvent =========================================================
+
+
+// class QResizeEvent ==========================================================
+
+class QResizeEvent : public QEvent {
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QResizeEvent();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QResizeEvent(const QResizeEvent &);
+ QResizeEvent &operator=(const QResizeEvent &);
+
+}; // class QResizeEvent =======================================================
+
+
+// class QShowEvent ============================================================
+
+class QShowEvent : public QEvent {
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QShowEvent();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QShowEvent(const QShowEvent &);
+ QShowEvent &operator=(const QShowEvent &);
+
+}; // class QShowEvent =========================================================
+
+
+// class QWheelEvent ===========================================================
+
+class QWheelEvent : public QEvent {
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QWheelEvent();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QWheelEvent(const QWheelEvent &);
+ QWheelEvent &operator=(const QWheelEvent &);
-class QFocusEvent : public QEvent {};
-class QHideEvent : public QEvent {};
-class QResizeEvent : public QEvent {};
-class QShowEvent : public QEvent {};
-class QWheelEvent : public QEvent {};
+}; // class QWheelEvent ========================================================
#endif
diff --git a/WebCore/src/kwq/qt/qfile.h b/WebCore/src/kwq/qt/qfile.h
index a3f66d7..08a520f 100644
--- a/WebCore/src/kwq/qt/qfile.h
+++ b/WebCore/src/kwq/qt/qfile.h
@@ -28,17 +28,42 @@
#include "qstring.h"
+// class QFile =================================================================
+
class QFile {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QFile();
QFile(const QString &);
+ ~QFile();
+
+ // member functions --------------------------------------------------------
+
bool exists() const;
static bool exists(const QString &);
bool open(int);
void close();
uint size() const;
int readBlock(char *, uint);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QFile(const QFile &);
+ QFile &operator=(const QFile &);
+
+}; // class QFile ==============================================================
#endif
diff --git a/WebCore/src/kwq/qt/qfont.h b/WebCore/src/kwq/qt/qfont.h
index 87444d8..688a260 100644
--- a/WebCore/src/kwq/qt/qfont.h
+++ b/WebCore/src/kwq/qt/qfont.h
@@ -28,12 +28,31 @@
class QString;
+// class QFont =================================================================
+
class QFont {
+friend class QPainter;
public:
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+
enum CharSet { Latin1, Unicode };
enum Weight { Normal = 50, Bold = 63 };
-
+
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QFont();
+
+ QFont(const QFont &);
+
+ ~QFont();
+
+ // member functions --------------------------------------------------------
+
int pixelSize() const;
QString family() const;
void setFamily(const QString &);
@@ -43,11 +62,16 @@ public:
bool setItalic(bool);
bool italic() const;
bool bold() const;
+
+ // operators ---------------------------------------------------------------
+
+ QFont &operator=(const QFont &);
bool operator==(const QFont &x) const;
bool operator!=(const QFont &x) const;
-private:
- friend class QPainter;
-};
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QFont ==============================================================
#endif
diff --git a/WebCore/src/kwq/qt/qfontdatabase.h b/WebCore/src/kwq/qt/qfontdatabase.h
index 51f6f35..4c32ad9 100644
--- a/WebCore/src/kwq/qt/qfontdatabase.h
+++ b/WebCore/src/kwq/qt/qfontdatabase.h
@@ -30,12 +30,41 @@
#include "qfont.h"
#include "qstring.h"
+// class QFontDatabase =========================================================
+
class QFontDatabase {
public:
- QFont font(const QString familyName, const QString &style, int pointSize, const QString charSetName = QString::null);
- bool isSmoothlyScalable(const QString &family, const QString &style = QString::null, const QString &charSet = QString::null) const;
- QValueList<int> smoothSizes(const QString &family, const QString &style, const QString &charSet = QString::null);
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QFontDatabase();
+
+ // member functions --------------------------------------------------------
+
+ QFont font(const QString, const QString &, int,
+ const QString charSetName = QString::null);
+ bool isSmoothlyScalable(const QString &family,
+ const QString &style=QString::null,
+ const QString &charSet=QString::null) const;
+ QValueList<int> smoothSizes(const QString &, const QString &,
+ const QString &charSet = QString::null);
QString styleString(const QFont &);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QFontDatabase(const QFontDatabase &);
+ QFontDatabase &operator=(const QFontDatabase &);
+
+}; // class QFontDatabase ======================================================
#endif
diff --git a/WebCore/src/kwq/qt/qfontinfo.h b/WebCore/src/kwq/qt/qfontinfo.h
index 26f87ca..bd24c56 100644
--- a/WebCore/src/kwq/qt/qfontinfo.h
+++ b/WebCore/src/kwq/qt/qfontinfo.h
@@ -28,12 +28,34 @@
#include "qfont.h"
+// class QFontInfo =============================================================
+
class QFontInfo {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QFontInfo(const QFont &);
- QFontInfo( const QFontInfo & );
+ QFontInfo(const QFontInfo &);
+
+ ~QFontInfo();
+
+ // member functions --------------------------------------------------------
bool fixedPitch() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QFontInfo &operator=(const QFontInfo &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QFontInfo ==========================================================
#endif
diff --git a/WebCore/src/kwq/qt/qfontmetrics.h b/WebCore/src/kwq/qt/qfontmetrics.h
index 976043c..f652f09 100644
--- a/WebCore/src/kwq/qt/qfontmetrics.h
+++ b/WebCore/src/kwq/qt/qfontmetrics.h
@@ -26,28 +26,51 @@
#ifndef QFONTMETRICS_H_
#define QFONTMETRICS_H_
-class QRect;
-class QChar;
-class QFont;
-class QSize;
-class QString;
+#include "qrect.h"
+#include "qsize.h"
+#include "qstring.h"
+#include "qfont.h"
+
+// class QFontMetrics ==========================================================
class QFontMetrics {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QFontMetrics();
- QFontMetrics(const QFont&);
+ QFontMetrics(const QFont &);
+ QFontMetrics(const QFontMetrics &);
+
+ ~QFontMetrics();
+
+ // member functions --------------------------------------------------------
int ascent() const;
int height() const;
int width(QChar) const;
int width(char) const;
- int width(const QString &, int len = -1) const;
+ int width(const QString &, int len=-1) const;
int descent() const;
- QRect boundingRect( const QString &, int len = -1 ) const;
+ QRect boundingRect(const QString &, int len=-1) const;
QRect boundingRect(QChar) const;
- QSize size(int flags, const QString& str, int len=-1, int tabstops=0, int *tabarray=0, char **intern=0 ) const;
+ QSize size(int, const QString &, int len=-1, int tabstops=0,
+ int *tabarray=0, char **intern=0 ) const;
int rightBearing(QChar) const;
int leftBearing(QChar) const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QFontMetrics &operator=(const QFontMetrics &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QFontMetrics =======================================================
#endif
diff --git a/WebCore/src/kwq/qt/qguardedptr.h b/WebCore/src/kwq/qt/qguardedptr.h
index 4a5938d..ad31dde 100644
--- a/WebCore/src/kwq/qt/qguardedptr.h
+++ b/WebCore/src/kwq/qt/qguardedptr.h
@@ -28,16 +28,36 @@
#include "qobject.h"
-template <class T> class QGuardedPtr {
+// class QGuardedPtr ===========================================================
+
+template <class T> class QGuardedPtr : public QObject {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QGuardedPtr();
- QGuardedPtr(T* o);
- QGuardedPtr(const QGuardedPtr<T> &p);
+ QGuardedPtr(T *o);
+ QGuardedPtr(const QGuardedPtr<T> &);
+
+ ~QGuardedPtr();
+
+ // member functions --------------------------------------------------------
bool isNull() const;
-
- operator T*() const;
- T* operator->() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ operator T *() const;
+ T *operator->() const;
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QGuardedPtr ========================================================
#endif
diff --git a/WebCore/src/kwq/qt/qhbox.h b/WebCore/src/kwq/qt/qhbox.h
index cfdd7d7..f21d07f 100644
--- a/WebCore/src/kwq/qt/qhbox.h
+++ b/WebCore/src/kwq/qt/qhbox.h
@@ -29,12 +29,35 @@
#include "qwidget.h"
#include <KWQFrame.h>
+// class QHBox =================================================================
+
class QHBox : public QFrame {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QHBox();
QHBox(QWidget *);
+ // member functions --------------------------------------------------------
+
bool setStretchFactor(QWidget*, int stretch);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QHBox(const QHBox &);
+ QHBox &operator=(const QHBox &);
+
+}; // class QHBox ==============================================================
#endif
diff --git a/WebCore/src/kwq/qt/qimage.h b/WebCore/src/kwq/qt/qimage.h
index d824748..5361bc8 100644
--- a/WebCore/src/kwq/qt/qimage.h
+++ b/WebCore/src/kwq/qt/qimage.h
@@ -26,14 +26,37 @@
#ifndef QIMAGE_H_
#define QIMAGE_H_
+// class QImage ================================================================
+
class QImage {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QImage();
+ QImage(const QImage &);
+
+ // member functions --------------------------------------------------------
+
int width() const;
int height() const;
int depth() const;
int pixelIndex(int,int) const;
QImage createAlphaMask(int conversion_flags=0) const;
bool hasAlphaBuffer() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QImage &operator=(const QImage &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QImage =============================================================
#endif
diff --git a/WebCore/src/kwq/qt/qinputdialog.h b/WebCore/src/kwq/qt/qinputdialog.h
index d7c5140..e7fc142 100644
--- a/WebCore/src/kwq/qt/qinputdialog.h
+++ b/WebCore/src/kwq/qt/qinputdialog.h
@@ -27,12 +27,35 @@
#define QINPUTDIALOG_H_
#include "qstring.h"
-class QWidget;
+#include "qwidget.h"
+
+// class QInputDialog ==========================================================
class QInputDialog {
public:
- static QString getText( const QString &caption, const QString &label, const QString &text = QString::null,
- bool *ok = 0, QWidget *parent = 0, const char *name = 0 );
-};
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+
+ // static member functions -------------------------------------------------
+
+ static QString getText(const QString &, const QString &,
+ const QString &text=QString::null, bool *ok=0, QWidget *parent=0,
+ const char *name=0);
+
+ // constructors, copy constructors, and destructors ------------------------
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QInputDialog(const QInputDialog &);
+ QInputDialog &operator=(const QInputDialog &);
+
+}; // class QInputDialog =======================================================
#endif
diff --git a/WebCore/src/kwq/qt/qlabel.h b/WebCore/src/kwq/qt/qlabel.h
index 5eb95b4..4679fbb 100644
--- a/WebCore/src/kwq/qt/qlabel.h
+++ b/WebCore/src/kwq/qt/qlabel.h
@@ -30,13 +30,38 @@
#include "qwidget.h"
#include "qstring.h"
+// class QLabel ================================================================
+
class QLabel : public QFrame {
public:
- QLabel(QWidget *parent);
- QLabel(const QString &, QWidget *);
- virtual void setText(const QString &);
- virtual void setAlignment(int);
-};
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QLabel(QWidget *parent);
+ QLabel(const QString &, QWidget *);
+
+ virtual ~QLabel();
+
+ // member functions --------------------------------------------------------
+
+ virtual void setText(const QString &);
+ virtual void setAlignment(int);
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QLabel(const QLabel &);
+ QLabel &operator=(const QLabel &);
+
+}; // class QLabel =============================================================
#endif
diff --git a/WebCore/src/kwq/qt/qlineedit.h b/WebCore/src/kwq/qt/qlineedit.h
index 0535ccf..a95ddd1 100644
--- a/WebCore/src/kwq/qt/qlineedit.h
+++ b/WebCore/src/kwq/qt/qlineedit.h
@@ -30,23 +30,50 @@
#include "qevent.h"
#include "qstring.h"
+// class QLineEdit =============================================================
+
class QLineEdit : public QWidget {
public:
+
+ // typedefs ----------------------------------------------------------------
+
+ // enums -------------------------------------------------------------------
+
enum EchoMode { Normal, NoEcho, Password };
+
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ QLineEdit(QWidget *parent=0, const char *name=0);
+
+ virtual ~QLineEdit();
- QLineEdit(QWidget *parent=0, const char *name=0 );
+ // member functions --------------------------------------------------------
virtual void setEchoMode(EchoMode);
+ virtual void setCursorPosition(int);
+ virtual void setText(const QString &);
+ virtual void setMaxLength(int);
+
bool isReadOnly() const;
+ void setReadOnly(bool);
bool event(QEvent *);
bool frame() const;
- virtual void setCursorPosition(int);
int cursorPosition() const;
- virtual void setText(const QString &);
int maxLength() const;
- virtual void setMaxLength(int);
- void setReadOnly(bool);
void selectAll();
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QLineEdit(const QLineEdit &);
+ QLineEdit &operator=(const QLineEdit &);
+
+}; // class QLineEdit ==========================================================
#endif
diff --git a/WebCore/src/kwq/qt/qlist.h b/WebCore/src/kwq/qt/qlist.h
index 00c0be9..ab2fe7e 100644
--- a/WebCore/src/kwq/qt/qlist.h
+++ b/WebCore/src/kwq/qt/qlist.h
@@ -29,44 +29,96 @@
#include <KWQDef.h>
#include <KWQCollection.h>
+// class QList =================================================================
+
template <class T> class QList : public QCollection {
public:
- // FIXME: should any of these functions be moved into a base collection
- // class implementation?
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ QList();
+ QList(const QList<T> &);
+
+ // member functions --------------------------------------------------------
+
+ bool isEmpty() const;
uint count() const;
+ void clear();
+ void sort();
+
T *at(uint);
- void append(const T *);
+
void setAutoDelete(bool);
+
bool insert(uint i, const T *);
bool remove();
bool remove(const T *);
bool removeFirst();
bool removeLast();
+ bool removeRef(const T *);
+
T *getLast() const;
T *current() const;
- T *prev() const;
- void prepend(const T *);
- T *take(uint i);
T *first();
- T *next();
T *last();
- void clear();
- bool isEmpty() const;
- bool removeRef(const T *);
+ T *next();
+ T *prev();
+ T *take(uint i);
+
+ void append(const T *);
+ void prepend(const T *);
+
uint containsRef(const T *) const;
- void sort();
-};
+
+ // operators ---------------------------------------------------------------
+
+ QList<T> &operator=(const QList<T> &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QList ==============================================================
+
+
+// class QListIterator =========================================================
template <class T> class QListIterator {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QListIterator(const QList<T> &);
+
+ // member functions --------------------------------------------------------
+
uint count() const;
T *toFirst();
T *toLast();
T *current() const;
+
+ // operators ---------------------------------------------------------------
+
operator T *() const;
T *operator--();
T *operator++();
-};
+ QListIterator<T> &operator=(const QListIterator<T> &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying
+ QListIterator<T>(const QListIterator<T> &);
+
+}; // class QListIterator ======================================================
#endif
diff --git a/WebCore/src/kwq/qt/qmap.h b/WebCore/src/kwq/qt/qmap.h
index 600ff07..c005b2a 100644
--- a/WebCore/src/kwq/qt/qmap.h
+++ b/WebCore/src/kwq/qt/qmap.h
@@ -28,47 +28,120 @@
#include <KWQDef.h>
+// class QMapIterator ==========================================================
+
template<class K, class T> class QMapIterator {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QMapIterator();
QMapIterator(const QMapIterator<K,T>& it);
+ // member functions --------------------------------------------------------
+
const K& key() const;
const T& data() const;
+ // operators ---------------------------------------------------------------
+
+ QMapIterator<K,T> &operator=(const QMapIterator<K,T> &);
+ bool operator==(const QMapIterator<K,T>&) const;
bool operator!=(const QMapIterator<K,T>&) const;
T& operator*();
const T& operator*() const;
QMapIterator<K,T>& operator++();
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QMapIterator =======================================================
+
+
+// class QMapConstIterator =====================================================
template<class K, class T> class QMapConstIterator {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QMapConstIterator();
+ QMapConstIterator(const QMapConstIterator<K,T>&);
QMapConstIterator(const QMapIterator<K,T>&);
+
+ // member functions --------------------------------------------------------
+
const K& key() const;
const T& data() const;
+ // operators ---------------------------------------------------------------
+
+ QMapConstIterator<K,T> &operator=(const QMapConstIterator<K,T> &);
+ bool operator==(const QMapConstIterator<K,T>&) const;
bool operator!=(const QMapConstIterator<K,T>&) const;
const T &operator*() const;
QMapConstIterator<K,T>& operator++();
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QMapConstIterator ==================================================
+
+
+// class QMap ==================================================================
template <class K, class T> class QMap {
public:
+
+ // typedefs ----------------------------------------------------------------
+
typedef QMapIterator<K, T> Iterator;
typedef QMapConstIterator< K, T> ConstIterator;
+
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ QMap();
+ QMap(const QMap<K,T>&);
+
+ ~QMap();
+
+ // member functions --------------------------------------------------------
+
+ void clear();
+ uint count() const;
+
Iterator begin();
Iterator end();
+
ConstIterator begin() const;
ConstIterator end() const;
+
Iterator insert(const K&, const T&);
- ConstIterator find (const K &) const;
void remove(const K&);
- void clear();
- uint count() const;
-
+
+ ConstIterator find (const K &) const;
+
+ // operators ---------------------------------------------------------------
+
+ QMap<K,T>& operator=(const QMap<K,T>&);
T& operator[](const K& k);
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QMap ===============================================================
#endif
diff --git a/WebCore/src/kwq/qt/qmovie.h b/WebCore/src/kwq/qt/qmovie.h
index d62934e..7843d88 100644
--- a/WebCore/src/kwq/qt/qmovie.h
+++ b/WebCore/src/kwq/qt/qmovie.h
@@ -32,13 +32,30 @@
#include "qimage.h"
#include "qrect.h"
+// class QMovie ================================================================
+
class QMovie {
public:
+
+ // typedefs ----------------------------------------------------------------
+
+ // enums -------------------------------------------------------------------
+
enum Status { EndOfFrame, EndOfMovie };
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QMovie();
QMovie(QDataSource*, int bufsize=1024);
+ QMovie(const QMovie &);
+ ~QMovie();
+
+ // member functions --------------------------------------------------------
+
void unpause();
void pause();
void restart();
@@ -57,6 +74,14 @@ public:
void disconnectResize(QObject* receiver, const char *member=0);
void disconnectUpdate(QObject* receiver, const char *member=0);
void disconnectStatus(QObject* receiver, const char *member=0);
-};
+
+ // operators ---------------------------------------------------------------
+
+ QMovie &operator=(const QMovie &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QMovie =============================================================
#endif
diff --git a/WebCore/src/kwq/qt/qnamespace.h b/WebCore/src/kwq/qt/qnamespace.h
index 5309336..60202fe 100644
--- a/WebCore/src/kwq/qt/qnamespace.h
+++ b/WebCore/src/kwq/qt/qnamespace.h
@@ -29,9 +29,16 @@
class QColor;
class QCursor;
+// class Qt ====================================================================
+
class Qt {
public:
- enum ButtonState {
+
+ // typedefs ----------------------------------------------------------------
+
+ // enums -------------------------------------------------------------------
+
+ enum ButtonState {
LeftButton,
MidButton,
RightButton,
@@ -67,10 +74,12 @@ public:
};
enum Key {
- Key_Escape = 0x1000, // misc keys
+ Key_Escape = 0x1000,
Key_Tab = 0x1001,
- Key_Backtab = 0x1002, Key_BackTab = Key_Backtab,
- Key_Backspace = 0x1003, Key_BackSpace = Key_Backspace,
+ Key_Backtab = 0x1002,
+ Key_BackTab = Key_Backtab,
+ Key_Backspace = 0x1003,
+ Key_BackSpace = Key_Backspace,
Key_Return = 0x1004,
Key_Enter = 0x1005,
Key_Insert = 0x1006,
@@ -78,7 +87,7 @@ public:
Key_Pause = 0x1008,
Key_Print = 0x1009,
Key_SysReq = 0x100a,
- Key_Home = 0x1010, // cursor movement
+ Key_Home = 0x1010,
Key_End = 0x1011,
Key_Left = 0x1012,
Key_Up = 0x1013,
@@ -92,6 +101,8 @@ public:
XorROP,
};
+ // constants ---------------------------------------------------------------
+
static const QColor &black;
static const QColor &white;
static const QColor &darkGray;
@@ -99,6 +110,24 @@ public:
static const QCursor &sizeAllCursor;
static const QCursor &splitHCursor;
static const QCursor &splitVCursor;
-};
+
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ Qt();
+ ~Qt();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ Qt(const Qt &);
+ Qt &operator=(const Qt &);
+
+}; // class Qt =================================================================
#endif
diff --git a/WebCore/src/kwq/qt/qobject.h b/WebCore/src/kwq/qt/qobject.h
index 2c59c3d..09bfb8a 100644
--- a/WebCore/src/kwq/qt/qobject.h
+++ b/WebCore/src/kwq/qt/qobject.h
@@ -63,23 +63,54 @@ class QTimer;
class QImage;
class QVariant;
+// class QObject ===============================================================
class QObject : public Qt {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ static bool connect(const QObject *, const char *, const QObject *,
+ const char *);
+
+ static bool disconnect( const QObject *, const char *, const QObject *,
+ const char *);
+
+ // constructors, copy constructors, and destructors ------------------------
+
QObject(QObject *parent=0, const char *name=0);
+
+ // member functions --------------------------------------------------------
+
const char *name() const;
virtual void setName(const char *);
+
QVariant property(const char *name) const;
bool inherits(const char *) const;
- static bool connect(const QObject *, const char *, const QObject *, const char *);
bool connect(const QObject *, const char *, const char *) const;
- static bool disconnect( const QObject *, const char *, const QObject *, const char *);
+
int startTimer(int);
void killTimer(int);
void killTimers();
+
void installEventFilter(const QObject *);
void removeEventFilter(const QObject *);
+
void blockSignals(bool);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QObject(const QObject &);
+ QObject &operator=(const QObject &);
+
+}; // class QObject ============================================================
#endif
diff --git a/WebCore/src/kwq/qt/qpaintdevice.h b/WebCore/src/kwq/qt/qpaintdevice.h
index b988007..327cb1d 100644
--- a/WebCore/src/kwq/qt/qpaintdevice.h
+++ b/WebCore/src/kwq/qt/qpaintdevice.h
@@ -26,10 +26,28 @@
#ifndef QPAINTDEVICE_H_
#define QPAINTDEVICE_H_
-#include "qrect.h"
+// class QPaintDevice ==========================================================
class QPaintDevice {
- friend class QPaintDeviceMetrics;
-};
+friend class QPaintDeviceMetrics;
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QPaintDevice(const QPaintDevice &);
+ QPaintDevice &operator=(const QPaintDevice &);
+
+}; // class QPaintDevice =======================================================
#endif
diff --git a/WebCore/src/kwq/qt/qpaintdevicemetrics.h b/WebCore/src/kwq/qt/qpaintdevicemetrics.h
index d61dbd9..f9161d5 100644
--- a/WebCore/src/kwq/qt/qpaintdevicemetrics.h
+++ b/WebCore/src/kwq/qt/qpaintdevicemetrics.h
@@ -28,11 +28,35 @@
class QPaintDevice;
+// class QPaintDeviceMetrics ===================================================
+
class QPaintDeviceMetrics {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QPaintDeviceMetrics(const QPaintDevice *);
+
+ // member functions --------------------------------------------------------
+
int logicalDpiY() const;
int depth() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QPaintDeviceMetrics(const QPaintDeviceMetrics &);
+ QPaintDeviceMetrics &operator=(const QPaintDeviceMetrics &);
+
+}; // class QPaintDeviceMetrics ================================================
#endif
diff --git a/WebCore/src/kwq/qt/qpainter.h b/WebCore/src/kwq/qt/qpainter.h
index ebab5a6..13afc1a 100644
--- a/WebCore/src/kwq/qt/qpainter.h
+++ b/WebCore/src/kwq/qt/qpainter.h
@@ -39,16 +39,53 @@
class QFont;
class QPixmap;
+// class QWMatrix ==============================================================
+
class QWMatrix {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QWMatrix();
+
+ ~QWMatrix();
+
+ // member functions --------------------------------------------------------
+
QWMatrix &scale(double, double);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QWMatrix ===========================================================
+
+
+// class QPainter ==============================================================
class QPainter : public Qt {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QPainter();
QPainter(const QPaintDevice *);
+ ~QPainter();
+
+ // member functions --------------------------------------------------------
+
const QFont &font() const;
void setFont(const QFont &);
QFontMetrics fontMetrics() const;
@@ -64,19 +101,21 @@ public:
void restore();
void drawRect(int, int, int, int);
- void fillRect(int, int, int, int, const QBrush &);
void drawLine(int, int, int, int);
void drawEllipse(int, int, int, int);
void drawArc(int, int, int, int, int, int);
- void drawPolyline(const QPointArray &, int index = 0, int npoints = -1);
- void drawPolygon(const QPointArray &, bool winding = FALSE, int index = 0,
- int npoints = -1);
+ void drawPolyline(const QPointArray &, int index=0, int npoints=-1);
+ void drawPolygon(const QPointArray &, bool winding=FALSE, int index=0,
+ int npoints=-1);
void drawPixmap(const QPoint &, const QPixmap &);
void drawPixmap(const QPoint &, const QPixmap &, const QRect &);
- void drawTiledPixmap(int, int, int, int, const QPixmap &, int sx = 0, int sy = 0);
- void drawText(int x, int y, const QString &, int len = -1);
+ void drawTiledPixmap(int, int, int, int, const QPixmap &, int sx=0,
+ int sy=0);
+ void drawText(int x, int y, const QString &, int len=-1);
void drawText(int, int, int, int, AlignmentFlags, const QString &);
- void drawText(int, int, int, int, int flags, const QString&, int len = -1, QRect *br=0, char **internal=0);
+ void drawText(int, int, int, int, int flags, const QString&, int len=-1,
+ QRect *br=0, char **internal=0);
+ void fillRect(int, int, int, int, const QBrush &);
void setClipping(bool);
void setClipRegion(const QRegion &);
@@ -84,6 +123,21 @@ public:
bool hasClipping() const;
RasterOp rasterOp() const;
void setRasterOp(RasterOp);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QPainter(const QPainter &);
+ QPainter &operator=(const QPainter &);
+
+
+}; // end class QPainter
+
+// =============================================================================
#endif
diff --git a/WebCore/src/kwq/qt/qpalette.h b/WebCore/src/kwq/qt/qpalette.h
index 201d3b9..bf95e0a 100644
--- a/WebCore/src/kwq/qt/qpalette.h
+++ b/WebCore/src/kwq/qt/qpalette.h
@@ -28,12 +28,42 @@
class QColor;
+// class QColorGroup ===========================================================
+
class QColorGroup {
public:
- enum ColorRole { Foreground, Shadow, Light, Mid, Midlight, Dark, Base, ButtonText, Button, Background, Text };
+
+ // typedefs ----------------------------------------------------------------
+
+ enum ColorRole {
+ Foreground,
+ Shadow,
+ Light,
+ Mid,
+ Midlight,
+ Dark,
+ Base,
+ ButtonText,
+ Button,
+ Background,
+ Text
+ };
+
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ QColorGroup();
+ QColorGroup(const QColorGroup &);
+
+ ~QColorGroup();
+
+ // member functions --------------------------------------------------------
const QColor &color(ColorRole) const;
void setColor(ColorRole, const QColor &);
+
const QColor &foreground() const;
const QColor &shadow() const;
const QColor &light() const;
@@ -44,18 +74,52 @@ public:
const QColor &button() const;
const QColor &text() const;
const QColor &background() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QColorGroup &operator=(const QColorGroup &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QColorGroup ========================================================
+
+
+// class QPalette ==============================================================
class QPalette {
public:
+
+ // typedefs ----------------------------------------------------------------
+
+ // enums -------------------------------------------------------------------
+
enum ColorGroup { Active, Inactive, Disabled };
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QPalette();
+ QPalette(const QPalette &);
+
+ ~QPalette();
+
+ // member functions --------------------------------------------------------
+
void setColor(ColorGroup, QColorGroup::ColorRole role, const QColor &color);
const QColorGroup &active() const;
const QColorGroup &inactive() const;
const QColorGroup &disabled() const;
const QColorGroup &normal() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QPalette ===========================================================
#endif
diff --git a/WebCore/src/kwq/qt/qpen.h b/WebCore/src/kwq/qt/qpen.h
index 822e8a4..fe659bd 100644
--- a/WebCore/src/kwq/qt/qpen.h
+++ b/WebCore/src/kwq/qt/qpen.h
@@ -29,12 +29,35 @@
#include "qnamespace.h"
#include "qcolor.h"
+// class QPen ==================================================================
+
class QPen : public Qt {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QPen();
QPen(const QColor &color, uint width=0, PenStyle style=SolidLine);
+ QPen(const QPen &);
+
+ ~QPen();
+
+ // member functions --------------------------------------------------------
const QColor &color() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QPen &operator=(const QPen &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QPen ===============================================================
#endif
diff --git a/WebCore/src/kwq/qt/qpixmap.h b/WebCore/src/kwq/qt/qpixmap.h
index 56db9a3..0edfdac 100644
--- a/WebCore/src/kwq/qt/qpixmap.h
+++ b/WebCore/src/kwq/qt/qpixmap.h
@@ -31,28 +31,55 @@
#include "qstring.h"
#include "qnamespace.h"
#include "qimage.h"
+#include "qsize.h"
+#include "qrect.h"
class QBitmap;
class QWMatrix;
-class QPixmap : public QPaintDevice {
+// class QPixmap ===============================================================
+
+class QPixmap : public QPaintDevice, public Qt {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QPixmap();
QPixmap(const QSize&);
QPixmap(const QByteArray&);
QPixmap(int,int);
+ QPixmap(const QPixmap &);
+
+ ~QPixmap();
+
+ // member functions --------------------------------------------------------
void setMask(const QBitmap &);
const QBitmap *mask() const;
+ bool isNull() const;
+
QSize size() const;
QRect rect() const;
int width() const;
int height() const;
- bool isNull() const;
void resize(const QSize &);
+
QPixmap xForm(const QWMatrix &) const;
QImage convertToImage() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QPixmap &operator=(const QPixmap &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QPixmap ============================================================
#endif
diff --git a/WebCore/src/kwq/qt/qpoint.h b/WebCore/src/kwq/qt/qpoint.h
index 7d19a03..87c9373 100644
--- a/WebCore/src/kwq/qt/qpoint.h
+++ b/WebCore/src/kwq/qt/qpoint.h
@@ -28,28 +28,75 @@
#include <KWQDef.h>
+// class QPoint ================================================================
+
class QPoint {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QPoint();
QPoint(int, int);
QPoint(const QPoint &);
-
+
+ ~QPoint();
+
+ // member functions --------------------------------------------------------
+
int x() const;
int y() const;
int manhattanLength() const;
+ // operators ---------------------------------------------------------------
+
+ QPoint &operator=(const QPoint &);
+
friend QPoint operator+(const QPoint &, const QPoint &);
friend QPoint operator-(const QPoint &, const QPoint &);
-};
-// FIXME: QPointArray here to workaround bug in khtml/html/html_imageimpl.cpp
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QPoint =============================================================
+
+
+// class QPointArray ===========================================================
+
class QPointArray {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
QPointArray(int);
QPointArray(int, const QCOORD *);
+
+ ~QPointArray();
+
+ // member functions --------------------------------------------------------
+
void setPoint(uint, int, int);
- bool setPoints(int, int, int, ... );
-};
+ bool setPoints(int, int, int, ...);
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QPointArray(const QPointArray &);
+ QPointArray &operator=(const QPointArray &);
+
+}; // class QPointArray ========================================================
-#endif
+#endif
\ No newline at end of file
diff --git a/WebCore/src/kwq/qt/qpopupmenu.h b/WebCore/src/kwq/qt/qpopupmenu.h
index cd231d0..f186004 100644
--- a/WebCore/src/kwq/qt/qpopupmenu.h
+++ b/WebCore/src/kwq/qt/qpopupmenu.h
@@ -26,7 +26,33 @@
#ifndef QPOPUPMENU_H_
#define QPOPUPMENU_H_
+// class QPopupMenu ============================================================
+
class QPopupMenu {
-};
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QPopupMenu();
+
+ ~QPopupMenu();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QPopupMenu(const QPopupMenu &);
+ QPopupMenu &operator=(const QPopupMenu &);
+
+}; // class QPopupMenu =========================================================
#endif
diff --git a/WebCore/src/kwq/qt/qptrdict.h b/WebCore/src/kwq/qt/qptrdict.h
index 090fec5..95ea99f 100644
--- a/WebCore/src/kwq/qt/qptrdict.h
+++ b/WebCore/src/kwq/qt/qptrdict.h
@@ -29,27 +29,75 @@
#include <KWQDef.h>
#include <KWQCollection.h>
+// class QPtrDict ==============================================================
+
template <class T> class QPtrDict : public QCollection {
public:
- QPtrDict(int size=13);
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QPtrDict(int size=17);
+ QPtrDict(const QPtrDict<T> &);
+
+ ~QPtrDict();
+
+ // member functions --------------------------------------------------------
uint count() const;
T *at(uint);
T *take(void *);
+
void append(const T *);
void insert(void *, const T *);
void remove(void *);
+
+ // operators ---------------------------------------------------------------
+
+ QPtrDict<T> &operator=(const QPtrDict<T> &);
T *operator[](void *) const;
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QPtrDict ===========================================================
+
+
+// class QPtrDictIterator ======================================================
template<class T> class QPtrDictIterator {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QPtrDictIterator(const QPtrDict<T> &);
+ // member functions --------------------------------------------------------
+
T *current() const;
void *currentKey() const;
+ // operators ---------------------------------------------------------------
+
T *operator++();
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QPtrDictIterator(const QPtrDictIterator &);
+ QPtrDictIterator &operator=(const QPtrDictIterator &);
+
+}; // class QPtrDictIterator ===================================================
#endif
diff --git a/WebCore/src/kwq/qt/qpushbutton.h b/WebCore/src/kwq/qt/qpushbutton.h
index 328a391..c81de3b 100644
--- a/WebCore/src/kwq/qt/qpushbutton.h
+++ b/WebCore/src/kwq/qt/qpushbutton.h
@@ -31,11 +31,35 @@
#include "qwidget.h"
#include "qstring.h"
+// class QPushButton ===========================================================
+
class QPushButton : public QButton {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QPushButton();
QPushButton(QWidget *);
QPushButton(const QString &text, QWidget *parent, const char* name=0);
-};
+
+ ~QPushButton();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QPushButton(const QPushButton &);
+ QPushButton &operator=(const QPushButton &);
+
+}; // class QPushButton ========================================================
#endif
diff --git a/WebCore/src/kwq/qt/qradiobutton.h b/WebCore/src/kwq/qt/qradiobutton.h
index 521e2f8..f5b269c 100644
--- a/WebCore/src/kwq/qt/qradiobutton.h
+++ b/WebCore/src/kwq/qt/qradiobutton.h
@@ -30,12 +30,37 @@
#include "qwidget.h"
+// class QRadioButton ==========================================================
+
class QRadioButton : public QButton {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QRadioButton();
QRadioButton(QWidget *);
+
+ ~QRadioButton();
+
+ // member functions --------------------------------------------------------
void setChecked(bool);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QRadioButton(const QRadioButton &);
+ QRadioButton &operator=(const QRadioButton &);
+
+}; // class QRadioButton =======================================================
#endif
diff --git a/WebCore/src/kwq/qt/qrect.h b/WebCore/src/kwq/qt/qrect.h
index 546ffea..6cdc4df 100644
--- a/WebCore/src/kwq/qt/qrect.h
+++ b/WebCore/src/kwq/qt/qrect.h
@@ -28,10 +28,28 @@
#include "qsize.h"
+// class QRect =================================================================
+
class QRect {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QRect();
QRect(int l, int t, int w, int h);
+ QRect(const QRect &);
+
+ ~QRect();
+
+ // member functions --------------------------------------------------------
+
+ bool isNull() const;
+ bool isValid() const;
int x() const;
int y() const;
@@ -41,14 +59,20 @@ public:
int bottom() const;
int width() const;
int height() const;
- bool isNull() const;
- bool isValid() const;
QSize size() const;
void setWidth(int);
void setHeight(int);
QRect intersect(const QRect &) const;
bool intersects(const QRect &) const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QRect &operator=(const QRect &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QRect ==============================================================
#endif
diff --git a/WebCore/src/kwq/qt/qregexp.h b/WebCore/src/kwq/qt/qregexp.h
index ec1c524..b567d65 100644
--- a/WebCore/src/kwq/qt/qregexp.h
+++ b/WebCore/src/kwq/qt/qregexp.h
@@ -28,10 +28,31 @@
#include "qstring.h"
+// class QRegExp ===============================================================
+
class QRegExp {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QRegExp();
QRegExp(const QString &);
QRegExp(const QRegExp &);
-};
+
+ // member functions --------------------------------------------------------
+
+ // operators ---------------------------------------------------------------
+
+ QRegExp &operator=(const QRegExp &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QRegExp ============================================================
#endif
diff --git a/WebCore/src/kwq/qt/qregion.h b/WebCore/src/kwq/qt/qregion.h
index 35d02ab..b087686 100644
--- a/WebCore/src/kwq/qt/qregion.h
+++ b/WebCore/src/kwq/qt/qregion.h
@@ -27,25 +27,46 @@
#define QREGION_H_
#include "qpoint.h"
-
-// FIXME: workaround for error on line 58 of khtml/html/html_imageimpl.h
#include "qimage.h"
-
#include "qrect.h"
+// class QRegion ===============================================================
+
class QRegion {
public:
+
+ // typedefs ----------------------------------------------------------------
+
// NOTE: alphabetical order
enum RegionType { Ellipse, Rectangle };
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QRegion();
QRegion(const QRect &);
QRegion(int, int, int, int, RegionType = Rectangle);
QRegion(const QPointArray &);
+ QRegion(const QRegion &);
+
+ ~QRegion();
+
+ // member functions --------------------------------------------------------
QRegion intersect(const QRegion &) const;
bool contains(const QPoint &) const;
bool isNull() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QRegion &operator=(const QRegion &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QRegion ============================================================
#endif
diff --git a/WebCore/src/kwq/qt/qscrollview.h b/WebCore/src/kwq/qt/qscrollview.h
index 41cab1f..2114443 100644
--- a/WebCore/src/kwq/qt/qscrollview.h
+++ b/WebCore/src/kwq/qt/qscrollview.h
@@ -30,9 +30,28 @@
#include <KWQFrame.h>
#include "qwidget.h"
+// class QScrollView ===========================================================
+
class QScrollView : public QFrame {
public:
+
+ // typedefs ----------------------------------------------------------------
+
+ // enums -------------------------------------------------------------------
+
+ // NOTE: alphabetical order
+ enum ScrollBarMode { AlwaysOff, AlwaysOn, Auto };
+
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QScrollView();
+ virtual ~QScrollView();
+
+ // member functions --------------------------------------------------------
+
QWidget* viewport() const;
int visibleWidth() const;
int visibleHeight() const;
@@ -40,18 +59,32 @@ public:
int contentsX() const;
int contentsY() const;
void scrollBy(int dx, int dy);
+
virtual void setContentsPos(int x, int y);
- // NOTE: alphabetical order
- enum ScrollBarMode { AlwaysOff, AlwaysOn, Auto };
+
QScrollBar *horizontalScrollBar() const;
QScrollBar *verticalScrollBar() const;
+
virtual void setVScrollBarMode(ScrollBarMode);
virtual void setHScrollBarMode(ScrollBarMode);
+
virtual void addChild(QWidget* child, int x=0, int y=0);
void removeChild(QWidget* child);
+
virtual void resizeContents(int w, int h);
void updateContents(int x, int y, int w, int h);
void repaintContents(int x, int y, int w, int h, bool erase=TRUE);
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QScrollView(const QScrollView &);
+ QScrollView &operator=(const QScrollView &);
+
+}; // class QScrollView ========================================================
#endif
diff --git a/WebCore/src/kwq/qt/qsize.h b/WebCore/src/kwq/qt/qsize.h
index 34a7141..195708a 100644
--- a/WebCore/src/kwq/qt/qsize.h
+++ b/WebCore/src/kwq/qt/qsize.h
@@ -26,11 +26,26 @@
#ifndef QSIZE_H_
#define QSIZE_H_
+// class QSize =================================================================
+
class QSize {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QSize();
QSize(int,int);
-
+ QSize(const QSize &);
+
+ ~QSize();
+
+ // member functions --------------------------------------------------------
+
bool isValid() const;
int width() const;
int height() const;
@@ -38,9 +53,17 @@ public:
void setHeight(int);
QSize expandedTo(const QSize &) const;
+ // operators ---------------------------------------------------------------
+
+ QSize &operator=(const QSize &);
+
friend inline QSize operator+(const QSize &, const QSize &);
friend inline bool operator==(const QSize &, const QSize &);
friend inline bool operator!=(const QSize &, const QSize &);
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QSize ==============================================================
#endif
diff --git a/WebCore/src/kwq/qt/qsortedlist.h b/WebCore/src/kwq/qt/qsortedlist.h
index 1e5f26e..caa9d38 100644
--- a/WebCore/src/kwq/qt/qsortedlist.h
+++ b/WebCore/src/kwq/qt/qsortedlist.h
@@ -28,7 +28,32 @@
#include "qlist.h"
+// class QSortedList ===========================================================
+
template<class T> class QSortedList : public QList<T> {
-};
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QSortedList();
+ QSortedList(const QSortedList<T> &);
+
+ ~QSortedList();
+
+ // member functions --------------------------------------------------------
+
+ // operators ---------------------------------------------------------------
+
+ QSortedList<T> &operator=(const QSortedList<T> &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QSortedList ========================================================
#endif
diff --git a/WebCore/src/kwq/qt/qstack.h b/WebCore/src/kwq/qt/qstack.h
index 38fa256..3570460 100644
--- a/WebCore/src/kwq/qt/qstack.h
+++ b/WebCore/src/kwq/qt/qstack.h
@@ -26,11 +26,35 @@
#ifndef QSTACK_H_
#define QSTACK_H_
+// class QStack ================================================================
+
template<class T> class QStack {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ QStack();
+ QStack(const QStack<T> &);
+
+ ~QStack();
+
+ // member functions --------------------------------------------------------
+
bool isEmpty() const;
- void push(const T *d);
+ void push(const T *);
T *pop();
-};
+
+ // operators ---------------------------------------------------------------
+
+ QStack<T> &operator=(const QStack<T> &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QStack =============================================================
#endif
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index 3bb1d8a..cfa8684 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -31,14 +31,14 @@
class QString;
class QRegExp;
-// =============================================================================
-// QChar class
+// QChar class =================================================================
class QChar {
public:
- // -------------------------------------------------------------------------
- // enums
+ // typedefs ----------------------------------------------------------------
+
+ // enums -------------------------------------------------------------------
enum Direction {
// NOTE: alphabetical order
@@ -46,13 +46,13 @@ public:
DirLRO, DirNSM, DirON, DirPDF, DirR, DirRLE, DirRLO, DirS, DirWS
};
- // -------------------------------------------------------------------------
- // constants
+ // constants ---------------------------------------------------------------
static const QChar null;
- // -------------------------------------------------------------------------
- // constructors, copy constructors, and destructors
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
QChar();
QChar(char);
@@ -63,11 +63,7 @@ public:
QChar(uint);
QChar(int);
- // -------------------------------------------------------------------------
- // static member functions
-
- // -------------------------------------------------------------------------
- // member functions
+ // member functions --------------------------------------------------------
QChar lower() const;
QChar upper() const;
@@ -85,8 +81,7 @@ public:
QChar mirroredChar() const;
ushort unicode() const;
- // -------------------------------------------------------------------------
- // operators
+ // operators ---------------------------------------------------------------
friend int operator==(char, QChar);
friend int operator==(QChar, char);
@@ -96,48 +91,46 @@ public:
friend int operator!=(QChar, char);
operator char() const;
-}; // end class QChar
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QChar ==============================================================
+
-// =============================================================================
-// QString class
+// QString class ===============================================================
class QString {
public:
- static QString fromLatin1(const char*, int len = -1);
+ static QString fromLatin1(const char*, int len=-1);
- // -------------------------------------------------------------------------
- // enums
-
- // -------------------------------------------------------------------------
- // constants
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
static const QString null;
- // -------------------------------------------------------------------------
- // constructors, copy constructors, and destructors
+ // static member functions -------------------------------------------------
+
+ static QString number(long, int base=10);
+
+ // constructors, copy constructors, and destructors ------------------------
QString();
QString(QChar);
- QString(const QString&);
- QString(const QByteArray&);
+ QString(const QString &);
+ QString(const QByteArray &);
QString(const QChar *, uint);
QString(const char *);
- QString &operator=(const QString&);
- QString &operator=(const char *);
- QString &operator=(const QCString&);
QString &operator=(QChar);
+ QString &operator=(const QString &);
+ QString &operator=(const char *);
+ QString &operator=(const QCString &);
QString &operator=(char);
~QString();
- // -------------------------------------------------------------------------
- // static member functions
-
- static QString number(long, int base = 10);
-
- // -------------------------------------------------------------------------
- // member functions
+ // member functions --------------------------------------------------------
bool isNull() const;
bool isEmpty() const;
@@ -146,9 +139,9 @@ public:
int toInt() const;
int toInt(bool *, int base=10) const;
- uint toUInt(bool *ok = 0, int base = 10) const;
- long toLong(bool *ok = 0, int base = 10) const;
- float toFloat(bool *b = 0) const;
+ uint toUInt(bool *ok=0, int base=10) const;
+ long toLong(bool *ok=0, int base=10) const;
+ float toFloat(bool *b=0) const;
QString &prepend(const QString &);
QString &append(const char *);
@@ -159,25 +152,25 @@ public:
int contains(char) const;
int find(char, int index=0) const;
- int find(const char *, int index = 0, bool b = 0) const;
- int find(const QString &, int index = 0, bool b = 0) const;
- int find(const QRegExp &, int index = 0, bool b = 0) const;
- int findRev(char, int index = 0) const;
- int findRev(const char *, int index = 0) const;
+ int find(const char *, int index=0, bool b=0) const;
+ int find(const QString &, int index=0, bool b=0) const;
+ int find(const QRegExp &, int index=0, bool b=0) const;
+ int findRev(char, int index=0) const;
+ int findRev(const char *, int index=0) const;
QString &remove(uint, uint);
QString &replace(const QRegExp &, const QString &);
QString &insert(uint, char);
void truncate(uint pos);
- void fill(QChar, int len = -1);
+ void fill(QChar, int len=-1);
QString arg (int &);
QString arg(int a, int fieldwidth=0, int base=10) const;
- QString arg(const QString&, int fieldwidth = 0) const;
+ QString arg(const QString &, int fieldwidth = 0) const;
QString left(uint) const;
QString right(uint) const;
- QString mid(int, int len = 0xffffffff) const;
+ QString mid(int, int len=0xffffffff) const;
const char* latin1() const;
const char *ascii() const;
@@ -186,16 +179,15 @@ public:
QCString local8Bit() const;
QString &setUnicode(const QChar *, uint);
- QString &setNum(int, int base = 10);
+ QString &setNum(int, int base=10);
QString &sprintf(const char *, ...);
QString lower() const;
QString stripWhiteSpace() const;
QString simplifyWhiteSpace() const;
void compose();
- QString visual(int index = 0, int len = -1);
+ QString visual(int index=0, int len=-1);
- // -------------------------------------------------------------------------
- // operators
+ // operators ---------------------------------------------------------------
bool operator!() const;
operator const char *() const;
@@ -207,11 +199,14 @@ public:
QString &operator+=(QChar);
QString &operator+=(const QString &);
operator QChar () const;
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
-}; // end class QString
+}; // class QString ============================================================
-// =============================================================================
-// operators associated with QChar and QString
+
+// operators associated with QChar and QString =================================
QString &operator+(const char *, const QString &);
QString &operator+(QChar, const QString &);
@@ -225,36 +220,30 @@ bool operator!=(const QString &, const char *);
bool operator!=(const char *, const QString &);
QString operator+(char, const QString &);
-// =============================================================================
-// QConstString class
+
+// class QConstString ==========================================================
class QConstString {
public:
- // -------------------------------------------------------------------------
- // enums
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
- // -------------------------------------------------------------------------
- // constants
-
- // -------------------------------------------------------------------------
- // static member functions
+ // static member functions -------------------------------------------------
const QString string() const;
- // -------------------------------------------------------------------------
- // constructors, copy constructors, and destructors
+ // constructors, copy constructors, and destructors ------------------------
QConstString(QChar *, uint);
- // -------------------------------------------------------------------------
- // member functions
-
- // -------------------------------------------------------------------------
- // operators
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
-}; // end class QConstString
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
-// =============================================================================
+}; // class QConstString =======================================================
#endif
diff --git a/WebCore/src/kwq/qt/qstringlist.h b/WebCore/src/kwq/qt/qstringlist.h
index 662588a..a697574 100644
--- a/WebCore/src/kwq/qt/qstringlist.h
+++ b/WebCore/src/kwq/qt/qstringlist.h
@@ -29,11 +29,40 @@
#include "qstring.h"
#include "qvaluelist.h"
+// class QStringList ===========================================================
+
class QStringList : public QValueList<QString> {
public:
- static QStringList split(const QString &sep, const QString &str, bool allowEmptyEntries = FALSE );
- static QStringList split(const QChar &sep, const QString &str, bool allowEmptyEntries = FALSE );
- QString join(const QString &sepx ) const;
-};
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+
+ // static member functions -------------------------------------------------
+
+ static QStringList split(const QString &, const QString &,
+ bool allowEmptyEntries = FALSE );
+ static QStringList split(const QChar &, const QString &,
+ bool allowEmptyEntries = FALSE );
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QStringList();
+ QStringList(const QStringList &);
+
+ ~QStringList();
+
+ // member functions --------------------------------------------------------
+
+ QString join(const QString &) const;
+
+ // operators ---------------------------------------------------------------
+
+ QStringList &operator=(const QStringList &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QStringList ========================================================
#endif
diff --git a/WebCore/src/kwq/qt/qtextcodec.h b/WebCore/src/kwq/qt/qtextcodec.h
index 5ea5020..8689bb8 100644
--- a/WebCore/src/kwq/qt/qtextcodec.h
+++ b/WebCore/src/kwq/qt/qtextcodec.h
@@ -29,24 +29,81 @@
#include "qstring.h"
#include "qcstring.h"
+// class QTextDecoder ==========================================================
+
class QTextDecoder {
public:
- virtual QString toUnicode(const char *, int) = 0;
-};
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QTextDecoder();
+
+ virtual ~QTextDecoder();
+
+ // member functions --------------------------------------------------------
+
+ virtual QString toUnicode(const char *, int)=0;
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QTextDecoder(const QTextDecoder &);
+ QTextDecoder &operator=(const QTextDecoder &);
+
+}; // class QTextDecoder =======================================================
+
+
+// class QTextCodec ============================================================
class QTextCodec {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+
+ // static member functions -------------------------------------------------
+
static QTextCodec *codecForMib(int);
- static QTextCodec *codecForName(const char *, int accuracy = 0);
+ static QTextCodec *codecForName(const char *, int accuracy=0);
static QTextCodec *codecForLocale();
- virtual const char* name() const = 0;
- virtual int mibEnum() const = 0;
+ // constructors, copy constructors, and destructors ------------------------
+
+ QTextCodec();
+
+ virtual ~QTextCodec();
+
+ // member functions --------------------------------------------------------
+
+ virtual const char* name() const=0;
+ virtual int mibEnum() const=0;
virtual QTextDecoder *makeDecoder() const;
QCString fromUnicode(const QString &) const;
+
virtual QString toUnicode(const char *, int) const;
QString toUnicode(const QByteArray &, int) const;
QString toUnicode(const char *) const;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QTextCodec(const QTextCodec &);
+ QTextCodec &operator=(const QTextCodec &);
+
+}; // class QTextCodec =========================================================
#endif
diff --git a/WebCore/src/kwq/qt/qtextstream.h b/WebCore/src/kwq/qt/qtextstream.h
index eb94205..7024dcf 100644
--- a/WebCore/src/kwq/qt/qtextstream.h
+++ b/WebCore/src/kwq/qt/qtextstream.h
@@ -28,26 +28,106 @@
#include "qstring.h"
+// class QTextStream ===========================================================
+
class QTextStream {
public:
- QTextStream();
- QTextStream(QByteArray, int);
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QTextStream();
+ QTextStream(QByteArray, int);
+
+ virtual ~QTextStream();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
QTextStream &operator<<(char);
QTextStream &operator<<(const char *);
- QTextStream &operator<<(const QCString&);
- QTextStream &operator<<(const QString&);
-};
+ QTextStream &operator<<(const QCString &);
+ QTextStream &operator<<(const QString &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QTextStream(const QTextStream &);
+ QTextStream &operator=(const QTextStream &);
+
+}; // class QTextStream ========================================================
+
+
+// class QTextIStream ==========================================================
class QTextIStream : public QTextStream {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QTextIStream(QString *);
+
+ virtual ~QTextIStream();
+
+ // member functions --------------------------------------------------------
+
QString readLine();
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QTextIStream(const QTextIStream &);
+ QTextIStream &operator=(const QTextIStream &);
+
+}; // class QTextIStream =======================================================
+
+
+// class QTextOStream ==========================================================
class QTextOStream : public QTextStream {
public:
- QTextOStream(QByteArray ba);
-};
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QTextOStream(QString *);
+ QTextOStream(QByteArray);
+
+ virtual ~QTextOStream();
+
+ // member functions --------------------------------------------------------
+
+ QString readLine();
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QTextOStream(const QTextOStream &);
+ QTextOStream &operator=(const QTextOStream &);
+
+}; // class QTextOStream =======================================================
#endif
diff --git a/WebCore/src/kwq/qt/qtimer.h b/WebCore/src/kwq/qt/qtimer.h
index aa069b9..52e0b25 100644
--- a/WebCore/src/kwq/qt/qtimer.h
+++ b/WebCore/src/kwq/qt/qtimer.h
@@ -28,9 +28,36 @@
#include "qobject.h"
+// class QTimer ================================================================
+
class QTimer : public QObject {
public:
- static void singleShot(int msec, QObject *receiver, const char *member);
-};
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+
+ // static member functions -------------------------------------------------
+
+ static void singleShot(int, QObject *, const char *);
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QTimer();
+
+ ~QTimer();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QTimer(const QTimer &);
+ QTimer &operator=(const QTimer &);
+
+}; // class QTimer =============================================================
#endif
diff --git a/WebCore/src/kwq/qt/qtooltip.h b/WebCore/src/kwq/qt/qtooltip.h
index 7c024a6..5ee206f 100644
--- a/WebCore/src/kwq/qt/qtooltip.h
+++ b/WebCore/src/kwq/qt/qtooltip.h
@@ -26,11 +26,40 @@
#ifndef QTOOLTIP_H_
#define QTOOLTIP_H_
-class QPalette;
+#include "qnamespace.h"
+#include "qpalette.h"
+#include "qwidget.h"
-class QToolTip {
+// class QToolTip ==============================================================
+
+class QToolTip : public Qt {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+
+ // static member functions -------------------------------------------------
+
static QPalette palette();
-};
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QToolTip(QWidget *);
+
+ ~QToolTip();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QToolTip(const QToolTip &);
+ QToolTip &operator=(const QToolTip &);
+
+}; // class QToolTip ===========================================================
#endif
diff --git a/WebCore/src/kwq/qt/qvaluelist.h b/WebCore/src/kwq/qt/qvaluelist.h
index 904fa88..fdc3446 100644
--- a/WebCore/src/kwq/qt/qvaluelist.h
+++ b/WebCore/src/kwq/qt/qvaluelist.h
@@ -28,48 +28,128 @@
#include <KWQDef.h>
+// class QValueListIterator ====================================================
+
template<class T> class QValueListIterator {
public:
- bool operator!=(const QValueListIterator<T>& it);
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QValueListIterator();
+ QValueListIterator(const QValueListIterator<T>&);
+
+ ~QValueListIterator();
+
+ // member functions --------------------------------------------------------
+
+ // operators ---------------------------------------------------------------
+
+ bool operator==(const QValueListIterator<T>&);
+ bool operator!=(const QValueListIterator<T>&);
T& operator*();
const T& operator*() const;
QValueListIterator<T>& operator++();
QValueListIterator<T>& operator++(int);
QValueListIterator<T>& operator--();
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QValueListIterator =================================================
+
+
+// class QValueListConstIterator ===============================================
template<class T> class QValueListConstIterator {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QValueListConstIterator();
- QValueListConstIterator(const QValueListIterator<T>& it);
+ QValueListConstIterator(const QValueListIterator<T>&);
+
+ ~QValueListConstIterator();
+
+ // member functions --------------------------------------------------------
+
+ // operators ---------------------------------------------------------------
+
+ bool operator==(const QValueListConstIterator<T>&);
+ bool operator!=(const QValueListConstIterator<T>&);
+ T& operator*();
QValueListConstIterator operator++();
QValueListConstIterator operator++(int);
- bool operator!=(const QValueListConstIterator<T>& it);
- T& operator*();
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QValueListConstIterator ============================================
+
+
+// class QValueList ============================================================
template <class T> class QValueList {
public:
+
+ // typedefs ----------------------------------------------------------------
+
typedef QValueListIterator<T> Iterator;
typedef QValueListConstIterator<T> ConstIterator;
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QValueList();
+ QValueList(const QValueList<T>&);
+
+ ~QValueList();
+
+ // member functions --------------------------------------------------------
+
void clear();
uint count() const;
bool isEmpty() const;
+
void append(const T&);
void remove(const T&);
+
uint contains(const T&);
+
Iterator remove(Iterator);
Iterator fromLast();
+
const T& first() const;
const T& last() const;
+
Iterator begin();
Iterator end();
+
ConstIterator begin() const;
ConstIterator end() const;
+
+ // operators ---------------------------------------------------------------
+
+ QValueList<T>& operator=(const QValueList<T>&);
T& operator[] (uint);
const T& operator[] (uint) const;
QValueList<T> &operator+=(const T &);
-};
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QValueList =========================================================
#endif
diff --git a/WebCore/src/kwq/qt/qvariant.h b/WebCore/src/kwq/qt/qvariant.h
index 9f39241..279fb8b 100644
--- a/WebCore/src/kwq/qt/qvariant.h
+++ b/WebCore/src/kwq/qt/qvariant.h
@@ -30,24 +30,45 @@ typedef unsigned int uint;
class QString;
-// this isn't used in this class, but it other classes expect the forward decl
-class QImage;
+// class QVariant ==============================================================
class QVariant {
public:
+
+ // typedefs ----------------------------------------------------------------
+
enum Type {
UInt,
Bool
};
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QVariant();
QVariant(bool, int);
QVariant(double);
- QVariant(const QString&);
+ QVariant(const QString &);
+ QVariant(const QVariant &);
+
+ ~QVariant();
+ // member functions --------------------------------------------------------
+
Type type() const;
bool toBool() const;
uint toUInt() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QVariant &operator=(const QVariant &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QVariant ===========================================================
#endif
diff --git a/WebCore/src/kwq/qt/qvector.h b/WebCore/src/kwq/qt/qvector.h
index 405765a..c742154 100644
--- a/WebCore/src/kwq/qt/qvector.h
+++ b/WebCore/src/kwq/qt/qvector.h
@@ -31,15 +31,56 @@
typedef void *Item;
+// class QGVector ==============================================================
+
class QGVector : public QCollection {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+
+ // static member functions -------------------------------------------------
+
virtual int compareItems(Item, Item);
-};
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QGVector();
+
+ // member functions --------------------------------------------------------
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QGVector(const QGVector &);
+ QGVector &operator=(const QGVector &);
+
+}; // class QGVector ===========================================================
+
+
+// class QVector ===============================================================
template<class T> class QVector : public QGVector {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
QVector();
QVector(uint);
+ QVector(const QVector &);
+
+ ~QVector();
+
+ // member functions --------------------------------------------------------
bool isEmpty() const;
uint count() const;
@@ -49,7 +90,14 @@ public:
bool insert(uint, const T *);
T *at(int) const;
+ // operators ---------------------------------------------------------------
+
T *operator[](int) const;
-};
+ QVector &operator=(const QVector &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QVector ============================================================
#endif
diff --git a/WebCore/src/kwq/qt/qwidget.h b/WebCore/src/kwq/qt/qwidget.h
index 664d621..f0c2191 100644
--- a/WebCore/src/kwq/qt/qwidget.h
+++ b/WebCore/src/kwq/qt/qwidget.h
@@ -37,9 +37,15 @@
#include "qevent.h"
#include <KWQStyle.h>
+// class QWidget ===============================================================
+
class QWidget : public QObject, public QPaintDevice {
public:
+ // typedefs ----------------------------------------------------------------
+
+ // enums -------------------------------------------------------------------
+
enum FocusPolicy {
NoFocus = 0,
TabFocus = 0x1,
@@ -48,46 +54,75 @@ public:
WheelFocus = 0x7
};
- // FIXME: do any of these methods need to be virtual?
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ QWidget(QWidget *parent=0, const char *name=0, WFlags f=0);
+
+ virtual ~QWidget();
+
+ // member functions --------------------------------------------------------
+
+ virtual QSize sizeHint() const;
+ virtual void resize(int,int);
+ virtual void setActiveWindow();
+ virtual void setEnabled(bool);
+ virtual void setAutoMask(bool);
+ virtual void setMouseTracking(bool);
+
int winId() const;
int x() const;
int y() const;
int width() const;
int height() const;
QSize size() const;
- virtual QSize sizeHint() const;
- virtual void resize(int,int);
void resize(const QSize &);
QPoint pos() const;
- virtual void move(const QPoint &);
void move(int, int);
+ virtual void move(const QPoint &);
+
QWidget *topLevelWidget() const;
+
QPoint mapToGlobal(const QPoint &) const;
+
void setFocus();
void clearFocus();
FocusPolicy focusPolicy() const;
virtual void setFocusPolicy(FocusPolicy);
virtual void setFocusProxy( QWidget * );
- virtual void setActiveWindow();
- virtual void setEnabled(bool);
+
const QPalette& palette() const;
virtual void setPalette(const QPalette &);
void unsetPalette();
- virtual void setAutoMask(bool);
- virtual void setMouseTracking(bool);
+
QStyle &style() const;
void setStyle(QStyle *);
+
QFont font() const;
virtual void setFont(const QFont &);
+
void constPolish() const;
virtual QSize minimumSizeHint() const;
bool isVisible() const;
virtual void setCursor(const QCursor &);
bool event(QEvent *);
bool focusNextPrevChild(bool);
+ bool hasMouseTracking() const;
+
virtual void show();
virtual void hide();
- bool hasMouseTracking() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QWidget(const QWidget &);
+ QWidget &operator=(const QWidget &);
+
+}; // class QWidget ============================================================
#endif
diff --git a/WebCore/src/kwq/qt/qxml.h b/WebCore/src/kwq/qt/qxml.h
index e328792..5935eb0 100644
--- a/WebCore/src/kwq/qt/qxml.h
+++ b/WebCore/src/kwq/qt/qxml.h
@@ -28,52 +28,161 @@
class QString;
+// class QXmlAttributes ========================================================
+
class QXmlAttributes {
public:
- QString value(const QString& qName) const;
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QXmlAttributes();
+ QXmlAttributes(const QXmlAttributes &);
+
+ virtual ~QXmlAttributes();
+
+ // member functions --------------------------------------------------------
+
+ QString value(const QString &) const;
int length() const;
QString localName(int index) const;
QString value(int index) const;
-};
+
+ // operators ---------------------------------------------------------------
+
+ QXmlAttributes &operator=(const QXmlAttributes &);
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+}; // class QXmlAttributes =====================================================
+
+
+// class QXmlInputSource ========================================================
class QXmlInputSource {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QXmlInputSource();
+
+ virtual ~QXmlInputSource();
+
+ // member functions --------------------------------------------------------
+
virtual void setData(const QString& data);
-};
-class QXmlDTDHandler {
-};
+ // operators ---------------------------------------------------------------
-class QXmlDeclHandler {
-};
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
-class QXmlErrorHandler {
-};
+private:
+ // no copying or assignment
+ QXmlInputSource(const QXmlInputSource &);
+ QXmlInputSource &operator=(const QXmlInputSource &);
-class QXmlLexicalHandler {
-};
+}; // class QXmlInputSource =====================================================
-class QXmlContentHandler {
-};
-class QXmlDefaultHandler : public QXmlContentHandler, public QXmlLexicalHandler, public QXmlErrorHandler, public QXmlDeclHandler, public QXmlDTDHandler {
+class QXmlDTDHandler {};
+
+class QXmlDeclHandler {};
+
+class QXmlErrorHandler {};
+
+class QXmlLexicalHandler {};
+
+class QXmlContentHandler {};
+
+class QXmlDefaultHandler :
+ public QXmlContentHandler,
+ public QXmlLexicalHandler,
+ public QXmlErrorHandler,
+ public QXmlDeclHandler,
+ public QXmlDTDHandler {
};
+
+// class QXmlSimpleReader ======================================================
+
class QXmlSimpleReader {
public:
- void setContentHandler(QXmlContentHandler* handler);
- bool parse(const QXmlInputSource& input);
- void setLexicalHandler(QXmlLexicalHandler* handler);
- void setDTDHandler(QXmlDTDHandler* handler);
- void setDeclHandler(QXmlDeclHandler* handler);
- void setErrorHandler(QXmlErrorHandler* handler);
-};
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+ // constructors, copy constructors, and destructors ------------------------
+
+ QXmlSimpleReader();
+
+ ~QXmlSimpleReader();
+
+ // member functions --------------------------------------------------------
+
+ void setContentHandler(QXmlContentHandler *handler);
+ bool parse(const QXmlInputSource &input);
+ void setLexicalHandler(QXmlLexicalHandler *handler);
+ void setDTDHandler(QXmlDTDHandler *handler);
+ void setDeclHandler(QXmlDeclHandler *handler);
+ void setErrorHandler(QXmlErrorHandler *handler);
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QXmlSimpleReader(const QXmlSimpleReader &);
+ QXmlSimpleReader &operator=(const QXmlSimpleReader &);
+
+}; // class QXmlSimpleReader ===================================================
+
+
+// class QXmlParseException ====================================================
class QXmlParseException {
public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QXmlParseException();
+
+ ~QXmlParseException();
+
+ // member functions --------------------------------------------------------
+
QString message() const;
int columnNumber() const;
int lineNumber() const;
-};
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QXmlParseException(const QXmlParseException &);
+ QXmlParseException &operator=(const QXmlParseException &);
+
+}; // class QXmlParseException =================================================
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list