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

FontEngine[DirectWrite]: Mark interface functions noexcept

Browse Source 
MinGW-clang warns(-as-error) that the overridden functions are not
marked noexcept like in the original class.

Change-Id: I7c5663b82e0f4449e27fd3842f7b37015fd5f4ea
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 6d46788e43b3c949d8c5b5946dead7e7a6a54735)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Mårten Nordheim 2022-10-24 12:45:34 +02:00 committed by Qt Cherry-pick Bot
parent b9e37ee852
commit 6b2bd76fca
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/text/windows/qwindowsfontenginedirectwrite.cpp
View File

@ -65,7 +65,7 @@ namespace {
}; };
void GeometrySink::AddBeziers(const D2D1_BEZIER_SEGMENT *beziers, void GeometrySink::AddBeziers(const D2D1_BEZIER_SEGMENT *beziers,
UINT bezierCount) UINT bezierCount) noexcept
{ {
for (uint i=0; i<bezierCount; ++i) { for (uint i=0; i<bezierCount; ++i) {
QPointF c1 = fromD2D1_POINT_2F(beziers[i].point1); QPointF c1 = fromD2D1_POINT_2F(beziers[i].point1);
@ -76,48 +76,48 @@ namespace {
} }
} }
void GeometrySink::AddLines(const D2D1_POINT_2F *points, UINT pointsCount) void GeometrySink::AddLines(const D2D1_POINT_2F *points, UINT pointsCount) noexcept
{ {
for (uint i=0; i<pointsCount; ++i) for (uint i=0; i<pointsCount; ++i)
m_path->lineTo(fromD2D1_POINT_2F(points[i])); m_path->lineTo(fromD2D1_POINT_2F(points[i]));
} }
void GeometrySink::BeginFigure(D2D1_POINT_2F startPoint, void GeometrySink::BeginFigure(D2D1_POINT_2F startPoint,
D2D1_FIGURE_BEGIN /*figureBegin*/) D2D1_FIGURE_BEGIN /*figureBegin*/) noexcept
{ {
m_startPoint = fromD2D1_POINT_2F(startPoint); m_startPoint = fromD2D1_POINT_2F(startPoint);
m_path->moveTo(m_startPoint); m_path->moveTo(m_startPoint);
} }
IFACEMETHODIMP GeometrySink::Close() IFACEMETHODIMP GeometrySink::Close() noexcept
{ {
return E_NOTIMPL; return E_NOTIMPL;
} }
void GeometrySink::EndFigure(D2D1_FIGURE_END figureEnd) void GeometrySink::EndFigure(D2D1_FIGURE_END figureEnd) noexcept
{ {
if (figureEnd == D2D1_FIGURE_END_CLOSED) if (figureEnd == D2D1_FIGURE_END_CLOSED)
m_path->closeSubpath(); m_path->closeSubpath();
} }
void GeometrySink::SetFillMode(D2D1_FILL_MODE fillMode) void GeometrySink::SetFillMode(D2D1_FILL_MODE fillMode) noexcept
{ {
m_path->setFillRule(fillMode == D2D1_FILL_MODE_ALTERNATE m_path->setFillRule(fillMode == D2D1_FILL_MODE_ALTERNATE
? Qt::OddEvenFill ? Qt::OddEvenFill
: Qt::WindingFill); : Qt::WindingFill);
} }
void GeometrySink::SetSegmentFlags(D2D1_PATH_SEGMENT /*vertexFlags*/) void GeometrySink::SetSegmentFlags(D2D1_PATH_SEGMENT /*vertexFlags*/) noexcept
{ {
/* Not implemented */ /* Not implemented */
} }
IFACEMETHODIMP_(unsigned long) GeometrySink::AddRef() IFACEMETHODIMP_(unsigned long) GeometrySink::AddRef() noexcept
{ {
return InterlockedIncrement(&m_refCount); return InterlockedIncrement(&m_refCount);
} }
IFACEMETHODIMP_(unsigned long) GeometrySink::Release() IFACEMETHODIMP_(unsigned long) GeometrySink::Release() noexcept
{ {
unsigned long newCount = InterlockedDecrement(&m_refCount); unsigned long newCount = InterlockedDecrement(&m_refCount);
if (newCount == 0) if (newCount == 0)
@ -129,7 +129,7 @@ namespace {
return newCount; return newCount;
} }
IFACEMETHODIMP GeometrySink::QueryInterface(IID const &riid, void **ppvObject) IFACEMETHODIMP GeometrySink::QueryInterface(IID const &riid, void **ppvObject) noexcept
{ {
if (__uuidof(IDWriteGeometrySink) == riid) { if (__uuidof(IDWriteGeometrySink) == riid) {
*ppvObject = this; *ppvObject = this;