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>

14 files changed, 54 insertions, 0 deletions

diff --git a/src/plugins/platforms/xcb/qxcbclipboard.cpp b/src/plugins/platforms/xcb/qxcbclipboard.cpp
index fdf89cbda1..03ee054f59 100644
--- a/src/plugins/platforms/xcb/qxcbclipboard.cpp
+++ b/src/plugins/platforms/xcb/qxcbclipboard.cpp
@@ -54,6 +54,8 @@
 #include <xcb/xcb_icccm.h>
 #undef class
 
+QT_BEGIN_NAMESPACE
+
 class QXcbClipboardMime : public QXcbMime
 {
     Q_OBJECT
@@ -847,4 +849,6 @@ QByteArray QXcbClipboard::getSelection(xcb_atom_t selection, xcb_atom_t target,
     return buf;
 }
 
+QT_END_NAMESPACE
+
 #include "qxcbclipboard.moc"
diff --git a/src/plugins/platforms/xcb/qxcbclipboard.h b/src/plugins/platforms/xcb/qxcbclipboard.h
index c3c4af66e8..3fd59964c1 100644
--- a/src/plugins/platforms/xcb/qxcbclipboard.h
+++ b/src/plugins/platforms/xcb/qxcbclipboard.h
@@ -47,6 +47,8 @@
 #include <xcb/xcb.h>
 #include <xcb/xfixes.h>
 
+QT_BEGIN_NAMESPACE
+
 class QXcbConnection;
 class QXcbScreen;
 class QXcbClipboardMime;
@@ -105,4 +107,6 @@ private:
 
 };
 
+QT_END_NAMESPACE
+
 #endif // QXCBCLIPBOARD_H
diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp
index 32919eed20..363a5625da 100644
--- a/src/plugins/platforms/xcb/qxcbconnection.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
@@ -83,6 +83,8 @@ extern "C" {
 #include <EGL/eglext.h>
 #endif
 
+QT_BEGIN_NAMESPACE
+
 QXcbConnection::QXcbConnection(const char *displayName)
     : m_displayName(displayName ? QByteArray(displayName) : qgetenv("DISPLAY"))
 #ifdef XCB_USE_DRI2
@@ -1070,3 +1072,5 @@ bool QXcbConnection::hasSupportForDri2() const
     return m_has_support_for_dri2;
 }
 #endif //XCB_USE_DRI2
+
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h
index 6d93093072..eb95326535 100644
--- a/src/plugins/platforms/xcb/qxcbconnection.h
+++ b/src/plugins/platforms/xcb/qxcbconnection.h
@@ -53,6 +53,8 @@
 
 #define Q_XCB_DEBUG
 
+QT_BEGIN_NAMESPACE
+
 class QXcbScreen;
 class QXcbWindow;
 class QXcbDrag;
@@ -429,4 +431,6 @@ cookie_t q_xcb_call_template(const cookie_t &cookie, QXcbConnection *connection,
 #define EGL_DISPLAY_FROM_XCB(object) ((EGLDisplay)(object->connection()->egl_display()))
 #endif //endifXCB_USE_DRI2
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/plugins/platforms/xcb/qxcbkeyboard.h b/src/plugins/platforms/xcb/qxcbkeyboard.h
index ea5f84e8c2..a4b6a28886 100644
--- a/src/plugins/platforms/xcb/qxcbkeyboard.h
+++ b/src/plugins/platforms/xcb/qxcbkeyboard.h
@@ -48,6 +48,8 @@
 
 #include <QEvent>
 
+QT_BEGIN_NAMESPACE
+
 class QWindow;
 
 class QXcbKeyboard : public QXcbObject
@@ -86,4 +88,6 @@ private:
     xcb_key_symbols_t *m_key_symbols;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/plugins/platforms/xcb/qxcbmime.cpp b/src/plugins/platforms/xcb/qxcbmime.cpp
index 53b7d516a2..271d41ae75 100644
--- a/src/plugins/platforms/xcb/qxcbmime.cpp
+++ b/src/plugins/platforms/xcb/qxcbmime.cpp
@@ -52,6 +52,8 @@
 #undef XCB_ATOM_PIXMAP
 #undef XCB_ATOM_BITMAP
 
+QT_BEGIN_NAMESPACE
+
 QXcbMime::QXcbMime()
     : QInternalMimeData()
 { }
@@ -286,3 +288,5 @@ xcb_atom_t QXcbMime::mimeAtomForFormat(QXcbConnection *connection, const QString
 
     return 0;
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/xcb/qxcbmime.h b/src/plugins/platforms/xcb/qxcbmime.h
index 014222c2c4..ac032db442 100644
--- a/src/plugins/platforms/xcb/qxcbmime.h
+++ b/src/plugins/platforms/xcb/qxcbmime.h
@@ -49,6 +49,8 @@
 #include "qxcbintegration.h"
 #include "qxcbconnection.h"
 
+QT_BEGIN_NAMESPACE
+
 class QXcbMime : public QInternalMimeData {
     Q_OBJECT
 public:
@@ -65,4 +67,6 @@ public:
                                         const QList<xcb_atom_t> &atoms, QByteArray *requestedEncoding);
 };
 
+QT_END_NAMESPACE
+
 #endif // QXCBMIME_H
diff --git a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
index 3c9cdfd257..5e0af8d24d 100644
--- a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
+++ b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
@@ -57,6 +57,8 @@
 #include "qdri2context.h"
 #endif
 
+QT_BEGIN_NAMESPACE
+
 class QXcbResourceMap : public QMap<QByteArray, QXcbNativeInterface::ResourceType>
 {
 public:
@@ -202,3 +204,5 @@ void * QXcbNativeInterface::eglContextForContext(QOpenGLContext *context)
     return 0;
 #endif
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/xcb/qxcbnativeinterface.h b/src/plugins/platforms/xcb/qxcbnativeinterface.h
index 8dec83267a..0902af03eb 100644
--- a/src/plugins/platforms/xcb/qxcbnativeinterface.h
+++ b/src/plugins/platforms/xcb/qxcbnativeinterface.h
@@ -44,6 +44,8 @@
 
 #include <QtGui/QPlatformNativeInterface>
 
+QT_BEGIN_NAMESPACE
+
 class QWidget;
 class QXcbScreen;
 
@@ -74,4 +76,6 @@ private:
     static QXcbScreen *qPlatformScreenForWindow(QWindow *window);
 };
 
+QT_END_NAMESPACE
+
 #endif // QXCBNATIVEINTERFACE_H
diff --git a/src/plugins/platforms/xcb/qxcbscreen.h b/src/plugins/platforms/xcb/qxcbscreen.h
index 07d855b398..3c9bf0513c 100644
--- a/src/plugins/platforms/xcb/qxcbscreen.h
+++ b/src/plugins/platforms/xcb/qxcbscreen.h
@@ -49,6 +49,8 @@
 
 #include "qxcbobject.h"
 
+QT_BEGIN_NAMESPACE
+
 class QXcbConnection;
 class QXcbCursor;
 
@@ -91,4 +93,6 @@ private:
     QXcbCursor *m_cursor;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index 4169ba5e4f..c5aee5c81d 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -104,6 +104,8 @@
 
 //#ifdef NET_WM_STATE_DEBUG
 
+QT_BEGIN_NAMESPACE
+
 // Returns true if we should set WM_TRANSIENT_FOR on \a w
 static inline bool isTransient(const QWindow *w)
 {
@@ -1393,3 +1395,5 @@ void QXcbWindow::setCursor(xcb_cursor_t cursor)
     xcb_change_window_attributes(xcb_connection(), m_window, XCB_CW_CURSOR, &cursor);
     xcb_flush(xcb_connection());
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h
index e70686cba0..8bed8a2559 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.h
+++ b/src/plugins/platforms/xcb/qxcbwindow.h
@@ -51,6 +51,8 @@
 
 #include "qxcbobject.h"
 
+QT_BEGIN_NAMESPACE
+
 class QXcbScreen;
 class QXcbEGLSurface;
 
@@ -160,4 +162,6 @@ private:
     QRegion m_exposeRegion;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/plugins/platforms/xcb/qxcbwmsupport.cpp b/src/plugins/platforms/xcb/qxcbwmsupport.cpp
index 5fb67b6377..15e423e95b 100644
--- a/src/plugins/platforms/xcb/qxcbwmsupport.cpp
+++ b/src/plugins/platforms/xcb/qxcbwmsupport.cpp
@@ -44,6 +44,8 @@
 
 #include <qdebug.h>
 
+QT_BEGIN_NAMESPACE
+
 QXcbWMSupport::QXcbWMSupport(QXcbConnection *c)
     : QXcbObject(c)
 {
@@ -134,3 +136,4 @@ void QXcbWMSupport::updateVirtualRoots()
     qDebug() << "======== updateVirtualRoots";
 }
 
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/xcb/qxcbwmsupport.h b/src/plugins/platforms/xcb/qxcbwmsupport.h
index 3b02ef3e7e..7b0a21f035 100644
--- a/src/plugins/platforms/xcb/qxcbwmsupport.h
+++ b/src/plugins/platforms/xcb/qxcbwmsupport.h
@@ -45,6 +45,8 @@
 #include "qxcbconnection.h"
 #include <qvector.h>
 
+QT_BEGIN_NAMESPACE
+
 class QXcbWMSupport : public QXcbObject
 {
 public:
@@ -63,5 +65,6 @@ private:
     QVector<xcb_window_t> net_virtual_roots;
 };
 
+QT_END_NAMESPACE
 
 #endif