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

diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar_p.h b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar_p.h
index 8266a395f5..364e7da4b6 100644
--- a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar_p.h
+++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar_p.h
@@ -67,12 +67,12 @@ public:
     QDBusMenuBar();
     virtual ~QDBusMenuBar();
 
-    void insertMenu(QPlatformMenu *menu, QPlatformMenu *before) Q_DECL_OVERRIDE;
-    void removeMenu(QPlatformMenu *menu) Q_DECL_OVERRIDE;
-    void syncMenu(QPlatformMenu *menu) Q_DECL_OVERRIDE;
-    void handleReparent(QWindow *newParentWindow) Q_DECL_OVERRIDE;
-    QPlatformMenu *menuForTag(quintptr tag) const Q_DECL_OVERRIDE;
-    QPlatformMenu *createMenu() const Q_DECL_OVERRIDE;
+    void insertMenu(QPlatformMenu *menu, QPlatformMenu *before) override;
+    void removeMenu(QPlatformMenu *menu) override;
+    void syncMenu(QPlatformMenu *menu) override;
+    void handleReparent(QWindow *newParentWindow) override;
+    QPlatformMenu *menuForTag(quintptr tag) const override;
+    QPlatformMenu *createMenu() const override;
 
 private:
     QDBusPlatformMenu *m_menu;
diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h
index 5458e2fdd5..8a31f82fb0 100644
--- a/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h
+++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h
@@ -77,31 +77,31 @@ public:
     ~QDBusPlatformMenuItem();
 
     const QString text() const { return m_text; }
-    void setText(const QString &text) Q_DECL_OVERRIDE;
+    void setText(const QString &text) override;
     QIcon icon() const { return m_icon; }
-    void setIcon(const QIcon &icon) Q_DECL_OVERRIDE;
+    void setIcon(const QIcon &icon) override;
     const QPlatformMenu *menu() const { return m_subMenu; }
-    void setMenu(QPlatformMenu *menu) Q_DECL_OVERRIDE;
+    void setMenu(QPlatformMenu *menu) override;
     bool isEnabled() const { return m_isEnabled; }
-    void setEnabled(bool enabled) Q_DECL_OVERRIDE;
+    void setEnabled(bool enabled) override;
     bool isVisible() const { return m_isVisible; }
-    void setVisible(bool isVisible) Q_DECL_OVERRIDE;
+    void setVisible(bool isVisible) override;
     bool isSeparator() const { return m_isSeparator; }
-    void setIsSeparator(bool isSeparator) Q_DECL_OVERRIDE;
-    void setFont(const QFont &font) Q_DECL_OVERRIDE { Q_UNUSED(font); }
-    void setRole(MenuRole role) Q_DECL_OVERRIDE;
+    void setIsSeparator(bool isSeparator) override;
+    void setFont(const QFont &font) override { Q_UNUSED(font); }
+    void setRole(MenuRole role) override;
     bool isCheckable() const { return m_isCheckable; }
-    void setCheckable(bool checkable) Q_DECL_OVERRIDE;
+    void setCheckable(bool checkable) override;
     bool isChecked() const { return m_isChecked; }
-    void setChecked(bool isChecked) Q_DECL_OVERRIDE;
+    void setChecked(bool isChecked) override;
     bool hasExclusiveGroup() const { return m_hasExclusiveGroup; }
-    void setHasExclusiveGroup(bool hasExclusiveGroup) Q_DECL_OVERRIDE;
+    void setHasExclusiveGroup(bool hasExclusiveGroup) override;
 #ifndef QT_NO_SHORTCUT
     QKeySequence shortcut() const { return m_shortcut; }
-    void setShortcut(const QKeySequence& shortcut) Q_DECL_OVERRIDE;
+    void setShortcut(const QKeySequence& shortcut) override;
 #endif
-    void setIconSize(int size) Q_DECL_OVERRIDE { Q_UNUSED(size); }
-    void setNativeContents(WId item) Q_DECL_OVERRIDE { Q_UNUSED(item); }
+    void setIconSize(int size) override { Q_UNUSED(size); }
+    void setNativeContents(WId item) override { Q_UNUSED(item); }
 
     int dbusID() const { return m_dbusID; }
 
@@ -133,35 +133,35 @@ class QDBusPlatformMenu : public QPlatformMenu
 public:
     QDBusPlatformMenu();
     ~QDBusPlatformMenu();
-    void insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before) Q_DECL_OVERRIDE;
-    void removeMenuItem(QPlatformMenuItem *menuItem) Q_DECL_OVERRIDE;
+    void insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before) override;
+    void removeMenuItem(QPlatformMenuItem *menuItem) override;
     void syncSubMenu(const QDBusPlatformMenu *menu);
-    void syncMenuItem(QPlatformMenuItem *menuItem) Q_DECL_OVERRIDE;
-    void syncSeparatorsCollapsible(bool enable) Q_DECL_OVERRIDE { Q_UNUSED(enable); }
+    void syncMenuItem(QPlatformMenuItem *menuItem) override;
+    void syncSeparatorsCollapsible(bool enable) override { Q_UNUSED(enable); }
 
     const QString text() const { return m_text; }
-    void setText(const QString &text) Q_DECL_OVERRIDE;
+    void setText(const QString &text) override;
     QIcon icon() const { return m_icon; }
-    void setIcon(const QIcon &icon) Q_DECL_OVERRIDE;
-    bool isEnabled() const Q_DECL_OVERRIDE { return m_isEnabled; }
-    void setEnabled(bool enabled) Q_DECL_OVERRIDE;
+    void setIcon(const QIcon &icon) override;
+    bool isEnabled() const override { return m_isEnabled; }
+    void setEnabled(bool enabled) override;
     bool isVisible() const { return m_isVisible; }
-    void setVisible(bool visible) Q_DECL_OVERRIDE;
-    void setMinimumWidth(int width) Q_DECL_OVERRIDE { Q_UNUSED(width); }
-    void setFont(const QFont &font) Q_DECL_OVERRIDE { Q_UNUSED(font); }
-    void setMenuType(MenuType type) Q_DECL_OVERRIDE { Q_UNUSED(type); }
+    void setVisible(bool visible) override;
+    void setMinimumWidth(int width) override { Q_UNUSED(width); }
+    void setFont(const QFont &font) override { Q_UNUSED(font); }
+    void setMenuType(MenuType type) override { Q_UNUSED(type); }
     void setContainingMenuItem(QDBusPlatformMenuItem *item);
 
-    void showPopup(const QWindow *parentWindow, const QRect &targetRect, const QPlatformMenuItem *item) Q_DECL_OVERRIDE;
+    void showPopup(const QWindow *parentWindow, const QRect &targetRect, const QPlatformMenuItem *item) override;
 
-    void dismiss() Q_DECL_OVERRIDE { } // Closes this and all its related menu popups
+    void dismiss() override { } // Closes this and all its related menu popups
 
-    QPlatformMenuItem *menuItemAt(int position) const Q_DECL_OVERRIDE;
-    QPlatformMenuItem *menuItemForTag(quintptr tag) const Q_DECL_OVERRIDE;
+    QPlatformMenuItem *menuItemAt(int position) const override;
+    QPlatformMenuItem *menuItemForTag(quintptr tag) const override;
     const QList<QDBusPlatformMenuItem *> items() const;
 
-    QPlatformMenuItem *createMenuItem() const Q_DECL_OVERRIDE;
-    QPlatformMenu *createSubMenu() const Q_DECL_OVERRIDE;
+    QPlatformMenuItem *createMenuItem() const override;
+    QPlatformMenu *createSubMenu() const override;
 
     uint revision() const { return m_revision; }
 
diff --git a/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h
index 4c9bc8f7e3..7034a7edb4 100644
--- a/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h
+++ b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h
@@ -91,18 +91,18 @@ public:
 
     QDBusMenuConnection * dBusConnection();
 
-    void init() Q_DECL_OVERRIDE;
-    void cleanup() Q_DECL_OVERRIDE;
-    void updateIcon(const QIcon &icon) Q_DECL_OVERRIDE;
-    void updateToolTip(const QString &tooltip) Q_DECL_OVERRIDE;
-    void updateMenu(QPlatformMenu *menu) Q_DECL_OVERRIDE;
-    QPlatformMenu *createMenu() const Q_DECL_OVERRIDE;
+    void init() override;
+    void cleanup() override;
+    void updateIcon(const QIcon &icon) override;
+    void updateToolTip(const QString &tooltip) override;
+    void updateMenu(QPlatformMenu *menu) override;
+    QPlatformMenu *createMenu() const override;
     void showMessage(const QString &title, const QString &msg,
-                     const QIcon &icon, MessageIcon iconType, int msecs) Q_DECL_OVERRIDE;
+                     const QIcon &icon, MessageIcon iconType, int msecs) override;
 
-    bool isSystemTrayAvailable() const Q_DECL_OVERRIDE;
-    bool supportsMessages() const Q_DECL_OVERRIDE { return true; }
-    QRect geometry() const Q_DECL_OVERRIDE { return QRect(); }
+    bool isSystemTrayAvailable() const override;
+    bool supportsMessages() const override { return true; }
+    QRect geometry() const override { return QRect(); }
 
     QString category() const { return m_category; }
     QString status() const { return m_status; }
diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h
index da13390662..186e5a7dff 100644
--- a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h
+++ b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h
@@ -81,15 +81,15 @@ public:
     static QPlatformTheme *createUnixTheme(const QString &name);
     static QStringList themeNames();
 
-    const QFont *font(Font type) const Q_DECL_OVERRIDE;
-    QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE;
+    const QFont *font(Font type) const override;
+    QVariant themeHint(ThemeHint hint) const override;
 
     static QStringList xdgIconThemePaths();
 #ifndef QT_NO_DBUS
-    QPlatformMenuBar *createPlatformMenuBar() const Q_DECL_OVERRIDE;
+    QPlatformMenuBar *createPlatformMenuBar() const override;
 #endif
 #if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON)
-    QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const Q_DECL_OVERRIDE;
+    QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const override;
 #endif
 
     static const char *name;
@@ -105,19 +105,19 @@ public:
     QKdeTheme(const QStringList& kdeDirs, int kdeVersion);
 
     static QPlatformTheme *createKdeTheme();
-    QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE;
+    QVariant themeHint(ThemeHint hint) const override;
 
     QIcon fileIcon(const QFileInfo &fileInfo,
                    QPlatformTheme::IconOptions iconOptions = 0) const override;
 
-    const QPalette *palette(Palette type = SystemPalette) const Q_DECL_OVERRIDE;
+    const QPalette *palette(Palette type = SystemPalette) const override;
 
-    const QFont *font(Font type) const Q_DECL_OVERRIDE;
+    const QFont *font(Font type) const override;
 #ifndef QT_NO_DBUS
-    QPlatformMenuBar *createPlatformMenuBar() const Q_DECL_OVERRIDE;
+    QPlatformMenuBar *createPlatformMenuBar() const override;
 #endif
 #if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON)
-    QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const Q_DECL_OVERRIDE;
+    QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const override;
 #endif
 
     static const char *name;
@@ -131,18 +131,18 @@ class QGnomeTheme : public QPlatformTheme
     Q_DECLARE_PRIVATE(QGnomeTheme)
 public:
     QGnomeTheme();
-    QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE;
+    QVariant themeHint(ThemeHint hint) const override;
     QIcon fileIcon(const QFileInfo &fileInfo,
                    QPlatformTheme::IconOptions = 0) const override;
-    const QFont *font(Font type) const Q_DECL_OVERRIDE;
-    QString standardButtonText(int button) const Q_DECL_OVERRIDE;
+    const QFont *font(Font type) const override;
+    QString standardButtonText(int button) const override;
 
     virtual QString gtkFontName() const;
 #ifndef QT_NO_DBUS
-    QPlatformMenuBar *createPlatformMenuBar() const Q_DECL_OVERRIDE;
+    QPlatformMenuBar *createPlatformMenuBar() const override;
 #endif
 #if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON)
-    QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const Q_DECL_OVERRIDE;
+    QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const override;
 #endif
 
     static const char *name;