diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2022-08-17 15:52:22 +0200 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2022-08-24 22:08:49 +0200 |
| commit | 373c7fe17e48782e3deb4418a0fe34f0ec7c40fa (patch) | |
| tree | 805b9fa08f645d78407115a354fd8bda5a544fb8 /tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp | |
| parent | e5c184ecd11ab1f03ee568687fbfd25d1c2dd8d2 (diff) | |
DBus tests: port away from deprecated APIs
Replacing QVariant::Type with QMetaType::Type
Task-number: QTBUG-104858
Change-Id: If03e2ad72b46c33f68f4382c7ed5c5801d2e70b2
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp')
| -rw-r--r-- | tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp b/tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp index 7242e6c353..bf598fb031 100644 --- a/tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp +++ b/tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp @@ -868,7 +868,7 @@ void tst_QDBusAbstractAdaptor::readProperties() properties.call(QDBus::BlockWithGui, "Get", "local." + name, propname); QVariant value = reply; - QCOMPARE(value.userType(), int(QVariant::String)); + QCOMPARE(value.userType(), int(QMetaType::QString)); QCOMPARE(value.toString(), QString("QString %1::%2() const").arg(name, propname)); } } @@ -957,7 +957,7 @@ void tst_QDBusAbstractAdaptor::readAllProperties() qPrintable(propname + " on " + name)); QVariant value = reply.value().value(propname); - QCOMPARE(value.userType(), int(QVariant::String)); + QCOMPARE(value.userType(), int(QMetaType::QString)); QCOMPARE(value.toString(), QString("QString %1::%2() const").arg(name, propname)); } } @@ -1405,7 +1405,7 @@ void tst_QDBusAbstractAdaptor::readPropertiesPeer() properties.call(QDBus::BlockWithGui, "Get", "local." + name, propname); QVariant value = reply; - QCOMPARE(value.userType(), int(QVariant::String)); + QCOMPARE(value.userType(), int(QMetaType::QString)); QCOMPARE(value.toString(), QString("QString %1::%2() const").arg(name, propname)); } } @@ -1484,7 +1484,7 @@ void tst_QDBusAbstractAdaptor::readAllPropertiesPeer() qPrintable(propname + " on " + name)); QVariant value = reply.value().value(propname); - QCOMPARE(value.userType(), int(QVariant::String)); + QCOMPARE(value.userType(), int(QMetaType::QString)); QCOMPARE(value.toString(), QString("QString %1::%2() const").arg(name, propname)); } } @@ -1864,7 +1864,7 @@ void tst_QDBusAbstractAdaptor::methodWithMoreThanOneReturnValue() QVERIFY(intreply.isValid()); QCOMPARE(intreply.value(), 42); - QCOMPARE(reply.arguments().at(1).userType(), int(QVariant::String)); + QCOMPARE(reply.arguments().at(1).userType(), int(QMetaType::QString)); QCOMPARE(qdbus_cast<QString>(reply.arguments().at(1)), testString); } @@ -1887,7 +1887,7 @@ void tst_QDBusAbstractAdaptor::methodWithMoreThanOneReturnValuePeer() QVERIFY(intreply.isValid()); QCOMPARE(intreply.value(), 42); - QCOMPARE(reply.arguments().at(1).userType(), int(QVariant::String)); + QCOMPARE(reply.arguments().at(1).userType(), int(QMetaType::QString)); QCOMPARE(qdbus_cast<QString>(reply.arguments().at(1)), testString); } |