5 files changed, 19 insertions, 4 deletions
diff --git a/src/bluetoothsettings/bluetoothdevice.cpp b/src/bluetoothsettings/bluetoothdevice.cpp
index 0facf27..442a31c 100644
--- a/src/bluetoothsettings/bluetoothdevice.cpp
+++ b/src/bluetoothsettings/bluetoothdevice.cpp
@@ -30,6 +30,8 @@
 #include "bluetoothdevice.h"
 #include "bluetoothdevice_p.h"
 
+QT_BEGIN_NAMESPACE
+
 BluetoothDevice::BluetoothDevice(QObject *parent) : QObject(parent)
   ,d_ptr(new BluetoothDevicePrivate(this))
 {
@@ -51,7 +53,7 @@ void BluetoothDevice::setPowered(const bool& aPowered)
 DiscoveryModel* BluetoothDevice::deviceModel() const
 {
     Q_D(const BluetoothDevice);
-    return d->m_deviceModel;
+    return d->deviceModel();
 }
 
 bool BluetoothDevice::scanning() const
@@ -89,3 +91,5 @@ bool BluetoothDevice::available() const
     Q_D(const BluetoothDevice);
     return d->available();
 }
+
+QT_END_NAMESPACE
diff --git a/src/bluetoothsettings/bluetoothdevice.h b/src/bluetoothsettings/bluetoothdevice.h
index 03ea961..1c51b87 100644
--- a/src/bluetoothsettings/bluetoothdevice.h
+++ b/src/bluetoothsettings/bluetoothdevice.h
@@ -32,11 +32,11 @@
 #include <QObject>
 #include "discoverymodel.h"
 
-QT_BEGIN_NAMESPACE
-
 QT_FORWARD_DECLARE_CLASS(DiscoveryModel)
 QT_FORWARD_DECLARE_CLASS(BluetoothDevicePrivate)
 
+QT_BEGIN_NAMESPACE
+
 class Q_DECL_EXPORT BluetoothDevice : public QObject
 {
     Q_OBJECT
diff --git a/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp b/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp
index 28ed605..e473f59 100644
--- a/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp
+++ b/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp
@@ -33,6 +33,8 @@
 #include "moc_objectmanager_interface.cpp"
 #include "device1_interface.h"
 
+QT_BEGIN_NAMESPACE
+
 BluetoothDevicePrivate::BluetoothDevicePrivate(BluetoothDevice *parent) : QObject(parent)
     ,q_ptr(parent)
     ,m_localDevice(Q_NULLPTR)
@@ -253,3 +255,5 @@ OrgBluezDevice1Interface* BluetoothDevicePrivate::findPeerDevice(const QString &
     }
     return NULL;
 }
+
+QT_END_NAMESPACE
diff --git a/src/bluetoothsettings/bluez/bluetoothdevice_p.h b/src/bluetoothsettings/bluez/bluetoothdevice_p.h
index 432a7e7..e037ca3 100644
--- a/src/bluetoothsettings/bluez/bluetoothdevice_p.h
+++ b/src/bluetoothsettings/bluez/bluetoothdevice_p.h
@@ -45,9 +45,12 @@
 #include <QtDBus>
 #include "bluetoothdevice.h"
 
+// Automatically generated classes in global namespace
 class OrgBluezDevice1Interface;
 class OrgFreedesktopDBusObjectManagerInterface;
 
+QT_BEGIN_NAMESPACE
+
 class BluetoothDevicePrivate : public QObject
 {
     Q_OBJECT
@@ -90,6 +93,6 @@ private:
     OrgFreedesktopDBusObjectManagerInterface *m_manager;
 };
 
-
+QT_END_NAMESPACE
 
 #endif // BLUETOOTHDEVICE__P_H
diff --git a/src/bluetoothsettings/discoverymodel.cpp b/src/bluetoothsettings/discoverymodel.cpp
index 3cae1df..2f70800 100644
--- a/src/bluetoothsettings/discoverymodel.cpp
+++ b/src/bluetoothsettings/discoverymodel.cpp
@@ -29,6 +29,8 @@
 #include <QBluetoothAddress>
 #include "discoverymodel.h"
 
+QT_BEGIN_NAMESPACE
+
 BtDeviceItem::BtDeviceItem(const QBluetoothDeviceInfo& bt, QObject *parent)
     : QObject(parent)
     ,m_name(bt.name())
@@ -245,3 +247,5 @@ void DiscoveryModel::setConnected(const QString &aAddress, bool connected)
     if (found)
         emit dataChanged(index(i, 0), index(i, 0), role);
 }
+
+QT_END_NAMESPACE