From dea76f3496ee077e271b334c7e8101fed5119481 Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Fri, 23 Sep 2011 15:01:04 +0200
Subject: 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>
---
 src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp | 4 ++++
 src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h   | 4 ++++
 src/plugins/platforminputcontexts/ibus/qibustypes.cpp                | 3 +++
 src/plugins/platforminputcontexts/ibus/qibustypes.h                  | 4 ++++
 4 files changed, 15 insertions(+)

(limited to 'src/plugins/platforminputcontexts')

diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
index af8fd5a1f1..0d0e240b37 100644
--- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
+++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
@@ -55,6 +55,8 @@
 
 #include <QtDBus>
 
+QT_BEGIN_NAMESPACE
+
 enum { debug = 0 };
 
 class QIBusPlatformInputContextPrivate
@@ -327,3 +329,5 @@ QDBusConnection *QIBusPlatformInputContextPrivate::createConnection()
 
     return new QDBusConnection(QDBusConnection::connectToBus(QString::fromLatin1(address), QLatin1String("QIBusProxy")));
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
index 84b578db16..6008fc31aa 100644
--- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
+++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
@@ -43,6 +43,8 @@
 
 #include <QPlatformInputContext>
 
+QT_BEGIN_NAMESPACE
+
 class QIBusPlatformInputContextPrivate;
 class QDBusVariant;
 
@@ -71,4 +73,6 @@ private:
     QIBusPlatformInputContextPrivate *d;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/plugins/platforminputcontexts/ibus/qibustypes.cpp b/src/plugins/platforminputcontexts/ibus/qibustypes.cpp
index 8d8c61afb7..c6dcfb10b9 100644
--- a/src/plugins/platforminputcontexts/ibus/qibustypes.cpp
+++ b/src/plugins/platforminputcontexts/ibus/qibustypes.cpp
@@ -43,6 +43,8 @@
 #include <qtextformat.h>
 #include <QtDBus>
 
+QT_BEGIN_NAMESPACE
+
 QIBusSerializable::QIBusSerializable()
 {
 }
@@ -207,3 +209,4 @@ void QIBusText::fromDBusArgument(const QDBusArgument &arg)
     arg.endStructure();
 }
 
+QT_END_NAMESPACE
diff --git a/src/plugins/platforminputcontexts/ibus/qibustypes.h b/src/plugins/platforminputcontexts/ibus/qibustypes.h
index c426ff7eda..6848149c8b 100644
--- a/src/plugins/platforminputcontexts/ibus/qibustypes.h
+++ b/src/plugins/platforminputcontexts/ibus/qibustypes.h
@@ -44,6 +44,8 @@
 #include <qvector.h>
 #include <qevent.h>
 
+QT_BEGIN_NAMESPACE
+
 class QDBusArgument;
 
 class QIBusSerializable
@@ -113,4 +115,6 @@ public:
     QIBusAttributeList attributes;
 };
 
+QT_END_NAMESPACE
+
 #endif
-- 
cgit v1.2.3