1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
From 86243dc42a600505f965b8bb888261d1fba70193 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 2 Apr 2025 22:00:09 +0200
Subject: [PATCH 19/19] Avoid compile error due to inconsistent use of
`noexcept`
Change-Id: Ib4c392cd306b4e8b433048af077ae7aeb0459e1f
---
src/plugins/platforms/windows/qwindowsdrag.h | 8 +++---
.../windows/qwindowsdropdataobject.h | 4 +--
src/plugins/platforms/windows/qwindowsole.h | 26 +++++++++----------
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;
--
2.49.0
|