diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2014-12-05 14:38:47 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2014-12-08 09:31:46 +0100 |
| commit | 30f5f9fd247f7454e008c1893f70ef1099cbb835 (patch) | |
| tree | 6b3006f9a1f09043b7f4e43641f8eb889a099b46 | |
| parent | 414dee3c6fa231f5af48178cf5b8021a99514526 (diff) | |
| download | qtactiveqt-30f5f9fd247f7454e008c1893f70ef1099cbb835.tar.gz | |
Use Q_DECL_OVERRIDE where applicable.
Task-number: QTBUG-41130
Change-Id: I4951e2cc27d5652fd9802216511bbc3a4cdeb186
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | examples/activeqt/webbrowser/webaxwidget.h | 2 | ||||
| -rw-r--r-- | src/activeqt/container/qaxwidget.cpp | 2 | ||||
| -rw-r--r-- | src/activeqt/control/qaxaggregated.h | 8 | ||||
| -rw-r--r-- | src/activeqt/control/qaxserverbase.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/examples/activeqt/webbrowser/webaxwidget.h b/examples/activeqt/webbrowser/webaxwidget.h index 4a34a12..3a7a47f 100644 --- a/examples/activeqt/webbrowser/webaxwidget.h +++ b/examples/activeqt/webbrowser/webaxwidget.h @@ -53,7 +53,7 @@ public: { } protected: - virtual bool translateKeyEvent(int message, int keycode) const + bool translateKeyEvent(int message, int keycode) const Q_DECL_OVERRIDE { if (message >= WM_KEYFIRST && message <= WM_KEYLAST) return true; diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp index 87ca4c3..2f3e84e 100644 --- a/src/activeqt/container/qaxwidget.cpp +++ b/src/activeqt/container/qaxwidget.cpp @@ -463,7 +463,7 @@ static const wchar_t *qaxatom = L"QAxContainer4_Atom"; class QAxNativeEventFilter : public QAbstractNativeEventFilter { public: - virtual bool nativeEventFilter(const QByteArray &eventType, void *message, long *) Q_DECL_OVERRIDE; + bool nativeEventFilter(const QByteArray &eventType, void *message, long *) Q_DECL_OVERRIDE; }; Q_GLOBAL_STATIC(QAxNativeEventFilter, s_nativeEventFilter) diff --git a/src/activeqt/control/qaxaggregated.h b/src/activeqt/control/qaxaggregated.h index 90c8f5a..5ed5235 100644 --- a/src/activeqt/control/qaxaggregated.h +++ b/src/activeqt/control/qaxaggregated.h @@ -74,10 +74,10 @@ private: }; #define QAXAGG_IUNKNOWN \ - HRESULT WINAPI QueryInterface(REFIID iid, LPVOID *iface) { \ - return controllingUnknown()->QueryInterface(iid, iface); } \ - ULONG WINAPI AddRef() {return controllingUnknown()->AddRef(); } \ - ULONG WINAPI Release() {return controllingUnknown()->Release(); } \ + HRESULT WINAPI QueryInterface(REFIID iid, LPVOID *iface) Q_DECL_OVERRIDE \ + { return controllingUnknown()->QueryInterface(iid, iface); } \ + ULONG WINAPI AddRef() Q_DECL_OVERRIDE { return controllingUnknown()->AddRef(); } \ + ULONG WINAPI Release() Q_DECL_OVERRIDE { return controllingUnknown()->Release(); } \ QT_END_NAMESPACE diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp index 2b43c2c..c0f0512 100644 --- a/src/activeqt/control/qaxserverbase.cpp +++ b/src/activeqt/control/qaxserverbase.cpp @@ -782,7 +782,7 @@ LRESULT QT_WIN_CALLBACK axs_FilterProc(int nCode, WPARAM wParam, LPARAM lParam) class QAxWinEventFilter : public QAbstractNativeEventFilter { public: - virtual bool nativeEventFilter(const QByteArray &, void *message, long *) Q_DECL_OVERRIDE; + bool nativeEventFilter(const QByteArray &, void *message, long *) Q_DECL_OVERRIDE; }; bool QAxWinEventFilter::nativeEventFilter(const QByteArray &, void *message, long *) |