diff options
author | Kevin Funk <kfunk@kde.org> | 2017-09-20 20:57:50 +0200 |
---|---|---|
committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-21 10:29:11 +0000 |
commit | 48e574234f4a007f448b5d8fbd470fa6138bce64 (patch) | |
tree | 123239e09f0554d5cb45f2089cdedab5f7ca569c | |
parent | 8a0e0a988644c744de4005b34ffdbbed151e2309 (diff) | |
download | qtwebchannel-48e574234f4a007f448b5d8fbd470fa6138bce64.tar.gz |
Replace Q_DECL_OVERRIDE with override
Change-Id: I8661063408d17c80a04433beda595061e89b5ba8
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
-rw-r--r-- | examples/webchannel/shared/websockettransport.h | 2 | ||||
-rw-r--r-- | src/webchannel/qmetaobjectpublisher_p.h | 2 | ||||
-rw-r--r-- | src/webchannel/signalhandler_p.h | 2 | ||||
-rw-r--r-- | tests/auto/qml/testtransport.h | 2 | ||||
-rw-r--r-- | tests/auto/webchannel/tst_webchannel.cpp | 2 | ||||
-rw-r--r-- | tests/auto/webchannel/tst_webchannel.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/examples/webchannel/shared/websockettransport.h b/examples/webchannel/shared/websockettransport.h index 44cb92e..02bd07e 100644 --- a/examples/webchannel/shared/websockettransport.h +++ b/examples/webchannel/shared/websockettransport.h @@ -63,7 +63,7 @@ public: explicit WebSocketTransport(QWebSocket *socket); virtual ~WebSocketTransport(); - void sendMessage(const QJsonObject &message) Q_DECL_OVERRIDE; + void sendMessage(const QJsonObject &message) override; private Q_SLOTS: void textMessageReceived(const QString &message); diff --git a/src/webchannel/qmetaobjectpublisher_p.h b/src/webchannel/qmetaobjectpublisher_p.h index 830e510..d02a933 100644 --- a/src/webchannel/qmetaobjectpublisher_p.h +++ b/src/webchannel/qmetaobjectpublisher_p.h @@ -218,7 +218,7 @@ public Q_SLOTS: void handleMessage(const QJsonObject &message, QWebChannelAbstractTransport *transport); protected: - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *) override; private: friend class QQmlWebChannelPrivate; diff --git a/src/webchannel/signalhandler_p.h b/src/webchannel/signalhandler_p.h index 9bcb071..27afadb 100644 --- a/src/webchannel/signalhandler_p.h +++ b/src/webchannel/signalhandler_p.h @@ -94,7 +94,7 @@ public: * * Custom implementation of qt_metacall which calls dispatch() for connected signals. */ - int qt_metacall(QMetaObject::Call call, int methodId, void **args) Q_DECL_OVERRIDE; + int qt_metacall(QMetaObject::Call call, int methodId, void **args) override; /** * Reset all connections, useful for benchmarks. diff --git a/tests/auto/qml/testtransport.h b/tests/auto/qml/testtransport.h index 972bcd8..5c533ae 100644 --- a/tests/auto/qml/testtransport.h +++ b/tests/auto/qml/testtransport.h @@ -39,7 +39,7 @@ class TestTransport : public QWebChannelAbstractTransport public: explicit TestTransport(QObject *parent = 0); - virtual void sendMessage(const QJsonObject &message) Q_DECL_OVERRIDE; + virtual void sendMessage(const QJsonObject &message) override; Q_INVOKABLE void receiveMessage(const QString &message); diff --git a/tests/auto/webchannel/tst_webchannel.cpp b/tests/auto/webchannel/tst_webchannel.cpp index f214b7e..6d6fa55 100644 --- a/tests/auto/webchannel/tst_webchannel.cpp +++ b/tests/auto/webchannel/tst_webchannel.cpp @@ -47,7 +47,7 @@ class TestEngineTransport : public QWebChannelAbstractTransport Q_OBJECT public: TestEngineTransport(TestJSEngine *); - void sendMessage(const QJsonObject &message) Q_DECL_OVERRIDE; + void sendMessage(const QJsonObject &message) override; Q_INVOKABLE void channelSetupReady(); Q_INVOKABLE void send(const QByteArray &message); diff --git a/tests/auto/webchannel/tst_webchannel.h b/tests/auto/webchannel/tst_webchannel.h index d2597e5..714fe56 100644 --- a/tests/auto/webchannel/tst_webchannel.h +++ b/tests/auto/webchannel/tst_webchannel.h @@ -54,7 +54,7 @@ public: } public slots: - void sendMessage(const QJsonObject &/*message*/) Q_DECL_OVERRIDE + void sendMessage(const QJsonObject &/*message*/) override { } }; |