summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMårten Nordheim <[email protected]>2024-07-25 12:30:51 +0200
committerMårten Nordheim <[email protected]>2024-08-02 15:22:30 +0200
commit4aad091c5ead4062d4478f3c4a1d5edd74d83846 (patch)
treec6ae959eb7585e3125b913e340c092c38ac0a8b3
parentd6eda60b330e72570be9ce43ce5dc01cd8851665 (diff)
Fix mingw clang compilation
Missing noexcept specifiers and pragma push Change-Id: Id64c71c9e23ae1cb0c1c911cd8c5d3283bbc3048 Reviewed-by: Oliver Wolff <[email protected]>
-rw-r--r--src/plugins/platforms/windows/qwindowsdrag.cpp16
-rw-r--r--src/plugins/platforms/windows/qwindowsdropdataobject.cpp4
-rw-r--r--src/plugins/platforms/windows/qwindowsole.cpp26
-rw-r--r--src/plugins/platforms/windows/uiautomation/qwindowsuiautomation.cpp1
4 files changed, 24 insertions, 23 deletions
diff --git a/src/plugins/platforms/windows/qwindowsdrag.cpp b/src/plugins/platforms/windows/qwindowsdrag.cpp
index c9e7ae90a9e..044cd4c7a2c 100644
--- a/src/plugins/platforms/windows/qwindowsdrag.cpp
+++ b/src/plugins/platforms/windows/qwindowsdrag.cpp
@@ -183,8 +183,8 @@ public:
void createCursors();
// IDropSource methods
- STDMETHOD(QueryContinueDrag)(BOOL fEscapePressed, DWORD grfKeyState) override;
- STDMETHOD(GiveFeedback)(DWORD dwEffect) override;
+ STDMETHOD(QueryContinueDrag)(BOOL fEscapePressed, DWORD grfKeyState) noexcept override;
+ STDMETHOD(GiveFeedback)(DWORD dwEffect) noexcept override;
private:
struct CursorEntry {
@@ -336,7 +336,7 @@ void QWindowsOleDropSource::createCursors()
*/
QT_ENSURE_STACK_ALIGNED_FOR_SSE STDMETHODIMP
-QWindowsOleDropSource::QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState)
+QWindowsOleDropSource::QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState) noexcept
{
// In some rare cases, when a mouse button is released but the mouse is static,
// grfKeyState will not be updated with these released buttons until the mouse
@@ -390,7 +390,7 @@ QWindowsOleDropSource::QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState)
*/
QT_ENSURE_STACK_ALIGNED_FOR_SSE STDMETHODIMP
-QWindowsOleDropSource::GiveFeedback(DWORD dwEffect)
+QWindowsOleDropSource::GiveFeedback(DWORD dwEffect) noexcept
{
const Qt::DropAction action = translateToQDragDropAction(dwEffect);
m_drag->updateAction(action);
@@ -484,7 +484,7 @@ void QWindowsOleDropTarget::handleDrag(QWindow *window, DWORD grfKeyState,
QT_ENSURE_STACK_ALIGNED_FOR_SSE STDMETHODIMP
QWindowsOleDropTarget::DragEnter(LPDATAOBJECT pDataObj, DWORD grfKeyState,
- POINTL pt, LPDWORD pdwEffect)
+ POINTL pt, LPDWORD pdwEffect) noexcept
{
if (IDropTargetHelper* dh = QWindowsDrag::instance()->dropHelper())
dh->DragEnter(reinterpret_cast<HWND>(m_window->winId()), pDataObj, reinterpret_cast<POINT*>(&pt), *pdwEffect);
@@ -500,7 +500,7 @@ QWindowsOleDropTarget::DragEnter(LPDATAOBJECT pDataObj, DWORD grfKeyState,
}
QT_ENSURE_STACK_ALIGNED_FOR_SSE STDMETHODIMP
-QWindowsOleDropTarget::DragOver(DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect)
+QWindowsOleDropTarget::DragOver(DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect) noexcept
{
if (IDropTargetHelper* dh = QWindowsDrag::instance()->dropHelper())
dh->DragOver(reinterpret_cast<POINT*>(&pt), *pdwEffect);
@@ -521,7 +521,7 @@ QWindowsOleDropTarget::DragOver(DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect)
}
QT_ENSURE_STACK_ALIGNED_FOR_SSE STDMETHODIMP
-QWindowsOleDropTarget::DragLeave()
+QWindowsOleDropTarget::DragLeave() noexcept
{
if (IDropTargetHelper* dh = QWindowsDrag::instance()->dropHelper())
dh->DragLeave();
@@ -546,7 +546,7 @@ QWindowsOleDropTarget::DragLeave()
QT_ENSURE_STACK_ALIGNED_FOR_SSE STDMETHODIMP
QWindowsOleDropTarget::Drop(LPDATAOBJECT pDataObj, DWORD grfKeyState,
- POINTL pt, LPDWORD pdwEffect)
+ POINTL pt, LPDWORD pdwEffect) noexcept
{
if (IDropTargetHelper* dh = QWindowsDrag::instance()->dropHelper())
dh->Drop(pDataObj, reinterpret_cast<POINT*>(&pt), *pdwEffect);
diff --git a/src/plugins/platforms/windows/qwindowsdropdataobject.cpp b/src/plugins/platforms/windows/qwindowsdropdataobject.cpp
index 629291640f1..1dd910dff57 100644
--- a/src/plugins/platforms/windows/qwindowsdropdataobject.cpp
+++ b/src/plugins/platforms/windows/qwindowsdropdataobject.cpp
@@ -30,7 +30,7 @@ QWindowsDropDataObject::QWindowsDropDataObject(QMimeData *mimeData) :
QWindowsDropDataObject::~QWindowsDropDataObject() = default;
STDMETHODIMP
-QWindowsDropDataObject::GetData(LPFORMATETC pformatetc, LPSTGMEDIUM pmedium)
+QWindowsDropDataObject::GetData(LPFORMATETC pformatetc, LPSTGMEDIUM pmedium) noexcept
{
if (shouldIgnore(pformatetc))
return ResultFromScode(DATA_E_FORMATETC);
@@ -39,7 +39,7 @@ QWindowsDropDataObject::GetData(LPFORMATETC pformatetc, LPSTGMEDIUM pmedium)
}
STDMETHODIMP
-QWindowsDropDataObject::QueryGetData(LPFORMATETC pformatetc)
+QWindowsDropDataObject::QueryGetData(LPFORMATETC pformatetc) noexcept
{
if (shouldIgnore(pformatetc))
return ResultFromScode(DATA_E_FORMATETC);
diff --git a/src/plugins/platforms/windows/qwindowsole.cpp b/src/plugins/platforms/windows/qwindowsole.cpp
index c01f7160541..4efb589450b 100644
--- a/src/plugins/platforms/windows/qwindowsole.cpp
+++ b/src/plugins/platforms/windows/qwindowsole.cpp
@@ -61,7 +61,7 @@ DWORD QWindowsOleDataObject::reportedPerformedEffect() const
}
STDMETHODIMP
-QWindowsOleDataObject::GetData(LPFORMATETC pformatetc, LPSTGMEDIUM pmedium)
+QWindowsOleDataObject::GetData(LPFORMATETC pformatetc, LPSTGMEDIUM pmedium) noexcept
{
HRESULT hr = ResultFromScode(DATA_E_FORMATETC);
@@ -79,13 +79,13 @@ QWindowsOleDataObject::GetData(LPFORMATETC pformatetc, LPSTGMEDIUM pmedium)
}
STDMETHODIMP
-QWindowsOleDataObject::GetDataHere(LPFORMATETC, LPSTGMEDIUM)
+QWindowsOleDataObject::GetDataHere(LPFORMATETC, LPSTGMEDIUM) noexcept
{
return ResultFromScode(DATA_E_FORMATETC);
}
STDMETHODIMP
-QWindowsOleDataObject::QueryGetData(LPFORMATETC pformatetc)
+QWindowsOleDataObject::QueryGetData(LPFORMATETC pformatetc) noexcept
{
HRESULT hr = ResultFromScode(DATA_E_FORMATETC);
@@ -103,14 +103,14 @@ QWindowsOleDataObject::QueryGetData(LPFORMATETC pformatetc)
}
STDMETHODIMP
-QWindowsOleDataObject::GetCanonicalFormatEtc(LPFORMATETC, LPFORMATETC pformatetcOut)
+QWindowsOleDataObject::GetCanonicalFormatEtc(LPFORMATETC, LPFORMATETC pformatetcOut) noexcept
{
pformatetcOut->ptd = nullptr;
return ResultFromScode(E_NOTIMPL);
}
STDMETHODIMP
-QWindowsOleDataObject::SetData(LPFORMATETC pFormatetc, STGMEDIUM *pMedium, BOOL fRelease)
+QWindowsOleDataObject::SetData(LPFORMATETC pFormatetc, STGMEDIUM *pMedium, BOOL fRelease) noexcept
{
if (QWindowsContext::verbose > 1)
qCDebug(lcQpaMime) << __FUNCTION__;
@@ -132,7 +132,7 @@ QWindowsOleDataObject::SetData(LPFORMATETC pFormatetc, STGMEDIUM *pMedium, BOOL
STDMETHODIMP
-QWindowsOleDataObject::EnumFormatEtc(DWORD dwDirection, LPENUMFORMATETC FAR* ppenumFormatEtc)
+QWindowsOleDataObject::EnumFormatEtc(DWORD dwDirection, LPENUMFORMATETC FAR* ppenumFormatEtc) noexcept
{
if (QWindowsContext::verbose > 1)
qCDebug(lcQpaMime) << __FUNCTION__ << "dwDirection=" << dwDirection;
@@ -169,20 +169,20 @@ QWindowsOleDataObject::EnumFormatEtc(DWORD dwDirection, LPENUMFORMATETC FAR* ppe
STDMETHODIMP
QWindowsOleDataObject::DAdvise(FORMATETC FAR*, DWORD,
- LPADVISESINK, DWORD FAR*)
+ LPADVISESINK, DWORD FAR*) noexcept
{
return ResultFromScode(OLE_E_ADVISENOTSUPPORTED);
}
STDMETHODIMP
-QWindowsOleDataObject::DUnadvise(DWORD)
+QWindowsOleDataObject::DUnadvise(DWORD) noexcept
{
return ResultFromScode(OLE_E_ADVISENOTSUPPORTED);
}
STDMETHODIMP
-QWindowsOleDataObject::EnumDAdvise(LPENUMSTATDATA FAR*)
+QWindowsOleDataObject::EnumDAdvise(LPENUMSTATDATA FAR*) noexcept
{
return ResultFromScode(OLE_E_ADVISENOTSUPPORTED);
}
@@ -252,7 +252,7 @@ bool QWindowsOleEnumFmtEtc::isNull() const
// IEnumFORMATETC methods
STDMETHODIMP
-QWindowsOleEnumFmtEtc::Next(ULONG celt, LPFORMATETC rgelt, ULONG FAR* pceltFetched)
+QWindowsOleEnumFmtEtc::Next(ULONG celt, LPFORMATETC rgelt, ULONG FAR* pceltFetched) noexcept
{
ULONG i=0;
ULONG nOffset;
@@ -283,7 +283,7 @@ QWindowsOleEnumFmtEtc::Next(ULONG celt, LPFORMATETC rgelt, ULONG FAR* pceltFetch
}
STDMETHODIMP
-QWindowsOleEnumFmtEtc::Skip(ULONG celt)
+QWindowsOleEnumFmtEtc::Skip(ULONG celt) noexcept
{
ULONG i=0;
ULONG nOffset;
@@ -307,14 +307,14 @@ QWindowsOleEnumFmtEtc::Skip(ULONG celt)
}
STDMETHODIMP
-QWindowsOleEnumFmtEtc::Reset()
+QWindowsOleEnumFmtEtc::Reset() noexcept
{
m_nIndex = 0;
return NOERROR;
}
STDMETHODIMP
-QWindowsOleEnumFmtEtc::Clone(LPENUMFORMATETC FAR* newEnum)
+QWindowsOleEnumFmtEtc::Clone(LPENUMFORMATETC FAR* newEnum) noexcept
{
if (newEnum == nullptr)
return ResultFromScode(E_INVALIDARG);
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiautomation.cpp b/src/plugins/platforms/windows/uiautomation/qwindowsuiautomation.cpp
index 6954a881d09..5d580a6155b 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiautomation.cpp
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiautomation.cpp
@@ -15,6 +15,7 @@ struct winapi_func
const func_t func;
const T error_value;
#ifdef __GNUC__
+# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wcast-function-type"
#endif
winapi_func(const char *lib_name, const char *func_name, func_t func_proto,