diff options
author | Kevin Funk <kevin.funk@kdab.com> | 2017-09-18 10:36:49 +0200 |
---|---|---|
committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-19 11:53:42 +0000 |
commit | 47c92fbb0b588b443cead18a5aad5a2b5ad9e4d7 (patch) | |
tree | 330914ff8225867e19b9ed5e049813d9f1e5ec08 /src/winmain | |
parent | 93dd85141b35460a83dac86083581ba1c1975927 (diff) |
Replace Q_DECL_OVERRIDE with override where possible
Remaining uses of Q_DECL_OVERRIDE are in:
src/corelib/global/qcompilerdetection.h
src/corelib/global/qglobal.cpp
doc/global/qt-cpp-defines.qdocconf
(definition and documentation of Q_DECL_OVERRIDE)
tests/manual/qcursor/qcursorhighdpi/main.cpp
(a test executable compilable both under Qt4 and Qt5)
Change-Id: Ib9b05d829add69e98a86238274b6a1fcb19b49ba
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/winmain')
-rw-r--r-- | src/winmain/qtmain_winrt.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/winmain/qtmain_winrt.cpp b/src/winmain/qtmain_winrt.cpp index 13ca561d35..1f5b98794d 100644 --- a/src/winmain/qtmain_winrt.cpp +++ b/src/winmain/qtmain_winrt.cpp @@ -229,12 +229,12 @@ private: return S_OK; } - HRESULT __stdcall OnActivated(IActivatedEventArgs *args) Q_DECL_OVERRIDE + HRESULT __stdcall OnActivated(IActivatedEventArgs *args) override { return activatedLaunch(args); } - HRESULT __stdcall OnLaunched(ILaunchActivatedEventArgs *launchArgs) Q_DECL_OVERRIDE + HRESULT __stdcall OnLaunched(ILaunchActivatedEventArgs *launchArgs) override { ComPtr<IPrelaunchActivatedEventArgs> preArgs; HRESULT hr = launchArgs->QueryInterface(preArgs.GetAddressOf()); @@ -324,41 +324,41 @@ private: return S_OK; } - HRESULT __stdcall OnFileActivated(IFileActivatedEventArgs *args) Q_DECL_OVERRIDE + HRESULT __stdcall OnFileActivated(IFileActivatedEventArgs *args) override { return activatedLaunch(args); } - HRESULT __stdcall OnSearchActivated(ISearchActivatedEventArgs *args) Q_DECL_OVERRIDE + HRESULT __stdcall OnSearchActivated(ISearchActivatedEventArgs *args) override { Q_UNUSED(args); return S_OK; } - HRESULT __stdcall OnShareTargetActivated(IShareTargetActivatedEventArgs *args) Q_DECL_OVERRIDE + HRESULT __stdcall OnShareTargetActivated(IShareTargetActivatedEventArgs *args) override { return activatedLaunch(args); } - HRESULT __stdcall OnFileOpenPickerActivated(IFileOpenPickerActivatedEventArgs *args) Q_DECL_OVERRIDE + HRESULT __stdcall OnFileOpenPickerActivated(IFileOpenPickerActivatedEventArgs *args) override { Q_UNUSED(args); return S_OK; } - HRESULT __stdcall OnFileSavePickerActivated(IFileSavePickerActivatedEventArgs *args) Q_DECL_OVERRIDE + HRESULT __stdcall OnFileSavePickerActivated(IFileSavePickerActivatedEventArgs *args) override { Q_UNUSED(args); return S_OK; } - HRESULT __stdcall OnCachedFileUpdaterActivated(ICachedFileUpdaterActivatedEventArgs *args) Q_DECL_OVERRIDE + HRESULT __stdcall OnCachedFileUpdaterActivated(ICachedFileUpdaterActivatedEventArgs *args) override { Q_UNUSED(args); return S_OK; } - HRESULT __stdcall OnWindowCreated(Xaml::IWindowCreatedEventArgs *args) Q_DECL_OVERRIDE + HRESULT __stdcall OnWindowCreated(Xaml::IWindowCreatedEventArgs *args) override { Q_UNUSED(args); return S_OK; |