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

diff --git a/src/corelib/io/qresource_p.h b/src/corelib/io/qresource_p.h
index e08ba64d2b..dcfe46704c 100644
--- a/src/corelib/io/qresource_p.h
+++ b/src/corelib/io/qresource_p.h
@@ -64,52 +64,52 @@ public:
     explicit QResourceFileEngine(const QString &path);
     ~QResourceFileEngine();
 
-    virtual void setFileName(const QString &file) Q_DECL_OVERRIDE;
+    virtual void setFileName(const QString &file) override;
 
-    virtual bool open(QIODevice::OpenMode flags) Q_DECL_OVERRIDE ;
-    virtual bool close() Q_DECL_OVERRIDE;
-    virtual bool flush() Q_DECL_OVERRIDE;
-    virtual qint64 size() const Q_DECL_OVERRIDE;
-    virtual qint64 pos() const Q_DECL_OVERRIDE;
+    virtual bool open(QIODevice::OpenMode flags) override ;
+    virtual bool close() override;
+    virtual bool flush() override;
+    virtual qint64 size() const override;
+    virtual qint64 pos() const override;
     virtual bool atEnd() const;
-    virtual bool seek(qint64) Q_DECL_OVERRIDE;
-    virtual qint64 read(char *data, qint64 maxlen) Q_DECL_OVERRIDE;
-    virtual qint64 write(const char *data, qint64 len) Q_DECL_OVERRIDE;
+    virtual bool seek(qint64) override;
+    virtual qint64 read(char *data, qint64 maxlen) override;
+    virtual qint64 write(const char *data, qint64 len) override;
 
-    virtual bool remove() Q_DECL_OVERRIDE;
-    virtual bool copy(const QString &newName) Q_DECL_OVERRIDE;
-    virtual bool rename(const QString &newName) Q_DECL_OVERRIDE;
-    virtual bool link(const QString &newName) Q_DECL_OVERRIDE;
+    virtual bool remove() override;
+    virtual bool copy(const QString &newName) override;
+    virtual bool rename(const QString &newName) override;
+    virtual bool link(const QString &newName) override;
 
-    virtual bool isSequential() const Q_DECL_OVERRIDE;
+    virtual bool isSequential() const override;
 
-    virtual bool isRelativePath() const Q_DECL_OVERRIDE;
+    virtual bool isRelativePath() const override;
 
-    virtual bool mkdir(const QString &dirName, bool createParentDirectories) const Q_DECL_OVERRIDE;
-    virtual bool rmdir(const QString &dirName, bool recurseParentDirectories) const Q_DECL_OVERRIDE;
+    virtual bool mkdir(const QString &dirName, bool createParentDirectories) const override;
+    virtual bool rmdir(const QString &dirName, bool recurseParentDirectories) const override;
 
-    virtual bool setSize(qint64 size) Q_DECL_OVERRIDE;
+    virtual bool setSize(qint64 size) override;
 
-    virtual QStringList entryList(QDir::Filters filters, const QStringList &filterNames) const Q_DECL_OVERRIDE;
+    virtual QStringList entryList(QDir::Filters filters, const QStringList &filterNames) const override;
 
-    virtual bool caseSensitive() const Q_DECL_OVERRIDE;
+    virtual bool caseSensitive() const override;
 
-    virtual FileFlags fileFlags(FileFlags type) const Q_DECL_OVERRIDE;
+    virtual FileFlags fileFlags(FileFlags type) const override;
 
-    virtual bool setPermissions(uint perms) Q_DECL_OVERRIDE;
+    virtual bool setPermissions(uint perms) override;
 
-    virtual QString fileName(QAbstractFileEngine::FileName file) const Q_DECL_OVERRIDE;
+    virtual QString fileName(QAbstractFileEngine::FileName file) const override;
 
-    virtual uint ownerId(FileOwner) const Q_DECL_OVERRIDE;
-    virtual QString owner(FileOwner) const Q_DECL_OVERRIDE;
+    virtual uint ownerId(FileOwner) const override;
+    virtual QString owner(FileOwner) const override;
 
-    virtual QDateTime fileTime(FileTime time) const Q_DECL_OVERRIDE;
+    virtual QDateTime fileTime(FileTime time) const override;
 
-    virtual Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) Q_DECL_OVERRIDE;
-    virtual Iterator *endEntryList() Q_DECL_OVERRIDE;
+    virtual Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override;
+    virtual Iterator *endEntryList() override;
 
-    bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0) Q_DECL_OVERRIDE;
-    bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE;
+    bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0) override;
+    bool supportsExtension(Extension extension) const override;
 };
 
 QT_END_NAMESPACE