1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid compile errors due to inconsistent use of noexcept

Browse Source 
Only with these changes the affected code compiles with mingw-w64 and
GCC 14.2.0.

Change-Id: Ib4c392cd306b4e8b433048af077ae7aeb0459e1f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Marius Kittler 2025-04-02 22:00:09 +02:00
parent a92c78784f
commit 43dbbf67ac
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/platforms/windows/qwindowsdrag.h
View File

@ -31,11 +31,11 @@ public:
// IDropTarget methods
STDMETHOD(DragEnter)
(LPDATAOBJECT pDataObj, DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect) override;
STDMETHOD(DragOver)(DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect) override;
STDMETHOD(DragLeave)() override;
(LPDATAOBJECT pDataObj, DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect) noexcept override;
STDMETHOD(DragOver)(DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect) noexcept override;
STDMETHOD(DragLeave)() noexcept override;
STDMETHOD(Drop)
(LPDATAOBJECT pDataObj, DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect) override;
(LPDATAOBJECT pDataObj, DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect) noexcept override;
private:
void handleDrag(QWindow *window, DWORD grfKeyState, const QPoint &, LPDWORD pdwEffect);

4
src/plugins/platforms/windows/qwindowsdropdataobject.h
View File

@ -15,8 +15,8 @@ public:
~QWindowsDropDataObject() override;
// overridden IDataObject methods
STDMETHOD(GetData)(LPFORMATETC pformatetcIn, LPSTGMEDIUM pmedium) override;
STDMETHOD(QueryGetData)(LPFORMATETC pformatetc) override;
STDMETHOD(GetData)(LPFORMATETC pformatetcIn, LPSTGMEDIUM pmedium) noexcept override;
STDMETHOD(QueryGetData)(LPFORMATETC pformatetc) noexcept override;
private:
bool shouldIgnore(LPFORMATETC pformatetc) const;

26
src/plugins/platforms/windows/qwindowsole.h
View File

@ -29,17 +29,17 @@ public:
DWORD reportedPerformedEffect() const;
// IDataObject methods
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(GetData)(LPFORMATETC pformatetcIn, LPSTGMEDIUM pmedium) noexcept override;
STDMETHOD(GetDataHere)(LPFORMATETC pformatetc, LPSTGMEDIUM pmedium) noexcept override;
STDMETHOD(QueryGetData)(LPFORMATETC pformatetc) noexcept override;
STDMETHOD(GetCanonicalFormatEtc)(LPFORMATETC pformatetc, LPFORMATETC pformatetcOut) noexcept override;
STDMETHOD(SetData)(LPFORMATETC pformatetc, STGMEDIUM FAR *pmedium, BOOL fRelease) noexcept override;
STDMETHOD(EnumFormatEtc)(DWORD dwDirection, LPENUMFORMATETC FAR *ppenumFormatEtc) noexcept 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;
DWORD FAR *pdwConnection) noexcept override;
STDMETHOD(DUnadvise)(DWORD dwConnection) noexcept override;
STDMETHOD(EnumDAdvise)(LPENUMSTATDATA FAR *ppenumAdvise) noexcept override;
private:
QPointer<QMimeData> data;
@ -57,10 +57,10 @@ public:
bool isNull() const;
// IEnumFORMATETC methods
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;
STDMETHOD(Next)(ULONG celt, LPFORMATETC rgelt, ULONG FAR *pceltFetched) noexcept override;
STDMETHOD(Skip)(ULONG celt) noexcept override;
STDMETHOD(Reset)(void) noexcept override;
STDMETHOD(Clone)(LPENUMFORMATETC FAR *newEnum) noexcept override;
private:
bool copyFormatEtc(LPFORMATETC dest, const FORMATETC *src) const;