summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/windows
diff options
context:
space:
mode:
authorMarius Kittler <[email protected]>2025-04-02 22:00:09 +0200
committerMarius Kittler <[email protected]>2025-04-07 20:04:12 +0200
commit43dbbf67acbc512f1b54e3c29e7fadac07dabd56 (patch)
tree59f1aeed662d0041ceb7f154365f31059c8b8752 /src/plugins/platforms/windows
parenta92c78784f0f3ba994c9ea8857a113b9cd28fee5 (diff)
Avoid compile errors due to inconsistent use of `noexcept`
Only with these changes the affected code compiles with mingw-w64 and GCC 14.2.0. Change-Id: Ib4c392cd306b4e8b433048af077ae7aeb0459e1f Reviewed-by: MÃ¥rten Nordheim <[email protected]>
Diffstat (limited to 'src/plugins/platforms/windows')
-rw-r--r--src/plugins/platforms/windows/qwindowsdrag.h8
-rw-r--r--src/plugins/platforms/windows/qwindowsdropdataobject.h4
-rw-r--r--src/plugins/platforms/windows/qwindowsole.h26
3 files changed, 19 insertions, 19 deletions
diff --git a/src/plugins/platforms/windows/qwindowsdrag.h b/src/plugins/platforms/windows/qwindowsdrag.h
index a2d0e54044b..6bffe2b67e1 100644
--- a/src/plugins/platforms/windows/qwindowsdrag.h
+++ b/src/plugins/platforms/windows/qwindowsdrag.h
@@ -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);
diff --git a/src/plugins/platforms/windows/qwindowsdropdataobject.h b/src/plugins/platforms/windows/qwindowsdropdataobject.h
index b74a3dbc7eb..a8816220c6f 100644
--- a/src/plugins/platforms/windows/qwindowsdropdataobject.h
+++ b/src/plugins/platforms/windows/qwindowsdropdataobject.h
@@ -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;
diff --git a/src/plugins/platforms/windows/qwindowsole.h b/src/plugins/platforms/windows/qwindowsole.h
index 016f9dd04c0..70a03360015 100644
--- a/src/plugins/platforms/windows/qwindowsole.h
+++ b/src/plugins/platforms/windows/qwindowsole.h
@@ -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;