[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

Sat Sep 26 05:44:15 UTC 2009

The following commit has been merged in the debian/unstable branch:
commit 7af9d9eb2dc4aaf83b106680953e06b53d022bee
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 5 22:57:41 2001 +0000

    Various changes to remove files that are not explicitly included by KDE/QT code.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@109 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQAsyncIO.h b/WebCore/kwq/KWQAsyncIO.h
index f5b0912..6f1116b 100644
--- a/WebCore/kwq/KWQAsyncIO.h
+++ b/WebCore/kwq/KWQAsyncIO.h
@@ -26,7 +26,7 @@
 #ifndef QASYNCIO_H_
 #define QASYNCIO_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
 
 class QAsynchIO {
 protected:
diff --git a/WebCore/kwq/KWQBuffer.h b/WebCore/kwq/KWQBuffer.h
index 13faf38..8a4781e 100644
--- a/WebCore/kwq/KWQBuffer.h
+++ b/WebCore/kwq/KWQBuffer.h
@@ -26,7 +26,7 @@
 #ifndef QBUFFER_H_
 #define QBUFFER_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
 
 #include "qstring.h"
 
diff --git a/WebCore/kwq/KWQCheckBox.h b/WebCore/kwq/KWQCheckBox.h
index 41c34bc..3e60fd6 100644
--- a/WebCore/kwq/KWQCheckBox.h
+++ b/WebCore/kwq/KWQCheckBox.h
@@ -26,9 +26,9 @@
 #ifndef QCHECKBOX_H_
 #define QCHECKBOX_H_
 
-#include "qbutton.h"
+#include <KWQButton.h>
 
-class QCheckBox : public QButton {
+class QCheckBox : public KWQButton {
 public:
     QCheckBox();
     QCheckBox(QWidget *parent);
diff --git a/WebCore/src/kwq/kdecore/kcompletion.h b/WebCore/kwq/KWQCompletion.h
similarity index 84%
copy from WebCore/src/kwq/kdecore/kcompletion.h
copy to WebCore/kwq/KWQCompletion.h
index 382975e..e38ed86 100644
--- a/WebCore/src/kwq/kdecore/kcompletion.h
+++ b/WebCore/kwq/KWQCompletion.h
@@ -23,22 +23,22 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef KCOMPLETION_H_
-#define KCOMPLETION_H_
+#ifndef KWQCOMPLETION_H_
+#define KWQCOMPLETION_H_
 
 #include <qobject.h>
 #include <qstringlist.h>
 
-class KCompletion : public QObject {
+class KWQCompletion : public QObject {
 public:
-    KCompletion();
-    void setItems(const QStringList&);
+    KWQCompletion();
+    void setItems(const QStringList &);
 };
 
-class KCompletionBase {
+class KWQCompletionBase {
 public:
-     KCompletionBase();
-     KCompletion *completionObject(bool hsig = true);
+     KWQCompletionBase();
+     KWQCompletion *completionObject(bool hsig = true);
 };
 
 #endif
diff --git a/WebCore/kwq/qt/qcolor.h b/WebCore/kwq/KWQDef.h
similarity index 69%
copy from WebCore/kwq/qt/qcolor.h
copy to WebCore/kwq/KWQDef.h
index 7e675a9..93d3830 100644
--- a/WebCore/kwq/qt/qcolor.h
+++ b/WebCore/kwq/KWQDef.h
@@ -23,35 +23,42 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef QCOLOR_H_
-#define QCOLOR_H_
+#ifndef KWQDEF_H_
+#define KWQDEF_H_
 
-#include "qstring.h"
+typedef unsigned char uchar;
+typedef unsigned short ushort;
+typedef unsigned uint;
 
-class QColor {
-public:
-    QColor();
-    QColor(int,int,int);
-    QColor(const char *);
+typedef int Q_INT32;  
+typedef unsigned int Q_UINT32;  
 
-    QString name() const;
-    void setNamedColor(const QString&);
-    int red() const;
-    int green() const;
-    int blue() const;
-    bool isValid() const;
-    void setRgb(int,int,int);
-    void setRgb(int);
+typedef Q_INT32 QCOORD;
 
-    void hsv(int *, int *, int *) const;
+typedef uint WFlags;
+typedef int WId;
 
-    QColor light(int f = 150) const;
-    QColor dark(int f = 200) const;
+#define QMAX(a,b) ((a) > (b) ? (a) : (b))
+#define QMIN(a,b) ((a) < (b) ? (a) : (b))
 
-    QColor &operator=(const QColor &);
-    bool operator==(const QColor &x) const;
-    bool operator!=(const QColor &x) const;
+#define KMAX(a,b) QMAX(a, b)
+#define KMIN(a,b) QMIN(a, b)
 
-};
+#define QABS(a) (((a) >= 0) ? (a) : -(a))
+
+#ifndef TRUE
+#define TRUE (1)
+#endif
+
+#ifndef FALSE
+#define FALSE (0)
+#endif
+
+#define ASSERT(a)
+void qDebug(const char *msg, ...);
+
+#ifdef NEED_BOGUS_X_DEFINES
+typedef int XEvent;
+#endif
 
 #endif
diff --git a/WebCore/kwq/KWQDict.h b/WebCore/kwq/KWQDict.h
index 84cf9a4..a663d0c 100644
--- a/WebCore/kwq/KWQDict.h
+++ b/WebCore/kwq/KWQDict.h
@@ -26,8 +26,8 @@
 #ifndef QDICT_H_
 #define QDICT_H_
 
-#include "qcollection.h"
 #include "qstring.h"
+#include "qcollection.h"
 
 template <class T> class QDict : public QCollection {
 public:
diff --git a/WebCore/kwq/KWQFrame.h b/WebCore/kwq/KWQFrame.h
index c7f3dc8..e2b5052 100644
--- a/WebCore/kwq/KWQFrame.h
+++ b/WebCore/kwq/KWQFrame.h
@@ -30,6 +30,7 @@
 
 class QFrame : public QWidget {
 public:
+
     enum Shape {
         NoFrame,
         Box,
diff --git a/WebCore/kwq/KWQIODevice.h b/WebCore/kwq/KWQIODevice.h
deleted file mode 100644
index c63a14e..0000000
--- a/WebCore/kwq/KWQIODevice.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2001 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef QIODEVICE_H_
-#define QIODEVICE_H_
-
-// constants added to help in compilation of html_document.cpp:184
-#define IO_ReadOnly             0x0001          // readable device
-#define IO_WriteOnly            0x0002          // writable device
-#define IO_ReadWrite            0x0003          // read+write device
-#define IO_Append               0x0004          // append
-#define IO_Truncate             0x0008          // truncate device
-#define IO_Translate            0x0010          // translate CR+LF
-#define IO_ModeMask             0x00ff
-
-#endif
diff --git a/WebCore/kwq/kdecore/kicontheme.h b/WebCore/kwq/KWQIcon.h
similarity index 100%
rename from WebCore/kwq/kdecore/kicontheme.h
rename to WebCore/kwq/KWQIcon.h
diff --git a/WebCore/kwq/KWQKComboBox.h b/WebCore/kwq/KWQKComboBox.h
index 2213a24..b18f039 100644
--- a/WebCore/kwq/KWQKComboBox.h
+++ b/WebCore/kwq/KWQKComboBox.h
@@ -27,9 +27,10 @@
 #define KCOMBOBOX_H_
 
 #include <qcombobox.h>
-#include <kcompletion.h>
 
-class KComboBox : public QComboBox, public KCompletionBase {
+#include <KWQCompletion.h>
+
+class KComboBox : public QComboBox, public KWQCompletionBase {
 public:
     KComboBox(QWidget *parent=0, const char *name=0);
     KComboBox(bool rw, QWidget *parent=0, const char *name=0);
diff --git a/WebCore/kwq/KWQKConfigBase.h b/WebCore/kwq/KWQKConfigBase.h
index f365518..17cfd33 100644
--- a/WebCore/kwq/KWQKConfigBase.h
+++ b/WebCore/kwq/KWQKConfigBase.h
@@ -26,9 +26,26 @@
 #ifndef KCONFIG_H_
 #define KCONFIG_H_
 
-#include "kconfigbase.h"
+#include <qobject.h>
+#include <qcolor.h>
+#include <qfont.h>
+#include <qdatetime.h>
+#include <qstring.h>
+#include <qstrlist.h>
+#include <qstringlist.h>
+#include <qvariant.h>
+#include <qmap.h>
+#include <qcolor.h>
 
-class QString;
+class KConfigBase {
+public:
+    void setGroup(const QString& pGroup);
+    QString readEntry(const char *pKey, const QString& aDefault = QString::null) const;
+    int readNumEntry(const char *pKey, int nDefault = 0) const;
+    unsigned int readUnsignedNumEntry(const char *pKey, unsigned int nDefault = 0) const;
+    bool readBoolEntry(const char *pKey, bool nDefault = 0) const;
+    QColor readColorEntry(const char *pKey, const QColor* pDefault = 0L) const;
+};
 
 class KConfig : public KConfigBase {
 public:
diff --git a/WebCore/kwq/KWQKIconLoader.h b/WebCore/kwq/KWQKIconLoader.h
index 754b845..394fb37 100644
--- a/WebCore/kwq/KWQKIconLoader.h
+++ b/WebCore/kwq/KWQKIconLoader.h
@@ -29,12 +29,17 @@
 #include <qpixmap.h>
 #include <qstring.h>
 #include <kinstance.h>
-#include "kicontheme.h"
+
+class KIcon {
+public:
+    enum Context { Any, Action, Application, Device, FileSystem, MimeType };
+    enum States { DefaultState, ActiveState, DisabledState, LastState };
+};
 
 class KIconLoader {
 public:
-    QPixmap loadIcon(const QString& name, int group, int size=0, int state=KIcon::DefaultState, 
-        QString *path_store=0L, bool canReturnNull=false) const;
+    QPixmap loadIcon(const QString &name, int group, int size=0, int state=KIcon::DefaultState, 
+    QString *path_store=0L, bool canReturnNull=false) const;
 };
 
 #endif
diff --git a/WebCore/kwq/KWQKLineEdit.h b/WebCore/kwq/KWQKLineEdit.h
index 9db14b2..347c739 100644
--- a/WebCore/kwq/KWQKLineEdit.h
+++ b/WebCore/kwq/KWQKLineEdit.h
@@ -27,10 +27,12 @@
 #define KLINEEDIT_H_
 
 #include <qlineedit.h>
-#include <kcompletion.h>
-#include <kcompletionbox.h>
 
-class KLineEdit : public QLineEdit, public KCompletionBase {
+#include <KWQCompletion.h>
+
+#include "kcompletionbox.h"
+
+class KLineEdit : public QLineEdit, public KWQCompletionBase {
 public:
     KLineEdit(QWidget *parent=0, const char *name=0);
 
diff --git a/WebCore/kwq/KWQKPartsBrowserExtension.h b/WebCore/kwq/KWQKPartsBrowserExtension.h
index e33b822..a28ed5a 100644
--- a/WebCore/kwq/KWQKPartsBrowserExtension.h
+++ b/WebCore/kwq/KWQKPartsBrowserExtension.h
@@ -26,22 +26,18 @@
 #ifndef BROWSEREXTENSION_H_
 #define BROWSEREXTENSION_H_
 
-// Added for compilation of khtml/dom/html_document.cpp:184
+#include <qpoint.h>
+#include <qevent.h>
 #include <qdatastream.h>
 
-// This is a bad hack to get some rendering code to work
-#include <kxmlguiclient.h>
+#include <kurl.h>
 
-// classes and includes added for ecma directory
 #include "part.h"
 #include "browserinterface.h"
-class KURL;
-
-// Added for compilation of khtml/khtml_part.h:734
-class QPoint;
 
-// Added for compilation of khtml/khtml_part.h:755
-class QEvent;
+// This is a bad hack to get some rendering code to work
+class KXMLGUIClient {
+};
 
 namespace KParts {
 
diff --git a/WebCore/kwq/KWQKPartsBrowserInterface.h b/WebCore/kwq/KWQKPartsBrowserInterface.h
index 7d83269..07bf114 100644
--- a/WebCore/kwq/KWQKPartsBrowserInterface.h
+++ b/WebCore/kwq/KWQKPartsBrowserInterface.h
@@ -26,7 +26,8 @@
 #ifndef BROWSERINTERFACE_H_
 #define BROWSERINTERFACE_H_
 
-class QVariant;
+#include <qobject.h>
+#include <qvariant.h>
 
 namespace KParts {
 
diff --git a/WebCore/kwq/KWQKWin.h b/WebCore/kwq/KWQKWin.h
index a17db64..6d64693 100644
--- a/WebCore/kwq/KWQKWin.h
+++ b/WebCore/kwq/KWQKWin.h
@@ -26,7 +26,7 @@
 #ifndef KWIN_H_
 #define KWIN_H_
 
-#include <qobjectdefs.h>
+#include <qobject.h>
 #include <qrect.h>
 #include <qstring.h>
 
diff --git a/WebCore/kwq/KWQLabel.h b/WebCore/kwq/KWQLabel.h
index c98a515..198a3b5 100644
--- a/WebCore/kwq/KWQLabel.h
+++ b/WebCore/kwq/KWQLabel.h
@@ -27,6 +27,8 @@
 #define QLABEL_H_
 
 #include "qframe.h"
+#include "qwidget.h"
+#include "qstring.h"
 
 class QLabel : public QFrame {
 public:
diff --git a/WebCore/kwq/KWQMap.h b/WebCore/kwq/KWQMap.h
index 1dce85c..600ff07 100644
--- a/WebCore/kwq/KWQMap.h
+++ b/WebCore/kwq/KWQMap.h
@@ -26,7 +26,7 @@
 #ifndef QMAP_H_
 #define QMAP_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
 
 template<class K, class T> class QMapIterator {
 public:
diff --git a/WebCore/kwq/KWQMemArray.h b/WebCore/kwq/KWQMemArray.h
index 38d27c8..d39605d 100644
--- a/WebCore/kwq/KWQMemArray.h
+++ b/WebCore/kwq/KWQMemArray.h
@@ -26,7 +26,7 @@
 #ifndef QARRAY_H_
 #define QARRAY_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
 
 template <class T> class QArray {
 public:
diff --git a/WebCore/kwq/KWQObject.h b/WebCore/kwq/KWQObject.h
index 36ac7d1..2c59c3d 100644
--- a/WebCore/kwq/KWQObject.h
+++ b/WebCore/kwq/KWQObject.h
@@ -26,9 +26,8 @@
 #ifndef QOBJECT_H_
 #define QOBJECT_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
 
-#include "qobjectdefs.h"
 #include "qnamespace.h"
 #include "qstring.h"
 #include "qevent.h"
@@ -41,9 +40,30 @@
 #define SIGNAL(x) "x"
 #define emit
 #define Q_OBJECT
+#define Q_PROPERTY(text)
 
+class QEvent;
+class QPaintDevice;
+class QPaintDeviceMetrics;
+class QWidget;
+class QColor;
+class QColorGroup;
+class QPalette;
+class QPainter;
+class QRegion;
+class QSize;
+class QSizePolicy;
+class QRect;
+class QFont;
+class QFontMetrics;
+class QBrush;
+class QBitmap;
+class QMovie;
+class QTimer;
+class QImage;
 class QVariant;
 
+
 class QObject : public Qt {
 public:
     QObject(QObject *parent=0, const char *name=0);
diff --git a/WebCore/kwq/KWQPointArray.h b/WebCore/kwq/KWQPointArray.h
index febf844..7d19a03 100644
--- a/WebCore/kwq/KWQPointArray.h
+++ b/WebCore/kwq/KWQPointArray.h
@@ -26,7 +26,7 @@
 #ifndef QPOINT_H_
 #define QPOINT_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
 
 class QPoint {
 public:
diff --git a/WebCore/kwq/KWQPtrDict.h b/WebCore/kwq/KWQPtrDict.h
index 2cf597d..22d1a88 100644
--- a/WebCore/kwq/KWQPtrDict.h
+++ b/WebCore/kwq/KWQPtrDict.h
@@ -26,7 +26,8 @@
 #ifndef QPTRDICT_H_
 #define QPTRDICT_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
+
 #include "qcollection.h"
 
 template <class T> class QPtrDict : public QCollection {
diff --git a/WebCore/kwq/KWQPtrList.h b/WebCore/kwq/KWQPtrList.h
index 759ac5a..3262373 100644
--- a/WebCore/kwq/KWQPtrList.h
+++ b/WebCore/kwq/KWQPtrList.h
@@ -26,10 +26,11 @@
 #ifndef QLIST_H_
 #define QLIST_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
+
 #include "qcollection.h"
 
-template <class T> class QList {
+template <class T> class QList : public QCollection {
 public:
     // FIXME: should any of these functions be moved into a base collection
     // class implementation?
diff --git a/WebCore/kwq/KWQPtrVector.h b/WebCore/kwq/KWQPtrVector.h
index 064baae..f18d0f1 100644
--- a/WebCore/kwq/KWQPtrVector.h
+++ b/WebCore/kwq/KWQPtrVector.h
@@ -26,8 +26,9 @@
 #ifndef QVECTOR_H_
 #define QVECTOR_H_
 
-#include <kwqdef.h>
-#include <qcollection.h>
+#include <KWQDef.h>
+
+#include "qcollection.h"
 
 typedef void *Item;
 
diff --git a/WebCore/kwq/KWQPushButton.h b/WebCore/kwq/KWQPushButton.h
index bbcb25c..38994c8 100644
--- a/WebCore/kwq/KWQPushButton.h
+++ b/WebCore/kwq/KWQPushButton.h
@@ -26,11 +26,12 @@
 #ifndef QPUSHBUTTON_H_
 #define QPUSHBUTTON_H_
 
+#include <KWQButton.h>
+
 #include "qwidget.h"
-#include "qbutton.h"
 #include "qstring.h"
 
-class QPushButton : public QButton {
+class QPushButton : public KWQButton {
 public:
     QPushButton();
     QPushButton(QWidget *);
diff --git a/WebCore/kwq/KWQRadioButton.h b/WebCore/kwq/KWQRadioButton.h
index 206ccf5..14e4263 100644
--- a/WebCore/kwq/KWQRadioButton.h
+++ b/WebCore/kwq/KWQRadioButton.h
@@ -26,10 +26,11 @@
 #ifndef QRADIOBUTTON_H_
 #define QRADIOBUTTON_H_
 
+#include <KWQButton.h>
+
 #include "qwidget.h"
-#include "qbutton.h"
 
-class QRadioButton : public QButton {
+class QRadioButton : public KWQButton {
 public:
     QRadioButton();
     QRadioButton(QWidget *);
diff --git a/WebCore/kwq/qt/qscrollbar.h b/WebCore/kwq/KWQScrollBar.h
similarity index 91%
rename from WebCore/kwq/qt/qscrollbar.h
rename to WebCore/kwq/KWQScrollBar.h
index d36a730..f065bc8 100644
--- a/WebCore/kwq/qt/qscrollbar.h
+++ b/WebCore/kwq/KWQScrollBar.h
@@ -23,12 +23,13 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef QSCROLLBAR_H_
-#define QSCROLLBAR_H_
+#ifndef KWQSCROLLVIEW_H_
+#define KWQSCROLLVIEW_H_
 
-#include "qwidget.h"
+#include <qwidget.h>
+#include <qpalette.h>
 
-class QScrollBar : public QWidget {
+class KWQScrollBar : public QWidget {
 public:
     virtual void setPalette(const QPalette &);
 };
diff --git a/WebCore/kwq/KWQScrollView.h b/WebCore/kwq/KWQScrollView.h
index 10f416a..15971ab 100644
--- a/WebCore/kwq/KWQScrollView.h
+++ b/WebCore/kwq/KWQScrollView.h
@@ -26,9 +26,13 @@
 #ifndef QSCROLLVIEW_H_
 #define QSCROLLVIEW_H_
 
-#include "qframe.h"
 #include "qwidget.h"
-#include "qscrollbar.h"
+#include "qframe.h"
+
+class QScrollBar : public QWidget {
+public:
+    virtual void setPalette(const QPalette &);
+};
 
 class QScrollView : public QFrame {
 public:
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index 961d585..3bb1d8a 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -31,14 +31,29 @@
 class QString;
 class QRegExp;
 
+// =============================================================================
+// QChar class
+
 class QChar {
 public:
+
+    // -------------------------------------------------------------------------
+    // enums
+
     enum Direction {
         // NOTE: alphabetical order
         DirAL, DirAN, DirB, DirBN, DirCS, DirEN, DirES, DirET, DirL, DirLRE,
         DirLRO, DirNSM, DirON, DirPDF, DirR, DirRLE, DirRLO, DirS, DirWS
     };
 
+    // -------------------------------------------------------------------------
+    // constants
+
+    static const QChar null;
+
+    // -------------------------------------------------------------------------
+    // constructors, copy constructors, and destructors
+
     QChar();
     QChar(char);
     QChar(uchar);
@@ -48,6 +63,12 @@ public:
     QChar(uint);
     QChar(int);
 
+    // -------------------------------------------------------------------------
+    // static member functions
+
+    // -------------------------------------------------------------------------
+    // member functions
+
     QChar lower() const;
     QChar upper() const;
     char latin1() const;
@@ -62,6 +83,10 @@ public:
     Direction direction() const;
     bool mirrored() const;
     QChar mirroredChar() const;
+    ushort unicode() const;
+
+    // -------------------------------------------------------------------------
+    // operators
 
     friend int operator==(char, QChar);
     friend int operator==(QChar, char);
@@ -70,15 +95,27 @@ public:
     friend int operator!=(char, QChar);
     friend int operator!=(QChar, char);
     operator char() const;
-    ushort unicode() const;
 
-    static const QChar null;
-};
+}; // end class QChar
+
+// =============================================================================
+// QString class
 
 class QString {
 public:
     static QString fromLatin1(const char*, int len = -1);
 
+    // -------------------------------------------------------------------------
+    // enums
+
+    // -------------------------------------------------------------------------
+    // constants
+
+    static const QString null;
+
+    // -------------------------------------------------------------------------
+    // constructors, copy constructors, and destructors
+
     QString();
     QString(QChar);
     QString(const QString&);
@@ -92,33 +129,47 @@ public:
     QString &operator=(QChar);
     QString &operator=(char);
 
+    ~QString();
+
+    // -------------------------------------------------------------------------
+    // static member functions
+
+    static QString number(long, int base = 10);
+
+    // -------------------------------------------------------------------------
+    // member functions
+
+    bool isNull() const;
+    bool isEmpty() const;
+    uint length() const;
+    bool startsWith(const QString &) const;
+
     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;
-    QString &setNum(int, int base = 10 );
-    bool isNull() const;
-    const QChar *unicode() const;
+    float toFloat(bool *b = 0) const;
+
+    QString &prepend(const QString &);
+    QString &append(const char *);
+    QString &append(const QString &);
+
     int contains(const char *, bool) const;
     int contains(const char *) const;
     int contains(char) const;
-    uint length() const;
-    QString &sprintf(const char *, ...);
-    QString lower() const;
-    QString stripWhiteSpace() const;
-    QString simplifyWhiteSpace() const;
-    bool isEmpty() 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;
+
     QString &remove(uint, uint);
     QString &replace(const QRegExp &, const QString &);
     QString &insert(uint, char);
     void truncate(uint pos);
-    bool startsWith(const QString &) const;
+    void fill(QChar, int len = -1);
 
     QString arg (int &);
     QString arg(int a, int fieldwidth=0, int base=10) const;
@@ -127,13 +178,25 @@ public:
     QString left(uint) const;
     QString right(uint) const;
     QString mid(int, int len = 0xffffffff) const;
-    void fill(QChar, int len = -1);
-
-    float toFloat(bool *b = 0) const;
 
     const char* latin1() const;
     const char *ascii() const;
-    // FIXME: is there a standard parameter type for overloaded operators?
+    const QChar *unicode() const;
+    QCString utf8() const;
+    QCString local8Bit() const;
+    QString &setUnicode(const QChar *, uint);
+    
+    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);
+
+    // -------------------------------------------------------------------------
+    // operators
+
     bool operator!() const;
     operator const char *() const;
     QChar operator[](int) const;
@@ -143,24 +206,12 @@ public:
     QString &operator+=(char);
     QString &operator+=(QChar);
     QString &operator+=(const QString &);
-
-    QString &prepend(const QString &);
-    QString &append(const char *);
-    QString &append(const QString &);
-
-    QCString utf8() const;
-    QCString local8Bit() const;
-    QString &setUnicode(const QChar *, uint);
-    void compose();
-
-    QString visual(int index = 0, int len = -1);
-
-    static const QString null;
-
-    static QString number(long, int base = 10);
-
     operator QChar () const;
-};
+    
+}; // end class QString
+
+// =============================================================================
+// operators associated with QChar and QString
 
 QString &operator+(const char *, const QString &);
 QString &operator+(QChar, const QString &);
@@ -174,10 +225,36 @@ bool operator!=(const QString &, const char *);
 bool operator!=(const char *, const QString &);
 QString operator+(char, const QString &);
 
+// =============================================================================
+// QConstString class
+
 class QConstString {
 public:
-    QConstString(QChar *, uint);
+
+    // -------------------------------------------------------------------------
+    // enums
+
+    // -------------------------------------------------------------------------
+    // constants
+
+    // -------------------------------------------------------------------------
+    // static member functions
+
     const QString string() const;
-};
+
+    // -------------------------------------------------------------------------
+    // constructors, copy constructors, and destructors
+
+    QConstString(QChar *, uint);
+
+    // -------------------------------------------------------------------------
+    // member functions
+
+    // -------------------------------------------------------------------------
+    // operators
+
+}; // end class QConstString
+
+// =============================================================================
 
 #endif
diff --git a/WebCore/kwq/KWQStyle.h b/WebCore/kwq/KWQStyle.h
index eb66433..691870e 100644
--- a/WebCore/kwq/KWQStyle.h
+++ b/WebCore/kwq/KWQStyle.h
@@ -26,9 +26,8 @@
 #ifndef QSTYLE_H_
 #define QSTYLE_H_
 
-#include "qobject.h"
-#include "qobjectdefs.h"
-#include "qsize.h"
+#include <qobject.h>
+#include <qsize.h>
 
 class QStyle : public QObject {
 public:
diff --git a/WebCore/kwq/KWQValueList.h b/WebCore/kwq/KWQValueList.h
index f7c585a..904fa88 100644
--- a/WebCore/kwq/KWQValueList.h
+++ b/WebCore/kwq/KWQValueList.h
@@ -26,7 +26,7 @@
 #ifndef QVALUELIST_H_
 #define QVALUELIST_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
 
 template<class T> class QValueListIterator {
 public: 
diff --git a/WebCore/kwq/KWQWidget.h b/WebCore/kwq/KWQWidget.h
index 91a27a8..e06b115 100644
--- a/WebCore/kwq/KWQWidget.h
+++ b/WebCore/kwq/KWQWidget.h
@@ -32,10 +32,10 @@
 #include "qpoint.h"
 #include "qsize.h"
 #include "qpalette.h"
-#include "qstyle.h"
 #include "qfont.h"
 #include "qcursor.h"
 #include "qevent.h"
+#include "qstyle.h"
 
 class QWidget : public QObject, public QPaintDevice {
 public:
diff --git a/WebCore/kwq/kdecore/kconfig.h b/WebCore/kwq/kdecore/kconfig.h
index f365518..17cfd33 100644
--- a/WebCore/kwq/kdecore/kconfig.h
+++ b/WebCore/kwq/kdecore/kconfig.h
@@ -26,9 +26,26 @@
 #ifndef KCONFIG_H_
 #define KCONFIG_H_
 
-#include "kconfigbase.h"
+#include <qobject.h>
+#include <qcolor.h>
+#include <qfont.h>
+#include <qdatetime.h>
+#include <qstring.h>
+#include <qstrlist.h>
+#include <qstringlist.h>
+#include <qvariant.h>
+#include <qmap.h>
+#include <qcolor.h>
 
-class QString;
+class KConfigBase {
+public:
+    void setGroup(const QString& pGroup);
+    QString readEntry(const char *pKey, const QString& aDefault = QString::null) const;
+    int readNumEntry(const char *pKey, int nDefault = 0) const;
+    unsigned int readUnsignedNumEntry(const char *pKey, unsigned int nDefault = 0) const;
+    bool readBoolEntry(const char *pKey, bool nDefault = 0) const;
+    QColor readColorEntry(const char *pKey, const QColor* pDefault = 0L) const;
+};
 
 class KConfig : public KConfigBase {
 public:
diff --git a/WebCore/kwq/kdecore/kconfigbase.h b/WebCore/kwq/kdecore/kconfigbase.h
deleted file mode 100644
index 7073449..0000000
--- a/WebCore/kwq/kdecore/kconfigbase.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2001 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef KCONFIGBASE_H_
-#define KCONFIGBASE_H_
-
-#include <qobject.h>
-#include <qcolor.h>
-#include <qfont.h>
-#include <qdatetime.h>
-#include <qstrlist.h>
-#include <qstringlist.h>
-#include <qvariant.h>
-#include <qmap.h>
-
-class QString;
-class QColor;
-
-class KConfigBase {
-public:
-    void setGroup(const QString& pGroup);
-    QString readEntry(const char *pKey, const QString& aDefault = QString::null) const;
-    int readNumEntry(const char *pKey, int nDefault = 0) const;
-    unsigned int readUnsignedNumEntry(const char *pKey, unsigned int nDefault = 0) const;
-    bool readBoolEntry(const char *pKey, bool nDefault = 0) const;
-    QColor readColorEntry(const char *pKey, const QColor* pDefault = 0L) const;
-};
-
-#endif
diff --git a/WebCore/kwq/kdecore/kiconloader.h b/WebCore/kwq/kdecore/kiconloader.h
index 754b845..394fb37 100644
--- a/WebCore/kwq/kdecore/kiconloader.h
+++ b/WebCore/kwq/kdecore/kiconloader.h
@@ -29,12 +29,17 @@
 #include <qpixmap.h>
 #include <qstring.h>
 #include <kinstance.h>
-#include "kicontheme.h"
+
+class KIcon {
+public:
+    enum Context { Any, Action, Application, Device, FileSystem, MimeType };
+    enum States { DefaultState, ActiveState, DisabledState, LastState };
+};
 
 class KIconLoader {
 public:
-    QPixmap loadIcon(const QString& name, int group, int size=0, int state=KIcon::DefaultState, 
-        QString *path_store=0L, bool canReturnNull=false) const;
+    QPixmap loadIcon(const QString &name, int group, int size=0, int state=KIcon::DefaultState, 
+    QString *path_store=0L, bool canReturnNull=false) const;
 };
 
 #endif
diff --git a/WebCore/kwq/kdecore/kwin.h b/WebCore/kwq/kdecore/kwin.h
index a17db64..6d64693 100644
--- a/WebCore/kwq/kdecore/kwin.h
+++ b/WebCore/kwq/kdecore/kwin.h
@@ -26,7 +26,7 @@
 #ifndef KWIN_H_
 #define KWIN_H_
 
-#include <qobjectdefs.h>
+#include <qobject.h>
 #include <qrect.h>
 #include <qstring.h>
 
diff --git a/WebCore/kwq/kdeui/kcombobox.h b/WebCore/kwq/kdeui/kcombobox.h
index 2213a24..b18f039 100644
--- a/WebCore/kwq/kdeui/kcombobox.h
+++ b/WebCore/kwq/kdeui/kcombobox.h
@@ -27,9 +27,10 @@
 #define KCOMBOBOX_H_
 
 #include <qcombobox.h>
-#include <kcompletion.h>
 
-class KComboBox : public QComboBox, public KCompletionBase {
+#include <KWQCompletion.h>
+
+class KComboBox : public QComboBox, public KWQCompletionBase {
 public:
     KComboBox(QWidget *parent=0, const char *name=0);
     KComboBox(bool rw, QWidget *parent=0, const char *name=0);
diff --git a/WebCore/kwq/kdeui/keditcl.h b/WebCore/kwq/kdeui/keditcl.h
index 2207a60..c4b3ae4 100644
--- a/WebCore/kwq/kdeui/keditcl.h
+++ b/WebCore/kwq/kdeui/keditcl.h
@@ -28,7 +28,7 @@
 
 #include <qwidget.h>
 #include <qframe.h>
-#include <qscrollbar.h>
+#include <KWQScrollbar.h>
 #include <qstring.h>
 
 class QTableView : public QFrame {
diff --git a/WebCore/kwq/kdeui/klineedit.h b/WebCore/kwq/kdeui/klineedit.h
index 9db14b2..347c739 100644
--- a/WebCore/kwq/kdeui/klineedit.h
+++ b/WebCore/kwq/kdeui/klineedit.h
@@ -27,10 +27,12 @@
 #define KLINEEDIT_H_
 
 #include <qlineedit.h>
-#include <kcompletion.h>
-#include <kcompletionbox.h>
 
-class KLineEdit : public QLineEdit, public KCompletionBase {
+#include <KWQCompletion.h>
+
+#include "kcompletionbox.h"
+
+class KLineEdit : public QLineEdit, public KWQCompletionBase {
 public:
     KLineEdit(QWidget *parent=0, const char *name=0);
 
diff --git a/WebCore/kwq/kdeui/kmessagebox.h b/WebCore/kwq/kdeui/kmessagebox.h
index 4443873..82b9507 100644
--- a/WebCore/kwq/kdeui/kmessagebox.h
+++ b/WebCore/kwq/kdeui/kmessagebox.h
@@ -26,7 +26,8 @@
 #ifndef KMESSAGEBOX_H_
 #define KMESSAGEBOX_H_
 
-class QWidget;
+#include <qwidget.h>
+#include <qstring.h>
 
 class KMessageBox {
 public:
diff --git a/WebCore/kwq/kdeui/kxmlguiclient.h b/WebCore/kwq/kdeui/kxmlguiclient.h
deleted file mode 100644
index 9ed7e04..0000000
--- a/WebCore/kwq/kdeui/kxmlguiclient.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2001 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef KXMLGUICLIENT_H_
-#define KXMLGUICLIENT_H_
-
-class KXMLGUIClient {
-};
-
-#endif
diff --git a/WebCore/kwq/kparts/browserextension.h b/WebCore/kwq/kparts/browserextension.h
index e33b822..a28ed5a 100644
--- a/WebCore/kwq/kparts/browserextension.h
+++ b/WebCore/kwq/kparts/browserextension.h
@@ -26,22 +26,18 @@
 #ifndef BROWSEREXTENSION_H_
 #define BROWSEREXTENSION_H_
 
-// Added for compilation of khtml/dom/html_document.cpp:184
+#include <qpoint.h>
+#include <qevent.h>
 #include <qdatastream.h>
 
-// This is a bad hack to get some rendering code to work
-#include <kxmlguiclient.h>
+#include <kurl.h>
 
-// classes and includes added for ecma directory
 #include "part.h"
 #include "browserinterface.h"
-class KURL;
-
-// Added for compilation of khtml/khtml_part.h:734
-class QPoint;
 
-// Added for compilation of khtml/khtml_part.h:755
-class QEvent;
+// This is a bad hack to get some rendering code to work
+class KXMLGUIClient {
+};
 
 namespace KParts {
 
diff --git a/WebCore/kwq/kparts/browserinterface.h b/WebCore/kwq/kparts/browserinterface.h
index 7d83269..07bf114 100644
--- a/WebCore/kwq/kparts/browserinterface.h
+++ b/WebCore/kwq/kparts/browserinterface.h
@@ -26,7 +26,8 @@
 #ifndef BROWSERINTERFACE_H_
 #define BROWSERINTERFACE_H_
 
-class QVariant;
+#include <qobject.h>
+#include <qvariant.h>
 
 namespace KParts {
 
diff --git a/WebCore/kwq/qt/qarray.h b/WebCore/kwq/qt/qarray.h
index 38d27c8..d39605d 100644
--- a/WebCore/kwq/qt/qarray.h
+++ b/WebCore/kwq/qt/qarray.h
@@ -26,7 +26,7 @@
 #ifndef QARRAY_H_
 #define QARRAY_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
 
 template <class T> class QArray {
 public:
diff --git a/WebCore/kwq/qt/qasyncimageio.h b/WebCore/kwq/qt/qasyncimageio.h
index beef317..7dd40a5 100644
--- a/WebCore/kwq/qt/qasyncimageio.h
+++ b/WebCore/kwq/qt/qasyncimageio.h
@@ -26,7 +26,7 @@
 #ifndef QASYNCIMAGEIO_H_
 #define QASYNCIMAGEIO_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
 
 class QImageDecoder {
 public:
diff --git a/WebCore/kwq/qt/qasyncio.h b/WebCore/kwq/qt/qasyncio.h
index f5b0912..6f1116b 100644
--- a/WebCore/kwq/qt/qasyncio.h
+++ b/WebCore/kwq/qt/qasyncio.h
@@ -26,7 +26,7 @@
 #ifndef QASYNCIO_H_
 #define QASYNCIO_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
 
 class QAsynchIO {
 protected:
diff --git a/WebCore/kwq/qt/qbuffer.h b/WebCore/kwq/qt/qbuffer.h
index 13faf38..8a4781e 100644
--- a/WebCore/kwq/qt/qbuffer.h
+++ b/WebCore/kwq/qt/qbuffer.h
@@ -26,7 +26,7 @@
 #ifndef QBUFFER_H_
 #define QBUFFER_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
 
 #include "qstring.h"
 
diff --git a/WebCore/kwq/qt/qcheckbox.h b/WebCore/kwq/qt/qcheckbox.h
index 41c34bc..3e60fd6 100644
--- a/WebCore/kwq/qt/qcheckbox.h
+++ b/WebCore/kwq/qt/qcheckbox.h
@@ -26,9 +26,9 @@
 #ifndef QCHECKBOX_H_
 #define QCHECKBOX_H_
 
-#include "qbutton.h"
+#include <KWQButton.h>
 
-class QCheckBox : public QButton {
+class QCheckBox : public KWQButton {
 public:
     QCheckBox();
     QCheckBox(QWidget *parent);
diff --git a/WebCore/kwq/qt/qdatastream.h b/WebCore/kwq/qt/qdatastream.h
deleted file mode 100644
index 1100f95..0000000
--- a/WebCore/kwq/qt/qdatastream.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2001 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef QDATASTREAM_H_
-#define QDATASTREAM_H_
-
-#include <qarray.h>
-#include <qiodevice.h>
-#include <qstring.h>
-
-class QDataStream {
-public:
-    QDataStream( QByteArray, int mode );
-    virtual ~QDataStream();
-
-    QDataStream &operator<<(long int);
-    QDataStream &operator<<(const char *);
-    QDataStream &operator<<(const QString &);
-    QDataStream &operator<<(const QCString &);
-    QDataStream &operator>>(const QString &);
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qdict.h b/WebCore/kwq/qt/qdict.h
index 84cf9a4..a663d0c 100644
--- a/WebCore/kwq/qt/qdict.h
+++ b/WebCore/kwq/qt/qdict.h
@@ -26,8 +26,8 @@
 #ifndef QDICT_H_
 #define QDICT_H_
 
-#include "qcollection.h"
 #include "qstring.h"
+#include "qcollection.h"
 
 template <class T> class QDict : public QCollection {
 public:
diff --git a/WebCore/kwq/qt/qframe.h b/WebCore/kwq/qt/qframe.h
index c7f3dc8..e2b5052 100644
--- a/WebCore/kwq/qt/qframe.h
+++ b/WebCore/kwq/qt/qframe.h
@@ -30,6 +30,7 @@
 
 class QFrame : public QWidget {
 public:
+
     enum Shape {
         NoFrame,
         Box,
diff --git a/WebCore/kwq/qt/qiodevice.h b/WebCore/kwq/qt/qiodevice.h
deleted file mode 100644
index c63a14e..0000000
--- a/WebCore/kwq/qt/qiodevice.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2001 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef QIODEVICE_H_
-#define QIODEVICE_H_
-
-// constants added to help in compilation of html_document.cpp:184
-#define IO_ReadOnly             0x0001          // readable device
-#define IO_WriteOnly            0x0002          // writable device
-#define IO_ReadWrite            0x0003          // read+write device
-#define IO_Append               0x0004          // append
-#define IO_Truncate             0x0008          // truncate device
-#define IO_Translate            0x0010          // translate CR+LF
-#define IO_ModeMask             0x00ff
-
-#endif
diff --git a/WebCore/kwq/qt/qlabel.h b/WebCore/kwq/qt/qlabel.h
index c98a515..198a3b5 100644
--- a/WebCore/kwq/qt/qlabel.h
+++ b/WebCore/kwq/qt/qlabel.h
@@ -27,6 +27,8 @@
 #define QLABEL_H_
 
 #include "qframe.h"
+#include "qwidget.h"
+#include "qstring.h"
 
 class QLabel : public QFrame {
 public:
diff --git a/WebCore/kwq/qt/qlist.h b/WebCore/kwq/qt/qlist.h
index 759ac5a..3262373 100644
--- a/WebCore/kwq/qt/qlist.h
+++ b/WebCore/kwq/qt/qlist.h
@@ -26,10 +26,11 @@
 #ifndef QLIST_H_
 #define QLIST_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
+
 #include "qcollection.h"
 
-template <class T> class QList {
+template <class T> class QList : public QCollection {
 public:
     // FIXME: should any of these functions be moved into a base collection
     // class implementation?
diff --git a/WebCore/kwq/qt/qmap.h b/WebCore/kwq/qt/qmap.h
index 1dce85c..600ff07 100644
--- a/WebCore/kwq/qt/qmap.h
+++ b/WebCore/kwq/qt/qmap.h
@@ -26,7 +26,7 @@
 #ifndef QMAP_H_
 #define QMAP_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
 
 template<class K, class T> class QMapIterator {
 public:
diff --git a/WebCore/kwq/qt/qobject.h b/WebCore/kwq/qt/qobject.h
index 36ac7d1..2c59c3d 100644
--- a/WebCore/kwq/qt/qobject.h
+++ b/WebCore/kwq/qt/qobject.h
@@ -26,9 +26,8 @@
 #ifndef QOBJECT_H_
 #define QOBJECT_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
 
-#include "qobjectdefs.h"
 #include "qnamespace.h"
 #include "qstring.h"
 #include "qevent.h"
@@ -41,9 +40,30 @@
 #define SIGNAL(x) "x"
 #define emit
 #define Q_OBJECT
+#define Q_PROPERTY(text)
 
+class QEvent;
+class QPaintDevice;
+class QPaintDeviceMetrics;
+class QWidget;
+class QColor;
+class QColorGroup;
+class QPalette;
+class QPainter;
+class QRegion;
+class QSize;
+class QSizePolicy;
+class QRect;
+class QFont;
+class QFontMetrics;
+class QBrush;
+class QBitmap;
+class QMovie;
+class QTimer;
+class QImage;
 class QVariant;
 
+
 class QObject : public Qt {
 public:
     QObject(QObject *parent=0, const char *name=0);
diff --git a/WebCore/kwq/qt/qobjectdefs.h b/WebCore/kwq/qt/qobjectdefs.h
deleted file mode 100644
index 97afc10..0000000
--- a/WebCore/kwq/qt/qobjectdefs.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2001 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef QOBJECTDEFS_H_
-#define QOBJECTDEFS_H_
-
-#define Q_PROPERTY(text)
-
-class QObject;
-class QEvent;
-
-class QPaintDevice;
-class QPaintDeviceMetrics;
-class QWidget;
-class QColor;
-class QColorGroup;
-class QPalette;
-class QPainter;
-class QRegion;
-class QSize;
-class QSizePolicy;
-class QRect;
-class QFont;
-class QFontMetrics;
-class QBrush;
-class QBitmap;
-class QMovie;
-class QTimer;
-class QImage;
-
-#endif
diff --git a/WebCore/kwq/qt/qpoint.h b/WebCore/kwq/qt/qpoint.h
index febf844..7d19a03 100644
--- a/WebCore/kwq/qt/qpoint.h
+++ b/WebCore/kwq/qt/qpoint.h
@@ -26,7 +26,7 @@
 #ifndef QPOINT_H_
 #define QPOINT_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
 
 class QPoint {
 public:
diff --git a/WebCore/kwq/qt/qptrdict.h b/WebCore/kwq/qt/qptrdict.h
index 2cf597d..22d1a88 100644
--- a/WebCore/kwq/qt/qptrdict.h
+++ b/WebCore/kwq/qt/qptrdict.h
@@ -26,7 +26,8 @@
 #ifndef QPTRDICT_H_
 #define QPTRDICT_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
+
 #include "qcollection.h"
 
 template <class T> class QPtrDict : public QCollection {
diff --git a/WebCore/kwq/qt/qpushbutton.h b/WebCore/kwq/qt/qpushbutton.h
index bbcb25c..38994c8 100644
--- a/WebCore/kwq/qt/qpushbutton.h
+++ b/WebCore/kwq/qt/qpushbutton.h
@@ -26,11 +26,12 @@
 #ifndef QPUSHBUTTON_H_
 #define QPUSHBUTTON_H_
 
+#include <KWQButton.h>
+
 #include "qwidget.h"
-#include "qbutton.h"
 #include "qstring.h"
 
-class QPushButton : public QButton {
+class QPushButton : public KWQButton {
 public:
     QPushButton();
     QPushButton(QWidget *);
diff --git a/WebCore/kwq/qt/qradiobutton.h b/WebCore/kwq/qt/qradiobutton.h
index 206ccf5..14e4263 100644
--- a/WebCore/kwq/qt/qradiobutton.h
+++ b/WebCore/kwq/qt/qradiobutton.h
@@ -26,10 +26,11 @@
 #ifndef QRADIOBUTTON_H_
 #define QRADIOBUTTON_H_
 
+#include <KWQButton.h>
+
 #include "qwidget.h"
-#include "qbutton.h"
 
-class QRadioButton : public QButton {
+class QRadioButton : public KWQButton {
 public:
     QRadioButton();
     QRadioButton(QWidget *);
diff --git a/WebCore/kwq/qt/qscrollview.h b/WebCore/kwq/qt/qscrollview.h
index 10f416a..15971ab 100644
--- a/WebCore/kwq/qt/qscrollview.h
+++ b/WebCore/kwq/qt/qscrollview.h
@@ -26,9 +26,13 @@
 #ifndef QSCROLLVIEW_H_
 #define QSCROLLVIEW_H_
 
-#include "qframe.h"
 #include "qwidget.h"
-#include "qscrollbar.h"
+#include "qframe.h"
+
+class QScrollBar : public QWidget {
+public:
+    virtual void setPalette(const QPalette &);
+};
 
 class QScrollView : public QFrame {
 public:
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index 961d585..3bb1d8a 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -31,14 +31,29 @@
 class QString;
 class QRegExp;
 
+// =============================================================================
+// QChar class
+
 class QChar {
 public:
+
+    // -------------------------------------------------------------------------
+    // enums
+
     enum Direction {
         // NOTE: alphabetical order
         DirAL, DirAN, DirB, DirBN, DirCS, DirEN, DirES, DirET, DirL, DirLRE,
         DirLRO, DirNSM, DirON, DirPDF, DirR, DirRLE, DirRLO, DirS, DirWS
     };
 
+    // -------------------------------------------------------------------------
+    // constants
+
+    static const QChar null;
+
+    // -------------------------------------------------------------------------
+    // constructors, copy constructors, and destructors
+
     QChar();
     QChar(char);
     QChar(uchar);
@@ -48,6 +63,12 @@ public:
     QChar(uint);
     QChar(int);
 
+    // -------------------------------------------------------------------------
+    // static member functions
+
+    // -------------------------------------------------------------------------
+    // member functions
+
     QChar lower() const;
     QChar upper() const;
     char latin1() const;
@@ -62,6 +83,10 @@ public:
     Direction direction() const;
     bool mirrored() const;
     QChar mirroredChar() const;
+    ushort unicode() const;
+
+    // -------------------------------------------------------------------------
+    // operators
 
     friend int operator==(char, QChar);
     friend int operator==(QChar, char);
@@ -70,15 +95,27 @@ public:
     friend int operator!=(char, QChar);
     friend int operator!=(QChar, char);
     operator char() const;
-    ushort unicode() const;
 
-    static const QChar null;
-};
+}; // end class QChar
+
+// =============================================================================
+// QString class
 
 class QString {
 public:
     static QString fromLatin1(const char*, int len = -1);
 
+    // -------------------------------------------------------------------------
+    // enums
+
+    // -------------------------------------------------------------------------
+    // constants
+
+    static const QString null;
+
+    // -------------------------------------------------------------------------
+    // constructors, copy constructors, and destructors
+
     QString();
     QString(QChar);
     QString(const QString&);
@@ -92,33 +129,47 @@ public:
     QString &operator=(QChar);
     QString &operator=(char);
 
+    ~QString();
+
+    // -------------------------------------------------------------------------
+    // static member functions
+
+    static QString number(long, int base = 10);
+
+    // -------------------------------------------------------------------------
+    // member functions
+
+    bool isNull() const;
+    bool isEmpty() const;
+    uint length() const;
+    bool startsWith(const QString &) const;
+
     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;
-    QString &setNum(int, int base = 10 );
-    bool isNull() const;
-    const QChar *unicode() const;
+    float toFloat(bool *b = 0) const;
+
+    QString &prepend(const QString &);
+    QString &append(const char *);
+    QString &append(const QString &);
+
     int contains(const char *, bool) const;
     int contains(const char *) const;
     int contains(char) const;
-    uint length() const;
-    QString &sprintf(const char *, ...);
-    QString lower() const;
-    QString stripWhiteSpace() const;
-    QString simplifyWhiteSpace() const;
-    bool isEmpty() 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;
+
     QString &remove(uint, uint);
     QString &replace(const QRegExp &, const QString &);
     QString &insert(uint, char);
     void truncate(uint pos);
-    bool startsWith(const QString &) const;
+    void fill(QChar, int len = -1);
 
     QString arg (int &);
     QString arg(int a, int fieldwidth=0, int base=10) const;
@@ -127,13 +178,25 @@ public:
     QString left(uint) const;
     QString right(uint) const;
     QString mid(int, int len = 0xffffffff) const;
-    void fill(QChar, int len = -1);
-
-    float toFloat(bool *b = 0) const;
 
     const char* latin1() const;
     const char *ascii() const;
-    // FIXME: is there a standard parameter type for overloaded operators?
+    const QChar *unicode() const;
+    QCString utf8() const;
+    QCString local8Bit() const;
+    QString &setUnicode(const QChar *, uint);
+    
+    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);
+
+    // -------------------------------------------------------------------------
+    // operators
+
     bool operator!() const;
     operator const char *() const;
     QChar operator[](int) const;
@@ -143,24 +206,12 @@ public:
     QString &operator+=(char);
     QString &operator+=(QChar);
     QString &operator+=(const QString &);
-
-    QString &prepend(const QString &);
-    QString &append(const char *);
-    QString &append(const QString &);
-
-    QCString utf8() const;
-    QCString local8Bit() const;
-    QString &setUnicode(const QChar *, uint);
-    void compose();
-
-    QString visual(int index = 0, int len = -1);
-
-    static const QString null;
-
-    static QString number(long, int base = 10);
-
     operator QChar () const;
-};
+    
+}; // end class QString
+
+// =============================================================================
+// operators associated with QChar and QString
 
 QString &operator+(const char *, const QString &);
 QString &operator+(QChar, const QString &);
@@ -174,10 +225,36 @@ bool operator!=(const QString &, const char *);
 bool operator!=(const char *, const QString &);
 QString operator+(char, const QString &);
 
+// =============================================================================
+// QConstString class
+
 class QConstString {
 public:
-    QConstString(QChar *, uint);
+
+    // -------------------------------------------------------------------------
+    // enums
+
+    // -------------------------------------------------------------------------
+    // constants
+
+    // -------------------------------------------------------------------------
+    // static member functions
+
     const QString string() const;
-};
+
+    // -------------------------------------------------------------------------
+    // constructors, copy constructors, and destructors
+
+    QConstString(QChar *, uint);
+
+    // -------------------------------------------------------------------------
+    // member functions
+
+    // -------------------------------------------------------------------------
+    // operators
+
+}; // end class QConstString
+
+// =============================================================================
 
 #endif
diff --git a/WebCore/kwq/qt/qstyle.h b/WebCore/kwq/qt/qstyle.h
index eb66433..691870e 100644
--- a/WebCore/kwq/qt/qstyle.h
+++ b/WebCore/kwq/qt/qstyle.h
@@ -26,9 +26,8 @@
 #ifndef QSTYLE_H_
 #define QSTYLE_H_
 
-#include "qobject.h"
-#include "qobjectdefs.h"
-#include "qsize.h"
+#include <qobject.h>
+#include <qsize.h>
 
 class QStyle : public QObject {
 public:
diff --git a/WebCore/kwq/qt/qvaluelist.h b/WebCore/kwq/qt/qvaluelist.h
index f7c585a..904fa88 100644
--- a/WebCore/kwq/qt/qvaluelist.h
+++ b/WebCore/kwq/qt/qvaluelist.h
@@ -26,7 +26,7 @@
 #ifndef QVALUELIST_H_
 #define QVALUELIST_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
 
 template<class T> class QValueListIterator {
 public: 
diff --git a/WebCore/kwq/qt/qvector.h b/WebCore/kwq/qt/qvector.h
index 064baae..f18d0f1 100644
--- a/WebCore/kwq/qt/qvector.h
+++ b/WebCore/kwq/qt/qvector.h
@@ -26,8 +26,9 @@
 #ifndef QVECTOR_H_
 #define QVECTOR_H_
 
-#include <kwqdef.h>
-#include <qcollection.h>
+#include <KWQDef.h>
+
+#include "qcollection.h"
 
 typedef void *Item;
 
diff --git a/WebCore/kwq/qt/qwidget.h b/WebCore/kwq/qt/qwidget.h
index 91a27a8..e06b115 100644
--- a/WebCore/kwq/qt/qwidget.h
+++ b/WebCore/kwq/qt/qwidget.h
@@ -32,10 +32,10 @@
 #include "qpoint.h"
 #include "qsize.h"
 #include "qpalette.h"
-#include "qstyle.h"
 #include "qfont.h"
 #include "qcursor.h"
 #include "qevent.h"
+#include "qstyle.h"
 
 class QWidget : public QObject, public QPaintDevice {
 public:
diff --git a/WebCore/kwq/KWQButton.h b/WebCore/src/kwq/KWQButton.h
similarity index 90%
copy from WebCore/kwq/KWQButton.h
copy to WebCore/src/kwq/KWQButton.h
index 898bab3..aaa7400 100644
--- a/WebCore/kwq/KWQButton.h
+++ b/WebCore/src/kwq/KWQButton.h
@@ -23,17 +23,16 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef QBUTTON_H_
-#define QBUTTON_H_
+#ifndef KWQBUTTON_H_
+#define KWQBUTTON_H_
 
-#include "qwidget.h"
+#include <qwidget.h>
+#include <qstring.h>
 
-class QString;
-
-class QButton : public QWidget {
+class KWQButton : public QWidget {
 public:
-    QButton();
-    QButton(QWidget *);
+    KWQButton();
+    KWQButton(QWidget *);
     
     virtual void setText(const QString &);
     QString text() const;
diff --git a/WebCore/src/kwq/kdecore/kcompletion.h b/WebCore/src/kwq/KWQCompletion.h
similarity index 84%
copy from WebCore/src/kwq/kdecore/kcompletion.h
copy to WebCore/src/kwq/KWQCompletion.h
index 382975e..e38ed86 100644
--- a/WebCore/src/kwq/kdecore/kcompletion.h
+++ b/WebCore/src/kwq/KWQCompletion.h
@@ -23,22 +23,22 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef KCOMPLETION_H_
-#define KCOMPLETION_H_
+#ifndef KWQCOMPLETION_H_
+#define KWQCOMPLETION_H_
 
 #include <qobject.h>
 #include <qstringlist.h>
 
-class KCompletion : public QObject {
+class KWQCompletion : public QObject {
 public:
-    KCompletion();
-    void setItems(const QStringList&);
+    KWQCompletion();
+    void setItems(const QStringList &);
 };
 
-class KCompletionBase {
+class KWQCompletionBase {
 public:
-     KCompletionBase();
-     KCompletion *completionObject(bool hsig = true);
+     KWQCompletionBase();
+     KWQCompletion *completionObject(bool hsig = true);
 };
 
 #endif
diff --git a/WebCore/kwq/qt/qcolor.h b/WebCore/src/kwq/KWQDef.h
similarity index 69%
copy from WebCore/kwq/qt/qcolor.h
copy to WebCore/src/kwq/KWQDef.h
index 7e675a9..93d3830 100644
--- a/WebCore/kwq/qt/qcolor.h
+++ b/WebCore/src/kwq/KWQDef.h
@@ -23,35 +23,42 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef QCOLOR_H_
-#define QCOLOR_H_
+#ifndef KWQDEF_H_
+#define KWQDEF_H_
 
-#include "qstring.h"
+typedef unsigned char uchar;
+typedef unsigned short ushort;
+typedef unsigned uint;
 
-class QColor {
-public:
-    QColor();
-    QColor(int,int,int);
-    QColor(const char *);
+typedef int Q_INT32;  
+typedef unsigned int Q_UINT32;  
 
-    QString name() const;
-    void setNamedColor(const QString&);
-    int red() const;
-    int green() const;
-    int blue() const;
-    bool isValid() const;
-    void setRgb(int,int,int);
-    void setRgb(int);
+typedef Q_INT32 QCOORD;
 
-    void hsv(int *, int *, int *) const;
+typedef uint WFlags;
+typedef int WId;
 
-    QColor light(int f = 150) const;
-    QColor dark(int f = 200) const;
+#define QMAX(a,b) ((a) > (b) ? (a) : (b))
+#define QMIN(a,b) ((a) < (b) ? (a) : (b))
 
-    QColor &operator=(const QColor &);
-    bool operator==(const QColor &x) const;
-    bool operator!=(const QColor &x) const;
+#define KMAX(a,b) QMAX(a, b)
+#define KMIN(a,b) QMIN(a, b)
 
-};
+#define QABS(a) (((a) >= 0) ? (a) : -(a))
+
+#ifndef TRUE
+#define TRUE (1)
+#endif
+
+#ifndef FALSE
+#define FALSE (0)
+#endif
+
+#define ASSERT(a)
+void qDebug(const char *msg, ...);
+
+#ifdef NEED_BOGUS_X_DEFINES
+typedef int XEvent;
+#endif
 
 #endif
diff --git a/WebCore/src/kwq/kdecore/kicontheme.h b/WebCore/src/kwq/KWQIcon.h
similarity index 100%
rename from WebCore/src/kwq/kdecore/kicontheme.h
rename to WebCore/src/kwq/KWQIcon.h
diff --git a/WebCore/src/kwq/qt/qscrollbar.h b/WebCore/src/kwq/KWQScrollBar.h
similarity index 91%
rename from WebCore/src/kwq/qt/qscrollbar.h
rename to WebCore/src/kwq/KWQScrollBar.h
index d36a730..f065bc8 100644
--- a/WebCore/src/kwq/qt/qscrollbar.h
+++ b/WebCore/src/kwq/KWQScrollBar.h
@@ -23,12 +23,13 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef QSCROLLBAR_H_
-#define QSCROLLBAR_H_
+#ifndef KWQSCROLLVIEW_H_
+#define KWQSCROLLVIEW_H_
 
-#include "qwidget.h"
+#include <qwidget.h>
+#include <qpalette.h>
 
-class QScrollBar : public QWidget {
+class KWQScrollBar : public QWidget {
 public:
     virtual void setPalette(const QPalette &);
 };
diff --git a/WebCore/src/kwq/kdecore/kconfig.h b/WebCore/src/kwq/kdecore/kconfig.h
index f365518..17cfd33 100644
--- a/WebCore/src/kwq/kdecore/kconfig.h
+++ b/WebCore/src/kwq/kdecore/kconfig.h
@@ -26,9 +26,26 @@
 #ifndef KCONFIG_H_
 #define KCONFIG_H_
 
-#include "kconfigbase.h"
+#include <qobject.h>
+#include <qcolor.h>
+#include <qfont.h>
+#include <qdatetime.h>
+#include <qstring.h>
+#include <qstrlist.h>
+#include <qstringlist.h>
+#include <qvariant.h>
+#include <qmap.h>
+#include <qcolor.h>
 
-class QString;
+class KConfigBase {
+public:
+    void setGroup(const QString& pGroup);
+    QString readEntry(const char *pKey, const QString& aDefault = QString::null) const;
+    int readNumEntry(const char *pKey, int nDefault = 0) const;
+    unsigned int readUnsignedNumEntry(const char *pKey, unsigned int nDefault = 0) const;
+    bool readBoolEntry(const char *pKey, bool nDefault = 0) const;
+    QColor readColorEntry(const char *pKey, const QColor* pDefault = 0L) const;
+};
 
 class KConfig : public KConfigBase {
 public:
diff --git a/WebCore/src/kwq/kdecore/kconfigbase.h b/WebCore/src/kwq/kdecore/kconfigbase.h
deleted file mode 100644
index 7073449..0000000
--- a/WebCore/src/kwq/kdecore/kconfigbase.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2001 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef KCONFIGBASE_H_
-#define KCONFIGBASE_H_
-
-#include <qobject.h>
-#include <qcolor.h>
-#include <qfont.h>
-#include <qdatetime.h>
-#include <qstrlist.h>
-#include <qstringlist.h>
-#include <qvariant.h>
-#include <qmap.h>
-
-class QString;
-class QColor;
-
-class KConfigBase {
-public:
-    void setGroup(const QString& pGroup);
-    QString readEntry(const char *pKey, const QString& aDefault = QString::null) const;
-    int readNumEntry(const char *pKey, int nDefault = 0) const;
-    unsigned int readUnsignedNumEntry(const char *pKey, unsigned int nDefault = 0) const;
-    bool readBoolEntry(const char *pKey, bool nDefault = 0) const;
-    QColor readColorEntry(const char *pKey, const QColor* pDefault = 0L) const;
-};
-
-#endif
diff --git a/WebCore/src/kwq/kdecore/kiconloader.h b/WebCore/src/kwq/kdecore/kiconloader.h
index 754b845..394fb37 100644
--- a/WebCore/src/kwq/kdecore/kiconloader.h
+++ b/WebCore/src/kwq/kdecore/kiconloader.h
@@ -29,12 +29,17 @@
 #include <qpixmap.h>
 #include <qstring.h>
 #include <kinstance.h>
-#include "kicontheme.h"
+
+class KIcon {
+public:
+    enum Context { Any, Action, Application, Device, FileSystem, MimeType };
+    enum States { DefaultState, ActiveState, DisabledState, LastState };
+};
 
 class KIconLoader {
 public:
-    QPixmap loadIcon(const QString& name, int group, int size=0, int state=KIcon::DefaultState, 
-        QString *path_store=0L, bool canReturnNull=false) const;
+    QPixmap loadIcon(const QString &name, int group, int size=0, int state=KIcon::DefaultState, 
+    QString *path_store=0L, bool canReturnNull=false) const;
 };
 
 #endif
diff --git a/WebCore/src/kwq/kdecore/kwin.h b/WebCore/src/kwq/kdecore/kwin.h
index a17db64..6d64693 100644
--- a/WebCore/src/kwq/kdecore/kwin.h
+++ b/WebCore/src/kwq/kdecore/kwin.h
@@ -26,7 +26,7 @@
 #ifndef KWIN_H_
 #define KWIN_H_
 
-#include <qobjectdefs.h>
+#include <qobject.h>
 #include <qrect.h>
 #include <qstring.h>
 
diff --git a/WebCore/src/kwq/kdeui/kcombobox.h b/WebCore/src/kwq/kdeui/kcombobox.h
index 2213a24..b18f039 100644
--- a/WebCore/src/kwq/kdeui/kcombobox.h
+++ b/WebCore/src/kwq/kdeui/kcombobox.h
@@ -27,9 +27,10 @@
 #define KCOMBOBOX_H_
 
 #include <qcombobox.h>
-#include <kcompletion.h>
 
-class KComboBox : public QComboBox, public KCompletionBase {
+#include <KWQCompletion.h>
+
+class KComboBox : public QComboBox, public KWQCompletionBase {
 public:
     KComboBox(QWidget *parent=0, const char *name=0);
     KComboBox(bool rw, QWidget *parent=0, const char *name=0);
diff --git a/WebCore/src/kwq/kdeui/keditcl.h b/WebCore/src/kwq/kdeui/keditcl.h
index 2207a60..c4b3ae4 100644
--- a/WebCore/src/kwq/kdeui/keditcl.h
+++ b/WebCore/src/kwq/kdeui/keditcl.h
@@ -28,7 +28,7 @@
 
 #include <qwidget.h>
 #include <qframe.h>
-#include <qscrollbar.h>
+#include <KWQScrollbar.h>
 #include <qstring.h>
 
 class QTableView : public QFrame {
diff --git a/WebCore/src/kwq/kdeui/klineedit.h b/WebCore/src/kwq/kdeui/klineedit.h
index 9db14b2..347c739 100644
--- a/WebCore/src/kwq/kdeui/klineedit.h
+++ b/WebCore/src/kwq/kdeui/klineedit.h
@@ -27,10 +27,12 @@
 #define KLINEEDIT_H_
 
 #include <qlineedit.h>
-#include <kcompletion.h>
-#include <kcompletionbox.h>
 
-class KLineEdit : public QLineEdit, public KCompletionBase {
+#include <KWQCompletion.h>
+
+#include "kcompletionbox.h"
+
+class KLineEdit : public QLineEdit, public KWQCompletionBase {
 public:
     KLineEdit(QWidget *parent=0, const char *name=0);
 
diff --git a/WebCore/src/kwq/kdeui/kmessagebox.h b/WebCore/src/kwq/kdeui/kmessagebox.h
index 4443873..82b9507 100644
--- a/WebCore/src/kwq/kdeui/kmessagebox.h
+++ b/WebCore/src/kwq/kdeui/kmessagebox.h
@@ -26,7 +26,8 @@
 #ifndef KMESSAGEBOX_H_
 #define KMESSAGEBOX_H_
 
-class QWidget;
+#include <qwidget.h>
+#include <qstring.h>
 
 class KMessageBox {
 public:
diff --git a/WebCore/src/kwq/kdeui/kxmlguiclient.h b/WebCore/src/kwq/kdeui/kxmlguiclient.h
deleted file mode 100644
index 9ed7e04..0000000
--- a/WebCore/src/kwq/kdeui/kxmlguiclient.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2001 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef KXMLGUICLIENT_H_
-#define KXMLGUICLIENT_H_
-
-class KXMLGUIClient {
-};
-
-#endif
diff --git a/WebCore/src/kwq/kparts/browserextension.h b/WebCore/src/kwq/kparts/browserextension.h
index e33b822..a28ed5a 100644
--- a/WebCore/src/kwq/kparts/browserextension.h
+++ b/WebCore/src/kwq/kparts/browserextension.h
@@ -26,22 +26,18 @@
 #ifndef BROWSEREXTENSION_H_
 #define BROWSEREXTENSION_H_
 
-// Added for compilation of khtml/dom/html_document.cpp:184
+#include <qpoint.h>
+#include <qevent.h>
 #include <qdatastream.h>
 
-// This is a bad hack to get some rendering code to work
-#include <kxmlguiclient.h>
+#include <kurl.h>
 
-// classes and includes added for ecma directory
 #include "part.h"
 #include "browserinterface.h"
-class KURL;
-
-// Added for compilation of khtml/khtml_part.h:734
-class QPoint;
 
-// Added for compilation of khtml/khtml_part.h:755
-class QEvent;
+// This is a bad hack to get some rendering code to work
+class KXMLGUIClient {
+};
 
 namespace KParts {
 
diff --git a/WebCore/src/kwq/kparts/browserinterface.h b/WebCore/src/kwq/kparts/browserinterface.h
index 7d83269..07bf114 100644
--- a/WebCore/src/kwq/kparts/browserinterface.h
+++ b/WebCore/src/kwq/kparts/browserinterface.h
@@ -26,7 +26,8 @@
 #ifndef BROWSERINTERFACE_H_
 #define BROWSERINTERFACE_H_
 
-class QVariant;
+#include <qobject.h>
+#include <qvariant.h>
 
 namespace KParts {
 
diff --git a/WebCore/src/kwq/qt/qarray.h b/WebCore/src/kwq/qt/qarray.h
index 38d27c8..d39605d 100644
--- a/WebCore/src/kwq/qt/qarray.h
+++ b/WebCore/src/kwq/qt/qarray.h
@@ -26,7 +26,7 @@
 #ifndef QARRAY_H_
 #define QARRAY_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
 
 template <class T> class QArray {
 public:
diff --git a/WebCore/src/kwq/qt/qasyncimageio.h b/WebCore/src/kwq/qt/qasyncimageio.h
index beef317..7dd40a5 100644
--- a/WebCore/src/kwq/qt/qasyncimageio.h
+++ b/WebCore/src/kwq/qt/qasyncimageio.h
@@ -26,7 +26,7 @@
 #ifndef QASYNCIMAGEIO_H_
 #define QASYNCIMAGEIO_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
 
 class QImageDecoder {
 public:
diff --git a/WebCore/src/kwq/qt/qasyncio.h b/WebCore/src/kwq/qt/qasyncio.h
index f5b0912..6f1116b 100644
--- a/WebCore/src/kwq/qt/qasyncio.h
+++ b/WebCore/src/kwq/qt/qasyncio.h
@@ -26,7 +26,7 @@
 #ifndef QASYNCIO_H_
 #define QASYNCIO_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
 
 class QAsynchIO {
 protected:
diff --git a/WebCore/src/kwq/qt/qbuffer.h b/WebCore/src/kwq/qt/qbuffer.h
index 13faf38..8a4781e 100644
--- a/WebCore/src/kwq/qt/qbuffer.h
+++ b/WebCore/src/kwq/qt/qbuffer.h
@@ -26,7 +26,7 @@
 #ifndef QBUFFER_H_
 #define QBUFFER_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
 
 #include "qstring.h"
 
diff --git a/WebCore/src/kwq/qt/qcheckbox.h b/WebCore/src/kwq/qt/qcheckbox.h
index 41c34bc..3e60fd6 100644
--- a/WebCore/src/kwq/qt/qcheckbox.h
+++ b/WebCore/src/kwq/qt/qcheckbox.h
@@ -26,9 +26,9 @@
 #ifndef QCHECKBOX_H_
 #define QCHECKBOX_H_
 
-#include "qbutton.h"
+#include <KWQButton.h>
 
-class QCheckBox : public QButton {
+class QCheckBox : public KWQButton {
 public:
     QCheckBox();
     QCheckBox(QWidget *parent);
diff --git a/WebCore/src/kwq/qt/qdatastream.h b/WebCore/src/kwq/qt/qdatastream.h
deleted file mode 100644
index 1100f95..0000000
--- a/WebCore/src/kwq/qt/qdatastream.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2001 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef QDATASTREAM_H_
-#define QDATASTREAM_H_
-
-#include <qarray.h>
-#include <qiodevice.h>
-#include <qstring.h>
-
-class QDataStream {
-public:
-    QDataStream( QByteArray, int mode );
-    virtual ~QDataStream();
-
-    QDataStream &operator<<(long int);
-    QDataStream &operator<<(const char *);
-    QDataStream &operator<<(const QString &);
-    QDataStream &operator<<(const QCString &);
-    QDataStream &operator>>(const QString &);
-};
-
-#endif
diff --git a/WebCore/src/kwq/qt/qdict.h b/WebCore/src/kwq/qt/qdict.h
index 84cf9a4..a663d0c 100644
--- a/WebCore/src/kwq/qt/qdict.h
+++ b/WebCore/src/kwq/qt/qdict.h
@@ -26,8 +26,8 @@
 #ifndef QDICT_H_
 #define QDICT_H_
 
-#include "qcollection.h"
 #include "qstring.h"
+#include "qcollection.h"
 
 template <class T> class QDict : public QCollection {
 public:
diff --git a/WebCore/src/kwq/qt/qframe.h b/WebCore/src/kwq/qt/qframe.h
index c7f3dc8..e2b5052 100644
--- a/WebCore/src/kwq/qt/qframe.h
+++ b/WebCore/src/kwq/qt/qframe.h
@@ -30,6 +30,7 @@
 
 class QFrame : public QWidget {
 public:
+
     enum Shape {
         NoFrame,
         Box,
diff --git a/WebCore/src/kwq/qt/qiodevice.h b/WebCore/src/kwq/qt/qiodevice.h
deleted file mode 100644
index c63a14e..0000000
--- a/WebCore/src/kwq/qt/qiodevice.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2001 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef QIODEVICE_H_
-#define QIODEVICE_H_
-
-// constants added to help in compilation of html_document.cpp:184
-#define IO_ReadOnly             0x0001          // readable device
-#define IO_WriteOnly            0x0002          // writable device
-#define IO_ReadWrite            0x0003          // read+write device
-#define IO_Append               0x0004          // append
-#define IO_Truncate             0x0008          // truncate device
-#define IO_Translate            0x0010          // translate CR+LF
-#define IO_ModeMask             0x00ff
-
-#endif
diff --git a/WebCore/src/kwq/qt/qlabel.h b/WebCore/src/kwq/qt/qlabel.h
index c98a515..198a3b5 100644
--- a/WebCore/src/kwq/qt/qlabel.h
+++ b/WebCore/src/kwq/qt/qlabel.h
@@ -27,6 +27,8 @@
 #define QLABEL_H_
 
 #include "qframe.h"
+#include "qwidget.h"
+#include "qstring.h"
 
 class QLabel : public QFrame {
 public:
diff --git a/WebCore/src/kwq/qt/qlist.h b/WebCore/src/kwq/qt/qlist.h
index 759ac5a..3262373 100644
--- a/WebCore/src/kwq/qt/qlist.h
+++ b/WebCore/src/kwq/qt/qlist.h
@@ -26,10 +26,11 @@
 #ifndef QLIST_H_
 #define QLIST_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
+
 #include "qcollection.h"
 
-template <class T> class QList {
+template <class T> class QList : public QCollection {
 public:
     // FIXME: should any of these functions be moved into a base collection
     // class implementation?
diff --git a/WebCore/src/kwq/qt/qmap.h b/WebCore/src/kwq/qt/qmap.h
index 1dce85c..600ff07 100644
--- a/WebCore/src/kwq/qt/qmap.h
+++ b/WebCore/src/kwq/qt/qmap.h
@@ -26,7 +26,7 @@
 #ifndef QMAP_H_
 #define QMAP_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
 
 template<class K, class T> class QMapIterator {
 public:
diff --git a/WebCore/src/kwq/qt/qobject.h b/WebCore/src/kwq/qt/qobject.h
index 36ac7d1..2c59c3d 100644
--- a/WebCore/src/kwq/qt/qobject.h
+++ b/WebCore/src/kwq/qt/qobject.h
@@ -26,9 +26,8 @@
 #ifndef QOBJECT_H_
 #define QOBJECT_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
 
-#include "qobjectdefs.h"
 #include "qnamespace.h"
 #include "qstring.h"
 #include "qevent.h"
@@ -41,9 +40,30 @@
 #define SIGNAL(x) "x"
 #define emit
 #define Q_OBJECT
+#define Q_PROPERTY(text)
 
+class QEvent;
+class QPaintDevice;
+class QPaintDeviceMetrics;
+class QWidget;
+class QColor;
+class QColorGroup;
+class QPalette;
+class QPainter;
+class QRegion;
+class QSize;
+class QSizePolicy;
+class QRect;
+class QFont;
+class QFontMetrics;
+class QBrush;
+class QBitmap;
+class QMovie;
+class QTimer;
+class QImage;
 class QVariant;
 
+
 class QObject : public Qt {
 public:
     QObject(QObject *parent=0, const char *name=0);
diff --git a/WebCore/src/kwq/qt/qobjectdefs.h b/WebCore/src/kwq/qt/qobjectdefs.h
deleted file mode 100644
index 97afc10..0000000
--- a/WebCore/src/kwq/qt/qobjectdefs.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2001 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef QOBJECTDEFS_H_
-#define QOBJECTDEFS_H_
-
-#define Q_PROPERTY(text)
-
-class QObject;
-class QEvent;
-
-class QPaintDevice;
-class QPaintDeviceMetrics;
-class QWidget;
-class QColor;
-class QColorGroup;
-class QPalette;
-class QPainter;
-class QRegion;
-class QSize;
-class QSizePolicy;
-class QRect;
-class QFont;
-class QFontMetrics;
-class QBrush;
-class QBitmap;
-class QMovie;
-class QTimer;
-class QImage;
-
-#endif
diff --git a/WebCore/src/kwq/qt/qpoint.h b/WebCore/src/kwq/qt/qpoint.h
index febf844..7d19a03 100644
--- a/WebCore/src/kwq/qt/qpoint.h
+++ b/WebCore/src/kwq/qt/qpoint.h
@@ -26,7 +26,7 @@
 #ifndef QPOINT_H_
 #define QPOINT_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
 
 class QPoint {
 public:
diff --git a/WebCore/src/kwq/qt/qptrdict.h b/WebCore/src/kwq/qt/qptrdict.h
index 2cf597d..22d1a88 100644
--- a/WebCore/src/kwq/qt/qptrdict.h
+++ b/WebCore/src/kwq/qt/qptrdict.h
@@ -26,7 +26,8 @@
 #ifndef QPTRDICT_H_
 #define QPTRDICT_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
+
 #include "qcollection.h"
 
 template <class T> class QPtrDict : public QCollection {
diff --git a/WebCore/src/kwq/qt/qpushbutton.h b/WebCore/src/kwq/qt/qpushbutton.h
index bbcb25c..38994c8 100644
--- a/WebCore/src/kwq/qt/qpushbutton.h
+++ b/WebCore/src/kwq/qt/qpushbutton.h
@@ -26,11 +26,12 @@
 #ifndef QPUSHBUTTON_H_
 #define QPUSHBUTTON_H_
 
+#include <KWQButton.h>
+
 #include "qwidget.h"
-#include "qbutton.h"
 #include "qstring.h"
 
-class QPushButton : public QButton {
+class QPushButton : public KWQButton {
 public:
     QPushButton();
     QPushButton(QWidget *);
diff --git a/WebCore/src/kwq/qt/qradiobutton.h b/WebCore/src/kwq/qt/qradiobutton.h
index 206ccf5..14e4263 100644
--- a/WebCore/src/kwq/qt/qradiobutton.h
+++ b/WebCore/src/kwq/qt/qradiobutton.h
@@ -26,10 +26,11 @@
 #ifndef QRADIOBUTTON_H_
 #define QRADIOBUTTON_H_
 
+#include <KWQButton.h>
+
 #include "qwidget.h"
-#include "qbutton.h"
 
-class QRadioButton : public QButton {
+class QRadioButton : public KWQButton {
 public:
     QRadioButton();
     QRadioButton(QWidget *);
diff --git a/WebCore/src/kwq/qt/qscrollview.h b/WebCore/src/kwq/qt/qscrollview.h
index 10f416a..15971ab 100644
--- a/WebCore/src/kwq/qt/qscrollview.h
+++ b/WebCore/src/kwq/qt/qscrollview.h
@@ -26,9 +26,13 @@
 #ifndef QSCROLLVIEW_H_
 #define QSCROLLVIEW_H_
 
-#include "qframe.h"
 #include "qwidget.h"
-#include "qscrollbar.h"
+#include "qframe.h"
+
+class QScrollBar : public QWidget {
+public:
+    virtual void setPalette(const QPalette &);
+};
 
 class QScrollView : public QFrame {
 public:
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index 961d585..3bb1d8a 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -31,14 +31,29 @@
 class QString;
 class QRegExp;
 
+// =============================================================================
+// QChar class
+
 class QChar {
 public:
+
+    // -------------------------------------------------------------------------
+    // enums
+
     enum Direction {
         // NOTE: alphabetical order
         DirAL, DirAN, DirB, DirBN, DirCS, DirEN, DirES, DirET, DirL, DirLRE,
         DirLRO, DirNSM, DirON, DirPDF, DirR, DirRLE, DirRLO, DirS, DirWS
     };
 
+    // -------------------------------------------------------------------------
+    // constants
+
+    static const QChar null;
+
+    // -------------------------------------------------------------------------
+    // constructors, copy constructors, and destructors
+
     QChar();
     QChar(char);
     QChar(uchar);
@@ -48,6 +63,12 @@ public:
     QChar(uint);
     QChar(int);
 
+    // -------------------------------------------------------------------------
+    // static member functions
+
+    // -------------------------------------------------------------------------
+    // member functions
+
     QChar lower() const;
     QChar upper() const;
     char latin1() const;
@@ -62,6 +83,10 @@ public:
     Direction direction() const;
     bool mirrored() const;
     QChar mirroredChar() const;
+    ushort unicode() const;
+
+    // -------------------------------------------------------------------------
+    // operators
 
     friend int operator==(char, QChar);
     friend int operator==(QChar, char);
@@ -70,15 +95,27 @@ public:
     friend int operator!=(char, QChar);
     friend int operator!=(QChar, char);
     operator char() const;
-    ushort unicode() const;
 
-    static const QChar null;
-};
+}; // end class QChar
+
+// =============================================================================
+// QString class
 
 class QString {
 public:
     static QString fromLatin1(const char*, int len = -1);
 
+    // -------------------------------------------------------------------------
+    // enums
+
+    // -------------------------------------------------------------------------
+    // constants
+
+    static const QString null;
+
+    // -------------------------------------------------------------------------
+    // constructors, copy constructors, and destructors
+
     QString();
     QString(QChar);
     QString(const QString&);
@@ -92,33 +129,47 @@ public:
     QString &operator=(QChar);
     QString &operator=(char);
 
+    ~QString();
+
+    // -------------------------------------------------------------------------
+    // static member functions
+
+    static QString number(long, int base = 10);
+
+    // -------------------------------------------------------------------------
+    // member functions
+
+    bool isNull() const;
+    bool isEmpty() const;
+    uint length() const;
+    bool startsWith(const QString &) const;
+
     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;
-    QString &setNum(int, int base = 10 );
-    bool isNull() const;
-    const QChar *unicode() const;
+    float toFloat(bool *b = 0) const;
+
+    QString &prepend(const QString &);
+    QString &append(const char *);
+    QString &append(const QString &);
+
     int contains(const char *, bool) const;
     int contains(const char *) const;
     int contains(char) const;
-    uint length() const;
-    QString &sprintf(const char *, ...);
-    QString lower() const;
-    QString stripWhiteSpace() const;
-    QString simplifyWhiteSpace() const;
-    bool isEmpty() 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;
+
     QString &remove(uint, uint);
     QString &replace(const QRegExp &, const QString &);
     QString &insert(uint, char);
     void truncate(uint pos);
-    bool startsWith(const QString &) const;
+    void fill(QChar, int len = -1);
 
     QString arg (int &);
     QString arg(int a, int fieldwidth=0, int base=10) const;
@@ -127,13 +178,25 @@ public:
     QString left(uint) const;
     QString right(uint) const;
     QString mid(int, int len = 0xffffffff) const;
-    void fill(QChar, int len = -1);
-
-    float toFloat(bool *b = 0) const;
 
     const char* latin1() const;
     const char *ascii() const;
-    // FIXME: is there a standard parameter type for overloaded operators?
+    const QChar *unicode() const;
+    QCString utf8() const;
+    QCString local8Bit() const;
+    QString &setUnicode(const QChar *, uint);
+    
+    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);
+
+    // -------------------------------------------------------------------------
+    // operators
+
     bool operator!() const;
     operator const char *() const;
     QChar operator[](int) const;
@@ -143,24 +206,12 @@ public:
     QString &operator+=(char);
     QString &operator+=(QChar);
     QString &operator+=(const QString &);
-
-    QString &prepend(const QString &);
-    QString &append(const char *);
-    QString &append(const QString &);
-
-    QCString utf8() const;
-    QCString local8Bit() const;
-    QString &setUnicode(const QChar *, uint);
-    void compose();
-
-    QString visual(int index = 0, int len = -1);
-
-    static const QString null;
-
-    static QString number(long, int base = 10);
-
     operator QChar () const;
-};
+    
+}; // end class QString
+
+// =============================================================================
+// operators associated with QChar and QString
 
 QString &operator+(const char *, const QString &);
 QString &operator+(QChar, const QString &);
@@ -174,10 +225,36 @@ bool operator!=(const QString &, const char *);
 bool operator!=(const char *, const QString &);
 QString operator+(char, const QString &);
 
+// =============================================================================
+// QConstString class
+
 class QConstString {
 public:
-    QConstString(QChar *, uint);
+
+    // -------------------------------------------------------------------------
+    // enums
+
+    // -------------------------------------------------------------------------
+    // constants
+
+    // -------------------------------------------------------------------------
+    // static member functions
+
     const QString string() const;
-};
+
+    // -------------------------------------------------------------------------
+    // constructors, copy constructors, and destructors
+
+    QConstString(QChar *, uint);
+
+    // -------------------------------------------------------------------------
+    // member functions
+
+    // -------------------------------------------------------------------------
+    // operators
+
+}; // end class QConstString
+
+// =============================================================================
 
 #endif
diff --git a/WebCore/src/kwq/qt/qstyle.h b/WebCore/src/kwq/qt/qstyle.h
index eb66433..691870e 100644
--- a/WebCore/src/kwq/qt/qstyle.h
+++ b/WebCore/src/kwq/qt/qstyle.h
@@ -26,9 +26,8 @@
 #ifndef QSTYLE_H_
 #define QSTYLE_H_
 
-#include "qobject.h"
-#include "qobjectdefs.h"
-#include "qsize.h"
+#include <qobject.h>
+#include <qsize.h>
 
 class QStyle : public QObject {
 public:
diff --git a/WebCore/src/kwq/qt/qvaluelist.h b/WebCore/src/kwq/qt/qvaluelist.h
index f7c585a..904fa88 100644
--- a/WebCore/src/kwq/qt/qvaluelist.h
+++ b/WebCore/src/kwq/qt/qvaluelist.h
@@ -26,7 +26,7 @@
 #ifndef QVALUELIST_H_
 #define QVALUELIST_H_
 
-#include <kwqdef.h>
+#include <KWQDef.h>
 
 template<class T> class QValueListIterator {
 public: 
diff --git a/WebCore/src/kwq/qt/qvector.h b/WebCore/src/kwq/qt/qvector.h
index 064baae..f18d0f1 100644
--- a/WebCore/src/kwq/qt/qvector.h
+++ b/WebCore/src/kwq/qt/qvector.h
@@ -26,8 +26,9 @@
 #ifndef QVECTOR_H_
 #define QVECTOR_H_
 
-#include <kwqdef.h>
-#include <qcollection.h>
+#include <KWQDef.h>
+
+#include "qcollection.h"
 
 typedef void *Item;
 
diff --git a/WebCore/src/kwq/qt/qwidget.h b/WebCore/src/kwq/qt/qwidget.h
index 91a27a8..e06b115 100644
--- a/WebCore/src/kwq/qt/qwidget.h
+++ b/WebCore/src/kwq/qt/qwidget.h
@@ -32,10 +32,10 @@
 #include "qpoint.h"
 #include "qsize.h"
 #include "qpalette.h"
-#include "qstyle.h"
 #include "qfont.h"
 #include "qcursor.h"
 #include "qevent.h"
+#include "qstyle.h"
 
 class QWidget : public QObject, public QPaintDevice {
 public:

-- 
WebKit Debian packaging

