Refactoring include for Visual Studio.

--HG-- branch : develop
2024-06-28 15:18:13 +02:00 · 2013-11-06 19:06:00 +02:00 · 2013-11-06 19:06:00 +02:00 · 95b4a34e6c
parent b9a99cd0cf
commit 95b4a34e6c
50 changed files with 69 additions and 69 deletions
--- 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
--- 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 <QDebug>

 DialogHistory::DialogHistory(VContainer *data, VDomDocument *doc, QWidget *parent)
--- 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
 {
--- 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
 {
--- 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())
--- 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
 {
--- a/geometry/vnodedetail.h
+++ b/geometry/vnodedetail.h
@ -23,7 +23,7 @@
 #define VNODEDETAIL_H

 #include <QMetaType>
-#include "options.h"
+#include "../options.h"

 namespace NodeDetail
 {
--- 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");

--- 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
 {
--- 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");
--- a/tools/drawTools/vtoolarc.h
+++ b/tools/drawTools/vtoolarc.h
@ -24,8 +24,8 @@

 #include "vdrawtool.h"
 #include <QGraphicsPathItem>
-#include "dialogs/dialogarc.h"
-#include "widgets/vcontrolpointspline.h"
+#include "../../dialogs/dialogarc.h"
+#include "../../widgets/vcontrolpointspline.h"

 class VToolArc :public VDrawTool, public QGraphicsPathItem
 {
--- 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
 {
--- 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");
--- 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
 {
--- 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
 {
--- 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 <QGraphicsLineItem>
+#include "../../dialogs/dialogline.h"

 class VToolLine: public VDrawTool, public QGraphicsLineItem
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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");
--- a/tools/drawTools/vtoolspline.h
+++ b/tools/drawTools/vtoolspline.h
@ -24,9 +24,9 @@

 #include "vdrawtool.h"
 #include <QGraphicsPathItem>
-#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
 {
--- a/tools/drawTools/vtoolsplinepath.h
+++ b/tools/drawTools/vtoolsplinepath.h
@ -24,8 +24,8 @@

 #include "vdrawtool.h"
 #include <QGraphicsPathItem>
-#include "dialogs/dialogsplinepath.h"
-#include "widgets/vcontrolpointspline.h"
+#include "../../dialogs/dialogsplinepath.h"
+#include "../../widgets/vcontrolpointspline.h"

 class VToolSplinePath:public VDrawTool, public QGraphicsPathItem
 {
--- 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
 {
--- 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");

--- 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
 {
--- 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");
--- a/tools/modelingTools/vmodelingarc.h
+++ b/tools/modelingTools/vmodelingarc.h
@ -24,8 +24,8 @@

 #include "vmodelingtool.h"
 #include <QGraphicsPathItem>
-#include "dialogs/dialogarc.h"
-#include "widgets/vcontrolpointspline.h"
+#include "../../dialogs/dialogarc.h"
+#include "../../widgets/vcontrolpointspline.h"

 class VModelingArc :public VModelingTool, public QGraphicsPathItem
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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 <QGraphicsLineItem>
+#include "../../dialogs/dialogline.h"

 class VModelingLine: public VModelingTool, public QGraphicsLineItem
 {
--- 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
 {
--- 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
 {
--- 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");

--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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");
--- a/tools/modelingTools/vmodelingspline.h
+++ b/tools/modelingTools/vmodelingspline.h
@ -24,9 +24,9 @@

 #include "vmodelingtool.h"
 #include <QGraphicsPathItem>
-#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
 {
--- a/tools/modelingTools/vmodelingsplinepath.h
+++ b/tools/modelingTools/vmodelingsplinepath.h
@ -24,8 +24,8 @@

 #include "vmodelingtool.h"
 #include <QGraphicsPathItem>
-#include "dialogs/dialogsplinepath.h"
-#include "widgets/vcontrolpointspline.h"
+#include "../../dialogs/dialogsplinepath.h"
+#include "../../widgets/vcontrolpointspline.h"

 class VModelingSplinePath:public VModelingTool, public QGraphicsPathItem
 {
--- 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
 {
--- 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
 {
--- a/tools/vtooldetail.h
+++ b/tools/vtooldetail.h
@ -24,7 +24,7 @@

 #include "vabstracttool.h"
 #include <QGraphicsPathItem>
-#include "dialogs/dialogdetail.h"
+#include "../dialogs/dialogdetail.h"

 class VToolDetail: public VAbstractTool, public QGraphicsPathItem
 {
--- 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)
--- a/widgets/vcontrolpointspline.h
+++ b/widgets/vcontrolpointspline.h
@ -24,7 +24,7 @@

 #include <QGraphicsEllipseItem>
 #include <QObject>
-#include "geometry/vsplinepath.h"
+#include "../geometry/vsplinepath.h"

 class VControlPointSpline : public QObject, public QGraphicsEllipseItem
 {