diff options
| author | Aaron McCarthy <mccarthy.aaron@gmail.com> | 2013-01-31 22:22:22 +1000 |
|---|---|---|
| committer | Aaron McCarthy <mccarthy.aaron@gmail.com> | 2013-02-14 13:26:02 +0100 |
| commit | 1002efbb0c049b6958a495660014eece7189150a (patch) | |
| tree | 32843a1e213a083dfd2d2f4c2f45754e902a5fb3 /src/bluetooth/qbluetoothserviceinfo.h | |
| parent | 4c6ddcf21f4e6f332674e5be6e09751fbccc01d6 (diff) | |
Rename NFC and Bluetooth namespace macros.
Renamed to the namespace macros to follow what syncqt expects. This
fixes missing namespace macro warnings printed by syncqt.
Change-Id: I7be5a700e8435a559cb4c2e74938851233095887
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
Diffstat (limited to 'src/bluetooth/qbluetoothserviceinfo.h')
| -rw-r--r-- | src/bluetooth/qbluetoothserviceinfo.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bluetooth/qbluetoothserviceinfo.h b/src/bluetooth/qbluetoothserviceinfo.h index 1e746d69..db83a23d 100644 --- a/src/bluetooth/qbluetoothserviceinfo.h +++ b/src/bluetooth/qbluetoothserviceinfo.h @@ -52,7 +52,7 @@ #include <QtCore/QDebug> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothServiceInfoPrivate; class QBluetoothDeviceInfo; @@ -149,14 +149,14 @@ private: Q_DECLARE_PRIVATE(QBluetoothServiceInfo) }; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH Q_DECLARE_METATYPE(QtBluetooth::QBluetoothServiceInfo) Q_DECLARE_METATYPE(QtBluetooth::QBluetoothServiceInfo::Sequence) Q_DECLARE_METATYPE(QtBluetooth::QBluetoothServiceInfo::Alternative) Q_DECLARE_METATYPE(QList<QtBluetooth::QBluetoothUuid>) -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH inline void QBluetoothServiceInfo::setAttribute(quint16 attributeId, const QBluetoothUuid &value) { @@ -228,6 +228,6 @@ inline QList<QBluetoothUuid> QBluetoothServiceInfo::serviceClassUuids() const return attribute(ServiceClassIds).value<QList<QBluetoothUuid> >(); } -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH #endif |