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

Remove redundant includes.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2022-11-21 18:49:41 +02:00
parent 2d6fa0fe9b
commit 1925300ff3
11 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libs/vgeometry/vabstractarc.h
View File

@ -34,7 +34,6 @@
#include <QString> #include <QString>
#include <QtGlobal> #include <QtGlobal>
#include "../ifc/ifcdef.h"
#include "vabstractcurve.h" #include "vabstractcurve.h"
#include "vgeometrydef.h" #include "vgeometrydef.h"

2
src/libs/vgeometry/vabstractarc_p.h
View File

@ -30,8 +30,6 @@
#define VABSTRACTARC_P_H #define VABSTRACTARC_P_H
#include <QSharedData> #include <QSharedData>
#include "vgeometrydef.h"
#include "../vmisc/vabstractapplication.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h" #include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)

1
src/libs/vgeometry/varc.cpp
View File

@ -35,6 +35,7 @@
#include "../vmisc/def.h" #include "../vmisc/def.h"
#include "../vmisc/vmath.h" #include "../vmisc/vmath.h"
#include "../vmisc/compatibility.h" #include "../vmisc/compatibility.h"
#include "../vmisc/vabstractapplication.h"
#include "../ifc/ifcdef.h" #include "../ifc/ifcdef.h"
#include "vabstractcurve.h" #include "vabstractcurve.h"
#include "varc_p.h" #include "varc_p.h"

6
src/libs/vgeometry/varc_p.h
View File

@ -30,12 +30,12 @@
#define VARC_P_H #define VARC_P_H
#include <QSharedData> #include <QSharedData>
#include "vgeometrydef.h"
#include "../vmisc/vabstractvalapplication.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h" #include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/defglobal.h"
QT_WARNING_PUSH QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Weffc++") QT_WARNING_DISABLE_GCC("-Weffc++")
QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor") QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
@ -74,7 +74,7 @@ VArcData::VArcData(qreal radius, const QString &formulaRadius)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
VArcData::VArcData(qreal radius) VArcData::VArcData(qreal radius)
: radius(radius), : radius(radius),
formulaRadius(QString().number(VAbstractValApplication::VApp()->fromPixel(radius))) formulaRadius(QString().number(radius))
{} {}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

2
src/libs/vgeometry/vcubicbezier_p.h
View File

@ -33,11 +33,9 @@
#include <QLineF> #include <QLineF>
#include "vpointf.h" #include "vpointf.h"
#include "../vmisc/vabstractapplication.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h" #include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/vmath.h"
QT_WARNING_PUSH QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Weffc++") QT_WARNING_DISABLE_GCC("-Weffc++")

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

@ -284,6 +284,7 @@ VEllipticalArc::VEllipticalArc(qreal length, const VPointF &center, qreal radius
{ {
CreateName(); CreateName();
FindF2(length); FindF2(length);
SetFormulaLength(QString::number(length));
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -698,7 +699,6 @@ void VEllipticalArc::FindF2(qreal length)
SetFormulaF2(QString::number(endAngle), endAngle); SetFormulaF2(QString::number(endAngle), endAngle);
lenBez = GetLength(); lenBez = GetLength();
} }
SetFormulaLength(QString::number(VAbstractValApplication::VApp()->fromPixel(lenBez)));
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

8
src/libs/vgeometry/vellipticalarc_p.h
View File

@ -2,11 +2,9 @@
#define VELLIPTICALARC_P #define VELLIPTICALARC_P
#include <QSharedData> #include <QSharedData>
#include "../vmisc/vabstractvalapplication.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h" #include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "vpointf.h"
QT_WARNING_PUSH QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Weffc++") QT_WARNING_DISABLE_GCC("-Weffc++")
@ -69,10 +67,10 @@ VEllipticalArcData::VEllipticalArcData(qreal radius1, qreal radius2, const QStri
VEllipticalArcData::VEllipticalArcData(qreal radius1, qreal radius2, qreal rotationAngle) VEllipticalArcData::VEllipticalArcData(qreal radius1, qreal radius2, qreal rotationAngle)
: radius1(radius1), : radius1(radius1),
radius2(radius2), radius2(radius2),
formulaRadius1(QString().number(VAbstractValApplication::VApp()->fromPixel(radius1))), formulaRadius1(QString().number(radius1)),
formulaRadius2(QString().number(VAbstractValApplication::VApp()->fromPixel(radius2))), formulaRadius2(QString().number(radius2)),
rotationAngle(rotationAngle), rotationAngle(rotationAngle),
formulaRotationAngle(QString().number(VAbstractValApplication::VApp()->fromPixel(rotationAngle))), formulaRotationAngle(QString().number(rotationAngle)),
m_transform() m_transform()
{} {}

1
src/libs/vgeometry/vgobject_p.h
View File

@ -31,7 +31,6 @@
#include <QSharedData> #include <QSharedData>
#include "vgeometrydef.h" #include "vgeometrydef.h"
#include "../ifc/ifcdef.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h" #include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)

1
src/libs/vgeometry/vplacelabelitem_p.h
View File

@ -30,7 +30,6 @@
#include <QSharedData> #include <QSharedData>
#include "vgeometrydef.h" #include "vgeometrydef.h"
#include "../ifc/ifcdef.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h" #include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)

1
src/libs/vgeometry/vpointf_p.h
View File

@ -30,7 +30,6 @@
#define VPOINTF_P_H #define VPOINTF_P_H
#include <QSharedData> #include <QSharedData>
#include "vgeometrydef.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h" #include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)

11
src/libs/vgeometry/vspline_p.h
View File

@ -31,10 +31,9 @@
#include <QSharedData> #include <QSharedData>
#include <QLineF> #include <QLineF>
#include <QtMath>
#include "vpointf.h" #include "vpointf.h"
#include "../vmisc/vabstractvalapplication.h"
#include "../vmisc/vmath.h"
QT_WARNING_PUSH QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Weffc++") QT_WARNING_DISABLE_GCC("-Weffc++")
@ -140,12 +139,12 @@ VSplineData::VSplineData(VPointF p1, VPointF p4, qreal angle1, qreal angle2, qre
QLineF p1p2(p1.x(), p1.y(), p1.x() + L * kAsm1, p1.y()); QLineF p1p2(p1.x(), p1.y(), p1.x() + L * kAsm1, p1.y());
p1p2.setAngle(angle1); p1p2.setAngle(angle1);
c1Length = p1p2.length(); c1Length = p1p2.length();
c1LengthF = QString().number(VAbstractValApplication::VApp()->fromPixel(c1Length)); c1LengthF = QString().number(c1Length);
QLineF p4p3(p4.x(), p4.y(), p4.x() + L * kAsm2, p4.y()); QLineF p4p3(p4.x(), p4.y(), p4.x() + L * kAsm2, p4.y());
p4p3.setAngle(angle2); p4p3.setAngle(angle2);
c2Length = p4p3.length(); c2Length = p4p3.length();
c2LengthF = QString().number(VAbstractValApplication::VApp()->fromPixel(c2Length)); c2LengthF = QString().number(c2Length);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -168,7 +167,7 @@ VSplineData::VSplineData(VPointF p1, QPointF p2, QPointF p3, VPointF p4)
angle1F = QString().number(angle1); angle1F = QString().number(angle1);
c1Length = p1p2.length(); c1Length = p1p2.length();
c1LengthF = QString().number(VAbstractValApplication::VApp()->fromPixel(c1Length)); c1LengthF = QString().number(c1Length);
QLineF p4p3(static_cast<QPointF>(p4), static_cast<QPointF>(p3)); QLineF p4p3(static_cast<QPointF>(p4), static_cast<QPointF>(p3));
@ -176,7 +175,7 @@ VSplineData::VSplineData(VPointF p1, QPointF p2, QPointF p3, VPointF p4)
angle2F = QString().number(angle2); angle2F = QString().number(angle2);
c2Length = p4p3.length(); c2Length = p4p3.length();
c2LengthF = QString().number(VAbstractValApplication::VApp()->fromPixel(c2Length)); c2LengthF = QString().number(c2Length);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------