[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:17 UTC 2009 

The following commit has been merged in the debian/unstable branch:
commit 6ccf6473f35fa275e8354a5f1da22d5e261f293e
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 5 23:53:34 2001 +0000

    Moved some more files around to remove dependencies on all files not explicitly included by KDE/QT
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@110 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQCheckBox.h b/WebCore/kwq/KWQCheckBox.h
index 3e60fd6..e0f0327 100644
--- a/WebCore/kwq/KWQCheckBox.h
+++ b/WebCore/kwq/KWQCheckBox.h
@@ -28,7 +28,7 @@
 
 #include <KWQButton.h>
 
-class QCheckBox : public KWQButton {
+class QCheckBox : public QButton {
 public:
     QCheckBox();
     QCheckBox(QWidget *parent);
diff --git a/WebCore/kwq/KWQComboBox.h b/WebCore/kwq/KWQComboBox.h
index 11253ff..401358d 100644
--- a/WebCore/kwq/KWQComboBox.h
+++ b/WebCore/kwq/KWQComboBox.h
@@ -26,8 +26,8 @@
 #ifndef QCOMBOBOX_H_
 #define QCOMBOBOX_H_
 
+#include <KWQListBox.h>
 #include "qwidget.h"
-#include "qlistbox.h"
 
 class QComboBox : public QWidget {
 public:
diff --git a/WebCore/kwq/KWQCompletion.h b/WebCore/kwq/KWQCompletion.h
index e38ed86..cb289b0 100644
--- a/WebCore/kwq/KWQCompletion.h
+++ b/WebCore/kwq/KWQCompletion.h
@@ -29,16 +29,16 @@
 #include <qobject.h>
 #include <qstringlist.h>
 
-class KWQCompletion : public QObject {
+class QCompletion : public QObject {
 public:
-    KWQCompletion();
+    QCompletion();
     void setItems(const QStringList &);
 };
 
-class KWQCompletionBase {
+class QCompletionBase {
 public:
-     KWQCompletionBase();
-     KWQCompletion *completionObject(bool hsig = true);
+     QCompletionBase();
+     QCompletion *completionObject(bool hsig = true);
 };
 
 #endif
diff --git a/WebCore/kwq/KWQTextCodec.h b/WebCore/kwq/KWQDataStream.h
similarity index 63%
copy from WebCore/kwq/KWQTextCodec.h
copy to WebCore/kwq/KWQDataStream.h
index 5ea5020..4b16351 100644
--- a/WebCore/kwq/KWQTextCodec.h
+++ b/WebCore/kwq/KWQDataStream.h
@@ -23,30 +23,31 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef QTEXTCODEC_H_
-#define QTEXTCODEC_H_
+#ifndef KWQDATASTREAM_H_
+#define KWQDATASTREAM_H_
 
+#include "qarray.h"
 #include "qstring.h"
 #include "qcstring.h"
 
-class QTextDecoder {
-public:
-    virtual QString toUnicode(const char *, int) = 0;
-};
+#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
 
-class QTextCodec {
+class QDataStream {
 public:
-    static QTextCodec *codecForMib(int);
-    static QTextCodec *codecForName(const char *, int accuracy = 0);
-    static QTextCodec *codecForLocale();
+    QDataStream( QByteArray, int mode );
+    virtual ~QDataStream();
 
-    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;
+    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/KWQDict.h b/WebCore/kwq/KWQDict.h
index a663d0c..82ad4b2 100644
--- a/WebCore/kwq/KWQDict.h
+++ b/WebCore/kwq/KWQDict.h
@@ -26,8 +26,8 @@
 #ifndef QDICT_H_
 #define QDICT_H_
 
+#include <KWQCollection.h>
 #include "qstring.h"
-#include "qcollection.h"
 
 template <class T> class QDict : public QCollection {
 public:
diff --git a/WebCore/kwq/KWQKComboBox.h b/WebCore/kwq/KWQKComboBox.h
index b18f039..86ab211 100644
--- a/WebCore/kwq/KWQKComboBox.h
+++ b/WebCore/kwq/KWQKComboBox.h
@@ -30,7 +30,7 @@
 
 #include <KWQCompletion.h>
 
-class KComboBox : public QComboBox, public KWQCompletionBase {
+class KComboBox : public QComboBox, public QCompletionBase {
 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 17cfd33..23ca873 100644
--- a/WebCore/kwq/KWQKConfigBase.h
+++ b/WebCore/kwq/KWQKConfigBase.h
@@ -31,11 +31,11 @@
 #include <qfont.h>
 #include <qdatetime.h>
 #include <qstring.h>
-#include <qstrlist.h>
 #include <qstringlist.h>
 #include <qvariant.h>
 #include <qmap.h>
 #include <qcolor.h>
+#include <KWQStrList.h>
 
 class KConfigBase {
 public:
diff --git a/WebCore/kwq/KWQKImageIO.h b/WebCore/kwq/KWQKImageIO.h
index 5f730df..6bcab4f 100644
--- a/WebCore/kwq/KWQKImageIO.h
+++ b/WebCore/kwq/KWQKImageIO.h
@@ -26,6 +26,8 @@
 #ifndef KIMAGEIO_H_
 #define KIMAGEIO_H_
 
+#include <qstringlist.h>
+
 class KImageIO {
 public:
     enum Mode { Reading, Writing };
diff --git a/WebCore/kwq/KWQKJobClasses.h b/WebCore/kwq/KWQKJobClasses.h
index 1eeeede..4faf865 100644
--- a/WebCore/kwq/KWQKJobClasses.h
+++ b/WebCore/kwq/KWQKJobClasses.h
@@ -26,7 +26,8 @@
 #ifndef JOBCLASSES_H_
 #define JOBCLASSES_H_
 
-class QString;
+#include <qobject.h>
+#include <qstring.h>
 
 namespace KIO {
 
diff --git a/WebCore/kwq/KWQKLineEdit.h b/WebCore/kwq/KWQKLineEdit.h
index 347c739..0771da2 100644
--- a/WebCore/kwq/KWQKLineEdit.h
+++ b/WebCore/kwq/KWQKLineEdit.h
@@ -32,7 +32,7 @@
 
 #include "kcompletionbox.h"
 
-class KLineEdit : public QLineEdit, public KWQCompletionBase {
+class KLineEdit : public QLineEdit, public QCompletionBase {
 public:
     KLineEdit(QWidget *parent=0, const char *name=0);
 
diff --git a/WebCore/kwq/KWQKListBox.h b/WebCore/kwq/KWQKListBox.h
index ff9079d..f90c719 100644
--- a/WebCore/kwq/KWQKListBox.h
+++ b/WebCore/kwq/KWQKListBox.h
@@ -26,7 +26,7 @@
 #ifndef KLISTBOX_H_
 #define KLISTBOX_H_
 
-#include <qlistbox.h>
+#include <KWQListBox.h>
 #include <qwidget.h>
 
 class KListBox : public QListBox {
diff --git a/WebCore/kwq/KWQKPartsBrowserExtension.h b/WebCore/kwq/KWQKPartsBrowserExtension.h
index a28ed5a..97d9862 100644
--- a/WebCore/kwq/KWQKPartsBrowserExtension.h
+++ b/WebCore/kwq/KWQKPartsBrowserExtension.h
@@ -28,7 +28,7 @@
 
 #include <qpoint.h>
 #include <qevent.h>
-#include <qdatastream.h>
+#include <KWQDataStream.h>
 
 #include <kurl.h>
 
diff --git a/WebCore/kwq/KWQLabel.h b/WebCore/kwq/KWQLabel.h
index 198a3b5..5eb95b4 100644
--- a/WebCore/kwq/KWQLabel.h
+++ b/WebCore/kwq/KWQLabel.h
@@ -26,7 +26,7 @@
 #ifndef QLABEL_H_
 #define QLABEL_H_
 
-#include "qframe.h"
+#include <KWQFrame.h>
 #include "qwidget.h"
 #include "qstring.h"
 
diff --git a/WebCore/kwq/qt/qlistbox.h b/WebCore/kwq/KWQListBox.h
similarity index 96%
rename from WebCore/kwq/qt/qlistbox.h
rename to WebCore/kwq/KWQListBox.h
index d0d8eca..b914571 100644
--- a/WebCore/kwq/qt/qlistbox.h
+++ b/WebCore/kwq/KWQListBox.h
@@ -23,11 +23,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef QLISTBOX_H_
-#define QLISTBOX_H_
+#ifndef KWQLISTBOX_H_
+#define KWQLISTBOX_H_
 
-#include "qscrollview.h"
-#include "qstring.h"
+#include <qscrollview.h>
+#include <qstring.h>
 
 class QListBoxItem;
 class QListBoxText;
diff --git a/WebCore/kwq/KWQPtrDict.h b/WebCore/kwq/KWQPtrDict.h
index 22d1a88..090fec5 100644
--- a/WebCore/kwq/KWQPtrDict.h
+++ b/WebCore/kwq/KWQPtrDict.h
@@ -27,8 +27,7 @@
 #define QPTRDICT_H_
 
 #include <KWQDef.h>
-
-#include "qcollection.h"
+#include <KWQCollection.h>
 
 template <class T> class QPtrDict : public QCollection {
 public:
diff --git a/WebCore/kwq/KWQPtrList.h b/WebCore/kwq/KWQPtrList.h
index 3262373..00c0be9 100644
--- a/WebCore/kwq/KWQPtrList.h
+++ b/WebCore/kwq/KWQPtrList.h
@@ -27,8 +27,7 @@
 #define QLIST_H_
 
 #include <KWQDef.h>
-
-#include "qcollection.h"
+#include <KWQCollection.h>
 
 template <class T> class QList : public QCollection {
 public:
diff --git a/WebCore/kwq/KWQPtrVector.h b/WebCore/kwq/KWQPtrVector.h
index f18d0f1..405765a 100644
--- a/WebCore/kwq/KWQPtrVector.h
+++ b/WebCore/kwq/KWQPtrVector.h
@@ -27,8 +27,7 @@
 #define QVECTOR_H_
 
 #include <KWQDef.h>
-
-#include "qcollection.h"
+#include <KWQCollection.h>
 
 typedef void *Item;
 
diff --git a/WebCore/kwq/KWQPushButton.h b/WebCore/kwq/KWQPushButton.h
index 38994c8..328a391 100644
--- a/WebCore/kwq/KWQPushButton.h
+++ b/WebCore/kwq/KWQPushButton.h
@@ -31,7 +31,7 @@
 #include "qwidget.h"
 #include "qstring.h"
 
-class QPushButton : public KWQButton {
+class QPushButton : public QButton {
 public:
     QPushButton();
     QPushButton(QWidget *);
diff --git a/WebCore/kwq/KWQRadioButton.h b/WebCore/kwq/KWQRadioButton.h
index 14e4263..521e2f8 100644
--- a/WebCore/kwq/KWQRadioButton.h
+++ b/WebCore/kwq/KWQRadioButton.h
@@ -30,7 +30,7 @@
 
 #include "qwidget.h"
 
-class QRadioButton : public KWQButton {
+class QRadioButton : public QButton {
 public:
     QRadioButton();
     QRadioButton(QWidget *);
diff --git a/WebCore/kwq/KWQScrollBar.h b/WebCore/kwq/KWQScrollBar.h
index f065bc8..1f79c8c 100644
--- a/WebCore/kwq/KWQScrollBar.h
+++ b/WebCore/kwq/KWQScrollBar.h
@@ -29,7 +29,7 @@
 #include <qwidget.h>
 #include <qpalette.h>
 
-class KWQScrollBar : public QWidget {
+class QScrollBar : public QWidget {
 public:
     virtual void setPalette(const QPalette &);
 };
diff --git a/WebCore/kwq/KWQScrollView.h b/WebCore/kwq/KWQScrollView.h
index 15971ab..41cab1f 100644
--- a/WebCore/kwq/KWQScrollView.h
+++ b/WebCore/kwq/KWQScrollView.h
@@ -26,13 +26,9 @@
 #ifndef QSCROLLVIEW_H_
 #define QSCROLLVIEW_H_
 
+#include <KWQScrollBar.h>
+#include <KWQFrame.h>
 #include "qwidget.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/qstrlist.h b/WebCore/kwq/KWQStrList.h
similarity index 94%
copy from WebCore/src/kwq/qt/qstrlist.h
copy to WebCore/kwq/KWQStrList.h
index 0a154e4..f785f40 100644
--- a/WebCore/src/kwq/qt/qstrlist.h
+++ b/WebCore/kwq/KWQStrList.h
@@ -23,11 +23,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef QSTRLIST_H_
-#define QSTRLIST_H_
+#ifndef KWQSTRLIST_H_
+#define KWQSTRLIST_H_
 
-#include "qstring.h"
-#include "qlist.h"
+#include <qstring.h>
+#include <qlist.h>
 
 class QStrList : public QList<char> {
 public:
diff --git a/WebCore/kwq/KWQWidget.h b/WebCore/kwq/KWQWidget.h
index e06b115..664d621 100644
--- a/WebCore/kwq/KWQWidget.h
+++ b/WebCore/kwq/KWQWidget.h
@@ -35,7 +35,7 @@
 #include "qfont.h"
 #include "qcursor.h"
 #include "qevent.h"
-#include "qstyle.h"
+#include <KWQStyle.h>
 
 class QWidget : public QObject, public QPaintDevice {
 public:
diff --git a/WebCore/kwq/kdecore/kconfig.h b/WebCore/kwq/kdecore/kconfig.h
index 17cfd33..23ca873 100644
--- a/WebCore/kwq/kdecore/kconfig.h
+++ b/WebCore/kwq/kdecore/kconfig.h
@@ -31,11 +31,11 @@
 #include <qfont.h>
 #include <qdatetime.h>
 #include <qstring.h>
-#include <qstrlist.h>
 #include <qstringlist.h>
 #include <qvariant.h>
 #include <qmap.h>
 #include <qcolor.h>
+#include <KWQStrList.h>
 
 class KConfigBase {
 public:
diff --git a/WebCore/kwq/kdecore/kprocess.h b/WebCore/kwq/kdecore/kprocess.h
index 6db1dbd..2b095cd 100644
--- a/WebCore/kwq/kdecore/kprocess.h
+++ b/WebCore/kwq/kdecore/kprocess.h
@@ -30,7 +30,7 @@
 
 #include <qobject.h>
 #include <qstring.h>
-#include <qstrlist.h>
+#include <KWQStrList.h>
 
 class KProcess : public QObject {
 public:
diff --git a/WebCore/kwq/kdeui/kcombobox.h b/WebCore/kwq/kdeui/kcombobox.h
index b18f039..86ab211 100644
--- a/WebCore/kwq/kdeui/kcombobox.h
+++ b/WebCore/kwq/kdeui/kcombobox.h
@@ -30,7 +30,7 @@
 
 #include <KWQCompletion.h>
 
-class KComboBox : public QComboBox, public KWQCompletionBase {
+class KComboBox : public QComboBox, public QCompletionBase {
 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 c4b3ae4..4494989 100644
--- a/WebCore/kwq/kdeui/keditcl.h
+++ b/WebCore/kwq/kdeui/keditcl.h
@@ -27,7 +27,7 @@
 #define KEDITCL_H_
 
 #include <qwidget.h>
-#include <qframe.h>
+#include <KWQFrame.h>
 #include <KWQScrollbar.h>
 #include <qstring.h>
 
diff --git a/WebCore/kwq/kdeui/klineedit.h b/WebCore/kwq/kdeui/klineedit.h
index 347c739..0771da2 100644
--- a/WebCore/kwq/kdeui/klineedit.h
+++ b/WebCore/kwq/kdeui/klineedit.h
@@ -32,7 +32,7 @@
 
 #include "kcompletionbox.h"
 
-class KLineEdit : public QLineEdit, public KWQCompletionBase {
+class KLineEdit : public QLineEdit, public QCompletionBase {
 public:
     KLineEdit(QWidget *parent=0, const char *name=0);
 
diff --git a/WebCore/kwq/kdeui/klistbox.h b/WebCore/kwq/kdeui/klistbox.h
index ff9079d..f90c719 100644
--- a/WebCore/kwq/kdeui/klistbox.h
+++ b/WebCore/kwq/kdeui/klistbox.h
@@ -26,7 +26,7 @@
 #ifndef KLISTBOX_H_
 #define KLISTBOX_H_
 
-#include <qlistbox.h>
+#include <KWQListBox.h>
 #include <qwidget.h>
 
 class KListBox : public QListBox {
diff --git a/WebCore/kwq/kio/jobclasses.h b/WebCore/kwq/kio/jobclasses.h
index 1eeeede..4faf865 100644
--- a/WebCore/kwq/kio/jobclasses.h
+++ b/WebCore/kwq/kio/jobclasses.h
@@ -26,7 +26,8 @@
 #ifndef JOBCLASSES_H_
 #define JOBCLASSES_H_
 
-class QString;
+#include <qobject.h>
+#include <qstring.h>
 
 namespace KIO {
 
diff --git a/WebCore/kwq/kio/kimageio.h b/WebCore/kwq/kio/kimageio.h
index 5f730df..6bcab4f 100644
--- a/WebCore/kwq/kio/kimageio.h
+++ b/WebCore/kwq/kio/kimageio.h
@@ -26,6 +26,8 @@
 #ifndef KIMAGEIO_H_
 #define KIMAGEIO_H_
 
+#include <qstringlist.h>
+
 class KImageIO {
 public:
     enum Mode { Reading, Writing };
diff --git a/WebCore/kwq/kparts/browserextension.h b/WebCore/kwq/kparts/browserextension.h
index a28ed5a..97d9862 100644
--- a/WebCore/kwq/kparts/browserextension.h
+++ b/WebCore/kwq/kparts/browserextension.h
@@ -28,7 +28,7 @@
 
 #include <qpoint.h>
 #include <qevent.h>
-#include <qdatastream.h>
+#include <KWQDataStream.h>
 
 #include <kurl.h>
 
diff --git a/WebCore/kwq/qt/qcheckbox.h b/WebCore/kwq/qt/qcheckbox.h
index 3e60fd6..e0f0327 100644
--- a/WebCore/kwq/qt/qcheckbox.h
+++ b/WebCore/kwq/qt/qcheckbox.h
@@ -28,7 +28,7 @@
 
 #include <KWQButton.h>
 
-class QCheckBox : public KWQButton {
+class QCheckBox : public QButton {
 public:
     QCheckBox();
     QCheckBox(QWidget *parent);
diff --git a/WebCore/kwq/qt/qcollection.h b/WebCore/kwq/qt/qcollection.h
deleted file mode 100644
index 0a17687..0000000
--- a/WebCore/kwq/qt/qcollection.h
+++ /dev/null
@@ -1,37 +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 QCOLLECTION_H_
-#define QCOLLECTION_H_
-
-class QCollection {
-public:
-    typedef void *Item;
-    void setAutoDelete(bool);
-protected:
-    virtual Item newItem(Item);
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qcombobox.h b/WebCore/kwq/qt/qcombobox.h
index 11253ff..401358d 100644
--- a/WebCore/kwq/qt/qcombobox.h
+++ b/WebCore/kwq/qt/qcombobox.h
@@ -26,8 +26,8 @@
 #ifndef QCOMBOBOX_H_
 #define QCOMBOBOX_H_
 
+#include <KWQListBox.h>
 #include "qwidget.h"
-#include "qlistbox.h"
 
 class QComboBox : public QWidget {
 public:
diff --git a/WebCore/kwq/qt/qdict.h b/WebCore/kwq/qt/qdict.h
index a663d0c..82ad4b2 100644
--- a/WebCore/kwq/qt/qdict.h
+++ b/WebCore/kwq/qt/qdict.h
@@ -26,8 +26,8 @@
 #ifndef QDICT_H_
 #define QDICT_H_
 
+#include <KWQCollection.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
deleted file mode 100644
index e2b5052..0000000
--- a/WebCore/kwq/qt/qframe.h
+++ /dev/null
@@ -1,50 +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 QFRAME_H_
-#define QFRAME_H_
-
-#include "qwidget.h"
-
-class QFrame : public QWidget {
-public:
-
-    enum Shape {
-        NoFrame,
-        Box,
-        StyledPanel,
-    };
-    enum Shadow {
-        Sunken,
-    };
-
-    QFrame();
-    QFrame(QWidget *parent);
-
-    virtual void setFrameStyle(int);
-    int frameWidth() const;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qhbox.h b/WebCore/kwq/qt/qhbox.h
index 913dde8..cfdd7d7 100644
--- a/WebCore/kwq/qt/qhbox.h
+++ b/WebCore/kwq/qt/qhbox.h
@@ -27,7 +27,7 @@
 #define QHBOX_H_
 
 #include "qwidget.h"
-#include "qframe.h"
+#include <KWQFrame.h>
 
 class QHBox : public QFrame {
 public:
diff --git a/WebCore/kwq/qt/qlabel.h b/WebCore/kwq/qt/qlabel.h
index 198a3b5..5eb95b4 100644
--- a/WebCore/kwq/qt/qlabel.h
+++ b/WebCore/kwq/qt/qlabel.h
@@ -26,7 +26,7 @@
 #ifndef QLABEL_H_
 #define QLABEL_H_
 
-#include "qframe.h"
+#include <KWQFrame.h>
 #include "qwidget.h"
 #include "qstring.h"
 
diff --git a/WebCore/kwq/qt/qlist.h b/WebCore/kwq/qt/qlist.h
index 3262373..00c0be9 100644
--- a/WebCore/kwq/qt/qlist.h
+++ b/WebCore/kwq/qt/qlist.h
@@ -27,8 +27,7 @@
 #define QLIST_H_
 
 #include <KWQDef.h>
-
-#include "qcollection.h"
+#include <KWQCollection.h>
 
 template <class T> class QList : public QCollection {
 public:
diff --git a/WebCore/kwq/qt/qptrdict.h b/WebCore/kwq/qt/qptrdict.h
index 22d1a88..090fec5 100644
--- a/WebCore/kwq/qt/qptrdict.h
+++ b/WebCore/kwq/qt/qptrdict.h
@@ -27,8 +27,7 @@
 #define QPTRDICT_H_
 
 #include <KWQDef.h>
-
-#include "qcollection.h"
+#include <KWQCollection.h>
 
 template <class T> class QPtrDict : public QCollection {
 public:
diff --git a/WebCore/kwq/qt/qpushbutton.h b/WebCore/kwq/qt/qpushbutton.h
index 38994c8..328a391 100644
--- a/WebCore/kwq/qt/qpushbutton.h
+++ b/WebCore/kwq/qt/qpushbutton.h
@@ -31,7 +31,7 @@
 #include "qwidget.h"
 #include "qstring.h"
 
-class QPushButton : public KWQButton {
+class QPushButton : public QButton {
 public:
     QPushButton();
     QPushButton(QWidget *);
diff --git a/WebCore/kwq/qt/qradiobutton.h b/WebCore/kwq/qt/qradiobutton.h
index 14e4263..521e2f8 100644
--- a/WebCore/kwq/qt/qradiobutton.h
+++ b/WebCore/kwq/qt/qradiobutton.h
@@ -30,7 +30,7 @@
 
 #include "qwidget.h"
 
-class QRadioButton : public KWQButton {
+class QRadioButton : public QButton {
 public:
     QRadioButton();
     QRadioButton(QWidget *);
diff --git a/WebCore/kwq/qt/qscrollview.h b/WebCore/kwq/qt/qscrollview.h
index 15971ab..41cab1f 100644
--- a/WebCore/kwq/qt/qscrollview.h
+++ b/WebCore/kwq/qt/qscrollview.h
@@ -26,13 +26,9 @@
 #ifndef QSCROLLVIEW_H_
 #define QSCROLLVIEW_H_
 
+#include <KWQScrollBar.h>
+#include <KWQFrame.h>
 #include "qwidget.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/qstyle.h b/WebCore/kwq/qt/qstyle.h
deleted file mode 100644
index 691870e..0000000
--- a/WebCore/kwq/qt/qstyle.h
+++ /dev/null
@@ -1,39 +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 QSTYLE_H_
-#define QSTYLE_H_
-
-#include <qobject.h>
-#include <qsize.h>
-
-class QStyle : public QObject {
-public:
-    GUIStyle guiStyle() const;
-    virtual QSize indicatorSize() const = 0;
-    virtual QSize exclusiveIndicatorSize() const = 0;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qvector.h b/WebCore/kwq/qt/qvector.h
index f18d0f1..405765a 100644
--- a/WebCore/kwq/qt/qvector.h
+++ b/WebCore/kwq/qt/qvector.h
@@ -27,8 +27,7 @@
 #define QVECTOR_H_
 
 #include <KWQDef.h>
-
-#include "qcollection.h"
+#include <KWQCollection.h>
 
 typedef void *Item;
 
diff --git a/WebCore/kwq/qt/qwidget.h b/WebCore/kwq/qt/qwidget.h
index e06b115..664d621 100644
--- a/WebCore/kwq/qt/qwidget.h
+++ b/WebCore/kwq/qt/qwidget.h
@@ -35,7 +35,7 @@
 #include "qfont.h"
 #include "qcursor.h"
 #include "qevent.h"
-#include "qstyle.h"
+#include <KWQStyle.h>
 
 class QWidget : public QObject, public QPaintDevice {
 public:
diff --git a/WebCore/src/kwq/KWQButton.h b/WebCore/src/kwq/KWQButton.h
index aaa7400..f6a6f0f 100644
--- a/WebCore/src/kwq/KWQButton.h
+++ b/WebCore/src/kwq/KWQButton.h
@@ -29,10 +29,10 @@
 #include <qwidget.h>
 #include <qstring.h>
 
-class KWQButton : public QWidget {
+class QButton : public QWidget {
 public:
-    KWQButton();
-    KWQButton(QWidget *);
+    QButton();
+    QButton(QWidget *);
     
     virtual void setText(const QString &);
     QString text() const;
diff --git a/WebCore/kwq/KWQCollection.h b/WebCore/src/kwq/KWQCollection.h
similarity index 100%
rename from WebCore/kwq/KWQCollection.h
rename to WebCore/src/kwq/KWQCollection.h
diff --git a/WebCore/src/kwq/KWQCompletion.h b/WebCore/src/kwq/KWQCompletion.h
index e38ed86..cb289b0 100644
--- a/WebCore/src/kwq/KWQCompletion.h
+++ b/WebCore/src/kwq/KWQCompletion.h
@@ -29,16 +29,16 @@
 #include <qobject.h>
 #include <qstringlist.h>
 
-class KWQCompletion : public QObject {
+class QCompletion : public QObject {
 public:
-    KWQCompletion();
+    QCompletion();
     void setItems(const QStringList &);
 };
 
-class KWQCompletionBase {
+class QCompletionBase {
 public:
-     KWQCompletionBase();
-     KWQCompletion *completionObject(bool hsig = true);
+     QCompletionBase();
+     QCompletion *completionObject(bool hsig = true);
 };
 
 #endif
diff --git a/WebCore/kwq/KWQTextCodec.h b/WebCore/src/kwq/KWQDataStream.h
similarity index 63%
copy from WebCore/kwq/KWQTextCodec.h
copy to WebCore/src/kwq/KWQDataStream.h
index 5ea5020..4b16351 100644
--- a/WebCore/kwq/KWQTextCodec.h
+++ b/WebCore/src/kwq/KWQDataStream.h
@@ -23,30 +23,31 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef QTEXTCODEC_H_
-#define QTEXTCODEC_H_
+#ifndef KWQDATASTREAM_H_
+#define KWQDATASTREAM_H_
 
+#include "qarray.h"
 #include "qstring.h"
 #include "qcstring.h"
 
-class QTextDecoder {
-public:
-    virtual QString toUnicode(const char *, int) = 0;
-};
+#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
 
-class QTextCodec {
+class QDataStream {
 public:
-    static QTextCodec *codecForMib(int);
-    static QTextCodec *codecForName(const char *, int accuracy = 0);
-    static QTextCodec *codecForLocale();
+    QDataStream( QByteArray, int mode );
+    virtual ~QDataStream();
 
-    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;
+    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/KWQFrame.h b/WebCore/src/kwq/KWQFrame.h
similarity index 98%
rename from WebCore/kwq/KWQFrame.h
rename to WebCore/src/kwq/KWQFrame.h
index e2b5052..ba1b247 100644
--- a/WebCore/kwq/KWQFrame.h
+++ b/WebCore/src/kwq/KWQFrame.h
@@ -26,7 +26,7 @@
 #ifndef QFRAME_H_
 #define QFRAME_H_
 
-#include "qwidget.h"
+#include <qwidget.h>
 
 class QFrame : public QWidget {
 public:
diff --git a/WebCore/src/kwq/qt/qlistbox.h b/WebCore/src/kwq/KWQListBox.h
similarity index 96%
rename from WebCore/src/kwq/qt/qlistbox.h
rename to WebCore/src/kwq/KWQListBox.h
index d0d8eca..b914571 100644
--- a/WebCore/src/kwq/qt/qlistbox.h
+++ b/WebCore/src/kwq/KWQListBox.h
@@ -23,11 +23,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef QLISTBOX_H_
-#define QLISTBOX_H_
+#ifndef KWQLISTBOX_H_
+#define KWQLISTBOX_H_
 
-#include "qscrollview.h"
-#include "qstring.h"
+#include <qscrollview.h>
+#include <qstring.h>
 
 class QListBoxItem;
 class QListBoxText;
diff --git a/WebCore/src/kwq/KWQScrollBar.h b/WebCore/src/kwq/KWQScrollBar.h
index f065bc8..1f79c8c 100644
--- a/WebCore/src/kwq/KWQScrollBar.h
+++ b/WebCore/src/kwq/KWQScrollBar.h
@@ -29,7 +29,7 @@
 #include <qwidget.h>
 #include <qpalette.h>
 
-class KWQScrollBar : public QWidget {
+class QScrollBar : public QWidget {
 public:
     virtual void setPalette(const QPalette &);
 };
diff --git a/WebCore/src/kwq/qt/qstrlist.h b/WebCore/src/kwq/KWQStrList.h
similarity index 94%
copy from WebCore/src/kwq/qt/qstrlist.h
copy to WebCore/src/kwq/KWQStrList.h
index 0a154e4..f785f40 100644
--- a/WebCore/src/kwq/qt/qstrlist.h
+++ b/WebCore/src/kwq/KWQStrList.h
@@ -23,11 +23,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef QSTRLIST_H_
-#define QSTRLIST_H_
+#ifndef KWQSTRLIST_H_
+#define KWQSTRLIST_H_
 
-#include "qstring.h"
-#include "qlist.h"
+#include <qstring.h>
+#include <qlist.h>
 
 class QStrList : public QList<char> {
 public:
diff --git a/WebCore/kwq/KWQStyle.h b/WebCore/src/kwq/KWQStyle.h
similarity index 97%
rename from WebCore/kwq/KWQStyle.h
rename to WebCore/src/kwq/KWQStyle.h
index 691870e..e4c6eab 100644
--- a/WebCore/kwq/KWQStyle.h
+++ b/WebCore/src/kwq/KWQStyle.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef QSTYLE_H_
-#define QSTYLE_H_
+#ifndef KWQSTYLE_H_
+#define KWQSTYLE_H_
 
 #include <qobject.h>
 #include <qsize.h>
diff --git a/WebCore/src/kwq/kdecore/kconfig.h b/WebCore/src/kwq/kdecore/kconfig.h
index 17cfd33..23ca873 100644
--- a/WebCore/src/kwq/kdecore/kconfig.h
+++ b/WebCore/src/kwq/kdecore/kconfig.h
@@ -31,11 +31,11 @@
 #include <qfont.h>
 #include <qdatetime.h>
 #include <qstring.h>
-#include <qstrlist.h>
 #include <qstringlist.h>
 #include <qvariant.h>
 #include <qmap.h>
 #include <qcolor.h>
+#include <KWQStrList.h>
 
 class KConfigBase {
 public:
diff --git a/WebCore/src/kwq/kdecore/kprocess.h b/WebCore/src/kwq/kdecore/kprocess.h
index 6db1dbd..2b095cd 100644
--- a/WebCore/src/kwq/kdecore/kprocess.h
+++ b/WebCore/src/kwq/kdecore/kprocess.h
@@ -30,7 +30,7 @@
 
 #include <qobject.h>
 #include <qstring.h>
-#include <qstrlist.h>
+#include <KWQStrList.h>
 
 class KProcess : public QObject {
 public:
diff --git a/WebCore/src/kwq/kdeui/kcombobox.h b/WebCore/src/kwq/kdeui/kcombobox.h
index b18f039..86ab211 100644
--- a/WebCore/src/kwq/kdeui/kcombobox.h
+++ b/WebCore/src/kwq/kdeui/kcombobox.h
@@ -30,7 +30,7 @@
 
 #include <KWQCompletion.h>
 
-class KComboBox : public QComboBox, public KWQCompletionBase {
+class KComboBox : public QComboBox, public QCompletionBase {
 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 c4b3ae4..4494989 100644
--- a/WebCore/src/kwq/kdeui/keditcl.h
+++ b/WebCore/src/kwq/kdeui/keditcl.h
@@ -27,7 +27,7 @@
 #define KEDITCL_H_
 
 #include <qwidget.h>
-#include <qframe.h>
+#include <KWQFrame.h>
 #include <KWQScrollbar.h>
 #include <qstring.h>
 
diff --git a/WebCore/src/kwq/kdeui/klineedit.h b/WebCore/src/kwq/kdeui/klineedit.h
index 347c739..0771da2 100644
--- a/WebCore/src/kwq/kdeui/klineedit.h
+++ b/WebCore/src/kwq/kdeui/klineedit.h
@@ -32,7 +32,7 @@
 
 #include "kcompletionbox.h"
 
-class KLineEdit : public QLineEdit, public KWQCompletionBase {
+class KLineEdit : public QLineEdit, public QCompletionBase {
 public:
     KLineEdit(QWidget *parent=0, const char *name=0);
 
diff --git a/WebCore/src/kwq/kdeui/klistbox.h b/WebCore/src/kwq/kdeui/klistbox.h
index ff9079d..f90c719 100644
--- a/WebCore/src/kwq/kdeui/klistbox.h
+++ b/WebCore/src/kwq/kdeui/klistbox.h
@@ -26,7 +26,7 @@
 #ifndef KLISTBOX_H_
 #define KLISTBOX_H_
 
-#include <qlistbox.h>
+#include <KWQListBox.h>
 #include <qwidget.h>
 
 class KListBox : public QListBox {
diff --git a/WebCore/src/kwq/kio/jobclasses.h b/WebCore/src/kwq/kio/jobclasses.h
index 1eeeede..4faf865 100644
--- a/WebCore/src/kwq/kio/jobclasses.h
+++ b/WebCore/src/kwq/kio/jobclasses.h
@@ -26,7 +26,8 @@
 #ifndef JOBCLASSES_H_
 #define JOBCLASSES_H_
 
-class QString;
+#include <qobject.h>
+#include <qstring.h>
 
 namespace KIO {
 
diff --git a/WebCore/src/kwq/kio/kimageio.h b/WebCore/src/kwq/kio/kimageio.h
index 5f730df..6bcab4f 100644
--- a/WebCore/src/kwq/kio/kimageio.h
+++ b/WebCore/src/kwq/kio/kimageio.h
@@ -26,6 +26,8 @@
 #ifndef KIMAGEIO_H_
 #define KIMAGEIO_H_
 
+#include <qstringlist.h>
+
 class KImageIO {
 public:
     enum Mode { Reading, Writing };
diff --git a/WebCore/src/kwq/kparts/browserextension.h b/WebCore/src/kwq/kparts/browserextension.h
index a28ed5a..97d9862 100644
--- a/WebCore/src/kwq/kparts/browserextension.h
+++ b/WebCore/src/kwq/kparts/browserextension.h
@@ -28,7 +28,7 @@
 
 #include <qpoint.h>
 #include <qevent.h>
-#include <qdatastream.h>
+#include <KWQDataStream.h>
 
 #include <kurl.h>
 
diff --git a/WebCore/src/kwq/qt/qcheckbox.h b/WebCore/src/kwq/qt/qcheckbox.h
index 3e60fd6..e0f0327 100644
--- a/WebCore/src/kwq/qt/qcheckbox.h
+++ b/WebCore/src/kwq/qt/qcheckbox.h
@@ -28,7 +28,7 @@
 
 #include <KWQButton.h>
 
-class QCheckBox : public KWQButton {
+class QCheckBox : public QButton {
 public:
     QCheckBox();
     QCheckBox(QWidget *parent);
diff --git a/WebCore/src/kwq/qt/qcollection.h b/WebCore/src/kwq/qt/qcollection.h
deleted file mode 100644
index 0a17687..0000000
--- a/WebCore/src/kwq/qt/qcollection.h
+++ /dev/null
@@ -1,37 +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 QCOLLECTION_H_
-#define QCOLLECTION_H_
-
-class QCollection {
-public:
-    typedef void *Item;
-    void setAutoDelete(bool);
-protected:
-    virtual Item newItem(Item);
-};
-
-#endif
diff --git a/WebCore/src/kwq/qt/qcombobox.h b/WebCore/src/kwq/qt/qcombobox.h
index 11253ff..401358d 100644
--- a/WebCore/src/kwq/qt/qcombobox.h
+++ b/WebCore/src/kwq/qt/qcombobox.h
@@ -26,8 +26,8 @@
 #ifndef QCOMBOBOX_H_
 #define QCOMBOBOX_H_
 
+#include <KWQListBox.h>
 #include "qwidget.h"
-#include "qlistbox.h"
 
 class QComboBox : public QWidget {
 public:
diff --git a/WebCore/src/kwq/qt/qdict.h b/WebCore/src/kwq/qt/qdict.h
index a663d0c..82ad4b2 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 <KWQCollection.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
deleted file mode 100644
index e2b5052..0000000
--- a/WebCore/src/kwq/qt/qframe.h
+++ /dev/null
@@ -1,50 +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 QFRAME_H_
-#define QFRAME_H_
-
-#include "qwidget.h"
-
-class QFrame : public QWidget {
-public:
-
-    enum Shape {
-        NoFrame,
-        Box,
-        StyledPanel,
-    };
-    enum Shadow {
-        Sunken,
-    };
-
-    QFrame();
-    QFrame(QWidget *parent);
-
-    virtual void setFrameStyle(int);
-    int frameWidth() const;
-};
-
-#endif
diff --git a/WebCore/src/kwq/qt/qhbox.h b/WebCore/src/kwq/qt/qhbox.h
index 913dde8..cfdd7d7 100644
--- a/WebCore/src/kwq/qt/qhbox.h
+++ b/WebCore/src/kwq/qt/qhbox.h
@@ -27,7 +27,7 @@
 #define QHBOX_H_
 
 #include "qwidget.h"
-#include "qframe.h"
+#include <KWQFrame.h>
 
 class QHBox : public QFrame {
 public:
diff --git a/WebCore/src/kwq/qt/qlabel.h b/WebCore/src/kwq/qt/qlabel.h
index 198a3b5..5eb95b4 100644
--- a/WebCore/src/kwq/qt/qlabel.h
+++ b/WebCore/src/kwq/qt/qlabel.h
@@ -26,7 +26,7 @@
 #ifndef QLABEL_H_
 #define QLABEL_H_
 
-#include "qframe.h"
+#include <KWQFrame.h>
 #include "qwidget.h"
 #include "qstring.h"
 
diff --git a/WebCore/src/kwq/qt/qlist.h b/WebCore/src/kwq/qt/qlist.h
index 3262373..00c0be9 100644
--- a/WebCore/src/kwq/qt/qlist.h
+++ b/WebCore/src/kwq/qt/qlist.h
@@ -27,8 +27,7 @@
 #define QLIST_H_
 
 #include <KWQDef.h>
-
-#include "qcollection.h"
+#include <KWQCollection.h>
 
 template <class T> class QList : public QCollection {
 public:
diff --git a/WebCore/src/kwq/qt/qptrdict.h b/WebCore/src/kwq/qt/qptrdict.h
index 22d1a88..090fec5 100644
--- a/WebCore/src/kwq/qt/qptrdict.h
+++ b/WebCore/src/kwq/qt/qptrdict.h
@@ -27,8 +27,7 @@
 #define QPTRDICT_H_
 
 #include <KWQDef.h>
-
-#include "qcollection.h"
+#include <KWQCollection.h>
 
 template <class T> class QPtrDict : public QCollection {
 public:
diff --git a/WebCore/src/kwq/qt/qpushbutton.h b/WebCore/src/kwq/qt/qpushbutton.h
index 38994c8..328a391 100644
--- a/WebCore/src/kwq/qt/qpushbutton.h
+++ b/WebCore/src/kwq/qt/qpushbutton.h
@@ -31,7 +31,7 @@
 #include "qwidget.h"
 #include "qstring.h"
 
-class QPushButton : public KWQButton {
+class QPushButton : public QButton {
 public:
     QPushButton();
     QPushButton(QWidget *);
diff --git a/WebCore/src/kwq/qt/qradiobutton.h b/WebCore/src/kwq/qt/qradiobutton.h
index 14e4263..521e2f8 100644
--- a/WebCore/src/kwq/qt/qradiobutton.h
+++ b/WebCore/src/kwq/qt/qradiobutton.h
@@ -30,7 +30,7 @@
 
 #include "qwidget.h"
 
-class QRadioButton : public KWQButton {
+class QRadioButton : public QButton {
 public:
     QRadioButton();
     QRadioButton(QWidget *);
diff --git a/WebCore/src/kwq/qt/qscrollview.h b/WebCore/src/kwq/qt/qscrollview.h
index 15971ab..41cab1f 100644
--- a/WebCore/src/kwq/qt/qscrollview.h
+++ b/WebCore/src/kwq/qt/qscrollview.h
@@ -26,13 +26,9 @@
 #ifndef QSCROLLVIEW_H_
 #define QSCROLLVIEW_H_
 
+#include <KWQScrollBar.h>
+#include <KWQFrame.h>
 #include "qwidget.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/qstyle.h b/WebCore/src/kwq/qt/qstyle.h
deleted file mode 100644
index 691870e..0000000
--- a/WebCore/src/kwq/qt/qstyle.h
+++ /dev/null
@@ -1,39 +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 QSTYLE_H_
-#define QSTYLE_H_
-
-#include <qobject.h>
-#include <qsize.h>
-
-class QStyle : public QObject {
-public:
-    GUIStyle guiStyle() const;
-    virtual QSize indicatorSize() const = 0;
-    virtual QSize exclusiveIndicatorSize() const = 0;
-};
-
-#endif
diff --git a/WebCore/src/kwq/qt/qvector.h b/WebCore/src/kwq/qt/qvector.h
index f18d0f1..405765a 100644
--- a/WebCore/src/kwq/qt/qvector.h
+++ b/WebCore/src/kwq/qt/qvector.h
@@ -27,8 +27,7 @@
 #define QVECTOR_H_
 
 #include <KWQDef.h>
-
-#include "qcollection.h"
+#include <KWQCollection.h>
 
 typedef void *Item;
 
diff --git a/WebCore/src/kwq/qt/qwidget.h b/WebCore/src/kwq/qt/qwidget.h
index e06b115..664d621 100644
--- a/WebCore/src/kwq/qt/qwidget.h
+++ b/WebCore/src/kwq/qt/qwidget.h
@@ -35,7 +35,7 @@
 #include "qfont.h"
 #include "qcursor.h"
 #include "qevent.h"
-#include "qstyle.h"
+#include <KWQStyle.h>
 
 class QWidget : public QObject, public QPaintDevice {
 public:

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list