summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2013-09-05 13:32:00 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-09 12:44:29 +0200
commite21b666856fe89a13c2c8c1eb7ef6fb18275f9b4 (patch)
tree3f5f6075a783fe4afe1b201faa591fa8dacc4238 /tests
parenta589ae4f2f525686efa9f031a82390433b0e606d (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 'tests')
-rw-r--r--tests/auto/cmake/CMakeLists.txt2
-rw-r--r--tests/auto/qbluetoothaddress/tst_qbluetoothaddress.cpp2
-rw-r--r--tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp2
-rw-r--r--tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp2
-rw-r--r--tests/auto/qbluetoothhostinfo/tst_qbluetoothhostinfo.cpp2
-rw-r--r--tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp2
-rw-r--r--tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp2
-rw-r--r--tests/auto/qbluetoothserviceinfo/tst_qbluetoothserviceinfo.cpp2
-rw-r--r--tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp2
-rw-r--r--tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp2
-rw-r--r--tests/auto/qbluetoothtransferrequest/tst_qbluetoothtransferrequest.cpp2
-rw-r--r--tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp2
-rw-r--r--tests/auto/ql2capserver/tst_ql2capserver.cpp2
-rw-r--r--tests/auto/qndefmessage/tst_qndefmessage.cpp2
-rw-r--r--tests/auto/qndefnfcsmartposterrecord/tst_qndefnfcsmartposterrecord.cpp2
-rw-r--r--tests/auto/qndefrecord/tst_qndefrecord.cpp2
-rw-r--r--tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp2
-rw-r--r--tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp2
-rw-r--r--tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp2
-rw-r--r--tests/auto/qrfcommserver/tst_qrfcommserver.cpp2
-rw-r--r--tests/nfctestserver/servercontroller.h2
-rw-r--r--tests/nfctestserver/socketcontroller.h2
22 files changed, 21 insertions, 23 deletions
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
index 1ff9321f..34bbf980 100644
--- a/tests/auto/cmake/CMakeLists.txt
+++ b/tests/auto/cmake/CMakeLists.txt
@@ -13,8 +13,6 @@ set(qt_module_includes
Bluetooth QBluetoothAddress
Nfc QNdefRecord
)
-set(QBluetoothAddress_NAMESPACE QtBluetooth)
-set(QNdefRecord_NAMESPACE QtNfc)
test_module_includes(
${qt_module_includes}
diff --git a/tests/auto/qbluetoothaddress/tst_qbluetoothaddress.cpp b/tests/auto/qbluetoothaddress/tst_qbluetoothaddress.cpp
index 20a50e2e..d53f39dd 100644
--- a/tests/auto/qbluetoothaddress/tst_qbluetoothaddress.cpp
+++ b/tests/auto/qbluetoothaddress/tst_qbluetoothaddress.cpp
@@ -45,7 +45,7 @@
#include <qbluetoothaddress.h>
-QT_USE_NAMESPACE_BLUETOOTH
+QT_USE_NAMESPACE
class tst_QBluetoothAddress : public QObject
{
diff --git a/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp b/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp
index 33b6b204..fd923f0e 100644
--- a/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp
+++ b/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp
@@ -49,7 +49,7 @@
#include <qbluetoothdevicediscoveryagent.h>
#include <qbluetoothlocaldevice.h>
-QT_USE_NAMESPACE_BLUETOOTH
+QT_USE_NAMESPACE
Q_DECLARE_METATYPE(QBluetoothDeviceInfo)
Q_DECLARE_METATYPE(QBluetoothDeviceDiscoveryAgent::InquiryType)
diff --git a/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp b/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp
index 514be2e9..64a65348 100644
--- a/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp
+++ b/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp
@@ -48,7 +48,7 @@
#include <qbluetoothlocaldevice.h>
#include <qbluetoothuuid.h>
-QT_USE_NAMESPACE_BLUETOOTH
+QT_USE_NAMESPACE
Q_DECLARE_METATYPE(QBluetoothDeviceInfo::ServiceClasses)
Q_DECLARE_METATYPE(QBluetoothDeviceInfo::MajorDeviceClass)
diff --git a/tests/auto/qbluetoothhostinfo/tst_qbluetoothhostinfo.cpp b/tests/auto/qbluetoothhostinfo/tst_qbluetoothhostinfo.cpp
index 7fa0e657..aa2448a8 100644
--- a/tests/auto/qbluetoothhostinfo/tst_qbluetoothhostinfo.cpp
+++ b/tests/auto/qbluetoothhostinfo/tst_qbluetoothhostinfo.cpp
@@ -46,7 +46,7 @@
#include <qbluetoothhostinfo.h>
-QT_USE_NAMESPACE_BLUETOOTH
+QT_USE_NAMESPACE
class tst_QBluetoothHostInfo : public QObject
{
diff --git a/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp b/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp
index bc4e269e..abe19c0b 100644
--- a/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp
+++ b/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp
@@ -47,7 +47,7 @@
#include <qbluetoothaddress.h>
#include <qbluetoothlocaldevice.h>
-QT_USE_NAMESPACE_BLUETOOTH
+QT_USE_NAMESPACE
/*
* Running the manual tests requires another Bluetooth device in the vincinity.
diff --git a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp
index ec5ff840..941245e0 100644
--- a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp
+++ b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp
@@ -52,7 +52,7 @@
#include <qbluetoothserver.h>
#include <qbluetoothserviceinfo.h>
-QT_USE_NAMESPACE_BLUETOOTH
+QT_USE_NAMESPACE
Q_DECLARE_METATYPE(QBluetoothDeviceInfo)
Q_DECLARE_METATYPE(QBluetoothServiceDiscoveryAgent::Error)
diff --git a/tests/auto/qbluetoothserviceinfo/tst_qbluetoothserviceinfo.cpp b/tests/auto/qbluetoothserviceinfo/tst_qbluetoothserviceinfo.cpp
index ea2c4ee8..62550622 100644
--- a/tests/auto/qbluetoothserviceinfo/tst_qbluetoothserviceinfo.cpp
+++ b/tests/auto/qbluetoothserviceinfo/tst_qbluetoothserviceinfo.cpp
@@ -50,7 +50,7 @@
#include <qbluetoothlocaldevice.h>
#include <qbluetoothuuid.h>
-QT_USE_NAMESPACE_BLUETOOTH
+QT_USE_NAMESPACE
Q_DECLARE_METATYPE(QBluetoothUuid::ProtocolUuid)
Q_DECLARE_METATYPE(QUuid)
diff --git a/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp b/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp
index af0db519..5e81e114 100644
--- a/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp
+++ b/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp
@@ -53,7 +53,7 @@
#include <btclient.h>
-QT_USE_NAMESPACE_BLUETOOTH
+QT_USE_NAMESPACE
Q_DECLARE_METATYPE(QBluetoothSocket::SocketState)
Q_DECLARE_METATYPE(QBluetoothSocket::SocketType)
diff --git a/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp b/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp
index 998e3d4e..5c9ea9f0 100644
--- a/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp
+++ b/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp
@@ -65,7 +65,7 @@
* discoverable and the object push service must be accessible. Any
**/
-QT_USE_NAMESPACE_BLUETOOTH
+QT_USE_NAMESPACE
typedef QMap<QBluetoothTransferRequest::Attribute,QVariant> tst_QBluetoothTransferManager_QParameterMap;
Q_DECLARE_METATYPE(tst_QBluetoothTransferManager_QParameterMap)
diff --git a/tests/auto/qbluetoothtransferrequest/tst_qbluetoothtransferrequest.cpp b/tests/auto/qbluetoothtransferrequest/tst_qbluetoothtransferrequest.cpp
index 729ca083..3de7aec0 100644
--- a/tests/auto/qbluetoothtransferrequest/tst_qbluetoothtransferrequest.cpp
+++ b/tests/auto/qbluetoothtransferrequest/tst_qbluetoothtransferrequest.cpp
@@ -48,7 +48,7 @@
#include <qbluetoothaddress.h>
#include <qbluetoothlocaldevice.h>
-QT_USE_NAMESPACE_BLUETOOTH
+QT_USE_NAMESPACE
typedef QMap<int,QVariant> tst_QBluetoothTransferRequest_QParameterMap;
Q_DECLARE_METATYPE(tst_QBluetoothTransferRequest_QParameterMap)
diff --git a/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp b/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp
index 700d6fb4..5aae3ba9 100644
--- a/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp
+++ b/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp
@@ -51,7 +51,7 @@
# include <netinet/in.h>
#endif
-QT_USE_NAMESPACE_BLUETOOTH
+QT_USE_NAMESPACE
Q_DECLARE_METATYPE(quint128)
diff --git a/tests/auto/ql2capserver/tst_ql2capserver.cpp b/tests/auto/ql2capserver/tst_ql2capserver.cpp
index 9ba7ba8a..26c68cad 100644
--- a/tests/auto/ql2capserver/tst_ql2capserver.cpp
+++ b/tests/auto/ql2capserver/tst_ql2capserver.cpp
@@ -46,7 +46,7 @@
#include <qbluetoothserver.h>
#include <qbluetoothsocket.h>
-QT_USE_NAMESPACE_BLUETOOTH
+QT_USE_NAMESPACE
Q_DECLARE_METATYPE(QBluetooth::SecurityFlags);
diff --git a/tests/auto/qndefmessage/tst_qndefmessage.cpp b/tests/auto/qndefmessage/tst_qndefmessage.cpp
index 17e29207..5813d0cd 100644
--- a/tests/auto/qndefmessage/tst_qndefmessage.cpp
+++ b/tests/auto/qndefmessage/tst_qndefmessage.cpp
@@ -46,7 +46,7 @@
#include <qndefnfctextrecord.h>
#include <qndefnfcurirecord.h>
-QT_USE_NAMESPACE_NFC
+QT_USE_NAMESPACE
Q_DECLARE_METATYPE(QNdefRecord)
diff --git a/tests/auto/qndefnfcsmartposterrecord/tst_qndefnfcsmartposterrecord.cpp b/tests/auto/qndefnfcsmartposterrecord/tst_qndefnfcsmartposterrecord.cpp
index 33b15980..c16fb211 100644
--- a/tests/auto/qndefnfcsmartposterrecord/tst_qndefnfcsmartposterrecord.cpp
+++ b/tests/auto/qndefnfcsmartposterrecord/tst_qndefnfcsmartposterrecord.cpp
@@ -47,7 +47,7 @@
#include <qndefnfcurirecord.h>
#include <qndefnfcsmartposterrecord.h>
-QT_USE_NAMESPACE_NFC
+QT_USE_NAMESPACE
static const quint8 payload[] = {
0xC1, 0x02, 0x00, 0x00, 0x03, 0x0D, 0x53, 0x70, 0x91, 0x01, 0x08, 0x55, 0x01, 0x72, 0x69, 0x6D, 0x2E, 0x63, 0x6F, 0x6D,
diff --git a/tests/auto/qndefrecord/tst_qndefrecord.cpp b/tests/auto/qndefrecord/tst_qndefrecord.cpp
index 438add93..cccd1c61 100644
--- a/tests/auto/qndefrecord/tst_qndefrecord.cpp
+++ b/tests/auto/qndefrecord/tst_qndefrecord.cpp
@@ -46,7 +46,7 @@
#include <qndefnfcurirecord.h>
#include <qdeclarativendefrecord.h>
-QT_USE_NAMESPACE_NFC
+QT_USE_NAMESPACE
Q_DECLARE_METATYPE(QNdefRecord::TypeNameFormat)
diff --git a/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp b/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp
index 655d9193..79a2a35a 100644
--- a/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp
+++ b/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp
@@ -48,7 +48,7 @@
#include <qndefmessage.h>
#include <qndefrecord.h>
-QT_USE_NAMESPACE_NFC
+QT_USE_NAMESPACE
Q_DECLARE_METATYPE(QNearFieldTarget*)
Q_DECLARE_METATYPE(QNearFieldTarget::Type)
diff --git a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp
index 9611698d..7dbb37a8 100644
--- a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp
+++ b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp
@@ -47,7 +47,7 @@
#include <private/qnearfieldtagtype1_p.h>
#include <qndefnfctextrecord.h>
-QT_USE_NAMESPACE_NFC
+QT_USE_NAMESPACE
Q_DECLARE_METATYPE(QNearFieldTarget*)
diff --git a/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp b/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp
index 9b4fa6a7..f57b1f23 100644
--- a/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp
+++ b/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp
@@ -47,7 +47,7 @@
#include <private/qnearfieldtagtype2_p.h>
#include <qndefnfctextrecord.h>
-QT_USE_NAMESPACE_NFC
+QT_USE_NAMESPACE
Q_DECLARE_METATYPE(QNearFieldTarget*)
diff --git a/tests/auto/qrfcommserver/tst_qrfcommserver.cpp b/tests/auto/qrfcommserver/tst_qrfcommserver.cpp
index 57cee4d3..3620600e 100644
--- a/tests/auto/qrfcommserver/tst_qrfcommserver.cpp
+++ b/tests/auto/qrfcommserver/tst_qrfcommserver.cpp
@@ -47,7 +47,7 @@
#include <qbluetoothsocket.h>
#include <qbluetoothlocaldevice.h>
-QT_USE_NAMESPACE_BLUETOOTH
+QT_USE_NAMESPACE
Q_DECLARE_METATYPE(QBluetooth::SecurityFlags);
diff --git a/tests/nfctestserver/servercontroller.h b/tests/nfctestserver/servercontroller.h
index 437f5df0..a27ffffe 100644
--- a/tests/nfctestserver/servercontroller.h
+++ b/tests/nfctestserver/servercontroller.h
@@ -46,7 +46,7 @@
#include <qllcpserver.h>
-QT_USE_NAMESPACE_NFC
+QT_USE_NAMESPACE
class ServerController : public QObject
{
diff --git a/tests/nfctestserver/socketcontroller.h b/tests/nfctestserver/socketcontroller.h
index 525984df..cbfc4109 100644
--- a/tests/nfctestserver/socketcontroller.h
+++ b/tests/nfctestserver/socketcontroller.h
@@ -47,7 +47,7 @@
#include <qnearfieldmanager.h>
#include <qllcpsocket.h>
-QT_USE_NAMESPACE_NFC
+QT_USE_NAMESPACE
class SocketController : public QObject
{