4 files changed, 14 insertions, 26 deletions
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