diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2013-09-05 13:32:00 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-09 12:44:29 +0200 |
| commit | e21b666856fe89a13c2c8c1eb7ef6fb18275f9b4 (patch) | |
| tree | 3f5f6075a783fe4afe1b201faa591fa8dacc4238 /examples/bluetooth/btscanner | |
| parent | a589ae4f2f525686efa9f031a82390433b0e606d (diff) | |
Remove QtBluetooth and QtNfc namespace.
This is based on namespace discussions on the Qt project dev mailing list.
We continue to use the Qt namespace.
Change-Id: I6119d06662f7682c11f42d759f3218be1f5a7d6c
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'examples/bluetooth/btscanner')
| -rw-r--r-- | examples/bluetooth/btscanner/device.h | 8 | ||||
| -rw-r--r-- | examples/bluetooth/btscanner/service.h | 11 |
2 files changed, 7 insertions, 12 deletions
diff --git a/examples/bluetooth/btscanner/device.h b/examples/bluetooth/btscanner/device.h index 0bcf908e..6dbfb870 100644 --- a/examples/bluetooth/btscanner/device.h +++ b/examples/bluetooth/btscanner/device.h @@ -48,12 +48,10 @@ #include <QDialog> -QT_BEGIN_NAMESPACE_BLUETOOTH -class QBluetoothDeviceDiscoveryAgent; -class QBluetoothDeviceInfo; -QT_END_NAMESPACE_BLUETOOTH +QT_FORWARD_DECLARE_CLASS(QBluetoothDeviceDiscoveryAgent) +QT_FORWARD_DECLARE_CLASS(QBluetoothDeviceInfo) -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE class DeviceDiscoveryDialog : public QDialog { diff --git a/examples/bluetooth/btscanner/service.h b/examples/bluetooth/btscanner/service.h index b2b31809..293bc7a9 100644 --- a/examples/bluetooth/btscanner/service.h +++ b/examples/bluetooth/btscanner/service.h @@ -44,16 +44,13 @@ #include "ui_service.h" #include <qbluetoothglobal.h> - #include <QDialog> -QT_BEGIN_NAMESPACE_BLUETOOTH -class QBluetoothServiceDiscoveryAgent; -class QBluetoothServiceInfo; -class QBluetoothAddress; -QT_END_NAMESPACE_BLUETOOTH +QT_FORWARD_DECLARE_CLASS(QBluetoothAddress) +QT_FORWARD_DECLARE_CLASS(QBluetoothServiceInfo) +QT_FORWARD_DECLARE_CLASS(QBluetoothServiceDiscoveryAgent) -QT_USE_NAMESPACE_BLUETOOTH +QT_USE_NAMESPACE class ServiceDiscoveryDialog : public QDialog { |