diff options
Diffstat (limited to 'src/bluetoothsettings')
-rw-r--r-- | src/bluetoothsettings/bluetoothdevice.h | 4 | ||||
-rw-r--r-- | src/bluetoothsettings/bluez/bluetoothdevice_p.h | 11 | ||||
-rw-r--r-- | src/bluetoothsettings/bluez/datatypes.h | 4 | ||||
-rw-r--r-- | src/bluetoothsettings/discoverymodel.h | 5 |
4 files changed, 24 insertions, 0 deletions
diff --git a/src/bluetoothsettings/bluetoothdevice.h b/src/bluetoothsettings/bluetoothdevice.h index 8519044..219154f 100644 --- a/src/bluetoothsettings/bluetoothdevice.h +++ b/src/bluetoothsettings/bluetoothdevice.h @@ -32,6 +32,8 @@ #include <QObject> #include <QBluetoothLocalDevice> +QT_BEGIN_NAMESPACE + class DiscoveryModel; class Q_DECL_EXPORT BluetoothDevice : public QObject @@ -75,4 +77,6 @@ private: bool m_scanning; }; +QT_END_NAMESPACE + #endif // BLUETOOTHDEVICE_H diff --git a/src/bluetoothsettings/bluez/bluetoothdevice_p.h b/src/bluetoothsettings/bluez/bluetoothdevice_p.h index 84d1382..f6892e3 100644 --- a/src/bluetoothsettings/bluez/bluetoothdevice_p.h +++ b/src/bluetoothsettings/bluez/bluetoothdevice_p.h @@ -29,6 +29,17 @@ #ifndef BLUETOOTHDEVICE__P_H #define BLUETOOTHDEVICE__P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QObject> class OrgBluezDevice1Interface; diff --git a/src/bluetoothsettings/bluez/datatypes.h b/src/bluetoothsettings/bluez/datatypes.h index e172378..9458dbe 100644 --- a/src/bluetoothsettings/bluez/datatypes.h +++ b/src/bluetoothsettings/bluez/datatypes.h @@ -36,9 +36,13 @@ #include <QtDBus/QDBusObjectPath> #include <QtCore/QMetaType> +QT_BEGIN_NAMESPACE + typedef QMap<QString, QVariantMap> InterfaceList; typedef QMap<QDBusObjectPath, InterfaceList> ManagedObjectList; +QT_END_NAMESPACE + Q_DECLARE_METATYPE(InterfaceList) Q_DECLARE_METATYPE(ManagedObjectList) diff --git a/src/bluetoothsettings/discoverymodel.h b/src/bluetoothsettings/discoverymodel.h index 12554d7..75d93bc 100644 --- a/src/bluetoothsettings/discoverymodel.h +++ b/src/bluetoothsettings/discoverymodel.h @@ -35,6 +35,8 @@ #include <QBluetoothDeviceInfo> #include <QBluetoothDeviceDiscoveryAgent> +QT_BEGIN_NAMESPACE + class Q_DECL_EXPORT BtDeviceItem : public QObject { Q_OBJECT @@ -116,4 +118,7 @@ private: QHash<int, QByteArray> m_roleNames; QBluetoothDeviceDiscoveryAgent *m_discoveryAgent; }; + +QT_END_NAMESPACE + #endif // DISCOVERYMODEL_H |