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>

6 files changed, 47 insertions, 47 deletions

diff --git a/src/plugins/printsupport/cups/main.cpp b/src/plugins/printsupport/cups/main.cpp
index 39309a0031..cf263a7f52 100644
--- a/src/plugins/printsupport/cups/main.cpp
+++ b/src/plugins/printsupport/cups/main.cpp
@@ -52,7 +52,7 @@ class QCupsPrinterSupportPlugin : public QPlatformPrinterSupportPlugin
 
 public:
     QStringList keys() const;
-    QPlatformPrinterSupport *create(const QString &) Q_DECL_OVERRIDE;
+    QPlatformPrinterSupport *create(const QString &) override;
 };
 
 QStringList QCupsPrinterSupportPlugin::keys() const
diff --git a/src/plugins/printsupport/cups/qcupsprintengine_p.h b/src/plugins/printsupport/cups/qcupsprintengine_p.h
index 0ebf6e7a0f..c99c48c7ea 100644
--- a/src/plugins/printsupport/cups/qcupsprintengine_p.h
+++ b/src/plugins/printsupport/cups/qcupsprintengine_p.h
@@ -72,8 +72,8 @@ public:
     virtual ~QCupsPrintEngine();
 
     // reimplementations QPdfPrintEngine
-    void setProperty(PrintEnginePropertyKey key, const QVariant &value) Q_DECL_OVERRIDE;
-    QVariant property(PrintEnginePropertyKey key) const Q_DECL_OVERRIDE;
+    void setProperty(PrintEnginePropertyKey key, const QVariant &value) override;
+    QVariant property(PrintEnginePropertyKey key) const override;
     // end reimplementations QPdfPrintEngine
 
 private:
@@ -87,8 +87,8 @@ public:
     QCupsPrintEnginePrivate(QPrinter::PrinterMode m);
     ~QCupsPrintEnginePrivate();
 
-    bool openPrintDevice() Q_DECL_OVERRIDE;
-    void closePrintDevice() Q_DECL_OVERRIDE;
+    bool openPrintDevice() override;
+    void closePrintDevice() override;
 
 private:
     Q_DISABLE_COPY(QCupsPrintEnginePrivate)
diff --git a/src/plugins/printsupport/cups/qcupsprintersupport_p.h b/src/plugins/printsupport/cups/qcupsprintersupport_p.h
index df6507d324..42de28aec0 100644
--- a/src/plugins/printsupport/cups/qcupsprintersupport_p.h
+++ b/src/plugins/printsupport/cups/qcupsprintersupport_p.h
@@ -64,12 +64,12 @@ public:
     QCupsPrinterSupport();
     ~QCupsPrinterSupport();
 
-    QPrintEngine *createNativePrintEngine(QPrinter::PrinterMode printerMode, const QString &deviceId = QString()) Q_DECL_OVERRIDE;
-    QPaintEngine *createPaintEngine(QPrintEngine *printEngine, QPrinter::PrinterMode) Q_DECL_OVERRIDE;
+    QPrintEngine *createNativePrintEngine(QPrinter::PrinterMode printerMode, const QString &deviceId = QString()) override;
+    QPaintEngine *createPaintEngine(QPrintEngine *printEngine, QPrinter::PrinterMode) override;
 
-    QPrintDevice createPrintDevice(const QString &id) Q_DECL_OVERRIDE;
-    QStringList availablePrintDeviceIds() const Q_DECL_OVERRIDE;
-    QString defaultPrintDeviceId() const Q_DECL_OVERRIDE;
+    QPrintDevice createPrintDevice(const QString &id) override;
+    QStringList availablePrintDeviceIds() const override;
+    QString defaultPrintDeviceId() const override;
 
 private:
     QString cupsOption(int i, const QString &key) const;
diff --git a/src/plugins/printsupport/cups/qppdprintdevice.h b/src/plugins/printsupport/cups/qppdprintdevice.h
index fab7077ce4..3cd7518b14 100644
--- a/src/plugins/printsupport/cups/qppdprintdevice.h
+++ b/src/plugins/printsupport/cups/qppdprintdevice.h
@@ -69,35 +69,35 @@ public:
     explicit QPpdPrintDevice(const QString &id);
     virtual ~QPpdPrintDevice();
 
-    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;
 
 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 loadPageSizes() const override;
+    void loadResolutions() const override;
+    void loadInputSlots() const override;
+    void loadOutputBins() const override;
+    void loadDuplexModes() const override;
+    void loadColorModes() const override;
 #ifndef QT_NO_MIMETYPE
-    void loadMimeTypes() const Q_DECL_OVERRIDE;
+    void loadMimeTypes() const override;
 #endif
 
 private:
diff --git a/src/plugins/printsupport/windows/qwindowsprintdevice.h b/src/plugins/printsupport/windows/qwindowsprintdevice.h
index d95a4316cc..6b51ee8785 100644
--- a/src/plugins/printsupport/windows/qwindowsprintdevice.h
+++ b/src/plugins/printsupport/windows/qwindowsprintdevice.h
@@ -64,34 +64,34 @@ public:
     explicit QWindowsPrintDevice(const QString &id);
     virtual ~QWindowsPrintDevice();
 
-    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::DuplexMode defaultDuplexMode() const Q_DECL_OVERRIDE;
+    QPrint::DuplexMode defaultDuplexMode() const override;
 
-    QPrint::ColorMode defaultColorMode() const Q_DECL_OVERRIDE;
+    QPrint::ColorMode defaultColorMode() const override;
 
     static QStringList availablePrintDeviceIds();
     static QString defaultPrintDeviceId();
 
 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 loadPageSizes() const override;
+    void loadResolutions() const override;
+    void loadInputSlots() const override;
+    void loadOutputBins() const override;
+    void loadDuplexModes() const override;
+    void loadColorModes() const override;
 
 private:
     HANDLE m_hPrinter;
diff --git a/src/plugins/printsupport/windows/qwindowsprintersupport.h b/src/plugins/printsupport/windows/qwindowsprintersupport.h
index 84b60a8207..c42e7aa551 100644
--- a/src/plugins/printsupport/windows/qwindowsprintersupport.h
+++ b/src/plugins/printsupport/windows/qwindowsprintersupport.h
@@ -50,12 +50,12 @@ public:
     QWindowsPrinterSupport();
     ~QWindowsPrinterSupport();
 
-    QPrintEngine *createNativePrintEngine(QPrinter::PrinterMode printerMode, const QString &deviceId = QString()) Q_DECL_OVERRIDE;
-    QPaintEngine *createPaintEngine(QPrintEngine *printEngine, QPrinter::PrinterMode) Q_DECL_OVERRIDE;
+    QPrintEngine *createNativePrintEngine(QPrinter::PrinterMode printerMode, const QString &deviceId = QString()) override;
+    QPaintEngine *createPaintEngine(QPrintEngine *printEngine, QPrinter::PrinterMode) override;
 
-    QPrintDevice createPrintDevice(const QString &id) Q_DECL_OVERRIDE;
-    QStringList availablePrintDeviceIds() const Q_DECL_OVERRIDE;
-    QString defaultPrintDeviceId() const Q_DECL_OVERRIDE;
+    QPrintDevice createPrintDevice(const QString &id) override;
+    QStringList availablePrintDeviceIds() const override;
+    QString defaultPrintDeviceId() const override;
 };
 
 QT_END_NAMESPACE