Windows/Direct2D platform plugins: Add Q_DECL_OVERRIDE.

Replace old virtual declarations by Q_DECL_OVERRIDE where
applicable.
Errors discovered: QWindowsScreen::primaryOrientation() did not
overwrite any method, changed to orientation().

Task-number: QTBUG-38858
Task-number: QTBUG-38993
Change-Id: Ie85d5235f3cd35c7a24cac3c1c7693c6508b1009
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>

1 files changed, 12 insertions, 12 deletions

diff --git a/src/plugins/platforms/windows/qwindowsscreen.h b/src/plugins/platforms/windows/qwindowsscreen.h
index 00f0b316c2..c9d8a5662c 100644
--- a/src/plugins/platforms/windows/qwindowsscreen.h
+++ b/src/plugins/platforms/windows/qwindowsscreen.h
@@ -88,24 +88,24 @@ public:
 
     static QWindowsScreen *screenOf(const QWindow *w = 0);
 
-    virtual QRect geometry() const { return m_data.geometry; }
-    virtual QRect availableGeometry() const { return m_data.availableGeometry; }
-    virtual int depth() const { return m_data.depth; }
-    virtual QImage::Format format() const { return m_data.format; }
-    virtual QSizeF physicalSize() const { return m_data.physicalSizeMM; }
-    virtual QDpi logicalDpi() const { return m_data.dpi; }
-    virtual qreal refreshRate() const { return m_data.refreshRateHz; }
-    virtual QString name() const { return m_data.name; }
-    virtual Qt::ScreenOrientation primaryOrientation() { return m_data.orientation; }
-    virtual QList<QPlatformScreen *> virtualSiblings() const;
-    virtual QWindow *topLevelAt(const QPoint &point) const
+    QRect geometry() const Q_DECL_OVERRIDE { return m_data.geometry; }
+    QRect availableGeometry() const Q_DECL_OVERRIDE { return m_data.availableGeometry; }
+    int depth() const Q_DECL_OVERRIDE { return m_data.depth; }
+    QImage::Format format() const Q_DECL_OVERRIDE { return m_data.format; }
+    QSizeF physicalSize() const Q_DECL_OVERRIDE { return m_data.physicalSizeMM; }
+    QDpi logicalDpi() const Q_DECL_OVERRIDE { return m_data.dpi; }
+    qreal refreshRate() const Q_DECL_OVERRIDE { return m_data.refreshRateHz; }
+    QString name() const Q_DECL_OVERRIDE { return m_data.name; }
+    Qt::ScreenOrientation orientation() const Q_DECL_OVERRIDE { return m_data.orientation; }
+    QList<QPlatformScreen *> virtualSiblings() const Q_DECL_OVERRIDE;
+    QWindow *topLevelAt(const QPoint &point) const Q_DECL_OVERRIDE
         {  return QWindowsScreen::findTopLevelAt(point, CWP_SKIPINVISIBLE);  }
 
     static QWindow *findTopLevelAt(const QPoint &point, unsigned flags);
     static QWindow *windowAt(const QPoint &point, unsigned flags = CWP_SKIPINVISIBLE);
     static QWindow *windowUnderMouse(unsigned flags = CWP_SKIPINVISIBLE);
 
-    virtual QPixmap grabWindow(WId window, int x, int y, int width, int height) const;
+    QPixmap grabWindow(WId window, int x, int y, int width, int height) const Q_DECL_OVERRIDE;
 
     inline void handleChanges(const QWindowsScreenData &newData);