diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-07-25 13:19:03 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-07-29 08:39:33 +0200 |
commit | c67f7c0f0fc34887a4922a269815c460cbe3ccf8 (patch) | |
tree | ca04418b4cc59548dfeb8133af948c5e583afc57 /src/plugins/platforms/windows/qwindowsclipboard.h | |
parent | 87242756d44b6c1b697290b583484550694a9695 (diff) |
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>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsclipboard.h')
-rw-r--r-- | src/plugins/platforms/windows/qwindowsclipboard.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/platforms/windows/qwindowsclipboard.h b/src/plugins/platforms/windows/qwindowsclipboard.h index 61c5967e98..a3e9da7f3f 100644 --- a/src/plugins/platforms/windows/qwindowsclipboard.h +++ b/src/plugins/platforms/windows/qwindowsclipboard.h @@ -54,8 +54,8 @@ class QWindowsClipboardRetrievalMimeData : public QWindowsInternalMimeData { public: protected: - virtual IDataObject *retrieveDataObject() const; - virtual void releaseDataObject(IDataObject *) const; + IDataObject *retrieveDataObject() const Q_DECL_OVERRIDE; + void releaseDataObject(IDataObject *) const Q_DECL_OVERRIDE; }; class QWindowsClipboard : public QPlatformClipboard @@ -66,10 +66,10 @@ public: void registerViewer(); // Call in initialization, when context is up. void cleanup(); - virtual QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard); - virtual void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard); - virtual bool supportsMode(QClipboard::Mode mode) const; - virtual bool ownsMode(QClipboard::Mode mode) const; + QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard) Q_DECL_OVERRIDE; + void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard) Q_DECL_OVERRIDE; + bool supportsMode(QClipboard::Mode mode) const Q_DECL_OVERRIDE; + bool ownsMode(QClipboard::Mode mode) const Q_DECL_OVERRIDE; inline bool clipboardViewerWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT *result); |