diff options
| author | Samuel Nevala <samuel.nevala@intopalo.com> | 2015-08-27 09:16:09 +0300 |
|---|---|---|
| committer | Samuel Nevala <samuel.nevala@intopalo.com> | 2015-08-27 09:47:23 +0000 |
| commit | df49755d7427a1f67ab0a8944c720d66a820dfeb (patch) | |
| tree | 71f73995c04f5b6a965a3a91468d7fb97784abb3 /src/plugins/platforms/winrt | |
| parent | 06b457c693f207e392d3021d77a0ab18cd78da92 (diff) | |
winrt: Add missing Q_DECL_OVERRIDE and fix white space.
Change-Id: Ibbcb637dac4d531934786fff25f7b8c36ef5ebed
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/winrt')
| -rw-r--r-- | src/plugins/platforms/winrt/qwinrtscreen.cpp | 2 | ||||
| -rw-r--r-- | 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 2a7cbaa159..e52f038605 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 796e6abb80..4112e49c4d 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); |