[Qt] Fix compilation against namespaced Qt

Patch by Oswald Buddenhagen <oswald.buddenhagen@nokia.com> on 2012-07-23
Reviewed by Simon Hausmann.

Source/WebCore:

* platform/graphics/Font.h:
* platform/network/ResourceHandleInternal.h:
* platform/qt/ThirdPartyCookiesQt.h:

Source/WebKit/qt:

* WebCoreSupport/GeolocationClientQt.h:
* examples/platformplugin/WebPlugin.h:

Source/WebKit2:

* Platform/CoreIPC/Connection.h:
* Platform/PlatformProcessIdentifier.h:
* Platform/WorkQueue.h:
* Shared/qt/QtNetworkRequestData.h:
* Shared/qt/WebEventFactoryQt.h:
* UIProcess/API/C/qt/WKNativeEvent.h:
* UIProcess/API/qt/qquickwebview_p.h:
* UIProcess/API/qt/qwebnavigationhistory_p.h:
* UIProcess/API/qt/raw/qrawwebview_p.h:
* UIProcess/DrawingAreaProxy.h:
* UIProcess/Launcher/ThreadLauncher.h:
* UIProcess/LayerTreeCoordinatorProxy.h:
* UIProcess/qt/QtViewportHandler.h:
* UIProcess/qt/QtWebPageSGNode.h:
* UIProcess/qt/WebColorChooserProxyQt.h:
* UIProcess/qt/WebGeolocationProviderQt.h:
* UIProcess/qt/WebPopupMenuProxyQt.h:
* WebProcess/WebProcess.h:

Tools:

* QtTestBrowser/launcherwindow.h:
* WebKitTestRunner/PlatformWebView.h:

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 105c727..aafefb9 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2012-07-23  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
+
+        [Qt] Fix compilation against namespaced Qt
+
+        Reviewed by Simon Hausmann.
+
+        * platform/graphics/Font.h:
+        * platform/network/ResourceHandleInternal.h:
+        * platform/qt/ThirdPartyCookiesQt.h:
+
 2012-07-24  Anthony Scian  <ascian@rim.com>
 
         Web Inspector [JSC]: Enable initiator column in network panel.

diff --git a/Source/WebCore/platform/graphics/Font.h b/Source/WebCore/platform/graphics/Font.h
index d80660d..b3b61ba 100644 (file)
--- a/Source/WebCore/platform/graphics/Font.h
+++ b/Source/WebCore/platform/graphics/Font.h
@@ -38,7 +38,9 @@
 #if PLATFORM(QT)
 #if HAVE(QRAWFONT)
 #include <QRawFont>
+QT_BEGIN_NAMESPACE
 class QTextLayout;
+QT_END_NAMESPACE
 #else
 #include <QFont>
 #endif

diff --git a/Source/WebCore/platform/network/ResourceHandleInternal.h b/Source/WebCore/platform/network/ResourceHandleInternal.h
index e4a4c38..ecf648f 100644 (file)
--- a/Source/WebCore/platform/network/ResourceHandleInternal.h
+++ b/Source/WebCore/platform/network/ResourceHandleInternal.h
@@ -54,7 +54,9 @@ class Frame;
 #endif
 
 #if PLATFORM(QT)
+QT_BEGIN_NAMESPACE
 class QWebNetworkJob;
+QT_END_NAMESPACE
 namespace WebCore {
 class QNetworkReplyHandler;
 }

diff --git a/Source/WebCore/platform/qt/ThirdPartyCookiesQt.h b/Source/WebCore/platform/qt/ThirdPartyCookiesQt.h
index bfe7e22..750b40f 100644 (file)
--- a/Source/WebCore/platform/qt/ThirdPartyCookiesQt.h
+++ b/Source/WebCore/platform/qt/ThirdPartyCookiesQt.h
@@ -20,8 +20,10 @@
 #ifndef ThirdPartyCookiesQt_h
 #define ThirdPartyCookiesQt_h
 
+QT_BEGIN_NAMESPACE
 class QNetworkCookieJar;
 class QUrl;
+QT_END_NAMESPACE
 
 namespace WebCore {
 class NetworkingContext;

diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
index 1e2dc40..805c43c 100644 (file)
--- a/Source/WebKit/qt/ChangeLog
+++ b/Source/WebKit/qt/ChangeLog
@@ -1,3 +1,12 @@
+2012-07-23  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
+
+        [Qt] Fix compilation against namespaced Qt
+
+        Reviewed by Simon Hausmann.
+
+        * WebCoreSupport/GeolocationClientQt.h:
+        * examples/platformplugin/WebPlugin.h:
+
 2012-07-23  Pierre Rossi  <pierre.rossi@gmail.com>
 
         Unify numTouchEventHandlersChanged and needTouchEvents in the chrome client

diff --git a/Source/WebKit/qt/WebCoreSupport/GeolocationClientQt.h b/Source/WebKit/qt/WebCoreSupport/GeolocationClientQt.h
index 94b0f65..726be15 100644 (file)
--- a/Source/WebKit/qt/WebCoreSupport/GeolocationClientQt.h
+++ b/Source/WebKit/qt/WebCoreSupport/GeolocationClientQt.h
@@ -39,7 +39,9 @@ class QGeoPositionInfoSource;
 using namespace QtMobility;
 #elif HAVE(QT5)
 #include <QtLocation/QGeoPositionInfo>
+QT_BEGIN_NAMESPACE
 class QGeoPositionInfoSource;
+QT_END_NAMESPACE
 #endif
 
 

diff --git a/Source/WebKit/qt/examples/platformplugin/WebPlugin.h b/Source/WebKit/qt/examples/platformplugin/WebPlugin.h
index 74bc2ec..de06f4a 100644 (file)
--- a/Source/WebKit/qt/examples/platformplugin/WebPlugin.h
+++ b/Source/WebKit/qt/examples/platformplugin/WebPlugin.h
@@ -28,8 +28,10 @@
 #include <QVideoWidget>
 #endif
 
+QT_BEGIN_NAMESPACE
 class QListWidgetItem;
 class QListWidget;
+QT_END_NAMESPACE
 
 class Popup : public QDialog {
     Q_OBJECT

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 73e0ddb..166d6d4 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,28 @@
+2012-07-23  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
+
+        [Qt] Fix compilation against namespaced Qt
+
+        Reviewed by Simon Hausmann.
+
+        * Platform/CoreIPC/Connection.h:
+        * Platform/PlatformProcessIdentifier.h:
+        * Platform/WorkQueue.h:
+        * Shared/qt/QtNetworkRequestData.h:
+        * Shared/qt/WebEventFactoryQt.h:
+        * UIProcess/API/C/qt/WKNativeEvent.h:
+        * UIProcess/API/qt/qquickwebview_p.h:
+        * UIProcess/API/qt/qwebnavigationhistory_p.h:
+        * UIProcess/API/qt/raw/qrawwebview_p.h:
+        * UIProcess/DrawingAreaProxy.h:
+        * UIProcess/Launcher/ThreadLauncher.h:
+        * UIProcess/LayerTreeCoordinatorProxy.h:
+        * UIProcess/qt/QtViewportHandler.h:
+        * UIProcess/qt/QtWebPageSGNode.h:
+        * UIProcess/qt/WebColorChooserProxyQt.h:
+        * UIProcess/qt/WebGeolocationProviderQt.h:
+        * UIProcess/qt/WebPopupMenuProxyQt.h:
+        * WebProcess/WebProcess.h:
+
 2012-07-24  Christophe Dumez  <christophe.dumez@intel.com>
 
         [EFL][WK2] Remove unneeded WebURLRequestEfl and WebURLResponseEfl

diff --git a/Source/WebKit2/Platform/CoreIPC/Connection.h b/Source/WebKit2/Platform/CoreIPC/Connection.h
index 773f6e0..da9a08a 100644 (file)
--- a/Source/WebKit2/Platform/CoreIPC/Connection.h
+++ b/Source/WebKit2/Platform/CoreIPC/Connection.h
@@ -43,7 +43,9 @@
 #elif PLATFORM(WIN)
 #include <string>
 #elif PLATFORM(QT)
+QT_BEGIN_NAMESPACE
 class QSocketNotifier;
+QT_END_NAMESPACE
 #endif
 
 #if PLATFORM(QT) || PLATFORM(GTK) || PLATFORM(EFL)

diff --git a/Source/WebKit2/Platform/PlatformProcessIdentifier.h b/Source/WebKit2/Platform/PlatformProcessIdentifier.h
index 96ecbe8..2d18975 100644 (file)
--- a/Source/WebKit2/Platform/PlatformProcessIdentifier.h
+++ b/Source/WebKit2/Platform/PlatformProcessIdentifier.h
@@ -28,7 +28,9 @@
 #define PlatformProcessIdentifier_h
 
 #if PLATFORM(QT)
+QT_BEGIN_NAMESPACE
 class QProcess;
+QT_END_NAMESPACE
 #elif PLATFORM(EFL)
 #include <unistd.h>
 #endif

diff --git a/Source/WebKit2/Platform/WorkQueue.h b/Source/WebKit2/Platform/WorkQueue.h
index d630dc0..5ff7d39 100644 (file)
--- a/Source/WebKit2/Platform/WorkQueue.h
+++ b/Source/WebKit2/Platform/WorkQueue.h
@@ -47,8 +47,10 @@
 
 #if PLATFORM(QT) && !OS(DARWIN)
 #include <QSocketNotifier>
+QT_BEGIN_NAMESPACE
 class QObject;
 class QThread;
+QT_END_NAMESPACE
 #elif PLATFORM(GTK)
 #include <wtf/gobject/GRefPtr.h>
 typedef gboolean (*GSourceFunc) (gpointer data);

diff --git a/Source/WebKit2/Shared/qt/QtNetworkRequestData.h b/Source/WebKit2/Shared/qt/QtNetworkRequestData.h
index 940bf81..9bcaac7 100644 (file)
--- a/Source/WebKit2/Shared/qt/QtNetworkRequestData.h
+++ b/Source/WebKit2/Shared/qt/QtNetworkRequestData.h
@@ -34,8 +34,10 @@ class ArgumentEncoder;
 class ArgumentDecoder;
 };
 
+QT_BEGIN_NAMESPACE
 class QNetworkRequest;
 class QNetworkReply;
+QT_END_NAMESPACE
 
 namespace WebKit {
 

diff --git a/Source/WebKit2/Shared/qt/WebEventFactoryQt.h b/Source/WebKit2/Shared/qt/WebEventFactoryQt.h
index deecc25..f1c24fb 100644 (file)
--- a/Source/WebKit2/Shared/qt/WebEventFactoryQt.h
+++ b/Source/WebKit2/Shared/qt/WebEventFactoryQt.h
@@ -29,6 +29,8 @@
 
 #include "WebEvent.h"
 
+QT_BEGIN_NAMESPACE
+
 #if ENABLE(TOUCH_EVENTS)
 class QTouchEvent;
 #endif
@@ -37,6 +39,8 @@ class QMouseEvent;
 class QWheelEvent;
 class QKeyEvent;
 
+QT_END_NAMESPACE
+
 namespace WebKit {
 
 class WebEventFactory {

diff --git a/Source/WebKit2/UIProcess/API/C/qt/WKNativeEvent.h b/Source/WebKit2/UIProcess/API/C/qt/WKNativeEvent.h
index 78df4ac..974db37 100644 (file)
--- a/Source/WebKit2/UIProcess/API/C/qt/WKNativeEvent.h
+++ b/Source/WebKit2/UIProcess/API/C/qt/WKNativeEvent.h
@@ -29,7 +29,9 @@
 // a Qt specific WKNativeEvent.h file is needed because that the use of __APPLE__
 // in original WKNativeEvent.h file breaks Qt build in MacOS
 
+QT_BEGIN_NAMESPACE
 class QEvent;
+QT_END_NAMESPACE
 typedef const QEvent* WKNativeEventPtr;
 
 #endif /* WKNativeEvent_h */

diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h b/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h
index ceaab68..8d0f4ff 100644 (file)
--- a/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h
+++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h
@@ -27,8 +27,10 @@
 #include <QtQuick/qquickitem.h>
 #include <private/qquickflickable_p.h>
 
-class QWebNavigationRequest;
+QT_BEGIN_NAMESPACE
 class QQmlComponent;
+QT_END_NAMESPACE
+class QWebNavigationRequest;
 class QQuickWebPage;
 class QQuickWebViewAttached;
 class QWebLoadRequest;

diff --git a/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h b/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h
index fa63075..f1a3e57 100644 (file)
--- a/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h
+++ b/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h
@@ -33,11 +33,13 @@
 #include <QVariant>
 #include <QtQml/qqml.h>
 
+QT_BEGIN_NAMESPACE
 class QAbstractListModel;
+class QString;
+class QUrl;
+QT_END_NAMESPACE
 class QWebNavigationHistoryPrivate;
 class QWebNavigationListModelPrivate;
-class QUrl;
-class QString;
 
 class QWEBKIT_EXPORT QWebNavigationListModel : public QAbstractListModel {
     Q_OBJECT

diff --git a/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h b/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h
index a4bef5d..4608ff9 100644 (file)
--- a/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h
+++ b/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h
@@ -32,6 +32,7 @@
 #include <WebKit2/WKPageGroup.h>
 #include <wtf/Platform.h>
 
+QT_BEGIN_NAMESPACE
 class QRect;
 class QRectF;
 class QPoint;
@@ -43,6 +44,7 @@ class QTouchEvent;
 class QUrl;
 class QMatrix4x4;
 class QCursor;
+QT_END_NAMESPACE
 
 class QRawWebViewPrivate;
 

diff --git a/Source/WebKit2/UIProcess/DrawingAreaProxy.h b/Source/WebKit2/UIProcess/DrawingAreaProxy.h
index 426fea1..805b8ac 100644 (file)
--- a/Source/WebKit2/UIProcess/DrawingAreaProxy.h
+++ b/Source/WebKit2/UIProcess/DrawingAreaProxy.h
@@ -36,7 +36,9 @@
 #include <wtf/Noncopyable.h>
 
 #if PLATFORM(QT)
+QT_BEGIN_NAMESPACE
 class QPainter;
+QT_END_NAMESPACE
 #elif PLATFORM(GTK)
 typedef struct _cairo cairo_t;
 #endif

diff --git a/Source/WebKit2/UIProcess/Launcher/ThreadLauncher.h b/Source/WebKit2/UIProcess/Launcher/ThreadLauncher.h
index f3a5312..46a7208 100644 (file)
--- a/Source/WebKit2/UIProcess/Launcher/ThreadLauncher.h
+++ b/Source/WebKit2/UIProcess/Launcher/ThreadLauncher.h
@@ -32,7 +32,9 @@
 #include <wtf/Threading.h>
 
 #if PLATFORM(QT)
+QT_BEGIN_NAMESPACE
 class QLocalSocket;
+QT_END_NAMESPACE
 #endif
 
 namespace WebKit {

diff --git a/Source/WebKit2/UIProcess/LayerTreeCoordinatorProxy.h b/Source/WebKit2/UIProcess/LayerTreeCoordinatorProxy.h
index b4e7b7c..eca6900 100644 (file)
--- a/Source/WebKit2/UIProcess/LayerTreeCoordinatorProxy.h
+++ b/Source/WebKit2/UIProcess/LayerTreeCoordinatorProxy.h
@@ -36,7 +36,9 @@
 #include <wtf/Functional.h>
 #include <wtf/HashSet.h>
 
+QT_BEGIN_NAMESPACE
 class QSGNode;
+QT_END_NAMESPACE
 
 namespace WebKit {
 

diff --git a/Source/WebKit2/UIProcess/qt/QtViewportHandler.h b/Source/WebKit2/UIProcess/qt/QtViewportHandler.h
index e4a8c51..c93b0bd 100644 (file)
--- a/Source/WebKit2/UIProcess/qt/QtViewportHandler.h
+++ b/Source/WebKit2/UIProcess/qt/QtViewportHandler.h
@@ -31,11 +31,12 @@
 
 QT_BEGIN_NAMESPACE
 class QPointF;
-class QQuickWebPage;
-class QQuickWebView;
 class QWheelEvent;
 QT_END_NAMESPACE
 
+class QQuickWebPage;
+class QQuickWebView;
+
 class QWebKitTest;
 
 namespace WebKit {

diff --git a/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.h b/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.h
index 4c0fcfc..22a5bcf 100644 (file)
--- a/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.h
+++ b/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.h
@@ -24,7 +24,9 @@
 #include <QtQuick/QSGTransformNode>
 #include <wtf/PassRefPtr.h>
 
+QT_BEGIN_NAMESPACE
 class QSGSimpleRectNode;
+QT_END_NAMESPACE
 
 namespace WebKit {
 

diff --git a/Source/WebKit2/UIProcess/qt/WebColorChooserProxyQt.h b/Source/WebKit2/UIProcess/qt/WebColorChooserProxyQt.h
index 75a74a2..7872dc9 100644 (file)
--- a/Source/WebKit2/UIProcess/qt/WebColorChooserProxyQt.h
+++ b/Source/WebKit2/UIProcess/qt/WebColorChooserProxyQt.h
@@ -25,9 +25,12 @@
 #include <QtCore/QObject>
 #include <wtf/OwnPtr.h>
 
+QT_BEGIN_NAMESPACE
 class QQmlComponent;
 class QQmlContext;
 class QQuickItem;
+QT_END_NAMESPACE
+
 class QQuickWebView;
 
 namespace WebCore {

diff --git a/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.h b/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.h
index 598c74a..e476b12 100644 (file)
--- a/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.h
+++ b/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.h
@@ -26,8 +26,10 @@
 #include <WebKit2/WKGeolocationPosition.h>
 #include <WebKit2/WKRetainPtr.h>
 
+QT_BEGIN_NAMESPACE
 class QGeoPositionInfoSource;
 class QGeoPositionInfo;
+QT_END_NAMESPACE
 
 namespace WebKit {
 

diff --git a/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.h b/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.h
index 3eb544d..e622f90 100644 (file)
--- a/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.h
+++ b/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.h
@@ -31,10 +31,13 @@
 #include <QtCore/QObject>
 #include <wtf/OwnPtr.h>
 
+QT_BEGIN_NAMESPACE
 class QQmlComponent;
 class QQmlContext;
-class QQuickWebView;
 class QQuickItem;
+QT_END_NAMESPACE
+
+class QQuickWebView;
 
 namespace WebKit {
 

diff --git a/Source/WebKit2/WebProcess/WebProcess.h b/Source/WebKit2/WebProcess/WebProcess.h
index 090d4d8..0d005a4 100644 (file)
--- a/Source/WebKit2/WebProcess/WebProcess.h
+++ b/Source/WebKit2/WebProcess/WebProcess.h
@@ -50,7 +50,9 @@
 #endif
 
 #if PLATFORM(QT)
+QT_BEGIN_NAMESPACE
 class QNetworkAccessManager;
+QT_END_NAMESPACE
 #endif
 
 #if PLATFORM(MAC)

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index ee51522..e55a096 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2012-07-23  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
+
+        [Qt] Fix compilation against namespaced Qt
+
+        Reviewed by Simon Hausmann.
+
+        * QtTestBrowser/launcherwindow.h:
+        * WebKitTestRunner/PlatformWebView.h:
+
 2012-07-24  Peter Beverloo  <peter@chromium.org>
 
         Update a few Chromium Android contributors in committers.py

diff --git a/Tools/QtTestBrowser/launcherwindow.h b/Tools/QtTestBrowser/launcherwindow.h
index 9aed6c0..348bf12 100644 (file)
--- a/Tools/QtTestBrowser/launcherwindow.h
+++ b/Tools/QtTestBrowser/launcherwindow.h
@@ -59,8 +59,10 @@
 #include "webpage.h"
 #include "webview.h"
 
+QT_BEGIN_NAMESPACE
 class QPropertyAnimation;
 class QLineEdit;
+QT_END_NAMESPACE
 
 class WindowOptions {
 public:

diff --git a/Tools/WebKitTestRunner/PlatformWebView.h b/Tools/WebKitTestRunner/PlatformWebView.h
index a8cf0d6..d3ad21a 100644 (file)
--- a/Tools/WebKitTestRunner/PlatformWebView.h
+++ b/Tools/WebKitTestRunner/PlatformWebView.h
@@ -29,11 +29,13 @@
 #include <WebKit2/WKRetainPtr.h>
 
 #if defined(BUILDING_QT__)
+QT_BEGIN_NAMESPACE
+class QQuickView;
+class QEventLoop;
+QT_END_NAMESPACE
 class QQuickWebView;
 typedef QQuickWebView* PlatformWKView;
-class QQuickView;
 typedef QQuickView* PlatformWindow;
-class QEventLoop;
 #elif defined(__APPLE__) && __APPLE__
 #if __OBJC__
 @class WKView;