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/plugins/platforms/windows/qwindowsole.h | |
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/plugins/platforms/windows/qwindowsole.h')
-rw-r--r-- | src/plugins/platforms/windows/qwindowsole.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/plugins/platforms/windows/qwindowsole.h b/src/plugins/platforms/windows/qwindowsole.h index 759779c6c3..c556a3fb9c 100644 --- a/src/plugins/platforms/windows/qwindowsole.h +++ b/src/plugins/platforms/windows/qwindowsole.h @@ -65,17 +65,17 @@ public: DWORD reportedPerformedEffect() const; // IDataObject methods - STDMETHOD(GetData)(LPFORMATETC pformatetcIn, LPSTGMEDIUM pmedium); - STDMETHOD(GetDataHere)(LPFORMATETC pformatetc, LPSTGMEDIUM pmedium); - STDMETHOD(QueryGetData)(LPFORMATETC pformatetc); - STDMETHOD(GetCanonicalFormatEtc)(LPFORMATETC pformatetc, LPFORMATETC pformatetcOut); - STDMETHOD(SetData)(LPFORMATETC pformatetc, STGMEDIUM FAR * pmedium, - BOOL fRelease); - STDMETHOD(EnumFormatEtc)(DWORD dwDirection, LPENUMFORMATETC FAR* ppenumFormatEtc); - STDMETHOD(DAdvise)(FORMATETC FAR* pFormatetc, DWORD advf, - LPADVISESINK pAdvSink, DWORD FAR* pdwConnection); - STDMETHOD(DUnadvise)(DWORD dwConnection); - STDMETHOD(EnumDAdvise)(LPENUMSTATDATA FAR* ppenumAdvise); + STDMETHOD(GetData)(LPFORMATETC pformatetcIn, LPSTGMEDIUM pmedium) override; + STDMETHOD(GetDataHere)(LPFORMATETC pformatetc, LPSTGMEDIUM pmedium) override; + STDMETHOD(QueryGetData)(LPFORMATETC pformatetc) override; + STDMETHOD(GetCanonicalFormatEtc)(LPFORMATETC pformatetc, LPFORMATETC pformatetcOut) override; + STDMETHOD(SetData)(LPFORMATETC pformatetc, STGMEDIUM FAR *pmedium, BOOL fRelease) override; + STDMETHOD(EnumFormatEtc)(DWORD dwDirection, LPENUMFORMATETC FAR *ppenumFormatEtc) override; + STDMETHOD(DAdvise) + (FORMATETC FAR *pFormatetc, DWORD advf, LPADVISESINK pAdvSink, + DWORD FAR *pdwConnection) override; + STDMETHOD(DUnadvise)(DWORD dwConnection) override; + STDMETHOD(EnumDAdvise)(LPENUMSTATDATA FAR *ppenumAdvise) override; private: QPointer<QMimeData> data; @@ -93,10 +93,10 @@ public: bool isNull() const; // IEnumFORMATETC methods - STDMETHOD(Next)(ULONG celt, LPFORMATETC rgelt, ULONG FAR* pceltFetched); - STDMETHOD(Skip)(ULONG celt); - STDMETHOD(Reset)(void); - STDMETHOD(Clone)(LPENUMFORMATETC FAR* newEnum); + STDMETHOD(Next)(ULONG celt, LPFORMATETC rgelt, ULONG FAR *pceltFetched) override; + STDMETHOD(Skip)(ULONG celt) override; + STDMETHOD(Reset)(void) override; + STDMETHOD(Clone)(LPENUMFORMATETC FAR *newEnum) override; private: bool copyFormatEtc(LPFORMATETC dest, const FORMATETC *src) const; |