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

Refactoring.

Browse Source 
Replace the redundant type with "auto".
This commit is contained in:
Roman Telezhynskyi 2024-05-02 13:47:29 +03:00
parent 5e56f30fb1
commit 9600364c05
30 changed files with 64 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/ifc/xml/vabstractpattern.cpp
View File

@ -799,8 +799,7 @@ auto VAbstractPattern::ParseSANode(const QDomElement &domElement) -> VPieceNode
VDomDocument::GetParametrString(domElement, VAbstractPattern::AttrSABefore, currentSeamAllowance);
const QString saAfter =
VDomDocument::GetParametrString(domElement, VAbstractPattern::AttrSAAfter, currentSeamAllowance);
const PieceNodeAngle angle =
static_cast<PieceNodeAngle>(VDomDocument::GetParametrUInt(domElement, AttrAngle, QChar('0')));
const auto angle = static_cast<PieceNodeAngle>(VDomDocument::GetParametrUInt(domElement, AttrAngle, QChar('0')));
const bool passmark = VDomDocument::GetParametrBool(domElement, VAbstractPattern::AttrNodePassmark, falseStr);
const PassmarkLineType passmarkLine = StringToPassmarkLineType(
@ -1510,7 +1509,7 @@ void VAbstractPattern::DeleteBackgroundImage(const QUuid &id)
const QDomElement imageElement = imageNode.toElement();
if (not imageElement.isNull())
{
QUuid const imageId = QUuid(GetParametrEmptyString(imageElement, AttrImageId));
auto const imageId = QUuid(GetParametrEmptyString(imageElement, AttrImageId));
if (imageId == id)
{
imagesTag.removeChild(imageElement);
@ -2272,7 +2271,7 @@ auto VAbstractPattern::GetBackgroundImageElement(const QUuid &id) const -> QDomE
const QDomElement imageElement = imageNode.toElement();
if (not imageElement.isNull())
{
QUuid const imageId = QUuid(GetParametrEmptyString(imageElement, AttrImageId));
auto const imageId = QUuid(GetParametrEmptyString(imageElement, AttrImageId));
if (imageId == id)
{
return imageElement;

2
src/libs/qmuparser/qmuparsertest.cpp
View File

@ -504,7 +504,7 @@ auto QmuParserTester::TestVarConst() -> int
// 4 used variables
p.SetExpr("a+b+c+d");
qmu::varmap_type UsedVar = p.GetUsedVar();
int iCount = static_cast<int>(UsedVar.size());
auto iCount = static_cast<int>(UsedVar.size());
if (iCount != 4)
{
throw false;

2
src/libs/vformat/vmeasurements.cpp
View File

@ -1017,7 +1017,7 @@ auto VMeasurements::DimensionTypeToStr(const MeasurementDimension &type) -> QStr
//---------------------------------------------------------------------------------------------------------------------
auto VMeasurements::StrToDimensionType(const QString &type) -> MeasurementDimension
{
const QStringList dimensions = QStringList{DimensionX, DimensionY, DimensionW, DimensionZ};
const auto dimensions = QStringList{DimensionX, DimensionY, DimensionW, DimensionZ};
switch (dimensions.indexOf(type))
{
case 1: // DimensionY

2
src/libs/vgeometry/vabstractcurve.cpp
View File

@ -496,7 +496,7 @@ auto VAbstractCurve::CurveIntersectAxis(const QPointF &point, qreal angle, const
rec.translate(-INT_MAX / 2.0, -INT_MAX / 2.0);
// Instead of using axis compare two rays. See issue #963.
QLineF axis = QLineF(point, VGObject::BuildRay(point, angle, rec));
auto axis = QLineF(point, VGObject::BuildRay(point, angle, rec));
QVector<QPointF> points = VAbstractCurve::CurveIntersectLine(curvePoints, axis);
axis = QLineF(point, VGObject::BuildRay(point, angle + 180, rec));

4
src/libs/vgeometry/vgobject.cpp
View File

@ -299,7 +299,7 @@ auto VGObject::ToJson() const -> QJsonObject
//---------------------------------------------------------------------------------------------------------------------
auto VGObject::BuildLine(const QPointF &p1, const qreal &length, const qreal &angle) -> QLineF
{
QLineF line = QLineF();
QLineF line;
line.setP1(p1);
line.setAngle(angle); // First set angle then length. Length can have negative value.
line.setLength(length);
@ -696,7 +696,7 @@ auto VGObject::FlippingMatrix(const QLineF &axis) -> QTransform
return matrix;
}
const QLineF axisOX = QLineF(axis.x2(), axis.y2(), axis.x2() + 100, axis.y2()); // Ox axis
const auto axisOX = QLineF(axis.x2(), axis.y2(), axis.x2() + 100, axis.y2()); // Ox axis
const qreal angle = axis.angleTo(axisOX);
const QPointF p2 = axis.p2();

10
src/libs/vlayout/vabstractpiece.cpp
View File

@ -327,7 +327,7 @@ auto AngleByFirstSymmetry(const QVector<VRawSAPoint> &points, QPointF p1, QPoint
*needRollback = false;
}
const QLineF axis = QLineF(p1, p2);
const auto axis = QLineF(p1, p2);
QLineF const sEdge(VPointF::FlipPF(axis, bigLine2.p1()), VPointF::FlipPF(axis, bigLine2.p2()));
@ -408,7 +408,7 @@ auto AngleBySecondSymmetry(const QVector<VRawSAPoint> &points, QPointF p1, QPoin
*needRollback = false;
}
const QLineF axis = QLineF(p3, p2);
const auto axis = QLineF(p3, p2);
QLineF const sEdge(VPointF::FlipPF(axis, bigLine1.p1()), VPointF::FlipPF(axis, bigLine1.p2()));
@ -755,7 +755,7 @@ void RollbackByLength(QVector<VRawSAPoint> &ekvPoints, const QVector<VSAPoint> &
//---------------------------------------------------------------------------------------------------------------------
void RollbackBySecondEdgeSymmetry(QVector<VRawSAPoint> &ekvPoints, const QVector<VSAPoint> &points, qreal width)
{
const QLineF axis = QLineF(points.at(points.size() - 1), points.at(1));
const auto axis = QLineF(points.at(points.size() - 1), points.at(1));
const QLineF bigLine1 = VAbstractPiece::ParallelLine(points.at(points.size() - 2), points.at(0), width);
QLineF const sEdge(VPointF::FlipPF(axis, bigLine1.p1()), VPointF::FlipPF(axis, bigLine1.p2()));
@ -772,7 +772,7 @@ void RollbackBySecondEdgeSymmetry(QVector<VRawSAPoint> &ekvPoints, const QVector
//---------------------------------------------------------------------------------------------------------------------
void RollbackByFirstEdgeSymmetry(QVector<VRawSAPoint> &ekvPoints, const QVector<VSAPoint> &points, qreal width)
{
const QLineF axis = QLineF(points.at(points.size() - 2), points.at(points.size() - 1));
const auto axis = QLineF(points.at(points.size() - 2), points.at(points.size() - 1));
const QLineF bigLine2 = VAbstractPiece::ParallelLine(points.at(points.size() - 1), points.at(1), width);
QLineF const sEdge(VPointF::FlipPF(axis, bigLine2.p1()), VPointF::FlipPF(axis, bigLine2.p2()));
const QLineF bigLine1 = VAbstractPiece::ParallelLine(points.at(points.size() - 2), points.at(0), width);
@ -1625,7 +1625,7 @@ void VAbstractPiece::SetUUID(const QUuid &uuid)
//---------------------------------------------------------------------------------------------------------------------
void VAbstractPiece::SetUUID(const QString &uuid)
{
const QUuid temp = QUuid(uuid);
const auto temp = QUuid(uuid);
d->m_uuid = temp.isNull() ? QUuid::createUuid() : temp;
}

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

@ -1269,7 +1269,7 @@ void VLayoutPiece::Mirror(const QLineF &edge)
return;
}
const QLineF axis = QLineF(edge.x2(), edge.y2(), edge.x2() + 100, edge.y2()); // Ox axis
const auto axis = QLineF(edge.x2(), edge.y2(), edge.x2() + 100, edge.y2()); // Ox axis
const qreal angle = edge.angleTo(axis);
const QPointF p2 = edge.p2();

4
src/libs/vmisc/crashhandler/vcrashpaths.cpp
View File

@ -55,9 +55,9 @@ auto LogDirPath(const QString &appName) -> QString
#endif
}
#if defined(Q_OS_WINDOWS)
QString path = QStringList{logDirPath, logs}.join(QDir::separator());
auto path = QStringList{logDirPath, logs}.join(QDir::separator());
#else
QString path = QStringList{logDirPath, VER_COMPANYNAME_STR, logs, appName}.join(QDir::separator());
auto path = QStringList{logDirPath, VER_COMPANYNAME_STR, logs, appName}.join(QDir::separator());
#endif
return path;
}

4
src/libs/vmisc/vabstractapplication.cpp
View File

@ -662,9 +662,9 @@ auto VAbstractApplication::LogDirPath() -> QString
#endif
}
#if defined(Q_OS_WINDOWS)
QString path = QStringList{logDirPath, logs}.join(QDir::separator());
auto path = QStringList{logDirPath, logs}.join(QDir::separator());
#else
QString path =
auto path =
QStringList{logDirPath, QCoreApplication::organizationName(), logs, QCoreApplication::applicationName()}.join(
QDir::separator());
#endif

2
src/libs/vmisc/vcommonsettings.cpp
View File

@ -347,7 +347,7 @@ void VCommonSettings::SetPathCustomImage(const QString &value)
//---------------------------------------------------------------------------------------------------------------------
auto VCommonSettings::GetDefPathSVGFonts() -> QString
{
QString const defPath = QStringList{QDir::homePath(), "Valentina"_L1, "Svg fonts"_L1}.join(QDir::separator());
auto const defPath = QStringList{QDir::homePath(), "Valentina"_L1, "Svg fonts"_L1}.join(QDir::separator());
#if defined(Q_OS_WIN)
QString const docPath = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);

34
src/libs/vpatterndb/vpassmark.cpp
View File

@ -82,7 +82,7 @@ auto PointsToSegments(const QVector<QPointF> &points) -> QVector<QLineF>
lines.reserve(points.size() - 1);
for (int i = 0; i < points.size() - 1; ++i)
{
QLineF const segment = QLineF(points.at(i), points.at(i + 1));
auto const segment = QLineF(points.at(i), points.at(i + 1));
if (segment.length() > 0)
{
lines.append(segment);
@ -183,7 +183,7 @@ auto PassmarkWidth(const VPiecePassmarkData &passmarkData, qreal width) -> qreal
//---------------------------------------------------------------------------------------------------------------------
auto FixNotchPoint(const QVector<QPointF> &seamAllowance, const VPiecePassmarkData &data, QPointF *notch) -> bool
{
QLineF axis = QLineF(data.passmarkSAPoint, *notch);
auto axis = QLineF(data.passmarkSAPoint, *notch);
if (data.passmarkAngleType == PassmarkAngleType::Straightforward)
{
@ -274,7 +274,7 @@ auto CreateTwoPassmarkLines(const VPiecePassmarkData &passmarkData, const QLineF
QPointF l1p2;
{
QLineF line1 = QLineF(line.p2(), line.p1());
auto line1 = QLineF(line.p2(), line.p1());
line1.setAngle(line1.angle() - 90);
line1.setLength(width / 2.);
l1p2 = line1.p2();
@ -282,7 +282,7 @@ auto CreateTwoPassmarkLines(const VPiecePassmarkData &passmarkData, const QLineF
QPointF l2p2;
{
QLineF line2 = QLineF(line.p2(), line.p1());
auto line2 = QLineF(line.p2(), line.p1());
line2.setAngle(line2.angle() + 90);
line2.setLength(width / 2.);
l2p2 = line2.p2();
@ -321,7 +321,7 @@ auto CreateThreePassmarkLines(const VPiecePassmarkData &passmarkData, const QLin
QPointF l1p2;
{
QLineF line1 = QLineF(line.p2(), line.p1());
auto line1 = QLineF(line.p2(), line.p1());
line1.setAngle(line1.angle() - 90);
line1.setLength(width / 2.);
l1p2 = line1.p2();
@ -329,7 +329,7 @@ auto CreateThreePassmarkLines(const VPiecePassmarkData &passmarkData, const QLin
QPointF l2p2;
{
QLineF line2 = QLineF(line.p2(), line.p1());
auto line2 = QLineF(line.p2(), line.p1());
line2.setAngle(line2.angle() + 90);
line2.setLength(width / 2.);
l2p2 = line2.p2();
@ -353,7 +353,7 @@ auto CreateTMarkPassmark(const VPiecePassmarkData &passmarkData, const QLineF &l
QPointF p1;
{
QLineF tmpLine = QLineF(line.p2(), line.p1());
auto tmpLine = QLineF(line.p2(), line.p1());
tmpLine.setAngle(tmpLine.angle() - 90);
tmpLine.setLength(width / 2.);
p1 = tmpLine.p2();
@ -361,7 +361,7 @@ auto CreateTMarkPassmark(const VPiecePassmarkData &passmarkData, const QLineF &l
QPointF p2;
{
QLineF tmpLine = QLineF(line.p2(), line.p1());
auto tmpLine = QLineF(line.p2(), line.p1());
tmpLine.setAngle(tmpLine.angle() + 90);
tmpLine.setLength(width / 2.);
p2 = tmpLine.p2();
@ -396,11 +396,11 @@ auto CreateInternalVMarkPassmark(const VPiecePassmarkData &passmarkData, const Q
const qreal width = PassmarkWidth(passmarkData, defWidth * 2.);
const qreal angle = qRadiansToDegrees(qAtan(qAbs(width) / 2. / line.length()));
QLineF l1 = QLineF(line.p2(), line.p1());
auto l1 = QLineF(line.p2(), line.p1());
l1.setAngle(l1.angle() + angle);
l1 = VPassmark::FindIntersection(l1, seamAllowance);
QLineF l2 = QLineF(line.p2(), line.p1());
auto l2 = QLineF(line.p2(), line.p1());
l2.setAngle(l2.angle() - angle);
return {{l1.p2(), l1.p1()}, VPassmark::FindIntersection(l2, seamAllowance)};
@ -439,7 +439,7 @@ auto CreateUMarkPassmark(const VPiecePassmarkData &passmarkData, const QLineF &l
QPointF l1p2;
{
QLineF line = QLineF(baseLine.p2(), baseLine.p1());
auto line = QLineF(baseLine.p2(), baseLine.p1());
line.setAngle(line.angle() + 90);
line.setLength(radius);
l1p2 = line.p2();
@ -447,7 +447,7 @@ auto CreateUMarkPassmark(const VPiecePassmarkData &passmarkData, const QLineF &l
QPointF l2p2;
{
QLineF line = QLineF(baseLine.p2(), baseLine.p1());
auto line = QLineF(baseLine.p2(), baseLine.p1());
line.setAngle(line.angle() - 90);
line.setLength(radius);
l2p2 = line.p2();
@ -497,7 +497,7 @@ auto CreateBoxMarkPassmark(const VPiecePassmarkData &passmarkData, const QLineF
QPointF l1p2;
{
QLineF tmp = QLineF(line.p2(), line.p1());
auto tmp = QLineF(line.p2(), line.p1());
tmp.setAngle(tmp.angle() + 90);
tmp.setLength(width / 2.);
l1p2 = tmp.p2();
@ -513,7 +513,7 @@ auto CreateBoxMarkPassmark(const VPiecePassmarkData &passmarkData, const QLineF
QPointF l2p2;
{
QLineF tmp = QLineF(line.p2(), line.p1());
auto tmp = QLineF(line.p2(), line.p1());
tmp.setAngle(tmp.angle() - 90);
tmp.setLength(width / 2.);
l2p2 = tmp.p2();
@ -783,7 +783,7 @@ auto VPassmark::PassmarkStraightforwardBaseLine(const QPointF &seamPassmarkSAPoi
return {};
}
QLineF line = QLineF(seamPassmarkSAPoint, m_data.passmarkSAPoint);
auto line = QLineF(seamPassmarkSAPoint, m_data.passmarkSAPoint);
line.setLength(length);
return {line};
}
@ -952,8 +952,8 @@ auto VPassmark::BuiltInSAPassmarkBaseLine(const VPiece &piece) const -> QVector<
}
}
QLineF edge1 = QLineF(m_data.passmarkSAPoint, m_data.previousSAPoint);
QLineF const edge2 = QLineF(m_data.passmarkSAPoint, m_data.nextSAPoint);
auto edge1 = QLineF(m_data.passmarkSAPoint, m_data.previousSAPoint);
auto const edge2 = QLineF(m_data.passmarkSAPoint, m_data.nextSAPoint);
edge1.setAngle(edge1.angle() + edge1.angleTo(edge2) / 2.);
edge1.setLength(length);

2
src/libs/vtools/dialogs/tools/dialogarc.cpp
View File

@ -269,7 +269,7 @@ void DialogArc::ShowDialog(bool click)
auto *scene = qobject_cast<VMainGraphicsScene *>(VAbstractValApplication::VApp()->getCurrentScene());
SCASSERT(scene != nullptr)
const QSharedPointer<VPointF> point = data->GeometricObject<VPointF>(GetCenter());
QLineF const line = QLineF(static_cast<QPointF>(*point), scene->getScenePos());
auto const line = QLineF(static_cast<QPointF>(*point), scene->getScenePos());
auto Angle = [&line]()
{

2
src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp
View File

@ -296,7 +296,7 @@ void DialogArcWithLength::ShowDialog(bool click)
auto *scene = qobject_cast<VMainGraphicsScene *>(VAbstractValApplication::VApp()->getCurrentScene());
SCASSERT(scene != nullptr)
const QSharedPointer<VPointF> point = data->GeometricObject<VPointF>(GetCenter());
QLineF const line = QLineF(static_cast<QPointF>(*point), scene->getScenePos());
auto const line = QLineF(static_cast<QPointF>(*point), scene->getScenePos());
auto Angle = [&line]()
{

2
src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp
View File

@ -232,7 +232,7 @@ void DialogCurveIntersectAxis::ShowDialog(bool click)
auto *scene = qobject_cast<VMainGraphicsScene *>(VAbstractValApplication::VApp()->getCurrentScene());
SCASSERT(scene != nullptr)
const QSharedPointer<VPointF> point = data->GeometricObject<VPointF>(GetBasePointId());
QLineF const line = QLineF(static_cast<QPointF>(*point), scene->getScenePos());
auto const line = QLineF(static_cast<QPointF>(*point), scene->getScenePos());
// Radius of point circle, but little bigger. Need handle with hover sizes.
if (line.length() <= ScaledRadius(SceneScale(VAbstractValApplication::VApp()->getCurrentScene())) * 1.5)

2
src/libs/vtools/dialogs/tools/dialogellipticalarc.cpp
View File

@ -590,7 +590,7 @@ void DialogEllipticalArc::ShowDialog(bool click)
SCASSERT(scene != nullptr)
const QSharedPointer<VPointF> center = data->GeometricObject<VPointF>(GetCenter());
QLineF line = QLineF(static_cast<QPointF>(*center), scene->getScenePos());
auto line = QLineF(static_cast<QPointF>(*center), scene->getScenePos());
auto Angle = [&line]()
{

2
src/libs/vtools/dialogs/tools/dialogendline.cpp
View File

@ -344,7 +344,7 @@ void DialogEndLine::ShowDialog(bool click)
auto *scene = qobject_cast<VMainGraphicsScene *>(VAbstractValApplication::VApp()->getCurrentScene());
SCASSERT(scene != nullptr)
const QSharedPointer<VPointF> point = data->GeometricObject<VPointF>(GetBasePointId());
QLineF const line = QLineF(static_cast<QPointF>(*point), scene->getScenePos());
auto const line = QLineF(static_cast<QPointF>(*point), scene->getScenePos());
// Radius of point circle, but little bigger. Need handle with hover sizes.
if (line.length() <= ScaledRadius(SceneScale(VAbstractValApplication::VApp()->getCurrentScene())) * 1.5)

2
src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp
View File

@ -255,7 +255,7 @@ void DialogLineIntersectAxis::ShowDialog(bool click)
auto *scene = qobject_cast<VMainGraphicsScene *>(VAbstractValApplication::VApp()->getCurrentScene());
SCASSERT(scene != nullptr)
const QSharedPointer<VPointF> point = data->GeometricObject<VPointF>(GetBasePointId());
QLineF const line = QLineF(static_cast<QPointF>(*point), scene->getScenePos());
auto const line = QLineF(static_cast<QPointF>(*point), scene->getScenePos());
// Radius of point circle, but little bigger. Need handle with hover sizes.
if (line.length() <= ScaledRadius(SceneScale(VAbstractValApplication::VApp()->getCurrentScene())) * 1.5)

2
src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp
View File

@ -223,7 +223,7 @@ void DialogPointFromCircleAndTangent::ShowDialog(bool click)
auto *scene = qobject_cast<VMainGraphicsScene *>(VAbstractValApplication::VApp()->getCurrentScene());
SCASSERT(scene != nullptr)
const QSharedPointer<VPointF> center = data->GeometricObject<VPointF>(GetCircleCenterId());
QLineF const line = QLineF(static_cast<QPointF>(*center), scene->getScenePos());
auto const line = QLineF(static_cast<QPointF>(*center), scene->getScenePos());
SetCircleRadius(QString::number(FromPixel(line.length(), *data->GetPatternUnit())));
}

2
src/libs/vtools/dialogs/tools/dialogrotation.cpp
View File

@ -277,7 +277,7 @@ void DialogRotation::ShowDialog(bool click)
try
{
const QSharedPointer<VPointF> point = data->GeometricObject<VPointF>(GetOrigPointId());
const QLineF line = QLineF(static_cast<QPointF>(*point), scene->getScenePos());
const auto line = QLineF(static_cast<QPointF>(*point), scene->getScenePos());
// Radius of point circle, but little bigger. Need handle with hover sizes.
if (line.length() <= ScaledRadius(SceneScale(VAbstractValApplication::VApp()->getCurrentScene())) * 1.5)

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp
View File

@ -272,7 +272,7 @@ auto VToolAlongLine::Create(VToolAlongLineInitData &initData) -> VToolAlongLine
{
const QSharedPointer<VPointF> firstPoint = initData.data->GeometricObject<VPointF>(initData.firstPointId);
const QSharedPointer<VPointF> secondPoint = initData.data->GeometricObject<VPointF>(initData.secondPointId);
QLineF line = QLineF(static_cast<QPointF>(*firstPoint), static_cast<QPointF>(*secondPoint));
auto line = QLineF(static_cast<QPointF>(*firstPoint), static_cast<QPointF>(*secondPoint));
// Declare special variable "CurrentLength"
auto *length = new VLengthLine(firstPoint.data(), initData.firstPointId, secondPoint.data(), initData.secondPointId,

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp
View File

@ -133,7 +133,7 @@ auto VToolEndLine::Create(const QPointer<DialogTool> &dialog, VMainGraphicsScene
auto VToolEndLine::Create(VToolEndLineInitData &initData) -> VToolEndLine *
{
const QSharedPointer<VPointF> basePoint = initData.data->GeometricObject<VPointF>(initData.basePointId);
QLineF line = QLineF(static_cast<QPointF>(*basePoint), QPointF(basePoint->x() + 100, basePoint->y()));
auto line = QLineF(static_cast<QPointF>(*basePoint), QPointF(basePoint->x() + 100, basePoint->y()));
line.setAngle(CheckFormula(initData.id, initData.formulaAngle, initData.data)); // First set angle.
line.setLength(

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp
View File

@ -120,7 +120,7 @@ auto VToolLineIntersectAxis::Create(const QPointer<DialogTool> &dialog, VMainGra
auto VToolLineIntersectAxis::Create(VToolLineIntersectAxisInitData &initData) -> VToolLineIntersectAxis *
{
const QSharedPointer<VPointF> basePoint = initData.data->GeometricObject<VPointF>(initData.basePointId);
QLineF axis = QLineF(static_cast<QPointF>(*basePoint), QPointF(basePoint->x() + 100, basePoint->y()));
auto axis = QLineF(static_cast<QPointF>(*basePoint), QPointF(basePoint->x() + 100, basePoint->y()));
axis.setAngle(CheckFormula(initData.id, initData.formulaAngle, initData.data));
const QSharedPointer<VPointF> firstPoint = initData.data->GeometricObject<VPointF>(initData.firstPointId);

6
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp
View File

@ -114,7 +114,7 @@ auto VToolShoulderPoint::FindPoint(const QPointF &p1Line, const QPointF &p2Line,
return shoulderPoint;
}
QLineF line = QLineF(p1Line, p2Line);
auto line = QLineF(p1Line, p2Line);
const qreal baseLength = line.length();
const int baseAngle = qRound(line.angle());
line.setLength(length * 2);
@ -126,8 +126,8 @@ auto VToolShoulderPoint::FindPoint(const QPointF &p1Line, const QPointF &p2Line,
if (res == 1 || res == 2)
{
const QLineF line1 = QLineF(p1Line, p1);
const QLineF line2 = QLineF(p1Line, p2);
const auto line1 = QLineF(p1Line, p1);
const auto line2 = QLineF(p1Line, p2);
if (line1.length() > baseLength && baseAngle == qRound(line1.angle()))
{
shoulderPoint = p1;

4
src/libs/vtools/tools/vtooluniondetails.cpp
View File

@ -375,8 +375,8 @@ void UnionInitParameters(const VToolUnionDetailsInitData &initData, const VPiece
point4.setX(point4.x() + dx);
point4.setY(point4.y() + dy);
const QLineF p4p3 = QLineF(static_cast<QPointF>(point4), static_cast<QPointF>(point3));
const QLineF p1p2 = QLineF(static_cast<QPointF>(point1), static_cast<QPointF>(point2));
const auto p4p3 = QLineF(static_cast<QPointF>(point4), static_cast<QPointF>(point3));
const auto p1p2 = QLineF(static_cast<QPointF>(point1), static_cast<QPointF>(point2));
angle = p4p3.angleTo(p1p2);
}

8
src/libs/vtools/visualization/line/visline.cpp
View File

@ -83,7 +83,7 @@ auto VisLine::Ray(const QPointF &firstPoint, const qreal &angle) const -> QPoint
{
if (this->scene() == nullptr)
{
QLineF line = QLineF(firstPoint, ScenePos());
auto line = QLineF(firstPoint, ScenePos());
line.setAngle(angle);
return line.p2(); // We can't find ray because item doesn't have scene. We will return cursor position on scene.
}
@ -91,10 +91,10 @@ auto VisLine::Ray(const QPointF &firstPoint, const qreal &angle) const -> QPoint
QRectF scRect = this->scene()->sceneRect();
// Limit size of the scene rect. Axis that has same size as scene rect cause scene size growth.
QLineF line1 = QLineF(scRect.topLeft(), scRect.bottomRight());
auto line1 = QLineF(scRect.topLeft(), scRect.bottomRight());
line1.setLength(2);
QLineF line2 = QLineF(scRect.bottomRight(), scRect.topLeft());
auto line2 = QLineF(scRect.bottomRight(), scRect.topLeft());
line2.setLength(2);
scRect = QRectF(line1.p2(), line2.p2());
@ -110,7 +110,7 @@ auto VisLine::Ray(const QPointF &firstPoint, const qreal &angle) const -> QPoint
//---------------------------------------------------------------------------------------------------------------------
auto VisLine::Ray(const QPointF &firstPoint) const -> QPointF
{
QLineF const line = QLineF(firstPoint, ScenePos());
auto const line = QLineF(firstPoint, ScenePos());
return Ray(firstPoint, line.angle());
}

4
src/libs/vtools/visualization/line/vistoolnormal.cpp
View File

@ -82,7 +82,7 @@ void VisToolNormal::RefreshGeometry()
{
QPointF const fPoint = VToolNormal::FindPoint(static_cast<QPointF>(*first),
static_cast<QPointF>(*second), m_length, m_angle);
QLineF const mainLine = QLineF(static_cast<QPointF>(*first), fPoint);
auto const mainLine = QLineF(static_cast<QPointF>(*first), fPoint);
DrawLine(this, mainLine, LineStyle());
DrawPoint(m_point, mainLine.p2());
@ -101,7 +101,7 @@ void VisToolNormal::RefreshGeometry()
QPointF const fPoint =
VToolNormal::FindPoint(static_cast<QPointF>(*first), static_cast<QPointF>(*second), len, m_angle);
QLineF const mainLine = QLineF(static_cast<QPointF>(*first), fPoint);
auto const mainLine = QLineF(static_cast<QPointF>(*first), fPoint);
DrawLine(this, mainLine, LineStyle());
DrawPoint(m_point, mainLine.p2());

4
src/libs/vtools/visualization/line/vistoolshoulderpoint.cpp
View File

@ -92,7 +92,7 @@ void VisToolShoulderPoint::RefreshGeometry()
QPointF const fPoint =
VToolShoulderPoint::FindPoint(static_cast<QPointF>(*second), static_cast<QPointF>(*third),
static_cast<QPointF>(*first), m_length);
QLineF const mainLine = QLineF(static_cast<QPointF>(*second), fPoint);
auto const mainLine = QLineF(static_cast<QPointF>(*second), fPoint);
DrawLine(this, mainLine, LineStyle());
DrawPoint(m_point, mainLine.p2());
@ -105,7 +105,7 @@ void VisToolShoulderPoint::RefreshGeometry()
qreal const len = cursorLine.length();
QPointF const fPoint = VToolShoulderPoint::FindPoint(
static_cast<QPointF>(*second), static_cast<QPointF>(*third), static_cast<QPointF>(*first), len);
QLineF const mainLine = QLineF(static_cast<QPointF>(*second), fPoint);
auto const mainLine = QLineF(static_cast<QPointF>(*second), fPoint);
DrawLine(this, mainLine, LineStyle());
DrawPoint(m_point, mainLine.p2());

2
src/libs/vtools/visualization/path/vistoolarc.cpp
View File

@ -65,7 +65,7 @@ void VisToolArc::RefreshGeometry()
if (GetMode() == Mode::Creation)
{
QLineF const r = QLineF(static_cast<QPointF>(*first), ScenePos());
auto const r = QLineF(static_cast<QPointF>(*first), ScenePos());
auto Angle = [&r]()
{

2
src/libs/vtools/visualization/path/vistoolarcwithlength.cpp
View File

@ -63,7 +63,7 @@ void VisToolArcWithLength::RefreshGeometry()
if (GetMode() == Mode::Creation)
{
QLineF const r = QLineF(static_cast<QPointF>(*first), ScenePos());
auto const r = QLineF(static_cast<QPointF>(*first), ScenePos());
auto Angle = [&r]()
{

4
src/test/ValentinaTest/tst_vpointf.cpp
View File

@ -52,7 +52,7 @@ void TST_VPointF::TestFlip_data()
QTest::addColumn<QString>("prefix");
VPointF const originPoint;
QLineF axis = QLineF(QPointF(5, 0), QPointF(5, 10));
auto axis = QLineF(QPointF(5, 0), QPointF(5, 10));
auto flipped = QPointF(10, 0);
QTest::newRow("Vertical axis") << originPoint << axis << flipped << "a2";
@ -62,7 +62,7 @@ void TST_VPointF::TestFlip_data()
QTest::newRow("Horizontal axis") << originPoint << axis << flipped << "a2";
QLineF l = QLineF(QPointF(), QPointF(10, 0));
auto l = QLineF(QPointF(), QPointF(10, 0));
l.setAngle(315);
flipped = l.p2();
l.setLength(l.length() / 2.0);