From 95b4a34e6c2684917dda9e2ac3a8cdbb45b2025a Mon Sep 17 00:00:00 2001 From: dismine Date: Wed, 6 Nov 2013 19:06:00 +0200 Subject: [PATCH] Refactoring include for Visual Studio. --HG-- branch : develop --- container/vcontainer.h | 8 ++++---- dialogs/dialoghistory.cpp | 6 +++--- dialogs/dialoghistory.h | 2 +- dialogs/dialogincrements.h | 2 +- dialogs/dialogsplinepath.cpp | 2 +- dialogs/dialogsplinepath.h | 2 +- geometry/vnodedetail.h | 2 +- tools/drawTools/vtoolalongline.cpp | 2 +- tools/drawTools/vtoolalongline.h | 2 +- tools/drawTools/vtoolarc.cpp | 2 +- tools/drawTools/vtoolarc.h | 4 ++-- tools/drawTools/vtoolbisector.h | 2 +- tools/drawTools/vtoolendline.cpp | 2 +- tools/drawTools/vtoolendline.h | 2 +- tools/drawTools/vtoolheight.h | 2 +- tools/drawTools/vtoolline.h | 4 ++-- tools/drawTools/vtoollineintersect.h | 2 +- tools/drawTools/vtoolnormal.h | 2 +- tools/drawTools/vtoolpoint.h | 2 +- tools/drawTools/vtoolpointofcontact.h | 2 +- tools/drawTools/vtoolpointofintersection.h | 2 +- tools/drawTools/vtoolshoulderpoint.h | 2 +- tools/drawTools/vtoolsinglepoint.h | 2 +- tools/drawTools/vtoolspline.cpp | 2 +- tools/drawTools/vtoolspline.h | 6 +++--- tools/drawTools/vtoolsplinepath.h | 4 ++-- tools/drawTools/vtooltriangle.h | 2 +- tools/modelingTools/vmodelingalongline.cpp | 2 +- tools/modelingTools/vmodelingalongline.h | 2 +- tools/modelingTools/vmodelingarc.cpp | 2 +- tools/modelingTools/vmodelingarc.h | 4 ++-- tools/modelingTools/vmodelingbisector.h | 2 +- tools/modelingTools/vmodelingendline.h | 2 +- tools/modelingTools/vmodelingheight.h | 2 +- tools/modelingTools/vmodelingline.h | 4 ++-- tools/modelingTools/vmodelinglineintersect.h | 2 +- tools/modelingTools/vmodelingnormal.h | 2 +- tools/modelingTools/vmodelingpoint.cpp | 2 +- tools/modelingTools/vmodelingpoint.h | 2 +- tools/modelingTools/vmodelingpointofcontact.h | 2 +- tools/modelingTools/vmodelingpointofintersection.h | 2 +- tools/modelingTools/vmodelingshoulderpoint.h | 2 +- tools/modelingTools/vmodelingspline.cpp | 2 +- tools/modelingTools/vmodelingspline.h | 6 +++--- tools/modelingTools/vmodelingsplinepath.h | 4 ++-- tools/modelingTools/vmodelingtriangle.h | 2 +- tools/nodeDetails/vnodepoint.h | 2 +- tools/vtooldetail.h | 2 +- widgets/vapplication.cpp | 10 +++++----- widgets/vcontrolpointspline.h | 2 +- 50 files changed, 69 insertions(+), 69 deletions(-) diff --git a/container/vcontainer.h b/container/vcontainer.h index 5937bb03e..1e33e2f0e 100644 --- a/container/vcontainer.h +++ b/container/vcontainer.h @@ -24,10 +24,10 @@ #include "vstandarttablecell.h" #include "vincrementtablerow.h" -#include "geometry/varc.h" -#include "geometry/vsplinepath.h" -#include "geometry/vdetail.h" -#include "widgets/vitem.h" +#include "../geometry/varc.h" +#include "../geometry/vsplinepath.h" +#include "../geometry/vdetail.h" +#include "../widgets/vitem.h" /** * @brief The VContainer class diff --git a/dialogs/dialoghistory.cpp b/dialogs/dialoghistory.cpp index 8b175b3f5..92849163e 100644 --- a/dialogs/dialoghistory.cpp +++ b/dialogs/dialoghistory.cpp @@ -21,9 +21,9 @@ #include "dialoghistory.h" #include "ui_dialoghistory.h" -#include "geometry/varc.h" -#include "geometry/vspline.h" -#include "geometry/vsplinepath.h" +#include "../geometry/varc.h" +#include "../geometry/vspline.h" +#include "../geometry/vsplinepath.h" #include DialogHistory::DialogHistory(VContainer *data, VDomDocument *doc, QWidget *parent) diff --git a/dialogs/dialoghistory.h b/dialogs/dialoghistory.h index c3b51156c..21c7c4bab 100644 --- a/dialogs/dialoghistory.h +++ b/dialogs/dialoghistory.h @@ -23,7 +23,7 @@ #define DIALOGHISTORY_H #include "dialogtool.h" -#include "xml/vdomdocument.h" +#include "../xml/vdomdocument.h" namespace Ui { diff --git a/dialogs/dialogincrements.h b/dialogs/dialogincrements.h index bc4260052..bb476393b 100644 --- a/dialogs/dialogincrements.h +++ b/dialogs/dialogincrements.h @@ -23,7 +23,7 @@ #define DIALOGINCREMENTS_H #include "dialogtool.h" -#include "xml/vdomdocument.h" +#include "../xml/vdomdocument.h" namespace Ui { diff --git a/dialogs/dialogsplinepath.cpp b/dialogs/dialogsplinepath.cpp index d671ef182..7321f2989 100644 --- a/dialogs/dialogsplinepath.cpp +++ b/dialogs/dialogsplinepath.cpp @@ -21,7 +21,7 @@ #include "dialogsplinepath.h" #include "ui_dialogsplinepath.h" -#include "geometry/vsplinepoint.h" +#include "../geometry/vsplinepoint.h" DialogSplinePath::DialogSplinePath(const VContainer *data, Draw::Draws mode, QWidget *parent) :DialogTool(data, mode, parent), ui(new Ui::DialogSplinePath), path(VSplinePath()) diff --git a/dialogs/dialogsplinepath.h b/dialogs/dialogsplinepath.h index 394e79356..d3ebff753 100644 --- a/dialogs/dialogsplinepath.h +++ b/dialogs/dialogsplinepath.h @@ -23,7 +23,7 @@ #define DIALOGSPLINEPATH_H #include "dialogtool.h" -#include "geometry/vsplinepath.h" +#include "../geometry/vsplinepath.h" namespace Ui { diff --git a/geometry/vnodedetail.h b/geometry/vnodedetail.h index 9735445d4..38a3caced 100644 --- a/geometry/vnodedetail.h +++ b/geometry/vnodedetail.h @@ -23,7 +23,7 @@ #define VNODEDETAIL_H #include -#include "options.h" +#include "../options.h" namespace NodeDetail { diff --git a/tools/drawTools/vtoolalongline.cpp b/tools/drawTools/vtoolalongline.cpp index e95cd586e..c47034ae6 100644 --- a/tools/drawTools/vtoolalongline.cpp +++ b/tools/drawTools/vtoolalongline.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vtoolalongline.h" -#include "container/calculator.h" +#include "../../container/calculator.h" const QString VToolAlongLine::ToolType = QStringLiteral("alongLine"); diff --git a/tools/drawTools/vtoolalongline.h b/tools/drawTools/vtoolalongline.h index 22b0e7996..974e7d29e 100644 --- a/tools/drawTools/vtoolalongline.h +++ b/tools/drawTools/vtoolalongline.h @@ -23,7 +23,7 @@ #define VTOOLALONGLINE_H #include "vtoollinepoint.h" -#include "dialogs/dialogalongline.h" +#include "../../dialogs/dialogalongline.h" class VToolAlongLine : public VToolLinePoint { diff --git a/tools/drawTools/vtoolarc.cpp b/tools/drawTools/vtoolarc.cpp index bda386b36..8c7c146d6 100644 --- a/tools/drawTools/vtoolarc.cpp +++ b/tools/drawTools/vtoolarc.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vtoolarc.h" -#include "container/calculator.h" +#include "../../container/calculator.h" const QString VToolArc::TagName = QStringLiteral("arc"); const QString VToolArc::ToolType = QStringLiteral("simple"); diff --git a/tools/drawTools/vtoolarc.h b/tools/drawTools/vtoolarc.h index 75ea37bfa..a199ad10a 100644 --- a/tools/drawTools/vtoolarc.h +++ b/tools/drawTools/vtoolarc.h @@ -24,8 +24,8 @@ #include "vdrawtool.h" #include -#include "dialogs/dialogarc.h" -#include "widgets/vcontrolpointspline.h" +#include "../../dialogs/dialogarc.h" +#include "../../widgets/vcontrolpointspline.h" class VToolArc :public VDrawTool, public QGraphicsPathItem { diff --git a/tools/drawTools/vtoolbisector.h b/tools/drawTools/vtoolbisector.h index 9f7434538..b072bf052 100644 --- a/tools/drawTools/vtoolbisector.h +++ b/tools/drawTools/vtoolbisector.h @@ -23,7 +23,7 @@ #define VTOOLBISECTOR_H #include "vtoollinepoint.h" -#include "dialogs/dialogbisector.h" +#include "../../dialogs/dialogbisector.h" class VToolBisector : public VToolLinePoint { diff --git a/tools/drawTools/vtoolendline.cpp b/tools/drawTools/vtoolendline.cpp index 38e5f0057..98fc7d4d9 100644 --- a/tools/drawTools/vtoolendline.cpp +++ b/tools/drawTools/vtoolendline.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vtoolendline.h" -#include "widgets/vmaingraphicsscene.h" +#include "../../widgets/vmaingraphicsscene.h" #include "../../container/calculator.h" const QString VToolEndLine::ToolType = QStringLiteral("endLine"); diff --git a/tools/drawTools/vtoolendline.h b/tools/drawTools/vtoolendline.h index 9e7171a7f..d9819a378 100644 --- a/tools/drawTools/vtoolendline.h +++ b/tools/drawTools/vtoolendline.h @@ -23,7 +23,7 @@ #define VTOOLENDLINE_H #include "vtoollinepoint.h" -#include "dialogs/dialogendline.h" +#include "../../dialogs/dialogendline.h" class VToolEndLine : public VToolLinePoint { diff --git a/tools/drawTools/vtoolheight.h b/tools/drawTools/vtoolheight.h index 2dd0145e7..3777d85b0 100644 --- a/tools/drawTools/vtoolheight.h +++ b/tools/drawTools/vtoolheight.h @@ -23,7 +23,7 @@ #define VTOOLHEIGHT_H #include "vtoollinepoint.h" -#include "dialogs/dialogheight.h" +#include "../../dialogs/dialogheight.h" class VToolHeight: public VToolLinePoint { diff --git a/tools/drawTools/vtoolline.h b/tools/drawTools/vtoolline.h index 43469b535..9e9700eed 100644 --- a/tools/drawTools/vtoolline.h +++ b/tools/drawTools/vtoolline.h @@ -23,8 +23,8 @@ #define VTOOLLINE_H #include "vdrawtool.h" -#include "QGraphicsLineItem" -#include "dialogs/dialogline.h" +#include +#include "../../dialogs/dialogline.h" class VToolLine: public VDrawTool, public QGraphicsLineItem { diff --git a/tools/drawTools/vtoollineintersect.h b/tools/drawTools/vtoollineintersect.h index 5d9058dbd..141f123d0 100644 --- a/tools/drawTools/vtoollineintersect.h +++ b/tools/drawTools/vtoollineintersect.h @@ -23,7 +23,7 @@ #define VTOOLLINEINTERSECT_H #include "vtoolpoint.h" -#include "dialogs/dialoglineintersect.h" +#include "../../dialogs/dialoglineintersect.h" class VToolLineIntersect:public VToolPoint { diff --git a/tools/drawTools/vtoolnormal.h b/tools/drawTools/vtoolnormal.h index 2ce571cd7..bf6d0292e 100644 --- a/tools/drawTools/vtoolnormal.h +++ b/tools/drawTools/vtoolnormal.h @@ -23,7 +23,7 @@ #define VTOOLNORMAL_H #include "vtoollinepoint.h" -#include "dialogs/dialognormal.h" +#include "../../dialogs/dialognormal.h" class VToolNormal : public VToolLinePoint { diff --git a/tools/drawTools/vtoolpoint.h b/tools/drawTools/vtoolpoint.h index ae04e6fb7..fedd8dad6 100644 --- a/tools/drawTools/vtoolpoint.h +++ b/tools/drawTools/vtoolpoint.h @@ -23,7 +23,7 @@ #define VTOOLPOINT_H #include "vdrawtool.h" -#include "widgets/vgraphicssimpletextitem.h" +#include "../../widgets/vgraphicssimpletextitem.h" class VToolPoint: public VDrawTool, public QGraphicsEllipseItem { diff --git a/tools/drawTools/vtoolpointofcontact.h b/tools/drawTools/vtoolpointofcontact.h index a5f76f046..ad3854c3a 100644 --- a/tools/drawTools/vtoolpointofcontact.h +++ b/tools/drawTools/vtoolpointofcontact.h @@ -23,7 +23,7 @@ #define VTOOLPOINTOFCONTACT_H #include "vtoolpoint.h" -#include "dialogs/dialogpointofcontact.h" +#include "../../dialogs/dialogpointofcontact.h" class VToolPointOfContact : public VToolPoint { diff --git a/tools/drawTools/vtoolpointofintersection.h b/tools/drawTools/vtoolpointofintersection.h index 45ea6ea70..d7701c979 100644 --- a/tools/drawTools/vtoolpointofintersection.h +++ b/tools/drawTools/vtoolpointofintersection.h @@ -23,7 +23,7 @@ #define VTOOLPOINTOFINTERSECTION_H #include "vtoolpoint.h" -#include "dialogs/dialogpointofintersection.h" +#include "../../dialogs/dialogpointofintersection.h" class VToolPointOfIntersection : public VToolPoint { diff --git a/tools/drawTools/vtoolshoulderpoint.h b/tools/drawTools/vtoolshoulderpoint.h index e557fdbb2..bfb8d3b9f 100644 --- a/tools/drawTools/vtoolshoulderpoint.h +++ b/tools/drawTools/vtoolshoulderpoint.h @@ -23,7 +23,7 @@ #define VTOOLSHOULDERPOINT_H #include "vtoollinepoint.h" -#include "dialogs/dialogshoulderpoint.h" +#include "../../dialogs/dialogshoulderpoint.h" class VToolShoulderPoint : public VToolLinePoint { diff --git a/tools/drawTools/vtoolsinglepoint.h b/tools/drawTools/vtoolsinglepoint.h index 4265f8f83..466d76eef 100644 --- a/tools/drawTools/vtoolsinglepoint.h +++ b/tools/drawTools/vtoolsinglepoint.h @@ -22,8 +22,8 @@ #ifndef VTOOLSINGLEPOINT_H #define VTOOLSINGLEPOINT_H -#include "dialogs/dialogsinglepoint.h" #include "vtoolpoint.h" +#include "../../dialogs/dialogsinglepoint.h" class VToolSinglePoint : public VToolPoint { diff --git a/tools/drawTools/vtoolspline.cpp b/tools/drawTools/vtoolspline.cpp index 0c058806b..df7b0e81c 100644 --- a/tools/drawTools/vtoolspline.cpp +++ b/tools/drawTools/vtoolspline.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vtoolspline.h" -#include "geometry/vspline.h" +#include "../../geometry/vspline.h" const QString VToolSpline::TagName = QStringLiteral("spline"); const QString VToolSpline::ToolType = QStringLiteral("simple"); diff --git a/tools/drawTools/vtoolspline.h b/tools/drawTools/vtoolspline.h index bc5ccb9fa..0b2d5488e 100644 --- a/tools/drawTools/vtoolspline.h +++ b/tools/drawTools/vtoolspline.h @@ -24,9 +24,9 @@ #include "vdrawtool.h" #include -#include "dialogs/dialogspline.h" -#include "widgets/vcontrolpointspline.h" -#include "geometry/vsplinepath.h" +#include "../../dialogs/dialogspline.h" +#include "../../widgets/vcontrolpointspline.h" +#include "../../geometry/vsplinepath.h" class VToolSpline:public VDrawTool, public QGraphicsPathItem { diff --git a/tools/drawTools/vtoolsplinepath.h b/tools/drawTools/vtoolsplinepath.h index a1c3c51be..d495a7240 100644 --- a/tools/drawTools/vtoolsplinepath.h +++ b/tools/drawTools/vtoolsplinepath.h @@ -24,8 +24,8 @@ #include "vdrawtool.h" #include -#include "dialogs/dialogsplinepath.h" -#include "widgets/vcontrolpointspline.h" +#include "../../dialogs/dialogsplinepath.h" +#include "../../widgets/vcontrolpointspline.h" class VToolSplinePath:public VDrawTool, public QGraphicsPathItem { diff --git a/tools/drawTools/vtooltriangle.h b/tools/drawTools/vtooltriangle.h index 349ced7fd..d83aa184c 100644 --- a/tools/drawTools/vtooltriangle.h +++ b/tools/drawTools/vtooltriangle.h @@ -23,7 +23,7 @@ #define VTOOLTRIANGLE_H #include "vtoolpoint.h" -#include "dialogs/dialogtriangle.h" +#include "../../dialogs/dialogtriangle.h" class VToolTriangle : public VToolPoint { diff --git a/tools/modelingTools/vmodelingalongline.cpp b/tools/modelingTools/vmodelingalongline.cpp index eda3d393d..535598a7b 100644 --- a/tools/modelingTools/vmodelingalongline.cpp +++ b/tools/modelingTools/vmodelingalongline.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vmodelingalongline.h" -#include "container/calculator.h" +#include "../../container/calculator.h" const QString VModelingAlongLine::ToolType = QStringLiteral("alongLine"); diff --git a/tools/modelingTools/vmodelingalongline.h b/tools/modelingTools/vmodelingalongline.h index 10806c529..943836b67 100644 --- a/tools/modelingTools/vmodelingalongline.h +++ b/tools/modelingTools/vmodelingalongline.h @@ -23,7 +23,7 @@ #define VMODELINGALONGLINE_H #include "vmodelinglinepoint.h" -#include "dialogs/dialogalongline.h" +#include "../../dialogs/dialogalongline.h" class VModelingAlongLine : public VModelingLinePoint { diff --git a/tools/modelingTools/vmodelingarc.cpp b/tools/modelingTools/vmodelingarc.cpp index 79cd93d05..fe6c8f309 100644 --- a/tools/modelingTools/vmodelingarc.cpp +++ b/tools/modelingTools/vmodelingarc.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vmodelingarc.h" -#include "container/calculator.h" +#include "../../container/calculator.h" const QString VModelingArc::TagName = QStringLiteral("arc"); const QString VModelingArc::ToolType = QStringLiteral("simple"); diff --git a/tools/modelingTools/vmodelingarc.h b/tools/modelingTools/vmodelingarc.h index 5604adf1b..9aba52347 100644 --- a/tools/modelingTools/vmodelingarc.h +++ b/tools/modelingTools/vmodelingarc.h @@ -24,8 +24,8 @@ #include "vmodelingtool.h" #include -#include "dialogs/dialogarc.h" -#include "widgets/vcontrolpointspline.h" +#include "../../dialogs/dialogarc.h" +#include "../../widgets/vcontrolpointspline.h" class VModelingArc :public VModelingTool, public QGraphicsPathItem { diff --git a/tools/modelingTools/vmodelingbisector.h b/tools/modelingTools/vmodelingbisector.h index a80bfdb20..20a422f47 100644 --- a/tools/modelingTools/vmodelingbisector.h +++ b/tools/modelingTools/vmodelingbisector.h @@ -23,7 +23,7 @@ #define VMODELINGBISECTOR_H #include "vmodelinglinepoint.h" -#include "dialogs/dialogbisector.h" +#include "../../dialogs/dialogbisector.h" class VModelingBisector : public VModelingLinePoint { diff --git a/tools/modelingTools/vmodelingendline.h b/tools/modelingTools/vmodelingendline.h index 7142d2b6c..8561048ff 100644 --- a/tools/modelingTools/vmodelingendline.h +++ b/tools/modelingTools/vmodelingendline.h @@ -23,7 +23,7 @@ #define VMODELINGENDLINE_H #include "vmodelinglinepoint.h" -#include "dialogs/dialogendline.h" +#include "../../dialogs/dialogendline.h" class VModelingEndLine : public VModelingLinePoint { diff --git a/tools/modelingTools/vmodelingheight.h b/tools/modelingTools/vmodelingheight.h index 073b7bfae..5dfd82e96 100644 --- a/tools/modelingTools/vmodelingheight.h +++ b/tools/modelingTools/vmodelingheight.h @@ -23,7 +23,7 @@ #define VMODELINGHEIGHT_H #include "vmodelinglinepoint.h" -#include "dialogs/dialogheight.h" +#include "../../dialogs/dialogheight.h" class VModelingHeight : public VModelingLinePoint { diff --git a/tools/modelingTools/vmodelingline.h b/tools/modelingTools/vmodelingline.h index f91380eaa..0149f9be5 100644 --- a/tools/modelingTools/vmodelingline.h +++ b/tools/modelingTools/vmodelingline.h @@ -23,8 +23,8 @@ #define VMODELINGLINE_H #include "vmodelingtool.h" -#include "QGraphicsLineItem" -#include "dialogs/dialogline.h" +#include +#include "../../dialogs/dialogline.h" class VModelingLine: public VModelingTool, public QGraphicsLineItem { diff --git a/tools/modelingTools/vmodelinglineintersect.h b/tools/modelingTools/vmodelinglineintersect.h index f6b1cc3e0..93f2f75c7 100644 --- a/tools/modelingTools/vmodelinglineintersect.h +++ b/tools/modelingTools/vmodelinglineintersect.h @@ -23,7 +23,7 @@ #define VMODELINGLINEINTERSECT_H #include "vmodelingpoint.h" -#include "dialogs/dialoglineintersect.h" +#include "../../dialogs/dialoglineintersect.h" class VModelingLineIntersect:public VModelingPoint { diff --git a/tools/modelingTools/vmodelingnormal.h b/tools/modelingTools/vmodelingnormal.h index 91dcaef62..56a0167ec 100644 --- a/tools/modelingTools/vmodelingnormal.h +++ b/tools/modelingTools/vmodelingnormal.h @@ -23,7 +23,7 @@ #define VMODELINGNORMAL_H #include "vmodelinglinepoint.h" -#include "dialogs/dialognormal.h" +#include "../../dialogs/dialognormal.h" class VModelingNormal : public VModelingLinePoint { diff --git a/tools/modelingTools/vmodelingpoint.cpp b/tools/modelingTools/vmodelingpoint.cpp index 50bb89a03..9c0e225da 100644 --- a/tools/modelingTools/vmodelingpoint.cpp +++ b/tools/modelingTools/vmodelingpoint.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vmodelingpoint.h" -#include "container/vpointf.h" +#include "../../container/vpointf.h" const QString VModelingPoint::TagName = QStringLiteral("point"); diff --git a/tools/modelingTools/vmodelingpoint.h b/tools/modelingTools/vmodelingpoint.h index ff5558185..360db6153 100644 --- a/tools/modelingTools/vmodelingpoint.h +++ b/tools/modelingTools/vmodelingpoint.h @@ -23,7 +23,7 @@ #define VMODELINGPOINT_H #include "vmodelingtool.h" -#include "widgets/vgraphicssimpletextitem.h" +#include "../../widgets/vgraphicssimpletextitem.h" class VModelingPoint: public VModelingTool, public QGraphicsEllipseItem { diff --git a/tools/modelingTools/vmodelingpointofcontact.h b/tools/modelingTools/vmodelingpointofcontact.h index 64418b636..3e23b9c3b 100644 --- a/tools/modelingTools/vmodelingpointofcontact.h +++ b/tools/modelingTools/vmodelingpointofcontact.h @@ -23,7 +23,7 @@ #define VMODELINGPOINTOFCONTACT_H #include "vmodelingpoint.h" -#include "dialogs/dialogpointofcontact.h" +#include "../../dialogs/dialogpointofcontact.h" class VModelingPointOfContact : public VModelingPoint { diff --git a/tools/modelingTools/vmodelingpointofintersection.h b/tools/modelingTools/vmodelingpointofintersection.h index 6890998d5..00740a439 100644 --- a/tools/modelingTools/vmodelingpointofintersection.h +++ b/tools/modelingTools/vmodelingpointofintersection.h @@ -23,7 +23,7 @@ #define VMODELINGPOINTOFINTERSECTION_H #include "vmodelingpoint.h" -#include "dialogs/dialogpointofintersection.h" +#include "../../dialogs/dialogpointofintersection.h" class VModelingPointOfIntersection : public VModelingPoint { diff --git a/tools/modelingTools/vmodelingshoulderpoint.h b/tools/modelingTools/vmodelingshoulderpoint.h index e1d86995e..7795a387b 100644 --- a/tools/modelingTools/vmodelingshoulderpoint.h +++ b/tools/modelingTools/vmodelingshoulderpoint.h @@ -23,7 +23,7 @@ #define VMODELINGSHOULDERPOINT_H #include "vmodelinglinepoint.h" -#include "dialogs/dialogshoulderpoint.h" +#include "../../dialogs/dialogshoulderpoint.h" class VModelingShoulderPoint : public VModelingLinePoint { diff --git a/tools/modelingTools/vmodelingspline.cpp b/tools/modelingTools/vmodelingspline.cpp index 7d3a39e69..cd7fd4823 100644 --- a/tools/modelingTools/vmodelingspline.cpp +++ b/tools/modelingTools/vmodelingspline.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vmodelingspline.h" -#include "geometry/vspline.h" +#include "../../geometry/vspline.h" const QString VModelingSpline::TagName = QStringLiteral("spline"); const QString VModelingSpline::ToolType = QStringLiteral("simple"); diff --git a/tools/modelingTools/vmodelingspline.h b/tools/modelingTools/vmodelingspline.h index 66d1bbd1c..5661f1557 100644 --- a/tools/modelingTools/vmodelingspline.h +++ b/tools/modelingTools/vmodelingspline.h @@ -24,9 +24,9 @@ #include "vmodelingtool.h" #include -#include "dialogs/dialogspline.h" -#include "widgets/vcontrolpointspline.h" -#include "geometry/vsplinepath.h" +#include "../../dialogs/dialogspline.h" +#include "../../widgets/vcontrolpointspline.h" +#include "../../geometry/vsplinepath.h" class VModelingSpline:public VModelingTool, public QGraphicsPathItem { diff --git a/tools/modelingTools/vmodelingsplinepath.h b/tools/modelingTools/vmodelingsplinepath.h index 4071c1c70..3b7551c62 100644 --- a/tools/modelingTools/vmodelingsplinepath.h +++ b/tools/modelingTools/vmodelingsplinepath.h @@ -24,8 +24,8 @@ #include "vmodelingtool.h" #include -#include "dialogs/dialogsplinepath.h" -#include "widgets/vcontrolpointspline.h" +#include "../../dialogs/dialogsplinepath.h" +#include "../../widgets/vcontrolpointspline.h" class VModelingSplinePath:public VModelingTool, public QGraphicsPathItem { diff --git a/tools/modelingTools/vmodelingtriangle.h b/tools/modelingTools/vmodelingtriangle.h index cc1007291..f4573ff74 100644 --- a/tools/modelingTools/vmodelingtriangle.h +++ b/tools/modelingTools/vmodelingtriangle.h @@ -24,7 +24,7 @@ #include "vmodelingpoint.h" #include "../drawTools/vtooltriangle.h" -#include "dialogs/dialogtriangle.h" +#include "../../dialogs/dialogtriangle.h" class VModelingTriangle : public VModelingPoint { diff --git a/tools/nodeDetails/vnodepoint.h b/tools/nodeDetails/vnodepoint.h index e90393e7d..5b2613b19 100644 --- a/tools/nodeDetails/vnodepoint.h +++ b/tools/nodeDetails/vnodepoint.h @@ -23,7 +23,7 @@ #define VNODEPOINT_H #include "vabstractnode.h" -#include "widgets/vgraphicssimpletextitem.h" +#include "../../widgets/vgraphicssimpletextitem.h" class VNodePoint: public VAbstractNode, public QGraphicsEllipseItem { diff --git a/tools/vtooldetail.h b/tools/vtooldetail.h index a5da79b37..f20186b25 100644 --- a/tools/vtooldetail.h +++ b/tools/vtooldetail.h @@ -24,7 +24,7 @@ #include "vabstracttool.h" #include -#include "dialogs/dialogdetail.h" +#include "../dialogs/dialogdetail.h" class VToolDetail: public VAbstractTool, public QGraphicsPathItem { diff --git a/widgets/vapplication.cpp b/widgets/vapplication.cpp index efabe6acb..3b05da39b 100644 --- a/widgets/vapplication.cpp +++ b/widgets/vapplication.cpp @@ -20,11 +20,11 @@ ****************************************************************************/ #include "vapplication.h" -#include "exception/vexceptionobjecterror.h" -#include "exception/vexceptionbadid.h" -#include "exception/vexceptionconversionerror.h" -#include "exception/vexceptionemptyparameter.h" -#include "exception/vexceptionwrongparameterid.h" +#include "../exception/vexceptionobjecterror.h" +#include "../exception/vexceptionbadid.h" +#include "../exception/vexceptionconversionerror.h" +#include "../exception/vexceptionemptyparameter.h" +#include "../exception/vexceptionwrongparameterid.h" // reimplemented from QApplication so we can throw exceptions in slots bool VApplication::notify(QObject *receiver, QEvent *event) diff --git a/widgets/vcontrolpointspline.h b/widgets/vcontrolpointspline.h index 56f51ef93..3d8bf86cb 100644 --- a/widgets/vcontrolpointspline.h +++ b/widgets/vcontrolpointspline.h @@ -24,7 +24,7 @@ #include #include -#include "geometry/vsplinepath.h" +#include "../geometry/vsplinepath.h" class VControlPointSpline : public QObject, public QGraphicsEllipseItem {