Replace Q_DECL_OVERRIDE with override where possible

Remaining uses of Q_DECL_OVERRIDE are in:

src/corelib/global/qcompilerdetection.h
src/corelib/global/qglobal.cpp
doc/global/qt-cpp-defines.qdocconf
  (definition and documentation of Q_DECL_OVERRIDE)
tests/manual/qcursor/qcursorhighdpi/main.cpp
  (a test executable compilable both under Qt4 and Qt5)

Change-Id: Ib9b05d829add69e98a86238274b6a1fcb19b49ba
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>

5 files changed, 47 insertions, 47 deletions

diff --git a/src/plugins/bearer/android/src/main.cpp b/src/plugins/bearer/android/src/main.cpp
index 3892766b89..f3a5074e5d 100644
--- a/src/plugins/bearer/android/src/main.cpp
+++ b/src/plugins/bearer/android/src/main.cpp
@@ -50,7 +50,7 @@ class QAndroidBearerEnginePlugin : public QBearerEnginePlugin
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QBearerEngineFactoryInterface" FILE "android.json")
 
 public:
-    QBearerEngine *create(const QString &key) const Q_DECL_OVERRIDE
+    QBearerEngine *create(const QString &key) const override
     {
         return (key == QLatin1String("android")) ? new QAndroidBearerEngine() : 0;
     }
diff --git a/src/plugins/bearer/android/src/qandroidbearerengine.h b/src/plugins/bearer/android/src/qandroidbearerengine.h
index f404ca65eb..837b02232d 100644
--- a/src/plugins/bearer/android/src/qandroidbearerengine.h
+++ b/src/plugins/bearer/android/src/qandroidbearerengine.h
@@ -60,20 +60,20 @@ class QAndroidBearerEngine : public QBearerEngineImpl
 
 public:
     explicit QAndroidBearerEngine(QObject *parent = 0);
-    ~QAndroidBearerEngine() Q_DECL_OVERRIDE;
-
-    QString getInterfaceFromId(const QString &id) Q_DECL_OVERRIDE;
-    bool hasIdentifier(const QString &id) Q_DECL_OVERRIDE;
-    void connectToId(const QString &id) Q_DECL_OVERRIDE;
-    void disconnectFromId(const QString &id) Q_DECL_OVERRIDE;
-    QNetworkSession::State sessionStateForId(const QString &id) Q_DECL_OVERRIDE;
-    QNetworkConfigurationManager::Capabilities capabilities() const Q_DECL_OVERRIDE;
-    QNetworkSessionPrivate *createSessionBackend() Q_DECL_OVERRIDE;
-    QNetworkConfigurationPrivatePointer defaultConfiguration() Q_DECL_OVERRIDE;
-    bool requiresPolling() const Q_DECL_OVERRIDE;
-    quint64 bytesWritten(const QString &id) Q_DECL_OVERRIDE;
-    quint64 bytesReceived(const QString &id) Q_DECL_OVERRIDE;
-    quint64 startTime(const QString &id) Q_DECL_OVERRIDE;
+    ~QAndroidBearerEngine() override;
+
+    QString getInterfaceFromId(const QString &id) override;
+    bool hasIdentifier(const QString &id) override;
+    void connectToId(const QString &id) override;
+    void disconnectFromId(const QString &id) override;
+    QNetworkSession::State sessionStateForId(const QString &id) override;
+    QNetworkConfigurationManager::Capabilities capabilities() const override;
+    QNetworkSessionPrivate *createSessionBackend() override;
+    QNetworkConfigurationPrivatePointer defaultConfiguration() override;
+    bool requiresPolling() const override;
+    quint64 bytesWritten(const QString &id) override;
+    quint64 bytesReceived(const QString &id) override;
+    quint64 startTime(const QString &id) override;
 
     Q_INVOKABLE void initialize();
     Q_INVOKABLE void requestUpdate();
diff --git a/src/plugins/bearer/generic/main.cpp b/src/plugins/bearer/generic/main.cpp
index 80e7b7d9aa..82a9ce97f4 100644
--- a/src/plugins/bearer/generic/main.cpp
+++ b/src/plugins/bearer/generic/main.cpp
@@ -54,7 +54,7 @@ public:
     QGenericEnginePlugin();
     ~QGenericEnginePlugin();
 
-    QBearerEngine *create(const QString &key) const Q_DECL_OVERRIDE;
+    QBearerEngine *create(const QString &key) const override;
 };
 
 QGenericEnginePlugin::QGenericEnginePlugin()
diff --git a/src/plugins/bearer/generic/qgenericengine.h b/src/plugins/bearer/generic/qgenericengine.h
index e680eb9cc0..08960d66f6 100644
--- a/src/plugins/bearer/generic/qgenericengine.h
+++ b/src/plugins/bearer/generic/qgenericengine.h
@@ -58,24 +58,24 @@ public:
     QGenericEngine(QObject *parent = 0);
     ~QGenericEngine();
 
-    QString getInterfaceFromId(const QString &id) Q_DECL_OVERRIDE;
-    bool hasIdentifier(const QString &id) Q_DECL_OVERRIDE;
+    QString getInterfaceFromId(const QString &id) override;
+    bool hasIdentifier(const QString &id) override;
 
-    void connectToId(const QString &id) Q_DECL_OVERRIDE;
-    void disconnectFromId(const QString &id) Q_DECL_OVERRIDE;
+    void connectToId(const QString &id) override;
+    void disconnectFromId(const QString &id) override;
 
     Q_INVOKABLE void initialize();
     Q_INVOKABLE void requestUpdate();
 
-    QNetworkSession::State sessionStateForId(const QString &id) Q_DECL_OVERRIDE;
+    QNetworkSession::State sessionStateForId(const QString &id) override;
 
-    QNetworkConfigurationManager::Capabilities capabilities() const Q_DECL_OVERRIDE;
+    QNetworkConfigurationManager::Capabilities capabilities() const override;
 
-    QNetworkSessionPrivate *createSessionBackend() Q_DECL_OVERRIDE;
+    QNetworkSessionPrivate *createSessionBackend() override;
 
-    QNetworkConfigurationPrivatePointer defaultConfiguration() Q_DECL_OVERRIDE;
+    QNetworkConfigurationPrivatePointer defaultConfiguration() override;
 
-    bool requiresPolling() const Q_DECL_OVERRIDE;
+    bool requiresPolling() const override;
 
 private Q_SLOTS:
     void doRequestUpdate();
diff --git a/src/plugins/bearer/qnetworksession_impl.h b/src/plugins/bearer/qnetworksession_impl.h
index e9c0e383fc..d9aa6ca8fb 100644
--- a/src/plugins/bearer/qnetworksession_impl.h
+++ b/src/plugins/bearer/qnetworksession_impl.h
@@ -75,31 +75,31 @@ public:
     //that the state is immediately updated (w/o actually opening
     //a session). Also this function should take care of
     //notification hooks to discover future state changes.
-    void syncStateWithInterface() Q_DECL_OVERRIDE;
+    void syncStateWithInterface() override;
 
 #ifndef QT_NO_NETWORKINTERFACE
-    QNetworkInterface currentInterface() const Q_DECL_OVERRIDE;
+    QNetworkInterface currentInterface() const override;
 #endif
-    QVariant sessionProperty(const QString& key) const Q_DECL_OVERRIDE;
-    void setSessionProperty(const QString& key, const QVariant& value) Q_DECL_OVERRIDE;
-
-    void open() Q_DECL_OVERRIDE;
-    void close() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
-    void migrate() Q_DECL_OVERRIDE;
-    void accept() Q_DECL_OVERRIDE;
-    void ignore() Q_DECL_OVERRIDE;
-    void reject() Q_DECL_OVERRIDE;
-
-    QString errorString() const Q_DECL_OVERRIDE; //must return translated string
-    QNetworkSession::SessionError error() const Q_DECL_OVERRIDE;
-
-    quint64 bytesWritten() const Q_DECL_OVERRIDE;
-    quint64 bytesReceived() const Q_DECL_OVERRIDE;
-    quint64 activeTime() const Q_DECL_OVERRIDE;
-
-    QNetworkSession::UsagePolicies usagePolicies() const Q_DECL_OVERRIDE;
-    void setUsagePolicies(QNetworkSession::UsagePolicies) Q_DECL_OVERRIDE;
+    QVariant sessionProperty(const QString& key) const override;
+    void setSessionProperty(const QString& key, const QVariant& value) override;
+
+    void open() override;
+    void close() override;
+    void stop() override;
+    void migrate() override;
+    void accept() override;
+    void ignore() override;
+    void reject() override;
+
+    QString errorString() const override; //must return translated string
+    QNetworkSession::SessionError error() const override;
+
+    quint64 bytesWritten() const override;
+    quint64 bytesReceived() const override;
+    quint64 activeTime() const override;
+
+    QNetworkSession::UsagePolicies usagePolicies() const override;
+    void setUsagePolicies(QNetworkSession::UsagePolicies) override;
 
 private Q_SLOTS:
     void networkConfigurationsChanged();