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

Fix build with Qt 5.6.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2022-01-29 14:57:21 +02:00
parent ab49227ec2
commit a3e1cc8639
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/vdxf/vdxfengine.cpp
View File

@ -162,7 +162,7 @@ void VDxfEngine::drawPath(const QPainterPath &path)
{ {
const QList<QPolygonF> subpaths = path.toSubpathPolygons(matrix); const QList<QPolygonF> subpaths = path.toSubpathPolygons(matrix);
for (auto polygon : subpaths) for (const auto& polygon : subpaths)
{ {
if (polygon.isEmpty()) if (polygon.isEmpty())
{ {
@ -171,13 +171,13 @@ void VDxfEngine::drawPath(const QPainterPath &path)
if (m_version > DRW::AC1009) if (m_version > DRW::AC1009)
{ // Use lwpolyline { // Use lwpolyline
DRW_LWPolyline *poly = new DRW_LWPolyline(); auto *poly = new DRW_LWPolyline();
poly->layer = '0'; poly->layer = '0';
poly->color = getPenColor(); poly->color = getPenColor();
poly->lWeight = DRW_LW_Conv::widthByLayer; poly->lWeight = DRW_LW_Conv::widthByLayer;
poly->lineType = getPenStyle(); poly->lineType = getPenStyle();
if (polygon.size() > 1 && ConstFirst(polygon) == ConstLast(polygon)) if (polygon.size() > 1 && ConstFirst<QPointF>(polygon) == ConstLast<QPointF>(polygon))
{ {
poly->flags |= 0x1; // closed poly->flags |= 0x1; // closed
} }
@ -194,12 +194,12 @@ void VDxfEngine::drawPath(const QPainterPath &path)
} }
else else
{ // Use polyline { // Use polyline
DRW_Polyline *poly = new DRW_Polyline(); auto *poly = new DRW_Polyline();
poly->layer = '0'; poly->layer = '0';
poly->color = getPenColor(); poly->color = getPenColor();
poly->lWeight = DRW_LW_Conv::widthByLayer; poly->lWeight = DRW_LW_Conv::widthByLayer;
poly->lineType = getPenStyle(); poly->lineType = getPenStyle();
if (polygon.size() > 1 && ConstFirst(polygon) == ConstLast(polygon)) if (polygon.size() > 1 && ConstFirst<QPointF>(polygon) == ConstLast<QPointF>(polygon))
{ {
poly->flags |= 0x1; // closed poly->flags |= 0x1; // closed
} }
@ -1184,7 +1184,7 @@ P *VDxfEngine::CreateAAMAPolygon(const QVector<QPointF> &polygon, const QString
} }
else else
{ {
if (polygon.size() > 1 && ConstFirst(polygon) == ConstLast(polygon)) if (polygon.size() > 1 && ConstFirst<QPointF>(polygon) == ConstLast<QPointF>(polygon))
{ {
poly->flags |= 0x1; // closed poly->flags |= 0x1; // closed
} }