summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKevin Funk <kfunk@kde.org>2017-09-20 20:57:50 +0200
committerKevin Funk <kevin.funk@kdab.com>2017-09-21 10:29:11 +0000
commit48e574234f4a007f448b5d8fbd470fa6138bce64 (patch)
tree123239e09f0554d5cb45f2089cdedab5f7ca569c /tests
parent8a0e0a988644c744de4005b34ffdbbed151e2309 (diff)
downloadqtwebchannel-48e574234f4a007f448b5d8fbd470fa6138bce64.tar.gz
Replace Q_DECL_OVERRIDE with override
Change-Id: I8661063408d17c80a04433beda595061e89b5ba8 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qml/testtransport.h2
-rw-r--r--tests/auto/webchannel/tst_webchannel.cpp2
-rw-r--r--tests/auto/webchannel/tst_webchannel.h2
3 files changed, 3 insertions, 3 deletions
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
{
}
};