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>

20 files changed, 43 insertions, 70 deletions

diff --git a/examples/bluetooth/btchat/chat.h b/examples/bluetooth/btchat/chat.h
index c32c85b1..fed850f1 100644
--- a/examples/bluetooth/btchat/chat.h
+++ b/examples/bluetooth/btchat/chat.h
@@ -47,11 +47,7 @@
 
 #include <QDebug>
 
-QT_BEGIN_NAMESPACE_BLUETOOTH
-class QRfcommServer;
-QT_END_NAMESPACE_BLUETOOTH
-
-QT_USE_NAMESPACE_BLUETOOTH
+QT_USE_NAMESPACE
 
 class ChatServer;
 class ChatClient;
diff --git a/examples/bluetooth/btchat/chatclient.h b/examples/bluetooth/btchat/chatclient.h
index 4a029fe0..07f23164 100644
--- a/examples/bluetooth/btchat/chatclient.h
+++ b/examples/bluetooth/btchat/chatclient.h
@@ -45,11 +45,9 @@
 
 #include <QtCore/QObject>
 
-QT_BEGIN_NAMESPACE_BLUETOOTH
-class QBluetoothSocket;
-QT_END_NAMESPACE_BLUETOOTH
+QT_FORWARD_DECLARE_CLASS(QBluetoothSocket)
 
-QT_USE_NAMESPACE_BLUETOOTH
+QT_USE_NAMESPACE
 
 //! [declaration]
 class ChatClient : public QObject
diff --git a/examples/bluetooth/btchat/chatserver.h b/examples/bluetooth/btchat/chatserver.h
index f73ec605..2a3c3503 100644
--- a/examples/bluetooth/btchat/chatserver.h
+++ b/examples/bluetooth/btchat/chatserver.h
@@ -46,12 +46,10 @@
 #include <QtCore/QObject>
 #include <QtCore/QList>
 
-QT_BEGIN_NAMESPACE_BLUETOOTH
-class QBluetoothServer;
-class QBluetoothSocket;
-QT_END_NAMESPACE_BLUETOOTH
+QT_FORWARD_DECLARE_CLASS(QBluetoothServer)
+QT_FORWARD_DECLARE_CLASS(QBluetoothSocket)
 
-QT_USE_NAMESPACE_BLUETOOTH
+QT_USE_NAMESPACE
 
 //! [declaration]
 class ChatServer : public QObject
diff --git a/examples/bluetooth/btchat/remoteselector.cpp b/examples/bluetooth/btchat/remoteselector.cpp
index ee195413..f660a815 100644
--- a/examples/bluetooth/btchat/remoteselector.cpp
+++ b/examples/bluetooth/btchat/remoteselector.cpp
@@ -45,7 +45,7 @@
 #include <qbluetoothaddress.h>
 #include <qbluetoothlocaldevice.h>
 
-QT_USE_NAMESPACE_BLUETOOTH
+QT_USE_NAMESPACE
 
 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 dc10c740..3f6e15c9 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)
 
-QT_USE_NAMESPACE_BLUETOOTH
+QT_USE_NAMESPACE
 
 QT_BEGIN_NAMESPACE
 namespace Ui {
diff --git a/examples/bluetooth/btfiletransfer/progress.cpp b/examples/bluetooth/btfiletransfer/progress.cpp
index fde95c61..c9913c44 100644
--- a/examples/bluetooth/btfiletransfer/progress.cpp
+++ b/examples/bluetooth/btfiletransfer/progress.cpp
@@ -46,7 +46,7 @@
 #include <qbluetoothtransferrequest.h>
 #include <qbluetoothtransferreply.h>
 
-QT_USE_NAMESPACE_BLUETOOTH
+QT_USE_NAMESPACE
 
 Progress::Progress(QWidget *parent) :
     QDialog(parent),
diff --git a/examples/bluetooth/btfiletransfer/progress.h b/examples/bluetooth/btfiletransfer/progress.h
index 27fe87d8..eab84746 100644
--- a/examples/bluetooth/btfiletransfer/progress.h
+++ b/examples/bluetooth/btfiletransfer/progress.h
@@ -45,11 +45,9 @@
 #include <qbluetoothglobal.h>
 #include <QTime>
 
-QT_BEGIN_NAMESPACE_BLUETOOTH
-class QBluetoothTransferReply;
-QT_END_NAMESPACE_BLUETOOTH
+QT_FORWARD_DECLARE_CLASS(QBluetoothTransferReply)
 
-QT_USE_NAMESPACE_BLUETOOTH
+QT_USE_NAMESPACE
 
 QT_BEGIN_NAMESPACE
 namespace Ui {
diff --git a/examples/bluetooth/btfiletransfer/remoteselector.cpp b/examples/bluetooth/btfiletransfer/remoteselector.cpp
index b148dab4..8b197bf0 100644
--- a/examples/bluetooth/btfiletransfer/remoteselector.cpp
+++ b/examples/bluetooth/btfiletransfer/remoteselector.cpp
@@ -55,7 +55,7 @@
 #include "progress.h"
 #include "pindisplay.h"
 
-QT_USE_NAMESPACE_BLUETOOTH
+QT_USE_NAMESPACE
 
 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 2ac715a2..fe1d3966 100644
--- a/examples/bluetooth/btfiletransfer/remoteselector.h
+++ b/examples/bluetooth/btfiletransfer/remoteselector.h
@@ -55,7 +55,7 @@ QT_FORWARD_DECLARE_CLASS(QFile)
 
 class pinDisplay;
 
-QT_USE_NAMESPACE_BLUETOOTH
+QT_USE_NAMESPACE
 
 QT_BEGIN_NAMESPACE
 namespace Ui {
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
 {
diff --git a/examples/bluetooth/bttennis/handover.h b/examples/bluetooth/bttennis/handover.h
index 0a18850f..52d2fba6 100644
--- a/examples/bluetooth/bttennis/handover.h
+++ b/examples/bluetooth/bttennis/handover.h
@@ -48,15 +48,12 @@
 #include <qbluetoothuuid.h>
 #include <qnfcglobal.h>
 
-QT_BEGIN_NAMESPACE_NFC
-class QNearFieldManager;
-class QNearFieldTarget;
-class QLlcpServer;
-class QLlcpSocket;
-QT_END_NAMESPACE_NFC
+QT_FORWARD_DECLARE_CLASS(QNearFieldManager)
+QT_FORWARD_DECLARE_CLASS(QNearFieldTarget)
+QT_FORWARD_DECLARE_CLASS(QLlcpServer)
+QT_FORWARD_DECLARE_CLASS(QLlcpSocket)
 
-QT_USE_NAMESPACE_NFC
-QT_USE_NAMESPACE_BLUETOOTH
+QT_USE_NAMESPACE
 
 class Handover : public QObject
 {
diff --git a/examples/bluetooth/bttennis/tennis.h b/examples/bluetooth/bttennis/tennis.h
index ac83fdd9..3b684dde 100644
--- a/examples/bluetooth/bttennis/tennis.h
+++ b/examples/bluetooth/bttennis/tennis.h
@@ -55,11 +55,9 @@
 
 #include <QDebug>
 
-QT_BEGIN_NAMESPACE_BLUETOOTH
-class QBluetoothServiceDiscoveryAgent;
-QT_END_NAMESPACE_BLUETOOTH
+QT_FORWARD_DECLARE_CLASS(QBluetoothServiceDiscoveryAgent)
 
-QT_USE_NAMESPACE_BLUETOOTH
+QT_USE_NAMESPACE
 
 static const QLatin1String serviceUuid("e8e10f95-1a70-4b27-9ccf-02010264e9c9");
 
diff --git a/examples/bluetooth/bttennis/tennisclient.h b/examples/bluetooth/bttennis/tennisclient.h
index f8d3dbe3..a6dd232e 100644
--- a/examples/bluetooth/bttennis/tennisclient.h
+++ b/examples/bluetooth/bttennis/tennisclient.h
@@ -49,15 +49,10 @@
 #include <QtCore/QTime>
 #include <QtCore/QTimer>
 
-QT_BEGIN_NAMESPACE_BLUETOOTH
-class QBluetoothSocket;
-QT_END_NAMESPACE_BLUETOOTH
+QT_FORWARD_DECLARE_CLASS(QBluetoothSocket)
+QT_FORWARD_DECLARE_CLASS(QDataStream)
 
-QT_BEGIN_NAMESPACE
-class QDataStream;
-QT_END_NAMESPACE
-
-QT_USE_NAMESPACE_BLUETOOTH
+QT_USE_NAMESPACE
 
 //! [declaration]
 class TennisClient : public QObject
diff --git a/examples/bluetooth/bttennis/tennisserver.h b/examples/bluetooth/bttennis/tennisserver.h
index ca9e542a..6bdb13cd 100644
--- a/examples/bluetooth/bttennis/tennisserver.h
+++ b/examples/bluetooth/bttennis/tennisserver.h
@@ -51,13 +51,11 @@
 #include <QtCore/QTime>
 #include <QtCore/QTimer>
 
-QT_BEGIN_NAMESPACE_BLUETOOTH
-class QBluetoothServer;
-class QBluetoothSocket;
-class QBluetoothServiceInfo;
-QT_END_NAMESPACE_BLUETOOTH
+QT_FORWARD_DECLARE_CLASS(QBluetoothServer)
+QT_FORWARD_DECLARE_CLASS(QBluetoothSocket)
+QT_FORWARD_DECLARE_CLASS(QBluetoothServiceInfo)
 
-QT_USE_NAMESPACE_BLUETOOTH
+QT_USE_NAMESPACE
 
 //! [declaration]
 class TennisServer : public QObject
diff --git a/examples/nfc/annotatedurl/annotatedurl.h b/examples/nfc/annotatedurl/annotatedurl.h
index 0ac9cea6..863f0976 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)
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 class QNearFieldTarget;
 class QNdefMessage;
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
-QT_USE_NAMESPACE_NFC
+QT_USE_NAMESPACE
 
 class AnnotatedUrl : public QObject
 {
diff --git a/examples/nfc/ndefeditor/mainwindow.h b/examples/nfc/ndefeditor/mainwindow.h
index ea44e074..69e1e50f 100644
--- a/examples/nfc/ndefeditor/mainwindow.h
+++ b/examples/nfc/ndefeditor/mainwindow.h
@@ -47,12 +47,12 @@
 
 #include <qnearfieldtarget.h>
 
-QT_BEGIN_NAMESPACE_NFC
+QT_BEGIN_NAMESPACE
 class QNearFieldManager;
 class QNdefMessage;
-QT_END_NAMESPACE_NFC
+QT_END_NAMESPACE
 
-QT_USE_NAMESPACE_NFC
+QT_USE_NAMESPACE
 
 QT_BEGIN_NAMESPACE
 namespace Ui {
diff --git a/examples/nfc/ndefeditor/mimeimagerecordeditor.h b/examples/nfc/ndefeditor/mimeimagerecordeditor.h
index fabfe5f6..150f11cd 100644
--- a/examples/nfc/ndefeditor/mimeimagerecordeditor.h
+++ b/examples/nfc/ndefeditor/mimeimagerecordeditor.h
@@ -48,7 +48,7 @@
 
 #include <qndefrecord.h>
 
-QT_USE_NAMESPACE_NFC
+QT_USE_NAMESPACE
 
 QT_BEGIN_NAMESPACE
 namespace Ui {
diff --git a/examples/nfc/ndefeditor/textrecordeditor.h b/examples/nfc/ndefeditor/textrecordeditor.h
index c5b51cc4..0da016ee 100644
--- a/examples/nfc/ndefeditor/textrecordeditor.h
+++ b/examples/nfc/ndefeditor/textrecordeditor.h
@@ -51,7 +51,7 @@ namespace Ui {
 }
 QT_END_NAMESPACE
 
-QT_USE_NAMESPACE_NFC
+QT_USE_NAMESPACE
 
 class TextRecordEditor : public QWidget
 {
diff --git a/examples/nfc/ndefeditor/urirecordeditor.h b/examples/nfc/ndefeditor/urirecordeditor.h
index 02fc910e..aaf46b9a 100644
--- a/examples/nfc/ndefeditor/urirecordeditor.h
+++ b/examples/nfc/ndefeditor/urirecordeditor.h
@@ -52,7 +52,7 @@ namespace Ui {
 }
 QT_END_NAMESPACE
 
-QT_USE_NAMESPACE_NFC
+QT_USE_NAMESPACE
 
 class UriRecordEditor : public QWidget
 {