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>

1 files changed, 8 insertions, 8 deletions

diff --git a/src/network/access/qnetworkdiskcache.h b/src/network/access/qnetworkdiskcache.h
index a3aa8d3a07..4f1bbe44e7 100644
--- a/src/network/access/qnetworkdiskcache.h
+++ b/src/network/access/qnetworkdiskcache.h
@@ -63,18 +63,18 @@ public:
     qint64 maximumCacheSize() const;
     void setMaximumCacheSize(qint64 size);
 
-    qint64 cacheSize() const Q_DECL_OVERRIDE;
-    QNetworkCacheMetaData metaData(const QUrl &url) Q_DECL_OVERRIDE;
-    void updateMetaData(const QNetworkCacheMetaData &metaData) Q_DECL_OVERRIDE;
-    QIODevice *data(const QUrl &url) Q_DECL_OVERRIDE;
-    bool remove(const QUrl &url) Q_DECL_OVERRIDE;
-    QIODevice *prepare(const QNetworkCacheMetaData &metaData) Q_DECL_OVERRIDE;
-    void insert(QIODevice *device) Q_DECL_OVERRIDE;
+    qint64 cacheSize() const override;
+    QNetworkCacheMetaData metaData(const QUrl &url) override;
+    void updateMetaData(const QNetworkCacheMetaData &metaData) override;
+    QIODevice *data(const QUrl &url) override;
+    bool remove(const QUrl &url) override;
+    QIODevice *prepare(const QNetworkCacheMetaData &metaData) override;
+    void insert(QIODevice *device) override;
 
     QNetworkCacheMetaData fileMetaData(const QString &fileName) const;
 
 public Q_SLOTS:
-    void clear() Q_DECL_OVERRIDE;
+    void clear() override;
 
 protected:
     virtual qint64 expire();