diff options
| author | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-11-22 17:01:06 +0200 |
|---|---|---|
| committer | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-11-24 11:53:21 +0000 |
| commit | 724309463d63480ca755d5f309825a9dd078d012 (patch) | |
| tree | ef26954371c0b56141ca59894f67dd14446f933b /src/bluetoothsettings/bluez | |
| parent | 5f7d1bacb8701e24ea185c63e05e5f8883cbef2c (diff) | |
Fix compilation with namespaces
Task-number: QTBUG-64693
Change-Id: I35487b54271f031077c0f96a90eb47f0683caa77
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'src/bluetoothsettings/bluez')
| -rw-r--r-- | src/bluetoothsettings/bluez/bluetoothdevice_p.cpp | 4 | ||||
| -rw-r--r-- | src/bluetoothsettings/bluez/bluetoothdevice_p.h | 5 |
2 files changed, 8 insertions, 1 deletions
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 |