diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2020-07-23 08:19:45 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2020-08-10 11:56:54 +0200 |
| commit | 177f040c6c79571eadaf51c3e4ad90ae7b023b0d (patch) | |
| tree | fce6d1ced37fc64df9e0ce9800366ab0acf7fc6f /src/corelib/io/qfilesystemengine_win.cpp | |
| parent | 7c861a36f98972b64379589477930e2e894b0d72 (diff) | |
Fix build with mingw gcc 9 and -Wsuggest-override
Change-Id: I780b0761a7f6b19022116b738efa7aca1378b715
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/corelib/io/qfilesystemengine_win.cpp')
| -rw-r--r-- | src/corelib/io/qfilesystemengine_win.cpp | 51 |
1 files changed, 21 insertions, 30 deletions
diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp index 1c99f07400..b3d7ecfed8 100644 --- a/src/corelib/io/qfilesystemengine_win.cpp +++ b/src/corelib/io/qfilesystemengine_win.cpp @@ -413,11 +413,8 @@ public: {} virtual ~FileOperationProgressSink() {} - ULONG STDMETHODCALLTYPE AddRef() - { - return ++ref; - } - ULONG STDMETHODCALLTYPE Release() + ULONG STDMETHODCALLTYPE AddRef() override { return ++ref; } + ULONG STDMETHODCALLTYPE Release() override { if (--ref == 0) { delete this; @@ -425,7 +422,7 @@ public: } return ref; } - HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) + HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) override { if (!ppvObject) return E_POINTER; @@ -446,31 +443,30 @@ public: return E_NOINTERFACE; } - HRESULT STDMETHODCALLTYPE StartOperations() - { return S_OK; } - HRESULT STDMETHODCALLTYPE FinishOperations(HRESULT) - { return S_OK; } - HRESULT STDMETHODCALLTYPE PreRenameItem(DWORD, IShellItem *, LPCWSTR) - { return S_OK; } - HRESULT STDMETHODCALLTYPE PostRenameItem(DWORD, IShellItem *, LPCWSTR, HRESULT, IShellItem *) + HRESULT STDMETHODCALLTYPE StartOperations() override { return S_OK; } + HRESULT STDMETHODCALLTYPE FinishOperations(HRESULT) override { return S_OK; } + HRESULT STDMETHODCALLTYPE PreRenameItem(DWORD, IShellItem *, LPCWSTR) override { return S_OK; } + HRESULT STDMETHODCALLTYPE PostRenameItem(DWORD, IShellItem *, LPCWSTR, HRESULT, + IShellItem *) override { return S_OK; } - HRESULT STDMETHODCALLTYPE PreMoveItem(DWORD, IShellItem *, IShellItem *, LPCWSTR) + HRESULT STDMETHODCALLTYPE PreMoveItem(DWORD, IShellItem *, IShellItem *, LPCWSTR) override { return S_OK; } HRESULT STDMETHODCALLTYPE PostMoveItem(DWORD, IShellItem *, IShellItem *, LPCWSTR, HRESULT, - IShellItem *) + IShellItem *) override { return S_OK; } - HRESULT STDMETHODCALLTYPE PreCopyItem(DWORD, IShellItem *, IShellItem *, LPCWSTR ) + HRESULT STDMETHODCALLTYPE PreCopyItem(DWORD, IShellItem *, IShellItem *, LPCWSTR) override { return S_OK; } HRESULT STDMETHODCALLTYPE PostCopyItem(DWORD, IShellItem *, IShellItem *, LPCWSTR, HRESULT, - IShellItem *) + IShellItem *) override { return S_OK; } - HRESULT STDMETHODCALLTYPE PreDeleteItem(DWORD dwFlags, IShellItem *) + HRESULT STDMETHODCALLTYPE PreDeleteItem(DWORD dwFlags, IShellItem *) override { // stop the operation if the file will be deleted rather than trashed return (dwFlags & TSF_DELETE_RECYCLE_IF_POSSIBLE) ? S_OK : E_FAIL; } HRESULT STDMETHODCALLTYPE PostDeleteItem(DWORD /* dwFlags */, IShellItem * /* psiItem */, - HRESULT /* hrDelete */, IShellItem *psiNewlyCreated) + HRESULT /* hrDelete */, + IShellItem *psiNewlyCreated) override { if (psiNewlyCreated) { wchar_t *pszName = nullptr; @@ -482,19 +478,14 @@ public: } return S_OK; } - HRESULT STDMETHODCALLTYPE PreNewItem(DWORD, IShellItem *, LPCWSTR) - { return S_OK; } + HRESULT STDMETHODCALLTYPE PreNewItem(DWORD, IShellItem *, LPCWSTR) override { return S_OK; } HRESULT STDMETHODCALLTYPE PostNewItem(DWORD, IShellItem *, LPCWSTR, LPCWSTR, DWORD, HRESULT, - IShellItem *) - { return S_OK; } - HRESULT STDMETHODCALLTYPE UpdateProgress(UINT,UINT) - { return S_OK; } - HRESULT STDMETHODCALLTYPE ResetTimer() - { return S_OK; } - HRESULT STDMETHODCALLTYPE PauseTimer() - { return S_OK; } - HRESULT STDMETHODCALLTYPE ResumeTimer() + IShellItem *) override { return S_OK; } + HRESULT STDMETHODCALLTYPE UpdateProgress(UINT, UINT) override { return S_OK; } + HRESULT STDMETHODCALLTYPE ResetTimer() override { return S_OK; } + HRESULT STDMETHODCALLTYPE PauseTimer() override { return S_OK; } + HRESULT STDMETHODCALLTYPE ResumeTimer() override { return S_OK; } QString targetPath; private: |