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

diff --git a/src/plugins/platforms/cocoa/qcocoaprintdevice.h b/src/plugins/platforms/cocoa/qcocoaprintdevice.h
index c726cca4e5..20b27f3286 100644
--- a/src/plugins/platforms/cocoa/qcocoaprintdevice.h
+++ b/src/plugins/platforms/cocoa/qcocoaprintdevice.h
@@ -68,37 +68,37 @@ public:
     explicit QCocoaPrintDevice(const QString &id);
     virtual ~QCocoaPrintDevice();
 
-    bool isValid() const Q_DECL_OVERRIDE;
-    bool isDefault() const Q_DECL_OVERRIDE;
+    bool isValid() const override;
+    bool isDefault() const override;
 
-    QPrint::DeviceState state() const Q_DECL_OVERRIDE;
+    QPrint::DeviceState state() const override;
 
-    QPageSize defaultPageSize() const Q_DECL_OVERRIDE;
+    QPageSize defaultPageSize() const override;
 
     QMarginsF printableMargins(const QPageSize &pageSize, QPageLayout::Orientation orientation,
-                               int resolution) const Q_DECL_OVERRIDE;
+                               int resolution) const override;
 
-    int defaultResolution() const Q_DECL_OVERRIDE;
+    int defaultResolution() const override;
 
-    QPrint::InputSlot defaultInputSlot() const Q_DECL_OVERRIDE;
+    QPrint::InputSlot defaultInputSlot() const override;
 
-    QPrint::OutputBin defaultOutputBin() const Q_DECL_OVERRIDE;
+    QPrint::OutputBin defaultOutputBin() const override;
 
-    QPrint::DuplexMode defaultDuplexMode() const Q_DECL_OVERRIDE;
+    QPrint::DuplexMode defaultDuplexMode() const override;
 
-    QPrint::ColorMode defaultColorMode() const Q_DECL_OVERRIDE;
+    QPrint::ColorMode defaultColorMode() const override;
 
     PMPrinter macPrinter() const;
     PMPaper macPaper(const QPageSize &pageSize) const;
 
 protected:
-    void loadPageSizes() const Q_DECL_OVERRIDE;
-    void loadResolutions() const Q_DECL_OVERRIDE;
-    void loadInputSlots() const Q_DECL_OVERRIDE;
-    void loadOutputBins() const Q_DECL_OVERRIDE;
-    void loadDuplexModes() const Q_DECL_OVERRIDE;
-    void loadColorModes() const Q_DECL_OVERRIDE;
-    void loadMimeTypes() const Q_DECL_OVERRIDE;
+    void loadPageSizes() const override;
+    void loadResolutions() const override;
+    void loadInputSlots() const override;
+    void loadOutputBins() const override;
+    void loadDuplexModes() const override;
+    void loadColorModes() const override;
+    void loadMimeTypes() const override;
 
 private:
     QPageSize createPageSize(const PMPaper &paper) const;