summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2014-07-18 14:01:10 +0200
committerAlex Blasche <alexander.blasche@digia.com>2014-07-23 11:02:30 +0200
commit6ee2c7a095e1408000b02e1f3e1c4bab9359123d (patch)
tree48d244fb58482c2abc69bc7fd42fc512c52e76ba
parentd5731113e912e0df17f19fcdb12b4b6b68256220 (diff)
Further cleanup QLowEnergyServiceInfo
Removes obsolte code from the previos GATT API and other API elements which do not make any sense under the new API anymore. The entire purpose of QLowEnergyServiceInfo is also in question as it doesn't really contain BTLE specifics when compared to QBluetoothServiceInfo. This requires further API evaluation. Change-Id: Idfce724bb58150839f756745b87864054909dedb Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
-rw-r--r--src/bluetooth/bluetooth.pro5
-rw-r--r--src/bluetooth/qlowenergyserviceinfo.cpp26
-rw-r--r--src/bluetooth/qlowenergyserviceinfo.h13
-rw-r--r--src/bluetooth/qlowenergyserviceinfo_bluez.cpp62
-rw-r--r--src/bluetooth/qlowenergyserviceinfo_p.cpp58
-rw-r--r--src/bluetooth/qlowenergyserviceinfo_p.h25
-rw-r--r--src/bluetooth/qlowenergyserviceinfo_qnx.cpp58
-rw-r--r--tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp1
-rw-r--r--tests/auto/qlowenergyserviceinfo/tst_qlowenergyserviceinfo.cpp22
9 files changed, 3 insertions, 267 deletions
diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro
index 74309891..3a01765f 100644
--- a/src/bluetooth/bluetooth.pro
+++ b/src/bluetooth/bluetooth.pro
@@ -91,14 +91,12 @@ config_bluez:qtHaveModule(dbus) {
# old versions of Bluez do not have the required BTLE symbols
config_bluez_le {
SOURCES += \
- qlowenergyserviceinfo_bluez.cpp \
qlowenergycontrollernew_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 += \
- qlowenergyserviceinfo_p.cpp \
qlowenergycontrollernew_p.cpp
}
@@ -125,7 +123,6 @@ config_bluez:qtHaveModule(dbus) {
qbluetoothsocket_qnx.cpp \
qbluetoothserver_qnx.cpp \
qbluetoothtransferreply_qnx.cpp \
- qlowenergyserviceinfo_qnx.cpp \
qlowenergycontrollernew_p.cpp
} else:android:!android-no-sdk {
@@ -148,7 +145,6 @@ config_bluez:qtHaveModule(dbus) {
qbluetoothservicediscoveryagent_android.cpp \
qbluetoothsocket_android.cpp \
qbluetoothserver_android.cpp \
- qlowenergyserviceinfo_p.cpp \
qlowenergycontrollernew_p.cpp
} else {
@@ -161,7 +157,6 @@ config_bluez:qtHaveModule(dbus) {
qbluetoothservicediscoveryagent_p.cpp \
qbluetoothsocket_p.cpp \
qbluetoothserver_p.cpp \
- qlowenergyserviceinfo_p.cpp \
qlowenergycontrollernew_p.cpp
}
diff --git a/src/bluetooth/qlowenergyserviceinfo.cpp b/src/bluetooth/qlowenergyserviceinfo.cpp
index 5ed9690a..572e71d7 100644
--- a/src/bluetooth/qlowenergyserviceinfo.cpp
+++ b/src/bluetooth/qlowenergyserviceinfo.cpp
@@ -1,6 +1,7 @@
/***************************************************************************
**
** Copyright (C) 2013 BlackBerry Limited all rights reserved
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtBluetooth module of the Qt Toolkit.
@@ -137,23 +138,6 @@ QString QLowEnergyServiceInfo::serviceName() const
}
/*!
- Sets service type with \a type.
-*/
-void QLowEnergyServiceInfo::setServiceType(QLowEnergyServiceInfo::ServiceType type)
-{
- d_ptr->serviceType = type;
-}
-
-/*!
- Returns the service type. If setServiceType is not called default service type
- (PrimaryService) is returned.
-*/
-QLowEnergyServiceInfo::ServiceType QLowEnergyServiceInfo::serviceType() const
-{
- return d_ptr->serviceType;
-}
-
-/*!
Returns a copy of \a other and assigns it to this QLowEnergyServiceInfo object.
The two copies continue to share the same service and registration details.
*/
@@ -164,14 +148,6 @@ QLowEnergyServiceInfo &QLowEnergyServiceInfo::operator=(const QLowEnergyServiceI
}
/*!
- Returns \c true if this service is connected; otherwise returns \c false.
- */
-bool QLowEnergyServiceInfo::isConnected() const
-{
- return d_ptr->connected;
-}
-
-/*!
Returns the address of the Bluetooth device that provides this service.
*/
QBluetoothDeviceInfo QLowEnergyServiceInfo::device() const
diff --git a/src/bluetooth/qlowenergyserviceinfo.h b/src/bluetooth/qlowenergyserviceinfo.h
index 626203bf..43ddff30 100644
--- a/src/bluetooth/qlowenergyserviceinfo.h
+++ b/src/bluetooth/qlowenergyserviceinfo.h
@@ -1,6 +1,7 @@
/***************************************************************************
**
** Copyright (C) 2013 BlackBerry Limited all rights reserved
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtBluetooth module of the Qt Toolkit.
@@ -49,17 +50,10 @@
QT_BEGIN_NAMESPACE
class QLowEnergyServiceInfoPrivate;
-class QBluetoothAddress;
class Q_BLUETOOTH_EXPORT QLowEnergyServiceInfo
{
- friend class QLowEnergyControllerPrivate;
public:
- enum ServiceType {
- PrimaryService = 0x00000001,
- IncludedService = 0x00000002
- };
-
QLowEnergyServiceInfo();
QLowEnergyServiceInfo(const QBluetoothUuid &uuid);
QLowEnergyServiceInfo(const QLowEnergyServiceInfo &other);
@@ -75,11 +69,6 @@ public:
QString serviceName() const;
- void setServiceType(QLowEnergyServiceInfo::ServiceType type);
- QLowEnergyServiceInfo::ServiceType serviceType() const;
-
- bool isConnected() const;
-
bool isValid() const;
protected:
diff --git a/src/bluetooth/qlowenergyserviceinfo_bluez.cpp b/src/bluetooth/qlowenergyserviceinfo_bluez.cpp
deleted file mode 100644
index 5946205d..00000000
--- a/src/bluetooth/qlowenergyserviceinfo_bluez.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2013 BlackBerry Limited all rights reserved
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtBluetooth module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qlowenergyserviceinfo_p.h"
-#include "qlowenergyserviceinfo.h"
-
-#ifdef QT_LOWENERGYSERVICE_DEBUG
-#include <QtCore/QDebug>
-#endif
-
-QT_BEGIN_NAMESPACE
-
-QLowEnergyServiceInfoPrivate::QLowEnergyServiceInfoPrivate():
- serviceType(QLowEnergyServiceInfo::PrimaryService), connected(false),
- m_valueCounter(0), m_readCounter(0)
-{
- m_step = 0;
-}
-
-QLowEnergyServiceInfoPrivate::~QLowEnergyServiceInfoPrivate()
-{
-}
-
-QT_END_NAMESPACE
diff --git a/src/bluetooth/qlowenergyserviceinfo_p.cpp b/src/bluetooth/qlowenergyserviceinfo_p.cpp
deleted file mode 100644
index 89198be3..00000000
--- a/src/bluetooth/qlowenergyserviceinfo_p.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2013 BlackBerry Limited. All rights reserved.
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtBluetooth module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qlowenergyserviceinfo_p.h"
-
-QT_BEGIN_NAMESPACE
-
-QLowEnergyServiceInfoPrivate::QLowEnergyServiceInfoPrivate()
- : serviceType(QLowEnergyServiceInfo::PrimaryService),
- connected(false)
-{
-
-}
-
-QLowEnergyServiceInfoPrivate::~QLowEnergyServiceInfoPrivate()
-{
-
-}
-
-QT_END_NAMESPACE
diff --git a/src/bluetooth/qlowenergyserviceinfo_p.h b/src/bluetooth/qlowenergyserviceinfo_p.h
index fcdb0555..6d1d3c73 100644
--- a/src/bluetooth/qlowenergyserviceinfo_p.h
+++ b/src/bluetooth/qlowenergyserviceinfo_p.h
@@ -1,6 +1,7 @@
/***************************************************************************
**
** Copyright (C) 2013 BlackBerry Limited all rights reserved
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtBluetooth module of the Qt Toolkit.
@@ -41,39 +42,15 @@
#ifndef QLOWENERGYSERVICEINFO_P_H
#define QLOWENERGYSERVICEINFO_P_H
-#include "qbluetoothuuid.h"
#include "qlowenergyserviceinfo.h"
-#include <QPointer>
QT_BEGIN_NAMESPACE
-class QBluetoothUuid;
-class QLowEnergyServiceInfo;
-
class QLowEnergyServiceInfoPrivate
{
- friend class QLowEnergyControllerPrivate;
-
public:
- QLowEnergyServiceInfoPrivate();
- ~QLowEnergyServiceInfoPrivate();
-
QBluetoothUuid uuid;
-
- QLowEnergyServiceInfo::ServiceType serviceType;
- bool connected;
QBluetoothDeviceInfo deviceInfo;
-#if defined(QT_BLUEZ_BLUETOOTH) && !defined(QT_BLUEZ_NO_BTLE)
- QString startingHandle;
- QString endingHandle;
-#endif
-
-private:
-#if defined(QT_BLUEZ_BLUETOOTH) && !defined(QT_BLUEZ_NO_BTLE)
- int m_step;
- int m_valueCounter;
- int m_readCounter;
-#endif
};
QT_END_NAMESPACE
diff --git a/src/bluetooth/qlowenergyserviceinfo_qnx.cpp b/src/bluetooth/qlowenergyserviceinfo_qnx.cpp
deleted file mode 100644
index 26d0e9d9..00000000
--- a/src/bluetooth/qlowenergyserviceinfo_qnx.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2013 BlackBerry Limited. All rights reserved.
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtBluetooth module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qlowenergyserviceinfo_p.h"
-
-QT_BEGIN_NAMESPACE
-
-Q_DECLARE_LOGGING_CATEGORY(QT_BT_QNX);
-
-QLowEnergyServiceInfoPrivate::QLowEnergyServiceInfoPrivate()
-{
-
-}
-
-QLowEnergyServiceInfoPrivate::~QLowEnergyServiceInfoPrivate()
-{
-
-}
-
-QT_END_NAMESPACE
diff --git a/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp b/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp
index 3d501351..fa7aa50a 100644
--- a/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp
+++ b/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp
@@ -179,7 +179,6 @@ void tst_QLowEnergyController::tst_verifyAllServices()
QVERIFY(uuids.contains(info.serviceUuid()));
//QVERIFY(!info.isConnected());
QVERIFY(info.isValid());
- QCOMPARE(QLowEnergyServiceInfo::PrimaryService, info.serviceType());
QBluetoothUuid u = info.serviceUuid();
bool ok = false;
quint16 clsId = u.toUInt16(&ok);
diff --git a/tests/auto/qlowenergyserviceinfo/tst_qlowenergyserviceinfo.cpp b/tests/auto/qlowenergyserviceinfo/tst_qlowenergyserviceinfo.cpp
index e908ae97..ae9b3bd8 100644
--- a/tests/auto/qlowenergyserviceinfo/tst_qlowenergyserviceinfo.cpp
+++ b/tests/auto/qlowenergyserviceinfo/tst_qlowenergyserviceinfo.cpp
@@ -53,7 +53,6 @@
QT_USE_NAMESPACE
Q_DECLARE_METATYPE(QUuid)
-Q_DECLARE_METATYPE(QLowEnergyServiceInfo::ServiceType)
Q_DECLARE_METATYPE(QBluetoothDeviceInfo::CoreConfiguration)
Q_DECLARE_METATYPE(QLowEnergyServiceInfo)
Q_DECLARE_METATYPE(QBluetoothUuid::ServiceClassUuid)
@@ -102,8 +101,6 @@ void tst_QLowEnergyServiceInfo::tst_construction()
QVERIFY(!serviceInfo.isValid());
QCOMPARE(serviceInfo.serviceName(), QStringLiteral("Unknown Service"));
QCOMPARE(serviceInfo.serviceUuid().toString(), QBluetoothUuid().toString());
- QCOMPARE(serviceInfo.serviceType(), QLowEnergyServiceInfo::PrimaryService);
- QCOMPARE(serviceInfo.isConnected(), false);
QCOMPARE(serviceInfo.device(), QBluetoothDeviceInfo());
}
@@ -139,7 +136,6 @@ void tst_QLowEnergyServiceInfo::tst_assignment_data()
QTest::addColumn<QString>("name");
QTest::addColumn<quint32>("classOfDevice");
QTest::addColumn<QBluetoothUuid>("serviceClassUuid");
- QTest::addColumn<QLowEnergyServiceInfo::ServiceType>("serviceType");
QTest::addColumn<QBluetoothDeviceInfo::CoreConfiguration>("coreConfiguration");
// bits 12-8 Major
@@ -149,47 +145,38 @@ void tst_QLowEnergyServiceInfo::tst_assignment_data()
QTest::newRow("0x000000 COD") << QBluetoothAddress("000000000000") << "My Bluetooth Device"
<< quint32(0x000000)
<< QBluetoothUuid(QBluetoothUuid::GenericAccess)
- << QLowEnergyServiceInfo::ServiceType(QLowEnergyServiceInfo::PrimaryService)
<< QBluetoothDeviceInfo::BaseRateAndLowEnergyCoreConfiguration;
QTest::newRow("0x000100 COD") << QBluetoothAddress("000000000000") << "My Bluetooth Device"
<< quint32(0x000100)
<< QBluetoothUuid(QBluetoothUuid::GenericAttribute)
- << QLowEnergyServiceInfo::ServiceType(QLowEnergyServiceInfo::PrimaryService)
<< QBluetoothDeviceInfo::BaseRateAndLowEnergyCoreConfiguration;
QTest::newRow("0x000104 COD") << QBluetoothAddress("000000000000") << "My Bluetooth Device"
<< quint32(0x000104)
<< QBluetoothUuid(QBluetoothUuid::HeartRate)
- << QLowEnergyServiceInfo::ServiceType(QLowEnergyServiceInfo::PrimaryService)
<< QBluetoothDeviceInfo::BaseRateAndLowEnergyCoreConfiguration;
QTest::newRow("0x000118 COD") << QBluetoothAddress("000000000000") << "My Bluetooth Device"
<< quint32(0x000118)
<< QBluetoothUuid(QBluetoothUuid::CyclingSpeedAndCadence)
- << QLowEnergyServiceInfo::ServiceType(QLowEnergyServiceInfo::PrimaryService)
<< QBluetoothDeviceInfo::BaseRateAndLowEnergyCoreConfiguration;
QTest::newRow("0x000200 COD") << QBluetoothAddress("000000000000") << "My Bluetooth Device"
<< quint32(0x000200)
<< QBluetoothUuid(QBluetoothUuid::CyclingPower)
- << QLowEnergyServiceInfo::ServiceType(QLowEnergyServiceInfo::PrimaryService)
<< QBluetoothDeviceInfo::LowEnergyCoreConfiguration;
QTest::newRow("0x000204 COD") << QBluetoothAddress("000000000000") << "My Bluetooth Device"
<< quint32(0x000204)
<< QBluetoothUuid(QBluetoothUuid::ScanParameters)
- << QLowEnergyServiceInfo::ServiceType(QLowEnergyServiceInfo::PrimaryService)
<< QBluetoothDeviceInfo::LowEnergyCoreConfiguration;
QTest::newRow("0x000214 COD") << QBluetoothAddress("000000000000") << "My Bluetooth Device"
<< quint32(0x000214)
<< QBluetoothUuid(QBluetoothUuid::DeviceInformation)
- << QLowEnergyServiceInfo::ServiceType(QLowEnergyServiceInfo::PrimaryService)
<< QBluetoothDeviceInfo::LowEnergyCoreConfiguration;
QTest::newRow("0x000300 COD") << QBluetoothAddress("000000000000") << "My Bluetooth Device"
<< quint32(0x000300)
<< QBluetoothUuid(QBluetoothUuid::CurrentTimeService)
- << QLowEnergyServiceInfo::ServiceType(QLowEnergyServiceInfo::PrimaryService)
<< QBluetoothDeviceInfo::LowEnergyCoreConfiguration;
QTest::newRow("0x000320 COD") << QBluetoothAddress("000000000000") << "My Bluetooth Device"
<< quint32(0x000320)
<< QBluetoothUuid(QBluetoothUuid::LocationAndNavigation)
- << QLowEnergyServiceInfo::ServiceType(QLowEnergyServiceInfo::PrimaryService)
<< QBluetoothDeviceInfo::LowEnergyCoreConfiguration;
}
@@ -199,7 +186,6 @@ void tst_QLowEnergyServiceInfo::tst_assignment()
QFETCH(QString, name);
QFETCH(quint32, classOfDevice);
QFETCH(QBluetoothUuid, serviceClassUuid);
- QFETCH(QLowEnergyServiceInfo::ServiceType, serviceType);
QFETCH(QBluetoothDeviceInfo::CoreConfiguration, coreConfiguration);
QBluetoothDeviceInfo deviceInfo(address, name, classOfDevice);
@@ -220,8 +206,6 @@ void tst_QLowEnergyServiceInfo::tst_assignment()
QCOMPARE(copyInfo.device().address(), address);
QCOMPARE(copyInfo.serviceUuid(), serviceClassUuid);
QCOMPARE(copyInfo.device().coreConfigurations(), coreConfiguration);
- QCOMPARE(copyInfo.serviceType(), serviceType);
- QCOMPARE(copyInfo.isConnected(), false);
QCOMPARE(copyInfo.device(), deviceInfo);
}
@@ -237,7 +221,6 @@ void tst_QLowEnergyServiceInfo::tst_assignment()
QCOMPARE(copyInfo.device().address(), address);
QCOMPARE(copyInfo.serviceUuid(), serviceClassUuid);
QCOMPARE(copyInfo.device().coreConfigurations(), coreConfiguration);
- QCOMPARE(copyInfo.serviceType(), serviceType);
}
{
@@ -251,18 +234,13 @@ void tst_QLowEnergyServiceInfo::tst_assignment()
QVERIFY(copyInfo1.isValid());
QVERIFY(copyInfo2.isValid());
- //QVERIFY(QLowEnergyServiceInfo() != copyInfo1);
QCOMPARE(copyInfo1.device().address(), address);
QCOMPARE(copyInfo2.device().address(), address);
QCOMPARE(copyInfo1.serviceUuid(), serviceClassUuid);
QCOMPARE(copyInfo2.serviceUuid(), serviceClassUuid);
- QCOMPARE(copyInfo1.serviceType(), serviceType);
- QCOMPARE(copyInfo2.serviceType(), serviceType);
QCOMPARE(copyInfo1.device().coreConfigurations(), coreConfiguration);
QCOMPARE(copyInfo2.device().coreConfigurations(), coreConfiguration);
- QCOMPARE(copyInfo1.isConnected(), false);
- QCOMPARE(copyInfo2.isConnected(), false);
QCOMPARE(copyInfo1.device(), deviceInfo);
QCOMPARE(copyInfo2.device(), deviceInfo);
}