Use <QtModule/headerfile.h> instead of <Classname> in public HEADER files, to not...

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27964 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qcookiejar.h b/WebKit/qt/Api/qcookiejar.h
index 75a23e1a8e75dbaa97966674512df025b8f4ac56..0ca00bd2ad846eb308bd84deb4b7428e815eb891 100644 (file)
--- a/WebKit/qt/Api/qcookiejar.h
+++ b/WebKit/qt/Api/qcookiejar.h
@@ -20,9 +20,9 @@
 #ifndef QCOOKIEJAR_H
 #define QCOOKIEJAR_H
 
-#include <QObject>
-#include <QUrl>
-#include <qwebkitglobal.h>
+#include <QtCore/qobject.h>
+#include <QtCore/qurl.h>
+#include "qwebkitglobal.h"
 
 class QCookieJarPrivate;
 

diff --git a/WebKit/qt/Api/qwebframe.h b/WebKit/qt/Api/qwebframe.h
index 8d8e842ff27fb127c66205f4d983c691fb9f4717..4af4474e71b04f4cfb5490441cff4f6e129c2758 100644 (file)
--- a/WebKit/qt/Api/qwebframe.h
+++ b/WebKit/qt/Api/qwebframe.h
@@ -24,9 +24,9 @@
 #ifndef QWEBFRAME_H
 #define QWEBFRAME_H
 
-#include <qobject.h>
+#include <QtCore/qobject.h>
 
-#include <qwebkitglobal.h>
+#include "qwebkitglobal.h"
 
 class QRect;
 class QPoint;

diff --git a/WebKit/qt/Api/qwebhistoryinterface.h b/WebKit/qt/Api/qwebhistoryinterface.h
index ce43131571666be734eeb4ce21493ab9a92210bd..0ff1d88408a3115acb4b70934dedf03f6c263357 100644 (file)
--- a/WebKit/qt/Api/qwebhistoryinterface.h
+++ b/WebKit/qt/Api/qwebhistoryinterface.h
@@ -22,9 +22,9 @@
 #ifndef QWEBHISTORYINTERFACE_H
 #define QWEBHISTORYINTERFACE_H
 
-#include <qobject.h>
+#include <QtCore/qobject.h>
 
-#include <qwebkitglobal.h>
+#include "qwebkitglobal.h"
 
 class QWEBKIT_EXPORT QWebHistoryInterface : public QObject
 {

diff --git a/WebKit/qt/Api/qwebnetworkinterface.h b/WebKit/qt/Api/qwebnetworkinterface.h
index 113d9b30497dc5179d95bda68ababc717fca8df6..9f976d58ce80b24a1f52b55d1ccd5e2e303a0731 100644 (file)
--- a/WebKit/qt/Api/qwebnetworkinterface.h
+++ b/WebKit/qt/Api/qwebnetworkinterface.h
@@ -22,12 +22,12 @@
 #ifndef QWEBNETWORKINTERFACE_H
 #define QWEBNETWORKINTERFACE_H
 
-#include <qobject.h>
-#include <qurl.h>
-#include <qhttp.h>
-#include <qbytearray.h>
+#include <QtCore/qobject.h>
+#include <QtCore/qurl.h>
+#include <QtNetwork/qhttp.h>
+#include <QtCore/qbytearray.h>
 
-#include <qwebkitglobal.h>
+#include "qwebkitglobal.h"
 
 class QAuthenticator;
 class QNetworkProxy;

diff --git a/WebKit/qt/Api/qwebobjectplugin.h b/WebKit/qt/Api/qwebobjectplugin.h
index 5c54d7312eab27aefcd53df2c7eb6b3e9ab23eba..25e8171086a24bd0dab025b2174c5572d5a20e8b 100644 (file)
--- a/WebKit/qt/Api/qwebobjectplugin.h
+++ b/WebKit/qt/Api/qwebobjectplugin.h
@@ -20,7 +20,7 @@
 #ifndef QWEBOBJECTPLUGIN_H
 #define QWEBOBJECTPLUGIN_H
 
-#include <qwebkitglobal.h>
+#include "qwebkitglobal.h"
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>
 class QWebObjectPluginConnector;

diff --git a/WebKit/qt/Api/qwebobjectplugin_p.h b/WebKit/qt/Api/qwebobjectplugin_p.h
index be842b675e4869cdb52f810bc1ef3c65f56d674d..969230a3e85fee1f6a01b121cb2e0810cea7c068 100644 (file)
--- a/WebKit/qt/Api/qwebobjectplugin_p.h
+++ b/WebKit/qt/Api/qwebobjectplugin_p.h
@@ -1,8 +1,8 @@
 #ifndef QWEBOBJECTPLUGIN_P_H
 #define QWEBOBJECTPLUGIN_P_H
 
-#include <qglobal.h>
-#include <qwebobjectplugin.h>
+#include <QtCore/qglobal.h>
+#include "qwebobjectplugin.h"
 
 /*
   FIXME: This is copied from qfactoryloader_p.h.

diff --git a/WebKit/qt/Api/qwebobjectpluginconnector.h b/WebKit/qt/Api/qwebobjectpluginconnector.h
index c9b1489676d9bbaf5e2e825057e3fc551b072e67..7e289bef2ba6f3746a19203d862a695ec04087a6 100644 (file)
--- a/WebKit/qt/Api/qwebobjectpluginconnector.h
+++ b/WebKit/qt/Api/qwebobjectpluginconnector.h
@@ -20,9 +20,9 @@
 #ifndef QWEBOBJECTPLUGINCONNECTOR_H
 #define QWEBOBJECTPLUGINCONNECTOR_H
 
-#include <qwebkitglobal.h>
-#include <qobject.h>
-#include <qwebnetworkinterface.h>
+#include "qwebkitglobal.h"
+#include <QtCore/qobject.h>
+#include "qwebnetworkinterface.h"
 
 class QWebFrame;
 class QWebPage;

diff --git a/WebKit/qt/Api/qwebpage.h b/WebKit/qt/Api/qwebpage.h
index 9b070f5078f8a7514f714e05c03e7709273f82e8..e9407b834a996bc2de919b5a90ab7e6a8275ff57 100644 (file)
--- a/WebKit/qt/Api/qwebpage.h
+++ b/WebKit/qt/Api/qwebpage.h
@@ -26,9 +26,9 @@
 
 #include "qwebpagehistory.h"
 #include "qwebsettings.h"
-#include <qwebkitglobal.h>
+#include "qwebkitglobal.h"
 
-#include <qwidget.h>
+#include <QtGui/qwidget.h>
 class QNetworkProxy;
 class QUndoStack;
 class QUrl;

diff --git a/WebKit/qt/Api/qwebpagehistory.h b/WebKit/qt/Api/qwebpagehistory.h
index efba89a955c30d9d4e0324b374a599b48b57421d..f82af47305d8bfe2dbda472f95cdbf6ca74173c9 100644 (file)
--- a/WebKit/qt/Api/qwebpagehistory.h
+++ b/WebKit/qt/Api/qwebpagehistory.h
@@ -22,13 +22,13 @@
 #ifndef QWEBPAGEHISTORY_H
 #define QWEBPAGEHISTORY_H
 
-#include <QUrl>
-#include <QString>
-#include <QIcon>
-#include <QDateTime>
-#include <QSharedData>
+#include <QtCore/qurl.h>
+#include <QtCore/qstring.h>
+#include <QtGui/qicon.h>
+#include <QtCore/qdatetime.h>
+#include <QtCore/qshareddata.h>
 
-#include <qwebkitglobal.h>
+#include "qwebkitglobal.h"
 
 class QWebPage;
 

diff --git a/WebKit/qt/Api/qwebsettings.h b/WebKit/qt/Api/qwebsettings.h
index 50449a14570f2fcfc4ac0f28fc91df574f0f2276..b665e7bdcfb7e497bd18b0d7f6c25d713d6c7895 100644 (file)
--- a/WebKit/qt/Api/qwebsettings.h
+++ b/WebKit/qt/Api/qwebsettings.h
@@ -25,9 +25,9 @@
 
 #include <qwebkitglobal.h>
 
-#include <QString>
-#include <QPixmap>
-#include <QSharedDataPointer>
+#include <QtCore/qstring.h>
+#include <QtGui/qpixmap.h>
+#include <QtCore/qshareddata.h>
 
 namespace WebCore
 {

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 881c50b681a97d1c6f98f309f46ea94bff2a77a9..7c4bc815ee887ffcba2daa8837cad388147ae34d 100644 (file)
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,20 @@
+2007-11-22  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by George.
+
+        Use <QtModule/headerfile.h> instead of <Classname> in public HEADER files, to not require the include paths for the other modules to be present
+
+        * Api/qcookiejar.h:
+        * Api/qwebframe.h:
+        * Api/qwebhistoryinterface.h:
+        * Api/qwebnetworkinterface.h:
+        * Api/qwebobjectplugin.h:
+        * Api/qwebobjectplugin_p.h:
+        * Api/qwebobjectpluginconnector.h:
+        * Api/qwebpage.h:
+        * Api/qwebpagehistory.h:
+        * Api/qwebsettings.h:
+
 2007-11-22  Simon Hausmann  <hausmann@kde.org>
 
         Reviewed by George.