From 85bbb2e2e0e87e1b935a62da0eee44004952c542 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Wed, 4 Dec 2019 10:48:52 +0100 Subject: Fix a few compiler warnings in lowenergydescriptor unit test Change-Id: Ic77df9c81ff0b56408d2636582f976f2140708e2 Reviewed-by: Timur Pocheptsov --- tests/auto/qlowenergydescriptor/tst_qlowenergydescriptor.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/qlowenergydescriptor') diff --git a/tests/auto/qlowenergydescriptor/tst_qlowenergydescriptor.cpp b/tests/auto/qlowenergydescriptor/tst_qlowenergydescriptor.cpp index 5ebb0b1d..b3caab44 100644 --- a/tests/auto/qlowenergydescriptor/tst_qlowenergydescriptor.cpp +++ b/tests/auto/qlowenergydescriptor/tst_qlowenergydescriptor.cpp @@ -63,7 +63,7 @@ private: }; tst_QLowEnergyDescriptor::tst_QLowEnergyDescriptor() : - globalControl(0), globalService(0) + globalControl(nullptr), globalService(nullptr) { QLoggingCategory::setFilterRules(QStringLiteral("qt.bluetooth* = true")); } @@ -104,13 +104,13 @@ void tst_QLowEnergyDescriptor::initTestCase() QTRY_VERIFY_WITH_TIMEOUT(spy.count() > 0, 50000); // find first service with descriptor - QLowEnergyController *controller = 0; + QLowEnergyController *controller = nullptr; for (const QBluetoothDeviceInfo& remoteDeviceInfo : qAsConst(remoteLeDeviceInfos)) { controller = QLowEnergyController::createCentral(remoteDeviceInfo, this); qDebug() << "Connecting to" << remoteDeviceInfo.address(); controller->connectToDevice(); QTRY_IMPL(controller->state() != QLowEnergyController::ConnectingState, - 20000); + 20000) if (controller->state() != QLowEnergyController::ConnectedState) { // any error and we skip delete controller; -- cgit v1.2.3