From 7585db6a58b04eea44fa8ce5cc34b18d544dd78c Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 9 Aug 2016 16:55:46 +0300 Subject: [PATCH] Fix build on Qt\5.3\msvc2013_64_opengl. --HG-- branch : develop --- src/libs/fervor/fervor.pro | 2 ++ src/libs/ifc/exception/vexception.cpp | 2 +- src/libs/ifc/exception/vexceptionbadid.cpp | 2 +- .../exception/vexceptionconversionerror.cpp | 2 +- .../ifc/exception/vexceptionconversionerror.h | 2 +- .../exception/vexceptionemptyparameter.cpp | 2 +- .../ifc/exception/vexceptionobjecterror.cpp | 2 +- .../ifc/exception/vexceptionobjecterror.h | 2 +- src/libs/ifc/exception/vexceptionundo.cpp | 2 +- src/libs/ifc/exception/vexceptionwrongid.cpp | 2 +- src/libs/ifc/exception/vexceptionwrongid.h | 2 +- src/libs/ifc/ifc.pro | 5 +-- src/libs/ifc/xml/vabstractconverter.cpp | 2 +- src/libs/ifc/xml/vabstractmconverter.cpp | 2 +- src/libs/ifc/xml/vabstractpattern.cpp | 8 ++--- src/libs/ifc/xml/vdomdocument.cpp | 4 +-- src/libs/ifc/xml/vpatternconverter.cpp | 2 +- src/libs/ifc/xml/vvitconverter.cpp | 2 +- src/libs/ifc/xml/vvstconverter.cpp | 2 +- src/libs/libs.pri | 32 +++++++++++++++++++ src/libs/qmuparser/qmuparser.pro | 2 ++ src/libs/vdxf/vdxf.pro | 5 +-- src/libs/vformat/vformat.pro | 2 ++ src/libs/vformat/vmeasurements.cpp | 4 +-- src/libs/vformat/vmeasurements.h | 2 +- src/libs/vgeometry/vabstractarc.cpp | 2 +- src/libs/vgeometry/vabstractcubicbezier.cpp | 2 +- .../vgeometry/vabstractcubicbezierpath.cpp | 4 +-- src/libs/vgeometry/varc.cpp | 2 +- src/libs/vgeometry/vellipticalarc.cpp | 2 +- src/libs/vgeometry/vgeometry.pro | 2 ++ src/libs/vgeometry/vgobject.cpp | 2 +- src/libs/vlayout/vlayout.pro | 2 ++ src/libs/vmisc/vcommonsettings.cpp | 2 +- src/libs/vmisc/vmisc.pro | 2 ++ src/libs/vmisc/vsettings.cpp | 2 +- src/libs/vobj/vobj.pro | 2 ++ src/libs/vpatterndb/calculator.cpp | 2 +- src/libs/vpatterndb/variables/varcradius.cpp | 4 +-- src/libs/vpatterndb/variables/varcradius.h | 2 +- src/libs/vpatterndb/variables/vcurveangle.cpp | 6 ++-- .../vpatterndb/variables/vcurvelength.cpp | 4 +-- src/libs/vpatterndb/variables/vcurvelength.h | 2 +- .../vpatterndb/variables/vcurvevariable.cpp | 6 ++-- src/libs/vpatterndb/variables/vincrement.cpp | 4 +-- src/libs/vpatterndb/variables/vlineangle.cpp | 4 +-- src/libs/vpatterndb/variables/vlinelength.cpp | 2 +- src/libs/vpatterndb/variables/vlinelength.h | 2 +- .../vpatterndb/variables/vmeasurement.cpp | 4 +-- src/libs/vpatterndb/variables/vmeasurement.h | 2 +- src/libs/vpatterndb/variables/vvariable.cpp | 2 +- src/libs/vpatterndb/variables/vvariable.h | 2 +- src/libs/vpatterndb/vcontainer.cpp | 2 +- src/libs/vpatterndb/vcontainer.h | 4 +-- src/libs/vpatterndb/vdetail.cpp | 2 +- src/libs/vpatterndb/vformula.cpp | 2 +- src/libs/vpatterndb/vpatterndb.pro | 5 +-- src/libs/vpatterndb/vtranslatevars.cpp | 4 +-- .../vpropertyexplorer/vpropertyexplorer.pro | 2 ++ .../support/dialogeditwrongformula.cpp | 20 ++++++------ .../vtools/dialogs/support/dialogundo.cpp | 4 +-- .../vtools/dialogs/tools/dialogalongline.cpp | 6 ++-- .../vtools/dialogs/tools/dialogalongline.h | 1 - src/libs/vtools/dialogs/tools/dialogarc.cpp | 6 ++-- src/libs/vtools/dialogs/tools/dialogarc.h | 1 - .../dialogs/tools/dialogarcwithlength.cpp | 6 ++-- .../dialogs/tools/dialogarcwithlength.h | 1 - .../vtools/dialogs/tools/dialogbisector.cpp | 2 +- .../vtools/dialogs/tools/dialogbisector.h | 1 - .../dialogs/tools/dialogcubicbezier.cpp | 4 +-- .../dialogs/tools/dialogcubicbezierpath.cpp | 6 ++-- .../tools/dialogcurveintersectaxis.cpp | 12 +++---- .../dialogs/tools/dialogcurveintersectaxis.h | 1 - .../vtools/dialogs/tools/dialogcutarc.cpp | 4 +-- src/libs/vtools/dialogs/tools/dialogcutarc.h | 1 - .../vtools/dialogs/tools/dialogcutspline.cpp | 4 +-- .../vtools/dialogs/tools/dialogcutspline.h | 1 - .../dialogs/tools/dialogcutsplinepath.cpp | 4 +-- .../dialogs/tools/dialogcutsplinepath.h | 1 - .../vtools/dialogs/tools/dialogdetail.cpp | 6 ++-- .../vtools/dialogs/tools/dialogendline.cpp | 12 +++---- src/libs/vtools/dialogs/tools/dialogendline.h | 1 - src/libs/vtools/dialogs/tools/dialoggroup.h | 1 - .../vtools/dialogs/tools/dialogheight.cpp | 6 ++-- src/libs/vtools/dialogs/tools/dialogline.cpp | 4 +-- .../dialogs/tools/dialoglineintersect.cpp | 4 +-- .../dialogs/tools/dialoglineintersectaxis.cpp | 12 +++---- .../dialogs/tools/dialoglineintersectaxis.h | 1 - .../vtools/dialogs/tools/dialognormal.cpp | 4 +-- src/libs/vtools/dialogs/tools/dialognormal.h | 1 - .../tools/dialogpointfromarcandtangent.cpp | 2 +- .../tools/dialogpointfromcircleandtangent.cpp | 4 +-- .../tools/dialogpointfromcircleandtangent.h | 1 - .../dialogs/tools/dialogpointofcontact.cpp | 4 +-- .../dialogs/tools/dialogpointofcontact.h | 1 - .../tools/dialogpointofintersection.cpp | 6 ++-- .../tools/dialogpointofintersectionarcs.cpp | 2 +- .../dialogpointofintersectioncircles.cpp | 4 +-- .../tools/dialogpointofintersectioncircles.h | 1 - .../tools/dialogpointofintersectioncurves.cpp | 4 +-- .../vtools/dialogs/tools/dialogrotation.cpp | 2 +- .../vtools/dialogs/tools/dialogrotation.h | 1 - .../dialogs/tools/dialogshoulderpoint.cpp | 4 +-- .../dialogs/tools/dialogshoulderpoint.h | 1 - .../dialogs/tools/dialogsinglepoint.cpp | 2 +- .../vtools/dialogs/tools/dialogspline.cpp | 2 +- src/libs/vtools/dialogs/tools/dialogspline.h | 1 - .../vtools/dialogs/tools/dialogsplinepath.cpp | 2 +- .../vtools/dialogs/tools/dialogsplinepath.h | 1 - src/libs/vtools/dialogs/tools/dialogtool.cpp | 14 ++++---- src/libs/vtools/dialogs/tools/dialogtool.h | 3 +- .../vtools/dialogs/tools/dialogtriangle.cpp | 4 +-- .../vtools/dialogs/tools/dialogtruedarts.cpp | 4 +-- .../dialogs/tools/dialoguniondetails.cpp | 4 +-- .../drawTools/operation/vtoolrotation.cpp | 20 ++++++------ .../tools/drawTools/operation/vtoolrotation.h | 6 ++-- .../drawTools/toolcurve/vabstractspline.cpp | 6 ++-- .../drawTools/toolcurve/vabstractspline.h | 4 +-- .../tools/drawTools/toolcurve/vtoolarc.cpp | 12 +++---- .../tools/drawTools/toolcurve/vtoolarc.h | 2 +- .../toolcurve/vtoolarcwithlength.cpp | 12 +++---- .../drawTools/toolcurve/vtoolarcwithlength.h | 2 +- .../drawTools/toolcurve/vtoolcubicbezier.cpp | 10 +++--- .../drawTools/toolcurve/vtoolcubicbezier.h | 4 +-- .../toolcurve/vtoolcubicbezierpath.cpp | 12 +++---- .../toolcurve/vtoolcubicbezierpath.h | 2 +- .../tools/drawTools/toolcurve/vtoolspline.cpp | 12 +++---- .../tools/drawTools/toolcurve/vtoolspline.h | 4 +-- .../drawTools/toolcurve/vtoolsplinepath.cpp | 14 ++++---- .../drawTools/toolcurve/vtoolsplinepath.h | 4 +-- .../tooldoublepoint/vtooldoublepoint.cpp | 12 +++---- .../tooldoublepoint/vtooldoublepoint.h | 2 +- .../tooldoublepoint/vtooltruedarts.cpp | 12 +++---- .../tooldoublepoint/vtooltruedarts.h | 2 +- .../toolsinglepoint/toolcut/vtoolcut.cpp | 8 ++--- .../toolsinglepoint/toolcut/vtoolcut.h | 6 ++-- .../toolsinglepoint/toolcut/vtoolcutarc.cpp | 12 +++---- .../toolsinglepoint/toolcut/vtoolcutarc.h | 2 +- .../toolcut/vtoolcutspline.cpp | 12 +++---- .../toolsinglepoint/toolcut/vtoolcutspline.h | 2 +- .../toolcut/vtoolcutsplinepath.cpp | 12 +++---- .../toolcut/vtoolcutsplinepath.h | 2 +- .../toollinepoint/vtoolalongline.cpp | 14 ++++---- .../toollinepoint/vtoolalongline.h | 2 +- .../toollinepoint/vtoolbisector.cpp | 12 +++---- .../toollinepoint/vtoolbisector.h | 2 +- .../toollinepoint/vtoolcurveintersectaxis.cpp | 12 +++---- .../toollinepoint/vtoolcurveintersectaxis.h | 2 +- .../toollinepoint/vtoolendline.cpp | 12 +++---- .../toollinepoint/vtoolendline.h | 2 +- .../toollinepoint/vtoolheight.cpp | 12 +++---- .../toollinepoint/vtoolheight.h | 2 +- .../toollinepoint/vtoollineintersectaxis.cpp | 12 +++---- .../toollinepoint/vtoollineintersectaxis.h | 2 +- .../toollinepoint/vtoollinepoint.cpp | 8 ++--- .../toollinepoint/vtoollinepoint.h | 2 +- .../toollinepoint/vtoolnormal.cpp | 12 +++---- .../toollinepoint/vtoolnormal.h | 2 +- .../toollinepoint/vtoolshoulderpoint.cpp | 12 +++---- .../toollinepoint/vtoolshoulderpoint.h | 2 +- .../toolsinglepoint/vtoolbasepoint.cpp | 14 ++++---- .../toolsinglepoint/vtoolbasepoint.h | 4 +-- .../toolsinglepoint/vtoollineintersect.cpp | 12 +++---- .../toolsinglepoint/vtoollineintersect.h | 2 +- .../vtoolpointfromarcandtangent.cpp | 12 +++---- .../vtoolpointfromarcandtangent.h | 2 +- .../vtoolpointfromcircleandtangent.cpp | 12 +++---- .../vtoolpointfromcircleandtangent.h | 2 +- .../toolsinglepoint/vtoolpointofcontact.cpp | 12 +++---- .../toolsinglepoint/vtoolpointofcontact.h | 2 +- .../vtoolpointofintersection.cpp | 12 +++---- .../vtoolpointofintersection.h | 2 +- .../vtoolpointofintersectionarcs.cpp | 12 +++---- .../vtoolpointofintersectionarcs.h | 2 +- .../vtoolpointofintersectioncircles.cpp | 12 +++---- .../vtoolpointofintersectioncircles.h | 2 +- .../vtoolpointofintersectioncurves.cpp | 12 +++---- .../vtoolpointofintersectioncurves.h | 2 +- .../toolsinglepoint/vtoolsinglepoint.cpp | 12 +++---- .../toolsinglepoint/vtoolsinglepoint.h | 2 +- .../toolsinglepoint/vtooltriangle.cpp | 12 +++---- .../toolpoint/toolsinglepoint/vtooltriangle.h | 2 +- .../drawTools/toolpoint/vabstractpoint.cpp | 2 +- .../drawTools/toolpoint/vabstractpoint.h | 8 ++--- src/libs/vtools/tools/drawTools/vdrawtool.cpp | 14 ++++---- src/libs/vtools/tools/drawTools/vdrawtool.h | 6 ++-- src/libs/vtools/tools/drawTools/vtoolline.cpp | 10 +++--- src/libs/vtools/tools/drawTools/vtoolline.h | 2 +- .../tools/nodeDetails/vabstractnode.cpp | 8 ++--- .../vtools/tools/nodeDetails/vnodearc.cpp | 8 ++--- src/libs/vtools/tools/nodeDetails/vnodearc.h | 2 +- .../vtools/tools/nodeDetails/vnodepoint.cpp | 8 ++--- .../vtools/tools/nodeDetails/vnodepoint.h | 2 +- .../vtools/tools/nodeDetails/vnodespline.cpp | 8 ++--- .../vtools/tools/nodeDetails/vnodespline.h | 2 +- .../tools/nodeDetails/vnodesplinepath.cpp | 8 ++--- .../tools/nodeDetails/vnodesplinepath.h | 2 +- src/libs/vtools/tools/vabstracttool.cpp | 10 +++--- src/libs/vtools/tools/vabstracttool.h | 2 +- src/libs/vtools/tools/vtextgraphicsitem.cpp | 2 +- src/libs/vtools/tools/vtooldetail.cpp | 22 ++++++------- src/libs/vtools/tools/vtooluniondetails.cpp | 18 +++++------ src/libs/vtools/tools/vtooluniondetails.h | 7 ++-- src/libs/vtools/undocommands/adddet.cpp | 4 +-- src/libs/vtools/undocommands/adddetnode.cpp | 4 +-- src/libs/vtools/undocommands/addgroup.cpp | 6 ++-- .../vtools/undocommands/addpatternpiece.cpp | 4 +-- src/libs/vtools/undocommands/addtocalc.cpp | 6 ++-- src/libs/vtools/undocommands/deletedetail.cpp | 12 +++---- .../undocommands/deletepatternpiece.cpp | 4 +-- src/libs/vtools/undocommands/delgroup.cpp | 6 ++-- src/libs/vtools/undocommands/deltool.cpp | 6 ++-- .../undocommands/label/moveabstractlabel.cpp | 2 +- .../undocommands/label/movedoublelabel.cpp | 8 ++--- .../vtools/undocommands/label/movelabel.cpp | 8 ++--- .../undocommands/label/rotationmovelabel.cpp | 8 ++--- src/libs/vtools/undocommands/movedetail.cpp | 6 ++-- src/libs/vtools/undocommands/movespline.cpp | 10 +++--- src/libs/vtools/undocommands/movespline.h | 2 +- .../vtools/undocommands/movesplinepath.cpp | 6 ++-- src/libs/vtools/undocommands/movesplinepath.h | 2 +- src/libs/vtools/undocommands/movespoint.cpp | 6 ++-- src/libs/vtools/undocommands/renamepp.cpp | 4 +-- .../vtools/undocommands/savedetailoptions.cpp | 8 ++--- .../vtools/undocommands/savetooloptions.cpp | 4 +-- .../undocommands/toggledetailinlayout.cpp | 8 ++--- src/libs/vtools/undocommands/vundocommand.cpp | 6 ++-- src/libs/vtools/undocommands/vundocommand.h | 3 +- .../vtools/visualization/line/visline.cpp | 2 +- src/libs/vtools/visualization/line/visline.h | 2 +- .../visualization/line/vistoolalongline.cpp | 6 ++-- .../visualization/line/vistoolbisector.cpp | 6 ++-- .../line/vistoolcurveintersectaxis.cpp | 6 ++-- .../visualization/line/vistoolendline.cpp | 4 +-- .../visualization/line/vistoolheight.cpp | 6 ++-- .../vtools/visualization/line/vistoolline.cpp | 4 +-- .../line/vistoollineintersect.cpp | 6 ++-- .../line/vistoollineintersectaxis.cpp | 6 ++-- .../visualization/line/vistoolnormal.cpp | 6 ++-- .../line/vistoolpointfromarcandtangent.cpp | 6 ++-- .../line/vistoolpointfromcircleandtangent.cpp | 6 ++-- .../line/vistoolpointofcontact.cpp | 6 ++-- .../line/vistoolpointofintersection.cpp | 6 ++-- .../line/vistoolpointofintersectionarcs.cpp | 4 +-- .../vistoolpointofintersectioncircles.cpp | 6 ++-- .../visualization/line/vistoolrotation.cpp | 6 ++-- .../visualization/line/vistoolrotation.h | 2 +- .../line/vistoolshoulderpoint.cpp | 6 ++-- .../visualization/line/vistooltriangle.cpp | 6 ++-- .../visualization/line/vistooltruedarts.cpp | 6 ++-- .../vtools/visualization/path/vispath.cpp | 4 +-- .../vtools/visualization/path/vistoolarc.cpp | 6 ++-- .../path/vistoolarcwithlength.cpp | 6 ++-- .../visualization/path/vistoolcubicbezier.cpp | 6 ++-- .../path/vistoolcubicbezierpath.cpp | 4 +-- .../visualization/path/vistoolcutarc.cpp | 6 ++-- .../visualization/path/vistoolcutspline.cpp | 6 ++-- .../path/vistoolcutsplinepath.cpp | 6 ++-- .../path/vistoolpointofintersectioncurves.cpp | 4 +-- .../visualization/path/vistoolspline.cpp | 6 ++-- .../visualization/path/vistoolsplinepath.cpp | 4 +-- .../visualization/path/vistoolsplinepath.h | 1 - .../vtools/visualization/visualization.cpp | 7 ++-- src/libs/vtools/vtools.pro | 2 ++ src/libs/vwidgets/vabstractsimple.h | 1 - src/libs/vwidgets/vcontrolpointspline.cpp | 2 +- src/libs/vwidgets/vmaingraphicsscene.h | 1 - src/libs/vwidgets/vmaingraphicsview.cpp | 2 +- src/libs/vwidgets/vsimplecurve.cpp | 2 +- src/libs/vwidgets/vsimplecurve.h | 2 +- src/libs/vwidgets/vsimplepoint.h | 2 +- src/libs/vwidgets/vwidgets.pro | 2 ++ 272 files changed, 701 insertions(+), 684 deletions(-) create mode 100644 src/libs/libs.pri diff --git a/src/libs/fervor/fervor.pro b/src/libs/fervor/fervor.pro index 7959a96b3..fa2f901d7 100644 --- a/src/libs/fervor/fervor.pro +++ b/src/libs/fervor/fervor.pro @@ -67,3 +67,5 @@ CONFIG(release, debug|release){ } } } + +include (../libs.pri) diff --git a/src/libs/ifc/exception/vexception.cpp b/src/libs/ifc/exception/vexception.cpp index b7d5f74d5..019b88f4f 100644 --- a/src/libs/ifc/exception/vexception.cpp +++ b/src/libs/ifc/exception/vexception.cpp @@ -31,7 +31,7 @@ #include #include -#include "exception/../ifcdef.h" +#include "../ifcdef.h" //Q_LOGGING_CATEGORY(vExcep, "v.excep") //Commented because don't use now diff --git a/src/libs/ifc/exception/vexceptionbadid.cpp b/src/libs/ifc/exception/vexceptionbadid.cpp index 6ffc4f111..b1f294cd3 100644 --- a/src/libs/ifc/exception/vexceptionbadid.cpp +++ b/src/libs/ifc/exception/vexceptionbadid.cpp @@ -28,7 +28,7 @@ #include "vexceptionbadid.h" -#include "exception/vexception.h" +#include "vexception.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/libs/ifc/exception/vexceptionconversionerror.cpp b/src/libs/ifc/exception/vexceptionconversionerror.cpp index cda1b1d6f..3e6150411 100644 --- a/src/libs/ifc/exception/vexceptionconversionerror.cpp +++ b/src/libs/ifc/exception/vexceptionconversionerror.cpp @@ -30,7 +30,7 @@ #include -#include "exception/vexception.h" +#include "vexception.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/libs/ifc/exception/vexceptionconversionerror.h b/src/libs/ifc/exception/vexceptionconversionerror.h index a1808f1c4..8604fbb3e 100644 --- a/src/libs/ifc/exception/vexceptionconversionerror.h +++ b/src/libs/ifc/exception/vexceptionconversionerror.h @@ -32,7 +32,7 @@ #include #include -#include "exception/../ifcdef.h" +#include "../ifcdef.h" #include "vexception.h" /** diff --git a/src/libs/ifc/exception/vexceptionemptyparameter.cpp b/src/libs/ifc/exception/vexceptionemptyparameter.cpp index 03853f994..c2f1941c1 100644 --- a/src/libs/ifc/exception/vexceptionemptyparameter.cpp +++ b/src/libs/ifc/exception/vexceptionemptyparameter.cpp @@ -31,7 +31,7 @@ #include #include -#include "exception/vexception.h" +#include "vexception.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/libs/ifc/exception/vexceptionobjecterror.cpp b/src/libs/ifc/exception/vexceptionobjecterror.cpp index bceb126d2..e8e7bfe50 100644 --- a/src/libs/ifc/exception/vexceptionobjecterror.cpp +++ b/src/libs/ifc/exception/vexceptionobjecterror.cpp @@ -31,7 +31,7 @@ #include #include -#include "exception/vexception.h" +#include "vexception.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/libs/ifc/exception/vexceptionobjecterror.h b/src/libs/ifc/exception/vexceptionobjecterror.h index 10c2e0d2d..6eb5ac2ec 100644 --- a/src/libs/ifc/exception/vexceptionobjecterror.h +++ b/src/libs/ifc/exception/vexceptionobjecterror.h @@ -33,7 +33,7 @@ #include #include -#include "exception/../ifcdef.h" +#include "../ifcdef.h" #include "vexception.h" class QDomElement; diff --git a/src/libs/ifc/exception/vexceptionundo.cpp b/src/libs/ifc/exception/vexceptionundo.cpp index 487e349e6..4dc54f23c 100644 --- a/src/libs/ifc/exception/vexceptionundo.cpp +++ b/src/libs/ifc/exception/vexceptionundo.cpp @@ -28,7 +28,7 @@ #include "vexceptionundo.h" -#include "exception/vexception.h" +#include "vexception.h" //--------------------------------------------------------------------------------------------------------------------- VExceptionUndo::VExceptionUndo(const QString &what) diff --git a/src/libs/ifc/exception/vexceptionwrongid.cpp b/src/libs/ifc/exception/vexceptionwrongid.cpp index 5373df287..0ee637468 100644 --- a/src/libs/ifc/exception/vexceptionwrongid.cpp +++ b/src/libs/ifc/exception/vexceptionwrongid.cpp @@ -31,7 +31,7 @@ #include #include -#include "exception/vexception.h" +#include "vexception.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/libs/ifc/exception/vexceptionwrongid.h b/src/libs/ifc/exception/vexceptionwrongid.h index ab01e8a66..7c4712afd 100644 --- a/src/libs/ifc/exception/vexceptionwrongid.h +++ b/src/libs/ifc/exception/vexceptionwrongid.h @@ -33,7 +33,7 @@ #include #include -#include "exception/../ifcdef.h" +#include "../ifcdef.h" #include "vexception.h" class QDomElement; diff --git a/src/libs/ifc/ifc.pro b/src/libs/ifc/ifc.pro index aebea6785..5f29fd9ad 100644 --- a/src/libs/ifc/ifc.pro +++ b/src/libs/ifc/ifc.pro @@ -76,7 +76,4 @@ CONFIG(release, debug|release){ } } -win32-msvc*{ - #VMisc static library - INCLUDEPATH += $$PWD/../vmisc -} +include (../libs.pri) diff --git a/src/libs/ifc/xml/vabstractconverter.cpp b/src/libs/ifc/xml/vabstractconverter.cpp index 892fafeab..a1692b18a 100644 --- a/src/libs/ifc/xml/vabstractconverter.cpp +++ b/src/libs/ifc/xml/vabstractconverter.cpp @@ -45,7 +45,7 @@ #include "../exception/vexception.h" #include "../exception/vexceptionwrongid.h" -#include "xml/vdomdocument.h" +#include "vdomdocument.h" //--------------------------------------------------------------------------------------------------------------------- VAbstractConverter::VAbstractConverter(const QString &fileName) diff --git a/src/libs/ifc/xml/vabstractmconverter.cpp b/src/libs/ifc/xml/vabstractmconverter.cpp index 334353459..a68f30698 100644 --- a/src/libs/ifc/xml/vabstractmconverter.cpp +++ b/src/libs/ifc/xml/vabstractmconverter.cpp @@ -33,7 +33,7 @@ #include #include -#include "xml/vabstractconverter.h" +#include "vabstractconverter.h" //--------------------------------------------------------------------------------------------------------------------- VAbstractMConverter::VAbstractMConverter(const QString &fileName) diff --git a/src/libs/ifc/xml/vabstractpattern.cpp b/src/libs/ifc/xml/vabstractpattern.cpp index ea87d53bd..723c0b177 100644 --- a/src/libs/ifc/xml/vabstractpattern.cpp +++ b/src/libs/ifc/xml/vabstractpattern.cpp @@ -43,13 +43,13 @@ #include "../exception/vexceptionemptyparameter.h" #include "../exception/vexceptionobjecterror.h" #include "../qmuparser/qmutokenparser.h" -#include "../vpatterndb/../ifc/exception/vexceptionbadid.h" -#include "../vpatterndb/../vgeometry/../ifc/ifcdef.h" +#include "../ifc/exception/vexceptionbadid.h" +#include "../ifc/ifcdef.h" #include "../vpatterndb/vcontainer.h" #include "../vtools/tools/vdatatool.h" #include "vpatternconverter.h" -#include "xml/vdomdocument.h" -#include "xml/vtoolrecord.h" +#include "vdomdocument.h" +#include "vtoolrecord.h" class QDomElement; diff --git a/src/libs/ifc/xml/vdomdocument.cpp b/src/libs/ifc/xml/vdomdocument.cpp index f99b67c16..48ce29b1d 100644 --- a/src/libs/ifc/xml/vdomdocument.cpp +++ b/src/libs/ifc/xml/vdomdocument.cpp @@ -35,9 +35,9 @@ #include "../exception/vexceptionconversionerror.h" #include "../exception/vexceptionemptyparameter.h" #include "../exception/vexceptionwrongid.h" +#include "../exception/vexception.h" #include "../vmisc/logging.h" -#include "xml/../exception/../ifcdef.h" -#include "xml/../exception/vexception.h" +#include "../ifcdef.h" #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) # include "../vmisc/backport/qsavefile.h" diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp index a23a5b909..d481947e7 100644 --- a/src/libs/ifc/xml/vpatternconverter.cpp +++ b/src/libs/ifc/xml/vpatternconverter.cpp @@ -45,7 +45,7 @@ #include "../exception/vexceptionemptyparameter.h" #include "../qmuparser/qmutokenparser.h" #include "../vmisc/def.h" -#include "xml/vabstractconverter.h" +#include "vabstractconverter.h" class QDomElement; diff --git a/src/libs/ifc/xml/vvitconverter.cpp b/src/libs/ifc/xml/vvitconverter.cpp index a39578b74..bb5c857c9 100644 --- a/src/libs/ifc/xml/vvitconverter.cpp +++ b/src/libs/ifc/xml/vvitconverter.cpp @@ -43,7 +43,7 @@ #include "../exception/vexception.h" #include "../vmisc/def.h" -#include "xml/vabstractmconverter.h" +#include "vabstractmconverter.h" /* * Version rules: diff --git a/src/libs/ifc/xml/vvstconverter.cpp b/src/libs/ifc/xml/vvstconverter.cpp index a904d05fa..eb8c85d8a 100644 --- a/src/libs/ifc/xml/vvstconverter.cpp +++ b/src/libs/ifc/xml/vvstconverter.cpp @@ -43,7 +43,7 @@ #include "../exception/vexception.h" #include "../vmisc/def.h" -#include "xml/vabstractmconverter.h" +#include "vabstractmconverter.h" /* * Version rules: diff --git a/src/libs/libs.pri b/src/libs/libs.pri new file mode 100644 index 000000000..aa39fbe99 --- /dev/null +++ b/src/libs/libs.pri @@ -0,0 +1,32 @@ +#VTools static library +INCLUDEPATH += $$PWD/vtools + +#VWidgets static library +INCLUDEPATH += $$PWD/vwidgets + +#VFormat static library +INCLUDEPATH += $$PWD/vformat + +#VPatternDB static library +INCLUDEPATH += $$PWD/vpatterndb + +# Fervor static library +INCLUDEPATH += $$PWD/fervor + +#VMisc static library +INCLUDEPATH += $$PWD/vmisc + +#VGeometry static library +INCLUDEPATH += $$PWD/vgeometry + +# IFC static library +INCLUDEPATH += $$PWD/ifc + +#VLayout static library +INCLUDEPATH += $$PWD/vlayout + +#QMuParser library +INCLUDEPATH += $${PWD}/qmuparser + +#VPropertyExplorer library +INCLUDEPATH += $${PWD}/vpropertyexplorer diff --git a/src/libs/qmuparser/qmuparser.pro b/src/libs/qmuparser/qmuparser.pro index d4fa0a8f7..004568674 100644 --- a/src/libs/qmuparser/qmuparser.pro +++ b/src/libs/qmuparser/qmuparser.pro @@ -102,3 +102,5 @@ CONFIG(release, debug|release){ } } } + +include (../libs.pri) diff --git a/src/libs/vdxf/vdxf.pro b/src/libs/vdxf/vdxf.pro index a7d1cb254..3af4e08a1 100644 --- a/src/libs/vdxf/vdxf.pro +++ b/src/libs/vdxf/vdxf.pro @@ -65,7 +65,4 @@ CONFIG(release, debug|release){ } } -win32-msvc*{ - #VMisc static library - INCLUDEPATH += $$PWD/../vmisc -} +include (../libs.pri) diff --git a/src/libs/vformat/vformat.pro b/src/libs/vformat/vformat.pro index 5c05f91ec..ae1e9c541 100644 --- a/src/libs/vformat/vformat.pro +++ b/src/libs/vformat/vformat.pro @@ -68,3 +68,5 @@ CONFIG(release, debug|release){ } } } + +include (../libs.pri) diff --git a/src/libs/vformat/vmeasurements.cpp b/src/libs/vformat/vmeasurements.cpp index 53522f867..b6325cf36 100644 --- a/src/libs/vformat/vmeasurements.cpp +++ b/src/libs/vformat/vmeasurements.cpp @@ -47,9 +47,9 @@ #include "../ifc/exception/vexceptionemptyparameter.h" #include "../ifc/xml/vvitconverter.h" #include "../ifc/xml/vvstconverter.h" +#include "../ifc/ifcdef.h" #include "../qmuparser/qmutokenparser.h" -#include "../vpatterndb/../qmuparser/qmuparsererror.h" -#include "../vpatterndb/../vgeometry/../ifc/ifcdef.h" +#include "../qmuparser/qmuparsererror.h" #include "../vpatterndb/calculator.h" #include "../vpatterndb/variables/vmeasurement.h" #include "../vpatterndb/vcontainer.h" diff --git a/src/libs/vformat/vmeasurements.h b/src/libs/vformat/vmeasurements.h index 4c90b5db0..48c9bbf5a 100644 --- a/src/libs/vformat/vmeasurements.h +++ b/src/libs/vformat/vmeasurements.h @@ -37,7 +37,7 @@ #include #include "../ifc/xml/vdomdocument.h" -#include "../vpatterndb/../vmisc/def.h" +#include "../vmisc/def.h" #include "../vpatterndb/vcontainer.h" class QDate; diff --git a/src/libs/vgeometry/vabstractarc.cpp b/src/libs/vgeometry/vabstractarc.cpp index 048a88d05..f3fef56ec 100644 --- a/src/libs/vgeometry/vabstractarc.cpp +++ b/src/libs/vgeometry/vabstractarc.cpp @@ -30,7 +30,7 @@ #include -#include "../ifc/../vmisc/def.h" +#include "../vmisc/def.h" #include "vabstractarc_p.h" #include "vpointf.h" diff --git a/src/libs/vgeometry/vabstractcubicbezier.cpp b/src/libs/vgeometry/vabstractcubicbezier.cpp index 64dd9b2a5..5d658a7ec 100644 --- a/src/libs/vgeometry/vabstractcubicbezier.cpp +++ b/src/libs/vgeometry/vabstractcubicbezier.cpp @@ -35,7 +35,7 @@ #include #include -#include "../ifc/../vmisc/def.h" +#include "../vmisc/def.h" #include "../vgeometry/vpointf.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vgeometry/vabstractcubicbezierpath.cpp b/src/libs/vgeometry/vabstractcubicbezierpath.cpp index 991d15499..6a9ffadc0 100644 --- a/src/libs/vgeometry/vabstractcubicbezierpath.cpp +++ b/src/libs/vgeometry/vabstractcubicbezierpath.cpp @@ -30,8 +30,8 @@ #include -#include "../ifc/../vmisc/def.h" -#include "../ifc/exception/../ifcdef.h" +#include "../vmisc/def.h" +#include "../ifc/ifcdef.h" #include "../ifc/exception/vexception.h" #include "vpointf.h" #include "vspline.h" diff --git a/src/libs/vgeometry/varc.cpp b/src/libs/vgeometry/varc.cpp index 62752bbca..5d3cb083f 100644 --- a/src/libs/vgeometry/varc.cpp +++ b/src/libs/vgeometry/varc.cpp @@ -32,7 +32,7 @@ #include #include -#include "../ifc/../vmisc/def.h" +#include "../vmisc/def.h" #include "../ifc/ifcdef.h" #include "vabstractcurve.h" #include "varc_p.h" diff --git a/src/libs/vgeometry/vellipticalarc.cpp b/src/libs/vgeometry/vellipticalarc.cpp index 2b0eefd7d..f58a89dbd 100644 --- a/src/libs/vgeometry/vellipticalarc.cpp +++ b/src/libs/vgeometry/vellipticalarc.cpp @@ -33,7 +33,7 @@ #include #include -#include "../ifc/../vmisc/def.h" +#include "../vmisc/def.h" #include "../ifc/ifcdef.h" #include "../vmisc/vabstractapplication.h" #include "vabstractcurve.h" diff --git a/src/libs/vgeometry/vgeometry.pro b/src/libs/vgeometry/vgeometry.pro index 142556635..445dc546c 100644 --- a/src/libs/vgeometry/vgeometry.pro +++ b/src/libs/vgeometry/vgeometry.pro @@ -64,3 +64,5 @@ CONFIG(release, debug|release){ } } } + +include (../libs.pri) diff --git a/src/libs/vgeometry/vgobject.cpp b/src/libs/vgeometry/vgobject.cpp index b690c23e0..d5c1e8bdc 100644 --- a/src/libs/vgeometry/vgobject.cpp +++ b/src/libs/vgeometry/vgobject.cpp @@ -36,7 +36,7 @@ #include #include -#include "../ifc/../vmisc/def.h" +#include "../vmisc/def.h" #include "../ifc/ifcdef.h" #include "vgobject_p.h" diff --git a/src/libs/vlayout/vlayout.pro b/src/libs/vlayout/vlayout.pro index 83efafe99..edfa51766 100644 --- a/src/libs/vlayout/vlayout.pro +++ b/src/libs/vlayout/vlayout.pro @@ -75,3 +75,5 @@ CONFIG(release, debug|release){ RESOURCES += \ share/icons.qrc + +include (../libs.pri) diff --git a/src/libs/vmisc/vcommonsettings.cpp b/src/libs/vmisc/vcommonsettings.cpp index ef41d54aa..97ddf645c 100644 --- a/src/libs/vmisc/vcommonsettings.cpp +++ b/src/libs/vmisc/vcommonsettings.cpp @@ -40,7 +40,7 @@ #include #include -#include "../ifc/../vmisc/def.h" +#include "../vmisc/def.h" class QDate; diff --git a/src/libs/vmisc/vmisc.pro b/src/libs/vmisc/vmisc.pro index d9c2f60bc..b350e51d5 100644 --- a/src/libs/vmisc/vmisc.pro +++ b/src/libs/vmisc/vmisc.pro @@ -102,3 +102,5 @@ CONFIG(debug, debug|release){ message("Build revision:" $${HG_HESH}) DEFINES += "BUILD_REVISION=\\\"$${HG_HESH}\\\"" # Make available build revision number in sources. } + +include (../libs.pri) diff --git a/src/libs/vmisc/vsettings.cpp b/src/libs/vmisc/vsettings.cpp index 0ba732d8d..7de98c245 100644 --- a/src/libs/vmisc/vsettings.cpp +++ b/src/libs/vmisc/vsettings.cpp @@ -38,7 +38,7 @@ #include #include -#include "../ifc/../vmisc/def.h" +#include "../vmisc/def.h" class QMarginsF; diff --git a/src/libs/vobj/vobj.pro b/src/libs/vobj/vobj.pro index 71c21f01d..2c5c6806f 100644 --- a/src/libs/vobj/vobj.pro +++ b/src/libs/vobj/vobj.pro @@ -62,3 +62,5 @@ CONFIG(release, debug|release){ } } } + +include (../libs.pri) diff --git a/src/libs/vpatterndb/calculator.cpp b/src/libs/vpatterndb/calculator.cpp index a5a92f8c5..c17d5351b 100644 --- a/src/libs/vpatterndb/calculator.cpp +++ b/src/libs/vpatterndb/calculator.cpp @@ -33,7 +33,7 @@ #include #include -#include "../ifc/../vmisc/def.h" +#include "../vmisc/def.h" #include "../qmuparser/qmuparsererror.h" using namespace qmu; diff --git a/src/libs/vpatterndb/variables/varcradius.cpp b/src/libs/vpatterndb/variables/varcradius.cpp index 5b7541432..ca023d2c3 100644 --- a/src/libs/vpatterndb/variables/varcradius.cpp +++ b/src/libs/vpatterndb/variables/varcradius.cpp @@ -31,9 +31,9 @@ #include #include -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/varc.h" -#include "variables/vcurvevariable.h" +#include "vcurvevariable.h" //--------------------------------------------------------------------------------------------------------------------- VArcRadius::VArcRadius() diff --git a/src/libs/vpatterndb/variables/varcradius.h b/src/libs/vpatterndb/variables/varcradius.h index f40586c43..4d32d5ce5 100644 --- a/src/libs/vpatterndb/variables/varcradius.h +++ b/src/libs/vpatterndb/variables/varcradius.h @@ -32,7 +32,7 @@ #include #include -#include "../ifc/../vmisc/def.h" +#include "../vmisc/def.h" #include "../ifc/ifcdef.h" #include "vcurvevariable.h" diff --git a/src/libs/vpatterndb/variables/vcurveangle.cpp b/src/libs/vpatterndb/variables/vcurveangle.cpp index 7ed947c57..576d49543 100644 --- a/src/libs/vpatterndb/variables/vcurveangle.cpp +++ b/src/libs/vpatterndb/variables/vcurveangle.cpp @@ -31,11 +31,11 @@ #include #include -#include "../vgeometry/../ifc/../vmisc/def.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../vmisc/def.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vabstractcurve.h" #include "../vgeometry/vspline.h" -#include "variables/vcurvevariable.h" +#include "vcurvevariable.h" //--------------------------------------------------------------------------------------------------------------------- VCurveAngle::VCurveAngle() diff --git a/src/libs/vpatterndb/variables/vcurvelength.cpp b/src/libs/vpatterndb/variables/vcurvelength.cpp index b673e60c0..6fbab9ee9 100644 --- a/src/libs/vpatterndb/variables/vcurvelength.cpp +++ b/src/libs/vpatterndb/variables/vcurvelength.cpp @@ -31,10 +31,10 @@ #include #include -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vabstractcurve.h" #include "../vgeometry/vspline.h" -#include "variables/vcurvevariable.h" +#include "vcurvevariable.h" //--------------------------------------------------------------------------------------------------------------------- VCurveLength::VCurveLength() diff --git a/src/libs/vpatterndb/variables/vcurvelength.h b/src/libs/vpatterndb/variables/vcurvelength.h index 177fac716..e2c951a34 100644 --- a/src/libs/vpatterndb/variables/vcurvelength.h +++ b/src/libs/vpatterndb/variables/vcurvelength.h @@ -33,7 +33,7 @@ #include #include -#include "../ifc/../vmisc/def.h" +#include "../vmisc/def.h" #include "../ifc/ifcdef.h" #include "vcurvevariable.h" diff --git a/src/libs/vpatterndb/variables/vcurvevariable.cpp b/src/libs/vpatterndb/variables/vcurvevariable.cpp index b22bc528b..10d227433 100644 --- a/src/libs/vpatterndb/variables/vcurvevariable.cpp +++ b/src/libs/vpatterndb/variables/vcurvevariable.cpp @@ -28,9 +28,9 @@ #include "vcurvevariable.h" -#include "../ifc/../vmisc/def.h" -#include "../vgeometry/../ifc/ifcdef.h" -#include "variables/vinternalvariable.h" +#include "../vmisc/def.h" +#include "../ifc/ifcdef.h" +#include "vinternalvariable.h" #include "vcurvevariable_p.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vpatterndb/variables/vincrement.cpp b/src/libs/vpatterndb/variables/vincrement.cpp index 083321397..83a962547 100644 --- a/src/libs/vpatterndb/variables/vincrement.cpp +++ b/src/libs/vpatterndb/variables/vincrement.cpp @@ -28,8 +28,8 @@ #include "vincrement.h" -#include "../ifc/../vmisc/def.h" -#include "variables/vvariable.h" +#include "../vmisc/def.h" +#include "vvariable.h" #include "vincrement_p.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vpatterndb/variables/vlineangle.cpp b/src/libs/vpatterndb/variables/vlineangle.cpp index eef1c820b..6b117fb89 100644 --- a/src/libs/vpatterndb/variables/vlineangle.cpp +++ b/src/libs/vpatterndb/variables/vlineangle.cpp @@ -34,10 +34,10 @@ #include #include -#include "../ifc/../vmisc/def.h" +#include "../vmisc/def.h" #include "../ifc/ifcdef.h" #include "../vgeometry/vpointf.h" -#include "variables/vinternalvariable.h" +#include "vinternalvariable.h" #include "vlineangle_p.h" #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) diff --git a/src/libs/vpatterndb/variables/vlinelength.cpp b/src/libs/vpatterndb/variables/vlinelength.cpp index 09c06c8d4..bd014f65e 100644 --- a/src/libs/vpatterndb/variables/vlinelength.cpp +++ b/src/libs/vpatterndb/variables/vlinelength.cpp @@ -35,7 +35,7 @@ #include "../ifc/ifcdef.h" #include "../vgeometry/vpointf.h" -#include "variables/vinternalvariable.h" +#include "vinternalvariable.h" #include "vlinelength_p.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vpatterndb/variables/vlinelength.h b/src/libs/vpatterndb/variables/vlinelength.h index 9e9b87484..c42a88d6c 100644 --- a/src/libs/vpatterndb/variables/vlinelength.h +++ b/src/libs/vpatterndb/variables/vlinelength.h @@ -34,7 +34,7 @@ #include #include -#include "../ifc/../vmisc/def.h" +#include "../vmisc/def.h" #include "../ifc/ifcdef.h" #include "vinternalvariable.h" diff --git a/src/libs/vpatterndb/variables/vmeasurement.cpp b/src/libs/vpatterndb/variables/vmeasurement.cpp index a49796249..5fb7cb92c 100644 --- a/src/libs/vpatterndb/variables/vmeasurement.cpp +++ b/src/libs/vpatterndb/variables/vmeasurement.cpp @@ -33,8 +33,8 @@ #include #include -#include "../vgeometry/../ifc/ifcdef.h" -#include "variables/vvariable.h" +#include "../ifc/ifcdef.h" +#include "vvariable.h" #include "vmeasurement_p.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vpatterndb/variables/vmeasurement.h b/src/libs/vpatterndb/variables/vmeasurement.h index e36ea2e5f..c9d58aa11 100644 --- a/src/libs/vpatterndb/variables/vmeasurement.h +++ b/src/libs/vpatterndb/variables/vmeasurement.h @@ -37,7 +37,7 @@ #include #include -#include "../ifc/../vmisc/def.h" +#include "../vmisc/def.h" #include "../ifc/ifcdef.h" #include "vvariable.h" diff --git a/src/libs/vpatterndb/variables/vvariable.cpp b/src/libs/vpatterndb/variables/vvariable.cpp index 339329636..b4f1172f7 100644 --- a/src/libs/vpatterndb/variables/vvariable.cpp +++ b/src/libs/vpatterndb/variables/vvariable.cpp @@ -31,7 +31,7 @@ #include #include -#include "variables/vinternalvariable.h" +#include "vinternalvariable.h" #include "vvariable_p.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vpatterndb/variables/vvariable.h b/src/libs/vpatterndb/variables/vvariable.h index 1f645f6b8..5542b1934 100644 --- a/src/libs/vpatterndb/variables/vvariable.h +++ b/src/libs/vpatterndb/variables/vvariable.h @@ -35,7 +35,7 @@ #include #include -#include "../ifc/../vmisc/def.h" +#include "../vmisc/def.h" #include "../ifc/ifcdef.h" #include "vinternalvariable.h" diff --git a/src/libs/vpatterndb/vcontainer.cpp b/src/libs/vpatterndb/vcontainer.cpp index f711ce3fa..ac29c42b5 100644 --- a/src/libs/vpatterndb/vcontainer.cpp +++ b/src/libs/vpatterndb/vcontainer.cpp @@ -42,7 +42,7 @@ #include "../vgeometry/vpointf.h" #include "../vgeometry/vspline.h" #include "../vgeometry/varc.h" -#include "../vmisc/../vmisc/diagnostic.h" +#include "../vmisc/diagnostic.h" #include "../vmisc/logging.h" #include "../vmisc/vabstractapplication.h" #include "variables/varcradius.h" diff --git a/src/libs/vpatterndb/vcontainer.h b/src/libs/vpatterndb/vcontainer.h index 3ca7bf358..849c30ca7 100644 --- a/src/libs/vpatterndb/vcontainer.h +++ b/src/libs/vpatterndb/vcontainer.h @@ -44,9 +44,9 @@ #include #include -#include "../ifc/../vmisc/def.h" +#include "../vmisc/def.h" #include "../ifc/exception/vexceptionbadid.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vabstractcubicbezierpath.h" #include "../vgeometry/vabstractcurve.h" #include "../vgeometry/vgobject.h" diff --git a/src/libs/vpatterndb/vdetail.cpp b/src/libs/vpatterndb/vdetail.cpp index 153e5f131..2fecbef00 100644 --- a/src/libs/vpatterndb/vdetail.cpp +++ b/src/libs/vpatterndb/vdetail.cpp @@ -39,7 +39,7 @@ #include #include -#include "../ifc/../vmisc/def.h" +#include "../vmisc/def.h" #include "../vgeometry/vabstractcurve.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" diff --git a/src/libs/vpatterndb/vformula.cpp b/src/libs/vpatterndb/vformula.cpp index 464d80d46..794bccc27 100644 --- a/src/libs/vpatterndb/vformula.cpp +++ b/src/libs/vpatterndb/vformula.cpp @@ -34,9 +34,9 @@ #include #include -#include "../ifc/../vmisc/def.h" #include "../qmuparser/qmuparsererror.h" #include "../vgeometry/../ifc/ifcdef.h" +#include "../vmisc/def.h" #include "../vmisc/vabstractapplication.h" #include "../vmisc/vcommonsettings.h" #include "calculator.h" diff --git a/src/libs/vpatterndb/vpatterndb.pro b/src/libs/vpatterndb/vpatterndb.pro index 84ffcf14e..10c0b507f 100644 --- a/src/libs/vpatterndb/vpatterndb.pro +++ b/src/libs/vpatterndb/vpatterndb.pro @@ -66,7 +66,4 @@ CONFIG(release, debug|release){ } } -win32-msvc*{ - #VMisc static library - INCLUDEPATH += $$PWD/../vmisc -} +include (../libs.pri) diff --git a/src/libs/vpatterndb/vtranslatevars.cpp b/src/libs/vpatterndb/vtranslatevars.cpp index 9b3e5168e..299a9f1f2 100644 --- a/src/libs/vpatterndb/vtranslatevars.cpp +++ b/src/libs/vpatterndb/vtranslatevars.cpp @@ -36,12 +36,12 @@ #include #include -#include "../ifc/../vmisc/def.h" #include "../ifc/ifcdef.h" #include "../qmuparser/qmuparsererror.h" #include "../qmuparser/qmutokenparser.h" #include "../qmuparser/qmutranslation.h" -#include "../vmisc/../vpatterndb/vtranslatevars.h" +#include "../vpatterndb/vtranslatevars.h" +#include "../vmisc/def.h" #include "../vmisc/vabstractapplication.h" #include "vtranslatemeasurements.h" diff --git a/src/libs/vpropertyexplorer/vpropertyexplorer.pro b/src/libs/vpropertyexplorer/vpropertyexplorer.pro index d2c2ab78b..cd585beed 100644 --- a/src/libs/vpropertyexplorer/vpropertyexplorer.pro +++ b/src/libs/vpropertyexplorer/vpropertyexplorer.pro @@ -100,3 +100,5 @@ CONFIG(release, debug|release){ } } } + +include (../libs.pri) diff --git a/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp b/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp index 5b5289b17..8625a6fbb 100644 --- a/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp +++ b/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp @@ -52,21 +52,21 @@ #include #include -#include "../../../vpatterndb/vcontainer.h" -#include "../../../vpatterndb/vtranslatevars.h" +#include "../vpatterndb/vcontainer.h" +#include "../vpatterndb/vtranslatevars.h" +#include "../vpatterndb/variables/varcradius.h" +#include "../vpatterndb/variables/vcurveangle.h" +#include "../vpatterndb/variables/vcurvelength.h" +#include "../vpatterndb/variables/vincrement.h" +#include "../vpatterndb/variables/vlineangle.h" +#include "../vpatterndb/variables/vlinelength.h" +#include "../vpatterndb/variables/vmeasurement.h" #include "../ifc/xml/vdomdocument.h" #include "../vmisc/def.h" #include "../vmisc/vabstractapplication.h" #include "../vmisc/vcommonsettings.h" -#include "dialogs/support/../tools/dialogtool.h" +#include "../tools/dialogtool.h" #include "ui_dialogeditwrongformula.h" -#include "variables/varcradius.h" -#include "variables/vcurveangle.h" -#include "variables/vcurvelength.h" -#include "variables/vincrement.h" -#include "variables/vlineangle.h" -#include "variables/vlinelength.h" -#include "variables/vmeasurement.h" class QCloseEvent; class QShowEvent; diff --git a/src/libs/vtools/dialogs/support/dialogundo.cpp b/src/libs/vtools/dialogs/support/dialogundo.cpp index bf86e1202..b5136d9c4 100644 --- a/src/libs/vtools/dialogs/support/dialogundo.cpp +++ b/src/libs/vtools/dialogs/support/dialogundo.cpp @@ -33,8 +33,8 @@ #include #include -#include "../../../vmisc/vabstractapplication.h" -#include "dialogs/support/../../../ifc/exception/../../vmisc/vcommonsettings.h" +#include "../vmisc/vabstractapplication.h" +#include "../vmisc/vcommonsettings.h" #include "ui_dialogundo.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogalongline.cpp b/src/libs/vtools/dialogs/tools/dialogalongline.cpp index a689ade8c..ee14c0525 100644 --- a/src/libs/vtools/dialogs/tools/dialogalongline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogalongline.cpp @@ -41,9 +41,9 @@ #include #include -#include "../../../vpatterndb/vtranslatevars.h" #include "../../tools/vabstracttool.h" #include "../../visualization/line/vistoolalongline.h" +#include "../../visualization/visualization.h" #include "../ifc/xml/vabstractpattern.h" #include "../ifc/xml/vdomdocument.h" #include "../support/dialogeditwrongformula.h" @@ -52,9 +52,9 @@ #include "../vmisc/vabstractapplication.h" #include "../vmisc/vcommonsettings.h" #include "../vpatterndb/vcontainer.h" -#include "dialogs/tools/../../tools/../visualization/visualization.h" +#include "../vpatterndb/variables/vlinelength.h" +#include "../vpatterndb/vtranslatevars.h" #include "ui_dialogalongline.h" -#include "variables/vlinelength.h" class QCloseEvent; class QWidget; diff --git a/src/libs/vtools/dialogs/tools/dialogalongline.h b/src/libs/vtools/dialogs/tools/dialogalongline.h index f8ae57d15..04c26bc20 100644 --- a/src/libs/vtools/dialogs/tools/dialogalongline.h +++ b/src/libs/vtools/dialogs/tools/dialogalongline.h @@ -36,7 +36,6 @@ #include #include "../vmisc/def.h" -#include "dialogs/tools/../support/../tools/dialogtool.h" #include "dialogtool.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogarc.cpp b/src/libs/vtools/dialogs/tools/dialogarc.cpp index 8489c1aee..a7f40d7b3 100644 --- a/src/libs/vtools/dialogs/tools/dialogarc.cpp +++ b/src/libs/vtools/dialogs/tools/dialogarc.cpp @@ -38,13 +38,13 @@ #include #include -#include "../../../ifc/xml/vdomdocument.h" -#include "../../../vpatterndb/vtranslatevars.h" +#include "../ifc/xml/vdomdocument.h" +#include "../vpatterndb/vtranslatevars.h" #include "../../visualization/path/vistoolarc.h" +#include "../../visualization/visualization.h" #include "../support/dialogeditwrongformula.h" #include "../vmisc/vabstractapplication.h" #include "../vmisc/vcommonsettings.h" -#include "dialogs/tools/../../visualization/path/../visualization.h" #include "ui_dialogarc.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogarc.h b/src/libs/vtools/dialogs/tools/dialogarc.h index 0f5f28ed0..17db12557 100644 --- a/src/libs/vtools/dialogs/tools/dialogarc.h +++ b/src/libs/vtools/dialogs/tools/dialogarc.h @@ -36,7 +36,6 @@ #include #include "../vmisc/def.h" -#include "dialogs/tools/../support/../tools/dialogtool.h" #include "dialogtool.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp b/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp index bacaad2de..02cb2de0e 100644 --- a/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp +++ b/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp @@ -38,13 +38,13 @@ #include #include -#include "../../../ifc/xml/vdomdocument.h" -#include "../../../vpatterndb/vtranslatevars.h" +#include "../ifc/xml/vdomdocument.h" +#include "../vpatterndb/vtranslatevars.h" #include "../../visualization/path/vistoolarcwithlength.h" #include "../support/dialogeditwrongformula.h" #include "../vmisc/vabstractapplication.h" #include "../vmisc/vcommonsettings.h" -#include "dialogs/tools/../../visualization/path/../visualization.h" +#include "../../visualization/visualization.h" #include "ui_dialogarcwithlength.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogarcwithlength.h b/src/libs/vtools/dialogs/tools/dialogarcwithlength.h index f836f0e11..a189b452f 100644 --- a/src/libs/vtools/dialogs/tools/dialogarcwithlength.h +++ b/src/libs/vtools/dialogs/tools/dialogarcwithlength.h @@ -36,7 +36,6 @@ #include #include "../vmisc/def.h" -#include "dialogs/tools/../support/../tools/dialogtool.h" #include "dialogtool.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogbisector.cpp b/src/libs/vtools/dialogs/tools/dialogbisector.cpp index a812235aa..070edd7d5 100644 --- a/src/libs/vtools/dialogs/tools/dialogbisector.cpp +++ b/src/libs/vtools/dialogs/tools/dialogbisector.cpp @@ -41,13 +41,13 @@ #include "../../tools/vabstracttool.h" #include "../../visualization/line/vistoolbisector.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 "../vpatterndb/vtranslatevars.h" -#include "dialogs/tools/../../tools/../visualization/visualization.h" #include "ui_dialogbisector.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogbisector.h b/src/libs/vtools/dialogs/tools/dialogbisector.h index 5575e539b..b60e942cb 100644 --- a/src/libs/vtools/dialogs/tools/dialogbisector.h +++ b/src/libs/vtools/dialogs/tools/dialogbisector.h @@ -36,7 +36,6 @@ #include #include "../vmisc/def.h" -#include "dialogs/tools/../support/../tools/dialogtool.h" #include "dialogtool.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp b/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp index 3db63df11..8a4fe49c2 100644 --- a/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp @@ -36,10 +36,10 @@ #include #include "../../visualization/path/vistoolcubicbezier.h" +#include "../../visualization/visualization.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" -#include "dialogs/tools/../../visualization/path/../visualization.h" -#include "dialogs/tools/dialogtool.h" +#include "dialogtool.h" #include "ui_dialogcubicbezier.h" class QWidget; diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp index 8a1a7bc5e..48b8efc8e 100644 --- a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp @@ -45,12 +45,12 @@ #include #include "../../visualization/path/vistoolcubicbezierpath.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../../visualization/visualization.h" +#include "../ifc/ifcdef.h" #include "../vmisc/vabstractapplication.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vabstractmainwindow.h" -#include "dialogs/tools/../../visualization/path/../visualization.h" -#include "dialogs/tools/dialogtool.h" +#include "dialogtool.h" #include "ui_dialogcubicbezierpath.h" class QWidget; diff --git a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp index cea51b3ea..a83349d8a 100644 --- a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp @@ -40,18 +40,18 @@ #include #include -#include "../../../vgeometry/vpointf.h" -#include "../../../vpatterndb/vcontainer.h" -#include "../../../vpatterndb/vtranslatevars.h" -#include "../../../vwidgets/vmaingraphicsscene.h" +#include "../vgeometry/vpointf.h" +#include "../vpatterndb/vcontainer.h" +#include "../vpatterndb/vtranslatevars.h" +#include "../vwidgets/vmaingraphicsscene.h" +#include "../vwidgets/vabstractmainwindow.h" #include "../../tools/vabstracttool.h" #include "../../visualization/line/vistoolcurveintersectaxis.h" +#include "../../visualization/visualization.h" #include "../ifc/xml/vabstractpattern.h" #include "../support/dialogeditwrongformula.h" #include "../vmisc/vabstractapplication.h" #include "../vmisc/vcommonsettings.h" -#include "../vwidgets/vabstractmainwindow.h" -#include "dialogs/tools/../../tools/../visualization/visualization.h" #include "ui_dialogcurveintersectaxis.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h index 11ef9f67d..a3cc3c54a 100644 --- a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h +++ b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h @@ -36,7 +36,6 @@ #include #include "../vmisc/def.h" -#include "dialogs/tools/../support/../tools/dialogtool.h" #include "dialogtool.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogcutarc.cpp b/src/libs/vtools/dialogs/tools/dialogcutarc.cpp index 7193f6598..46f9846f4 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutarc.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcutarc.cpp @@ -35,14 +35,14 @@ #include #include -#include "../../../vpatterndb/vtranslatevars.h" +#include "../vpatterndb/vtranslatevars.h" #include "../../visualization/path/vistoolcutarc.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 "dialogs/tools/../../visualization/path/../visualization.h" #include "ui_dialogcutarc.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogcutarc.h b/src/libs/vtools/dialogs/tools/dialogcutarc.h index 24270b800..c10e371d2 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutarc.h +++ b/src/libs/vtools/dialogs/tools/dialogcutarc.h @@ -36,7 +36,6 @@ #include #include "../vmisc/def.h" -#include "dialogs/tools/../support/../tools/dialogtool.h" #include "dialogtool.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogcutspline.cpp b/src/libs/vtools/dialogs/tools/dialogcutspline.cpp index 9b924e308..c7ea264af 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutspline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcutspline.cpp @@ -35,14 +35,14 @@ #include #include -#include "../../../vpatterndb/vtranslatevars.h" +#include "../vpatterndb/vtranslatevars.h" #include "../../visualization/path/vistoolcutspline.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 "dialogs/tools/../../visualization/path/../visualization.h" #include "ui_dialogcutspline.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogcutspline.h b/src/libs/vtools/dialogs/tools/dialogcutspline.h index 930495f14..695de22f0 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutspline.h +++ b/src/libs/vtools/dialogs/tools/dialogcutspline.h @@ -36,7 +36,6 @@ #include #include "../vmisc/def.h" -#include "dialogs/tools/../support/../tools/dialogtool.h" #include "dialogtool.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp index cc5a74f42..d0f0b5729 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp @@ -35,14 +35,14 @@ #include #include -#include "../../../vpatterndb/vtranslatevars.h" +#include "../vpatterndb/vtranslatevars.h" #include "../../visualization/path/vistoolcutsplinepath.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 "dialogs/tools/../../visualization/path/../visualization.h" #include "ui_dialogcutsplinepath.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.h b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.h index e9da1636d..fd2021bf6 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.h +++ b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.h @@ -36,7 +36,6 @@ #include #include "../vmisc/def.h" -#include "dialogs/tools/../support/../tools/dialogtool.h" #include "dialogtool.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogdetail.cpp b/src/libs/vtools/dialogs/tools/dialogdetail.cpp index da255cd2e..cd30d30b6 100644 --- a/src/libs/vtools/dialogs/tools/dialogdetail.cpp +++ b/src/libs/vtools/dialogs/tools/dialogdetail.cpp @@ -59,11 +59,11 @@ #include #include -#include "../../../ifc/xml/vdomdocument.h" -#include "../../../vpatterndb/vcontainer.h" +#include "../ifc/xml/vdomdocument.h" +#include "../vpatterndb/vcontainer.h" #include "../vgeometry/vgobject.h" #include "../vmisc/vabstractapplication.h" -#include "dialogs/tools/dialogtool.h" +#include "dialogtool.h" #include "vnodedetail.h" class QPointF; diff --git a/src/libs/vtools/dialogs/tools/dialogendline.cpp b/src/libs/vtools/dialogs/tools/dialogendline.cpp index 056f8b903..ae9f1622e 100644 --- a/src/libs/vtools/dialogs/tools/dialogendline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogendline.cpp @@ -40,19 +40,19 @@ #include #include -#include "../../../vgeometry/vpointf.h" -#include "../../../vpatterndb/vcontainer.h" -#include "../../../vpatterndb/vtranslatevars.h" -#include "../../../vwidgets/vmaingraphicsscene.h" +#include "../vgeometry/vpointf.h" +#include "../vpatterndb/vcontainer.h" +#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 "../vwidgets/vabstractmainwindow.h" -#include "dialogs/tools/../../tools/../visualization/visualization.h" #include "ui_dialogendline.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogendline.h b/src/libs/vtools/dialogs/tools/dialogendline.h index baedf29ef..58e63214b 100644 --- a/src/libs/vtools/dialogs/tools/dialogendline.h +++ b/src/libs/vtools/dialogs/tools/dialogendline.h @@ -36,7 +36,6 @@ #include #include "../vmisc/def.h" -#include "dialogs/tools/../support/../tools/dialogtool.h" #include "dialogtool.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialoggroup.h b/src/libs/vtools/dialogs/tools/dialoggroup.h index 0462a7148..6434ea201 100644 --- a/src/libs/vtools/dialogs/tools/dialoggroup.h +++ b/src/libs/vtools/dialogs/tools/dialoggroup.h @@ -36,7 +36,6 @@ #include #include -#include "../vtools/tools/drawTools/../../dialogs/tools/dialogtool.h" #include "dialogtool.h" class QWidget; diff --git a/src/libs/vtools/dialogs/tools/dialogheight.cpp b/src/libs/vtools/dialogs/tools/dialogheight.cpp index 05c70e330..e4b3c0880 100644 --- a/src/libs/vtools/dialogs/tools/dialogheight.cpp +++ b/src/libs/vtools/dialogs/tools/dialogheight.cpp @@ -42,14 +42,14 @@ #include "../../tools/vabstracttool.h" #include "../../visualization/line/vistoolheight.h" +#include "../../visualization/visualization.h" +#include "../../visualization/line/visline.h" #include "../ifc/xml/vabstractpattern.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" #include "../vmisc/vabstractapplication.h" #include "../vpatterndb/vcontainer.h" -#include "dialogs/tools/../../visualization/line/../visualization.h" -#include "dialogs/tools/../../visualization/line/visline.h" -#include "dialogs/tools/dialogtool.h" +#include "dialogtool.h" #include "ui_dialogheight.h" class QWidget; diff --git a/src/libs/vtools/dialogs/tools/dialogline.cpp b/src/libs/vtools/dialogs/tools/dialogline.cpp index 565fa950f..7258a303f 100644 --- a/src/libs/vtools/dialogs/tools/dialogline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogline.cpp @@ -37,9 +37,9 @@ #include #include "../../tools/vabstracttool.h" +#include "../../visualization/visualization.h" #include "../../visualization/line/vistoolline.h" -#include "../vgeometry/../ifc/ifcdef.h" -#include "dialogs/tools/../../tools/../visualization/visualization.h" +#include "../ifc/ifcdef.h" #include "dialogs/tools/dialogtool.h" #include "ui_dialogline.h" diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp b/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp index e3fff2efb..0cc166f31 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp +++ b/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp @@ -41,13 +41,13 @@ #include #include +#include "../../visualization/visualization.h" #include "../../visualization/line/vistoollineintersect.h" #include "../ifc/xml/vabstractpattern.h" #include "../vgeometry/vpointf.h" #include "../vmisc/vabstractapplication.h" #include "../vpatterndb/vcontainer.h" -#include "dialogs/tools/../../visualization/line/../visualization.h" -#include "dialogs/tools/dialogtool.h" +#include "dialogtool.h" #include "ui_dialoglineintersect.h" class QWidget; diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp index 74453a47c..acd682196 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp +++ b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp @@ -44,18 +44,18 @@ #include #include -#include "../../../vgeometry/vpointf.h" -#include "../../../vpatterndb/vcontainer.h" -#include "../../../vpatterndb/vtranslatevars.h" -#include "../../../vwidgets/vmaingraphicsscene.h" +#include "../vgeometry/vpointf.h" +#include "../vpatterndb/vcontainer.h" +#include "../vpatterndb/vtranslatevars.h" +#include "../vwidgets/vmaingraphicsscene.h" +#include "../vwidgets/vabstractmainwindow.h" #include "../../tools/vabstracttool.h" #include "../../visualization/line/vistoollineintersectaxis.h" +#include "../../visualization/visualization.h" #include "../ifc/xml/vabstractpattern.h" #include "../support/dialogeditwrongformula.h" #include "../vmisc/vabstractapplication.h" #include "../vmisc/vcommonsettings.h" -#include "../vwidgets/vabstractmainwindow.h" -#include "dialogs/tools/../../tools/../visualization/visualization.h" #include "ui_dialoglineintersectaxis.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h index db473b2ff..bafe67414 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h +++ b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h @@ -36,7 +36,6 @@ #include #include "../vmisc/def.h" -#include "dialogs/tools/../support/../tools/dialogtool.h" #include "dialogtool.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialognormal.cpp b/src/libs/vtools/dialogs/tools/dialognormal.cpp index 06d0781ff..322f8abfc 100644 --- a/src/libs/vtools/dialogs/tools/dialognormal.cpp +++ b/src/libs/vtools/dialogs/tools/dialognormal.cpp @@ -39,15 +39,15 @@ #include #include -#include "../../../vpatterndb/vtranslatevars.h" +#include "../vpatterndb/vtranslatevars.h" #include "../../tools/vabstracttool.h" #include "../../visualization/line/vistoolnormal.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 "dialogs/tools/../../tools/../visualization/visualization.h" #include "ui_dialognormal.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialognormal.h b/src/libs/vtools/dialogs/tools/dialognormal.h index e9d19e10d..dd7f1867a 100644 --- a/src/libs/vtools/dialogs/tools/dialognormal.h +++ b/src/libs/vtools/dialogs/tools/dialognormal.h @@ -36,7 +36,6 @@ #include #include "../vmisc/def.h" -#include "dialogs/tools/../support/../tools/dialogtool.h" #include "dialogtool.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp index cf23437e5..3872c8465 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp @@ -32,9 +32,9 @@ #include #include +#include "../../visualization/visualization.h" #include "../../visualization/line/vistoolpointfromarcandtangent.h" #include "../vmisc/vabstractapplication.h" -#include "dialogs/tools/../../visualization/line/../visualization.h" #include "dialogs/tools/dialogtool.h" #include "ui_dialogpointfromarcandtangent.h" diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp index abce3057c..05a14d45f 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp @@ -41,13 +41,13 @@ #include #include -#include "../../../vpatterndb/vtranslatevars.h" +#include "../vpatterndb/vtranslatevars.h" +#include "../../visualization/visualization.h" #include "../../visualization/line/vistoolpointfromcircleandtangent.h" #include "../ifc/xml/vdomdocument.h" #include "../support/dialogeditwrongformula.h" #include "../vmisc/vabstractapplication.h" #include "../vmisc/vcommonsettings.h" -#include "dialogs/tools/../../visualization/line/../visualization.h" #include "ui_dialogpointfromcircleandtangent.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h index d6f5e69ee..503a68a78 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h +++ b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h @@ -37,7 +37,6 @@ #include "../ifc/xml/vabstractpattern.h" #include "../vmisc/def.h" -#include "dialogs/tools/../support/../tools/dialogtool.h" #include "dialogtool.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp b/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp index e96468d5c..633c7f966 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp @@ -39,14 +39,14 @@ #include #include -#include "../../../vpatterndb/vtranslatevars.h" +#include "../vpatterndb/vtranslatevars.h" +#include "../../visualization/visualization.h" #include "../../visualization/line/vistoolpointofcontact.h" #include "../ifc/xml/vabstractpattern.h" #include "../ifc/xml/vdomdocument.h" #include "../support/dialogeditwrongformula.h" #include "../vmisc/vabstractapplication.h" #include "../vmisc/vcommonsettings.h" -#include "dialogs/tools/../../visualization/line/../visualization.h" #include "ui_dialogpointofcontact.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogpointofcontact.h b/src/libs/vtools/dialogs/tools/dialogpointofcontact.h index 4937c0162..bed5a3bff 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofcontact.h +++ b/src/libs/vtools/dialogs/tools/dialogpointofcontact.h @@ -36,7 +36,6 @@ #include #include "../vmisc/def.h" -#include "dialogs/tools/../support/../tools/dialogtool.h" #include "dialogtool.h" #include "ui_dialogpointofcontact.h" diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp index 0923521b2..60c4da141 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp @@ -34,12 +34,12 @@ #include #include +#include "../../visualization/visualization.h" #include "../../visualization/line/vistoolpointofintersection.h" #include "../ifc/xml/vabstractpattern.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vmisc/vabstractapplication.h" -#include "dialogs/tools/../../visualization/line/../visualization.h" -#include "dialogs/tools/dialogtool.h" +#include "dialogtool.h" #include "ui_dialogpointofintersection.h" class QWidget; diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp index 8c710b38e..298d922d7 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp @@ -34,9 +34,9 @@ #include #include +#include "../../visualization/visualization.h" #include "../../visualization/line/vistoolpointofintersectionarcs.h" #include "../vmisc/vabstractapplication.h" -#include "dialogs/tools/../../visualization/line/../visualization.h" #include "dialogs/tools/dialogtool.h" #include "ui_dialogpointofintersectionarcs.h" diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp index dd05201e4..c50f45957 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp @@ -41,13 +41,13 @@ #include #include -#include "../../../vpatterndb/vtranslatevars.h" +#include "../vpatterndb/vtranslatevars.h" +#include "../../visualization/visualization.h" #include "../../visualization/line/vistoolpointofintersectioncircles.h" #include "../ifc/xml/vdomdocument.h" #include "../support/dialogeditwrongformula.h" #include "../vmisc/vabstractapplication.h" #include "../vmisc/vcommonsettings.h" -#include "dialogs/tools/../../visualization/line/../visualization.h" #include "ui_dialogpointofintersectioncircles.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h index a11ac7619..4f373c5c3 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h @@ -37,7 +37,6 @@ #include "../ifc/xml/vabstractpattern.h" #include "../vmisc/def.h" -#include "dialogs/tools/../support/../tools/dialogtool.h" #include "dialogtool.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp index c001fe99a..eb6804844 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp @@ -36,9 +36,9 @@ #include #include "../../visualization/path/vistoolpointofintersectioncurves.h" +#include "../../visualization/visualization.h" #include "../vmisc/vabstractapplication.h" -#include "dialogs/tools/../../visualization/path/../visualization.h" -#include "dialogs/tools/dialogtool.h" +#include "dialogtool.h" #include "ui_dialogpointofintersectioncurves.h" class QWidget; diff --git a/src/libs/vtools/dialogs/tools/dialogrotation.cpp b/src/libs/vtools/dialogs/tools/dialogrotation.cpp index 02663df1b..be65540c9 100644 --- a/src/libs/vtools/dialogs/tools/dialogrotation.cpp +++ b/src/libs/vtools/dialogs/tools/dialogrotation.cpp @@ -47,6 +47,7 @@ #include #include +#include "../../visualization/visualization.h" #include "../../visualization/line/vistoolrotation.h" #include "../ifc/xml/vabstractpattern.h" #include "../ifc/xml/vdomdocument.h" @@ -59,7 +60,6 @@ #include "../vpatterndb/vtranslatevars.h" #include "../vwidgets/vabstractmainwindow.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "dialogs/tools/../../visualization/line/../visualization.h" #include "ui_dialogrotation.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogrotation.h b/src/libs/vtools/dialogs/tools/dialogrotation.h index 32c65e8a7..6c5938aa6 100644 --- a/src/libs/vtools/dialogs/tools/dialogrotation.h +++ b/src/libs/vtools/dialogs/tools/dialogrotation.h @@ -38,7 +38,6 @@ #include #include "../vmisc/def.h" -#include "dialogs/tools/../support/../tools/dialogtool.h" #include "dialogtool.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp index 55a4d797b..d659aeac2 100644 --- a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp +++ b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp @@ -39,15 +39,15 @@ #include #include -#include "../../../vpatterndb/vtranslatevars.h" +#include "../vpatterndb/vtranslatevars.h" #include "../../tools/vabstracttool.h" +#include "../../visualization/visualization.h" #include "../../visualization/line/vistoolshoulderpoint.h" #include "../ifc/xml/vabstractpattern.h" #include "../ifc/xml/vdomdocument.h" #include "../support/dialogeditwrongformula.h" #include "../vmisc/vabstractapplication.h" #include "../vmisc/vcommonsettings.h" -#include "dialogs/tools/../../tools/../visualization/visualization.h" #include "ui_dialogshoulderpoint.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h index 2714152e2..6a6a905ec 100644 --- a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h +++ b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h @@ -36,7 +36,6 @@ #include #include "../vmisc/def.h" -#include "dialogs/tools/../support/../tools/dialogtool.h" #include "dialogtool.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogsinglepoint.cpp b/src/libs/vtools/dialogs/tools/dialogsinglepoint.cpp index 6c241575d..a073a1eeb 100644 --- a/src/libs/vtools/dialogs/tools/dialogsinglepoint.cpp +++ b/src/libs/vtools/dialogs/tools/dialogsinglepoint.cpp @@ -33,7 +33,7 @@ #include "../vmisc/def.h" #include "../vmisc/vabstractapplication.h" -#include "dialogs/tools/dialogtool.h" +#include "dialogtool.h" #include "ui_dialogsinglepoint.h" class QPointF; diff --git a/src/libs/vtools/dialogs/tools/dialogspline.cpp b/src/libs/vtools/dialogs/tools/dialogspline.cpp index 71efb46f9..08b975a5b 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogspline.cpp @@ -43,6 +43,7 @@ #include #include +#include "../../visualization/visualization.h" #include "../../visualization/path/vistoolspline.h" #include "../ifc/xml/vdomdocument.h" #include "../support/dialogeditwrongformula.h" @@ -52,7 +53,6 @@ #include "../vmisc/vcommonsettings.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "dialogs/tools/../../visualization/path/../visualization.h" #include "ui_dialogspline.h" #include "vtranslatevars.h" diff --git a/src/libs/vtools/dialogs/tools/dialogspline.h b/src/libs/vtools/dialogs/tools/dialogspline.h index 1a71cf2d5..fea70e017 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.h +++ b/src/libs/vtools/dialogs/tools/dialogspline.h @@ -38,7 +38,6 @@ #include "../vgeometry/vspline.h" #include "../vmisc/def.h" -#include "dialogs/tools/../support/../tools/dialogtool.h" #include "dialogtool.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp index b0ac6eee7..41bd2644e 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp @@ -47,6 +47,7 @@ #include #include +#include "../../visualization/visualization.h" #include "../../visualization/path/vistoolsplinepath.h" #include "../ifc/xml/vdomdocument.h" #include "../qmuparser/qmuparsererror.h" @@ -59,7 +60,6 @@ #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vabstractmainwindow.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "dialogs/tools/../../visualization/path/../visualization.h" #include "ui_dialogsplinepath.h" #include "vtranslatevars.h" diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.h b/src/libs/vtools/dialogs/tools/dialogsplinepath.h index 5f5f0f3ba..c635a5ab8 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.h +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.h @@ -39,7 +39,6 @@ #include "../vgeometry/vsplinepath.h" #include "../vmisc/def.h" -#include "dialogs/tools/../support/../tools/dialogtool.h" #include "dialogtool.h" class QCloseEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogtool.cpp b/src/libs/vtools/dialogs/tools/dialogtool.cpp index 1f828bdfc..cb9b4632c 100644 --- a/src/libs/vtools/dialogs/tools/dialogtool.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtool.cpp @@ -60,13 +60,13 @@ #include #include -#include "../../../ifc/xml/vdomdocument.h" -#include "../../../qmuparser/qmudef.h" -#include "../../../qmuparser/qmuparsererror.h" -#include "../../../vgeometry/vpointf.h" -#include "../../../vpatterndb/calculator.h" -#include "../../../vpatterndb/vcontainer.h" -#include "../../../vpatterndb/vtranslatevars.h" +#include "../ifc/xml/vdomdocument.h" +#include "../qmuparser/qmudef.h" +#include "../qmuparser/qmuparsererror.h" +#include "../vgeometry/vpointf.h" +#include "../vpatterndb/calculator.h" +#include "../vpatterndb/vcontainer.h" +#include "../vpatterndb/vtranslatevars.h" #include "../../tools/vabstracttool.h" #include "../ifc/xml/vabstractpattern.h" #include "../vgeometry/vabstractcurve.h" diff --git a/src/libs/vtools/dialogs/tools/dialogtool.h b/src/libs/vtools/dialogs/tools/dialogtool.h index 35b3479ee..51e098962 100644 --- a/src/libs/vtools/dialogs/tools/dialogtool.h +++ b/src/libs/vtools/dialogs/tools/dialogtool.h @@ -52,14 +52,13 @@ #include "../../visualization/visualization.h" #include "../ifc/xml/vabstractpattern.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vgeometrydef.h" #include "../vmisc/def.h" #include "../vmisc/logging.h" #include "../vmisc/vabstractapplication.h" #include "../vmisc/vcommonsettings.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "dialogs/tools/../../tools/../visualization/visualization.h" class QCloseEvent; class QEvent; diff --git a/src/libs/vtools/dialogs/tools/dialogtriangle.cpp b/src/libs/vtools/dialogs/tools/dialogtriangle.cpp index 0439e133f..f8e52f700 100644 --- a/src/libs/vtools/dialogs/tools/dialogtriangle.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtriangle.cpp @@ -35,11 +35,11 @@ #include #include +#include "../../visualization/visualization.h" #include "../../visualization/line/vistooltriangle.h" #include "../ifc/xml/vabstractpattern.h" #include "../vmisc/vabstractapplication.h" -#include "dialogs/tools/../../visualization/line/../visualization.h" -#include "dialogs/tools/dialogtool.h" +#include "dialogtool.h" #include "ui_dialogtriangle.h" class QWidget; diff --git a/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp b/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp index fde915757..dd4152eab 100644 --- a/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp @@ -39,14 +39,14 @@ #include #include +#include "../../visualization/visualization.h" #include "../../visualization/line/vistooltruedarts.h" #include "../ifc/xml/vabstractpattern.h" #include "../qmuparser/qmudef.h" #include "../vgeometry/../ifc/ifcdef.h" #include "../vmisc/vabstractapplication.h" #include "../vpatterndb/vcontainer.h" -#include "dialogs/tools/../../visualization/line/../visualization.h" -#include "dialogs/tools/dialogtool.h" +#include "dialogtool.h" #include "ui_dialogtruedarts.h" class QWidget; diff --git a/src/libs/vtools/dialogs/tools/dialoguniondetails.cpp b/src/libs/vtools/dialogs/tools/dialoguniondetails.cpp index 39c33a499..0078616b1 100644 --- a/src/libs/vtools/dialogs/tools/dialoguniondetails.cpp +++ b/src/libs/vtools/dialogs/tools/dialoguniondetails.cpp @@ -31,10 +31,10 @@ #include #include -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vpatterndb/vcontainer.h" #include "../vpatterndb/vdetail.h" -#include "dialogs/tools/dialogtool.h" +#include "dialogtool.h" #include "ui_dialoguniondetails.h" class QWidget; diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp index 11cf49387..07d80ff05 100644 --- a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp +++ b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp @@ -42,11 +42,11 @@ #include #include +#include "../../../dialogs/tools/dialogtool.h" #include "../../../dialogs/tools/dialogrotation.h" #include "../../../undocommands/label/rotationmovelabel.h" #include "../../../visualization/line/vistoolrotation.h" -#include "../ifc/exception/vexception.h" -#include "../vgeometry/../vmisc/diagnostic.h" +#include "../../../visualization/visualization.h" #include "../vgeometry/vabstractcurve.h" #include "../vgeometry/varc.h" #include "../vgeometry/vcubicbezier.h" @@ -55,22 +55,22 @@ #include "../vgeometry/vpointf.h" #include "../vgeometry/vspline.h" #include "../vgeometry/vsplinepath.h" -#include "../vmisc/../vpatterndb/vtranslatevars.h" +#include "../vpatterndb/vtranslatevars.h" #include "../vmisc/vabstractapplication.h" #include "../vmisc/vcommonsettings.h" +#include "../vmisc/diagnostic.h" +#include "../vmisc/logging.h" #include "../vpatterndb/vcontainer.h" #include "../vpatterndb/vformula.h" -#include "../vwidgets/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" +#include "../ifc/exception/vexception.h" #include "../vwidgets/vabstractsimple.h" #include "../vwidgets/vmaingraphicsscene.h" #include "../vwidgets/vsimplecurve.h" #include "../vwidgets/vsimplepoint.h" -#include "tools/drawTools/operation/../../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/operation/../../../undocommands/label/../../../vmisc/logging.h" -#include "tools/drawTools/operation/../../../visualization/line/../visualization.h" -#include "tools/drawTools/operation/../../vabstracttool.h" -#include "tools/drawTools/operation/../../vdatatool.h" -#include "tools/drawTools/operation/../vdrawtool.h" +#include "../../vabstracttool.h" +#include "../../vdatatool.h" +#include "../vdrawtool.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.h b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.h index a2cf33713..41e54cda2 100644 --- a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.h +++ b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.h @@ -42,9 +42,9 @@ #include #include "../vdrawtool.h" -#include "../vwidgets/../vgeometry/vgeometrydef.h" -#include "../vwidgets/../vmisc/def.h" -#include "tools/drawTools/operation/../../../undocommands/label/../../../ifc/xml/vabstractpattern.h" +#include "../vgeometry/vgeometrydef.h" +#include "../vmisc/def.h" +#include "../ifc/xml/vabstractpattern.h" class DialogTool; class QDomElement; diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp index aca0725de..4eb084624 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp @@ -50,9 +50,9 @@ #include "../vgeometry/vspline.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vcontrolpointspline.h" -#include "tools/drawTools/toolcurve/../../../visualization/line/visline.h" -#include "tools/drawTools/toolcurve/../../vabstracttool.h" -#include "tools/drawTools/toolcurve/../vdrawtool.h" +#include "../../../visualization/line/visline.h" +#include "../../vabstracttool.h" +#include "../vdrawtool.h" class QDomElement; class QGraphicsSceneHoverEvent; diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h index 2700b2134..e793ef6f6 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h @@ -42,15 +42,15 @@ #include #include +#include "../../../visualization/visualization.h" #include "../../../visualization/line/visline.h" #include "../vdrawtool.h" #include "../vgeometry/vabstractcurve.h" #include "../vgeometry/vgeometrydef.h" #include "../vmisc/vabstractapplication.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "../vwidgets/vmaingraphicsscene.h" #include "../vwidgets/vmaingraphicsview.h" -#include "tools/drawTools/toolcurve/../../../visualization/line/../visualization.h" class QDomElement; class QGraphicsSceneHoverEvent; diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp index 6068bdbdf..4ae142e39 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp @@ -36,11 +36,13 @@ #include #include +#include "../../../dialogs/tools/dialogtool.h" #include "../../../dialogs/tools/dialogarc.h" #include "../../../visualization/path/vistoolarc.h" +#include "../../../visualization/visualization.h" #include "../ifc/exception/vexception.h" #include "../ifc/xml/vdomdocument.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/varc.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" @@ -50,11 +52,9 @@ #include "../vpatterndb/vformula.h" #include "../vpatterndb/vtranslatevars.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolcurve/../../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/toolcurve/../../../visualization/path/../visualization.h" -#include "tools/drawTools/toolcurve/../../vabstracttool.h" -#include "tools/drawTools/toolcurve/../vdrawtool.h" -#include "tools/drawTools/toolcurve/vabstractspline.h" +#include "../../vabstracttool.h" +#include "../vdrawtool.h" +#include "vabstractspline.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h index 67da72b2b..2bca55fa8 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h @@ -37,7 +37,7 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vabstractspline.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp index b642deb2b..0b1ea3239 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp @@ -36,11 +36,13 @@ #include #include +#include "../../../dialogs/tools/dialogtool.h" #include "../../../dialogs/tools/dialogarcwithlength.h" +#include "../../../visualization/visualization.h" #include "../../../visualization/path/vistoolarcwithlength.h" #include "../ifc/exception/vexception.h" #include "../ifc/xml/vdomdocument.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/varc.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" @@ -50,11 +52,9 @@ #include "../vpatterndb/vformula.h" #include "../vpatterndb/vtranslatevars.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolcurve/../../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/toolcurve/../../../visualization/path/../visualization.h" -#include "tools/drawTools/toolcurve/../../vabstracttool.h" -#include "tools/drawTools/toolcurve/../vdrawtool.h" -#include "tools/drawTools/toolcurve/vabstractspline.h" +#include "../../vabstracttool.h" +#include "../vdrawtool.h" +#include "vabstractspline.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h index 71d85ec2f..349bfd5b8 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h @@ -37,7 +37,7 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vabstractspline.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp index 53f17c721..50f46413b 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp @@ -37,7 +37,9 @@ #include #include +#include "../../../dialogs/tools/dialogtool.h" #include "../../../dialogs/tools/dialogcubicbezier.h" +#include "../../../visualization/visualization.h" #include "../../../visualization/path/vistoolcubicbezier.h" #include "../ifc/exception/vexception.h" #include "../vgeometry/../ifc/ifcdef.h" @@ -48,11 +50,9 @@ #include "../vmisc/vabstractapplication.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolcurve/../../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/toolcurve/../../../visualization/path/../visualization.h" -#include "tools/drawTools/toolcurve/../../vabstracttool.h" -#include "tools/drawTools/toolcurve/../vdrawtool.h" -#include "tools/drawTools/toolcurve/vabstractspline.h" +#include "../../vabstracttool.h" +#include "../vdrawtool.h" +#include "vabstractspline.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h index b9bb1a397..477b9f2b9 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h @@ -36,8 +36,8 @@ #include #include -#include "../vwidgets/../vmisc/def.h" -#include "tools/drawTools/toolcurve/../../../undocommands/../../ifc/xml/vabstractpattern.h" +#include "../vmisc/def.h" +#include "../ifc/xml/vabstractpattern.h" #include "vabstractspline.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp index 75926fbf1..5a990592d 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp @@ -37,11 +37,13 @@ #include #include +#include "../../../dialogs/tools/dialogtool.h" #include "../../../dialogs/tools/dialogcubicbezierpath.h" +#include "../../../visualization/visualization.h" #include "../../../visualization/path/vistoolcubicbezierpath.h" #include "../ifc/exception/vexception.h" #include "../ifc/xml/vdomdocument.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vabstractcubicbezierpath.h" #include "../vgeometry/vabstractcurve.h" #include "../vgeometry/vcubicbezierpath.h" @@ -50,11 +52,9 @@ #include "../vmisc/vabstractapplication.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolcurve/../../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/toolcurve/../../../visualization/path/../visualization.h" -#include "tools/drawTools/toolcurve/../../vabstracttool.h" -#include "tools/drawTools/toolcurve/../vdrawtool.h" -#include "tools/drawTools/toolcurve/vabstractspline.h" +#include "../../vabstracttool.h" +#include "../vdrawtool.h" +#include "vabstractspline.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h index 1a56aa3a5..7f09b66b5 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h @@ -37,7 +37,7 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vabstractspline.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp index 2bc9cf308..5f9f01134 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp @@ -51,11 +51,13 @@ #include #include "../../../dialogs/tools/dialogspline.h" +#include "../../../dialogs/tools/dialogtool.h" #include "../../../undocommands/movespline.h" +#include "../../../visualization/visualization.h" #include "../../../visualization/path/vistoolspline.h" #include "../ifc/exception/vexception.h" +#include "../ifc/ifcdef.h" #include "../qmuparser/qmutokenparser.h" -#include "../vgeometry/../ifc/ifcdef.h" #include "../vgeometry/vabstractcurve.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" @@ -64,11 +66,9 @@ #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vcontrolpointspline.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolcurve/../../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/toolcurve/../../../visualization/path/../visualization.h" -#include "tools/drawTools/toolcurve/../../vabstracttool.h" -#include "tools/drawTools/toolcurve/../vdrawtool.h" -#include "tools/drawTools/toolcurve/vabstractspline.h" +#include "../../vabstracttool.h" +#include "../vdrawtool.h" +#include "vabstractspline.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h index a4450ac37..efa7d5028 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h @@ -38,8 +38,8 @@ #include #include "../vgeometry/vgeometrydef.h" -#include "../vwidgets/../vmisc/def.h" -#include "tools/drawTools/toolcurve/../../../undocommands/../../ifc/xml/vabstractpattern.h" +#include "../vmisc/def.h" +#include "../ifc/xml/vabstractpattern.h" #include "vabstractspline.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp index dc9980957..9f224c40f 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp @@ -50,13 +50,16 @@ #include #include +#include "../../../dialogs/tools/dialogtool.h" #include "../../../dialogs/tools/dialogsplinepath.h" #include "../../../undocommands/movesplinepath.h" +#include "../../../undocommands/vundocommand.h" +#include "../../../visualization/visualization.h" #include "../../../visualization/path/vistoolsplinepath.h" #include "../ifc/exception/vexception.h" #include "../ifc/xml/vdomdocument.h" +#include "../ifc/ifcdef.h" #include "../qmuparser/qmutokenparser.h" -#include "../vgeometry/../ifc/ifcdef.h" #include "../vgeometry/vabstractcubicbezierpath.h" #include "../vgeometry/vabstractcurve.h" #include "../vgeometry/vgobject.h" @@ -68,12 +71,9 @@ #include "../vwidgets/../vgeometry/vsplinepath.h" #include "../vwidgets/vcontrolpointspline.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolcurve/../../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/toolcurve/../../../undocommands/vundocommand.h" -#include "tools/drawTools/toolcurve/../../../visualization/path/../visualization.h" -#include "tools/drawTools/toolcurve/../../vabstracttool.h" -#include "tools/drawTools/toolcurve/../vdrawtool.h" -#include "tools/drawTools/toolcurve/vabstractspline.h" +#include "../../vabstracttool.h" +#include "../vdrawtool.h" +#include "vabstractspline.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h index 1b039f808..a50696dd7 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h @@ -39,8 +39,8 @@ #include #include "../vgeometry/vgeometrydef.h" -#include "../vwidgets/../vmisc/def.h" -#include "tools/drawTools/toolcurve/../../../undocommands/../../ifc/xml/vabstractpattern.h" +#include "../vmisc/def.h" +#include "../ifc/xml/vabstractpattern.h" #include "vabstractspline.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp index b5040943e..1bb4f61be 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp @@ -40,18 +40,18 @@ #include "../../../../undocommands/label/movedoublelabel.h" #include "../ifc/exception/vexception.h" #include "../ifc/exception/vexceptionbadid.h" +#include "../ifc/xml/vabstractpattern.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" #include "../vmisc/vabstractapplication.h" +#include "../vmisc/logging.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/../ifc/ifcdef.h" #include "../vwidgets/vsimplepoint.h" -#include "tools/drawTools/toolpoint/tooldoublepoint/../../../../undocommands/label/../../../ifc/xml/vabstractpattern.h" -#include "tools/drawTools/toolpoint/tooldoublepoint/../../../../undocommands/label/../../../vmisc/logging.h" -#include "tools/drawTools/toolpoint/tooldoublepoint/../../../vabstracttool.h" -#include "tools/drawTools/toolpoint/tooldoublepoint/../../../vdatatool.h" -#include "tools/drawTools/toolpoint/tooldoublepoint/../../vdrawtool.h" -#include "tools/drawTools/toolpoint/tooldoublepoint/../vabstractpoint.h" +#include "../../../vabstracttool.h" +#include "../../../vdatatool.h" +#include "../../vdrawtool.h" +#include "../vabstractpoint.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h index dc573c27c..0b1d784d0 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h @@ -40,7 +40,7 @@ #include #include "../vabstractpoint.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp index f3f195dfc..3548363b7 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp @@ -37,18 +37,18 @@ #include #include "../../../../dialogs/tools/dialogtruedarts.h" +#include "../../../../dialogs/tools/dialogtool.h" +#include "../../../../visualization/visualization.h" #include "../../../../visualization/line/vistooltruedarts.h" #include "../ifc/exception/vexception.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolpoint/tooldoublepoint/../../../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/toolpoint/tooldoublepoint/../../../../visualization/line/../visualization.h" -#include "tools/drawTools/toolpoint/tooldoublepoint/../../../vabstracttool.h" -#include "tools/drawTools/toolpoint/tooldoublepoint/../../vdrawtool.h" -#include "tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h" +#include "../../../vabstracttool.h" +#include "../../vdrawtool.h" +#include "vtooldoublepoint.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h index c3c57767c..5f191f19c 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h @@ -39,7 +39,7 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vtooldoublepoint.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp index 582330801..2c74ffb5e 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp @@ -33,15 +33,15 @@ #include #include "../ifc/xml/vdomdocument.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" #include "../vmisc/vabstractapplication.h" #include "../vpatterndb/vcontainer.h" #include "../vpatterndb/vformula.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../../vabstracttool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../toolcurve/../vdrawtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../vtoolsinglepoint.h" +#include "../../../../vabstracttool.h" +#include "../../../vdrawtool.h" +#include "../vtoolsinglepoint.h" //--------------------------------------------------------------------------------------------------------------------- VToolCut::VToolCut(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &formula, diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h index 5cfbe5e3f..291e2f7cf 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h @@ -39,9 +39,9 @@ #include "../../../toolcurve/vabstractspline.h" #include "../ifc/xml/vabstractpattern.h" #include "../vtoolsinglepoint.h" -#include "../vwidgets/../vmisc/def.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../../vdatatool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../toolcurve/../../../visualization/line/../visualization.h" +#include "../vmisc/def.h" +#include "../../../../vdatatool.h" +#include "../../../../../visualization/visualization.h" class VContainer; class VFormula; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp index dee0ade29..2069cf761 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp @@ -36,9 +36,11 @@ #include #include "../../../../../dialogs/tools/dialogcutarc.h" +#include "../../../../../dialogs/tools/dialogtool.h" +#include "../../../../../visualization/visualization.h" #include "../../../../../visualization/path/vistoolcutarc.h" #include "../ifc/exception/vexception.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/varc.h" #include "../vgeometry/vpointf.h" #include "../vmisc/vabstractapplication.h" @@ -46,11 +48,9 @@ #include "../vpatterndb/vcontainer.h" #include "../vpatterndb/vtranslatevars.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../../../visualization/path/../visualization.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../../vabstracttool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../toolcurve/../vdrawtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h" +#include "../../../../vabstracttool.h" +#include "../../../vdrawtool.h" +#include "vtoolcut.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h index 568a9597c..6befc19a0 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h @@ -38,7 +38,7 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vtoolcut.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp index f45e97a6b..7b0017c95 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp @@ -36,9 +36,11 @@ #include #include "../../../../../dialogs/tools/dialogcutspline.h" +#include "../../../../../dialogs/tools/dialogtool.h" +#include "../../../../../visualization/visualization.h" #include "../../../../../visualization/path/vistoolcutspline.h" #include "../ifc/exception/vexception.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vabstractcubicbezier.h" #include "../vgeometry/vabstractcurve.h" #include "../vgeometry/vpointf.h" @@ -48,11 +50,9 @@ #include "../vpatterndb/vcontainer.h" #include "../vpatterndb/vtranslatevars.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../../../visualization/path/../visualization.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../../vabstracttool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../toolcurve/../vdrawtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h" +#include "../../../../vabstracttool.h" +#include "../../../vdrawtool.h" +#include "vtoolcut.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h index e9ee40901..619a8ee2d 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h @@ -38,7 +38,7 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vtoolcut.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp index c2710ab4c..0955bb05a 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp @@ -37,9 +37,11 @@ #include #include "../../../../../dialogs/tools/dialogcutsplinepath.h" +#include "../../../../../dialogs/tools/dialogtool.h" +#include "../../../../../visualization/visualization.h" #include "../../../../../visualization/path/vistoolcutsplinepath.h" #include "../ifc/exception/vexception.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vabstractcubicbezierpath.h" #include "../vgeometry/vabstractcurve.h" #include "../vgeometry/vpointf.h" @@ -51,11 +53,9 @@ #include "../vpatterndb/vcontainer.h" #include "../vpatterndb/vtranslatevars.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../../../visualization/path/../visualization.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../../vabstracttool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../toolcurve/../vdrawtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h" +#include "../../../../vabstracttool.h" +#include "../../../vdrawtool.h" +#include "vtoolcut.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h index 788e091ce..7892cab59 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h @@ -38,7 +38,7 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vtoolcut.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp index db296a32f..098d5ca51 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp @@ -37,22 +37,22 @@ #include #include "../../../../../dialogs/tools/dialogalongline.h" +#include "../../../../../dialogs/tools/dialogtool.h" +#include "../../../../../visualization/visualization.h" #include "../../../../../visualization/line/vistoolalongline.h" #include "../ifc/exception/vexception.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" #include "../vmisc/vabstractapplication.h" #include "../vmisc/vcommonsettings.h" #include "../vpatterndb/vcontainer.h" #include "../vpatterndb/vtranslatevars.h" +#include "../vpatterndb/variables/vlinelength.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../visualization/line/../visualization.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../vabstracttool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../vdrawtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h" -#include "variables/vlinelength.h" +#include "../../../../vabstracttool.h" +#include "../../../vdrawtool.h" +#include "vtoollinepoint.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h index e80ecb3f6..64dee10fc 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h @@ -38,7 +38,7 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vtoollinepoint.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp index 8de87f1fd..aeb7d651a 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp @@ -36,9 +36,11 @@ #include #include "../../../../../dialogs/tools/dialogbisector.h" +#include "../../../../../dialogs/tools/dialogtool.h" +#include "../../../../../visualization/visualization.h" #include "../../../../../visualization/line/vistoolbisector.h" #include "../ifc/exception/vexception.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" #include "../vmisc/vabstractapplication.h" @@ -46,11 +48,9 @@ #include "../vpatterndb/vcontainer.h" #include "../vpatterndb/vtranslatevars.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../visualization/line/../visualization.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../vabstracttool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../vdrawtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h" +#include "../../../../vabstracttool.h" +#include "../../../vdrawtool.h" +#include "vtoollinepoint.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h index 8ad5e9eed..a3e207011 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h @@ -39,7 +39,7 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vtoollinepoint.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp index 4290f8fc9..c11517d78 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp @@ -39,11 +39,12 @@ #include #include +#include "../../../../../dialogs/tools/dialogtool.h" #include "../../../../../dialogs/tools/dialogcurveintersectaxis.h" +#include "../ifc/ifcdef.h" #include "../ifc/exception/vexception.h" #include "../qmuparser/qmudef.h" #include "../toolcut/vtoolcutsplinepath.h" -#include "../vgeometry/../ifc/ifcdef.h" #include "../vgeometry/vabstractcubicbezier.h" #include "../vgeometry/vabstractcubicbezierpath.h" #include "../vgeometry/vabstractcurve.h" @@ -56,13 +57,12 @@ #include "../vmisc/vcommonsettings.h" #include "../vpatterndb/vcontainer.h" #include "../vpatterndb/vtranslatevars.h" -#include "../vtools/visualization/line/../visualization.h" +#include "../vtools/visualization/visualization.h" #include "../vtools/visualization/line/vistoolcurveintersectaxis.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/support/../tools/dialogtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../vabstracttool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../toolcut/../../../toolcurve/../vdrawtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h" +#include "../../../../vabstracttool.h" +#include "../../../vdrawtool.h" +#include "vtoollinepoint.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h index b42374e7d..7573a71b9 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h @@ -41,7 +41,7 @@ #include "../ifc/xml/vabstractpattern.h" #include "../vgeometry/vgeometrydef.h" #include "../vpatterndb/vformula.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vtoollinepoint.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp index 9d97b7bde..43843c392 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp @@ -37,20 +37,20 @@ #include #include "../../../../../dialogs/tools/dialogendline.h" +#include "../../../../../dialogs/tools/dialogtool.h" +#include "../../../../../visualization/visualization.h" #include "../../../../../visualization/line/vistoolendline.h" #include "../ifc/exception/vexception.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vpointf.h" #include "../vmisc/vabstractapplication.h" #include "../vmisc/vcommonsettings.h" #include "../vpatterndb/vcontainer.h" #include "../vpatterndb/vtranslatevars.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/support/../tools/dialogtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../visualization/line/../visualization.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../vabstracttool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../vdrawtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h" +#include "../../../../vabstracttool.h" +#include "../../../vdrawtool.h" +#include "vtoollinepoint.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h index 7d343cb99..fab75209d 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h @@ -39,7 +39,7 @@ #include "../ifc/xml/vabstractpattern.h" #include "../vpatterndb/vformula.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vtoollinepoint.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp index 8ffc498ee..3b8434869 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp @@ -35,18 +35,18 @@ #include #include "../../../../../dialogs/tools/dialogheight.h" +#include "../../../../../dialogs/tools/dialogtool.h" +#include "../../../../../visualization/visualization.h" #include "../../../../../visualization/line/vistoolheight.h" #include "../ifc/exception/vexception.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../visualization/line/../visualization.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../vabstracttool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../vdrawtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h" +#include "../../../../vabstracttool.h" +#include "../../../vdrawtool.h" +#include "vtoollinepoint.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h index 2fc97537e..b918ec5fc 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h @@ -40,7 +40,7 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vtoollinepoint.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp index c3b5f5d77..0c26c4fb8 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp @@ -36,20 +36,20 @@ #include #include "../../../../../dialogs/tools/dialoglineintersectaxis.h" +#include "../../../../../dialogs/tools/dialogtool.h" +#include "../../../../../visualization/visualization.h" #include "../../../../../visualization/line/vistoollineintersectaxis.h" #include "../ifc/exception/vexception.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vpointf.h" #include "../vmisc/vabstractapplication.h" #include "../vmisc/vcommonsettings.h" #include "../vpatterndb/vcontainer.h" #include "../vpatterndb/vtranslatevars.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/support/../tools/dialogtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../visualization/line/../visualization.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../vabstracttool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../vdrawtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h" +#include "../../../../vabstracttool.h" +#include "../../../vdrawtool.h" +#include "vtoollinepoint.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h index cd5478df6..396d24882 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h @@ -41,7 +41,7 @@ #include "../ifc/xml/vabstractpattern.h" #include "../vpatterndb/vformula.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vtoollinepoint.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp index 81b6f1239..cf3cfa868 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp @@ -40,14 +40,14 @@ #include "../ifc/xml/vabstractpattern.h" #include "../ifc/xml/vdomdocument.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" #include "../vmisc/vabstractapplication.h" #include "../vpatterndb/vcontainer.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../vabstracttool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../vdrawtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../vtoolsinglepoint.h" +#include "../../../../vabstracttool.h" +#include "../../../vdrawtool.h" +#include "../vtoolsinglepoint.h" class QDomElement; template class QSharedPointer; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h index 0fd379569..8cb7e3b15 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h @@ -38,7 +38,7 @@ #include "../vpatterndb/vformula.h" #include "../vtoolsinglepoint.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" class QDomElement; class VAbstractPattern; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp index 6319cdd06..2a772b58b 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp @@ -36,9 +36,11 @@ #include #include "../../../../../dialogs/tools/dialognormal.h" +#include "../../../../../dialogs/tools/dialogtool.h" +#include "../../../../../visualization/visualization.h" #include "../../../../../visualization/line/vistoolnormal.h" #include "../ifc/exception/vexception.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" #include "../vmisc/vabstractapplication.h" @@ -46,11 +48,9 @@ #include "../vpatterndb/vcontainer.h" #include "../vpatterndb/vtranslatevars.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../visualization/line/../visualization.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../vabstracttool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../vdrawtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h" +#include "../../../../vabstracttool.h" +#include "../../../vdrawtool.h" +#include "vtoollinepoint.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h index 1c8253dd4..0c2ab225d 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h @@ -39,7 +39,7 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vtoollinepoint.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp index 2e8ed95b8..c10126dc9 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp @@ -39,9 +39,11 @@ #include #include "../../../../../dialogs/tools/dialogshoulderpoint.h" +#include "../../../../../dialogs/tools/dialogtool.h" +#include "../../../../../visualization/visualization.h" #include "../../../../../visualization/line/vistoolshoulderpoint.h" #include "../ifc/exception/vexception.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" #include "../vmisc/vabstractapplication.h" @@ -49,11 +51,9 @@ #include "../vpatterndb/vcontainer.h" #include "../vpatterndb/vtranslatevars.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../visualization/line/../visualization.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../vabstracttool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../vdrawtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h" +#include "../../../../vabstracttool.h" +#include "../../../vdrawtool.h" +#include "vtoollinepoint.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h index bc0d8baac..eb1f42366 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h @@ -39,7 +39,7 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vtoollinepoint.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp index f9823c89c..80f84d56d 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp @@ -48,12 +48,13 @@ #include #include +#include "../../../../dialogs/tools/dialogtool.h" #include "../../../../dialogs/tools/dialogsinglepoint.h" #include "../../../../undocommands/addpatternpiece.h" #include "../../../../undocommands/deletepatternpiece.h" #include "../../../../undocommands/movespoint.h" #include "../ifc/exception/vexception.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" #include "../vmisc/vabstractapplication.h" @@ -61,12 +62,11 @@ #include "../vwidgets/vgraphicssimpletextitem.h" #include "../vwidgets/vmaingraphicsscene.h" #include "../vwidgets/vmaingraphicsview.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../undocommands/../../vmisc/logging.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../vabstracttool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../vdatatool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../vdrawtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h" +#include "../vmisc/logging.h" +#include "../../../vabstracttool.h" +#include "../../../vdatatool.h" +#include "../../vdrawtool.h" +#include "vtoolsinglepoint.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h index a49e9806b..e865c2eb4 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h @@ -39,8 +39,8 @@ #include #include -#include "../vwidgets/../vmisc/def.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../undocommands/../../ifc/xml/vabstractpattern.h" +#include "../vmisc/def.h" +#include "../ifc/xml/vabstractpattern.h" #include "vtoolsinglepoint.h" class QDomElement; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp index 9345e0a90..662801242 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp @@ -40,16 +40,16 @@ #include "../../../../dialogs/tools/dialoglineintersect.h" #include "../../../../visualization/line/vistoollineintersect.h" #include "../ifc/exception/vexception.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../visualization/line/../visualization.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../vabstracttool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../vdrawtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h" +#include "../../../../dialogs/tools/dialogtool.h" +#include "../../../../visualization/visualization.h" +#include "../../../vabstracttool.h" +#include "../../vdrawtool.h" +#include "vtoolsinglepoint.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h index 7c566838c..fd8c6d005 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h @@ -38,7 +38,7 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vtoolsinglepoint.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp index f89b2687f..b4f405e5c 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp @@ -36,19 +36,19 @@ #include #include "../../../../dialogs/tools/dialogpointfromarcandtangent.h" +#include "../../../../dialogs/tools/dialogtool.h" +#include "../../../../visualization/visualization.h" #include "../../../../visualization/line/vistoolpointfromarcandtangent.h" #include "../ifc/exception/vexception.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/varc.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../visualization/line/../visualization.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../vabstracttool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../vdrawtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h" +#include "../../../vabstracttool.h" +#include "../../vdrawtool.h" +#include "vtoolsinglepoint.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h index 7d2165dd1..a21abfa84 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h @@ -39,7 +39,7 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vtoolsinglepoint.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp index 8ab077441..e23e72d0a 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp @@ -35,21 +35,21 @@ #include #include "../../../../dialogs/tools/dialogpointfromcircleandtangent.h" +#include "../../../../dialogs/tools/dialogtool.h" +#include "../../../../visualization/visualization.h" #include "../../../../visualization/line/vistoolpointfromcircleandtangent.h" #include "../ifc/exception/vexception.h" #include "../ifc/xml/vdomdocument.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" #include "../vmisc/vabstractapplication.h" #include "../vpatterndb/vcontainer.h" #include "../vpatterndb/vformula.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../visualization/line/../visualization.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../vabstracttool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../vdrawtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h" +#include "../../../vabstracttool.h" +#include "../../vdrawtool.h" +#include "vtoolsinglepoint.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h index dab0fe51b..bbe2c68e1 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h @@ -39,7 +39,7 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vtoolsinglepoint.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp index d86ecbc8a..d63a3f884 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp @@ -39,10 +39,12 @@ #include #include "../../../../dialogs/tools/dialogpointofcontact.h" +#include "../../../../dialogs/tools/dialogtool.h" +#include "../../../../visualization/visualization.h" #include "../../../../visualization/line/vistoolpointofcontact.h" #include "../ifc/exception/vexception.h" #include "../ifc/xml/vdomdocument.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" #include "../vmisc/vabstractapplication.h" @@ -51,11 +53,9 @@ #include "../vpatterndb/vformula.h" #include "../vpatterndb/vtranslatevars.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../visualization/line/../visualization.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../vabstracttool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../vdrawtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h" +#include "../../../vabstracttool.h" +#include "../../vdrawtool.h" +#include "vtoolsinglepoint.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h index ee42fff0e..2ad91ee4c 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h @@ -39,7 +39,7 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vtoolsinglepoint.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp index 2876a286c..dfb57b4aa 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp @@ -38,16 +38,16 @@ #include "../../../../dialogs/tools/dialogpointofintersection.h" #include "../../../../visualization/line/vistoolpointofintersection.h" #include "../ifc/exception/vexception.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../visualization/line/../visualization.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../vabstracttool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../vdrawtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h" +#include "../../../../dialogs/tools/dialogtool.h" +#include "../../../../visualization/visualization.h" +#include "../../../vabstracttool.h" +#include "../../vdrawtool.h" +#include "vtoolsinglepoint.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h index f0058065a..f47d48f02 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h @@ -38,7 +38,7 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vtoolsinglepoint.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp index 3666c212f..6c3c45edb 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp @@ -38,17 +38,17 @@ #include "../../../../dialogs/tools/dialogpointofintersectionarcs.h" #include "../../../../visualization/line/vistoolpointofintersectionarcs.h" #include "../ifc/exception/vexception.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/varc.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../visualization/line/../visualization.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../vabstracttool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../vdrawtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h" +#include "../../../../dialogs/tools/dialogtool.h" +#include "../../../../visualization/visualization.h" +#include "../../../vabstracttool.h" +#include "../../vdrawtool.h" +#include "vtoolsinglepoint.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h index 96c7ba2d6..4d2c0b462 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h @@ -39,7 +39,7 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vtoolsinglepoint.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp index 6b365c318..b9a4cc29a 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp @@ -35,21 +35,21 @@ #include #include "../../../../dialogs/tools/dialogpointofintersectioncircles.h" +#include "../../../../dialogs/tools/dialogtool.h" +#include "../../../../visualization/visualization.h" #include "../../../../visualization/line/vistoolpointofintersectioncircles.h" #include "../ifc/exception/vexception.h" #include "../ifc/xml/vdomdocument.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" #include "../vmisc/vabstractapplication.h" #include "../vpatterndb/vcontainer.h" #include "../vpatterndb/vformula.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../visualization/line/../visualization.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../vabstracttool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../vdrawtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h" +#include "../../../vabstracttool.h" +#include "../../vdrawtool.h" +#include "vtoolsinglepoint.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h index 562aee565..baac46e68 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h @@ -39,7 +39,7 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vtoolsinglepoint.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp index 6a4f188ba..6eb910b10 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp @@ -36,19 +36,19 @@ #include #include "../../../../dialogs/tools/dialogpointofintersectioncurves.h" +#include "../../../../dialogs/tools/dialogtool.h" +#include "../../../../visualization/path/../visualization.h" #include "../../../../visualization/path/vistoolpointofintersectioncurves.h" #include "../ifc/exception/vexception.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vabstractcurve.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../visualization/path/../visualization.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../vabstracttool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../vdrawtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h" +#include "../../../vabstracttool.h" +#include "../../vdrawtool.h" +#include "vtoolsinglepoint.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h index 71b3e842f..8bb7415fb 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h @@ -40,7 +40,7 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vtoolsinglepoint.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp index 85b8a3ea7..df652e1e9 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp @@ -47,17 +47,17 @@ #include "../../../../undocommands/label/movelabel.h" #include "../ifc/exception/vexception.h" #include "../ifc/exception/vexceptionbadid.h" -#include "../vgeometry/../ifc/ifcdef.h" -#include "../vgeometry/../vmisc/diagnostic.h" +#include "../ifc/ifcdef.h" +#include "../ifc/xml/vabstractpattern.h" +#include "../vmisc/diagnostic.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" #include "../vmisc/vabstractapplication.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vgraphicssimpletextitem.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../undocommands/label/../../../ifc/xml/vabstractpattern.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../vabstracttool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../vdrawtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../vabstractpoint.h" +#include "../../../vabstracttool.h" +#include "../../vdrawtool.h" +#include "../vabstractpoint.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h index 31bb0bfd2..cfb81f59c 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h @@ -40,7 +40,7 @@ #include #include "../vabstractpoint.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp index fcf68c965..9424f58b5 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp @@ -38,18 +38,18 @@ #include #include "../../../../dialogs/tools/dialogtriangle.h" +#include "../../../../dialogs/tools/dialogtool.h" +#include "../../../../visualization/visualization.h" #include "../../../../visualization/line/vistooltriangle.h" #include "../ifc/exception/vexception.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../../visualization/line/../visualization.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../../vabstracttool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/../../vdrawtool.h" -#include "tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h" +#include "../../../vabstracttool.h" +#include "../../vdrawtool.h" +#include "vtoolsinglepoint.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h index 13e611f2b..7ff33b5a2 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h @@ -39,7 +39,7 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vtoolsinglepoint.h" class DialogTool; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp index b8476e99c..c87076dc3 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp @@ -33,7 +33,7 @@ #include "../ifc/exception/vexception.h" #include "../ifc/xml/vabstractpattern.h" #include "../vgeometry/vgobject.h" -#include "tools/drawTools/toolpoint/../vdrawtool.h" +#include "../vdrawtool.h" //--------------------------------------------------------------------------------------------------------------------- VAbstractPoint::VAbstractPoint(VAbstractPattern *doc, VContainer *data, quint32 id) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h index bbdb68fcc..c7823a891 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h @@ -40,14 +40,14 @@ #include #include "../vdrawtool.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vpointf.h" #include "../vmisc/vabstractapplication.h" #include "../vpatterndb/vcontainer.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/drawTools/toolpoint/../../../dialogs/tools/../../visualization/visualization.h" -#include "tools/drawTools/toolpoint/../../vabstracttool.h" +#include "../../../visualization/visualization.h" +#include "../../vabstracttool.h" class QPointF; class VAbstractPattern; diff --git a/src/libs/vtools/tools/drawTools/vdrawtool.cpp b/src/libs/vtools/tools/drawTools/vdrawtool.cpp index a5ce06c7f..f51128217 100644 --- a/src/libs/vtools/tools/drawTools/vdrawtool.cpp +++ b/src/libs/vtools/tools/drawTools/vdrawtool.cpp @@ -39,19 +39,19 @@ #include #include -#include "../../../ifc/exception/vexceptionundo.h" -#include "../../../vpatterndb/calculator.h" +#include "../ifc/ifcdef.h" +#include "../ifc/xml/vdomdocument.h" +#include "../ifc/xml/vabstractpattern.h" +#include "../ifc/exception/vexceptionundo.h" +#include "../vpatterndb/calculator.h" #include "../../dialogs/support/dialogeditwrongformula.h" #include "../../dialogs/support/dialogundo.h" #include "../../undocommands/addtocalc.h" #include "../../undocommands/savetooloptions.h" -#include "../ifc/xml/vdomdocument.h" #include "../qmuparser/qmuparsererror.h" -#include "../vgeometry/../ifc/ifcdef.h" #include "../vpatterndb/vcontainer.h" -#include "tools/drawTools/../../undocommands/../../ifc/xml/vabstractpattern.h" -#include "tools/drawTools/../../undocommands/../../vmisc/logging.h" -#include "tools/drawTools/../vabstracttool.h" +#include "../vmisc/logging.h" +#include "../vabstracttool.h" class QDomElement; class VGObject; diff --git a/src/libs/vtools/tools/drawTools/vdrawtool.h b/src/libs/vtools/tools/drawTools/vdrawtool.h index ab558d788..8e8c56dc9 100644 --- a/src/libs/vtools/tools/drawTools/vdrawtool.h +++ b/src/libs/vtools/tools/drawTools/vdrawtool.h @@ -42,15 +42,15 @@ #include #include +#include "../../dialogs/tools/dialogtool.h" #include "../../dialogs/tools/dialogtool.h" #include "../ifc/exception/vexceptionbadid.h" #include "../vabstracttool.h" #include "../vmisc/vabstractapplication.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "../vwidgets/vmaingraphicsscene.h" #include "../vwidgets/vmaingraphicsview.h" -#include "tools/drawTools/../../dialogs/support/../tools/dialogtool.h" -#include "tools/drawTools/../vdatatool.h" +#include "../vdatatool.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/vtoolline.cpp b/src/libs/vtools/tools/drawTools/vtoolline.cpp index 336ae6a1c..d635858f5 100644 --- a/src/libs/vtools/tools/drawTools/vtoolline.cpp +++ b/src/libs/vtools/tools/drawTools/vtoolline.cpp @@ -40,18 +40,18 @@ #include #include "../../dialogs/tools/dialogline.h" +#include "../../dialogs/tools/dialogtool.h" +#include "../../visualization/visualization.h" #include "../../visualization/line/vistoolline.h" #include "../ifc/exception/vexception.h" -#include "../vgeometry/../ifc/ifcdef.h" +#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 "tools/drawTools/../../dialogs/tools/dialogtool.h" -#include "tools/drawTools/../../visualization/line/../visualization.h" -#include "tools/drawTools/../vabstracttool.h" -#include "tools/drawTools/vdrawtool.h" +#include "../vabstracttool.h" +#include "vdrawtool.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/drawTools/vtoolline.h b/src/libs/vtools/tools/drawTools/vtoolline.h index 0a6990ed1..e0da6010c 100644 --- a/src/libs/vtools/tools/drawTools/vtoolline.h +++ b/src/libs/vtools/tools/drawTools/vtoolline.h @@ -40,7 +40,7 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vdrawtool.h" class DialogTool; diff --git a/src/libs/vtools/tools/nodeDetails/vabstractnode.cpp b/src/libs/vtools/tools/nodeDetails/vabstractnode.cpp index 1be0314bd..21e4c9d5d 100644 --- a/src/libs/vtools/tools/nodeDetails/vabstractnode.cpp +++ b/src/libs/vtools/tools/nodeDetails/vabstractnode.cpp @@ -36,13 +36,13 @@ #include #include "../../undocommands/adddetnode.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" +#include "../ifc/xml/vabstractpattern.h" #include "../vgeometry/vgobject.h" #include "../vmisc/vabstractapplication.h" +#include "../vmisc/def.h" #include "../vpatterndb/vcontainer.h" -#include "../vwidgets/../vmisc/def.h" -#include "tools/nodeDetails/../../undocommands/../../ifc/xml/vabstractpattern.h" -#include "tools/nodeDetails/../vabstracttool.h" +#include "../vabstracttool.h" class QDomElement; diff --git a/src/libs/vtools/tools/nodeDetails/vnodearc.cpp b/src/libs/vtools/tools/nodeDetails/vnodearc.cpp index 4141a601c..9642baa80 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodearc.cpp +++ b/src/libs/vtools/tools/nodeDetails/vnodearc.cpp @@ -34,10 +34,10 @@ #include #include "../ifc/xml/vdomdocument.h" -#include "../vgeometry/../ifc/ifcdef.h" -#include "tools/nodeDetails/../vabstracttool.h" -#include "tools/nodeDetails/../vdatatool.h" -#include "tools/nodeDetails/vabstractnode.h" +#include "../ifc/ifcdef.h" +#include "../vabstracttool.h" +#include "../vdatatool.h" +#include "vabstractnode.h" class VContainer; diff --git a/src/libs/vtools/tools/nodeDetails/vnodearc.h b/src/libs/vtools/tools/nodeDetails/vnodearc.h index 836c5b491..4f5a6d284 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodearc.h +++ b/src/libs/vtools/tools/nodeDetails/vnodearc.h @@ -37,7 +37,7 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vabstractnode.h" class VContainer; diff --git a/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp b/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp index a89803002..33a3e0fcb 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp +++ b/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp @@ -47,13 +47,13 @@ #include "../../../vgeometry/vpointf.h" #include "../../../vwidgets/vgraphicssimpletextitem.h" #include "../ifc/xml/vdomdocument.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vmisc/vabstractapplication.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/nodeDetails/../vabstracttool.h" -#include "tools/nodeDetails/../vdatatool.h" -#include "tools/nodeDetails/vabstractnode.h" +#include "../vabstracttool.h" +#include "../vdatatool.h" +#include "vabstractnode.h" class QGraphicsSceneContextMenuEvent; class QGraphicsSceneHoverEvent; diff --git a/src/libs/vtools/tools/nodeDetails/vnodepoint.h b/src/libs/vtools/tools/nodeDetails/vnodepoint.h index 089fec1ba..f88c405b7 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodepoint.h +++ b/src/libs/vtools/tools/nodeDetails/vnodepoint.h @@ -39,7 +39,7 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vabstractnode.h" class QGraphicsItem; diff --git a/src/libs/vtools/tools/nodeDetails/vnodespline.cpp b/src/libs/vtools/tools/nodeDetails/vnodespline.cpp index aa00df5d7..6b607a6e6 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodespline.cpp +++ b/src/libs/vtools/tools/nodeDetails/vnodespline.cpp @@ -34,10 +34,10 @@ #include #include "../ifc/xml/vdomdocument.h" -#include "../vgeometry/../ifc/ifcdef.h" -#include "tools/nodeDetails/../vabstracttool.h" -#include "tools/nodeDetails/../vdatatool.h" -#include "tools/nodeDetails/vabstractnode.h" +#include "../ifc/ifcdef.h" +#include "../vabstracttool.h" +#include "../vdatatool.h" +#include "vabstractnode.h" class VContainer; diff --git a/src/libs/vtools/tools/nodeDetails/vnodespline.h b/src/libs/vtools/tools/nodeDetails/vnodespline.h index f04cecc9a..aba5c77ab 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodespline.h +++ b/src/libs/vtools/tools/nodeDetails/vnodespline.h @@ -37,7 +37,7 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vabstractnode.h" class VContainer; diff --git a/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp b/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp index d51db5ca2..c6ab8d453 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp +++ b/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp @@ -34,10 +34,10 @@ #include #include "../ifc/xml/vdomdocument.h" -#include "../vgeometry/../ifc/ifcdef.h" -#include "tools/nodeDetails/../vabstracttool.h" -#include "tools/nodeDetails/../vdatatool.h" -#include "tools/nodeDetails/vabstractnode.h" +#include "../ifc/ifcdef.h" +#include "../vabstracttool.h" +#include "../vdatatool.h" +#include "vabstractnode.h" class VContainer; diff --git a/src/libs/vtools/tools/nodeDetails/vnodesplinepath.h b/src/libs/vtools/tools/nodeDetails/vnodesplinepath.h index 18e258fbe..8a1b9c096 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodesplinepath.h +++ b/src/libs/vtools/tools/nodeDetails/vnodesplinepath.h @@ -37,7 +37,7 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "vabstractnode.h" class VContainer; diff --git a/src/libs/vtools/tools/vabstracttool.cpp b/src/libs/vtools/tools/vabstracttool.cpp index 818c0cc17..29bb6d395 100644 --- a/src/libs/vtools/tools/vabstracttool.cpp +++ b/src/libs/vtools/tools/vabstracttool.cpp @@ -53,9 +53,9 @@ #include #include -#include "../../vgeometry/vpointf.h" -#include "../../vpropertyexplorer/checkablemessagebox.h" -#include "../../vwidgets/vmaingraphicsview.h" +#include "../vgeometry/vpointf.h" +#include "../vpropertyexplorer/checkablemessagebox.h" +#include "../vwidgets/vmaingraphicsview.h" #include "../ifc/exception/vexception.h" #include "../ifc/xml/vtoolrecord.h" #include "../undocommands/deltool.h" @@ -63,10 +63,10 @@ #include "../vgeometry/vgeometrydef.h" #include "../vgeometry/vgobject.h" #include "../vmisc/vcommonsettings.h" +#include "../vmisc/logging.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vgraphicssimpletextitem.h" -#include "tools/../undocommands/../../vmisc/logging.h" -#include "tools/vdatatool.h" +#include "vdatatool.h" class QGraphicsEllipseItem; class QGraphicsLineItem; diff --git a/src/libs/vtools/tools/vabstracttool.h b/src/libs/vtools/tools/vabstracttool.h index 9886c0ea2..6247375cd 100644 --- a/src/libs/vtools/tools/vabstracttool.h +++ b/src/libs/vtools/tools/vabstracttool.h @@ -38,12 +38,12 @@ #include #include +#include "../ifc/xml/vabstractpattern.h" #include "../ifc/xml/vabstractpattern.h" #include "../visualization/visualization.h" #include "../vmisc/vabstractapplication.h" #include "../vwidgets/../vmisc/def.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "tools/../undocommands/../../ifc/xml/vabstractpattern.h" #include "vdatatool.h" class QDomElement; diff --git a/src/libs/vtools/tools/vtextgraphicsitem.cpp b/src/libs/vtools/tools/vtextgraphicsitem.cpp index 4ea716599..5fd5e2a41 100644 --- a/src/libs/vtools/tools/vtextgraphicsitem.cpp +++ b/src/libs/vtools/tools/vtextgraphicsitem.cpp @@ -40,7 +40,7 @@ #include #include -#include "../ifc/../vmisc/def.h" +#include "../vmisc/def.h" #include "vtextgraphicsitem.h" class QGraphicsSceneHoverEvent; diff --git a/src/libs/vtools/tools/vtooldetail.cpp b/src/libs/vtools/tools/vtooldetail.cpp index 422a0fb24..4bdba0336 100644 --- a/src/libs/vtools/tools/vtooldetail.cpp +++ b/src/libs/vtools/tools/vtooldetail.cpp @@ -71,11 +71,12 @@ #include "../dialogs/tools/dialogtool.h" #include "../ifc/exception/vexception.h" #include "../ifc/xml/vdomdocument.h" +#include "../ifc/xml/vabstractpattern.h" +#include "../ifc/ifcdef.h" #include "../undocommands/adddet.h" #include "../undocommands/deletedetail.h" #include "../undocommands/movedetail.h" #include "../undocommands/savedetailoptions.h" -#include "../vgeometry/../ifc/ifcdef.h" #include "../vgeometry/varc.h" #include "../vgeometry/vcubicbezier.h" #include "../vgeometry/vcubicbezierpath.h" @@ -89,19 +90,18 @@ #include "../vpatterndb/vdetail.h" #include "../vpatterndb/vpatterninfogeometry.h" #include "../vpatterndb/vpatternpiecedata.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "../vwidgets/vmaingraphicsscene.h" #include "../vwidgets/vmaingraphicsview.h" #include "../vwidgets/vnobrushscalepathitem.h" -#include "tools/../undocommands/../../ifc/xml/vabstractpattern.h" -#include "tools/../undocommands/../tools/vtooldetail.h" -#include "tools/nodeDetails/../vabstracttool.h" -#include "tools/nodeDetails/vabstractnode.h" -#include "tools/nodeDetails/vnodearc.h" -#include "tools/nodeDetails/vnodepoint.h" -#include "tools/nodeDetails/vnodespline.h" -#include "tools/nodeDetails/vnodesplinepath.h" -#include "tools/vtextgraphicsitem.h" +#include "../tools/vtooldetail.h" +#include "vabstracttool.h" +#include "nodeDetails/vabstractnode.h" +#include "nodeDetails/vnodearc.h" +#include "nodeDetails/vnodepoint.h" +#include "nodeDetails/vnodespline.h" +#include "nodeDetails/vnodesplinepath.h" +#include "vtextgraphicsitem.h" #include "vnodedetail.h" class QDomElement; diff --git a/src/libs/vtools/tools/vtooluniondetails.cpp b/src/libs/vtools/tools/vtooluniondetails.cpp index 2dbf6c935..785171f60 100644 --- a/src/libs/vtools/tools/vtooluniondetails.cpp +++ b/src/libs/vtools/tools/vtooluniondetails.cpp @@ -43,28 +43,28 @@ #include #include -#include "../../vgeometry/varc.h" -#include "../../vgeometry/vsplinepath.h" #include "../dialogs/tools/dialoguniondetails.h" #include "../ifc/xml/vabstractconverter.h" #include "../ifc/xml/vdomdocument.h" #include "../ifc/xml/vpatternconverter.h" -#include "../vgeometry/../vmisc/diagnostic.h" +#include "../vgeometry/varc.h" +#include "../vgeometry/vsplinepath.h" #include "../vgeometry/vabstractcubicbezier.h" #include "../vgeometry/vabstractcubicbezierpath.h" #include "../vgeometry/vgeometrydef.h" #include "../vgeometry/vpointf.h" #include "../vgeometry/vspline.h" #include "../vgeometry/vsplinepoint.h" +#include "../vmisc/diagnostic.h" #include "../vmisc/logging.h" #include "../vmisc/vabstractapplication.h" #include "../vpatterndb/vcontainer.h" -#include "tools/../dialogs/tools/dialogtool.h" -#include "tools/nodeDetails/vnodearc.h" -#include "tools/nodeDetails/vnodepoint.h" -#include "tools/nodeDetails/vnodespline.h" -#include "tools/nodeDetails/vnodesplinepath.h" -#include "tools/vdatatool.h" +#include "../dialogs/tools/dialogtool.h" +#include "nodeDetails/vnodearc.h" +#include "nodeDetails/vnodepoint.h" +#include "nodeDetails/vnodespline.h" +#include "nodeDetails/vnodesplinepath.h" +#include "vdatatool.h" #include "vnodedetail.h" #include "vtooldetail.h" diff --git a/src/libs/vtools/tools/vtooluniondetails.h b/src/libs/vtools/tools/vtooluniondetails.h index 00402d121..fae483cda 100644 --- a/src/libs/vtools/tools/vtooluniondetails.h +++ b/src/libs/vtools/tools/vtooluniondetails.h @@ -39,10 +39,9 @@ #include #include -#include "../vgeometry/../ifc/ifcdef.h" -#include "../vlayout/../ifc/xml/vabstractpattern.h" -#include "../vwidgets/../vmisc/def.h" -#include "tools/nodeDetails/../vabstracttool.h" +#include "../ifc/ifcdef.h" +#include "../ifc/xml/vabstractpattern.h" +#include "../vmisc/def.h" #include "vabstracttool.h" #include "vdetail.h" diff --git a/src/libs/vtools/undocommands/adddet.cpp b/src/libs/vtools/undocommands/adddet.cpp index 106be87de..c2b9d4efe 100644 --- a/src/libs/vtools/undocommands/adddet.cpp +++ b/src/libs/vtools/undocommands/adddet.cpp @@ -31,9 +31,9 @@ #include #include -#include "../vlayout/../ifc/xml/vabstractpattern.h" +#include "../ifc/xml/vabstractpattern.h" #include "../vmisc/logging.h" -#include "undocommands/vundocommand.h" +#include "vundocommand.h" class QDomElement; class QUndoCommand; diff --git a/src/libs/vtools/undocommands/adddetnode.cpp b/src/libs/vtools/undocommands/adddetnode.cpp index 5b3b445c9..6349c4731 100644 --- a/src/libs/vtools/undocommands/adddetnode.cpp +++ b/src/libs/vtools/undocommands/adddetnode.cpp @@ -32,8 +32,8 @@ #include #include "../vmisc/logging.h" -#include "undocommands/../../ifc/xml/vabstractpattern.h" -#include "undocommands/vundocommand.h" +#include "../ifc/xml/vabstractpattern.h" +#include "vundocommand.h" class QDomElement; class QUndoCommand; diff --git a/src/libs/vtools/undocommands/addgroup.cpp b/src/libs/vtools/undocommands/addgroup.cpp index cc9a83ee7..97b5405cc 100644 --- a/src/libs/vtools/undocommands/addgroup.cpp +++ b/src/libs/vtools/undocommands/addgroup.cpp @@ -33,10 +33,10 @@ #include "../vmisc/logging.h" #include "../vmisc/vabstractapplication.h" +#include "../vmisc/def.h" #include "../vwidgets/vmaingraphicsview.h" -#include "undocommands/../../ifc/xml/vabstractpattern.h" -#include "undocommands/../../vmisc/def.h" -#include "undocommands/vundocommand.h" +#include "../ifc/xml/vabstractpattern.h" +#include "vundocommand.h" class QDomElement; class QUndoCommand; diff --git a/src/libs/vtools/undocommands/addpatternpiece.cpp b/src/libs/vtools/undocommands/addpatternpiece.cpp index b8b02000c..1e27b917c 100644 --- a/src/libs/vtools/undocommands/addpatternpiece.cpp +++ b/src/libs/vtools/undocommands/addpatternpiece.cpp @@ -30,8 +30,8 @@ #include "../vmisc/def.h" #include "../vmisc/logging.h" -#include "undocommands/../../ifc/xml/vabstractpattern.h" -#include "undocommands/vundocommand.h" +#include "../ifc/xml/vabstractpattern.h" +#include "vundocommand.h" class QDomElement; class QUndoCommand; diff --git a/src/libs/vtools/undocommands/addtocalc.cpp b/src/libs/vtools/undocommands/addtocalc.cpp index 9cb70ce00..85fc3ced2 100644 --- a/src/libs/vtools/undocommands/addtocalc.cpp +++ b/src/libs/vtools/undocommands/addtocalc.cpp @@ -30,12 +30,12 @@ #include -#include "../../vwidgets/vmaingraphicsview.h" +#include "../vwidgets/vmaingraphicsview.h" #include "../ifc/xml/vabstractpattern.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vmisc/logging.h" #include "../vmisc/vabstractapplication.h" -#include "undocommands/vundocommand.h" +#include "vundocommand.h" class QDomElement; class QUndoCommand; diff --git a/src/libs/vtools/undocommands/deletedetail.cpp b/src/libs/vtools/undocommands/deletedetail.cpp index 73f76c0b6..50140d16a 100644 --- a/src/libs/vtools/undocommands/deletedetail.cpp +++ b/src/libs/vtools/undocommands/deletedetail.cpp @@ -32,13 +32,13 @@ #include #include "../tools/vtooldetail.h" -#include "../vgeometry/../ifc/ifcdef.h" -#include "../vlayout/../ifc/xml/vabstractpattern.h" +#include "../ifc/ifcdef.h" +#include "../ifc/xml/vabstractpattern.h" +#include "../ifc/xml/vdomdocument.h" #include "../vmisc/logging.h" -#include "../vwidgets/../vmisc/def.h" -#include "undocommands/../../ifc/xml/vdomdocument.h" -#include "undocommands/../tools/vdatatool.h" -#include "undocommands/vundocommand.h" +#include "../vmisc/def.h" +#include "../tools/vdatatool.h" +#include "vundocommand.h" class QUndoCommand; diff --git a/src/libs/vtools/undocommands/deletepatternpiece.cpp b/src/libs/vtools/undocommands/deletepatternpiece.cpp index 9ac7ad9f5..c0289733c 100644 --- a/src/libs/vtools/undocommands/deletepatternpiece.cpp +++ b/src/libs/vtools/undocommands/deletepatternpiece.cpp @@ -32,8 +32,8 @@ #include #include "../vmisc/logging.h" -#include "undocommands/../../ifc/xml/vabstractpattern.h" -#include "undocommands/vundocommand.h" +#include "../ifc/xml/vabstractpattern.h" +#include "vundocommand.h" class QUndoCommand; diff --git a/src/libs/vtools/undocommands/delgroup.cpp b/src/libs/vtools/undocommands/delgroup.cpp index df2527cf2..d37aca76c 100644 --- a/src/libs/vtools/undocommands/delgroup.cpp +++ b/src/libs/vtools/undocommands/delgroup.cpp @@ -34,10 +34,10 @@ #include "../vmisc/logging.h" #include "../vmisc/vabstractapplication.h" +#include "../vmisc/def.h" #include "../vwidgets/vmaingraphicsview.h" -#include "undocommands/../../ifc/xml/vabstractpattern.h" -#include "undocommands/../../vmisc/def.h" -#include "undocommands/vundocommand.h" +#include "../ifc/xml/vabstractpattern.h" +#include "vundocommand.h" class QUndoCommand; diff --git a/src/libs/vtools/undocommands/deltool.cpp b/src/libs/vtools/undocommands/deltool.cpp index 0bebd4415..1c55e9916 100644 --- a/src/libs/vtools/undocommands/deltool.cpp +++ b/src/libs/vtools/undocommands/deltool.cpp @@ -30,10 +30,10 @@ #include -#include "../vgeometry/../ifc/ifcdef.h" -#include "../vlayout/../ifc/xml/vabstractpattern.h" +#include "../ifc/ifcdef.h" +#include "../ifc/xml/vabstractpattern.h" #include "../vmisc/logging.h" -#include "undocommands/vundocommand.h" +#include "vundocommand.h" class QUndoCommand; diff --git a/src/libs/vtools/undocommands/label/moveabstractlabel.cpp b/src/libs/vtools/undocommands/label/moveabstractlabel.cpp index 76c736e9d..21453384f 100644 --- a/src/libs/vtools/undocommands/label/moveabstractlabel.cpp +++ b/src/libs/vtools/undocommands/label/moveabstractlabel.cpp @@ -33,7 +33,7 @@ #include "../vmisc/logging.h" #include "../vmisc/vabstractapplication.h" #include "../vwidgets/vmaingraphicsview.h" -#include "undocommands/label/../vundocommand.h" +#include "../vundocommand.h" class QUndoCommand; class VAbstractPattern; diff --git a/src/libs/vtools/undocommands/label/movedoublelabel.cpp b/src/libs/vtools/undocommands/label/movedoublelabel.cpp index 3fa4f5681..a782f19df 100644 --- a/src/libs/vtools/undocommands/label/movedoublelabel.cpp +++ b/src/libs/vtools/undocommands/label/movedoublelabel.cpp @@ -31,12 +31,12 @@ #include #include "../ifc/ifcdef.h" +#include "../ifc/xml/vabstractpattern.h" #include "../vmisc/logging.h" #include "../vmisc/vabstractapplication.h" -#include "undocommands/label/../../../ifc/xml/vabstractpattern.h" -#include "undocommands/label/../../../vmisc/def.h" -#include "undocommands/label/../vundocommand.h" -#include "undocommands/label/moveabstractlabel.h" +#include "../vmisc/def.h" +#include "../vundocommand.h" +#include "moveabstractlabel.h" class QUndoCommand; diff --git a/src/libs/vtools/undocommands/label/movelabel.cpp b/src/libs/vtools/undocommands/label/movelabel.cpp index 68ec9796c..ecef0a8bc 100644 --- a/src/libs/vtools/undocommands/label/movelabel.cpp +++ b/src/libs/vtools/undocommands/label/movelabel.cpp @@ -31,12 +31,12 @@ #include #include "../ifc/ifcdef.h" +#include "../ifc/xml/vabstractpattern.h" +#include "../vmisc/def.h" #include "../vmisc/logging.h" #include "../vmisc/vabstractapplication.h" -#include "undocommands/label/../../../ifc/xml/vabstractpattern.h" -#include "undocommands/label/../../../vmisc/def.h" -#include "undocommands/label/../vundocommand.h" -#include "undocommands/label/moveabstractlabel.h" +#include "../vundocommand.h" +#include "moveabstractlabel.h" class QUndoCommand; diff --git a/src/libs/vtools/undocommands/label/rotationmovelabel.cpp b/src/libs/vtools/undocommands/label/rotationmovelabel.cpp index 6b4ae04f0..89b2994e8 100644 --- a/src/libs/vtools/undocommands/label/rotationmovelabel.cpp +++ b/src/libs/vtools/undocommands/label/rotationmovelabel.cpp @@ -33,12 +33,12 @@ #include "../../tools/drawTools/operation/vtoolrotation.h" #include "../ifc/xml/vabstractpattern.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vmisc/logging.h" #include "../vmisc/vabstractapplication.h" -#include "../vwidgets/../vmisc/def.h" -#include "undocommands/label/../vundocommand.h" -#include "undocommands/label/moveabstractlabel.h" +#include "../vmisc/def.h" +#include "../vundocommand.h" +#include "moveabstractlabel.h" class QUndoCommand; diff --git a/src/libs/vtools/undocommands/movedetail.cpp b/src/libs/vtools/undocommands/movedetail.cpp index d955be5e9..f06fd568d 100644 --- a/src/libs/vtools/undocommands/movedetail.cpp +++ b/src/libs/vtools/undocommands/movedetail.cpp @@ -31,12 +31,12 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vmisc/logging.h" #include "../vmisc/vabstractapplication.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "../vwidgets/vmaingraphicsview.h" -#include "undocommands/vundocommand.h" +#include "vundocommand.h" class QDomElement; class QUndoCommand; diff --git a/src/libs/vtools/undocommands/movespline.cpp b/src/libs/vtools/undocommands/movespline.cpp index 523fce7ae..a36dc6467 100644 --- a/src/libs/vtools/undocommands/movespline.cpp +++ b/src/libs/vtools/undocommands/movespline.cpp @@ -30,15 +30,15 @@ #include -#include "../ifc/exception/../ifcdef.h" +#include "../ifc/ifcdef.h" #include "../ifc/xml/vabstractpattern.h" #include "../vmisc/logging.h" #include "../vmisc/vabstractapplication.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "../vwidgets/vmaingraphicsview.h" -#include "undocommands/../../vgeometry/vpointf.h" -#include "undocommands/../../vgeometry/vspline.h" -#include "undocommands/vundocommand.h" +#include "../vgeometry/vpointf.h" +#include "../vgeometry/vspline.h" +#include "vundocommand.h" class QUndoCommand; diff --git a/src/libs/vtools/undocommands/movespline.h b/src/libs/vtools/undocommands/movespline.h index ad12b7c0f..1636da182 100644 --- a/src/libs/vtools/undocommands/movespline.h +++ b/src/libs/vtools/undocommands/movespline.h @@ -35,7 +35,7 @@ #include #include -#include "../../vgeometry/vspline.h" +#include "../vgeometry/vspline.h" #include "vundocommand.h" class QGraphicsScene; diff --git a/src/libs/vtools/undocommands/movesplinepath.cpp b/src/libs/vtools/undocommands/movesplinepath.cpp index b9fab9702..12e9188f8 100644 --- a/src/libs/vtools/undocommands/movesplinepath.cpp +++ b/src/libs/vtools/undocommands/movesplinepath.cpp @@ -34,10 +34,10 @@ #include "../tools/drawTools/toolcurve/vtoolsplinepath.h" #include "../vmisc/logging.h" #include "../vmisc/vabstractapplication.h" -#include "../vwidgets/../vmisc/def.h" +#include "../vmisc/def.h" #include "../vwidgets/vmaingraphicsview.h" -#include "undocommands/../../vgeometry/vsplinepath.h" -#include "undocommands/vundocommand.h" +#include "../vgeometry/vsplinepath.h" +#include "vundocommand.h" class QUndoCommand; diff --git a/src/libs/vtools/undocommands/movesplinepath.h b/src/libs/vtools/undocommands/movesplinepath.h index 23cf42c08..c9198972b 100644 --- a/src/libs/vtools/undocommands/movesplinepath.h +++ b/src/libs/vtools/undocommands/movesplinepath.h @@ -35,7 +35,7 @@ #include #include -#include "../../vgeometry/vsplinepath.h" +#include "../vgeometry/vsplinepath.h" #include "vundocommand.h" class QGraphicsScene; diff --git a/src/libs/vtools/undocommands/movespoint.cpp b/src/libs/vtools/undocommands/movespoint.cpp index cb8f282c4..baf9ceba5 100644 --- a/src/libs/vtools/undocommands/movespoint.cpp +++ b/src/libs/vtools/undocommands/movespoint.cpp @@ -31,11 +31,11 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vmisc/logging.h" #include "../vmisc/vabstractapplication.h" -#include "../vwidgets/../vmisc/def.h" -#include "undocommands/vundocommand.h" +#include "../vmisc/def.h" +#include "vundocommand.h" class QUndoCommand; diff --git a/src/libs/vtools/undocommands/renamepp.cpp b/src/libs/vtools/undocommands/renamepp.cpp index ea94d386f..afc0025d0 100644 --- a/src/libs/vtools/undocommands/renamepp.cpp +++ b/src/libs/vtools/undocommands/renamepp.cpp @@ -33,8 +33,8 @@ #include "../vmisc/def.h" #include "../vmisc/logging.h" -#include "undocommands/../../ifc/xml/vabstractpattern.h" -#include "undocommands/vundocommand.h" +#include "../ifc/xml/vabstractpattern.h" +#include "vundocommand.h" class QUndoCommand; diff --git a/src/libs/vtools/undocommands/savedetailoptions.cpp b/src/libs/vtools/undocommands/savedetailoptions.cpp index a79b8fb92..51fabd490 100644 --- a/src/libs/vtools/undocommands/savedetailoptions.cpp +++ b/src/libs/vtools/undocommands/savedetailoptions.cpp @@ -33,13 +33,13 @@ #include #include "../ifc/xml/vabstractpattern.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vmisc/logging.h" +#include "../vmisc/def.h" #include "../vpatterndb/vpatterninfogeometry.h" #include "../vpatterndb/vpatternpiecedata.h" -#include "../vwidgets/../vmisc/def.h" -#include "undocommands/../tools/vtooldetail.h" -#include "undocommands/vundocommand.h" +#include "../tools/vtooldetail.h" +#include "vundocommand.h" class QDomElement; class QUndoCommand; diff --git a/src/libs/vtools/undocommands/savetooloptions.cpp b/src/libs/vtools/undocommands/savetooloptions.cpp index dc6fecbc9..492de6fc5 100644 --- a/src/libs/vtools/undocommands/savetooloptions.cpp +++ b/src/libs/vtools/undocommands/savetooloptions.cpp @@ -32,8 +32,8 @@ #include "../vmisc/def.h" #include "../vmisc/logging.h" -#include "undocommands/../../ifc/xml/vabstractpattern.h" -#include "undocommands/vundocommand.h" +#include "../ifc/xml/vabstractpattern.h" +#include "vundocommand.h" class QDomElement; class QUndoCommand; diff --git a/src/libs/vtools/undocommands/toggledetailinlayout.cpp b/src/libs/vtools/undocommands/toggledetailinlayout.cpp index 7f1baf2e1..8c71997c7 100644 --- a/src/libs/vtools/undocommands/toggledetailinlayout.cpp +++ b/src/libs/vtools/undocommands/toggledetailinlayout.cpp @@ -33,13 +33,13 @@ #include #include -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" +#include "../ifc/xml/vabstractpattern.h" #include "../vmisc/def.h" #include "../vmisc/logging.h" #include "../vpatterndb/vcontainer.h" -#include "undocommands/../../ifc/xml/vabstractpattern.h" -#include "undocommands/vundocommand.h" -#include "vdetail.h" +#include "../vpatterndb/vdetail.h" +#include "vundocommand.h" class QUndoCommand; diff --git a/src/libs/vtools/undocommands/vundocommand.cpp b/src/libs/vtools/undocommands/vundocommand.cpp index 90a70cbb8..a9b56b076 100644 --- a/src/libs/vtools/undocommands/vundocommand.cpp +++ b/src/libs/vtools/undocommands/vundocommand.cpp @@ -30,9 +30,9 @@ #include -#include "../vgeometry/../ifc/ifcdef.h" -#include "../vwidgets/../vmisc/def.h" -#include "vnodedetail.h" +#include "../ifc/ifcdef.h" +#include "../vmisc/def.h" +#include "../vpatterndb/vnodedetail.h" class QDomElement; class QDomNode; diff --git a/src/libs/vtools/undocommands/vundocommand.h b/src/libs/vtools/undocommands/vundocommand.h index c2b3fa429..95bb04312 100644 --- a/src/libs/vtools/undocommands/vundocommand.h +++ b/src/libs/vtools/undocommands/vundocommand.h @@ -39,9 +39,8 @@ #include #include -#include "../../ifc/xml/vabstractpattern.h" -#include "../../vmisc/logging.h" #include "../ifc/xml/vabstractpattern.h" +#include "../vmisc/logging.h" class QDomElement; class QDomNode; diff --git a/src/libs/vtools/visualization/line/visline.cpp b/src/libs/vtools/visualization/line/visline.cpp index ac1d6c5cd..d9c3f3791 100644 --- a/src/libs/vtools/visualization/line/visline.cpp +++ b/src/libs/vtools/visualization/line/visline.cpp @@ -34,7 +34,7 @@ #include #include -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vgobject.h" #include "../vmisc/vabstractapplication.h" #include "../vpatterndb/vcontainer.h" diff --git a/src/libs/vtools/visualization/line/visline.h b/src/libs/vtools/visualization/line/visline.h index 0253360cd..a604766cc 100644 --- a/src/libs/vtools/visualization/line/visline.h +++ b/src/libs/vtools/visualization/line/visline.h @@ -43,7 +43,7 @@ #include "../visualization.h" #include "../vmisc/def.h" -#include "visualization/line/../../tools/drawTools/../../dialogs/tools/../../visualization/visualization.h" + class QLineF; class QPointF; diff --git a/src/libs/vtools/visualization/line/vistoolalongline.cpp b/src/libs/vtools/visualization/line/vistoolalongline.cpp index fff15c970..7b3e5c3f4 100644 --- a/src/libs/vtools/visualization/line/vistoolalongline.cpp +++ b/src/libs/vtools/visualization/line/vistoolalongline.cpp @@ -36,12 +36,12 @@ #include #include -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" -#include "visualization/line/../visualization.h" -#include "visualization/line/visline.h" +#include "../visualization.h" +#include "visline.h" //--------------------------------------------------------------------------------------------------------------------- VisToolAlongLine::VisToolAlongLine(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/line/vistoolbisector.cpp b/src/libs/vtools/visualization/line/vistoolbisector.cpp index 83beaedce..2a72d7b2b 100644 --- a/src/libs/vtools/visualization/line/vistoolbisector.cpp +++ b/src/libs/vtools/visualization/line/vistoolbisector.cpp @@ -35,12 +35,12 @@ #include #include "../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" -#include "visualization/line/../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/tools/../../visualization/visualization.h" -#include "visualization/line/visline.h" +#include "../visualization.h" +#include "visline.h" //--------------------------------------------------------------------------------------------------------------------- VisToolBisector::VisToolBisector(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/line/vistoolcurveintersectaxis.cpp b/src/libs/vtools/visualization/line/vistoolcurveintersectaxis.cpp index a03868ee7..029149e82 100644 --- a/src/libs/vtools/visualization/line/vistoolcurveintersectaxis.cpp +++ b/src/libs/vtools/visualization/line/vistoolcurveintersectaxis.cpp @@ -39,12 +39,12 @@ #include #include "../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vabstractcurve.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" -#include "visualization/line/../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/tools/../../visualization/visualization.h" -#include "visualization/line/visline.h" +#include "../visualization.h" +#include "visline.h" //--------------------------------------------------------------------------------------------------------------------- VisToolCurveIntersectAxis::VisToolCurveIntersectAxis(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/line/vistoolendline.cpp b/src/libs/vtools/visualization/line/vistoolendline.cpp index ced2182b2..8cbd95ab0 100644 --- a/src/libs/vtools/visualization/line/vistoolendline.cpp +++ b/src/libs/vtools/visualization/line/vistoolendline.cpp @@ -42,8 +42,8 @@ #include "../vmisc/vabstractapplication.h" #include "../vmisc/vcommonsettings.h" #include "../vpatterndb/vcontainer.h" -#include "visualization/line/../../tools/../visualization/visualization.h" -#include "visualization/line/visline.h" +#include "../visualization.h" +#include "visline.h" #include "vtranslatevars.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/visualization/line/vistoolheight.cpp b/src/libs/vtools/visualization/line/vistoolheight.cpp index ad95f9af2..141f0dd5a 100644 --- a/src/libs/vtools/visualization/line/vistoolheight.cpp +++ b/src/libs/vtools/visualization/line/vistoolheight.cpp @@ -36,11 +36,11 @@ #include #include "../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" -#include "visualization/line/../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/tools/../../visualization/visualization.h" -#include "visualization/line/visline.h" +#include "../visualization.h" +#include "visline.h" //--------------------------------------------------------------------------------------------------------------------- VisToolHeight::VisToolHeight(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/line/vistoolline.cpp b/src/libs/vtools/visualization/line/vistoolline.cpp index 600f8664b..0a420e8af 100644 --- a/src/libs/vtools/visualization/line/vistoolline.cpp +++ b/src/libs/vtools/visualization/line/vistoolline.cpp @@ -34,11 +34,11 @@ #include #include -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vpointf.h" #include "../vmisc/vabstractapplication.h" #include "../vpatterndb/vcontainer.h" -#include "visualization/line/../../tools/drawTools/../../dialogs/tools/../../visualization/visualization.h" +#include "../visualization.h" #include "visualization/line/visline.h" class QLineF; diff --git a/src/libs/vtools/visualization/line/vistoollineintersect.cpp b/src/libs/vtools/visualization/line/vistoollineintersect.cpp index 468b999c5..485d23f9b 100644 --- a/src/libs/vtools/visualization/line/vistoollineintersect.cpp +++ b/src/libs/vtools/visualization/line/vistoollineintersect.cpp @@ -35,11 +35,11 @@ #include #include -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" -#include "visualization/line/../visualization.h" -#include "visualization/line/visline.h" +#include "../visualization.h" +#include "visline.h" //--------------------------------------------------------------------------------------------------------------------- VisToolLineIntersect::VisToolLineIntersect(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/line/vistoollineintersectaxis.cpp b/src/libs/vtools/visualization/line/vistoollineintersectaxis.cpp index 5ebeecb60..418fb3c6a 100644 --- a/src/libs/vtools/visualization/line/vistoollineintersectaxis.cpp +++ b/src/libs/vtools/visualization/line/vistoollineintersectaxis.cpp @@ -37,11 +37,11 @@ #include #include "../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" -#include "visualization/line/../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/tools/../../visualization/visualization.h" -#include "visualization/line/visline.h" +#include "../visualization.h" +#include "visline.h" //--------------------------------------------------------------------------------------------------------------------- VisToolLineIntersectAxis::VisToolLineIntersectAxis(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/line/vistoolnormal.cpp b/src/libs/vtools/visualization/line/vistoolnormal.cpp index 74c13bbef..0337ca683 100644 --- a/src/libs/vtools/visualization/line/vistoolnormal.cpp +++ b/src/libs/vtools/visualization/line/vistoolnormal.cpp @@ -37,11 +37,11 @@ #include #include "../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" -#include "visualization/line/../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/tools/../../visualization/visualization.h" -#include "visualization/line/visline.h" +#include "../visualization.h" +#include "visline.h" //--------------------------------------------------------------------------------------------------------------------- VisToolNormal::VisToolNormal(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/line/vistoolpointfromarcandtangent.cpp b/src/libs/vtools/visualization/line/vistoolpointfromarcandtangent.cpp index 86173dd99..b269472f5 100644 --- a/src/libs/vtools/visualization/line/vistoolpointfromarcandtangent.cpp +++ b/src/libs/vtools/visualization/line/vistoolpointfromarcandtangent.cpp @@ -37,14 +37,14 @@ #include #include "../../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vabstractcurve.h" #include "../vgeometry/varc.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" -#include "visualization/line/../../tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/../../visualization/visualization.h" -#include "visualization/line/visline.h" +#include "../visualization.h" +#include "visline.h" class QPointF; diff --git a/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.cpp b/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.cpp index 6ccf09e30..655c3c57b 100644 --- a/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.cpp +++ b/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.cpp @@ -35,12 +35,12 @@ #include #include "../../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" -#include "visualization/line/../../tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/../../visualization/visualization.h" -#include "visualization/line/visline.h" +#include "../visualization.h" +#include "visline.h" class QPointF; diff --git a/src/libs/vtools/visualization/line/vistoolpointofcontact.cpp b/src/libs/vtools/visualization/line/vistoolpointofcontact.cpp index 3f7367009..39d46e927 100644 --- a/src/libs/vtools/visualization/line/vistoolpointofcontact.cpp +++ b/src/libs/vtools/visualization/line/vistoolpointofcontact.cpp @@ -36,11 +36,11 @@ #include #include "../../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" -#include "visualization/line/../../tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/../../visualization/visualization.h" -#include "visualization/line/visline.h" +#include "../visualization.h" +#include "visline.h" //--------------------------------------------------------------------------------------------------------------------- VisToolPointOfContact::VisToolPointOfContact(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/line/vistoolpointofintersection.cpp b/src/libs/vtools/visualization/line/vistoolpointofintersection.cpp index 2e1a142f7..2c3c6afbd 100644 --- a/src/libs/vtools/visualization/line/vistoolpointofintersection.cpp +++ b/src/libs/vtools/visualization/line/vistoolpointofintersection.cpp @@ -36,11 +36,11 @@ #include #include -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" -#include "visualization/line/../visualization.h" -#include "visualization/line/visline.h" +#include "../visualization.h" +#include "visline.h" //--------------------------------------------------------------------------------------------------------------------- VisToolPointOfIntersection::VisToolPointOfIntersection(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.cpp b/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.cpp index 9b090f334..0a830674d 100644 --- a/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.cpp +++ b/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.cpp @@ -38,13 +38,13 @@ #include #include "../../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vabstractcurve.h" #include "../vgeometry/varc.h" #include "../vmisc/vabstractapplication.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "visualization/line/../../tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/../../visualization/visualization.h" +#include "../visualization.h" #include "visualization/line/visline.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp b/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp index 94ba0fa0f..7af20ea96 100644 --- a/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp +++ b/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp @@ -36,13 +36,13 @@ #include #include "../../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vpointf.h" #include "../vmisc/vabstractapplication.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "visualization/line/../../tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/../../visualization/visualization.h" -#include "visualization/line/visline.h" +#include "../visualization.h" +#include "visline.h" //--------------------------------------------------------------------------------------------------------------------- VisToolPointOfIntersectionCircles::VisToolPointOfIntersectionCircles(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/line/vistoolrotation.cpp b/src/libs/vtools/visualization/line/vistoolrotation.cpp index 3c6f15c44..885a58c63 100644 --- a/src/libs/vtools/visualization/line/vistoolrotation.cpp +++ b/src/libs/vtools/visualization/line/vistoolrotation.cpp @@ -39,7 +39,7 @@ #include #include -#include "../vgeometry/../vmisc/diagnostic.h" +#include "../vmisc/diagnostic.h" #include "../vgeometry/vabstractcurve.h" #include "../vgeometry/varc.h" #include "../vgeometry/vcubicbezier.h" @@ -53,8 +53,8 @@ #include "../vmisc/vabstractapplication.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "visualization/line/../visualization.h" -#include "visualization/line/visline.h" +#include "../visualization.h" +#include "visline.h" class QPointF; diff --git a/src/libs/vtools/visualization/line/vistoolrotation.h b/src/libs/vtools/visualization/line/vistoolrotation.h index 4dda5fd95..988fff1a7 100644 --- a/src/libs/vtools/visualization/line/vistoolrotation.h +++ b/src/libs/vtools/visualization/line/vistoolrotation.h @@ -39,7 +39,7 @@ #include #include -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vmisc/def.h" #include "visline.h" diff --git a/src/libs/vtools/visualization/line/vistoolshoulderpoint.cpp b/src/libs/vtools/visualization/line/vistoolshoulderpoint.cpp index b76f52003..352d4574c 100644 --- a/src/libs/vtools/visualization/line/vistoolshoulderpoint.cpp +++ b/src/libs/vtools/visualization/line/vistoolshoulderpoint.cpp @@ -36,12 +36,12 @@ #include #include "../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vgobject.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" -#include "visualization/line/../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/../../../../../dialogs/tools/../../visualization/visualization.h" -#include "visualization/line/visline.h" +#include "../visualization.h" +#include "visline.h" //--------------------------------------------------------------------------------------------------------------------- VisToolShoulderPoint::VisToolShoulderPoint(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/line/vistooltriangle.cpp b/src/libs/vtools/visualization/line/vistooltriangle.cpp index dd365ac65..6eebec560 100644 --- a/src/libs/vtools/visualization/line/vistooltriangle.cpp +++ b/src/libs/vtools/visualization/line/vistooltriangle.cpp @@ -38,12 +38,12 @@ #include #include "../../tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vpointf.h" #include "../vmisc/vabstractapplication.h" #include "../vpatterndb/vcontainer.h" -#include "visualization/line/../../tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/../../visualization/visualization.h" -#include "visualization/line/visline.h" +#include "../visualization.h" +#include "visline.h" class QLineF; diff --git a/src/libs/vtools/visualization/line/vistooltruedarts.cpp b/src/libs/vtools/visualization/line/vistooltruedarts.cpp index 34d192150..e421dd963 100644 --- a/src/libs/vtools/visualization/line/vistooltruedarts.cpp +++ b/src/libs/vtools/visualization/line/vistooltruedarts.cpp @@ -36,11 +36,11 @@ #include #include "../../tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" -#include "visualization/line/../../tools/drawTools/toolpoint/tooldoublepoint/../../../../dialogs/tools/../../visualization/visualization.h" -#include "visualization/line/visline.h" +#include "../visualization.h" +#include "visline.h" //--------------------------------------------------------------------------------------------------------------------- VisToolTrueDarts::VisToolTrueDarts(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/path/vispath.cpp b/src/libs/vtools/visualization/path/vispath.cpp index e257b43c2..ff1bbdabf 100644 --- a/src/libs/vtools/visualization/path/vispath.cpp +++ b/src/libs/vtools/visualization/path/vispath.cpp @@ -30,10 +30,10 @@ #include -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vmisc/vabstractapplication.h" #include "../vpatterndb/vcontainer.h" -#include "visualization/path/../visualization.h" +#include "../visualization.h" //--------------------------------------------------------------------------------------------------------------------- VisPath::VisPath(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/path/vistoolarc.cpp b/src/libs/vtools/visualization/path/vistoolarc.cpp index 69ec97c6e..10588beaf 100644 --- a/src/libs/vtools/visualization/path/vistoolarc.cpp +++ b/src/libs/vtools/visualization/path/vistoolarc.cpp @@ -34,13 +34,13 @@ #include #include -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vabstractcurve.h" #include "../vgeometry/varc.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" -#include "visualization/path/../visualization.h" -#include "visualization/path/vispath.h" +#include "../visualization.h" +#include "vispath.h" //--------------------------------------------------------------------------------------------------------------------- VisToolArc::VisToolArc(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/path/vistoolarcwithlength.cpp b/src/libs/vtools/visualization/path/vistoolarcwithlength.cpp index 16ee5f4b6..bdad14a8a 100644 --- a/src/libs/vtools/visualization/path/vistoolarcwithlength.cpp +++ b/src/libs/vtools/visualization/path/vistoolarcwithlength.cpp @@ -34,13 +34,13 @@ #include #include -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vabstractcurve.h" #include "../vgeometry/varc.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" -#include "visualization/path/../visualization.h" -#include "visualization/path/vispath.h" +#include "../visualization.h" +#include "vispath.h" //--------------------------------------------------------------------------------------------------------------------- VisToolArcWithLength::VisToolArcWithLength(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/path/vistoolcubicbezier.cpp b/src/libs/vtools/visualization/path/vistoolcubicbezier.cpp index 3dfd0da60..99600de23 100644 --- a/src/libs/vtools/visualization/path/vistoolcubicbezier.cpp +++ b/src/libs/vtools/visualization/path/vistoolcubicbezier.cpp @@ -36,13 +36,13 @@ #include #include -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vabstractcurve.h" #include "../vgeometry/vcubicbezier.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" -#include "visualization/path/../visualization.h" -#include "visualization/path/vispath.h" +#include "../visualization.h" +#include "vispath.h" //--------------------------------------------------------------------------------------------------------------------- VisToolCubicBezier::VisToolCubicBezier(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/path/vistoolcubicbezierpath.cpp b/src/libs/vtools/visualization/path/vistoolcubicbezierpath.cpp index 8ce946eee..d56227be1 100644 --- a/src/libs/vtools/visualization/path/vistoolcubicbezierpath.cpp +++ b/src/libs/vtools/visualization/path/vistoolcubicbezierpath.cpp @@ -39,8 +39,8 @@ #include "../vgeometry/vabstractcurve.h" #include "../vgeometry/vpointf.h" #include "../vgeometry/vspline.h" -#include "visualization/path/../visualization.h" -#include "visualization/path/vispath.h" +#include "../visualization.h" +#include "vispath.h" class VContainer; diff --git a/src/libs/vtools/visualization/path/vistoolcutarc.cpp b/src/libs/vtools/visualization/path/vistoolcutarc.cpp index 0eb04c16a..14556e105 100644 --- a/src/libs/vtools/visualization/path/vistoolcutarc.cpp +++ b/src/libs/vtools/visualization/path/vistoolcutarc.cpp @@ -36,12 +36,12 @@ #include #include -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vabstractcurve.h" #include "../vgeometry/varc.h" #include "../vpatterndb/vcontainer.h" -#include "visualization/path/../visualization.h" -#include "visualization/path/vispath.h" +#include "../visualization.h" +#include "vispath.h" //--------------------------------------------------------------------------------------------------------------------- VisToolCutArc::VisToolCutArc(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/path/vistoolcutspline.cpp b/src/libs/vtools/visualization/path/vistoolcutspline.cpp index 0660cdce8..7120ade02 100644 --- a/src/libs/vtools/visualization/path/vistoolcutspline.cpp +++ b/src/libs/vtools/visualization/path/vistoolcutspline.cpp @@ -36,14 +36,14 @@ #include #include -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vabstractcubicbezier.h" #include "../vgeometry/vabstractcurve.h" #include "../vgeometry/vpointf.h" #include "../vgeometry/vspline.h" #include "../vpatterndb/vcontainer.h" -#include "visualization/path/../visualization.h" -#include "visualization/path/vispath.h" +#include "../visualization.h" +#include "vispath.h" //--------------------------------------------------------------------------------------------------------------------- VisToolCutSpline::VisToolCutSpline(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/path/vistoolcutsplinepath.cpp b/src/libs/vtools/visualization/path/vistoolcutsplinepath.cpp index 7d8b7d174..93d68519c 100644 --- a/src/libs/vtools/visualization/path/vistoolcutsplinepath.cpp +++ b/src/libs/vtools/visualization/path/vistoolcutsplinepath.cpp @@ -36,14 +36,14 @@ #include #include "../../tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vabstractcubicbezierpath.h" #include "../vgeometry/vabstractcurve.h" #include "../vgeometry/vpointf.h" #include "../vgeometry/vsplinepath.h" #include "../vpatterndb/vcontainer.h" -#include "visualization/path/../../tools/drawTools/toolpoint/toolsinglepoint/toolcut/../../../toolcurve/../../../visualization/line/../visualization.h" -#include "visualization/path/vispath.h" +#include "../visualization.h" +#include "vispath.h" //--------------------------------------------------------------------------------------------------------------------- VisToolCutSplinePath::VisToolCutSplinePath(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.cpp b/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.cpp index ae0b9baed..bee369c4d 100644 --- a/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.cpp +++ b/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.cpp @@ -36,12 +36,12 @@ #include #include "../../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vabstractcurve.h" #include "../vmisc/vabstractapplication.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "visualization/path/../../tools/drawTools/toolpoint/toolsinglepoint/../../../../dialogs/tools/../../visualization/visualization.h" +#include "../visualization.h" #include "visualization/path/vispath.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/visualization/path/vistoolspline.cpp b/src/libs/vtools/visualization/path/vistoolspline.cpp index d34990ac4..0fdb61045 100644 --- a/src/libs/vtools/visualization/path/vistoolspline.cpp +++ b/src/libs/vtools/visualization/path/vistoolspline.cpp @@ -34,15 +34,15 @@ #include #include -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vabstractcurve.h" #include "../vgeometry/vgeometrydef.h" #include "../vgeometry/vpointf.h" #include "../vgeometry/vspline.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vcontrolpointspline.h" -#include "visualization/path/../visualization.h" -#include "visualization/path/vispath.h" +#include "../visualization.h" +#include "vispath.h" const int EMPTY_ANGLE = -1; diff --git a/src/libs/vtools/visualization/path/vistoolsplinepath.cpp b/src/libs/vtools/visualization/path/vistoolsplinepath.cpp index b9cfc642e..9f060ca27 100644 --- a/src/libs/vtools/visualization/path/vistoolsplinepath.cpp +++ b/src/libs/vtools/visualization/path/vistoolsplinepath.cpp @@ -42,8 +42,8 @@ #include "../vgeometry/vsplinepoint.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vcontrolpointspline.h" -#include "visualization/path/../visualization.h" -#include "visualization/path/vispath.h" +#include "../visualization.h" +#include "vispath.h" //--------------------------------------------------------------------------------------------------------------------- VisToolSplinePath::VisToolSplinePath(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/path/vistoolsplinepath.h b/src/libs/vtools/visualization/path/vistoolsplinepath.h index b0e6a5b91..c5ce2fb48 100644 --- a/src/libs/vtools/visualization/path/vistoolsplinepath.h +++ b/src/libs/vtools/visualization/path/vistoolsplinepath.h @@ -40,7 +40,6 @@ #include "../vgeometry/vsplinepath.h" #include "../vmisc/def.h" -#include "../vwidgets/../vgeometry/vsplinepath.h" #include "vispath.h" class QPointF; diff --git a/src/libs/vtools/visualization/visualization.cpp b/src/libs/vtools/visualization/visualization.cpp index 5b02c6bb0..7c3ace47c 100644 --- a/src/libs/vtools/visualization/visualization.cpp +++ b/src/libs/vtools/visualization/visualization.cpp @@ -46,15 +46,14 @@ #include #include -#include "../../vpatterndb/calculator.h" -#include "../../vpatterndb/vtranslatevars.h" +#include "../vpatterndb/calculator.h" +#include "../vpatterndb/vtranslatevars.h" #include "../qmuparser/qmuparsererror.h" #include "../tools/drawTools/vdrawtool.h" -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vmisc/vcommonsettings.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "visualization/../tools/drawTools/../../dialogs/tools/../../visualization/visualization.h" class QLineF; class QPainterPath; diff --git a/src/libs/vtools/vtools.pro b/src/libs/vtools/vtools.pro index 8f1cf770d..f5c3df237 100644 --- a/src/libs/vtools/vtools.pro +++ b/src/libs/vtools/vtools.pro @@ -72,3 +72,5 @@ CONFIG(release, debug|release){ } } } + +include (../libs.pri) diff --git a/src/libs/vwidgets/vabstractsimple.h b/src/libs/vwidgets/vabstractsimple.h index 8b914bc4f..0caf5e974 100644 --- a/src/libs/vwidgets/vabstractsimple.h +++ b/src/libs/vwidgets/vabstractsimple.h @@ -37,7 +37,6 @@ #include #include -#include "../ifc/../vmisc/def.h" #include "../ifc/ifcdef.h" #include "../vgeometry/vgeometrydef.h" #include "../vmisc/def.h" diff --git a/src/libs/vwidgets/vcontrolpointspline.cpp b/src/libs/vwidgets/vcontrolpointspline.cpp index 2cc1bf98d..e500b8ed4 100644 --- a/src/libs/vwidgets/vcontrolpointspline.cpp +++ b/src/libs/vwidgets/vcontrolpointspline.cpp @@ -43,7 +43,7 @@ #include #include -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vgobject.h" #include "vmaingraphicsscene.h" #include "vmaingraphicsview.h" diff --git a/src/libs/vwidgets/vmaingraphicsscene.h b/src/libs/vwidgets/vmaingraphicsscene.h index c691b10a7..a81172270 100644 --- a/src/libs/vwidgets/vmaingraphicsscene.h +++ b/src/libs/vwidgets/vmaingraphicsscene.h @@ -40,7 +40,6 @@ #include #include -#include "../ifc/../vmisc/def.h" #include "../vmisc/def.h" class QGraphicsItem; diff --git a/src/libs/vwidgets/vmaingraphicsview.cpp b/src/libs/vwidgets/vmaingraphicsview.cpp index 925161f68..30f5dee70 100644 --- a/src/libs/vwidgets/vmaingraphicsview.cpp +++ b/src/libs/vwidgets/vmaingraphicsview.cpp @@ -47,7 +47,7 @@ #include #include -#include "../ifc/../vmisc/def.h" +#include "../vmisc/def.h" #include "vmaingraphicsscene.h" #include "vsimplecurve.h" diff --git a/src/libs/vwidgets/vsimplecurve.cpp b/src/libs/vwidgets/vsimplecurve.cpp index becf53d9b..f8404afd7 100644 --- a/src/libs/vwidgets/vsimplecurve.cpp +++ b/src/libs/vwidgets/vsimplecurve.cpp @@ -40,7 +40,7 @@ #include #include -#include "../vgeometry/../ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #include "../vgeometry/vabstractcurve.h" class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vwidgets/vsimplecurve.h b/src/libs/vwidgets/vsimplecurve.h index 948da6b74..4c5744283 100644 --- a/src/libs/vwidgets/vsimplecurve.h +++ b/src/libs/vwidgets/vsimplecurve.h @@ -40,7 +40,7 @@ #include #include -#include "../ifc/../vmisc/def.h" +#include "../vmisc/def.h" #include "vabstractsimple.h" class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vwidgets/vsimplepoint.h b/src/libs/vwidgets/vsimplepoint.h index 68f3ff40f..b2d4649d4 100644 --- a/src/libs/vwidgets/vsimplepoint.h +++ b/src/libs/vwidgets/vsimplepoint.h @@ -40,7 +40,7 @@ #include #include -#include "../ifc/../vmisc/def.h" +#include "../vmisc/def.h" #include "vabstractsimple.h" class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vwidgets/vwidgets.pro b/src/libs/vwidgets/vwidgets.pro index a63da8cfd..926786dbb 100644 --- a/src/libs/vwidgets/vwidgets.pro +++ b/src/libs/vwidgets/vwidgets.pro @@ -64,3 +64,5 @@ CONFIG(release, debug|release){ } } } + +include (../libs.pri)