summaryrefslogtreecommitdiffstats
path: root/tests/auto/dbus
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2020-06-22 15:12:06 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2020-06-25 07:54:33 +0200
commit273fcd0c05cd5edb417e0a4edeffb70e56243ca9 (patch)
treea782aced4d7c0372ea310f91b41c4774159c2f18 /tests/auto/dbus
parent64c3ca091026de433780ba05f006294968f78526 (diff)
Use QList instead of QVector in dbus tests
Task-number: QTBUG-84469 Change-Id: I37d169770f188837118b4e33aa3a3894bf7aed2c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/dbus')
-rw-r--r--tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp7
-rw-r--r--tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp1
-rw-r--r--tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp1
3 files changed, 3 insertions, 6 deletions
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 <QtCore/QObject>
#include <QtCore/QVariant>
#include <QtCore/QList>
-#include <QtCore/QVector>
+#include <QtCore/QList>
#include <QtTest/QtTest>
#include <QtDBus>
@@ -52,8 +52,7 @@ public Q_SLOTS:
Q_SCRIPTABLE QDBusVariant echo(const QDBusVariant &value)
{ return value; }
- Q_SCRIPTABLE QVector<int> echo(const QVector<int> &value)
- { return value; }
+ Q_SCRIPTABLE QList<int> echo(const QList<int> &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<QList<int> >();
- qDBusRegisterMetaType<QVector<int> >();
+ qDBusRegisterMetaType<QList<int>>();
QList<int> 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 <QtCore/QVariant>
#include <QtCore/QList>
#include <QtCore/QThread>
-#include <QtCore/QVector>
#include <QtTest/QtTest>
#include <QtDBus>
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 <QtCore/QObject>
#include <QtCore/QVariant>
#include <QtCore/QList>
-#include <QtCore/QVector>
#include <QtTest/QtTest>
#include <QtDBus>