summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms
diff options
context:
space:
mode:
authorAlexander Volkov <a.volkov@rusbitech.ru>2016-11-27 11:22:44 +0300
committerAlexander Volkov <a.volkov@rusbitech.ru>2016-11-30 10:52:18 +0000
commit1a0e690d50ff3b99a8a2e785c711b43f71de8459 (patch)
tree42cbc5324609a0a30fbd82018b77ce33bc511f19 /src/plugins/platforms
parentaac3a4c032d3aa96c8c25402bbc72c78348401d0 (diff)
winrt: Add missing override
Change-Id: I2f257756bc606f8eb5cad2afe67b90810a2e394c Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r--src/plugins/platforms/winrt/main.cpp2
-rw-r--r--src/plugins/platforms/winrt/qwinrtbackingstore.h10
-rw-r--r--src/plugins/platforms/winrt/qwinrtcursor.h4
-rw-r--r--src/plugins/platforms/winrt/qwinrteventdispatcher.h4
-rw-r--r--src/plugins/platforms/winrt/qwinrtfiledialoghelper.h4
-rw-r--r--src/plugins/platforms/winrt/qwinrtinputcontext.h8
-rw-r--r--src/plugins/platforms/winrt/qwinrtmessagedialoghelper.h6
-rw-r--r--src/plugins/platforms/winrt/qwinrtservices.h4
-rw-r--r--src/plugins/platforms/winrt/qwinrttheme.h4
-rw-r--r--src/plugins/platforms/winrt/qwinrtwindow.h16
10 files changed, 31 insertions, 31 deletions
diff --git a/src/plugins/platforms/winrt/main.cpp b/src/plugins/platforms/winrt/main.cpp
index a0b31e0e25..5d0d9e94eb 100644
--- a/src/plugins/platforms/winrt/main.cpp
+++ b/src/plugins/platforms/winrt/main.cpp
@@ -50,7 +50,7 @@ class QWinRTIntegrationPlugin : public QPlatformIntegrationPlugin
public:
QStringList keys() const;
- QPlatformIntegration *create(const QString&, const QStringList&);
+ QPlatformIntegration *create(const QString&, const QStringList&) override;
};
QStringList QWinRTIntegrationPlugin::keys() const
diff --git a/src/plugins/platforms/winrt/qwinrtbackingstore.h b/src/plugins/platforms/winrt/qwinrtbackingstore.h
index bfd0e34b9b..cd05faa63e 100644
--- a/src/plugins/platforms/winrt/qwinrtbackingstore.h
+++ b/src/plugins/platforms/winrt/qwinrtbackingstore.h
@@ -58,11 +58,11 @@ class QWinRTBackingStore : public QPlatformBackingStore
public:
explicit QWinRTBackingStore(QWindow *window);
~QWinRTBackingStore();
- QPaintDevice *paintDevice();
- void beginPaint(const QRegion &);
- void endPaint();
- void flush(QWindow *window, const QRegion &region, const QPoint &offset);
- void resize(const QSize &size, const QRegion &staticContents);
+ QPaintDevice *paintDevice() override;
+ void beginPaint(const QRegion &) override;
+ void endPaint() override;
+ void flush(QWindow *window, const QRegion &region, const QPoint &offset) override;
+ void resize(const QSize &size, const QRegion &staticContents) override;
QImage toImage() const override;
private:
diff --git a/src/plugins/platforms/winrt/qwinrtcursor.h b/src/plugins/platforms/winrt/qwinrtcursor.h
index baf902c7af..7f579f1531 100644
--- a/src/plugins/platforms/winrt/qwinrtcursor.h
+++ b/src/plugins/platforms/winrt/qwinrtcursor.h
@@ -51,9 +51,9 @@ public:
explicit QWinRTCursor();
~QWinRTCursor();
#ifndef QT_NO_CURSOR
- void changeCursor(QCursor * windowCursor, QWindow *window);
+ void changeCursor(QCursor * windowCursor, QWindow *window) override;
#endif
- QPoint pos() const;
+ QPoint pos() const override;
private:
QScopedPointer<QWinRTCursorPrivate> d_ptr;
diff --git a/src/plugins/platforms/winrt/qwinrteventdispatcher.h b/src/plugins/platforms/winrt/qwinrteventdispatcher.h
index c04e9fca12..4c5c19c6b0 100644
--- a/src/plugins/platforms/winrt/qwinrteventdispatcher.h
+++ b/src/plugins/platforms/winrt/qwinrteventdispatcher.h
@@ -51,8 +51,8 @@ public:
explicit QWinRTEventDispatcher(QObject *parent = 0);
protected:
- bool hasPendingEvents();
- bool sendPostedEvents(QEventLoop::ProcessEventsFlags flags);
+ bool hasPendingEvents() override;
+ bool sendPostedEvents(QEventLoop::ProcessEventsFlags flags) override;
};
QT_END_NAMESPACE
diff --git a/src/plugins/platforms/winrt/qwinrtfiledialoghelper.h b/src/plugins/platforms/winrt/qwinrtfiledialoghelper.h
index 1ff2249bcb..413dee7459 100644
--- a/src/plugins/platforms/winrt/qwinrtfiledialoghelper.h
+++ b/src/plugins/platforms/winrt/qwinrtfiledialoghelper.h
@@ -82,11 +82,11 @@ public:
bool defaultNameFilterDisables() const override { return false; }
void setDirectory(const QUrl &directory) override;
QUrl directory() const override;
- void selectFile(const QUrl &saveFileName);
+ void selectFile(const QUrl &saveFileName) override;
QList<QUrl> selectedFiles() const override;
void setFilter() override { }
void selectNameFilter(const QString &selectedNameFilter) override;
- QString selectedNameFilter() const;
+ QString selectedNameFilter() const override;
#ifndef Q_OS_WINPHONE
HRESULT onSingleFilePicked(ABI::Windows::Foundation::IAsyncOperation<ABI::Windows::Storage::StorageFile *> *,
diff --git a/src/plugins/platforms/winrt/qwinrtinputcontext.h b/src/plugins/platforms/winrt/qwinrtinputcontext.h
index 9d5c4187e2..13a0088ddc 100644
--- a/src/plugins/platforms/winrt/qwinrtinputcontext.h
+++ b/src/plugins/platforms/winrt/qwinrtinputcontext.h
@@ -70,13 +70,13 @@ class QWinRTInputContext : public QPlatformInputContext
public:
explicit QWinRTInputContext(QWinRTScreen *);
- QRectF keyboardRect() const;
+ QRectF keyboardRect() const override;
- bool isInputPanelVisible() const;
+ bool isInputPanelVisible() const override;
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP)
- void showInputPanel();
- void hideInputPanel();
+ void showInputPanel() override;
+ void hideInputPanel() override;
#endif
private slots:
diff --git a/src/plugins/platforms/winrt/qwinrtmessagedialoghelper.h b/src/plugins/platforms/winrt/qwinrtmessagedialoghelper.h
index 439e8f592f..14b6d4b715 100644
--- a/src/plugins/platforms/winrt/qwinrtmessagedialoghelper.h
+++ b/src/plugins/platforms/winrt/qwinrtmessagedialoghelper.h
@@ -69,11 +69,11 @@ public:
explicit QWinRTMessageDialogHelper(const QWinRTTheme *theme);
~QWinRTMessageDialogHelper();
- void exec();
+ void exec() override;
bool show(Qt::WindowFlags windowFlags,
Qt::WindowModality windowModality,
- QWindow *parent);
- void hide();
+ QWindow *parent) override;
+ void hide() override;
private:
HRESULT onCompleted(ABI::Windows::Foundation::IAsyncOperation<ABI::Windows::UI::Popups::IUICommand *> *asyncInfo,
diff --git a/src/plugins/platforms/winrt/qwinrtservices.h b/src/plugins/platforms/winrt/qwinrtservices.h
index 1adc6c381c..80b9a6c92a 100644
--- a/src/plugins/platforms/winrt/qwinrtservices.h
+++ b/src/plugins/platforms/winrt/qwinrtservices.h
@@ -52,8 +52,8 @@ public:
explicit QWinRTServices();
~QWinRTServices();
- bool openUrl(const QUrl &url);
- bool openDocument(const QUrl &url);
+ bool openUrl(const QUrl &url) override;
+ bool openDocument(const QUrl &url) override;
private:
QScopedPointer<QWinRTServicesPrivate> d_ptr;
diff --git a/src/plugins/platforms/winrt/qwinrttheme.h b/src/plugins/platforms/winrt/qwinrttheme.h
index 6ad22a4188..cc5fc851e7 100644
--- a/src/plugins/platforms/winrt/qwinrttheme.h
+++ b/src/plugins/platforms/winrt/qwinrttheme.h
@@ -54,8 +54,8 @@ class QWinRTTheme : public QPlatformTheme
public:
QWinRTTheme();
- bool usePlatformNativeDialog(DialogType type) const;
- QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const;
+ bool usePlatformNativeDialog(DialogType type) const override;
+ QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const override;
const QPalette *palette(Palette type = SystemPalette) const override;
diff --git a/src/plugins/platforms/winrt/qwinrtwindow.h b/src/plugins/platforms/winrt/qwinrtwindow.h
index 95caf66c3d..968edcfa85 100644
--- a/src/plugins/platforms/winrt/qwinrtwindow.h
+++ b/src/plugins/platforms/winrt/qwinrtwindow.h
@@ -56,14 +56,14 @@ public:
QWinRTWindow(QWindow *window);
~QWinRTWindow();
- QSurfaceFormat format() const;
- bool isActive() const;
- bool isExposed() const;
- void setGeometry(const QRect &rect);
- void setVisible(bool visible);
- void setWindowTitle(const QString &title);
- void raise();
- void lower();
+ QSurfaceFormat format() const override;
+ bool isActive() const override;
+ bool isExposed() const override;
+ void setGeometry(const QRect &rect) override;
+ void setVisible(bool visible) override;
+ void setWindowTitle(const QString &title) override;
+ void raise() override;
+ void lower() override;
WId winId() const override;