From 4bc88e607e397008d789d9fff989d9f1a623b320 Mon Sep 17 00:00:00 2001
From: Toby Tomkins <toby.tomkins@nokia.com>
Date: Mon, 5 Dec 2011 15:54:22 +1000
Subject: Fixed QtConnectivity bluetooth namespace compilation.

Change-Id: I507f35962151e705682c65b1fe9bf33f309d3263
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
---
 src/bluetooth/bluez/agent_p.h                     | 3 +++
 src/bluetooth/bluez/obex_agent_p.h                | 3 +++
 src/bluetooth/qbluetoothdevicediscoveryagent_p.h  | 3 +++
 src/bluetooth/qbluetoothlocaldevice_p.h           | 3 +++
 src/bluetooth/qbluetoothservicediscoveryagent_p.h | 2 ++
 5 files changed, 14 insertions(+)

diff --git a/src/bluetooth/bluez/agent_p.h b/src/bluetooth/bluez/agent_p.h
index 3725928e..b970e513 100644
--- a/src/bluetooth/bluez/agent_p.h
+++ b/src/bluetooth/bluez/agent_p.h
@@ -14,12 +14,15 @@
 
 #include <QtCore/QObject>
 #include <QtDBus/QtDBus>
+
+QT_BEGIN_NAMESPACE
 class QByteArray;
 template<class T> class QList;
 template<class Key, class Value> class QMap;
 class QString;
 class QStringList;
 class QVariant;
+QT_END_NAMESPACE
 
 /*
  * Adaptor class for interface org.bluez.Agent
diff --git a/src/bluetooth/bluez/obex_agent_p.h b/src/bluetooth/bluez/obex_agent_p.h
index 11630093..fa9b89b1 100644
--- a/src/bluetooth/bluez/obex_agent_p.h
+++ b/src/bluetooth/bluez/obex_agent_p.h
@@ -14,12 +14,15 @@
 
 #include <QtCore/QObject>
 #include <QtDBus/QtDBus>
+
+QT_BEGIN_NAMESPACE
 class QByteArray;
 template<class T> class QList;
 template<class Key, class Value> class QMap;
 class QString;
 class QStringList;
 class QVariant;
+QT_END_NAMESPACE
 
 /*
  * Adaptor class for interface org.openobex.Agent
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
index 288d3d6d..e270c56a 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
@@ -49,7 +49,10 @@
 #ifdef QT_BLUEZ_BLUETOOTH
 class OrgBluezManagerInterface;
 class OrgBluezAdapterInterface;
+
+QT_BEGIN_NAMESPACE
 class QDBusVariant;
+QT_END_NAMESPACE
 #endif
 
 #ifdef QT_SYMBIAN_BLUETOOTH
diff --git a/src/bluetooth/qbluetoothlocaldevice_p.h b/src/bluetooth/qbluetoothlocaldevice_p.h
index f6770512..2ce143ca 100644
--- a/src/bluetooth/qbluetoothlocaldevice_p.h
+++ b/src/bluetooth/qbluetoothlocaldevice_p.h
@@ -59,7 +59,10 @@
 
 class OrgBluezAdapterInterface;
 class OrgBluezAgentAdaptor;
+
+QT_BEGIN_NAMESPACE
 class QDBusPendingCallWatcher;
+QT_END_NAMESPACE
 #endif
 
 QT_BEGIN_HEADER
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_p.h b/src/bluetooth/qbluetoothservicediscoveryagent_p.h
index 624e0cf8..04c010b7 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_p.h
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_p.h
@@ -57,8 +57,10 @@
 class OrgBluezManagerInterface;
 class OrgBluezAdapterInterface;
 class OrgBluezDeviceInterface;
+QT_BEGIN_NAMESPACE
 class QDBusPendingCallWatcher;
 class QXmlStreamReader;
+QT_END_NAMESPACE
 #endif
 
 QT_BEGIN_HEADER
-- 
cgit v1.2.3