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>

10 files changed, 74 insertions, 74 deletions

diff --git a/src/gui/image/qicon_p.h b/src/gui/image/qicon_p.h
index aa358e88af..e384ff9e49 100644
--- a/src/gui/image/qicon_p.h
+++ b/src/gui/image/qicon_p.h
@@ -112,18 +112,18 @@ public:
     QPixmapIconEngine();
     QPixmapIconEngine(const QPixmapIconEngine &);
     ~QPixmapIconEngine();
-    void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE;
-    QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE;
+    void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State state) override;
+    QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) override;
     QPixmapIconEngineEntry *bestMatch(const QSize &size, QIcon::Mode mode, QIcon::State state, bool sizeOnly);
-    QSize actualSize(const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE;
-    void addPixmap(const QPixmap &pixmap, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE;
-    void addFile(const QString &fileName, const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE;
-
-    QString key() const Q_DECL_OVERRIDE;
-    QIconEngine *clone() const Q_DECL_OVERRIDE;
-    bool read(QDataStream &in) Q_DECL_OVERRIDE;
-    bool write(QDataStream &out) const Q_DECL_OVERRIDE;
-    void virtual_hook(int id, void *data) Q_DECL_OVERRIDE;
+    QSize actualSize(const QSize &size, QIcon::Mode mode, QIcon::State state) override;
+    void addPixmap(const QPixmap &pixmap, QIcon::Mode mode, QIcon::State state) override;
+    void addFile(const QString &fileName, const QSize &size, QIcon::Mode mode, QIcon::State state) override;
+
+    QString key() const override;
+    QIconEngine *clone() const override;
+    bool read(QDataStream &in) override;
+    bool write(QDataStream &out) const override;
+    void virtual_hook(int id, void *data) override;
 
 private:
     QPixmapIconEngineEntry *tryMatch(const QSize &size, QIcon::Mode mode, QIcon::State state);
diff --git a/src/gui/image/qiconloader_p.h b/src/gui/image/qiconloader_p.h
index 9398bca585..0007437ee9 100644
--- a/src/gui/image/qiconloader_p.h
+++ b/src/gui/image/qiconloader_p.h
@@ -101,13 +101,13 @@ public:
 
 struct ScalableEntry : public QIconLoaderEngineEntry
 {
-    QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE;
+    QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) override;
     QIcon svgIcon;
 };
 
 struct PixmapEntry : public QIconLoaderEngineEntry
 {
-    QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE;
+    QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) override;
     QPixmap basePixmap;
 };
 
@@ -125,20 +125,20 @@ public:
     QIconLoaderEngine(const QString& iconName = QString());
     ~QIconLoaderEngine();
 
-    void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE;
-    QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE;
-    QSize actualSize(const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE;
-    QIconEngine *clone() const Q_DECL_OVERRIDE;
-    bool read(QDataStream &in) Q_DECL_OVERRIDE;
-    bool write(QDataStream &out) const Q_DECL_OVERRIDE;
+    void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State state) override;
+    QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) override;
+    QSize actualSize(const QSize &size, QIcon::Mode mode, QIcon::State state) override;
+    QIconEngine *clone() const override;
+    bool read(QDataStream &in) override;
+    bool write(QDataStream &out) const override;
 
     Q_GUI_EXPORT static QIconLoaderEngineEntry *entryForSize(const QThemeIconInfo &info, const QSize &size, int scale = 1);
 
 private:
-    QString key() const Q_DECL_OVERRIDE;
+    QString key() const override;
     bool hasIcon() const;
     void ensureLoaded();
-    void virtual_hook(int id, void *data) Q_DECL_OVERRIDE;
+    void virtual_hook(int id, void *data) override;
 
     QIconLoaderEngine(const QIconLoaderEngine &other);
     QThemeIconInfo m_info;
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index eccff480bb..dd1751427c 100644
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -164,7 +164,7 @@ public:
 
     bool isNull() const;
 
-    int devType() const Q_DECL_OVERRIDE;
+    int devType() const override;
 
     bool operator==(const QImage &) const;
     bool operator!=(const QImage &) const;
@@ -311,7 +311,7 @@ public:
 #endif
     qint64 cacheKey() const;
 
-    QPaintEngine *paintEngine() const Q_DECL_OVERRIDE;
+    QPaintEngine *paintEngine() const override;
 
     // Auxiliary data
     int dotsPerMeterX() const;
@@ -349,7 +349,7 @@ public:
 #endif
 
 protected:
-    virtual int metric(PaintDeviceMetric metric) const Q_DECL_OVERRIDE;
+    virtual int metric(PaintDeviceMetric metric) const override;
     QImage mirrored_helper(bool horizontal, bool vertical) const;
     QImage rgbSwapped_helper() const;
     void mirrored_inplace(bool horizontal, bool vertical);
diff --git a/src/gui/image/qpaintengine_pic_p.h b/src/gui/image/qpaintengine_pic_p.h
index 7c690c1498..c3044796ad 100644
--- a/src/gui/image/qpaintengine_pic_p.h
+++ b/src/gui/image/qpaintengine_pic_p.h
@@ -68,10 +68,10 @@ public:
     QPicturePaintEngine();
     ~QPicturePaintEngine();
 
-    bool begin(QPaintDevice *pdev) Q_DECL_OVERRIDE;
-    bool end() Q_DECL_OVERRIDE;
+    bool begin(QPaintDevice *pdev) override;
+    bool end() override;
 
-    void updateState(const QPaintEngineState &state) Q_DECL_OVERRIDE;
+    void updateState(const QPaintEngineState &state) override;
 
     void updatePen(const QPen &pen);
     void updateBrush(const QBrush &brush);
@@ -86,18 +86,18 @@ public:
     void updateClipEnabled(bool enabled);
     void updateOpacity(qreal opacity);
 
-    void drawEllipse(const QRectF &rect) Q_DECL_OVERRIDE;
-    void drawPath(const QPainterPath &path) Q_DECL_OVERRIDE;
-    void drawPolygon(const QPointF *points, int numPoints, PolygonDrawMode mode) Q_DECL_OVERRIDE;
+    void drawEllipse(const QRectF &rect) override;
+    void drawPath(const QPainterPath &path) override;
+    void drawPolygon(const QPointF *points, int numPoints, PolygonDrawMode mode) override;
     using QPaintEngine::drawPolygon;
 
-    void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) Q_DECL_OVERRIDE;
-    void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s) Q_DECL_OVERRIDE;
+    void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override;
+    void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s) override;
     void drawImage(const QRectF &r, const QImage &image, const QRectF &sr,
-                   Qt::ImageConversionFlags flags = Qt::AutoColor) Q_DECL_OVERRIDE;
-    void drawTextItem(const QPointF &p, const QTextItem &ti) Q_DECL_OVERRIDE;
+                   Qt::ImageConversionFlags flags = Qt::AutoColor) override;
+    void drawTextItem(const QPointF &p, const QTextItem &ti) override;
 
-    Type type() const Q_DECL_OVERRIDE { return Picture; }
+    Type type() const override { return Picture; }
 
 protected:
     QPicturePaintEngine(QPaintEnginePrivate &dptr);
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp
index bf628e7571..7aa221948e 100644
--- a/src/gui/image/qpicture.cpp
+++ b/src/gui/image/qpicture.cpp
@@ -456,8 +456,8 @@ public:
     QFakeDevice() { dpi_x = qt_defaultDpiX(); dpi_y = qt_defaultDpiY(); }
     void setDpiX(int dpi) { dpi_x = dpi; }
     void setDpiY(int dpi) { dpi_y = dpi; }
-    QPaintEngine *paintEngine() const Q_DECL_OVERRIDE { return 0; }
-    int metric(PaintDeviceMetric m) const Q_DECL_OVERRIDE
+    QPaintEngine *paintEngine() const override { return 0; }
+    int metric(PaintDeviceMetric m) const override
     {
         switch(m) {
             case PdmPhysicalDpiX:
diff --git a/src/gui/image/qpicture.h b/src/gui/image/qpicture.h
index db2b767efe..303806809d 100644
--- a/src/gui/image/qpicture.h
+++ b/src/gui/image/qpicture.h
@@ -62,7 +62,7 @@ public:
 
     bool isNull() const;
 
-    int devType() const Q_DECL_OVERRIDE;
+    int devType() const override;
     uint size() const;
     const char* data() const;
     virtual void setData(const char* data, uint size);
@@ -98,12 +98,12 @@ public:
     static QT_DEPRECATED QStringList outputFormatList();
 #endif // QT_DEPRECATED_SINCE(5, 10)
 
-    QPaintEngine *paintEngine() const Q_DECL_OVERRIDE;
+    QPaintEngine *paintEngine() const override;
 
 protected:
     QPicture(QPicturePrivate &data);
 
-    int metric(PaintDeviceMetric m) const Q_DECL_OVERRIDE;
+    int metric(PaintDeviceMetric m) const override;
 
 private:
     bool exec(QPainter *p, QDataStream &ds, int i);
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index d651b57fd5..822773d3c7 100644
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -83,7 +83,7 @@ public:
     operator QVariant() const;
 
     bool isNull() const;
-    int devType() const Q_DECL_OVERRIDE;
+    int devType() const override;
 
     int width() const;
     int height() const;
@@ -162,7 +162,7 @@ public:
 
     bool isQBitmap() const;
 
-    QPaintEngine *paintEngine() const Q_DECL_OVERRIDE;
+    QPaintEngine *paintEngine() const override;
 
     inline bool operator!() const { return isNull(); }
 
@@ -172,7 +172,7 @@ public:
 #endif
 
 protected:
-    int metric(PaintDeviceMetric) const Q_DECL_OVERRIDE;
+    int metric(PaintDeviceMetric) const override;
     static QPixmap fromImageInPlace(QImage &image, Qt::ImageConversionFlags flags = Qt::AutoColor);
 
 private:
diff --git a/src/gui/image/qpixmap_blitter_p.h b/src/gui/image/qpixmap_blitter_p.h
index 9889cfb8ec..d70cbcdcc3 100644
--- a/src/gui/image/qpixmap_blitter_p.h
+++ b/src/gui/image/qpixmap_blitter_p.h
@@ -69,17 +69,17 @@ public:
     QBlittable *blittable() const;
     void setBlittable(QBlittable *blittable);
 
-    void resize(int width, int height) Q_DECL_OVERRIDE;
-    int metric(QPaintDevice::PaintDeviceMetric metric) const Q_DECL_OVERRIDE;
-    void fill(const QColor &color) Q_DECL_OVERRIDE;
-    QImage *buffer() Q_DECL_OVERRIDE;
-    QImage toImage() const Q_DECL_OVERRIDE;
-    bool hasAlphaChannel() const Q_DECL_OVERRIDE;
-    void fromImage(const QImage &image, Qt::ImageConversionFlags flags) Q_DECL_OVERRIDE;
-    qreal devicePixelRatio() const Q_DECL_OVERRIDE;
-    void setDevicePixelRatio(qreal scaleFactor) Q_DECL_OVERRIDE;
-
-    QPaintEngine *paintEngine() const Q_DECL_OVERRIDE;
+    void resize(int width, int height) override;
+    int metric(QPaintDevice::PaintDeviceMetric metric) const override;
+    void fill(const QColor &color) override;
+    QImage *buffer() override;
+    QImage toImage() const override;
+    bool hasAlphaChannel() const override;
+    void fromImage(const QImage &image, Qt::ImageConversionFlags flags) override;
+    qreal devicePixelRatio() const override;
+    void setDevicePixelRatio(qreal scaleFactor) override;
+
+    QPaintEngine *paintEngine() const override;
 
     void markRasterOverlay(const QRectF &);
     void markRasterOverlay(const QPointF &, const QTextItem &);
diff --git a/src/gui/image/qpixmap_raster_p.h b/src/gui/image/qpixmap_raster_p.h
index 6ea965a324..cff962181a 100644
--- a/src/gui/image/qpixmap_raster_p.h
+++ b/src/gui/image/qpixmap_raster_p.h
@@ -63,28 +63,28 @@ public:
     QRasterPlatformPixmap(PixelType type);
     ~QRasterPlatformPixmap();
 
-    QPlatformPixmap *createCompatiblePlatformPixmap() const Q_DECL_OVERRIDE;
-
-    void resize(int width, int height) Q_DECL_OVERRIDE;
-    bool fromData(const uchar *buffer, uint len, const char *format, Qt::ImageConversionFlags flags) Q_DECL_OVERRIDE;
-    void fromImage(const QImage &image, Qt::ImageConversionFlags flags) Q_DECL_OVERRIDE;
-    void fromImageInPlace(QImage &image, Qt::ImageConversionFlags flags) Q_DECL_OVERRIDE;
-    void fromImageReader(QImageReader *imageReader, Qt::ImageConversionFlags flags) Q_DECL_OVERRIDE;
-
-    void copy(const QPlatformPixmap *data, const QRect &rect) Q_DECL_OVERRIDE;
-    bool scroll(int dx, int dy, const QRect &rect) Q_DECL_OVERRIDE;
-    void fill(const QColor &color) Q_DECL_OVERRIDE;
-    bool hasAlphaChannel() const Q_DECL_OVERRIDE;
-    QImage toImage() const Q_DECL_OVERRIDE;
-    QImage toImage(const QRect &rect) const Q_DECL_OVERRIDE;
-    QPaintEngine* paintEngine() const Q_DECL_OVERRIDE;
-    QImage* buffer() Q_DECL_OVERRIDE;
-    qreal devicePixelRatio() const Q_DECL_OVERRIDE;
-    void setDevicePixelRatio(qreal scaleFactor) Q_DECL_OVERRIDE;
+    QPlatformPixmap *createCompatiblePlatformPixmap() const override;
+
+    void resize(int width, int height) override;
+    bool fromData(const uchar *buffer, uint len, const char *format, Qt::ImageConversionFlags flags) override;
+    void fromImage(const QImage &image, Qt::ImageConversionFlags flags) override;
+    void fromImageInPlace(QImage &image, Qt::ImageConversionFlags flags) override;
+    void fromImageReader(QImageReader *imageReader, Qt::ImageConversionFlags flags) override;
+
+    void copy(const QPlatformPixmap *data, const QRect &rect) override;
+    bool scroll(int dx, int dy, const QRect &rect) override;
+    void fill(const QColor &color) override;
+    bool hasAlphaChannel() const override;
+    QImage toImage() const override;
+    QImage toImage(const QRect &rect) const override;
+    QPaintEngine* paintEngine() const override;
+    QImage* buffer() override;
+    qreal devicePixelRatio() const override;
+    void setDevicePixelRatio(qreal scaleFactor) override;
 
 
 protected:
-    int metric(QPaintDevice::PaintDeviceMetric metric) const Q_DECL_OVERRIDE;
+    int metric(QPaintDevice::PaintDeviceMetric metric) const override;
     void createPixmapForImage(QImage sourceImage, Qt::ImageConversionFlags flags);
     void setImage(const QImage &image);
     QImage image;
diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp
index 742aa31ba9..4b8b1203d6 100644
--- a/src/gui/image/qpixmapcache.cpp
+++ b/src/gui/image/qpixmapcache.cpp
@@ -193,7 +193,7 @@ public:
     QPMCache();
     ~QPMCache();
 
-    void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE;
+    void timerEvent(QTimerEvent *) override;
     bool insert(const QString& key, const QPixmap &pixmap, int cost);
     QPixmapCache::Key insert(const QPixmap &pixmap, int cost);
     bool replace(const QPixmapCache::Key &key, const QPixmap &pixmap, int cost);