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

The following commit has been merged in the debian/unstable branch:
commit 1eff3bfb826902506c08fbcc0889128a53da4e6b
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 20 18:40:38 2001 +0000

    Made some changes and confirmed that the tree builds when _KWQ_COMPLETE is
    defined *and* also when it isn't
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@160 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQPtrList.h b/WebCore/kwq/KWQPtrList.h
index b0a5152..7d6bdf5 100644
--- a/WebCore/kwq/KWQPtrList.h
+++ b/WebCore/kwq/KWQPtrList.h
@@ -37,7 +37,7 @@
 #else
 
 #include <KWQDef.h>
-#include <KWQCollection.h>
+#include <_qcollection.h>
 
 // class QList =================================================================
 
diff --git a/WebCore/kwq/qt/_qarray.h b/WebCore/kwq/qt/_qarray.h
index 5979ad9..f6c5c82 100644
--- a/WebCore/kwq/qt/_qarray.h
+++ b/WebCore/kwq/qt/_qarray.h
@@ -38,6 +38,16 @@
 #ifndef QARRAY_H
 #define QARRAY_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "_qgarray.h"
 #endif // QT_H
diff --git a/WebCore/kwq/qt/_qcollection.cpp b/WebCore/kwq/qt/_qcollection.cpp
index 25f6c17..73d0710 100644
--- a/WebCore/kwq/qt/_qcollection.cpp
+++ b/WebCore/kwq/qt/_qcollection.cpp
@@ -35,6 +35,14 @@
 **
 **********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 #include "_qcollection.h"
 
 // NOT REVISED
diff --git a/WebCore/kwq/qt/_qcollection.h b/WebCore/kwq/qt/_qcollection.h
index 63d676e..0754224 100644
--- a/WebCore/kwq/qt/_qcollection.h
+++ b/WebCore/kwq/qt/_qcollection.h
@@ -40,6 +40,10 @@
 
 // KWQ hacks ---------------------------------------------------------------
 
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
 #include <KWQDef.h>
 
 // -------------------------------------------------------------------------
diff --git a/WebCore/kwq/qt/_qcolor.cpp b/WebCore/kwq/qt/_qcolor.cpp
index a20e969..be6c8f0 100644
--- a/WebCore/kwq/qt/_qcolor.cpp
+++ b/WebCore/kwq/qt/_qcolor.cpp
@@ -35,6 +35,14 @@
 **
 **********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 #include "qcolor.h"
 #include "qnamespace.h"
 
diff --git a/WebCore/kwq/qt/_qcolor.h b/WebCore/kwq/qt/_qcolor.h
index 034bd30..d6350d8 100644
--- a/WebCore/kwq/qt/_qcolor.h
+++ b/WebCore/kwq/qt/_qcolor.h
@@ -40,6 +40,10 @@
 
 // KWQ hacks ---------------------------------------------------------------
 
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
 #include <KWQDef.h>
 #include <qnamespace.h>
 #include <qstring.h>
diff --git a/WebCore/kwq/qt/_qcstring.cpp b/WebCore/kwq/qt/_qcstring.cpp
index fa598e0..d2962c4 100644
--- a/WebCore/kwq/qt/_qcstring.cpp
+++ b/WebCore/kwq/qt/_qcstring.cpp
@@ -36,6 +36,14 @@
 **
 **********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 #include "qstring.h"
 #include "qregexp.h"
 
diff --git a/WebCore/kwq/qt/_qcstring.h b/WebCore/kwq/qt/_qcstring.h
index d1f0c65..8f82183 100644
--- a/WebCore/kwq/qt/_qcstring.h
+++ b/WebCore/kwq/qt/_qcstring.h
@@ -41,6 +41,10 @@
 
 // KWQ hacks ---------------------------------------------------------------
 
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
 #include <KWQDef.h>
 
 // -------------------------------------------------------------------------
diff --git a/WebCore/kwq/qt/_qdatetime.cpp b/WebCore/kwq/qt/_qdatetime.cpp
index 0423f50..7b461f8 100644
--- a/WebCore/kwq/qt/_qdatetime.cpp
+++ b/WebCore/kwq/qt/_qdatetime.cpp
@@ -35,6 +35,14 @@
 **
 **********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 #define gettimeofday	__hide_gettimeofday
 #include "qdatetime.h"
 
diff --git a/WebCore/kwq/qt/_qdatetime.h b/WebCore/kwq/qt/_qdatetime.h
index 820fde3..0a3d04e 100644
--- a/WebCore/kwq/qt/_qdatetime.h
+++ b/WebCore/kwq/qt/_qdatetime.h
@@ -38,6 +38,16 @@
 #ifndef QDATETIME_H
 #define QDATETIME_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "qstring.h"
 #endif // QT_H
diff --git a/WebCore/kwq/qt/_qgarray.cpp b/WebCore/kwq/qt/_qgarray.cpp
index f76bd34..1daa7f2 100644
--- a/WebCore/kwq/qt/_qgarray.cpp
+++ b/WebCore/kwq/qt/_qgarray.cpp
@@ -10,6 +10,14 @@
  *
  ***********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 #include <_qgarray.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/WebCore/kwq/qt/_qgarray.h b/WebCore/kwq/qt/_qgarray.h
index 1a41415..a18c5c4 100644
--- a/WebCore/kwq/qt/_qgarray.h
+++ b/WebCore/kwq/qt/_qgarray.h
@@ -13,6 +13,16 @@
 #ifndef _QGARRAY_H_
 #define _QGARRAY_H_
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #include <_qshared.h>
 
 class QGArray					// generic array
diff --git a/WebCore/kwq/qt/_qglist.cpp b/WebCore/kwq/qt/_qglist.cpp
index ca99ab3..f3adc8f 100644
--- a/WebCore/kwq/qt/_qglist.cpp
+++ b/WebCore/kwq/qt/_qglist.cpp
@@ -35,6 +35,14 @@
 **
 **********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 #include "_qglist.h"
 #include "_qgvector.h"
 #ifndef QT_NO_DATASTREAM
diff --git a/WebCore/kwq/qt/_qglist.h b/WebCore/kwq/qt/_qglist.h
index 59e0aad..8a562e3 100644
--- a/WebCore/kwq/qt/_qglist.h
+++ b/WebCore/kwq/qt/_qglist.h
@@ -38,6 +38,16 @@
 #ifndef QGLIST_H
 #define QGLIST_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "_qcollection.h"
 #endif // QT_H
diff --git a/WebCore/kwq/qt/_qglobal.cpp b/WebCore/kwq/qt/_qglobal.cpp
index 013222c..705e12f 100644
--- a/WebCore/kwq/qt/_qglobal.cpp
+++ b/WebCore/kwq/qt/_qglobal.cpp
@@ -23,6 +23,14 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 void qDebug(const char *msg, ...)
 {
 }
diff --git a/WebCore/kwq/qt/_qgvector.cpp b/WebCore/kwq/qt/_qgvector.cpp
index d78ee43..8b6b64f 100644
--- a/WebCore/kwq/qt/_qgvector.cpp
+++ b/WebCore/kwq/qt/_qgvector.cpp
@@ -35,6 +35,14 @@
 **
 **********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 #define	 QGVECTOR_CPP
 #include "_qgvector.h"
 #include "_qglist.h"
diff --git a/WebCore/kwq/qt/_qgvector.h b/WebCore/kwq/qt/_qgvector.h
index 47334c4..b679e77 100644
--- a/WebCore/kwq/qt/_qgvector.h
+++ b/WebCore/kwq/qt/_qgvector.h
@@ -38,6 +38,16 @@
 #ifndef QGVECTOR_H
 #define QGVECTOR_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "_qcollection.h"
 #endif // QT_H
diff --git a/WebCore/kwq/qt/_qiodevice.h b/WebCore/kwq/qt/_qiodevice.h
index 6688bda..4843159 100644
--- a/WebCore/kwq/qt/_qiodevice.h
+++ b/WebCore/kwq/qt/_qiodevice.h
@@ -38,6 +38,16 @@
 #ifndef QIODEVICE_H
 #define QIODEVICE_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "qglobal.h"
 #include "qcstring.h"
diff --git a/WebCore/kwq/qt/_qlist.h b/WebCore/kwq/qt/_qlist.h
index 1a9a25d..1406fea 100644
--- a/WebCore/kwq/qt/_qlist.h
+++ b/WebCore/kwq/qt/_qlist.h
@@ -38,6 +38,16 @@
 #ifndef QLIST_H
 #define QLIST_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "_qglist.h"
 #endif // QT_H
diff --git a/WebCore/kwq/qt/_qpoint.cpp b/WebCore/kwq/qt/_qpoint.cpp
index 7c204d6..5d69f26 100644
--- a/WebCore/kwq/qt/_qpoint.cpp
+++ b/WebCore/kwq/qt/_qpoint.cpp
@@ -10,6 +10,14 @@
  *
  ***********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 #include <qpoint.h>
 
 // for abs()
diff --git a/WebCore/kwq/qt/_qrect.cpp b/WebCore/kwq/qt/_qrect.cpp
index ddbbf53..38a8d10 100644
--- a/WebCore/kwq/qt/_qrect.cpp
+++ b/WebCore/kwq/qt/_qrect.cpp
@@ -10,6 +10,14 @@
  *
  ***********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 #include <qrect.h>
 
 QRect::QRect()
diff --git a/WebCore/kwq/qt/_qregexp.cpp b/WebCore/kwq/qt/_qregexp.cpp
index 99189a6..f33e82f 100644
--- a/WebCore/kwq/qt/_qregexp.cpp
+++ b/WebCore/kwq/qt/_qregexp.cpp
@@ -35,6 +35,14 @@
 **
 **********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 #include "qregexp.h"
 #include <ctype.h>
 #include <stdlib.h>
diff --git a/WebCore/kwq/qt/_qregexp.h b/WebCore/kwq/qt/_qregexp.h
index a66453c..99e2447 100644
--- a/WebCore/kwq/qt/_qregexp.h
+++ b/WebCore/kwq/qt/_qregexp.h
@@ -38,6 +38,16 @@
 #ifndef QREGEXP_H
 #define QREGEXP_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "qstring.h"
 #endif // QT_H
diff --git a/WebCore/kwq/qt/_qregion.cpp b/WebCore/kwq/qt/_qregion.cpp
index 3f1f92c..2f3f154 100644
--- a/WebCore/kwq/qt/_qregion.cpp
+++ b/WebCore/kwq/qt/_qregion.cpp
@@ -35,6 +35,14 @@
 **
 **********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 #include "qregion.h"
 #include "qpoint.h"
 #include "qbuffer.h"
diff --git a/WebCore/kwq/qt/_qregion.h b/WebCore/kwq/qt/_qregion.h
index cb8aa18..71db1b7 100644
--- a/WebCore/kwq/qt/_qregion.h
+++ b/WebCore/kwq/qt/_qregion.h
@@ -38,6 +38,16 @@
 #ifndef QREGION_H
 #define QREGION_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "_qshared.h"
 #include "qrect.h"
diff --git a/WebCore/kwq/qt/_qshared.h b/WebCore/kwq/qt/_qshared.h
index 1ba90d9..e24bcdb 100644
--- a/WebCore/kwq/qt/_qshared.h
+++ b/WebCore/kwq/qt/_qshared.h
@@ -17,8 +17,16 @@
 #include <config.h>
 #endif
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
 #include <KWQDef.h>
 
+// -------------------------------------------------------------------------
+
 struct QShared
 {
     QShared() 
diff --git a/WebCore/kwq/qt/_qsize.cpp b/WebCore/kwq/qt/_qsize.cpp
index b20748b..e7cee09 100644
--- a/WebCore/kwq/qt/_qsize.cpp
+++ b/WebCore/kwq/qt/_qsize.cpp
@@ -10,6 +10,14 @@
  *
  ***********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 #include <qsize.h>
 
 QSize::QSize() 
diff --git a/WebCore/kwq/qt/_qsortedlist.h b/WebCore/kwq/qt/_qsortedlist.h
index 7b90da6..cb78bee 100644
--- a/WebCore/kwq/qt/_qsortedlist.h
+++ b/WebCore/kwq/qt/_qsortedlist.h
@@ -38,6 +38,16 @@
 #ifndef QSORTEDLIST_H
 #define QSORTEDLIST_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "qlist.h"
 #endif // QT_H
diff --git a/WebCore/kwq/qt/_qstack.h b/WebCore/kwq/qt/_qstack.h
index 2958a42..ccb16ec 100644
--- a/WebCore/kwq/qt/_qstack.h
+++ b/WebCore/kwq/qt/_qstack.h
@@ -38,6 +38,16 @@
 #ifndef QSTACK_H
 #define QSTACK_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "_qglist.h"
 #endif // QT_H
diff --git a/WebCore/kwq/qt/_qstring.cpp b/WebCore/kwq/qt/_qstring.cpp
index de179c3..07a845a 100644
--- a/WebCore/kwq/qt/_qstring.cpp
+++ b/WebCore/kwq/qt/_qstring.cpp
@@ -35,6 +35,14 @@
 **
 **********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 // Don't define it while compiling this module, or USERS of Qt will
 // not be able to link.
 #ifdef QT_NO_CAST_ASCII
diff --git a/WebCore/kwq/qt/_qstring.h b/WebCore/kwq/qt/_qstring.h
index 6354ac9..cae347f 100644
--- a/WebCore/kwq/qt/_qstring.h
+++ b/WebCore/kwq/qt/_qstring.h
@@ -43,18 +43,16 @@
 #include "qcstring.h"
 #endif // QT_H
 
-
 // KWQ hacks ---------------------------------------------------------------
 
-// FIXME: we don't handle Q_EXPORT
-#define QT_STATIC_CONST static const
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
 
-typedef unsigned short Q_UINT16;
-typedef unsigned long ulong;
+#include <KWQDef.h>
 
 // -------------------------------------------------------------------------
 
-
 /*****************************************************************************
   QString class
  *****************************************************************************/
diff --git a/WebCore/kwq/qt/_qstringlist.cpp b/WebCore/kwq/qt/_qstringlist.cpp
index 8854008..6688bb1 100644
--- a/WebCore/kwq/qt/_qstringlist.cpp
+++ b/WebCore/kwq/qt/_qstringlist.cpp
@@ -35,6 +35,14 @@
 **
 **********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 #include "qstringlist.h"
 
 #ifndef QT_NO_STRINGLIST
diff --git a/WebCore/kwq/qt/_qstringlist.h b/WebCore/kwq/qt/_qstringlist.h
index 04d11c6..7018c09 100644
--- a/WebCore/kwq/qt/_qstringlist.h
+++ b/WebCore/kwq/qt/_qstringlist.h
@@ -38,6 +38,16 @@
 #ifndef QSTRINGLIST_H
 #define QSTRINGLIST_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "qvaluelist.h"
 #include "qstring.h"
diff --git a/WebCore/kwq/qt/_qstrlist.h b/WebCore/kwq/qt/_qstrlist.h
index cf4caef..f7700f2 100644
--- a/WebCore/kwq/qt/_qstrlist.h
+++ b/WebCore/kwq/qt/_qstrlist.h
@@ -38,6 +38,16 @@
 #ifndef QSTRLIST_H
 #define QSTRLIST_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "qstring.h"
 #include "qlist.h"
diff --git a/WebCore/kwq/qt/_qtextcodec.h b/WebCore/kwq/qt/_qtextcodec.h
index 9d5783f..4e6ac8b 100644
--- a/WebCore/kwq/qt/_qtextcodec.h
+++ b/WebCore/kwq/qt/_qtextcodec.h
@@ -38,6 +38,16 @@
 #ifndef QTEXTCODEC_H
 #define QTEXTCODEC_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "qstring.h"
 #endif // QT_H
diff --git a/WebCore/kwq/qt/_qtl.h b/WebCore/kwq/qt/_qtl.h
index 3b3b082..e1e2d1e 100644
--- a/WebCore/kwq/qt/_qtl.h
+++ b/WebCore/kwq/qt/_qtl.h
@@ -37,6 +37,16 @@
 #ifndef QTL_H
 #define QTL_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 
 #ifndef QT_NO_TEXTSTREAM
diff --git a/WebCore/kwq/qt/_qvaluelist.h b/WebCore/kwq/qt/_qvaluelist.h
index 28231c5..d6a7ec5 100644
--- a/WebCore/kwq/qt/_qvaluelist.h
+++ b/WebCore/kwq/qt/_qvaluelist.h
@@ -38,6 +38,16 @@
 #ifndef QVALUELIST_H
 #define QVALUELIST_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "_qshared.h"
 
diff --git a/WebCore/kwq/qt/_qvector.h b/WebCore/kwq/qt/_qvector.h
index 7a844f2..6995da1 100644
--- a/WebCore/kwq/qt/_qvector.h
+++ b/WebCore/kwq/qt/_qvector.h
@@ -40,6 +40,10 @@
 
 // KWQ hacks ---------------------------------------------------------------
 
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
 #include <KWQDef.h>
 
 // -------------------------------------------------------------------------
diff --git a/WebCore/kwq/qt/qlist.h b/WebCore/kwq/qt/qlist.h
index b0a5152..7d6bdf5 100644
--- a/WebCore/kwq/qt/qlist.h
+++ b/WebCore/kwq/qt/qlist.h
@@ -37,7 +37,7 @@
 #else
 
 #include <KWQDef.h>
-#include <KWQCollection.h>
+#include <_qcollection.h>
 
 // class QList =================================================================
 
diff --git a/WebCore/src/kwq/qt/_qarray.h b/WebCore/src/kwq/qt/_qarray.h
index 5979ad9..f6c5c82 100644
--- a/WebCore/src/kwq/qt/_qarray.h
+++ b/WebCore/src/kwq/qt/_qarray.h
@@ -38,6 +38,16 @@
 #ifndef QARRAY_H
 #define QARRAY_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "_qgarray.h"
 #endif // QT_H
diff --git a/WebCore/src/kwq/qt/_qcollection.cpp b/WebCore/src/kwq/qt/_qcollection.cpp
index 25f6c17..73d0710 100644
--- a/WebCore/src/kwq/qt/_qcollection.cpp
+++ b/WebCore/src/kwq/qt/_qcollection.cpp
@@ -35,6 +35,14 @@
 **
 **********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 #include "_qcollection.h"
 
 // NOT REVISED
diff --git a/WebCore/src/kwq/qt/_qcollection.h b/WebCore/src/kwq/qt/_qcollection.h
index 63d676e..0754224 100644
--- a/WebCore/src/kwq/qt/_qcollection.h
+++ b/WebCore/src/kwq/qt/_qcollection.h
@@ -40,6 +40,10 @@
 
 // KWQ hacks ---------------------------------------------------------------
 
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
 #include <KWQDef.h>
 
 // -------------------------------------------------------------------------
diff --git a/WebCore/src/kwq/qt/_qcolor.cpp b/WebCore/src/kwq/qt/_qcolor.cpp
index a20e969..be6c8f0 100644
--- a/WebCore/src/kwq/qt/_qcolor.cpp
+++ b/WebCore/src/kwq/qt/_qcolor.cpp
@@ -35,6 +35,14 @@
 **
 **********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 #include "qcolor.h"
 #include "qnamespace.h"
 
diff --git a/WebCore/src/kwq/qt/_qcolor.h b/WebCore/src/kwq/qt/_qcolor.h
index 034bd30..d6350d8 100644
--- a/WebCore/src/kwq/qt/_qcolor.h
+++ b/WebCore/src/kwq/qt/_qcolor.h
@@ -40,6 +40,10 @@
 
 // KWQ hacks ---------------------------------------------------------------
 
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
 #include <KWQDef.h>
 #include <qnamespace.h>
 #include <qstring.h>
diff --git a/WebCore/src/kwq/qt/_qcstring.cpp b/WebCore/src/kwq/qt/_qcstring.cpp
index fa598e0..d2962c4 100644
--- a/WebCore/src/kwq/qt/_qcstring.cpp
+++ b/WebCore/src/kwq/qt/_qcstring.cpp
@@ -36,6 +36,14 @@
 **
 **********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 #include "qstring.h"
 #include "qregexp.h"
 
diff --git a/WebCore/src/kwq/qt/_qcstring.h b/WebCore/src/kwq/qt/_qcstring.h
index d1f0c65..8f82183 100644
--- a/WebCore/src/kwq/qt/_qcstring.h
+++ b/WebCore/src/kwq/qt/_qcstring.h
@@ -41,6 +41,10 @@
 
 // KWQ hacks ---------------------------------------------------------------
 
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
 #include <KWQDef.h>
 
 // -------------------------------------------------------------------------
diff --git a/WebCore/src/kwq/qt/_qdatetime.cpp b/WebCore/src/kwq/qt/_qdatetime.cpp
index 0423f50..7b461f8 100644
--- a/WebCore/src/kwq/qt/_qdatetime.cpp
+++ b/WebCore/src/kwq/qt/_qdatetime.cpp
@@ -35,6 +35,14 @@
 **
 **********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 #define gettimeofday	__hide_gettimeofday
 #include "qdatetime.h"
 
diff --git a/WebCore/src/kwq/qt/_qdatetime.h b/WebCore/src/kwq/qt/_qdatetime.h
index 820fde3..0a3d04e 100644
--- a/WebCore/src/kwq/qt/_qdatetime.h
+++ b/WebCore/src/kwq/qt/_qdatetime.h
@@ -38,6 +38,16 @@
 #ifndef QDATETIME_H
 #define QDATETIME_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "qstring.h"
 #endif // QT_H
diff --git a/WebCore/src/kwq/qt/_qgarray.cpp b/WebCore/src/kwq/qt/_qgarray.cpp
index f76bd34..1daa7f2 100644
--- a/WebCore/src/kwq/qt/_qgarray.cpp
+++ b/WebCore/src/kwq/qt/_qgarray.cpp
@@ -10,6 +10,14 @@
  *
  ***********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 #include <_qgarray.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/WebCore/src/kwq/qt/_qgarray.h b/WebCore/src/kwq/qt/_qgarray.h
index 1a41415..a18c5c4 100644
--- a/WebCore/src/kwq/qt/_qgarray.h
+++ b/WebCore/src/kwq/qt/_qgarray.h
@@ -13,6 +13,16 @@
 #ifndef _QGARRAY_H_
 #define _QGARRAY_H_
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #include <_qshared.h>
 
 class QGArray					// generic array
diff --git a/WebCore/src/kwq/qt/_qglist.cpp b/WebCore/src/kwq/qt/_qglist.cpp
index ca99ab3..f3adc8f 100644
--- a/WebCore/src/kwq/qt/_qglist.cpp
+++ b/WebCore/src/kwq/qt/_qglist.cpp
@@ -35,6 +35,14 @@
 **
 **********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 #include "_qglist.h"
 #include "_qgvector.h"
 #ifndef QT_NO_DATASTREAM
diff --git a/WebCore/src/kwq/qt/_qglist.h b/WebCore/src/kwq/qt/_qglist.h
index 59e0aad..8a562e3 100644
--- a/WebCore/src/kwq/qt/_qglist.h
+++ b/WebCore/src/kwq/qt/_qglist.h
@@ -38,6 +38,16 @@
 #ifndef QGLIST_H
 #define QGLIST_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "_qcollection.h"
 #endif // QT_H
diff --git a/WebCore/src/kwq/qt/_qglobal.cpp b/WebCore/src/kwq/qt/_qglobal.cpp
index 013222c..705e12f 100644
--- a/WebCore/src/kwq/qt/_qglobal.cpp
+++ b/WebCore/src/kwq/qt/_qglobal.cpp
@@ -23,6 +23,14 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 void qDebug(const char *msg, ...)
 {
 }
diff --git a/WebCore/src/kwq/qt/_qgvector.cpp b/WebCore/src/kwq/qt/_qgvector.cpp
index d78ee43..8b6b64f 100644
--- a/WebCore/src/kwq/qt/_qgvector.cpp
+++ b/WebCore/src/kwq/qt/_qgvector.cpp
@@ -35,6 +35,14 @@
 **
 **********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 #define	 QGVECTOR_CPP
 #include "_qgvector.h"
 #include "_qglist.h"
diff --git a/WebCore/src/kwq/qt/_qgvector.h b/WebCore/src/kwq/qt/_qgvector.h
index 47334c4..b679e77 100644
--- a/WebCore/src/kwq/qt/_qgvector.h
+++ b/WebCore/src/kwq/qt/_qgvector.h
@@ -38,6 +38,16 @@
 #ifndef QGVECTOR_H
 #define QGVECTOR_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "_qcollection.h"
 #endif // QT_H
diff --git a/WebCore/src/kwq/qt/_qiodevice.h b/WebCore/src/kwq/qt/_qiodevice.h
index 6688bda..4843159 100644
--- a/WebCore/src/kwq/qt/_qiodevice.h
+++ b/WebCore/src/kwq/qt/_qiodevice.h
@@ -38,6 +38,16 @@
 #ifndef QIODEVICE_H
 #define QIODEVICE_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "qglobal.h"
 #include "qcstring.h"
diff --git a/WebCore/src/kwq/qt/_qlist.h b/WebCore/src/kwq/qt/_qlist.h
index 1a9a25d..1406fea 100644
--- a/WebCore/src/kwq/qt/_qlist.h
+++ b/WebCore/src/kwq/qt/_qlist.h
@@ -38,6 +38,16 @@
 #ifndef QLIST_H
 #define QLIST_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "_qglist.h"
 #endif // QT_H
diff --git a/WebCore/src/kwq/qt/_qpoint.cpp b/WebCore/src/kwq/qt/_qpoint.cpp
index 7c204d6..5d69f26 100644
--- a/WebCore/src/kwq/qt/_qpoint.cpp
+++ b/WebCore/src/kwq/qt/_qpoint.cpp
@@ -10,6 +10,14 @@
  *
  ***********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 #include <qpoint.h>
 
 // for abs()
diff --git a/WebCore/src/kwq/qt/_qrect.cpp b/WebCore/src/kwq/qt/_qrect.cpp
index ddbbf53..38a8d10 100644
--- a/WebCore/src/kwq/qt/_qrect.cpp
+++ b/WebCore/src/kwq/qt/_qrect.cpp
@@ -10,6 +10,14 @@
  *
  ***********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 #include <qrect.h>
 
 QRect::QRect()
diff --git a/WebCore/src/kwq/qt/_qregexp.cpp b/WebCore/src/kwq/qt/_qregexp.cpp
index 99189a6..f33e82f 100644
--- a/WebCore/src/kwq/qt/_qregexp.cpp
+++ b/WebCore/src/kwq/qt/_qregexp.cpp
@@ -35,6 +35,14 @@
 **
 **********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 #include "qregexp.h"
 #include <ctype.h>
 #include <stdlib.h>
diff --git a/WebCore/src/kwq/qt/_qregexp.h b/WebCore/src/kwq/qt/_qregexp.h
index a66453c..99e2447 100644
--- a/WebCore/src/kwq/qt/_qregexp.h
+++ b/WebCore/src/kwq/qt/_qregexp.h
@@ -38,6 +38,16 @@
 #ifndef QREGEXP_H
 #define QREGEXP_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "qstring.h"
 #endif // QT_H
diff --git a/WebCore/src/kwq/qt/_qregion.cpp b/WebCore/src/kwq/qt/_qregion.cpp
index 3f1f92c..2f3f154 100644
--- a/WebCore/src/kwq/qt/_qregion.cpp
+++ b/WebCore/src/kwq/qt/_qregion.cpp
@@ -35,6 +35,14 @@
 **
 **********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 #include "qregion.h"
 #include "qpoint.h"
 #include "qbuffer.h"
diff --git a/WebCore/src/kwq/qt/_qregion.h b/WebCore/src/kwq/qt/_qregion.h
index cb8aa18..71db1b7 100644
--- a/WebCore/src/kwq/qt/_qregion.h
+++ b/WebCore/src/kwq/qt/_qregion.h
@@ -38,6 +38,16 @@
 #ifndef QREGION_H
 #define QREGION_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "_qshared.h"
 #include "qrect.h"
diff --git a/WebCore/src/kwq/qt/_qshared.h b/WebCore/src/kwq/qt/_qshared.h
index 1ba90d9..e24bcdb 100644
--- a/WebCore/src/kwq/qt/_qshared.h
+++ b/WebCore/src/kwq/qt/_qshared.h
@@ -17,8 +17,16 @@
 #include <config.h>
 #endif
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
 #include <KWQDef.h>
 
+// -------------------------------------------------------------------------
+
 struct QShared
 {
     QShared() 
diff --git a/WebCore/src/kwq/qt/_qsize.cpp b/WebCore/src/kwq/qt/_qsize.cpp
index b20748b..e7cee09 100644
--- a/WebCore/src/kwq/qt/_qsize.cpp
+++ b/WebCore/src/kwq/qt/_qsize.cpp
@@ -10,6 +10,14 @@
  *
  ***********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 #include <qsize.h>
 
 QSize::QSize() 
diff --git a/WebCore/src/kwq/qt/_qsortedlist.h b/WebCore/src/kwq/qt/_qsortedlist.h
index 7b90da6..cb78bee 100644
--- a/WebCore/src/kwq/qt/_qsortedlist.h
+++ b/WebCore/src/kwq/qt/_qsortedlist.h
@@ -38,6 +38,16 @@
 #ifndef QSORTEDLIST_H
 #define QSORTEDLIST_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "qlist.h"
 #endif // QT_H
diff --git a/WebCore/src/kwq/qt/_qstack.h b/WebCore/src/kwq/qt/_qstack.h
index 2958a42..ccb16ec 100644
--- a/WebCore/src/kwq/qt/_qstack.h
+++ b/WebCore/src/kwq/qt/_qstack.h
@@ -38,6 +38,16 @@
 #ifndef QSTACK_H
 #define QSTACK_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "_qglist.h"
 #endif // QT_H
diff --git a/WebCore/src/kwq/qt/_qstring.cpp b/WebCore/src/kwq/qt/_qstring.cpp
index de179c3..07a845a 100644
--- a/WebCore/src/kwq/qt/_qstring.cpp
+++ b/WebCore/src/kwq/qt/_qstring.cpp
@@ -35,6 +35,14 @@
 **
 **********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 // Don't define it while compiling this module, or USERS of Qt will
 // not be able to link.
 #ifdef QT_NO_CAST_ASCII
diff --git a/WebCore/src/kwq/qt/_qstring.h b/WebCore/src/kwq/qt/_qstring.h
index 6354ac9..cae347f 100644
--- a/WebCore/src/kwq/qt/_qstring.h
+++ b/WebCore/src/kwq/qt/_qstring.h
@@ -43,18 +43,16 @@
 #include "qcstring.h"
 #endif // QT_H
 
-
 // KWQ hacks ---------------------------------------------------------------
 
-// FIXME: we don't handle Q_EXPORT
-#define QT_STATIC_CONST static const
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
 
-typedef unsigned short Q_UINT16;
-typedef unsigned long ulong;
+#include <KWQDef.h>
 
 // -------------------------------------------------------------------------
 
-
 /*****************************************************************************
   QString class
  *****************************************************************************/
diff --git a/WebCore/src/kwq/qt/_qstringlist.cpp b/WebCore/src/kwq/qt/_qstringlist.cpp
index 8854008..6688bb1 100644
--- a/WebCore/src/kwq/qt/_qstringlist.cpp
+++ b/WebCore/src/kwq/qt/_qstringlist.cpp
@@ -35,6 +35,14 @@
 **
 **********************************************************************/
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+// -------------------------------------------------------------------------
+
 #include "qstringlist.h"
 
 #ifndef QT_NO_STRINGLIST
diff --git a/WebCore/src/kwq/qt/_qstringlist.h b/WebCore/src/kwq/qt/_qstringlist.h
index 04d11c6..7018c09 100644
--- a/WebCore/src/kwq/qt/_qstringlist.h
+++ b/WebCore/src/kwq/qt/_qstringlist.h
@@ -38,6 +38,16 @@
 #ifndef QSTRINGLIST_H
 #define QSTRINGLIST_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "qvaluelist.h"
 #include "qstring.h"
diff --git a/WebCore/src/kwq/qt/_qstrlist.h b/WebCore/src/kwq/qt/_qstrlist.h
index cf4caef..f7700f2 100644
--- a/WebCore/src/kwq/qt/_qstrlist.h
+++ b/WebCore/src/kwq/qt/_qstrlist.h
@@ -38,6 +38,16 @@
 #ifndef QSTRLIST_H
 #define QSTRLIST_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "qstring.h"
 #include "qlist.h"
diff --git a/WebCore/src/kwq/qt/_qtextcodec.h b/WebCore/src/kwq/qt/_qtextcodec.h
index 9d5783f..4e6ac8b 100644
--- a/WebCore/src/kwq/qt/_qtextcodec.h
+++ b/WebCore/src/kwq/qt/_qtextcodec.h
@@ -38,6 +38,16 @@
 #ifndef QTEXTCODEC_H
 #define QTEXTCODEC_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "qstring.h"
 #endif // QT_H
diff --git a/WebCore/src/kwq/qt/_qtl.h b/WebCore/src/kwq/qt/_qtl.h
index 3b3b082..e1e2d1e 100644
--- a/WebCore/src/kwq/qt/_qtl.h
+++ b/WebCore/src/kwq/qt/_qtl.h
@@ -37,6 +37,16 @@
 #ifndef QTL_H
 #define QTL_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 
 #ifndef QT_NO_TEXTSTREAM
diff --git a/WebCore/src/kwq/qt/_qvaluelist.h b/WebCore/src/kwq/qt/_qvaluelist.h
index 28231c5..d6a7ec5 100644
--- a/WebCore/src/kwq/qt/_qvaluelist.h
+++ b/WebCore/src/kwq/qt/_qvaluelist.h
@@ -38,6 +38,16 @@
 #ifndef QVALUELIST_H
 #define QVALUELIST_H
 
+// KWQ hacks ---------------------------------------------------------------
+
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
+#include <KWQDef.h>
+
+// -------------------------------------------------------------------------
+
 #ifndef QT_H
 #include "_qshared.h"
 
diff --git a/WebCore/src/kwq/qt/_qvector.h b/WebCore/src/kwq/qt/_qvector.h
index 7a844f2..6995da1 100644
--- a/WebCore/src/kwq/qt/_qvector.h
+++ b/WebCore/src/kwq/qt/_qvector.h
@@ -40,6 +40,10 @@
 
 // KWQ hacks ---------------------------------------------------------------
 
+#ifndef _KWQ_COMPLETE_
+#define _KWQ_COMPLETE_
+#endif
+
 #include <KWQDef.h>
 
 // -------------------------------------------------------------------------
diff --git a/WebCore/src/kwq/qt/qlist.h b/WebCore/src/kwq/qt/qlist.h
index b0a5152..7d6bdf5 100644
--- a/WebCore/src/kwq/qt/qlist.h
+++ b/WebCore/src/kwq/qt/qlist.h
@@ -37,7 +37,7 @@
 #else
 
 #include <KWQDef.h>
-#include <KWQCollection.h>
+#include <_qcollection.h>
 
 // class QList =================================================================
 

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list