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/btfiletransfer | |
| 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/btfiletransfer')
4 files changed, 6 insertions, 6 deletions
diff --git a/examples/bluetooth/btfiletransfer/progress.cpp b/examples/bluetooth/btfiletransfer/progress.cpp index d589e9b5..c6386e6f 100644 --- a/examples/bluetooth/btfiletransfer/progress.cpp +++ b/examples/bluetooth/btfiletransfer/progress.cpp @@ -46,7 +46,7 @@ #include <qbluetoothtransferrequest.h> #include <qbluetoothtransferreply.h> -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH Progress::Progress(QWidget *parent) : QDialog(parent), diff --git a/examples/bluetooth/btfiletransfer/progress.h b/examples/bluetooth/btfiletransfer/progress.h index 400c9b70..c7efed83 100644 --- a/examples/bluetooth/btfiletransfer/progress.h +++ b/examples/bluetooth/btfiletransfer/progress.h @@ -45,11 +45,11 @@ #include <qbluetoothglobal.h> #include <QTime> -QTBLUETOOTH_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_BLUETOOTH class QBluetoothTransferReply; -QTBLUETOOTH_END_NAMESPACE +QT_END_NAMESPACE_BLUETOOTH -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH QT_BEGIN_NAMESPACE namespace Ui { diff --git a/examples/bluetooth/btfiletransfer/remoteselector.cpp b/examples/bluetooth/btfiletransfer/remoteselector.cpp index 80d8761e..b1a3901b 100644 --- a/examples/bluetooth/btfiletransfer/remoteselector.cpp +++ b/examples/bluetooth/btfiletransfer/remoteselector.cpp @@ -55,7 +55,7 @@ #include "progress.h" #include "pindisplay.h" -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH RemoteSelector::RemoteSelector(QWidget *parent) : QDialog(parent), ui(new Ui::RemoteSelector), diff --git a/examples/bluetooth/btfiletransfer/remoteselector.h b/examples/bluetooth/btfiletransfer/remoteselector.h index d3300c9a..7ce2bf69 100644 --- a/examples/bluetooth/btfiletransfer/remoteselector.h +++ b/examples/bluetooth/btfiletransfer/remoteselector.h @@ -55,7 +55,7 @@ QT_FORWARD_DECLARE_CLASS(QFile) class pinDisplay; -QTBLUETOOTH_USE_NAMESPACE +QT_USE_NAMESPACE_BLUETOOTH QT_BEGIN_NAMESPACE namespace Ui { |