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

Fix build issues.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-05-10 11:00:34 +03:00
parent 04852c132c
commit 54fdcf3cae
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/fervor/fvupdater.h
View File

@ -35,8 +35,6 @@
#include "fvavailableupdate.h" #include "fvavailableupdate.h"
#include "fvupdatewindow.h" #include "fvupdatewindow.h"
#include "../vmisc/defglobal.h"
class FvUpdater final : public QObject class FvUpdater final : public QObject
{ {
Q_OBJECT // NOLINT Q_OBJECT // NOLINT

39
src/libs/vwidgets/vpiecegrainline.cpp
View File

@ -29,9 +29,10 @@
#include "../vgeometry/vabstractcurve.h" #include "../vgeometry/vabstractcurve.h"
#include "qmath.h" #include "qmath.h"
#include "vpiecegrainline_p.h" #include "vpiecegrainline_p.h"
#include <algorithm>
#include <QPolygonF>
#include <QTransform> #include <QTransform>
#include <algorithm>
namespace namespace
{ {
@ -216,10 +217,10 @@ auto VPieceGrainline::ArrowUp() const -> QPolygonF
const QPointF pt = mainLine.p2(); const QPointF pt = mainLine.p2();
return { return {
pt, {pt,
QPointF(pt.x() + arrowLength * cos(rotation + arrowAngle), pt.y() - arrowLength * sin(rotation + arrowAngle)), QPointF(pt.x() + arrowLength * cos(rotation + arrowAngle), pt.y() - arrowLength * sin(rotation + arrowAngle)),
QPointF(pt.x() + arrowLength * cos(rotation - arrowAngle), pt.y() - arrowLength * sin(rotation - arrowAngle)), QPointF(pt.x() + arrowLength * cos(rotation - arrowAngle), pt.y() - arrowLength * sin(rotation - arrowAngle)),
pt}; pt}};
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -230,10 +231,10 @@ auto VPieceGrainline::ArrowDown() const -> QPolygonF
const QPointF pt = mainLine.p1(); const QPointF pt = mainLine.p1();
return { return {
pt, {pt,
QPointF(pt.x() + arrowLength * cos(rotation + arrowAngle), pt.y() - arrowLength * sin(rotation + arrowAngle)), QPointF(pt.x() + arrowLength * cos(rotation + arrowAngle), pt.y() - arrowLength * sin(rotation + arrowAngle)),
QPointF(pt.x() + arrowLength * cos(rotation - arrowAngle), pt.y() - arrowLength * sin(rotation - arrowAngle)), QPointF(pt.x() + arrowLength * cos(rotation - arrowAngle), pt.y() - arrowLength * sin(rotation - arrowAngle)),
pt}; pt}};
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -243,10 +244,10 @@ auto VPieceGrainline::ArrowLeft() const -> QPolygonF
const QPointF pt = SecondaryLine().p1(); const QPointF pt = SecondaryLine().p1();
return { return {
pt, {pt,
QPointF(pt.x() + arrowLength * cos(rotation - arrowAngle), pt.y() - arrowLength * sin(rotation - arrowAngle)), QPointF(pt.x() + arrowLength * cos(rotation - arrowAngle), pt.y() - arrowLength * sin(rotation - arrowAngle)),
QPointF(pt.x() + arrowLength * cos(rotation + arrowAngle), pt.y() - arrowLength * sin(rotation + arrowAngle)), QPointF(pt.x() + arrowLength * cos(rotation + arrowAngle), pt.y() - arrowLength * sin(rotation + arrowAngle)),
pt}; pt}};
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -256,10 +257,10 @@ auto VPieceGrainline::ArrowRight() const -> QPolygonF
const QPointF pt = SecondaryLine().p2(); const QPointF pt = SecondaryLine().p2();
return { return {
pt, {pt,
QPointF(pt.x() + arrowLength * cos(rotation + arrowAngle), pt.y() - arrowLength * sin(rotation + arrowAngle)), QPointF(pt.x() + arrowLength * cos(rotation + arrowAngle), pt.y() - arrowLength * sin(rotation + arrowAngle)),
QPointF(pt.x() + arrowLength * cos(rotation - arrowAngle), pt.y() - arrowLength * sin(rotation - arrowAngle)), QPointF(pt.x() + arrowLength * cos(rotation - arrowAngle), pt.y() - arrowLength * sin(rotation - arrowAngle)),
pt}; pt}};
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -403,7 +404,7 @@ auto VPieceGrainline::IsPositionValid(const QVector<QPointF> &contourPoints) con
grainLine = {mainLine}; grainLine = {mainLine};
for (auto line : grainLine) for (auto line : qAsConst(grainLine))
{ {
QVector<QPointF> points = VAbstractCurve::CurveIntersectLine(contourPoints, line); QVector<QPointF> points = VAbstractCurve::CurveIntersectLine(contourPoints, line);
for (auto &point : points) for (auto &point : points)
@ -416,7 +417,7 @@ auto VPieceGrainline::IsPositionValid(const QVector<QPointF> &contourPoints) con
} }
QPainterPath grainLinePath; QPainterPath grainLinePath;
for (auto line : grainLine) for (auto line : qAsConst(grainLine))
{ {
grainLinePath.addPath(VGObject::PainterPath(QVector<QPointF>{line.p1(), line.p2()})); grainLinePath.addPath(VGObject::PainterPath(QVector<QPointF>{line.p1(), line.p2()}));
} }