From df49755d7427a1f67ab0a8944c720d66a820dfeb Mon Sep 17 00:00:00 2001
From: Samuel Nevala <samuel.nevala@intopalo.com>
Date: Thu, 27 Aug 2015 09:16:09 +0300
Subject: [PATCH] winrt: Add missing Q_DECL_OVERRIDE and fix white space.
Change-Id: Ibbcb637dac4d531934786fff25f7b8c36ef5ebed
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
---
src/plugins/platforms/winrt/qwinrtscreen.cpp | 2 --
src/plugins/platforms/winrt/qwinrtscreen.h | 12 ++++++------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/plugins/platforms/winrt/qwinrtscreen.cpp b/src/plugins/platforms/winrt/qwinrtscreen.cpp
index 2a7cbaa1590..e52f0386054 100644
--- a/src/plugins/platforms/winrt/qwinrtscreen.cpp
+++ b/src/plugins/platforms/winrt/qwinrtscreen.cpp
@@ -419,9 +419,7 @@ public:
#endif // Q_OS_WINPHONE
QScopedPointer<QWinRTCursor> cursor;
-
QHash<quint32, QWindowSystemInterface::TouchPoint> touchPoints;
-
QSizeF logicalSize;
QSurfaceFormat surfaceFormat;
qreal logicalDpi;
diff --git a/src/plugins/platforms/winrt/qwinrtscreen.h b/src/plugins/platforms/winrt/qwinrtscreen.h
index 796e6abb809..4112e49c4da 100644
--- a/src/plugins/platforms/winrt/qwinrtscreen.h
+++ b/src/plugins/platforms/winrt/qwinrtscreen.h
@@ -82,17 +82,17 @@ class QWinRTScreen : public QPlatformScreen
public:
explicit QWinRTScreen(ABI::Windows::UI::Xaml::IWindow *xamlWindow);
~QWinRTScreen();
- QRect geometry() const;
- int depth() const;
- QImage::Format format() const;
+ QRect geometry() const Q_DECL_OVERRIDE;
+ int depth() const Q_DECL_OVERRIDE;
+ QImage::Format format() const Q_DECL_OVERRIDE;
QSizeF physicalSize() const Q_DECL_OVERRIDE;
QDpi logicalDpi() const Q_DECL_OVERRIDE;
qreal scaleFactor() const;
- QPlatformCursor *cursor() const;
+ QPlatformCursor *cursor() const Q_DECL_OVERRIDE;
Qt::KeyboardModifiers keyboardModifiers() const;
- Qt::ScreenOrientation nativeOrientation() const;
- Qt::ScreenOrientation orientation() const;
+ Qt::ScreenOrientation nativeOrientation() const Q_DECL_OVERRIDE;
+ Qt::ScreenOrientation orientation() const Q_DECL_OVERRIDE;
QWindow *topWindow() const;
void addWindow(QWindow *window);
--
GitLab