From 273fcd0c05cd5edb417e0a4edeffb70e56243ca9 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 22 Jun 2020 15:12:06 +0200 Subject: Use QList instead of QVector in dbus tests Task-number: QTBUG-84469 Change-Id: I37d169770f188837118b4e33aa3a3894bf7aed2c Reviewed-by: Lars Knoll --- tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp | 7 +++---- tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp | 1 - tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp | 1 - 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp b/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp index 905abe4791..90e0421883 100644 --- a/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp +++ b/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include @@ -52,8 +52,7 @@ public Q_SLOTS: Q_SCRIPTABLE QDBusVariant echo(const QDBusVariant &value) { return value; } - Q_SCRIPTABLE QVector echo(const QVector &value) - { return value; } + Q_SCRIPTABLE QList echo(const QList &value) { return value; } Q_SCRIPTABLE QString echo2(const QStringList &list, QString &out) { out = list[1]; return list[0]; } @@ -200,7 +199,7 @@ void tst_QDBusLocalCalls::makeCallsTwoRets() void tst_QDBusLocalCalls::makeCallsComplex() { qDBusRegisterMetaType >(); - qDBusRegisterMetaType >(); + qDBusRegisterMetaType>(); QList value; value << 1 << -42 << 47; diff --git a/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp b/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp index f42c58ba7f..78c3fb223b 100644 --- a/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp +++ b/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp @@ -30,7 +30,6 @@ #include #include #include -#include #include #include diff --git a/tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp b/tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp index a8466d848c..2648b22f1f 100644 --- a/tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp +++ b/tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp @@ -28,7 +28,6 @@ #include #include #include -#include #include #include -- cgit v1.2.3