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

Refactoring.

Browse Source 
Optimize includes.
This commit is contained in:
Roman Telezhynskyi 2022-08-22 11:34:02 +03:00
parent 0939d28c41
commit a13f13e3fc
77 changed files with 179 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/ifc/ifcdef.cpp
View File

@ -38,7 +38,9 @@
#include <QStringData>
#include <QStringDataPtr>
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
const QString CustomMSign = QStringLiteral("@");
const QString CustomIncrSign = QStringLiteral("#");

2
src/libs/ifc/ifcdef.h
View File

@ -42,7 +42,9 @@
#include "../vmisc/typedef.h"
#include "../vmisc/def.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
extern const QString CustomMSign;
extern const QString CustomIncrSign;

2
src/libs/ifc/xml/vdomdocument.h
View File

@ -46,7 +46,9 @@
#include "../ifc/ifcdef.h"
#include "../vmisc/def.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/literals.h"
class QDomElement;

2
src/libs/qmuparser/qmuparsercallback_p.h
View File

@ -27,7 +27,9 @@
#include <QSharedData>
#include "qmuparserdef.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/defglobal.h"
QT_WARNING_PUSH

2
src/libs/vdxf/libdxfrw/drw_entities.cpp
View File

@ -16,7 +16,9 @@
#include "intern/dxfreader.h"
#include "intern/drw_dbg.h"
#include "drw_reserve.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
//! Calculate arbitrary axis

2
src/libs/vdxf/libdxfrw/libdxfrw.cpp
View File

@ -21,7 +21,9 @@
#include "intern/dxfreader.h"
#include "intern/dxfwriter.h"
#include "intern/drw_dbg.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#define FIRSTHANDLE 48

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

@ -47,7 +47,9 @@
#include <QtDebug>
#include "../vmisc/def.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/vmath.h"
#include "dxiface.h"
#include "../vlayout/vlayoutpiece.h"

38
src/libs/vformat/vpatternrecipe.cpp
View File

@ -28,7 +28,7 @@
#include "vpatternrecipe.h"
#include "../vmisc/projectversion.h"
#include "../vmisc/vabstractapplication.h"
#include "../vmisc/vabstractvalapplication.h"
#include "../ifc/xml/vabstractpattern.h"
#include "../ifc/exception/vexceptioninvalidhistory.h"
#include "../vpatterndb/vcontainer.h"
@ -36,9 +36,43 @@
#include "../vgeometry/vcubicbezier.h"
#include "../vgeometry/vsplinepath.h"
#include "../vgeometry/vcubicbezierpath.h"
#include "../vtools/tools/drawTools/drawtools.h"
#include "../vpatterndb/calculator.h"
#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h"
#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h"
#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h"
#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h"
#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h"
#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h"
#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h"
#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h"
#include "../vtools/tools/drawTools/toolcurve/vtoolarc.h"
#include "../vtools/tools/drawTools/toolcurve/vtoolellipticalarc.h"
#include "../vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h"
#include "../vtools/tools/drawTools/toolcurve/vtoolspline.h"
#include "../vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h"
#include "../vtools/tools/drawTools/toolcurve/vtoolsplinepath.h"
#include "../vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h"
#include "../vtools/tools/drawTools/vtoolline.h"
#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h"
#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h"
#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h"
#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h"
#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h"
#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h"
#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h"
#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h"
#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h"
#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h"
#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h"
#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h"
#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h"
#include "../vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h"
#include "../vtools/tools/drawTools/operation/vtoolrotation.h"
#include "../vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.h"
#include "../vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.h"
#include "../vtools/tools/drawTools/operation/vtoolmove.h"
namespace
{
#define TagStep QStringLiteral("step")

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

@ -32,7 +32,9 @@
#include <QSharedData>
#include "vgeometrydef.h"
#include "../vmisc/vabstractapplication.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "vpointf.h"
QT_WARNING_PUSH

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

@ -32,7 +32,9 @@
#include <QSharedData>
#include "../ifc/ifcdef.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Weffc++")

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

@ -32,7 +32,9 @@
#include <QSharedData>
#include "vgeometrydef.h"
#include "../vmisc/vabstractvalapplication.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Weffc++")

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

@ -34,7 +34,9 @@
#include "vpointf.h"
#include "../vmisc/vabstractapplication.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/vmath.h"
QT_WARNING_PUSH

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

@ -32,7 +32,9 @@
#include <QSharedData>
#include "vpointf.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Weffc++")

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

@ -3,7 +3,9 @@
#include <QSharedData>
#include "../vmisc/vabstractvalapplication.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "vpointf.h"
QT_WARNING_PUSH

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

@ -32,7 +32,9 @@
#include <QSharedData>
#include "vgeometrydef.h"
#include "../ifc/ifcdef.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Weffc++")

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

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

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

@ -36,7 +36,9 @@
#include <QTypeInfo>
#include <QtGlobal>
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "vgeometrydef.h"
#include "vgobject.h"

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

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

2
src/libs/vlayout/vabstractpiece_p.h
View File

@ -34,7 +34,9 @@
#include <QCoreApplication>
#include <QUuid>
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
# include "../vmisc/vdatastreamenum.h"
#endif

2
src/libs/vlayout/vbestsquare_p.h
View File

@ -32,7 +32,9 @@
#include <QTransform>
#include "vlayoutdef.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/defglobal.h"
QT_WARNING_PUSH

2
src/libs/vlayout/vcontour_p.h
View File

@ -35,7 +35,9 @@
#include <QRectF>
#include <QPainterPath>
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/defglobal.h"
QT_WARNING_PUSH

2
src/libs/vlayout/vlayoutpiece_p.h
View File

@ -37,7 +37,9 @@
#include "../vpatterndb/floatItemData/vpiecelabeldata.h"
#include "../vpatterndb/floatItemData/vpatternlabeldata.h"
#include "../vpatterndb/floatItemData/vgrainlinedata.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
# include "../vmisc/vdatastreamenum.h"
#endif

2
src/libs/vlayout/vlayoutpiecepath_p.h
View File

@ -34,7 +34,9 @@
#include <QVector>
#include <QDataStream>
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
# include "../vmisc/vdatastreamenum.h"
#endif

2
src/libs/vlayout/vrawsapoint.h
View File

@ -30,7 +30,9 @@
#include <QPointF>
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/def.h"
QT_WARNING_PUSH

2
src/libs/vlayout/vsapoint.h
View File

@ -28,7 +28,9 @@
#ifndef VSAPOINT_H
#define VSAPOINT_H
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/def.h"
#include "../ifc/ifcdef.h"

4
src/libs/vmisc/backport/qoverload.h
View File

@ -33,7 +33,9 @@
#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
#if defined(Q_COMPILER_VARIADIC_TEMPLATES)
#include "../diagnostic.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Weffc++")

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

@ -41,7 +41,9 @@
#include <QTextStream>
#include <Qt>
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
class QxtCsvModelPrivate : public QxtPrivate<QxtCsvModel>
{

2
src/libs/vmisc/vlockguard.h
View File

@ -38,7 +38,9 @@
#include <QString>
#include <stdint.h>
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/defglobal.h"
#include <QFileInfo>

2
src/libs/vobj/delaunay.cpp
View File

@ -23,7 +23,9 @@
#include <string.h>
#include <QtGlobal>
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "delaunay.h"
QT_WARNING_PUSH

2
src/libs/vobj/predicates.cpp
View File

@ -107,7 +107,9 @@
#include <QtGlobal>
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
QT_WARNING_PUSH
QT_WARNING_DISABLE_MSVC(4701)

2
src/libs/vobj/vobjengine.cpp
View File

@ -43,7 +43,9 @@
#include <QtDebug>
#include <Qt>
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/vmath.h"
class QPaintDevice;

2
src/libs/vpatterndb/variables/vincrement_p.h
View File

@ -33,7 +33,9 @@
#include "../ifc/ifcdef.h"
#include "../vcontainer.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Weffc++")

2
src/libs/vpatterndb/variables/vmeasurement_p.h
View File

@ -32,7 +32,9 @@
#include <QSharedData>
#include "../vcontainer.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Weffc++")

2
src/libs/vpatterndb/vcontainer.h
View File

@ -50,7 +50,9 @@
#include "../vgeometry/vabstractcubicbezierpath.h"
#include "../vgeometry/vabstractcurve.h"
#include "../vgeometry/vgobject.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "variables.h"
#include "variables/vinternalvariable.h"
#include "vpiece.h"

2
src/libs/vpatterndb/vformula_p.h
View File

@ -28,7 +28,9 @@
#ifndef VFORMULA_P_H
#define VFORMULA_P_H
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/typedef.h"
#include "../vmisc/vmath.h"
#include "../vmisc/defglobal.h"

2
src/libs/vpatterndb/vnodedetail_p.h
View File

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

2
src/libs/vpatterndb/vpiece_p.h
View File

@ -32,7 +32,9 @@
#include <QSharedData>
#include <QVector>
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/def.h"
#include "vpiecenode.h"
#include "vpiecepath.h"

2
src/libs/vpatterndb/vpiecenode_p.h
View File

@ -35,7 +35,9 @@
#include "../ifc/ifcdef.h"
#include "../ifc/exception/vexception.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
# include "../vmisc/vdatastreamenum.h"
#endif

2
src/libs/vpatterndb/vpiecepath_p.h
View File

@ -32,7 +32,9 @@
#include <QSharedData>
#include <QVector>
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "vpiecenode.h"
QT_WARNING_PUSH

2
src/libs/vpropertyexplorer/vabstractpropertyfactory.h
View File

@ -22,7 +22,9 @@
#define VABSTRACTPROPERTYFACTORY_H
#include "vpropertyexplorer_global.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include <QObject>
namespace VPE

2
src/libs/vpropertyexplorer/vpropertyformview_p.h
View File

@ -24,7 +24,9 @@
// ONLY INCLUDE THIS IN .CPP FILES
#include "vpropertyformwidget_p.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
namespace VPE
{

2
src/libs/vpropertyexplorer/vpropertyformwidget_p.h
View File

@ -25,7 +25,9 @@
#include <QList>
#include "vproperty.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
namespace VPE
{

2
src/libs/vpropertyexplorer/vwidgetproperty_p.h
View File

@ -24,7 +24,9 @@
// ONLY INCLUDE THIS IN .CPP FILES
#include "vproperty_p.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include <QPointer>
#include <QWidget>

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

@ -49,6 +49,7 @@
#include "../vgeometry/varc.h"
#include "../qmuparser/qmudef.h"
#include "../vwidgets/vabstractmainwindow.h"
#include "../vwidgets/global.h"
//---------------------------------------------------------------------------------------------------------------------
/**

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

@ -38,7 +38,6 @@
#include <QToolButton>
#include <Qt>
#include "../ifc/xml/vdomdocument.h"
#include "../vpatterndb/vtranslatevars.h"
#include "../vpatterndb/vcontainer.h"
#include "../../visualization/path/vistoolarcwithlength.h"
@ -50,6 +49,7 @@
#include "../vgeometry/varc.h"
#include "../qmuparser/qmudef.h"
#include "../vwidgets/vabstractmainwindow.h"
#include "../vwidgets/global.h"
//---------------------------------------------------------------------------------------------------------------------
DialogArcWithLength::DialogArcWithLength(const VContainer *data, quint32 toolId, QWidget *parent)

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

@ -54,6 +54,7 @@
#include "../qmuparser/qmudef.h"
#include "../dialogtoolbox.h"
#include "ui_dialogcurveintersectaxis.h"
#include "../vwidgets/global.h"
//---------------------------------------------------------------------------------------------------------------------
DialogCurveIntersectAxis::DialogCurveIntersectAxis(const VContainer *data, quint32 toolId, QWidget *parent)

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

@ -45,15 +45,14 @@
#include "../vpatterndb/vtranslatevars.h"
#include "../vwidgets/vmaingraphicsscene.h"
#include "../vwidgets/vabstractmainwindow.h"
#include "../../tools/vabstracttool.h"
#include "../../visualization/line/vistoolendline.h"
#include "../../visualization/visualization.h"
#include "../ifc/xml/vabstractpattern.h"
#include "../ifc/xml/vdomdocument.h"
#include "../support/dialogeditwrongformula.h"
#include "../vmisc/vabstractapplication.h"
#include "../vmisc/vcommonsettings.h"
#include "ui_dialogendline.h"
#include "../vwidgets/global.h"
//---------------------------------------------------------------------------------------------------------------------
/**

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

@ -49,7 +49,7 @@
#include "../vpatterndb/vtranslatevars.h"
#include "../vwidgets/vmaingraphicsscene.h"
#include "../vwidgets/vabstractmainwindow.h"
#include "../../tools/vabstracttool.h"
#include "../vwidgets/global.h"
#include "../../visualization/line/vistoollineintersectaxis.h"
#include "../../visualization/visualization.h"
#include "../ifc/xml/vabstractpattern.h"

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

@ -57,7 +57,6 @@
#include "../vgeometry/vpointf.h"
#include "../vmisc/vabstractapplication.h"
#include "../vmisc/vcommonsettings.h"
#include "../vmisc/compatibility.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
#include "../vmisc/backport/qoverload.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
@ -66,6 +65,7 @@
#include "../vwidgets/vabstractmainwindow.h"
#include "../vwidgets/vmaingraphicsscene.h"
#include "../vwidgets/vmaingraphicsview.h"
#include "../vwidgets/global.h"
#include "ui_dialogrotation.h"
#include "../../tools/drawTools/operation/vabstractoperation.h"

67
src/libs/vtools/tools/drawTools/drawtools.h
View File

@ -1,67 +0,0 @@
/************************************************************************
**
** @file drawtools.h
** @author Roman Telezhynskyi <dismine(at)gmail.com>
** @date November 15, 2013
**
** @brief
** @copyright
** This source code is part of the Valentina project, a pattern making
** program, whose allow create and modeling patterns of clothing.
** Copyright (C) 2013-2015 Valentina project
** <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
**
** Valentina is free software: you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
** the Free Software Foundation, either version 3 of the License, or
** (at your option) any later version.
**
** Valentina is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
**
** You should have received a copy of the GNU General Public License
** along with Valentina. If not, see <http://www.gnu.org/licenses/>.
**
*************************************************************************/
#ifndef DRAWTOOLS_H
#define DRAWTOOLS_H
#include "toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h"
#include "toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h"
#include "toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h"
#include "toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h"
#include "toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h"
#include "toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h"
#include "toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h"
#include "toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h"
#include "toolcurve/vtoolarc.h"
#include "toolcurve/vtoolellipticalarc.h"
#include "toolcurve/vtoolarcwithlength.h"
#include "toolcurve/vtoolspline.h"
#include "toolcurve/vtoolcubicbezier.h"
#include "toolcurve/vtoolsplinepath.h"
#include "toolcurve/vtoolcubicbezierpath.h"
#include "vtoolline.h"
#include "toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h"
#include "toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h"
#include "toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h"
#include "toolpoint/toolsinglepoint/vtoollineintersect.h"
#include "toolpoint/toolsinglepoint/vtoolpointofcontact.h"
#include "toolpoint/toolsinglepoint/vtoolbasepoint.h"
#include "toolpoint/toolsinglepoint/vtooltriangle.h"
#include "toolpoint/toolsinglepoint/vtoolpointofintersection.h"
#include "toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h"
#include "toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h"
#include "toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h"
#include "toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h"
#include "toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h"
#include "toolpoint/tooldoublepoint/vtooltruedarts.h"
#include "operation/vtoolrotation.h"
#include "operation/flipping/vtoolflippingbyline.h"
#include "operation/flipping/vtoolflippingbyaxis.h"
#include "operation/vtoolmove.h"
#endif // DRAWTOOLS_H

2
src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp
View File

@ -50,7 +50,9 @@
#include "../vpatterndb/vtranslatevars.h"
#include "../vmisc/vabstractapplication.h"
#include "../vmisc/vcommonsettings.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vpatterndb/vcontainer.h"
#include "../vpatterndb/vformula.h"
#include "../ifc/ifcdef.h"

2
src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp
View File

@ -50,7 +50,9 @@
#include "../vpatterndb/vtranslatevars.h"
#include "../vmisc/vabstractapplication.h"
#include "../vmisc/vcommonsettings.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vpatterndb/vcontainer.h"
#include "../vpatterndb/vformula.h"
#include "../ifc/ifcdef.h"

2
src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp
View File

@ -58,7 +58,9 @@
#include "../vpatterndb/vtranslatevars.h"
#include "../vmisc/vabstractapplication.h"
#include "../vmisc/vcommonsettings.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/compatibility.h"
#include "../vpatterndb/vcontainer.h"
#include "../vpatterndb/vformula.h"

2
src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp
View File

@ -58,7 +58,9 @@
#include "../vpatterndb/vtranslatevars.h"
#include "../vmisc/vabstractapplication.h"
#include "../vmisc/vcommonsettings.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vpatterndb/vcontainer.h"
#include "../vpatterndb/vformula.h"
#include "../ifc/ifcdef.h"

1
src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp
View File

@ -50,6 +50,7 @@
#include "../vgeometry/vabstractarc.h"
#include "../vpatterndb/vcontainer.h"
#include "../vwidgets/vcontrolpointspline.h"
#include "../vwidgets/global.h"
#include "../../../visualization/line/visline.h"
#include "../../vabstracttool.h"
#include "../vdrawtool.h"

3
src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp
View File

@ -46,6 +46,7 @@
#include <QVector>
#include <Qt>
#include <new>
#include <QtMath>
#include "../../../dialogs/tools/dialogspline.h"
#include "../../../dialogs/tools/dialogtool.h"
@ -59,10 +60,10 @@
#include "../vgeometry/vgobject.h"
#include "../vgeometry/vpointf.h"
#include "../vmisc/vabstractapplication.h"
#include "../vmisc/vmath.h"
#include "../vpatterndb/vcontainer.h"
#include "../vwidgets/vcontrolpointspline.h"
#include "../vwidgets/vmaingraphicsscene.h"
#include "../vwidgets/global.h"
#include "../../vabstracttool.h"
#include "../vdrawtool.h"
#include "vabstractspline.h"

3
src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp
View File

@ -46,6 +46,7 @@
#include <QUndoStack>
#include <Qt>
#include <new>
#include <QtMath>
#include "../../../dialogs/tools/dialogtool.h"
#include "../../../dialogs/tools/dialogsplinepath.h"
@ -64,11 +65,11 @@
#include "../vgeometry/vspline.h"
#include "../vgeometry/vsplinepoint.h"
#include "../vmisc/vabstractapplication.h"
#include "../vmisc/vmath.h"
#include "../vpatterndb/vcontainer.h"
#include "../vwidgets/../vgeometry/vsplinepath.h"
#include "../vwidgets/vcontrolpointspline.h"
#include "../vwidgets/vmaingraphicsscene.h"
#include "../vwidgets/global.h"
#include "../../vabstracttool.h"
#include "../vdrawtool.h"
#include "vabstractspline.h"

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

@ -43,12 +43,12 @@
#include "../ifc/ifcdef.h"
#include "../vgeometry/vgobject.h"
#include "../vgeometry/vpointf.h"
#include "../vmisc/vabstractapplication.h"
#include "../vpatterndb/vcontainer.h"
#include "../../../../vabstracttool.h"
#include "../../../vdrawtool.h"
#include "../vtoolsinglepoint.h"
#include "../vwidgets/scalesceneitems.h"
#include "../vwidgets/global.h"
template <class T> class QSharedPointer;

1
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp
View File

@ -60,6 +60,7 @@
#include "../vpatterndb/vcontainer.h"
#include "../vwidgets/vgraphicssimpletextitem.h"
#include "../vwidgets/scalesceneitems.h"
#include "../vwidgets/global.h"
#include "../../../vabstracttool.h"
#include "../../vdrawtool.h"
#include "../vabstractpoint.h"

8
src/libs/vtools/tools/drawTools/vtoolline.cpp
View File

@ -46,9 +46,9 @@
#include "../ifc/ifcdef.h"
#include "../vgeometry/vgobject.h"
#include "../vgeometry/vpointf.h"
#include "../vmisc/vabstractapplication.h"
#include "../vpatterndb/vcontainer.h"
#include "../vwidgets/vmaingraphicsscene.h"
#include "../vwidgets/global.h"
#include "../vabstracttool.h"
#include "vdrawtool.h"
@ -68,7 +68,7 @@ VToolLine::VToolLine(const VToolLineInitData &initData, QGraphicsItem *parent)
lineColor(initData.lineColor),
m_acceptHoverEvents(true)
{
m_isBoldLine = false;
SetBoldLine(false);
this->m_lineType = initData.typeLine;
//Line
RefreshGeometry();
@ -292,7 +292,7 @@ void VToolLine::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
{
if (m_acceptHoverEvents)
{
m_isBoldLine = true;
SetBoldLine(true);
setToolTip(MakeToolTip());
VScaledLine::hoverEnterEvent(event);
}
@ -311,7 +311,7 @@ void VToolLine::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
{
if (m_acceptHoverEvents && vis.isNull())
{
m_isBoldLine = false;
SetBoldLine(false);
VScaledLine::hoverLeaveEvent(event);
}
}

41
src/libs/vtools/tools/nodeDetails/nodedetails.h
View File

@ -1,41 +0,0 @@
/************************************************************************
**
** @file nodedetails.h
** @author Roman Telezhynskyi <dismine(at)gmail.com>
** @date November 15, 2013
**
** @brief
** @copyright
** This source code is part of the Valentina project, a pattern making
** program, whose allow create and modeling patterns of clothing.
** Copyright (C) 2013-2015 Valentina project
** <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
**
** Valentina is free software: you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
** the Free Software Foundation, either version 3 of the License, or
** (at your option) any later version.
**
** Valentina is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
**
** You should have received a copy of the GNU General Public License
** along with Valentina. If not, see <http://www.gnu.org/licenses/>.
**
*************************************************************************/
#ifndef NODEDETAILS_H
#define NODEDETAILS_H
#include "vnodearc.h"
#include "vnodeellipticalarc.h"
#include "vnodepoint.h"
#include "vnodespline.h"
#include "vnodesplinepath.h"
#include "vtoolpiecepath.h"
#include "vtoolpin.h"
#include "vtoolplacelabel.h"
#endif // NODEDETAILS_H

1
src/libs/vtools/tools/nodeDetails/vnodepoint.cpp
View File

@ -55,6 +55,7 @@
#include "../vpatterndb/vpiecenode.h"
#include "../vwidgets/vmaingraphicsscene.h"
#include "../vwidgets/vmaingraphicsview.h"
#include "../vwidgets/global.h"
#include "../vabstracttool.h"
#include "../vdatatool.h"
#include "vabstractnode.h"

1
src/libs/vtools/tools/nodeDetails/vtoolpiecepath.cpp
View File

@ -33,6 +33,7 @@
#include "../../undocommands/savepieceoptions.h"
#include "../vtoolseamallowance.h"
#include "../ifc/xml/vabstractpattern.h"
#include "../vwidgets/global.h"
//---------------------------------------------------------------------------------------------------------------------
VToolPiecePath *VToolPiecePath::Create(const QPointer<DialogTool> &dialog, VMainGraphicsScene *scene,

35
src/libs/vtools/tools/tools.h
View File

@ -1,35 +0,0 @@
/************************************************************************
**
** @file tools.h
** @author Roman Telezhynskyi <dismine(at)gmail.com>
** @date November 15, 2013
**
** @brief
** @copyright
** This source code is part of the Valentina project, a pattern making
** program, whose allow create and modeling patterns of clothing.
** Copyright (C) 2013-2015 Valentina project
** <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
**
** Valentina is free software: you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
** the Free Software Foundation, either version 3 of the License, or
** (at your option) any later version.
**
** Valentina is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
**
** You should have received a copy of the GNU General Public License
** along with Valentina. If not, see <http://www.gnu.org/licenses/>.
**
*************************************************************************/
#ifndef TOOLS_H
#define TOOLS_H
#include "drawTools/drawtools.h"
#include "nodeDetails/nodedetails.h"
#endif // TOOLS_H

3
src/libs/vtools/tools/tools.pri
View File

@ -9,7 +9,6 @@ HEADERS += \
$$PWD/backgroundimage/vbackgroundimageitem.h \
$$PWD/vdatatool.h \
$$PWD/vabstracttool.h \
$$PWD/tools.h \
$$PWD/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h \
$$PWD/drawTools/toolcurve/vtoolsplinepath.h \
$$PWD/drawTools/toolcurve/vtoolspline.h \
@ -28,13 +27,11 @@ HEADERS += \
$$PWD/drawTools/toolcurve/vtoolarc.h \
$$PWD/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h \
$$PWD/drawTools/vdrawtool.h \
$$PWD/drawTools/drawtools.h \
$$PWD/nodeDetails/vnodesplinepath.h \
$$PWD/nodeDetails/vnodespline.h \
$$PWD/nodeDetails/vnodepoint.h \
$$PWD/nodeDetails/vnodearc.h \
$$PWD/nodeDetails/vabstractnode.h \
$$PWD/nodeDetails/nodedetails.h \
$$PWD/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h \
$$PWD/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h \
$$PWD/vtooluniondetails.h \

9
src/libs/vtools/tools/vabstracttool.cpp
View File

@ -64,15 +64,18 @@
#include "../vgeometry/vsplinepath.h"
#include "../vgeometry/varc.h"
#include "../vgeometry/vellipticalarc.h"
#include "../vmisc/vcommonsettings.h"
#include "../vpatterndb/vcontainer.h"
#include "../vpatterndb/vpiecenode.h"
#include "../vpatterndb/calculator.h"
#include "../vwidgets/vgraphicssimpletextitem.h"
#include "nodeDetails/nodedetails.h"
#include "../dialogs/support/dialogundo.h"
#include "../dialogs/support/dialogeditwrongformula.h"
#include "toolsdef.h"
#include "nodeDetails/vabstractnode.h"
#include "nodeDetails/vnodepoint.h"
#include "nodeDetails/vnodearc.h"
#include "nodeDetails/vnodeellipticalarc.h"
#include "nodeDetails/vnodespline.h"
#include "nodeDetails/vnodesplinepath.h"
template <class T> class QSharedPointer;

2
src/libs/vtools/tools/vabstracttool.h
View File

@ -44,7 +44,9 @@
#include "../vmisc/vabstractapplication.h"
#include "../vmisc/def.h"
#include "../vwidgets/vmaingraphicsscene.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "vdatatool.h"
class VGraphicsSimpleTextItem;

18
src/libs/vtools/tools/vtoolseamallowance.cpp
View File

@ -34,15 +34,10 @@
#include "../vpatterndb/calculator.h"
#include "../vpatterndb/floatItemData/vpatternlabeldata.h"
#include "../vpatterndb/floatItemData/vpiecelabeldata.h"
#include "nodeDetails/nodedetails.h"
#include "../vgeometry/varc.h"
#include "../vgeometry/vellipticalarc.h"
#include "../vgeometry/vcubicbezier.h"
#include "../vgeometry/vcubicbezierpath.h"
#include "../vgeometry/vpointf.h"
#include "../vgeometry/vspline.h"
#include "../vgeometry/vsplinepath.h"
#include "../vgeometry/vplacelabelitem.h"
#include "../vgeometry/vellipticalarc.h"
#include "../ifc/xml/vpatternconverter.h"
#include "../ifc/exception/vexceptionwrongid.h"
#include "../undocommands/addpiece.h"
@ -53,12 +48,20 @@
#include "../vwidgets/vmaingraphicsview.h"
#include "../vwidgets/vnobrushscalepathitem.h"
#include "../vwidgets/vabstractmainwindow.h"
#include "../vwidgets/global.h"
#include "../qmuparser/qmutokenparser.h"
#include "../vlayout/vlayoutdef.h"
#include "toolsdef.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
#include "../vmisc/backport/qoverload.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
#include "tools/nodeDetails/vtoolpin.h"
#include "tools/nodeDetails/vnodepoint.h"
#include "tools/nodeDetails/vtoolpiecepath.h"
#include "tools/nodeDetails/vnodearc.h"
#include "tools/nodeDetails/vnodeellipticalarc.h"
#include "tools/nodeDetails/vnodespline.h"
#include "tools/nodeDetails/vnodesplinepath.h"
#include "tools/nodeDetails/vtoolplacelabel.h"
#include <QFuture>
#include <QtConcurrent/QtConcurrentRun>
@ -69,6 +72,7 @@
#include <QMessageBox>
#include <QTimer>
#include <QUuid>
#include <QtMath>
// Current version of seam allowance tag need for backward compatibility
const quint8 VToolSeamAllowance::pieceVersion = 2;

4
src/libs/vtools/visualization/line/operation/vistoolmove.cpp
View File

@ -40,7 +40,9 @@
#include <new>
#include "../ifc/xml/vdomdocument.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/vmodifierkey.h"
#include "../vgeometry/vabstractcurve.h"
#include "../vgeometry/varc.h"
@ -55,8 +57,8 @@
#include "../vgeometry/varc.h"
#include "../vmisc/vabstractapplication.h"
#include "../vpatterndb/vcontainer.h"
#include "../vwidgets/vmaingraphicsscene.h"
#include "visoperation.h"
#include "../vwidgets/global.h"
//---------------------------------------------------------------------------------------------------------------------
VisToolMove::VisToolMove(const VContainer *data, QGraphicsItem *parent)

5
src/libs/vtools/visualization/line/operation/vistoolrotation.cpp
View File

@ -39,7 +39,9 @@
#include <QtAlgorithms>
#include <new>
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/vmodifierkey.h"
#include "../vgeometry/vabstractcurve.h"
#include "../vgeometry/varc.h"
@ -51,9 +53,8 @@
#include "../vgeometry/vpointf.h"
#include "../vgeometry/vspline.h"
#include "../vgeometry/vsplinepath.h"
#include "../vmisc/vabstractapplication.h"
#include "../vpatterndb/vcontainer.h"
#include "../vwidgets/vmaingraphicsscene.h"
#include "../vwidgets/global.h"
#include "visoperation.h"
//---------------------------------------------------------------------------------------------------------------------

2
src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.cpp
View File

@ -35,12 +35,12 @@
#include <new>
#include "../../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h"
#include "../ifc/ifcdef.h"
#include "../vgeometry/vgobject.h"
#include "../vgeometry/vpointf.h"
#include "../vpatterndb/vcontainer.h"
#include "../visualization.h"
#include "visline.h"
#include "../vwidgets/global.h"
//---------------------------------------------------------------------------------------------------------------------
VisToolPointFromCircleAndTangent::VisToolPointFromCircleAndTangent(const VContainer *data, QGraphicsItem *parent)

2
src/libs/vtools/visualization/line/vistoolpointofcontact.cpp
View File

@ -36,11 +36,11 @@
#include <new>
#include "../../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h"
#include "../ifc/ifcdef.h"
#include "../vgeometry/vpointf.h"
#include "../vpatterndb/vcontainer.h"
#include "../visualization.h"
#include "visline.h"
#include "../vwidgets/global.h"
//---------------------------------------------------------------------------------------------------------------------
VisToolPointOfContact::VisToolPointOfContact(const VContainer *data, QGraphicsItem *parent)

1
src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp
View File

@ -39,6 +39,7 @@
#include "../vgeometry/vpointf.h"
#include "../vpatterndb/vcontainer.h"
#include "../vwidgets/vmaingraphicsscene.h"
#include "../vwidgets/global.h"
#include "../visualization.h"
#include "visline.h"
#include "../vmisc/vmodifierkey.h"

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

@ -34,7 +34,6 @@
#include <Qt>
#include <new>
#include "../ifc/ifcdef.h"
#include "../vgeometry/vabstractcurve.h"
#include "../vgeometry/vgeometrydef.h"
#include "../vgeometry/vpointf.h"
@ -42,6 +41,7 @@
#include "../vpatterndb/vcontainer.h"
#include "../vwidgets/vcontrolpointspline.h"
#include "../vwidgets/scalesceneitems.h"
#include "../vwidgets/global.h"
#include "../visualization.h"
#include "vispath.h"
#include "../vmisc/vmodifierkey.h"

1
src/libs/vtools/visualization/path/vistoolsplinepath.cpp
View File

@ -43,6 +43,7 @@
#include "../vpatterndb/vcontainer.h"
#include "../vwidgets/vcontrolpointspline.h"
#include "../vwidgets/scalesceneitems.h"
#include "../vwidgets/global.h"
#include "../visualization.h"
#include "vispath.h"
#include "../vmisc/vmodifierkey.h"

1
src/libs/vtools/visualization/visualization.cpp
View File

@ -52,6 +52,7 @@
#include "../vwidgets/vmaingraphicsscene.h"
#include "../vwidgets/vcurvepathitem.h"
#include "../vwidgets/scalesceneitems.h"
#include "../vwidgets/global.h"
template <class K, class V> class QHash;

1
src/libs/vtools/visualization/visualization.h
View File

@ -39,7 +39,6 @@
#include "../vmisc/vabstractvalapplication.h"
#include "../vwidgets/vmaingraphicsscene.h"
#include "../vwidgets/vcurvepathitem.h"
#include "../vwidgets/global.h"
#include "../vgeometry/vabstractcurve.h"
Q_DECLARE_LOGGING_CATEGORY(vVis)