diff options
Diffstat (limited to 'tests/auto')
12 files changed, 27 insertions, 31 deletions
diff --git a/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp b/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp index e80a6dc5..89c2805c 100644 --- a/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp +++ b/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp @@ -44,8 +44,8 @@ QT_USE_NAMESPACE -Q_DECLARE_METATYPE(QBluetoothDeviceInfo) Q_DECLARE_METATYPE(QBluetoothDeviceDiscoveryAgent::InquiryType) +Q_DECLARE_METATYPE(QBluetoothDeviceDiscoveryAgent::Error) /* * Some parts of this test require a remote and discoverable Bluetooth @@ -92,7 +92,7 @@ private: tst_QBluetoothDeviceDiscoveryAgent::tst_QBluetoothDeviceDiscoveryAgent() { QLoggingCategory::setFilterRules(QStringLiteral("qt.bluetooth* = true")); - qRegisterMetaType<QBluetoothDeviceDiscoveryAgent::Error>("QBluetoothDeviceDiscoveryAgent::Error"); + qRegisterMetaType<QBluetoothDeviceDiscoveryAgent::Error>(); } tst_QBluetoothDeviceDiscoveryAgent::~tst_QBluetoothDeviceDiscoveryAgent() @@ -101,8 +101,8 @@ tst_QBluetoothDeviceDiscoveryAgent::~tst_QBluetoothDeviceDiscoveryAgent() void tst_QBluetoothDeviceDiscoveryAgent::initTestCase() { - qRegisterMetaType<QBluetoothDeviceInfo>("QBluetoothDeviceInfo"); - qRegisterMetaType<QBluetoothDeviceDiscoveryAgent::InquiryType>("QBluetoothDeviceDiscoveryAgent::InquiryType"); + qRegisterMetaType<QBluetoothDeviceInfo>(); + qRegisterMetaType<QBluetoothDeviceDiscoveryAgent::InquiryType>(); noOfLocalDevices = QBluetoothLocalDevice::allDevices().count(); if (!noOfLocalDevices) diff --git a/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp b/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp index f43bdb23..18698afd 100644 --- a/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp +++ b/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp @@ -79,8 +79,8 @@ tst_QBluetoothDeviceInfo::~tst_QBluetoothDeviceInfo() void tst_QBluetoothDeviceInfo::initTestCase() { - qRegisterMetaType<QBluetoothDeviceInfo::ServiceClasses>("QBluetoothDeviceInfo::ServiceClasses"); - qRegisterMetaType<QBluetoothDeviceInfo::MajorDeviceClass>("QBluetoothDeviceInfo::MajorDeviceClass"); + qRegisterMetaType<QBluetoothDeviceInfo::ServiceClasses>(); + qRegisterMetaType<QBluetoothDeviceInfo::MajorDeviceClass>(); // start Bluetooth if not started QBluetoothLocalDevice *device = new QBluetoothLocalDevice(); device->powerOn(); diff --git a/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp b/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp index 01a79a03..fca02b28 100644 --- a/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp +++ b/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp @@ -118,8 +118,8 @@ void tst_QBluetoothServer::setHostMode(const QBluetoothAddress &localAdapter, void tst_QBluetoothServer::initTestCase() { - qRegisterMetaType<QBluetooth::SecurityFlags>("QBluetooth::SecurityFlags"); - qRegisterMetaType<QBluetoothServer::Error>("QBluetoothServer::Error"); + qRegisterMetaType<QBluetooth::SecurityFlags>(); + qRegisterMetaType<QBluetoothServer::Error>(); QBluetoothLocalDevice device; if (!device.isValid()) diff --git a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp index 341c6918..b0c97d07 100644 --- a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp +++ b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp @@ -47,8 +47,7 @@ QT_USE_NAMESPACE -Q_DECLARE_METATYPE(QBluetoothDeviceInfo) -Q_DECLARE_METATYPE(QBluetoothServiceDiscoveryAgent::Error) +Q_DECLARE_METATYPE(QBluetoothDeviceDiscoveryAgent::Error) // Maximum time to for bluetooth device scan const int MaxScanTime = 5 * 60 * 1000; // 5 minutes in ms @@ -98,11 +97,11 @@ tst_QBluetoothServiceDiscoveryAgent::tst_QBluetoothServiceDiscoveryAgent() localDeviceAvailable = QBluetoothLocalDevice().hostMode() != QBluetoothLocalDevice::HostPoweredOff; #endif - qRegisterMetaType<QBluetoothDeviceInfo>("QBluetoothDeviceInfo"); - qRegisterMetaType<QBluetoothServiceInfo>("QBluetoothServiceInfo"); - qRegisterMetaType<QList<QBluetoothUuid> >("QList<QBluetoothUuid>"); - qRegisterMetaType<QBluetoothServiceDiscoveryAgent::Error>("QBluetoothServiceDiscoveryAgent::Error"); - qRegisterMetaType<QBluetoothDeviceDiscoveryAgent::Error>("QBluetoothDeviceDiscoveryAgent::Error"); + qRegisterMetaType<QBluetoothDeviceInfo>(); + qRegisterMetaType<QBluetoothServiceInfo>(); + qRegisterMetaType<QList<QBluetoothUuid> >(); + qRegisterMetaType<QBluetoothServiceDiscoveryAgent::Error>(); + qRegisterMetaType<QBluetoothDeviceDiscoveryAgent::Error>(); } diff --git a/tests/auto/qbluetoothserviceinfo/tst_qbluetoothserviceinfo.cpp b/tests/auto/qbluetoothserviceinfo/tst_qbluetoothserviceinfo.cpp index 61bad7c5..011b0e5f 100644 --- a/tests/auto/qbluetoothserviceinfo/tst_qbluetoothserviceinfo.cpp +++ b/tests/auto/qbluetoothserviceinfo/tst_qbluetoothserviceinfo.cpp @@ -78,9 +78,9 @@ tst_QBluetoothServiceInfo::~tst_QBluetoothServiceInfo() void tst_QBluetoothServiceInfo::initTestCase() { - qRegisterMetaType<QBluetoothUuid::ProtocolUuid>("QBluetoothUuid::ProtocolUuid"); - qRegisterMetaType<QUuid>("QUuid"); - qRegisterMetaType<QBluetoothServiceInfo::Protocol>("QBluetoothServiceInfo::Protocol"); + qRegisterMetaType<QBluetoothUuid::ProtocolUuid>(); + qRegisterMetaType<QUuid>(); + qRegisterMetaType<QBluetoothServiceInfo::Protocol>(); // start Bluetooth if not started QBluetoothLocalDevice *device = new QBluetoothLocalDevice(); device->powerOn(); diff --git a/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp b/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp index 6290f075..d7a35b1b 100644 --- a/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp +++ b/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp @@ -43,8 +43,6 @@ QT_USE_NAMESPACE -Q_DECLARE_METATYPE(QBluetoothSocket::SocketState) -Q_DECLARE_METATYPE(QBluetoothSocket::SocketError) Q_DECLARE_METATYPE(QBluetoothServiceInfo::Protocol) //same uuid as tests/bttestui @@ -100,8 +98,8 @@ Q_DECLARE_METATYPE(tst_QBluetoothSocket::ClientConnectionShutdown) tst_QBluetoothSocket::tst_QBluetoothSocket() { - qRegisterMetaType<QBluetoothSocket::SocketState>("QBluetoothSocket::SocketState"); - qRegisterMetaType<QBluetoothSocket::SocketError>("QBluetoothSocket::SocketError"); + qRegisterMetaType<QBluetoothSocket::SocketState>(); + qRegisterMetaType<QBluetoothSocket::SocketError>(); localDeviceFound = false; // true if we have a local adapter done_discovery = false; //true if we found remote device diff --git a/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp b/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp index b39e6292..b3b80e5e 100644 --- a/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp +++ b/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp @@ -92,7 +92,7 @@ private: tst_QBluetoothTransferManager::tst_QBluetoothTransferManager() { - qRegisterMetaType<QBluetoothTransferReply*>("QBluetoothTransferReply*"); + qRegisterMetaType<QBluetoothTransferReply*>(); } tst_QBluetoothTransferManager::~tst_QBluetoothTransferManager() diff --git a/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp b/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp index e905eb94..6743d38c 100644 --- a/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp +++ b/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp @@ -69,7 +69,7 @@ private slots: tst_QBluetoothUuid::tst_QBluetoothUuid() { - qRegisterMetaType<quint128>("quint128"); + qRegisterMetaType<quint128>(); } tst_QBluetoothUuid::~tst_QBluetoothUuid() diff --git a/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp b/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp index 8cd5cdee..8f5db8ab 100644 --- a/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp +++ b/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp @@ -97,7 +97,6 @@ private: Q_DECLARE_METATYPE(QLowEnergyCharacteristic) Q_DECLARE_METATYPE(QLowEnergyDescriptor) -Q_DECLARE_METATYPE(QLowEnergyService::ServiceError) tst_QLowEnergyController::tst_QLowEnergyController() { diff --git a/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp b/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp index 694b6b1b..8f3009ad 100644 --- a/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp +++ b/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp @@ -75,8 +75,8 @@ tst_QNearFieldManager::tst_QNearFieldManager() { QDir::setCurrent(QLatin1String(SRCDIR)); - qRegisterMetaType<QNdefMessage>("QNdefMessage"); - qRegisterMetaType<QNearFieldTarget *>("QNearFieldTarget*"); + qRegisterMetaType<QNdefMessage>(); + qRegisterMetaType<QNearFieldTarget *>(); } void tst_QNearFieldManager::initTestCase() diff --git a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp index 0d733e1d..a36fdffb 100644 --- a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp +++ b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp @@ -72,8 +72,8 @@ tst_QNearFieldTagType1::tst_QNearFieldTagType1() { QDir::setCurrent(QLatin1String(SRCDIR)); - qRegisterMetaType<QNdefMessage>("QNdefMessage"); - qRegisterMetaType<QNearFieldTarget *>("QNearFieldTarget*"); + qRegisterMetaType<QNdefMessage>(); + qRegisterMetaType<QNearFieldTarget *>(); } void tst_QNearFieldTagType1::init() diff --git a/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp b/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp index 39a2c68b..510be44f 100644 --- a/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp +++ b/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp @@ -74,8 +74,8 @@ tst_QNearFieldTagType2::tst_QNearFieldTagType2() { QDir::setCurrent(QLatin1String(SRCDIR)); - qRegisterMetaType<QNdefMessage>("QNdefMessage"); - qRegisterMetaType<QNearFieldTarget *>("QNearFieldTarget*"); + qRegisterMetaType<QNdefMessage>(); + qRegisterMetaType<QNearFieldTarget *>(); } void tst_QNearFieldTagType2::init() |