diff options
author | Alexander Akulich <akulichalexander@gmail.com> | 2020-01-18 19:28:59 +0300 |
---|---|---|
committer | Alexander Akulich <akulichalexander@gmail.com> | 2020-01-18 22:37:08 +0300 |
commit | f2fb77fb12622232f49bf325d16228f8c6957175 (patch) | |
tree | d1fb90abff7a28a6bceef6447db8e25ffd339994 /tests | |
parent | 4e3b64c54b82fcc6ccd22889ab5e4276b338e173 (diff) |
Use override specifiers wherever it makes sense
Refactored with clang-tidy
Diffstat (limited to 'tests')
-rw-r--r-- | tests/dbus/account-connection-factory.cpp | 2 | ||||
-rw-r--r-- | tests/dbus/base-filetransfer.cpp | 2 | ||||
-rw-r--r-- | tests/dbus/cm-protocol.cpp | 10 | ||||
-rw-r--r-- | tests/dbus/contact-messenger.cpp | 6 | ||||
-rw-r--r-- | tests/dbus/simple-observer.cpp | 4 | ||||
-rw-r--r-- | tests/dbus/stream-tube-handlers.cpp | 8 | ||||
-rw-r--r-- | tests/dbus/types.cpp | 2 | ||||
-rw-r--r-- | tests/lib/glib-helpers/test-conn-helper.h | 2 | ||||
-rw-r--r-- | tests/lib/test-thread-helper.h | 2 | ||||
-rw-r--r-- | tests/lib/test.h | 2 | ||||
-rw-r--r-- | tests/ptr.cpp | 2 |
11 files changed, 21 insertions, 21 deletions
diff --git a/tests/dbus/account-connection-factory.cpp b/tests/dbus/account-connection-factory.cpp index 2f734205..419d3fb3 100644 --- a/tests/dbus/account-connection-factory.cpp +++ b/tests/dbus/account-connection-factory.cpp @@ -40,7 +40,7 @@ public: { } - virtual ~AccountAdaptor() + ~AccountAdaptor() override { } diff --git a/tests/dbus/base-filetransfer.cpp b/tests/dbus/base-filetransfer.cpp index c43bd119..1228fcdd 100644 --- a/tests/dbus/base-filetransfer.cpp +++ b/tests/dbus/base-filetransfer.cpp @@ -183,7 +183,7 @@ public: setSelfContact(1, QLatin1String("selfContact")); } - virtual ~Connection() { } + ~Connection() override { } Tp::BaseChannelPtr receiveFile(const Tp::FileTransferChannelCreationProperties &properties, uint initiatorHandle) { diff --git a/tests/dbus/cm-protocol.cpp b/tests/dbus/cm-protocol.cpp index b84c560c..2b291d1b 100644 --- a/tests/dbus/cm-protocol.cpp +++ b/tests/dbus/cm-protocol.cpp @@ -50,7 +50,7 @@ public: { } - virtual ~ConnectionManagerAdaptor() + ~ConnectionManagerAdaptor() override { } @@ -116,7 +116,7 @@ public: mIcon = QLatin1String("icon-adaptor"); } - virtual ~ProtocolAdaptor() + ~ProtocolAdaptor() override { } @@ -214,7 +214,7 @@ public: mUris << QLatin1String("adaptor"); } - virtual ~ProtocolAddressingAdaptor() + ~ProtocolAddressingAdaptor() override { } @@ -291,7 +291,7 @@ public: mMaximumAvatarBytes = 4096; } - virtual ~ProtocolAvatarsAdaptor() + ~ProtocolAvatarsAdaptor() override { } @@ -400,7 +400,7 @@ public: mStatuses.insert(QLatin1String("available"), spec); } - virtual ~ProtocolPresenceAdaptor() + ~ProtocolPresenceAdaptor() override { } diff --git a/tests/dbus/contact-messenger.cpp b/tests/dbus/contact-messenger.cpp index 93ba0239..2da59044 100644 --- a/tests/dbus/contact-messenger.cpp +++ b/tests/dbus/contact-messenger.cpp @@ -66,7 +66,7 @@ public: } - virtual ~CDMessagesAdaptor() + ~CDMessagesAdaptor() override { } @@ -110,7 +110,7 @@ public: { } - virtual ~AccountAdaptor() + ~AccountAdaptor() override { } @@ -154,7 +154,7 @@ public: { } - ~Dispatcher() + ~Dispatcher() override { } }; diff --git a/tests/dbus/simple-observer.cpp b/tests/dbus/simple-observer.cpp index fd54295b..c656b421 100644 --- a/tests/dbus/simple-observer.cpp +++ b/tests/dbus/simple-observer.cpp @@ -86,7 +86,7 @@ public: { } - virtual ~AccountAdaptor() + ~AccountAdaptor() override { } @@ -130,7 +130,7 @@ public: { } - ~Dispatcher() + ~Dispatcher() override { } }; diff --git a/tests/dbus/stream-tube-handlers.cpp b/tests/dbus/stream-tube-handlers.cpp index 6bb11d62..af39bf76 100644 --- a/tests/dbus/stream-tube-handlers.cpp +++ b/tests/dbus/stream-tube-handlers.cpp @@ -88,7 +88,7 @@ public: { } - virtual ~ChannelRequestAdaptor() + ~ChannelRequestAdaptor() override { } @@ -784,7 +784,7 @@ void TestStreamTubeHandlers::testRegistration() CookieGenerator() : serial(0) {} QVariantMap nextParameters(const AccountPtr &account, const OutgoingStreamTubeChannelPtr &tube, - const ChannelRequestHints &hints) + const ChannelRequestHints &hints) override { QVariantMap params; params.insert(QLatin1String("cookie-y"), @@ -1342,7 +1342,7 @@ void TestStreamTubeHandlers::testClientBasicTcp() FakeGenerator() : port(0) {} QPair<QHostAddress, quint16> nextSourceAddress(const AccountPtr &account, - const IncomingStreamTubeChannelPtr &tube) { + const IncomingStreamTubeChannelPtr &tube) override { return qMakePair(QHostAddress(QHostAddress::LocalHost), ++port); } @@ -1436,7 +1436,7 @@ void TestStreamTubeHandlers::testClientTcpGeneratorIgnore() { public: QPair<QHostAddress, quint16> nextSourceAddress(const AccountPtr &account, - const IncomingStreamTubeChannelPtr &tube) { + const IncomingStreamTubeChannelPtr &tube) override { return qMakePair(QHostAddress(QHostAddress::LocalHost), quint16(1111)); } } gen; diff --git a/tests/dbus/types.cpp b/tests/dbus/types.cpp index 8e4acba8..7b2d9336 100644 --- a/tests/dbus/types.cpp +++ b/tests/dbus/types.cpp @@ -23,7 +23,7 @@ class TubeAdaptor : public QDBusAbstractAdaptor public: TubeAdaptor(QObject *parent) : QDBusAbstractAdaptor(parent) {} - ~TubeAdaptor() {} + ~TubeAdaptor() override {} public: // Properties inline QVariantMap Parameters() const diff --git a/tests/lib/glib-helpers/test-conn-helper.h b/tests/lib/glib-helpers/test-conn-helper.h index a40b3609..70d55449 100644 --- a/tests/lib/glib-helpers/test-conn-helper.h +++ b/tests/lib/glib-helpers/test-conn-helper.h @@ -34,7 +34,7 @@ public: const Tp::ContactFactoryConstPtr &contactFactory, GType gType, const char *firstPropertyName, ...); - virtual ~TestConnHelper(); + ~TestConnHelper() override; GObject *service() const { return mService; } Tp::ConnectionPtr client() const { return mClient; } diff --git a/tests/lib/test-thread-helper.h b/tests/lib/test-thread-helper.h index 3d483ed7..0674f1cd 100644 --- a/tests/lib/test-thread-helper.h +++ b/tests/lib/test-thread-helper.h @@ -24,7 +24,7 @@ public: typedef Tp::Callback1<void, Context&> Callback; Callback mCallback; - virtual void executeCallback() + void executeCallback() override { Q_ASSERT(mCallback.isValid()); Q_ASSERT(QThread::currentThread() != QCoreApplication::instance()->thread()); diff --git a/tests/lib/test.h b/tests/lib/test.h index 15e5f83f..3edb4107 100644 --- a/tests/lib/test.h +++ b/tests/lib/test.h @@ -21,7 +21,7 @@ public: Test(QObject *parent = 0); - virtual ~Test(); + ~Test() override; QEventLoop *mLoop; void processDBusQueue(Tp::DBusProxy *proxy); diff --git a/tests/ptr.cpp b/tests/ptr.cpp index e0ddfe93..4707ff7f 100644 --- a/tests/ptr.cpp +++ b/tests/ptr.cpp @@ -244,7 +244,7 @@ class Thread : public QThread public: Thread(const DataPtr &ptr, QObject *parent = 0) : QThread(parent), mPtr(ptr) {} - void run() + void run() override { QVERIFY(!mPtr.isNull()); for (int i = 0; i < 200; ++i) { |