Make qtbase build with Qt-in-namespace again

Change-Id: I5faa8690a05d6ec352fc69c0b69848539f2ed216
Reviewed-on: http://codereview.qt-project.org/5460
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

8 files changed, 28 insertions, 1 deletions

diff --git a/src/gui/kernel/qinputpanel.cpp b/src/gui/kernel/qinputpanel.cpp
index 19c0d4a9ce..a024a823f3 100644
--- a/src/gui/kernel/qinputpanel.cpp
+++ b/src/gui/kernel/qinputpanel.cpp
@@ -42,6 +42,8 @@
 #include <qinputpanel.h>
 #include <private/qinputpanel_p.h>
 
+QT_BEGIN_NAMESPACE
+
 QInputPanel::QInputPanel()
     : QObject(*new QInputPanelPrivate)
 {
@@ -190,4 +192,6 @@ void QInputPanel::invokeAction(Action a, int cursorPosition)
         ic->invokeAction(a, cursorPosition);
 }
 
+QT_END_NAMESPACE
+
 #include "moc_qinputpanel.cpp"
diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp
index 5f68d2a711..2d7a62996c 100644
--- a/src/gui/kernel/qopenglcontext.cpp
+++ b/src/gui/kernel/qopenglcontext.cpp
@@ -54,6 +54,8 @@
 
 #include <QDebug>
 
+QT_BEGIN_NAMESPACE
+
 class QGuiGLThreadContext
 {
 public:
@@ -603,3 +605,4 @@ void QOpenGLMultiGroupSharedResource::cleanup(QOpenGLContext *ctx, QOpenGLShared
     m_groups.removeOne(group);
 }
 
+QT_END_NAMESPACE
diff --git a/src/gui/kernel/qplatformopenglcontext_qpa.cpp b/src/gui/kernel/qplatformopenglcontext_qpa.cpp
index 2957b4db4b..26920cc574 100644
--- a/src/gui/kernel/qplatformopenglcontext_qpa.cpp
+++ b/src/gui/kernel/qplatformopenglcontext_qpa.cpp
@@ -41,6 +41,8 @@
 
 #include "qplatformopenglcontext_qpa.h"
 
+QT_BEGIN_NAMESPACE
+
 /*!
     \class QPlatformOpenGLContext
     \since 4.8
@@ -109,3 +111,5 @@ void QPlatformOpenGLContext::setContext(QOpenGLContext *context)
     Q_D(QPlatformOpenGLContext);
     d->context = context;
 }
+
+QT_END_NAMESPACE
diff --git a/src/gui/kernel/qplatformscreen_qpa.cpp b/src/gui/kernel/qplatformscreen_qpa.cpp
index e25e3f33d3..1a8e6d8f7c 100644
--- a/src/gui/kernel/qplatformscreen_qpa.cpp
+++ b/src/gui/kernel/qplatformscreen_qpa.cpp
@@ -46,6 +46,8 @@
 #include <QtGui/qscreen.h>
 #include <QtGui/qwindow.h>
 
+QT_BEGIN_NAMESPACE
+
 class QPlatformScreenPrivate
 {
 public:
@@ -219,3 +221,5 @@ QPlatformScreenPageFlipper *QPlatformScreen::pageFlipper() const
 {
     return 0;
 }
+
+QT_END_NAMESPACE
diff --git a/src/gui/kernel/qplatformwindow_qpa.cpp b/src/gui/kernel/qplatformwindow_qpa.cpp
index 0734fb7a26..f736f1d923 100644
--- a/src/gui/kernel/qplatformwindow_qpa.cpp
+++ b/src/gui/kernel/qplatformwindow_qpa.cpp
@@ -45,6 +45,8 @@
 #include <QtGui/qwindow.h>
 #include <QtGui/qscreen.h>
 
+QT_BEGIN_NAMESPACE
+
 class QPlatformWindowPrivate
 {
     QWindow *window;
@@ -273,3 +275,5 @@ bool QPlatformWindow::setMouseGrabEnabled(bool grab)
 
     \sa QWindowSurface, QWindow
 */
+
+QT_END_NAMESPACE
diff --git a/src/gui/kernel/qstylehints.cpp b/src/gui/kernel/qstylehints.cpp
index c917049a22..7585d23558 100644
--- a/src/gui/kernel/qstylehints.cpp
+++ b/src/gui/kernel/qstylehints.cpp
@@ -43,6 +43,8 @@
 #include <qplatformintegration_qpa.h>
 #include <private/qguiapplication_p.h>
 
+QT_BEGIN_NAMESPACE
+
 static inline QVariant hint(QPlatformIntegration::StyleHint h)
 {
     return QGuiApplicationPrivate::platformIntegration()->styleHint(h);
@@ -78,3 +80,5 @@ int QStyleHints::cursorFlashTime() const
 {
     return hint(QPlatformIntegration::CursorFlashTime).toInt();
 }
+
+QT_END_NAMESPACE
diff --git a/src/gui/kernel/qsurface.cpp b/src/gui/kernel/qsurface.cpp
index 72d74a2307..871b765bfd 100644
--- a/src/gui/kernel/qsurface.cpp
+++ b/src/gui/kernel/qsurface.cpp
@@ -53,5 +53,5 @@ QSurface::SurfaceType QSurface::surfaceType() const
     return m_type;
 }
 
-QT_BEGIN_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/gui/kernel/qsurfaceformat.cpp b/src/gui/kernel/qsurfaceformat.cpp
index b3167fc126..1919e2d282 100644
--- a/src/gui/kernel/qsurfaceformat.cpp
+++ b/src/gui/kernel/qsurfaceformat.cpp
@@ -52,6 +52,8 @@
 #undef minor
 #endif
 
+QT_BEGIN_NAMESPACE
+
 class QSurfaceFormatPrivate
 {
 public:
@@ -464,3 +466,5 @@ QDebug operator<<(QDebug dbg, const QSurfaceFormat &f)
     return dbg.space();
 }
 #endif
+
+QT_END_NAMESPACE