diff options
Diffstat (limited to 'tests/auto/dbus')
5 files changed, 9 insertions, 7 deletions
diff --git a/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp b/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp index 11896d2f15..615b25e01a 100644 --- a/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp +++ b/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp @@ -487,7 +487,7 @@ public: wait(); } - void run() + void run() override { QDBusConnection con = QDBusConnection::connectToBus(QDBusConnection::SessionBus, "ThreadConnection"); if (!con.isConnected()) diff --git a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h index b4d689e6f4..af42224b79 100644 --- a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h +++ b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h @@ -270,12 +270,12 @@ class VirtualObject: public QDBusVirtualObject public: VirtualObject() :success(true) {} - QString introspect(const QString & /* path */) const + QString introspect(const QString & /* path */) const override { return QString(); } - bool handleMessage(const QDBusMessage &message, const QDBusConnection &connection) { + bool handleMessage(const QDBusMessage &message, const QDBusConnection &connection) override { ++callCount; lastMessage = message; diff --git a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp index e416266b5f..481d40d00a 100644 --- a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp +++ b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp @@ -405,7 +405,8 @@ class VirtualObject: public QDBusVirtualObject public: VirtualObject() :success(true) {} - QString introspect(const QString &path) const { + QString introspect(const QString &path) const override + { Q_ASSERT(QThread::currentThread() == thread()); if (path == "/some/path/superNode") return "zitroneneis"; @@ -416,7 +417,8 @@ public: return QString(); } - bool handleMessage(const QDBusMessage &message, const QDBusConnection &connection) { + bool handleMessage(const QDBusMessage &message, const QDBusConnection &connection) override + { Q_ASSERT(QThread::currentThread() == thread()); ++callCount; lastMessage = message; diff --git a/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp b/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp index 78c3fb223b..99c7504207 100644 --- a/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp +++ b/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp @@ -323,7 +323,7 @@ void tst_QDBusPendingCall::watcher_waitForFinished_threaded() public: tst_QDBusPendingCall *tst; WorkerThread(tst_QDBusPendingCall *tst) : tst(tst) {} - void run() + void run() override { QDBusPendingCall ac = tst->sendMessage(); // QVERIFY(!ac.isFinished()); diff --git a/tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp b/tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp index b4690268c8..13c2c2bb61 100644 --- a/tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp +++ b/tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp @@ -41,7 +41,7 @@ class Thread : public QThread static int counter; public: Thread(bool automatic = true); - void run(); + void run() override; using QThread::exec; }; |