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 /examples/bluetooth/btchat | |
| 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 'examples/bluetooth/btchat')
| -rw-r--r-- | examples/bluetooth/btchat/chat.h | 6 | ||||
| -rw-r--r-- | examples/bluetooth/btchat/chatclient.h | 6 | ||||
| -rw-r--r-- | examples/bluetooth/btchat/chatserver.h | 6 | ||||
| -rw-r--r-- | examples/bluetooth/btchat/remoteselector.cpp | 2 | ||||
| -rw-r--r-- | examples/bluetooth/btchat/remoteselector.h | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/examples/bluetooth/btchat/chat.h b/examples/bluetooth/btchat/chat.h index 740999d0..9ced3f09 100644 --- a/examples/bluetooth/btchat/chat.h +++ b/examples/bluetooth/btchat/chat.h @@ -47,11 +47,11 @@ #include <QDebug> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QRfcommServer; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH class ChatServer; class ChatClient; diff --git a/examples/bluetooth/btchat/chatclient.h b/examples/bluetooth/btchat/chatclient.h index 710634e5..19c0a7e5 100644 --- a/examples/bluetooth/btchat/chatclient.h +++ b/examples/bluetooth/btchat/chatclient.h @@ -45,11 +45,11 @@ #include <QtCore/QObject> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothSocket; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH //! [declaration] class ChatClient : public QObject diff --git a/examples/bluetooth/btchat/chatserver.h b/examples/bluetooth/btchat/chatserver.h index ee4728a9..d3368451 100644 --- a/examples/bluetooth/btchat/chatserver.h +++ b/examples/bluetooth/btchat/chatserver.h @@ -46,12 +46,12 @@ #include <QtCore/QObject> #include <QtCore/QList> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QRfcommServer; class QBluetoothSocket; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH //! [declaration] class ChatServer : public QObject diff --git a/examples/bluetooth/btchat/remoteselector.cpp b/examples/bluetooth/btchat/remoteselector.cpp index a63c81c2..17f819da 100644 --- a/examples/bluetooth/btchat/remoteselector.cpp +++ b/examples/bluetooth/btchat/remoteselector.cpp @@ -44,7 +44,7 @@ #include <qbluetoothdeviceinfo.h> #include <qbluetoothaddress.h> -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH RemoteSelector::RemoteSelector(QWidget *parent) : QDialog(parent), ui(new Ui::RemoteSelector), diff --git a/examples/bluetooth/btchat/remoteselector.h b/examples/bluetooth/btchat/remoteselector.h index eff94895..4680a613 100644 --- a/examples/bluetooth/btchat/remoteselector.h +++ b/examples/bluetooth/btchat/remoteselector.h @@ -50,7 +50,7 @@ QT_FORWARD_DECLARE_CLASS(QModelIndex) QT_FORWARD_DECLARE_CLASS(QListWidgetItem) -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH QT_BEGIN_NAMESPACE namespace Ui { |