diff options
author | Alex Blasche <alexander.blasche@digia.com> | 2014-07-18 15:16:42 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@digia.com> | 2014-07-23 12:13:21 +0200 |
commit | 45536c645baa22e51be4871308ff872c1ba43dce (patch) | |
tree | 9d0119b3c2587773034141bcc1537a9661b8eeb6 /tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp | |
parent | b38d9e348470d917dba9d7b8acfc93fb505a6555 (diff) | |
download | qtconnectivity-45536c645baa22e51be4871308ff872c1ba43dce.tar.gz |
Rename QLowEnergyControllerNew -> QLowEnergyController
Moves the new API into its place and completes the removal of the old
API.
Change-Id: I10a285e24e288aeb747cb1606574e27a4bf57308
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Diffstat (limited to 'tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp')
-rw-r--r-- | tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp b/tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp index c6c408b6..0a35b173 100644 --- a/tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp +++ b/tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp @@ -47,7 +47,7 @@ #include <QBluetoothServiceDiscoveryAgent> #include <QLowEnergyCharacteristic> #include <QLowEnergyServiceInfo> -#include <QLowEnergyControllerNew> +#include <QLowEnergyController> #include <QBluetoothLocalDevice> QT_USE_NAMESPACE @@ -72,7 +72,7 @@ private slots: private: QBluetoothServiceDiscoveryAgent *agent; QSet<QString> remoteLeDevices; - QLowEnergyControllerNew *globalControl; + QLowEnergyController *globalControl; QLowEnergyService *globalService; }; @@ -113,14 +113,14 @@ void tst_QLowEnergyCharacteristic::initTestCase() QTRY_VERIFY_WITH_TIMEOUT(spy.count() > 0, 50000); // find first service with descriptor - QLowEnergyControllerNew *controller = 0; + QLowEnergyController *controller = 0; foreach (const QString &remoteDevice, remoteLeDevices.toList()) { - controller = new QLowEnergyControllerNew(QBluetoothAddress(remoteDevice), this); + controller = new QLowEnergyController(QBluetoothAddress(remoteDevice), this); qDebug() << "Connecting to" << remoteDevice; controller->connectToDevice(); - QTRY_IMPL(controller->state() != QLowEnergyControllerNew::ConnectingState, + QTRY_IMPL(controller->state() != QLowEnergyController::ConnectingState, 10000); - if (controller->state() != QLowEnergyControllerNew::ConnectedState) { + if (controller->state() != QLowEnergyController::ConnectedState) { // any error and we skip delete controller; qDebug() << "Skipping device"; |