diff options
20 files changed, 214 insertions, 214 deletions
diff --git a/examples/bluetooth/heartlistener/heartrate.cpp b/examples/bluetooth/heartlistener/heartrate.cpp index f0f4230e..7ada09dd 100644 --- a/examples/bluetooth/heartlistener/heartrate.cpp +++ b/examples/bluetooth/heartlistener/heartrate.cpp @@ -144,14 +144,14 @@ void HeartRate::connectToService(const QString &address) } //! [Connect signals] - m_control = new QLowEnergyControllerNew(m_currentDevice.getDevice().address(), + m_control = new QLowEnergyController(m_currentDevice.getDevice().address(), this); connect(m_control, SIGNAL(serviceDiscovered(QBluetoothUuid)), this, SLOT(serviceDiscovered(QBluetoothUuid))); connect(m_control, SIGNAL(discoveryFinished()), this, SLOT(serviceScanDone())); - connect(m_control, SIGNAL(error(QLowEnergyControllerNew::Error)), - this, SLOT(controllerError(QLowEnergyControllerNew::Error))); + connect(m_control, SIGNAL(error(QLowEnergyController::Error)), + this, SLOT(controllerError(QLowEnergyController::Error))); connect(m_control, SIGNAL(connected()), this, SLOT(serviceConnected())); @@ -232,7 +232,7 @@ void HeartRate::disconnectService() } //! [Error handling] -void HeartRate::controllerError(QLowEnergyControllerNew::Error error) +void HeartRate::controllerError(QLowEnergyController::Error error) { setMessage("Cannot connect to remote device."); qWarning() << "Controller Error:" << error; diff --git a/examples/bluetooth/heartlistener/heartrate.h b/examples/bluetooth/heartlistener/heartrate.h index 25ee8e01..65e92af8 100644 --- a/examples/bluetooth/heartlistener/heartrate.h +++ b/examples/bluetooth/heartlistener/heartrate.h @@ -51,7 +51,7 @@ #include <QTimer> #include <QBluetoothDeviceDiscoveryAgent> #include <QBluetoothDeviceInfo> -#include <QLowEnergyControllerNew> +#include <QLowEnergyController> #include <QLowEnergyService> @@ -99,10 +99,10 @@ private slots: void scanFinished(); void deviceScanError(QBluetoothDeviceDiscoveryAgent::Error); - //QLowEnergyControllerNew + //QLowEnergyController void serviceDiscovered(const QBluetoothUuid &); void serviceScanDone(); - void controllerError(QLowEnergyControllerNew::Error); + void controllerError(QLowEnergyController::Error); void serviceConnected(); void deviceDisconnected(); @@ -141,7 +141,7 @@ private: int m_max; int m_min; float calories; - QLowEnergyControllerNew *m_control; + QLowEnergyController *m_control; QTimer *timer; // for demo application QLowEnergyService *m_service; }; diff --git a/examples/bluetooth/lowenergyscanner/device.cpp b/examples/bluetooth/lowenergyscanner/device.cpp index e1bb63fe..3d82800f 100644 --- a/examples/bluetooth/lowenergyscanner/device.cpp +++ b/examples/bluetooth/lowenergyscanner/device.cpp @@ -156,11 +156,11 @@ void Device::scanServices(const QString &address) if (!controller) { // Connecting signals and slots for connecting to LE services. - controller = new QLowEnergyControllerNew(currentDevice.getDevice().address()); + controller = new QLowEnergyController(currentDevice.getDevice().address()); connect(controller, SIGNAL(connected()), this, SLOT(deviceConnected())); - connect(controller, SIGNAL(error(QLowEnergyControllerNew::Error)), - this, SLOT(errorReceived(QLowEnergyControllerNew::Error))); + connect(controller, SIGNAL(error(QLowEnergyController::Error)), + this, SLOT(errorReceived(QLowEnergyController::Error))); connect(controller, SIGNAL(disconnected()), this, SLOT(deviceDisconnected())); connect(controller, SIGNAL(serviceDiscovered(QBluetoothUuid)), @@ -232,7 +232,7 @@ void Device::deviceConnected() controller->discoverServices(); } -void Device::errorReceived(QLowEnergyControllerNew::Error /*error*/) +void Device::errorReceived(QLowEnergyController::Error /*error*/) { qWarning() << "Error: " << controller->errorString(); setUpdate(controller->errorString()); diff --git a/examples/bluetooth/lowenergyscanner/device.h b/examples/bluetooth/lowenergyscanner/device.h index bb99ffe0..f15c4c95 100644 --- a/examples/bluetooth/lowenergyscanner/device.h +++ b/examples/bluetooth/lowenergyscanner/device.h @@ -48,7 +48,7 @@ #include <QList> #include <QBluetoothServiceDiscoveryAgent> #include <QBluetoothDeviceDiscoveryAgent> -#include <QLowEnergyControllerNew> +#include <QLowEnergyController> #include <QBluetoothServiceInfo> #include "deviceinfo.h" #include "serviceinfo.h" @@ -88,10 +88,10 @@ private slots: void deviceScanFinished(); void deviceScanError(QBluetoothDeviceDiscoveryAgent::Error); - // QLowEnergyControllerNew realted + // QLowEnergyController realted void addLowEnergyService(const QBluetoothUuid &uuid); void deviceConnected(); - void errorReceived(QLowEnergyControllerNew::Error); + void errorReceived(QLowEnergyController::Error); void serviceScanDone(); void deviceDisconnected(); @@ -115,7 +115,7 @@ private: QList<QObject*> m_characteristics; QString m_message; bool connected; - QLowEnergyControllerNew *controller; + QLowEnergyController *controller; bool m_deviceScanState; }; diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index 3a01765f..15b840e2 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -28,7 +28,7 @@ PUBLIC_HEADERS += \ qlowenergycharacteristic.h \ qlowenergydescriptor.h \ qbluetoothtransferreply.h \ - qlowenergycontrollernew.h + qlowenergycontroller.h PRIVATE_HEADERS += \ qbluetoothaddress_p.h\ @@ -44,7 +44,7 @@ PRIVATE_HEADERS += \ qprivatelinearbuffer_p.h \ qbluetoothlocaldevice_p.h \ qlowenergyserviceinfo_p.h \ - qlowenergycontrollernew_p.h \ + qlowenergycontroller_p.h \ qlowenergyserviceprivate_p.h SOURCES += \ @@ -66,7 +66,7 @@ SOURCES += \ qlowenergyservice.cpp \ qlowenergycharacteristic.cpp \ qlowenergydescriptor.cpp \ - qlowenergycontrollernew.cpp \ + qlowenergycontroller.cpp \ qlowenergyserviceprivate.cpp config_bluez:qtHaveModule(dbus) { @@ -91,13 +91,13 @@ config_bluez:qtHaveModule(dbus) { # old versions of Bluez do not have the required BTLE symbols config_bluez_le { SOURCES += \ - qlowenergycontrollernew_bluez.cpp + qlowenergycontroller_bluez.cpp } else { message("Bluez version is too old to support Bluetooth Low Energy.") message("Only classic Bluetooth will be available.") DEFINES += QT_BLUEZ_NO_BTLE SOURCES += \ - qlowenergycontrollernew_p.cpp + qlowenergycontroller_p.cpp } CONFIG += link_pkgconfig @@ -123,7 +123,7 @@ config_bluez:qtHaveModule(dbus) { qbluetoothsocket_qnx.cpp \ qbluetoothserver_qnx.cpp \ qbluetoothtransferreply_qnx.cpp \ - qlowenergycontrollernew_p.cpp + qlowenergycontroller_p.cpp } else:android:!android-no-sdk { include(android/android.pri) @@ -145,7 +145,7 @@ config_bluez:qtHaveModule(dbus) { qbluetoothservicediscoveryagent_android.cpp \ qbluetoothsocket_android.cpp \ qbluetoothserver_android.cpp \ - qlowenergycontrollernew_p.cpp + qlowenergycontroller_p.cpp } else { message("Unsupported Bluetooth platform, will not build a working QtBluetooth library.") @@ -157,7 +157,7 @@ config_bluez:qtHaveModule(dbus) { qbluetoothservicediscoveryagent_p.cpp \ qbluetoothsocket_p.cpp \ qbluetoothserver_p.cpp \ - qlowenergycontrollernew_p.cpp + qlowenergycontroller_p.cpp } OTHER_FILES += diff --git a/src/bluetooth/qbluetoothsocket.h b/src/bluetooth/qbluetoothsocket.h index f0c45c0e..9f56764f 100644 --- a/src/bluetooth/qbluetoothsocket.h +++ b/src/bluetooth/qbluetoothsocket.h @@ -162,7 +162,7 @@ protected: private: Q_PRIVATE_SLOT(d_func(), void _q_readNotify()) Q_PRIVATE_SLOT(d_func(), void _q_writeNotify()) - friend class QLowEnergyControllerNewPrivate; + friend class QLowEnergyControllerPrivate; }; #ifndef QT_NO_DEBUG_STREAM diff --git a/src/bluetooth/qlowenergycharacteristic.h b/src/bluetooth/qlowenergycharacteristic.h index 5ed3dc55..1c30a939 100644 --- a/src/bluetooth/qlowenergycharacteristic.h +++ b/src/bluetooth/qlowenergycharacteristic.h @@ -98,7 +98,7 @@ protected: QSharedPointer<QLowEnergyServicePrivate> d_ptr; friend class QLowEnergyService; - friend class QLowEnergyControllerNewPrivate; + friend class QLowEnergyControllerPrivate; QLowEnergyCharacteristicPrivate *data; QLowEnergyCharacteristic(QSharedPointer<QLowEnergyServicePrivate> p, QLowEnergyHandle handle); diff --git a/src/bluetooth/qlowenergycontrollernew.cpp b/src/bluetooth/qlowenergycontroller.cpp index 3b499d3b..32fbd37e 100644 --- a/src/bluetooth/qlowenergycontrollernew.cpp +++ b/src/bluetooth/qlowenergycontroller.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qlowenergycontrollernew.h" -#include "qlowenergycontrollernew_p.h" +#include "qlowenergycontroller.h" +#include "qlowenergycontroller_p.h" #include <QtBluetooth/QBluetoothLocalDevice> @@ -48,32 +48,32 @@ QT_BEGIN_NAMESPACE -void QLowEnergyControllerNewPrivate::setError( - QLowEnergyControllerNew::Error newError) +void QLowEnergyControllerPrivate::setError( + QLowEnergyController::Error newError) { - Q_Q(QLowEnergyControllerNew); + Q_Q(QLowEnergyController); error = newError; switch (newError) { - case QLowEnergyControllerNew::UnknownRemoteDeviceError: - errorString = QLowEnergyControllerNew::tr("Remote device cannot be found"); + case QLowEnergyController::UnknownRemoteDeviceError: + errorString = QLowEnergyController::tr("Remote device cannot be found"); break; - case QLowEnergyControllerNew::InvalidBluetoothAdapterError: - errorString = QLowEnergyControllerNew::tr("Cannot find local adapter"); + case QLowEnergyController::InvalidBluetoothAdapterError: + errorString = QLowEnergyController::tr("Cannot find local adapter"); break; - case QLowEnergyControllerNew::NetworkError: - errorString = QLowEnergyControllerNew::tr("Error occurred during connection I/O"); + case QLowEnergyController::NetworkError: + errorString = QLowEnergyController::tr("Error occurred during connection I/O"); break; - case QLowEnergyControllerNew::UnknownError: + case QLowEnergyController::UnknownError: default: - errorString = QLowEnergyControllerNew::tr("Unknown Error"); + errorString = QLowEnergyController::tr("Unknown Error"); break; } emit q->error(newError); } -bool QLowEnergyControllerNewPrivate::isValidLocalAdapter() +bool QLowEnergyControllerPrivate::isValidLocalAdapter() { if (localAdapter.isNull()) return false; @@ -91,10 +91,10 @@ bool QLowEnergyControllerNewPrivate::isValidLocalAdapter() return adapterFound; } -void QLowEnergyControllerNewPrivate::setState( - QLowEnergyControllerNew::ControllerState newState) +void QLowEnergyControllerPrivate::setState( + QLowEnergyController::ControllerState newState) { - Q_Q(QLowEnergyControllerNew); + Q_Q(QLowEnergyController); if (state == newState) return; @@ -102,7 +102,7 @@ void QLowEnergyControllerNewPrivate::setState( emit q->stateChanged(state); } -void QLowEnergyControllerNewPrivate::invalidateServices() +void QLowEnergyControllerPrivate::invalidateServices() { foreach (const QSharedPointer<QLowEnergyServicePrivate> service, serviceList.values()) { service->setController(0); @@ -112,7 +112,7 @@ void QLowEnergyControllerNewPrivate::invalidateServices() serviceList.clear(); } -QSharedPointer<QLowEnergyServicePrivate> QLowEnergyControllerNewPrivate::serviceForHandle( +QSharedPointer<QLowEnergyServicePrivate> QLowEnergyControllerPrivate::serviceForHandle( QLowEnergyHandle handle) { foreach (QSharedPointer<QLowEnergyServicePrivate> service, serviceList.values()) @@ -126,7 +126,7 @@ QSharedPointer<QLowEnergyServicePrivate> QLowEnergyControllerNewPrivate::service Returns a valid characteristic if the given handle is the handle of the characteristic itself or one of its descriptors */ -QLowEnergyCharacteristic QLowEnergyControllerNewPrivate::characteristicForHandle( +QLowEnergyCharacteristic QLowEnergyControllerPrivate::characteristicForHandle( QLowEnergyHandle handle) { QSharedPointer<QLowEnergyServicePrivate> service = serviceForHandle(handle); @@ -157,7 +157,7 @@ QLowEnergyCharacteristic QLowEnergyControllerNewPrivate::characteristicForHandle Returns a valid descriptor if \a handle blongs to a descriptor; otherwise an invalid one. */ -QLowEnergyDescriptor QLowEnergyControllerNewPrivate::descriptorForHandle( +QLowEnergyDescriptor QLowEnergyControllerPrivate::descriptorForHandle( QLowEnergyHandle handle) { const QLowEnergyCharacteristic matchingChar = characteristicForHandle(handle); @@ -174,7 +174,7 @@ QLowEnergyDescriptor QLowEnergyControllerNewPrivate::descriptorForHandle( return QLowEnergyDescriptor(); } -void QLowEnergyControllerNewPrivate::updateValueOfCharacteristic( +void QLowEnergyControllerPrivate::updateValueOfCharacteristic( QLowEnergyHandle charHandle, const QByteArray &value) { QSharedPointer<QLowEnergyServicePrivate> service = serviceForHandle(charHandle); @@ -182,7 +182,7 @@ void QLowEnergyControllerNewPrivate::updateValueOfCharacteristic( service->characteristicList[charHandle].value = value; } -void QLowEnergyControllerNewPrivate::updateValueOfDescriptor( +void QLowEnergyControllerPrivate::updateValueOfDescriptor( QLowEnergyHandle charHandle, QLowEnergyHandle descriptorHandle, const QByteArray &value) { @@ -196,30 +196,30 @@ void QLowEnergyControllerNewPrivate::updateValueOfDescriptor( service->characteristicList[charHandle].descriptorList[descriptorHandle].value = value; } -QLowEnergyControllerNew::QLowEnergyControllerNew( +QLowEnergyController::QLowEnergyController( const QBluetoothAddress &remoteDevice, QObject *parent) - : QObject(parent), d_ptr(new QLowEnergyControllerNewPrivate()) + : QObject(parent), d_ptr(new QLowEnergyControllerPrivate()) { - Q_D(QLowEnergyControllerNew); + Q_D(QLowEnergyController); d->q_ptr = this; d->remoteDevice = remoteDevice; d->localAdapter = QBluetoothLocalDevice().address(); } -QLowEnergyControllerNew::QLowEnergyControllerNew( +QLowEnergyController::QLowEnergyController( const QBluetoothAddress &remoteDevice, const QBluetoothAddress &localDevice, QObject *parent) - : QObject(parent), d_ptr(new QLowEnergyControllerNewPrivate()) + : QObject(parent), d_ptr(new QLowEnergyControllerPrivate()) { - Q_D(QLowEnergyControllerNew); + Q_D(QLowEnergyController); d->q_ptr = this; d->remoteDevice = remoteDevice; d->localAdapter = localDevice; } -QLowEnergyControllerNew::~QLowEnergyControllerNew() +QLowEnergyController::~QLowEnergyController() { disconnectFromDevice(); //in case we were connected delete d_ptr; @@ -235,66 +235,66 @@ QLowEnergyControllerNew::~QLowEnergyControllerNew() \sa QBluetoothAddress::isNull() */ -QBluetoothAddress QLowEnergyControllerNew::localAddress() const +QBluetoothAddress QLowEnergyController::localAddress() const { return d_ptr->localAdapter; } -QBluetoothAddress QLowEnergyControllerNew::remoteAddress() const +QBluetoothAddress QLowEnergyController::remoteAddress() const { return d_ptr->remoteDevice; } -QLowEnergyControllerNew::ControllerState QLowEnergyControllerNew::state() const +QLowEnergyController::ControllerState QLowEnergyController::state() const { return d_ptr->state; } -void QLowEnergyControllerNew::connectToDevice() +void QLowEnergyController::connectToDevice() { - Q_D(QLowEnergyControllerNew); + Q_D(QLowEnergyController); if (!d->isValidLocalAdapter()) { - d->setError(QLowEnergyControllerNew::InvalidBluetoothAdapterError); + d->setError(QLowEnergyController::InvalidBluetoothAdapterError); return; } - if (state() != QLowEnergyControllerNew::UnconnectedState) + if (state() != QLowEnergyController::UnconnectedState) return; d->connectToDevice(); } -void QLowEnergyControllerNew::disconnectFromDevice() +void QLowEnergyController::disconnectFromDevice() { - Q_D(QLowEnergyControllerNew); + Q_D(QLowEnergyController); - if (state() == QLowEnergyControllerNew::UnconnectedState) + if (state() == QLowEnergyController::UnconnectedState) return; d->invalidateServices(); d->disconnectFromDevice(); } -void QLowEnergyControllerNew::discoverServices() +void QLowEnergyController::discoverServices() { - Q_D(QLowEnergyControllerNew); + Q_D(QLowEnergyController); - if (d->state != QLowEnergyControllerNew::ConnectedState) + if (d->state != QLowEnergyController::ConnectedState) return; d->discoverServices(); } -QList<QBluetoothUuid> QLowEnergyControllerNew::services() const +QList<QBluetoothUuid> QLowEnergyController::services() const { return d_ptr->serviceList.keys(); } -QLowEnergyService *QLowEnergyControllerNew::createServiceObject( +QLowEnergyService *QLowEnergyController::createServiceObject( const QBluetoothUuid &serviceUuid, QObject *parent) { - Q_D(QLowEnergyControllerNew); + Q_D(QLowEnergyController); if (!d->serviceList.contains(serviceUuid)) return 0; @@ -304,12 +304,12 @@ QLowEnergyService *QLowEnergyControllerNew::createServiceObject( return service; } -QLowEnergyControllerNew::Error QLowEnergyControllerNew::error() const +QLowEnergyController::Error QLowEnergyController::error() const { return d_ptr->error; } -QString QLowEnergyControllerNew::errorString() const +QString QLowEnergyController::errorString() const { return d_ptr->errorString; } diff --git a/src/bluetooth/qlowenergycontrollernew.h b/src/bluetooth/qlowenergycontroller.h index 75e5fa73..27421cf1 100644 --- a/src/bluetooth/qlowenergycontrollernew.h +++ b/src/bluetooth/qlowenergycontroller.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QLOWENERGYCONTROLLERNEW_H -#define QLOWENERGYCONTROLLERNEW_H +#ifndef QLOWENERGYCONTROLLER_H +#define QLOWENERGYCONTROLLER_H #include <QObject> #include <QtBluetooth/QBluetoothAddress> @@ -49,8 +49,8 @@ QT_BEGIN_NAMESPACE -class QLowEnergyControllerNewPrivate; -class Q_BLUETOOTH_EXPORT QLowEnergyControllerNew : public QObject +class QLowEnergyControllerPrivate; +class Q_BLUETOOTH_EXPORT QLowEnergyController : public QObject { Q_OBJECT public: @@ -69,12 +69,12 @@ public: ClosingState, }; - explicit QLowEnergyControllerNew(const QBluetoothAddress &remoteDevice, + explicit QLowEnergyController(const QBluetoothAddress &remoteDevice, QObject *parent = 0); - explicit QLowEnergyControllerNew(const QBluetoothAddress &remoteDevice, + explicit QLowEnergyController(const QBluetoothAddress &remoteDevice, const QBluetoothAddress &localDevice, QObject *parent = 0); - ~QLowEnergyControllerNew(); + ~QLowEnergyController(); QBluetoothAddress localAddress() const; QBluetoothAddress remoteAddress() const; @@ -96,17 +96,17 @@ public: Q_SIGNALS: void connected(); void disconnected(); - void stateChanged(QLowEnergyControllerNew::ControllerState state); - void error(QLowEnergyControllerNew::Error newError); + void stateChanged(QLowEnergyController::ControllerState state); + void error(QLowEnergyController::Error newError); void serviceDiscovered(const QBluetoothUuid &newService); void discoveryFinished(); private: - Q_DECLARE_PRIVATE(QLowEnergyControllerNew) - QLowEnergyControllerNewPrivate *d_ptr; + Q_DECLARE_PRIVATE(QLowEnergyController) + QLowEnergyControllerPrivate *d_ptr; }; QT_END_NAMESPACE -#endif // QLOWENERGYCONTROLLERNEW_H +#endif // QLOWENERGYCONTROLLER_H diff --git a/src/bluetooth/qlowenergycontrollernew_bluez.cpp b/src/bluetooth/qlowenergycontroller_bluez.cpp index e613bc05..f95e6a62 100644 --- a/src/bluetooth/qlowenergycontrollernew_bluez.cpp +++ b/src/bluetooth/qlowenergycontroller_bluez.cpp @@ -40,7 +40,7 @@ ** ****************************************************************************/ -#include "qlowenergycontrollernew_p.h" +#include "qlowenergycontroller_p.h" #include "qbluetoothsocket_p.h" #include <QtCore/QLoggingCategory> @@ -180,23 +180,23 @@ static void dumpErrorInformation(const QByteArray &response) << "handle:" << handle; } -QLowEnergyControllerNewPrivate::QLowEnergyControllerNewPrivate() +QLowEnergyControllerPrivate::QLowEnergyControllerPrivate() : QObject(), - state(QLowEnergyControllerNew::UnconnectedState), - error(QLowEnergyControllerNew::NoError), + state(QLowEnergyController::UnconnectedState), + error(QLowEnergyController::NoError), l2cpSocket(0), requestPending(false), mtuSize(ATT_DEFAULT_LE_MTU) { qRegisterMetaType<QList<QLowEnergyHandle> >(); } -QLowEnergyControllerNewPrivate::~QLowEnergyControllerNewPrivate() +QLowEnergyControllerPrivate::~QLowEnergyControllerPrivate() { } -void QLowEnergyControllerNewPrivate::connectToDevice() +void QLowEnergyControllerPrivate::connectToDevice() { - setState(QLowEnergyControllerNew::ConnectingState); + setState(QLowEnergyController::ConnectingState); if (l2cpSocket) delete l2cpSocket; @@ -213,7 +213,7 @@ void QLowEnergyControllerNewPrivate::connectToDevice() int sockfd = l2cpSocket->socketDescriptor(); if (sockfd < 0) { qCWarning(QT_BT_BLUEZ) << "l2cp socket not initialised"; - setError(QLowEnergyControllerNew::UnknownError); + setError(QLowEnergyController::UnknownError); return; } @@ -226,7 +226,7 @@ void QLowEnergyControllerNewPrivate::connectToDevice() if (::bind(sockfd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { qCWarning(QT_BT_BLUEZ) << qt_error_string(errno); - setError(QLowEnergyControllerNew::UnknownError); + setError(QLowEnergyController::UnknownError); return; } @@ -234,39 +234,39 @@ void QLowEnergyControllerNewPrivate::connectToDevice() l2cpSocket->connectToService(remoteDevice, ATTRIBUTE_CHANNEL_ID); } -void QLowEnergyControllerNewPrivate::l2cpConnected() +void QLowEnergyControllerPrivate::l2cpConnected() { - Q_Q(QLowEnergyControllerNew); + Q_Q(QLowEnergyController); exchangeMTU(); - setState(QLowEnergyControllerNew::ConnectedState); + setState(QLowEnergyController::ConnectedState); emit q->connected(); } -void QLowEnergyControllerNewPrivate::disconnectFromDevice() +void QLowEnergyControllerPrivate::disconnectFromDevice() { - setState(QLowEnergyControllerNew::ClosingState); + setState(QLowEnergyController::ClosingState); l2cpSocket->close(); } -void QLowEnergyControllerNewPrivate::l2cpDisconnected() +void QLowEnergyControllerPrivate::l2cpDisconnected() { - Q_Q(QLowEnergyControllerNew); + Q_Q(QLowEnergyController); - setState(QLowEnergyControllerNew::UnconnectedState); + setState(QLowEnergyController::UnconnectedState); emit q->disconnected(); } -void QLowEnergyControllerNewPrivate::l2cpErrorChanged(QBluetoothSocket::SocketError e) +void QLowEnergyControllerPrivate::l2cpErrorChanged(QBluetoothSocket::SocketError e) { switch (e) { case QBluetoothSocket::HostNotFoundError: - setError(QLowEnergyControllerNew::UnknownRemoteDeviceError); + setError(QLowEnergyController::UnknownRemoteDeviceError); qCDebug(QT_BT_BLUEZ) << "The passed remote device address cannot be found"; break; case QBluetoothSocket::NetworkError: - setError(QLowEnergyControllerNew::NetworkError); + setError(QLowEnergyController::NetworkError); qCDebug(QT_BT_BLUEZ) << "Network IO error while talking to LE device"; break; case QBluetoothSocket::UnknownSocketError: @@ -277,15 +277,15 @@ void QLowEnergyControllerNewPrivate::l2cpErrorChanged(QBluetoothSocket::SocketEr // these errors shouldn't happen -> as it means // the code in this file has bugs qCDebug(QT_BT_BLUEZ) << "Unknown l2cp socket error: " << e << l2cpSocket->errorString(); - setError(QLowEnergyControllerNew::UnknownError); + setError(QLowEnergyController::UnknownError); break; } invalidateServices(); - setState(QLowEnergyControllerNew::UnconnectedState); + setState(QLowEnergyController::UnconnectedState); } -void QLowEnergyControllerNewPrivate::l2cpReadyRead() +void QLowEnergyControllerPrivate::l2cpReadyRead() { const QByteArray reply = l2cpSocket->readAll(); qCDebug(QT_BT_BLUEZ) << "Received size:" << reply.size() << "data:" << reply.toHex(); @@ -331,7 +331,7 @@ void QLowEnergyControllerNewPrivate::l2cpReadyRead() sendNextPendingRequest(); } -void QLowEnergyControllerNewPrivate::sendCommand(const QByteArray &packet) +void QLowEnergyControllerPrivate::sendCommand(const QByteArray &packet) { qint64 result = l2cpSocket->write(packet.constData(), packet.size()); @@ -339,11 +339,11 @@ void QLowEnergyControllerNewPrivate::sendCommand(const QByteArray &packet) qCDebug(QT_BT_BLUEZ) << "Cannot write L2CP command:" << hex << packet.toHex() << l2cpSocket->errorString(); - setError(QLowEnergyControllerNew::NetworkError); + setError(QLowEnergyController::NetworkError); } } -void QLowEnergyControllerNewPrivate::sendNextPendingRequest() +void QLowEnergyControllerPrivate::sendNextPendingRequest() { if (openRequests.isEmpty() || requestPending) return; @@ -356,10 +356,10 @@ void QLowEnergyControllerNewPrivate::sendNextPendingRequest() sendCommand(request.payload); } -void QLowEnergyControllerNewPrivate::processReply( +void QLowEnergyControllerPrivate::processReply( const Request &request, const QByteArray &response) { - Q_Q(QLowEnergyControllerNew); + Q_Q(QLowEnergyController); quint8 command = response.constData()[0]; @@ -687,12 +687,12 @@ void QLowEnergyControllerNewPrivate::processReply( } } -void QLowEnergyControllerNewPrivate::discoverServices() +void QLowEnergyControllerPrivate::discoverServices() { sendReadByGroupRequest(0x0001, 0xFFFF); } -void QLowEnergyControllerNewPrivate::sendReadByGroupRequest( +void QLowEnergyControllerPrivate::sendReadByGroupRequest( QLowEnergyHandle start, QLowEnergyHandle end) { //call for primary services @@ -716,7 +716,7 @@ void QLowEnergyControllerNewPrivate::sendReadByGroupRequest( sendNextPendingRequest(); } -void QLowEnergyControllerNewPrivate::discoverServiceDetails(const QBluetoothUuid &service) +void QLowEnergyControllerPrivate::discoverServiceDetails(const QBluetoothUuid &service) { if (!serviceList.contains(service)) { qCWarning(QT_BT_BLUEZ) << "Discovery of unknown service" << service.toString() @@ -729,7 +729,7 @@ void QLowEnergyControllerNewPrivate::discoverServiceDetails(const QBluetoothUuid sendReadByTypeRequest(serviceData, serviceData->startHandle); } -void QLowEnergyControllerNewPrivate::sendReadByTypeRequest( +void QLowEnergyControllerPrivate::sendReadByTypeRequest( QSharedPointer<QLowEnergyServicePrivate> serviceData, QLowEnergyHandle nextHandle) { @@ -763,7 +763,7 @@ void QLowEnergyControllerNewPrivate::sendReadByTypeRequest( \a readCharacteristics determines whether we intend to read a characteristic; otherwise we read a descriptor. */ -void QLowEnergyControllerNewPrivate::readServiceValues( +void QLowEnergyControllerPrivate::readServiceValues( const QBluetoothUuid &serviceUuid, bool readCharacteristics) { // TODO Long charactertistic value reads not yet supported (larger than MTU) @@ -846,7 +846,7 @@ void QLowEnergyControllerNewPrivate::readServiceValues( sendNextPendingRequest(); } -void QLowEnergyControllerNewPrivate::discoverServiceDescriptors( +void QLowEnergyControllerPrivate::discoverServiceDescriptors( const QBluetoothUuid &serviceUuid) { qCDebug(QT_BT_BLUEZ) << "Discovering descriptor values for" @@ -866,7 +866,7 @@ void QLowEnergyControllerNewPrivate::discoverServiceDescriptors( discoverNextDescriptor(service, keys, keys[0]); } -void QLowEnergyControllerNewPrivate::processUnsolicitedReply(const QByteArray &payload) +void QLowEnergyControllerPrivate::processUnsolicitedReply(const QByteArray &payload) { const char *data = payload.constData(); bool isNotification = (data[0] == ATT_OP_HANDLE_VAL_NOTIFICATION); @@ -890,7 +890,7 @@ void QLowEnergyControllerNewPrivate::processUnsolicitedReply(const QByteArray &p } } -void QLowEnergyControllerNewPrivate::exchangeMTU() +void QLowEnergyControllerPrivate::exchangeMTU() { qCDebug(QT_BT_BLUEZ) << "Exchanging MTU"; @@ -909,7 +909,7 @@ void QLowEnergyControllerNewPrivate::exchangeMTU() sendNextPendingRequest(); } -void QLowEnergyControllerNewPrivate::discoverNextDescriptor( +void QLowEnergyControllerPrivate::discoverNextDescriptor( QSharedPointer<QLowEnergyServicePrivate> serviceData, const QList<QLowEnergyHandle> pendingCharHandles, const QLowEnergyHandle startingHandle) @@ -946,7 +946,7 @@ void QLowEnergyControllerNewPrivate::discoverNextDescriptor( sendNextPendingRequest(); } -void QLowEnergyControllerNewPrivate::writeCharacteristic( +void QLowEnergyControllerPrivate::writeCharacteristic( const QSharedPointer<QLowEnergyServicePrivate> service, const QLowEnergyHandle charHandle, const QByteArray &newValue) @@ -983,7 +983,7 @@ void QLowEnergyControllerNewPrivate::writeCharacteristic( sendNextPendingRequest(); } -void QLowEnergyControllerNewPrivate::writeDescriptor( +void QLowEnergyControllerPrivate::writeDescriptor( const QSharedPointer<QLowEnergyServicePrivate> service, const QLowEnergyHandle charHandle, const QLowEnergyHandle descriptorHandle, diff --git a/src/bluetooth/qlowenergycontrollernew_p.cpp b/src/bluetooth/qlowenergycontroller_p.cpp index ca074e9a..a903494d 100644 --- a/src/bluetooth/qlowenergycontrollernew_p.cpp +++ b/src/bluetooth/qlowenergycontroller_p.cpp @@ -39,42 +39,42 @@ ** ****************************************************************************/ -#include "qlowenergycontrollernew_p.h" +#include "qlowenergycontroller_p.h" QT_BEGIN_NAMESPACE -QLowEnergyControllerNewPrivate::QLowEnergyControllerNewPrivate() +QLowEnergyControllerPrivate::QLowEnergyControllerPrivate() : QObject(), - state(QLowEnergyControllerNew::UnconnectedState), - error(QLowEnergyControllerNew::NoError) + state(QLowEnergyController::UnconnectedState), + error(QLowEnergyController::NoError) { } -QLowEnergyControllerNewPrivate::~QLowEnergyControllerNewPrivate() +QLowEnergyControllerPrivate::~QLowEnergyControllerPrivate() { } -void QLowEnergyControllerNewPrivate::connectToDevice() +void QLowEnergyControllerPrivate::connectToDevice() { - setError(QLowEnergyControllerNew::UnknownError); + setError(QLowEnergyController::UnknownError); } -void QLowEnergyControllerNewPrivate::disconnectFromDevice() +void QLowEnergyControllerPrivate::disconnectFromDevice() { } -void QLowEnergyControllerNewPrivate::discoverServices() +void QLowEnergyControllerPrivate::discoverServices() { } -void QLowEnergyControllerNewPrivate::discoverServiceDetails(const QBluetoothUuid &/*service*/) +void QLowEnergyControllerPrivate::discoverServiceDetails(const QBluetoothUuid &/*service*/) { } -void QLowEnergyControllerNewPrivate::writeCharacteristic( +void QLowEnergyControllerPrivate::writeCharacteristic( const QSharedPointer<QLowEnergyServicePrivate> /*service*/, const QLowEnergyHandle /*charHandle*/, const QByteArray &/*newValue*/) @@ -82,7 +82,7 @@ void QLowEnergyControllerNewPrivate::writeCharacteristic( } -void QLowEnergyControllerNewPrivate::writeDescriptor( +void QLowEnergyControllerPrivate::writeDescriptor( const QSharedPointer<QLowEnergyServicePrivate> service, const QLowEnergyHandle charHandle, const QLowEnergyHandle descriptorHandle, diff --git a/src/bluetooth/qlowenergycontrollernew_p.h b/src/bluetooth/qlowenergycontroller_p.h index d51f04f0..e00e7a87 100644 --- a/src/bluetooth/qlowenergycontrollernew_p.h +++ b/src/bluetooth/qlowenergycontroller_p.h @@ -39,13 +39,13 @@ ** ****************************************************************************/ -#ifndef QLOWENERGYCONTROLLERNEWPRIVATE_P_H -#define QLOWENERGYCONTROLLERNEWPRIVATE_P_H +#ifndef QLOWENERGYCONTROLLERPRIVATE_P_H +#define QLOWENERGYCONTROLLERPRIVATE_P_H #include <qglobal.h> #include <QtCore/QQueue> #include <QtBluetooth/qbluetooth.h> -#include "qlowenergycontrollernew.h" +#include "qlowenergycontroller.h" #include "qlowenergyserviceprivate_p.h" #if defined(QT_BLUEZ_BLUETOOTH) && !defined(QT_BLUEZ_NO_BTLE) @@ -56,18 +56,18 @@ QT_BEGIN_NAMESPACE typedef QMap<QBluetoothUuid, QSharedPointer<QLowEnergyServicePrivate> > ServiceDataMap; -class QLowEnergyControllerNewPrivate : public QObject +class QLowEnergyControllerPrivate : public QObject { Q_OBJECT - Q_DECLARE_PUBLIC(QLowEnergyControllerNew) + Q_DECLARE_PUBLIC(QLowEnergyController) public: - QLowEnergyControllerNewPrivate(); - ~QLowEnergyControllerNewPrivate(); + QLowEnergyControllerPrivate(); + ~QLowEnergyControllerPrivate(); - void setError(QLowEnergyControllerNew::Error newError); + void setError(QLowEnergyController::Error newError); bool isValidLocalAdapter(); - void setState(QLowEnergyControllerNew::ControllerState newState); + void setState(QLowEnergyController::ControllerState newState); void connectToDevice(); void disconnectFromDevice(); @@ -105,8 +105,8 @@ public: QBluetoothAddress remoteDevice; QBluetoothAddress localAdapter; - QLowEnergyControllerNew::ControllerState state; - QLowEnergyControllerNew::Error error; + QLowEnergyController::ControllerState state; + QLowEnergyController::Error error; QString errorString; @@ -153,9 +153,9 @@ private slots: void l2cpReadyRead(); #endif private: - QLowEnergyControllerNew *q_ptr; + QLowEnergyController *q_ptr; }; QT_END_NAMESPACE -#endif // QLOWENERGYCONTROLLERNEWPRIVATE_P_H +#endif // QLOWENERGYCONTROLLERPRIVATE_P_H diff --git a/src/bluetooth/qlowenergydescriptor.h b/src/bluetooth/qlowenergydescriptor.h index 0cf78d4c..2c0a3296 100644 --- a/src/bluetooth/qlowenergydescriptor.h +++ b/src/bluetooth/qlowenergydescriptor.h @@ -80,7 +80,7 @@ protected: friend class QLowEnergyCharacteristic; friend class QLowEnergyService; - friend class QLowEnergyControllerNewPrivate; + friend class QLowEnergyControllerPrivate; QLowEnergyDescriptorPrivate *data; QLowEnergyDescriptor(QSharedPointer<QLowEnergyServicePrivate> p, diff --git a/src/bluetooth/qlowenergyservice.cpp b/src/bluetooth/qlowenergyservice.cpp index 8c7a7d02..11485183 100644 --- a/src/bluetooth/qlowenergyservice.cpp +++ b/src/bluetooth/qlowenergyservice.cpp @@ -45,7 +45,7 @@ #include <algorithm> -#include "qlowenergycontrollernew_p.h" +#include "qlowenergycontroller_p.h" #include "qlowenergyserviceprivate_p.h" QT_BEGIN_NAMESPACE @@ -53,9 +53,9 @@ QT_BEGIN_NAMESPACE /*! \internal - QLowEnergyControllerNewPrivate creates instances of this class. + QLowEnergyControllerPrivate creates instances of this class. The user gets access to class instances via - \l QLowEnergyControllerNew::services(). + \l QLowEnergyController::services(). */ QLowEnergyService::QLowEnergyService(QSharedPointer<QLowEnergyServicePrivate> p, QObject *parent) diff --git a/src/bluetooth/qlowenergyservice.h b/src/bluetooth/qlowenergyservice.h index fcaf9496..9fe56280 100644 --- a/src/bluetooth/qlowenergyservice.h +++ b/src/bluetooth/qlowenergyservice.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE class QLowEnergyServicePrivate; -class QLowEnergyControllerNewPrivate; +class QLowEnergyControllerPrivate; class Q_BLUETOOTH_EXPORT QLowEnergyService : public QObject { Q_OBJECT @@ -108,8 +108,8 @@ private: Q_DECLARE_PRIVATE(QLowEnergyService) QSharedPointer<QLowEnergyServicePrivate> d_ptr; - // QLowEnergyControllerNew is the factory for this class - friend class QLowEnergyControllerNew; + // QLowEnergyController is the factory for this class + friend class QLowEnergyController; QLowEnergyService(QSharedPointer<QLowEnergyServicePrivate> p, QObject *parent = 0); }; diff --git a/src/bluetooth/qlowenergyserviceprivate.cpp b/src/bluetooth/qlowenergyserviceprivate.cpp index 27a70bf6..4768582d 100644 --- a/src/bluetooth/qlowenergyserviceprivate.cpp +++ b/src/bluetooth/qlowenergyserviceprivate.cpp @@ -55,7 +55,7 @@ QLowEnergyServicePrivate::~QLowEnergyServicePrivate() { } -void QLowEnergyServicePrivate::setController(QLowEnergyControllerNewPrivate *control) +void QLowEnergyServicePrivate::setController(QLowEnergyControllerPrivate *control) { controller = control; diff --git a/src/bluetooth/qlowenergyserviceprivate_p.h b/src/bluetooth/qlowenergyserviceprivate_p.h index 2c118a4f..25b18e2d 100644 --- a/src/bluetooth/qlowenergyserviceprivate_p.h +++ b/src/bluetooth/qlowenergyserviceprivate_p.h @@ -48,7 +48,7 @@ #include <QtBluetooth/QLowEnergyService> #include <QtBluetooth/QLowEnergyCharacteristic> -#include "qlowenergycontrollernew_p.h" +#include "qlowenergycontroller_p.h" QT_BEGIN_NAMESPACE @@ -79,7 +79,7 @@ public: Characteristic = 0x2803 }; - void setController(QLowEnergyControllerNewPrivate* control); + void setController(QLowEnergyControllerPrivate* control); void setError(QLowEnergyService::ServiceError newError); void setState(QLowEnergyService::ServiceState newState); @@ -102,7 +102,7 @@ public: QHash<QLowEnergyHandle, CharData> characteristicList; - QPointer<QLowEnergyControllerNewPrivate> controller; + QPointer<QLowEnergyControllerPrivate> controller; }; QT_END_NAMESPACE 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"; diff --git a/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp b/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp index fa7aa50a..810a8d6a 100644 --- a/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp +++ b/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp @@ -43,7 +43,7 @@ #include <QBluetoothLocalDevice> #include <QBluetoothServiceDiscoveryAgent> #include <QBluetoothUuid> -#include <QLowEnergyControllerNew> +#include <QLowEnergyController> #include <QLowEnergyServiceInfo> #include <QLowEnergyCharacteristic> @@ -201,15 +201,15 @@ void tst_QLowEnergyController::tst_connect() QSKIP("No local Bluetooth or remote BTLE device found. Skipping test."); const QBluetoothAddress localAdapter = localAdapters.at(0).address(); - QLowEnergyControllerNew control(remoteDevice); + QLowEnergyController control(remoteDevice); QSignalSpy connectedSpy(&control, SIGNAL(connected())); QSignalSpy disconnectedSpy(&control, SIGNAL(disconnected())); QCOMPARE(control.localAddress(), localAdapter); QVERIFY(!control.localAddress().isNull()); QCOMPARE(control.remoteAddress(), remoteDevice); - QCOMPARE(control.state(), QLowEnergyControllerNew::UnconnectedState); - QCOMPARE(control.error(), QLowEnergyControllerNew::NoError); + QCOMPARE(control.state(), QLowEnergyController::UnconnectedState); + QCOMPARE(control.error(), QLowEnergyController::NoError); QVERIFY(control.errorString().isEmpty()); QCOMPARE(disconnectedSpy.count(), 0); QCOMPARE(connectedSpy.count(), 0); @@ -217,27 +217,27 @@ void tst_QLowEnergyController::tst_connect() bool wasError = false; control.connectToDevice(); - QTRY_IMPL(control.state() != QLowEnergyControllerNew::ConnectingState, + QTRY_IMPL(control.state() != QLowEnergyController::ConnectingState, 10000); QCOMPARE(disconnectedSpy.count(), 0); - if (control.error() != QLowEnergyControllerNew::NoError) { + if (control.error() != QLowEnergyController::NoError) { //error during connect QCOMPARE(connectedSpy.count(), 0); - QCOMPARE(control.state(), QLowEnergyControllerNew::UnconnectedState); + QCOMPARE(control.state(), QLowEnergyController::UnconnectedState); wasError = true; - } else if (control.state() == QLowEnergyControllerNew::ConnectingState) { + } else if (control.state() == QLowEnergyController::ConnectingState) { //timeout QCOMPARE(connectedSpy.count(), 0); QVERIFY(control.errorString().isEmpty()); - QCOMPARE(control.error(), QLowEnergyControllerNew::NoError); + QCOMPARE(control.error(), QLowEnergyController::NoError); QVERIFY(control.services().isEmpty()); QSKIP("Connection to LE device cannot be established. Skipping test."); return; } else { - QCOMPARE(control.state(), QLowEnergyControllerNew::ConnectedState); + QCOMPARE(control.state(), QLowEnergyController::ConnectedState); QCOMPARE(connectedSpy.count(), 1); - QCOMPARE(control.error(), QLowEnergyControllerNew::NoError); + QCOMPARE(control.error(), QLowEnergyController::NoError); QVERIFY(control.errorString().isEmpty()); } @@ -307,7 +307,7 @@ void tst_QLowEnergyController::tst_connect() // Finish off control.disconnectFromDevice(); QTRY_VERIFY_WITH_TIMEOUT( - control.state() == QLowEnergyControllerNew::UnconnectedState, + control.state() == QLowEnergyController::UnconnectedState, 10000); if (wasError) { @@ -342,34 +342,34 @@ void tst_QLowEnergyController::tst_concurrentDiscovery() QSKIP("No local Bluetooth or remote BTLE device found. Skipping test."); // quick setup - more elaborate test is done by connectNew() - QLowEnergyControllerNew control(remoteDevice); - QCOMPARE(control.state(), QLowEnergyControllerNew::UnconnectedState); - QCOMPARE(control.error(), QLowEnergyControllerNew::NoError); + QLowEnergyController control(remoteDevice); + QCOMPARE(control.state(), QLowEnergyController::UnconnectedState); + QCOMPARE(control.error(), QLowEnergyController::NoError); control.connectToDevice(); { - QTRY_IMPL(control.state() != QLowEnergyControllerNew::ConnectingState, + QTRY_IMPL(control.state() != QLowEnergyController::ConnectingState, 30000); } - if (control.state() == QLowEnergyControllerNew::ConnectingState - || control.error() != QLowEnergyControllerNew::NoError) { + if (control.state() == QLowEnergyController::ConnectingState + || control.error() != QLowEnergyController::NoError) { // default BTLE backend forever hangs in ConnectingState QSKIP("Cannot connect to remote device"); } - QCOMPARE(control.state(), QLowEnergyControllerNew::ConnectedState); + QCOMPARE(control.state(), QLowEnergyController::ConnectedState); // 2. new controller to same device fails { - QLowEnergyControllerNew control2(remoteDevice); + QLowEnergyController control2(remoteDevice); control2.connectToDevice(); { - QTRY_IMPL(control2.state() != QLowEnergyControllerNew::ConnectingState, + QTRY_IMPL(control2.state() != QLowEnergyController::ConnectingState, 30000); } - QVERIFY(control2.error() != QLowEnergyControllerNew::NoError); + QVERIFY(control2.error() != QLowEnergyController::NoError); } /* We are testing that we can run service discovery on the same device @@ -416,7 +416,7 @@ void tst_QLowEnergyController::tst_concurrentDiscovery() } control.disconnectFromDevice(); - QTRY_VERIFY_WITH_TIMEOUT(control.state() == QLowEnergyControllerNew::UnconnectedState, + QTRY_VERIFY_WITH_TIMEOUT(control.state() == QLowEnergyController::UnconnectedState, 30000); discoveryFinishedSpy.clear(); @@ -424,11 +424,11 @@ void tst_QLowEnergyController::tst_concurrentDiscovery() QLowEnergyService *services_second[MAX_SERVICES_SAME_TIME_ACCESS]; control.connectToDevice(); { - QTRY_IMPL(control.state() != QLowEnergyControllerNew::ConnectingState, + QTRY_IMPL(control.state() != QLowEnergyController::ConnectingState, 30000); } - QCOMPARE(control.state(), QLowEnergyControllerNew::ConnectedState); + QCOMPARE(control.state(), QLowEnergyController::ConnectedState); control.discoverServices(); QTRY_VERIFY_WITH_TIMEOUT(discoveryFinishedSpy.count() == 1, 10000); @@ -1424,13 +1424,13 @@ void tst_QLowEnergyController::tst_defaultBehavior() const QBluetoothAddress randomAddress("11:22:33:44:55:66"); // Test automatic detection of local adapter - QLowEnergyControllerNew controlDefaultAdapter(randomAddress); + QLowEnergyController controlDefaultAdapter(randomAddress); QCOMPARE(controlDefaultAdapter.remoteAddress(), randomAddress); - QCOMPARE(controlDefaultAdapter.state(), QLowEnergyControllerNew::UnconnectedState); + QCOMPARE(controlDefaultAdapter.state(), QLowEnergyController::UnconnectedState); if (foundAddresses.isEmpty()) { QVERIFY(controlDefaultAdapter.localAddress().isNull()); } else { - QCOMPARE(controlDefaultAdapter.error(), QLowEnergyControllerNew::NoError); + QCOMPARE(controlDefaultAdapter.error(), QLowEnergyController::NoError); QVERIFY(controlDefaultAdapter.errorString().isEmpty()); QVERIFY(foundAddresses.contains(controlDefaultAdapter.localAddress())); @@ -1447,12 +1447,12 @@ void tst_QLowEnergyController::tst_defaultBehavior() // Test explicit local adapter if (!foundAddresses.isEmpty()) { - QLowEnergyControllerNew controlExplicitAdapter(randomAddress, + QLowEnergyController controlExplicitAdapter(randomAddress, foundAddresses[0]); QCOMPARE(controlExplicitAdapter.remoteAddress(), randomAddress); QCOMPARE(controlExplicitAdapter.localAddress(), foundAddresses[0]); QCOMPARE(controlExplicitAdapter.state(), - QLowEnergyControllerNew::UnconnectedState); + QLowEnergyController::UnconnectedState); QCOMPARE(controlExplicitAdapter.services().count(), 0); // unrelated uuids don't return valid service object @@ -1472,22 +1472,22 @@ void tst_QLowEnergyController::tst_writeCharacteristic() QSKIP("No local Bluetooth or remote BTLE device found. Skipping test."); // quick setup - more elaborate test is done by connect() - QLowEnergyControllerNew control(remoteDevice); - QCOMPARE(control.error(), QLowEnergyControllerNew::NoError); + QLowEnergyController control(remoteDevice); + QCOMPARE(control.error(), QLowEnergyController::NoError); control.connectToDevice(); { - QTRY_IMPL(control.state() != QLowEnergyControllerNew::ConnectingState, + QTRY_IMPL(control.state() != QLowEnergyController::ConnectingState, 30000); } - if (control.state() == QLowEnergyControllerNew::ConnectingState - || control.error() != QLowEnergyControllerNew::NoError) { + if (control.state() == QLowEnergyController::ConnectingState + || control.error() != QLowEnergyController::NoError) { // default BTLE backend forever hangs in ConnectingState QSKIP("Cannot connect to remote device"); } - QCOMPARE(control.state(), QLowEnergyControllerNew::ConnectedState); + QCOMPARE(control.state(), QLowEnergyController::ConnectedState); QSignalSpy discoveryFinishedSpy(&control, SIGNAL(discoveryFinished())); control.discoverServices(); QTRY_VERIFY_WITH_TIMEOUT(discoveryFinishedSpy.count() == 1, 10000); @@ -1614,20 +1614,20 @@ void tst_QLowEnergyController::tst_writeDescriptor() QSKIP("No local Bluetooth or remote BTLE device found. Skipping test."); // quick setup - more elaborate test is done by connect() - QLowEnergyControllerNew control(remoteDevice); + QLowEnergyController control(remoteDevice); control.connectToDevice(); { - QTRY_IMPL(control.state() != QLowEnergyControllerNew::ConnectingState, + QTRY_IMPL(control.state() != QLowEnergyController::ConnectingState, 30000); } - if (control.state() == QLowEnergyControllerNew::ConnectingState - || control.error() != QLowEnergyControllerNew::NoError) { + if (control.state() == QLowEnergyController::ConnectingState + || control.error() != QLowEnergyController::NoError) { // default BTLE backend forever hangs in ConnectingState QSKIP("Cannot connect to remote device"); } - QCOMPARE(control.state(), QLowEnergyControllerNew::ConnectedState); + QCOMPARE(control.state(), QLowEnergyController::ConnectedState); QSignalSpy discoveryFinishedSpy(&control, SIGNAL(discoveryFinished())); control.discoverServices(); QTRY_VERIFY_WITH_TIMEOUT(discoveryFinishedSpy.count() == 1, 10000); diff --git a/tests/auto/qlowenergydescriptor/tst_qlowenergydescriptor.cpp b/tests/auto/qlowenergydescriptor/tst_qlowenergydescriptor.cpp index 41a1d3ac..6156f0cf 100644 --- a/tests/auto/qlowenergydescriptor/tst_qlowenergydescriptor.cpp +++ b/tests/auto/qlowenergydescriptor/tst_qlowenergydescriptor.cpp @@ -47,7 +47,7 @@ #include <QBluetoothServiceDiscoveryAgent> #include <QLowEnergyDescriptor> -#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; }; @@ -114,14 +114,14 @@ void tst_QLowEnergyDescriptor::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"; |