From 35d66ce48248f07759cbe2a17437198e8e1948ed Mon Sep 17 00:00:00 2001
From: Pierre Rossi <pierre.rossi@digia.com>
Date: Wed, 30 Jul 2014 18:35:06 +0200
Subject: s/QWebEngine/QtWebEngine/g

and make it a namespace

Change-Id: I15c1af8c7d0d8ab213cdf7945109263fe461d2ac
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
 src/core/content_browser_client_qt.cpp                | 2 +-
 src/webengine/api/qtwebengineglobal.cpp               | 8 +++++++-
 src/webengine/api/qtwebengineglobal.h                 | 7 +++----
 src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp | 5 ++++-
 4 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index 347636fe5..259392ca8 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -263,7 +263,7 @@ void ShareGroupQtQuick::AboutToAddFirstContext()
     // This currently has to be setup by ::main in all applications using QQuickWebEngineView with delegated rendering.
     QOpenGLContext *shareContext = QOpenGLContextPrivate::globalShareContext();
     if (!shareContext) {
-        qFatal("QWebEngine: OpenGL resource sharing is not set up in QtQuick. Please make sure to call QWebEngine::initialize() in your main() function.");
+        qFatal("QWebEngine: OpenGL resource sharing is not set up in QtQuick. Please make sure to call QtWebEngine::initialize() in your main() function.");
     }
     m_shareContextQtQuick = make_scoped_refptr(new QtShareGLContext(shareContext));
 }
diff --git a/src/webengine/api/qtwebengineglobal.cpp b/src/webengine/api/qtwebengineglobal.cpp
index 0a1d6a449..baa335740 100644
--- a/src/webengine/api/qtwebengineglobal.cpp
+++ b/src/webengine/api/qtwebengineglobal.cpp
@@ -45,6 +45,10 @@
 #include <QThread>
 #include <private/qopenglcontext_p.h>
 
+QT_BEGIN_NAMESPACE
+
+namespace QtWebEngine {
+
 static QOpenGLContext *shareContext;
 
 static void deleteShareContext()
@@ -53,7 +57,7 @@ static void deleteShareContext()
     shareContext = 0;
 }
 
-void QWebEngine::initialize()
+void initialize()
 {
     QCoreApplication *app = QCoreApplication::instance();
     if (!app) {
@@ -73,4 +77,6 @@ void QWebEngine::initialize()
     qAddPostRoutine(deleteShareContext);
     QOpenGLContextPrivate::setGlobalShareContext(shareContext);
 }
+} // namespace QtWebEngine
 
+QT_END_NAMESPACE
diff --git a/src/webengine/api/qtwebengineglobal.h b/src/webengine/api/qtwebengineglobal.h
index f5fa479d9..e0842b009 100644
--- a/src/webengine/api/qtwebengineglobal.h
+++ b/src/webengine/api/qtwebengineglobal.h
@@ -55,11 +55,10 @@ QT_BEGIN_NAMESPACE
 #  define Q_WEBENGINE_EXPORT
 #endif
 
-class Q_WEBENGINE_EXPORT QWebEngine
+namespace QtWebEngine
 {
-public:
-    static void initialize();
-};
+    Q_WEBENGINE_EXPORT void initialize();
+}
 
 QT_END_NAMESPACE
 
diff --git a/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp b/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp
index cffdb74bc..7d3954772 100644
--- a/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp
+++ b/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp
@@ -44,9 +44,12 @@
 #include "qtwebengineglobal.h"
 #include <QCoreApplication>
 
+QT_BEGIN_NAMESPACE
 static void initialize()
 {
-    QWebEngine::initialize();
+    QtWebEngine::initialize();
 }
 
 Q_COREAPP_STARTUP_FUNCTION(initialize)
+
+QT_END_NAMESPACE
-- 
cgit v1.2.3