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

The following commit has been merged in the debian/unstable branch:
commit 918bb055213876c94129b9a60e93cf00ece57db5
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 5 20:18:13 2001 +0000

    Cleanups on header files - all of these files now compile in a test file by themselves
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQAsyncIO.h b/WebCore/kwq/KWQAsyncIO.h
index a74ab92..f5b0912 100644
--- a/WebCore/kwq/KWQAsyncIO.h
+++ b/WebCore/kwq/KWQAsyncIO.h
@@ -26,6 +26,8 @@
 #ifndef QASYNCIO_H_
 #define QASYNCIO_H_
 
+#include <kwqdef.h>
+
 class QAsynchIO {
 protected:
     void ready();
diff --git a/WebCore/kwq/KWQBuffer.h b/WebCore/kwq/KWQBuffer.h
index ab7968d..13faf38 100644
--- a/WebCore/kwq/KWQBuffer.h
+++ b/WebCore/kwq/KWQBuffer.h
@@ -26,6 +26,10 @@
 #ifndef QBUFFER_H_
 #define QBUFFER_H_
 
+#include <kwqdef.h>
+
+#include "qstring.h"
+
 class QBuffer {
 public:
     QByteArray buffer() const;
diff --git a/WebCore/kwq/KWQColor.h b/WebCore/kwq/KWQColor.h
index b72fe27..7e675a9 100644
--- a/WebCore/kwq/KWQColor.h
+++ b/WebCore/kwq/KWQColor.h
@@ -26,7 +26,7 @@
 #ifndef QCOLOR_H_
 #define QCOLOR_H_
 
-class QString;
+#include "qstring.h"
 
 class QColor {
 public:
diff --git a/WebCore/kwq/KWQDict.h b/WebCore/kwq/KWQDict.h
index 56227bb..84cf9a4 100644
--- a/WebCore/kwq/KWQDict.h
+++ b/WebCore/kwq/KWQDict.h
@@ -27,6 +27,7 @@
 #define QDICT_H_
 
 #include "qcollection.h"
+#include "qstring.h"
 
 template <class T> class QDict : public QCollection {
 public:
diff --git a/WebCore/kwq/KWQDrawUtil.h b/WebCore/kwq/KWQDrawUtil.h
index 4e1dd29..3393e7c 100644
--- a/WebCore/kwq/KWQDrawUtil.h
+++ b/WebCore/kwq/KWQDrawUtil.h
@@ -27,6 +27,8 @@
 #define QDRAWUTIL_H_
 
 #include "qpainter.h"
+#include "qpalette.h"
+#include "qbrush.h"
 
 void qDrawShadePanel(QPainter *, int, int, int, int, const QColorGroup &, bool
         sunken = FALSE, int lineWidth = 1, const QBrush *fill = 0);
diff --git a/WebCore/kwq/KWQFontInfo.h b/WebCore/kwq/KWQFontInfo.h
index 8af1145..26f87ca 100644
--- a/WebCore/kwq/KWQFontInfo.h
+++ b/WebCore/kwq/KWQFontInfo.h
@@ -26,6 +26,8 @@
 #ifndef QFONTINFO_H_
 #define QFONTINFO_H_
 
+#include "qfont.h"
+
 class QFontInfo {
 public:
     QFontInfo(const QFont &);
diff --git a/WebCore/kwq/KWQMovie.h b/WebCore/kwq/KWQMovie.h
index 89d2531..d62934e 100644
--- a/WebCore/kwq/KWQMovie.h
+++ b/WebCore/kwq/KWQMovie.h
@@ -27,8 +27,10 @@
 #define QMOVIE_H_
 
 #include "qobject.h"
+#include "qasyncio.h"
 #include "qpixmap.h"
 #include "qimage.h"
+#include "qrect.h"
 
 class QMovie {
 public:
diff --git a/WebCore/kwq/KWQPainter.h b/WebCore/kwq/KWQPainter.h
index 89fb79e..ebab5a6 100644
--- a/WebCore/kwq/KWQPainter.h
+++ b/WebCore/kwq/KWQPainter.h
@@ -29,8 +29,8 @@
 #include "qnamespace.h"
 #include "qpaintdevice.h"
 #include "qcolor.h"
-#include "qbrush.h"
 #include "qpen.h"
+#include "qbrush.h"
 #include "qregion.h"
 #include "qpoint.h"
 #include "qstring.h"
diff --git a/WebCore/kwq/KWQValueList.h b/WebCore/kwq/KWQValueList.h
index 989a201..f7c585a 100644
--- a/WebCore/kwq/KWQValueList.h
+++ b/WebCore/kwq/KWQValueList.h
@@ -26,6 +26,8 @@
 #ifndef QVALUELIST_H_
 #define QVALUELIST_H_
 
+#include <kwqdef.h>
+
 template<class T> class QValueListIterator {
 public: 
     bool operator!=(const QValueListIterator<T>& it);
diff --git a/WebCore/kwq/kdecore/kapp.h b/WebCore/kwq/kdecore/kapp.h
index d62cb3e..5620894 100644
--- a/WebCore/kwq/kdecore/kapp.h
+++ b/WebCore/kwq/kdecore/kapp.h
@@ -27,6 +27,7 @@
 #define KAPP_H_
 
 #include <kglobal.h>
+#include <kglobalsettings.h>
 #include <dcopclient.h>
 #include <qapplication.h>
 #include <qpalette.h>
diff --git a/WebCore/kwq/qt/qasyncimageio.h b/WebCore/kwq/qt/qasyncimageio.h
index 187bb60..beef317 100644
--- a/WebCore/kwq/qt/qasyncimageio.h
+++ b/WebCore/kwq/qt/qasyncimageio.h
@@ -26,6 +26,8 @@
 #ifndef QASYNCIMAGEIO_H_
 #define QASYNCIMAGEIO_H_
 
+#include <kwqdef.h>
+
 class QImageDecoder {
 public:
     static const char* formatName(const uchar* buffer, int length);
diff --git a/WebCore/kwq/qt/qasyncio.h b/WebCore/kwq/qt/qasyncio.h
index a74ab92..f5b0912 100644
--- a/WebCore/kwq/qt/qasyncio.h
+++ b/WebCore/kwq/qt/qasyncio.h
@@ -26,6 +26,8 @@
 #ifndef QASYNCIO_H_
 #define QASYNCIO_H_
 
+#include <kwqdef.h>
+
 class QAsynchIO {
 protected:
     void ready();
diff --git a/WebCore/kwq/qt/qbuffer.h b/WebCore/kwq/qt/qbuffer.h
index ab7968d..13faf38 100644
--- a/WebCore/kwq/qt/qbuffer.h
+++ b/WebCore/kwq/qt/qbuffer.h
@@ -26,6 +26,10 @@
 #ifndef QBUFFER_H_
 #define QBUFFER_H_
 
+#include <kwqdef.h>
+
+#include "qstring.h"
+
 class QBuffer {
 public:
     QByteArray buffer() const;
diff --git a/WebCore/kwq/qt/qcolor.h b/WebCore/kwq/qt/qcolor.h
index b72fe27..7e675a9 100644
--- a/WebCore/kwq/qt/qcolor.h
+++ b/WebCore/kwq/qt/qcolor.h
@@ -26,7 +26,7 @@
 #ifndef QCOLOR_H_
 #define QCOLOR_H_
 
-class QString;
+#include "qstring.h"
 
 class QColor {
 public:
diff --git a/WebCore/kwq/qt/qdatastream.h b/WebCore/kwq/qt/qdatastream.h
index 82c5190..1100f95 100644
--- a/WebCore/kwq/qt/qdatastream.h
+++ b/WebCore/kwq/qt/qdatastream.h
@@ -28,6 +28,7 @@
 
 #include <qarray.h>
 #include <qiodevice.h>
+#include <qstring.h>
 
 class QDataStream {
 public:
diff --git a/WebCore/kwq/qt/qdict.h b/WebCore/kwq/qt/qdict.h
index 56227bb..84cf9a4 100644
--- a/WebCore/kwq/qt/qdict.h
+++ b/WebCore/kwq/qt/qdict.h
@@ -27,6 +27,7 @@
 #define QDICT_H_
 
 #include "qcollection.h"
+#include "qstring.h"
 
 template <class T> class QDict : public QCollection {
 public:
diff --git a/WebCore/kwq/qt/qdrawutil.h b/WebCore/kwq/qt/qdrawutil.h
index 4e1dd29..3393e7c 100644
--- a/WebCore/kwq/qt/qdrawutil.h
+++ b/WebCore/kwq/qt/qdrawutil.h
@@ -27,6 +27,8 @@
 #define QDRAWUTIL_H_
 
 #include "qpainter.h"
+#include "qpalette.h"
+#include "qbrush.h"
 
 void qDrawShadePanel(QPainter *, int, int, int, int, const QColorGroup &, bool
         sunken = FALSE, int lineWidth = 1, const QBrush *fill = 0);
diff --git a/WebCore/kwq/qt/qfontdatabase.h b/WebCore/kwq/qt/qfontdatabase.h
index 9680e73..51f6f35 100644
--- a/WebCore/kwq/qt/qfontdatabase.h
+++ b/WebCore/kwq/qt/qfontdatabase.h
@@ -27,9 +27,8 @@
 #define QFONTDATABASE_H_
 
 #include "qvaluelist.h"
-
-class QFont;
-class QString;
+#include "qfont.h"
+#include "qstring.h"
 
 class QFontDatabase {
 public:
diff --git a/WebCore/kwq/qt/qfontinfo.h b/WebCore/kwq/qt/qfontinfo.h
index 8af1145..26f87ca 100644
--- a/WebCore/kwq/qt/qfontinfo.h
+++ b/WebCore/kwq/qt/qfontinfo.h
@@ -26,6 +26,8 @@
 #ifndef QFONTINFO_H_
 #define QFONTINFO_H_
 
+#include "qfont.h"
+
 class QFontInfo {
 public:
     QFontInfo(const QFont &);
diff --git a/WebCore/kwq/qt/qmovie.h b/WebCore/kwq/qt/qmovie.h
index 89d2531..d62934e 100644
--- a/WebCore/kwq/qt/qmovie.h
+++ b/WebCore/kwq/qt/qmovie.h
@@ -27,8 +27,10 @@
 #define QMOVIE_H_
 
 #include "qobject.h"
+#include "qasyncio.h"
 #include "qpixmap.h"
 #include "qimage.h"
+#include "qrect.h"
 
 class QMovie {
 public:
diff --git a/WebCore/kwq/qt/qobjectdefs.h b/WebCore/kwq/qt/qobjectdefs.h
index 4ce32ec..97afc10 100644
--- a/WebCore/kwq/qt/qobjectdefs.h
+++ b/WebCore/kwq/qt/qobjectdefs.h
@@ -26,8 +26,6 @@
 #ifndef QOBJECTDEFS_H_
 #define QOBJECTDEFS_H_
 
-#include <kglobalsettings.h>
-
 #define Q_PROPERTY(text)
 
 class QObject;
diff --git a/WebCore/kwq/qt/qpainter.h b/WebCore/kwq/qt/qpainter.h
index 89fb79e..ebab5a6 100644
--- a/WebCore/kwq/qt/qpainter.h
+++ b/WebCore/kwq/qt/qpainter.h
@@ -29,8 +29,8 @@
 #include "qnamespace.h"
 #include "qpaintdevice.h"
 #include "qcolor.h"
-#include "qbrush.h"
 #include "qpen.h"
+#include "qbrush.h"
 #include "qregion.h"
 #include "qpoint.h"
 #include "qstring.h"
diff --git a/WebCore/kwq/qt/qvaluelist.h b/WebCore/kwq/qt/qvaluelist.h
index 989a201..f7c585a 100644
--- a/WebCore/kwq/qt/qvaluelist.h
+++ b/WebCore/kwq/qt/qvaluelist.h
@@ -26,6 +26,8 @@
 #ifndef QVALUELIST_H_
 #define QVALUELIST_H_
 
+#include <kwqdef.h>
+
 template<class T> class QValueListIterator {
 public: 
     bool operator!=(const QValueListIterator<T>& it);
diff --git a/WebCore/src/kwq/kdecore/kapp.h b/WebCore/src/kwq/kdecore/kapp.h
index d62cb3e..5620894 100644
--- a/WebCore/src/kwq/kdecore/kapp.h
+++ b/WebCore/src/kwq/kdecore/kapp.h
@@ -27,6 +27,7 @@
 #define KAPP_H_
 
 #include <kglobal.h>
+#include <kglobalsettings.h>
 #include <dcopclient.h>
 #include <qapplication.h>
 #include <qpalette.h>
diff --git a/WebCore/src/kwq/qt/qasyncimageio.h b/WebCore/src/kwq/qt/qasyncimageio.h
index 187bb60..beef317 100644
--- a/WebCore/src/kwq/qt/qasyncimageio.h
+++ b/WebCore/src/kwq/qt/qasyncimageio.h
@@ -26,6 +26,8 @@
 #ifndef QASYNCIMAGEIO_H_
 #define QASYNCIMAGEIO_H_
 
+#include <kwqdef.h>
+
 class QImageDecoder {
 public:
     static const char* formatName(const uchar* buffer, int length);
diff --git a/WebCore/src/kwq/qt/qasyncio.h b/WebCore/src/kwq/qt/qasyncio.h
index a74ab92..f5b0912 100644
--- a/WebCore/src/kwq/qt/qasyncio.h
+++ b/WebCore/src/kwq/qt/qasyncio.h
@@ -26,6 +26,8 @@
 #ifndef QASYNCIO_H_
 #define QASYNCIO_H_
 
+#include <kwqdef.h>
+
 class QAsynchIO {
 protected:
     void ready();
diff --git a/WebCore/src/kwq/qt/qbuffer.h b/WebCore/src/kwq/qt/qbuffer.h
index ab7968d..13faf38 100644
--- a/WebCore/src/kwq/qt/qbuffer.h
+++ b/WebCore/src/kwq/qt/qbuffer.h
@@ -26,6 +26,10 @@
 #ifndef QBUFFER_H_
 #define QBUFFER_H_
 
+#include <kwqdef.h>
+
+#include "qstring.h"
+
 class QBuffer {
 public:
     QByteArray buffer() const;
diff --git a/WebCore/src/kwq/qt/qcolor.h b/WebCore/src/kwq/qt/qcolor.h
index b72fe27..7e675a9 100644
--- a/WebCore/src/kwq/qt/qcolor.h
+++ b/WebCore/src/kwq/qt/qcolor.h
@@ -26,7 +26,7 @@
 #ifndef QCOLOR_H_
 #define QCOLOR_H_
 
-class QString;
+#include "qstring.h"
 
 class QColor {
 public:
diff --git a/WebCore/src/kwq/qt/qdatastream.h b/WebCore/src/kwq/qt/qdatastream.h
index 82c5190..1100f95 100644
--- a/WebCore/src/kwq/qt/qdatastream.h
+++ b/WebCore/src/kwq/qt/qdatastream.h
@@ -28,6 +28,7 @@
 
 #include <qarray.h>
 #include <qiodevice.h>
+#include <qstring.h>
 
 class QDataStream {
 public:
diff --git a/WebCore/src/kwq/qt/qdict.h b/WebCore/src/kwq/qt/qdict.h
index 56227bb..84cf9a4 100644
--- a/WebCore/src/kwq/qt/qdict.h
+++ b/WebCore/src/kwq/qt/qdict.h
@@ -27,6 +27,7 @@
 #define QDICT_H_
 
 #include "qcollection.h"
+#include "qstring.h"
 
 template <class T> class QDict : public QCollection {
 public:
diff --git a/WebCore/src/kwq/qt/qdrawutil.h b/WebCore/src/kwq/qt/qdrawutil.h
index 4e1dd29..3393e7c 100644
--- a/WebCore/src/kwq/qt/qdrawutil.h
+++ b/WebCore/src/kwq/qt/qdrawutil.h
@@ -27,6 +27,8 @@
 #define QDRAWUTIL_H_
 
 #include "qpainter.h"
+#include "qpalette.h"
+#include "qbrush.h"
 
 void qDrawShadePanel(QPainter *, int, int, int, int, const QColorGroup &, bool
         sunken = FALSE, int lineWidth = 1, const QBrush *fill = 0);
diff --git a/WebCore/src/kwq/qt/qfontdatabase.h b/WebCore/src/kwq/qt/qfontdatabase.h
index 9680e73..51f6f35 100644
--- a/WebCore/src/kwq/qt/qfontdatabase.h
+++ b/WebCore/src/kwq/qt/qfontdatabase.h
@@ -27,9 +27,8 @@
 #define QFONTDATABASE_H_
 
 #include "qvaluelist.h"
-
-class QFont;
-class QString;
+#include "qfont.h"
+#include "qstring.h"
 
 class QFontDatabase {
 public:
diff --git a/WebCore/src/kwq/qt/qfontinfo.h b/WebCore/src/kwq/qt/qfontinfo.h
index 8af1145..26f87ca 100644
--- a/WebCore/src/kwq/qt/qfontinfo.h
+++ b/WebCore/src/kwq/qt/qfontinfo.h
@@ -26,6 +26,8 @@
 #ifndef QFONTINFO_H_
 #define QFONTINFO_H_
 
+#include "qfont.h"
+
 class QFontInfo {
 public:
     QFontInfo(const QFont &);
diff --git a/WebCore/src/kwq/qt/qmovie.h b/WebCore/src/kwq/qt/qmovie.h
index 89d2531..d62934e 100644
--- a/WebCore/src/kwq/qt/qmovie.h
+++ b/WebCore/src/kwq/qt/qmovie.h
@@ -27,8 +27,10 @@
 #define QMOVIE_H_
 
 #include "qobject.h"
+#include "qasyncio.h"
 #include "qpixmap.h"
 #include "qimage.h"
+#include "qrect.h"
 
 class QMovie {
 public:
diff --git a/WebCore/src/kwq/qt/qobjectdefs.h b/WebCore/src/kwq/qt/qobjectdefs.h
index 4ce32ec..97afc10 100644
--- a/WebCore/src/kwq/qt/qobjectdefs.h
+++ b/WebCore/src/kwq/qt/qobjectdefs.h
@@ -26,8 +26,6 @@
 #ifndef QOBJECTDEFS_H_
 #define QOBJECTDEFS_H_
 
-#include <kglobalsettings.h>
-
 #define Q_PROPERTY(text)
 
 class QObject;
diff --git a/WebCore/src/kwq/qt/qpainter.h b/WebCore/src/kwq/qt/qpainter.h
index 89fb79e..ebab5a6 100644
--- a/WebCore/src/kwq/qt/qpainter.h
+++ b/WebCore/src/kwq/qt/qpainter.h
@@ -29,8 +29,8 @@
 #include "qnamespace.h"
 #include "qpaintdevice.h"
 #include "qcolor.h"
-#include "qbrush.h"
 #include "qpen.h"
+#include "qbrush.h"
 #include "qregion.h"
 #include "qpoint.h"
 #include "qstring.h"
diff --git a/WebCore/src/kwq/qt/qvaluelist.h b/WebCore/src/kwq/qt/qvaluelist.h
index 989a201..f7c585a 100644
--- a/WebCore/src/kwq/qt/qvaluelist.h
+++ b/WebCore/src/kwq/qt/qvaluelist.h
@@ -26,6 +26,8 @@
 #ifndef QVALUELIST_H_
 #define QVALUELIST_H_
 
+#include <kwqdef.h>
+
 template<class T> class QValueListIterator {
 public: 
     bool operator!=(const QValueListIterator<T>& it);

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list