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>

19 files changed, 41 insertions, 41 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 {
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 {
diff --git a/examples/bluetooth/btscanner/device.h b/examples/bluetooth/btscanner/device.h
index af2d9a7f..fe9112a7 100644
--- a/examples/bluetooth/btscanner/device.h
+++ b/examples/bluetooth/btscanner/device.h
@@ -48,12 +48,12 @@
 
 #include <QDialog>
 
-QTBLUETOOTH_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE_BLUETOOTH
 class QBluetoothDeviceDiscoveryAgent;
 class QBluetoothDeviceInfo;
-QTBLUETOOTH_END_NAMESPACE
+QT_END_NAMESPACE_BLUETOOTH
 
-QTBLUETOOTH_USE_NAMESPACE
+QT_USE_NAMESPACE_BLUETOOTH
 
 class DeviceDiscoveryDialog : public QDialog
 {
diff --git a/examples/bluetooth/btscanner/service.h b/examples/bluetooth/btscanner/service.h
index 0e17aa14..64d3d05f 100644
--- a/examples/bluetooth/btscanner/service.h
+++ b/examples/bluetooth/btscanner/service.h
@@ -47,13 +47,13 @@
 
 #include <QDialog>
 
-QTBLUETOOTH_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE_BLUETOOTH
 class QBluetoothServiceDiscoveryAgent;
 class QBluetoothServiceInfo;
 class QBluetoothAddress;
-QTBLUETOOTH_END_NAMESPACE
+QT_END_NAMESPACE_BLUETOOTH
 
-QTBLUETOOTH_USE_NAMESPACE
+QT_USE_NAMESPACE_BLUETOOTH
 
 class ServiceDiscoveryDialog : public QDialog
 {
diff --git a/examples/bluetooth/bttennis/tennis.h b/examples/bluetooth/bttennis/tennis.h
index 92b5f0fa..c72cabe2 100644
--- a/examples/bluetooth/bttennis/tennis.h
+++ b/examples/bluetooth/bttennis/tennis.h
@@ -55,11 +55,11 @@
 
 #include <QDebug>
 
-QTBLUETOOTH_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE_BLUETOOTH
 class QBluetoothServiceDiscoveryAgent;
-QTBLUETOOTH_END_NAMESPACE
+QT_END_NAMESPACE_BLUETOOTH
 
-QTBLUETOOTH_USE_NAMESPACE
+QT_USE_NAMESPACE_BLUETOOTH
 
 static const QLatin1String serviceUuid("e8e10f95-1a70-4b27-9ccf-02010264e9c9");
 
diff --git a/examples/bluetooth/bttennis/tennisclient.h b/examples/bluetooth/bttennis/tennisclient.h
index aeccfca1..e90a3dca 100644
--- a/examples/bluetooth/bttennis/tennisclient.h
+++ b/examples/bluetooth/bttennis/tennisclient.h
@@ -49,15 +49,15 @@
 #include <QtCore/QTime>
 #include <QtCore/QTimer>
 
-QTBLUETOOTH_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE_BLUETOOTH
 class QBluetoothSocket;
-QTBLUETOOTH_END_NAMESPACE
+QT_END_NAMESPACE_BLUETOOTH
 
 QT_BEGIN_NAMESPACE
 class QDataStream;
 QT_END_NAMESPACE
 
-QTBLUETOOTH_USE_NAMESPACE
+QT_USE_NAMESPACE_BLUETOOTH
 
 //! [declaration]
 class TennisClient : public QObject
diff --git a/examples/bluetooth/bttennis/tennisserver.h b/examples/bluetooth/bttennis/tennisserver.h
index bfce30ae..a1936012 100644
--- a/examples/bluetooth/bttennis/tennisserver.h
+++ b/examples/bluetooth/bttennis/tennisserver.h
@@ -51,13 +51,13 @@
 #include <QtCore/QTime>
 #include <QtCore/QTimer>
 
-QTBLUETOOTH_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE_BLUETOOTH
 class QL2capServer;
 class QBluetoothSocket;
 class QBluetoothServiceInfo;
-QTBLUETOOTH_END_NAMESPACE
+QT_END_NAMESPACE_BLUETOOTH
 
-QTBLUETOOTH_USE_NAMESPACE
+QT_USE_NAMESPACE_BLUETOOTH
 
 //! [declaration]
 class TennisServer : public QObject
diff --git a/examples/nfc/annotatedurl/annotatedurl.h b/examples/nfc/annotatedurl/annotatedurl.h
index 490539a2..8f7939c6 100644
--- a/examples/nfc/annotatedurl/annotatedurl.h
+++ b/examples/nfc/annotatedurl/annotatedurl.h
@@ -48,12 +48,12 @@
 QT_FORWARD_DECLARE_CLASS(QUrl)
 QT_FORWARD_DECLARE_CLASS(QPixmap)
 
-QTNFC_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE_NFC
 class QNearFieldTarget;
 class QNdefMessage;
-QTNFC_END_NAMESPACE
+QT_END_NAMESPACE_NFC
 
-QTNFC_USE_NAMESPACE
+QT_USE_NAMESPACE_NFC
 
 class AnnotatedUrl : public QObject
 {
diff --git a/examples/nfc/ndefeditor/mainwindow.h b/examples/nfc/ndefeditor/mainwindow.h
index 6be6be25..d7793b3c 100644
--- a/examples/nfc/ndefeditor/mainwindow.h
+++ b/examples/nfc/ndefeditor/mainwindow.h
@@ -47,12 +47,12 @@
 
 #include <qnearfieldtarget.h>
 
-QTNFC_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE_NFC
 class QNearFieldManager;
 class QNdefMessage;
-QTNFC_END_NAMESPACE
+QT_END_NAMESPACE_NFC
 
-QTNFC_USE_NAMESPACE
+QT_USE_NAMESPACE_NFC
 
 namespace Ui {
     class MainWindow;
diff --git a/examples/nfc/ndefeditor/mimeimagerecordeditor.h b/examples/nfc/ndefeditor/mimeimagerecordeditor.h
index 62330f2f..bfba282c 100644
--- a/examples/nfc/ndefeditor/mimeimagerecordeditor.h
+++ b/examples/nfc/ndefeditor/mimeimagerecordeditor.h
@@ -48,7 +48,7 @@
 
 #include <qndefrecord.h>
 
-QTNFC_USE_NAMESPACE
+QT_USE_NAMESPACE_NFC
 
 namespace Ui {
     class MimeImageRecordEditor;
diff --git a/examples/nfc/ndefeditor/textrecordeditor.h b/examples/nfc/ndefeditor/textrecordeditor.h
index f692d0b7..3f45a94b 100644
--- a/examples/nfc/ndefeditor/textrecordeditor.h
+++ b/examples/nfc/ndefeditor/textrecordeditor.h
@@ -49,7 +49,7 @@ namespace Ui {
     class TextRecordEditor;
 }
 
-QTNFC_USE_NAMESPACE
+QT_USE_NAMESPACE_NFC
 
 class TextRecordEditor : public QWidget
 {
diff --git a/examples/nfc/ndefeditor/urirecordeditor.h b/examples/nfc/ndefeditor/urirecordeditor.h
index cf7af023..c4c17110 100644
--- a/examples/nfc/ndefeditor/urirecordeditor.h
+++ b/examples/nfc/ndefeditor/urirecordeditor.h
@@ -50,7 +50,7 @@ namespace Ui {
     class UriRecordEditor;
 }
 
-QTNFC_USE_NAMESPACE
+QT_USE_NAMESPACE_NFC
 
 class UriRecordEditor : public QWidget
 {