diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2013-09-05 13:32:00 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-09 12:44:29 +0200 |
| commit | e21b666856fe89a13c2c8c1eb7ef6fb18275f9b4 (patch) | |
| tree | 3f5f6075a783fe4afe1b201faa591fa8dacc4238 /examples/bluetooth/btchat | |
| parent | a589ae4f2f525686efa9f031a82390433b0e606d (diff) | |
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>
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 | 8 | ||||
| -rw-r--r-- | examples/bluetooth/btchat/remoteselector.cpp | 2 | ||||
| -rw-r--r-- | examples/bluetooth/btchat/remoteselector.h | 2 |
5 files changed, 8 insertions, 16 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 { |