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, 19 insertions, 19 deletions

diff --git a/src/corelib/mimetypes/qmimeprovider_p.h b/src/corelib/mimetypes/qmimeprovider_p.h
index 0be01d2fd0..3eae672823 100644
--- a/src/corelib/mimetypes/qmimeprovider_p.h
+++ b/src/corelib/mimetypes/qmimeprovider_p.h
@@ -98,17 +98,17 @@ public:
     QMimeBinaryProvider(QMimeDatabasePrivate *db);
     virtual ~QMimeBinaryProvider();
 
-    virtual bool isValid() Q_DECL_OVERRIDE;
-    virtual QMimeType mimeTypeForName(const QString &name) Q_DECL_OVERRIDE;
-    virtual QMimeGlobMatchResult findByFileName(const QString &fileName) Q_DECL_OVERRIDE;
-    virtual QStringList parents(const QString &mime) Q_DECL_OVERRIDE;
-    virtual QString resolveAlias(const QString &name) Q_DECL_OVERRIDE;
-    virtual QStringList listAliases(const QString &name) Q_DECL_OVERRIDE;
-    virtual QMimeType findByMagic(const QByteArray &data, int *accuracyPtr) Q_DECL_OVERRIDE;
-    virtual QList<QMimeType> allMimeTypes() Q_DECL_OVERRIDE;
-    virtual void loadMimeTypePrivate(QMimeTypePrivate &) Q_DECL_OVERRIDE;
-    virtual void loadIcon(QMimeTypePrivate &) Q_DECL_OVERRIDE;
-    virtual void loadGenericIcon(QMimeTypePrivate &) Q_DECL_OVERRIDE;
+    virtual bool isValid() override;
+    virtual QMimeType mimeTypeForName(const QString &name) override;
+    virtual QMimeGlobMatchResult findByFileName(const QString &fileName) override;
+    virtual QStringList parents(const QString &mime) override;
+    virtual QString resolveAlias(const QString &name) override;
+    virtual QStringList listAliases(const QString &name) override;
+    virtual QMimeType findByMagic(const QByteArray &data, int *accuracyPtr) override;
+    virtual QList<QMimeType> allMimeTypes() override;
+    virtual void loadMimeTypePrivate(QMimeTypePrivate &) override;
+    virtual void loadIcon(QMimeTypePrivate &) override;
+    virtual void loadGenericIcon(QMimeTypePrivate &) override;
 
 private:
     struct CacheFile;
@@ -141,14 +141,14 @@ public:
     QMimeXMLProvider(QMimeDatabasePrivate *db);
     ~QMimeXMLProvider();
 
-    virtual bool isValid() Q_DECL_OVERRIDE;
-    virtual QMimeType mimeTypeForName(const QString &name) Q_DECL_OVERRIDE;
-    virtual QMimeGlobMatchResult findByFileName(const QString &fileName) Q_DECL_OVERRIDE;
-    virtual QStringList parents(const QString &mime) Q_DECL_OVERRIDE;
-    virtual QString resolveAlias(const QString &name) Q_DECL_OVERRIDE;
-    virtual QStringList listAliases(const QString &name) Q_DECL_OVERRIDE;
-    virtual QMimeType findByMagic(const QByteArray &data, int *accuracyPtr) Q_DECL_OVERRIDE;
-    virtual QList<QMimeType> allMimeTypes() Q_DECL_OVERRIDE;
+    virtual bool isValid() override;
+    virtual QMimeType mimeTypeForName(const QString &name) override;
+    virtual QMimeGlobMatchResult findByFileName(const QString &fileName) override;
+    virtual QStringList parents(const QString &mime) override;
+    virtual QString resolveAlias(const QString &name) override;
+    virtual QStringList listAliases(const QString &name) override;
+    virtual QMimeType findByMagic(const QByteArray &data, int *accuracyPtr) override;
+    virtual QList<QMimeType> allMimeTypes() override;
 
     bool load(const QString &fileName, QString *errorMessage);