aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Suppress warning Wnoexcept.

Browse Source 
Cannot fix because QPointF is part of library.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2020-01-07 12:55:23 +02:00
parent cf1e383d7b
commit 0e12e9f9fb
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/vlayout/vlayoutpiece.cpp
View File

@ -225,6 +225,10 @@ QVector<VLayoutPlaceLabel> ConvertPlaceLabels(const VPiece &piece, const VContai
const auto label = pattern->GeometricObject<VPlaceLabelItem>(placeLabel); const auto label = pattern->GeometricObject<VPlaceLabelItem>(placeLabel);
if (label->IsVisible()) if (label->IsVisible())
{ {
QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Wnoexcept")
// noexcept-expression evaluates to 'false' because of a call to 'constexpr QPointF::QPointF()'
VLayoutPlaceLabel layoutLabel; VLayoutPlaceLabel layoutLabel;
layoutLabel.shape = label->LabelShape(); layoutLabel.shape = label->LabelShape();
layoutLabel.rotationMatrix = label->RotationMatrix(); layoutLabel.rotationMatrix = label->RotationMatrix();
@ -232,6 +236,8 @@ QVector<VLayoutPlaceLabel> ConvertPlaceLabels(const VPiece &piece, const VContai
layoutLabel.center = label->toQPointF(); layoutLabel.center = label->toQPointF();
layoutLabel.type = label->GetLabelType(); layoutLabel.type = label->GetLabelType();
labels.append(layoutLabel); labels.append(layoutLabel);
QT_WARNING_POP
} }
} }
return labels; return labels;
@ -275,8 +281,14 @@ QVector<VLayoutPassmark> ConvertPassmarks(const VPiece &piece, const VContainer
auto PrepareSAPassmark = [pData, passmark, piece, &layoutPassmarks, pattern](PassmarkSide side) auto PrepareSAPassmark = [pData, passmark, piece, &layoutPassmarks, pattern](PassmarkSide side)
{ {
QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Wnoexcept")
// noexcept-expression evaluates to 'false' because of a call to 'constexpr QPointF::QPointF()'
VLayoutPassmark layoutPassmark; VLayoutPassmark layoutPassmark;
QT_WARNING_POP
const QVector<VPieceNode> path = piece.GetUnitedPath(pattern); const QVector<VPieceNode> path = piece.GetUnitedPath(pattern);
const int nodeIndex = VPiecePath::indexOfNode(path, pData.id); const int nodeIndex = VPiecePath::indexOfNode(path, pData.id);
if (nodeIndex != -1) if (nodeIndex != -1)