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>

4 files changed, 26 insertions, 26 deletions

diff --git a/src/testlib/qbenchmarkperfevents_p.h b/src/testlib/qbenchmarkperfevents_p.h
index 085dc620d7..86ba556549 100644
--- a/src/testlib/qbenchmarkperfevents_p.h
+++ b/src/testlib/qbenchmarkperfevents_p.h
@@ -60,16 +60,16 @@ class QBenchmarkPerfEventsMeasurer : public QBenchmarkMeasurerBase
 public:
     QBenchmarkPerfEventsMeasurer();
     ~QBenchmarkPerfEventsMeasurer();
-    virtual void init() Q_DECL_OVERRIDE;
-    virtual void start() Q_DECL_OVERRIDE;
-    virtual qint64 checkpoint() Q_DECL_OVERRIDE;
-    virtual qint64 stop() Q_DECL_OVERRIDE;
-    virtual bool isMeasurementAccepted(qint64 measurement) Q_DECL_OVERRIDE;
-    virtual int adjustIterationCount(int suggestion) Q_DECL_OVERRIDE;
-    virtual int adjustMedianCount(int suggestion) Q_DECL_OVERRIDE;
-    virtual bool repeatCount() Q_DECL_OVERRIDE { return 1; }
-    virtual bool needsWarmupIteration() Q_DECL_OVERRIDE { return true; }
-    virtual QTest::QBenchmarkMetric metricType() Q_DECL_OVERRIDE;
+    virtual void init() override;
+    virtual void start() override;
+    virtual qint64 checkpoint() override;
+    virtual qint64 stop() override;
+    virtual bool isMeasurementAccepted(qint64 measurement) override;
+    virtual int adjustIterationCount(int suggestion) override;
+    virtual int adjustMedianCount(int suggestion) override;
+    virtual bool repeatCount() override { return 1; }
+    virtual bool needsWarmupIteration() override { return true; }
+    virtual QTest::QBenchmarkMetric metricType() override;
 
     static bool isAvailable();
     static QTest::QBenchmarkMetric metricForEvent(quint32 type, quint64 event_id);
diff --git a/src/testlib/qcsvbenchmarklogger_p.h b/src/testlib/qcsvbenchmarklogger_p.h
index f321494e8a..5840aee0f5 100644
--- a/src/testlib/qcsvbenchmarklogger_p.h
+++ b/src/testlib/qcsvbenchmarklogger_p.h
@@ -61,18 +61,18 @@ public:
     QCsvBenchmarkLogger(const char *filename);
     ~QCsvBenchmarkLogger();
 
-    void startLogging() Q_DECL_OVERRIDE;
-    void stopLogging() Q_DECL_OVERRIDE;
+    void startLogging() override;
+    void stopLogging() override;
 
-    void enterTestFunction(const char *function) Q_DECL_OVERRIDE;
-    void leaveTestFunction() Q_DECL_OVERRIDE;
+    void enterTestFunction(const char *function) override;
+    void leaveTestFunction() override;
 
     void addIncident(IncidentTypes type, const char *description,
-                     const char *file = 0, int line = 0) Q_DECL_OVERRIDE;
-    void addBenchmarkResult(const QBenchmarkResult &result) Q_DECL_OVERRIDE;
+                     const char *file = 0, int line = 0) override;
+    void addBenchmarkResult(const QBenchmarkResult &result) override;
 
     void addMessage(MessageTypes type, const QString &message,
-                            const char *file = 0, int line = 0) Q_DECL_OVERRIDE;
+                            const char *file = 0, int line = 0) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/testlib/qsignalspy.h b/src/testlib/qsignalspy.h
index 6b1b7e6922..f05dd95565 100644
--- a/src/testlib/qsignalspy.h
+++ b/src/testlib/qsignalspy.h
@@ -151,7 +151,7 @@ public:
         return count() > origCount;
     }
 
-    int qt_metacall(QMetaObject::Call call, int methodId, void **a) Q_DECL_OVERRIDE
+    int qt_metacall(QMetaObject::Call call, int methodId, void **a) override
     {
         methodId = QObject::qt_metacall(call, methodId, a);
         if (methodId < 0)
diff --git a/src/testlib/qxctestlogger_p.h b/src/testlib/qxctestlogger_p.h
index 2bbd5ad296..1b641f18af 100644
--- a/src/testlib/qxctestlogger_p.h
+++ b/src/testlib/qxctestlogger_p.h
@@ -65,21 +65,21 @@ class QXcodeTestLogger : public QAbstractTestLogger
 {
 public:
     QXcodeTestLogger();
-    ~QXcodeTestLogger() Q_DECL_OVERRIDE;
+    ~QXcodeTestLogger() override;
 
-    void startLogging() Q_DECL_OVERRIDE;
-    void stopLogging() Q_DECL_OVERRIDE;
+    void startLogging() override;
+    void stopLogging() override;
 
-    void enterTestFunction(const char *function) Q_DECL_OVERRIDE;
-    void leaveTestFunction() Q_DECL_OVERRIDE;
+    void enterTestFunction(const char *function) override;
+    void leaveTestFunction() override;
 
     void addIncident(IncidentTypes type, const char *description,
-        const char *file = 0, int line = 0) Q_DECL_OVERRIDE;
+        const char *file = 0, int line = 0) override;
 
     void addMessage(MessageTypes type, const QString &message,
-        const char *file = 0, int line = 0) Q_DECL_OVERRIDE;
+        const char *file = 0, int line = 0) override;
 
-    void addBenchmarkResult(const QBenchmarkResult &result) Q_DECL_OVERRIDE;
+    void addBenchmarkResult(const QBenchmarkResult &result) override;
 
     static bool canLogTestProgress();
     static int parseCommandLineArgument(const char *argument);