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>

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";