Refactoring include for Visual Studio.

--HG-- branch : develop
2024-06-28 15:18:13 +02:00 · 2013-11-06 17:49:07 +02:00 · 2013-11-06 17:49:07 +02:00 · bc3bc3f994
parent 497e4633ff
commit bc3bc3f994
25 changed files with 37 additions and 129 deletions
--- a/container/vcontainer.cpp
+++ b/container/vcontainer.cpp
@ -20,7 +20,7 @@
 ****************************************************************************/

 #include "vcontainer.h"
-#include <exception/vexceptionbadid.h>
+#include "../exception/vexceptionbadid.h"

 qint64 VContainer::_id = 0;

--- a/dialogs/dialogincrements.cpp
+++ b/dialogs/dialogincrements.cpp
@ -21,8 +21,8 @@

 #include "dialogincrements.h"
 #include "ui_dialogincrements.h"
-#include <widgets/doubledelegate.h>
-#include <exception/vexception.h>
+#include "../widgets/doubledelegate.h"
+#include "../exception/vexception.h"

 DialogIncrements::DialogIncrements(VContainer *data, VDomDocument *doc, QWidget *parent)
    :DialogTool(data, Draw::Calculation, parent), ui(new Ui::DialogIncrements), data(data), doc(doc), row(0), column(0)
--- a/dialogs/dialogtool.cpp
+++ b/dialogs/dialogtool.cpp
@ -20,7 +20,7 @@
 ****************************************************************************/

 #include "dialogtool.h"
-#include <container/calculator.h>
+#include "../container/calculator.h"

 DialogTool::DialogTool(const VContainer *data, Draw::Draws mode, QWidget *parent)
    :QDialog(parent), data(data), isInitialized(false), flagName(true), flagFormula(true), timerFormula(0), bOk(0),
--- a/dialogs/dialogtool.h
+++ b/dialogs/dialogtool.h
@ -23,7 +23,7 @@
 #define DIALOGTOOL_H

 #include <QDialog>
-#include <container/vcontainer.h>
+#include "../container/vcontainer.h"

 class DialogTool : public QDialog
 {
--- a/geometry/varc.cpp
+++ b/geometry/varc.cpp
@ -20,7 +20,7 @@
 ****************************************************************************/

 #include "varc.h"
-#include <exception/vexception.h>
+#include "../exception/vexception.h"

 VArc::VArc ()
    : f1(0), formulaF1(QString()), f2(0), formulaF2(QString()), radius(0), formulaRadius(QString()),
--- a/geometry/vspline.h
+++ b/geometry/vspline.h
@ -22,7 +22,7 @@
 #ifndef VSPLINE_H
 #define VSPLINE_H

-#include <container/vpointf.h>
+#include "../container/vpointf.h"

 #define M_2PI   6.28318530717958647692528676655900576

--- a/geometry/vsplinepath.cpp
+++ b/geometry/vsplinepath.cpp
@ -20,7 +20,7 @@
 ****************************************************************************/

 #include "vsplinepath.h"
-#include <exception/vexception.h>
+#include "../exception/vexception.h"

 VSplinePath::VSplinePath()
    : path(QVector<VSplinePoint>()), kCurve(1), mode(Draw::Calculation), points(QHash<qint64, VPointF>()), idObject(0){}
--- a/geometry/vsplinepath.h
+++ b/geometry/vsplinepath.h
@ -23,7 +23,7 @@
 #define VSPLINEPATH_H

 #include "vsplinepoint.h"
-#include <container/vpointf.h>
+#include "../container/vpointf.h"
 #include "vspline.h"
 #include <QApplication>

--- a/tools/drawTools/drawTools.pri
+++ b/tools/drawTools/drawTools.pri
@ -1,40 +0,0 @@
-HEADERS += \
-    tools/drawTools/vtooltriangle.h \
-    tools/drawTools/vtoolsplinepath.h \
-    tools/drawTools/vtoolspline.h \
-    tools/drawTools/vtoolshoulderpoint.h \
-    tools/drawTools/vtoolpointofintersection.h \
-    tools/drawTools/vtoolpointofcontact.h \
-    tools/drawTools/vtoolpoint.h \
-    tools/drawTools/vtoolnormal.h \
-    tools/drawTools/vtoollinepoint.h \
-    tools/drawTools/vtoollineintersect.h \
-    tools/drawTools/vtoolline.h \
-    tools/drawTools/vtoolheight.h \
-    tools/drawTools/vtoolendline.h \
-    tools/drawTools/vtoolbisector.h \
-    tools/drawTools/vtoolarc.h \
-    tools/drawTools/vtoolalongline.h \
-    tools/drawTools/vdrawtool.h \
-    tools/drawTools/drawtools.h \
-    tools/drawTools/vtoolsinglepoint.h
-
-SOURCES += \
-    tools/drawTools/vtooltriangle.cpp \
-    tools/drawTools/vtoolsplinepath.cpp \
-    tools/drawTools/vtoolspline.cpp \
-    tools/drawTools/vtoolshoulderpoint.cpp \
-    tools/drawTools/vtoolpointofintersection.cpp \
-    tools/drawTools/vtoolpointofcontact.cpp \
-    tools/drawTools/vtoolpoint.cpp \
-    tools/drawTools/vtoolnormal.cpp \
-    tools/drawTools/vtoollinepoint.cpp \
-    tools/drawTools/vtoollineintersect.cpp \
-    tools/drawTools/vtoolline.cpp \
-    tools/drawTools/vtoolheight.cpp \
-    tools/drawTools/vtoolendline.cpp \
-    tools/drawTools/vtoolbisector.cpp \
-    tools/drawTools/vtoolarc.cpp \
-    tools/drawTools/vtoolalongline.cpp \
-    tools/drawTools/vdrawtool.cpp \
-    tools/drawTools/vtoolsinglepoint.cpp
--- a/tools/drawTools/vtoolbisector.cpp
+++ b/tools/drawTools/vtoolbisector.cpp
@ -20,7 +20,7 @@
 ****************************************************************************/

 #include "vtoolbisector.h"
-#include <container/calculator.h>
+#include "../../container/calculator.h"

 const QString VToolBisector::ToolType = QStringLiteral("bisector");

--- a/tools/drawTools/vtoolendline.cpp
+++ b/tools/drawTools/vtoolendline.cpp
@ -21,7 +21,7 @@

 #include "vtoolendline.h"
 #include "widgets/vmaingraphicsscene.h"
-#include <container/calculator.h>
+#include "../../container/calculator.h"

 const QString VToolEndLine::ToolType = QStringLiteral("endLine");

--- a/tools/drawTools/vtoolnormal.cpp
+++ b/tools/drawTools/vtoolnormal.cpp
@ -20,7 +20,7 @@
 ****************************************************************************/

 #include "vtoolnormal.h"
-#include <container/calculator.h>
+#include "../../container/calculator.h"

 const QString VToolNormal::ToolType = QStringLiteral("normal");

--- a/tools/drawTools/vtoolpointofcontact.cpp
+++ b/tools/drawTools/vtoolpointofcontact.cpp
@ -20,7 +20,7 @@
 ****************************************************************************/

 #include "vtoolpointofcontact.h"
-#include <container/calculator.h>
+#include "../../container/calculator.h"

 const QString VToolPointOfContact::ToolType = QStringLiteral("pointOfContact");

--- a/tools/drawTools/vtoolshoulderpoint.cpp
+++ b/tools/drawTools/vtoolshoulderpoint.cpp
@ -20,7 +20,7 @@
 ****************************************************************************/

 #include "vtoolshoulderpoint.h"
-#include <container/calculator.h>
+#include "../../container/calculator.h"

 const QString VToolShoulderPoint::ToolType = QStringLiteral("shoulder");

--- a/tools/modelingTools/modelingTools.pri
+++ b/tools/modelingTools/modelingTools.pri
@ -1,38 +0,0 @@
-HEADERS += \
-    tools/modelingTools/vmodelingtriangle.h \
-    tools/modelingTools/vmodelingtool.h \
-    tools/modelingTools/vmodelingsplinepath.h \
-    tools/modelingTools/vmodelingspline.h \
-    tools/modelingTools/vmodelingshoulderpoint.h \
-    tools/modelingTools/vmodelingpointofintersection.h \
-    tools/modelingTools/vmodelingpointofcontact.h \
-    tools/modelingTools/vmodelingpoint.h \
-    tools/modelingTools/vmodelingnormal.h \
-    tools/modelingTools/vmodelinglinepoint.h \
-    tools/modelingTools/vmodelinglineintersect.h \
-    tools/modelingTools/vmodelingline.h \
-    tools/modelingTools/vmodelingheight.h \
-    tools/modelingTools/vmodelingendline.h \
-    tools/modelingTools/vmodelingbisector.h \
-    tools/modelingTools/vmodelingarc.h \
-    tools/modelingTools/vmodelingalongline.h \
-    tools/modelingTools/modelingtools.h
-
-SOURCES += \
-    tools/modelingTools/vmodelingtriangle.cpp \
-    tools/modelingTools/vmodelingtool.cpp \
-    tools/modelingTools/vmodelingsplinepath.cpp \
-    tools/modelingTools/vmodelingspline.cpp \
-    tools/modelingTools/vmodelingshoulderpoint.cpp \
-    tools/modelingTools/vmodelingpointofintersection.cpp \
-    tools/modelingTools/vmodelingpointofcontact.cpp \
-    tools/modelingTools/vmodelingpoint.cpp \
-    tools/modelingTools/vmodelingnormal.cpp \
-    tools/modelingTools/vmodelinglinepoint.cpp \
-    tools/modelingTools/vmodelinglineintersect.cpp \
-    tools/modelingTools/vmodelingline.cpp \
-    tools/modelingTools/vmodelingheight.cpp \
-    tools/modelingTools/vmodelingendline.cpp \
-    tools/modelingTools/vmodelingbisector.cpp \
-    tools/modelingTools/vmodelingarc.cpp \
-    tools/modelingTools/vmodelingalongline.cpp
--- a/tools/modelingTools/vmodelingbisector.cpp
+++ b/tools/modelingTools/vmodelingbisector.cpp
@ -21,7 +21,7 @@

 #include "vmodelingbisector.h"
 #include "../drawTools/vtoolbisector.h"
-#include <container/calculator.h>
+#include "../../container/calculator.h"

 const QString VModelingBisector::ToolType = QStringLiteral("bisector");

--- a/tools/modelingTools/vmodelingendline.cpp
+++ b/tools/modelingTools/vmodelingendline.cpp
@ -20,7 +20,7 @@
 ****************************************************************************/

 #include "vmodelingendline.h"
-#include <container/calculator.h>
+#include "../../container/calculator.h"

 const QString VModelingEndLine::ToolType = QStringLiteral("endLine");

--- a/tools/modelingTools/vmodelingnormal.cpp
+++ b/tools/modelingTools/vmodelingnormal.cpp
@ -21,7 +21,7 @@

 #include "vmodelingnormal.h"
 #include "../drawTools/vtoolnormal.h"
-#include <container/calculator.h>
+#include "../../container/calculator.h"

 const QString VModelingNormal::ToolType = QStringLiteral("normal");

--- a/tools/modelingTools/vmodelingpointofcontact.cpp
+++ b/tools/modelingTools/vmodelingpointofcontact.cpp
@ -21,7 +21,7 @@

 #include "vmodelingpointofcontact.h"
 #include "../drawTools/vtoolpointofcontact.h"
-#include <container/calculator.h>
+#include "../../container/calculator.h"

 const QString VModelingPointOfContact::ToolType = QStringLiteral("pointOfContact");

--- a/tools/modelingTools/vmodelingshoulderpoint.cpp
+++ b/tools/modelingTools/vmodelingshoulderpoint.cpp
@ -21,7 +21,7 @@

 #include "vmodelingshoulderpoint.h"
 #include "../drawTools/vtoolshoulderpoint.h"
-#include <container/calculator.h>
+#include "../../container/calculator.h"

 const QString VModelingShoulderPoint::ToolType = QStringLiteral("shoulder");

--- a/tools/nodeDetails/nodeDetails.pri
+++ b/tools/nodeDetails/nodeDetails.pri
@ -1,14 +0,0 @@
-HEADERS += \
-    tools/nodeDetails/vnodesplinepath.h \
-    tools/nodeDetails/vnodespline.h \
-    tools/nodeDetails/vnodepoint.h \
-    tools/nodeDetails/vnodearc.h \
-    tools/nodeDetails/vabstractnode.h \
-    tools/nodeDetails/nodedetails.h
-
-SOURCES += \
-    tools/nodeDetails/vnodesplinepath.cpp \
-    tools/nodeDetails/vnodespline.cpp \
-    tools/nodeDetails/vnodepoint.cpp \
-    tools/nodeDetails/vnodearc.cpp \
-    tools/nodeDetails/vabstractnode.cpp
--- a/tools/vabstracttool.h
+++ b/tools/vabstracttool.h
@ -23,7 +23,7 @@
 #define VABSTRACTTOOL_H

 #include "vdatatool.h"
-#include <xml/vdomdocument.h>
+#include "../xml/vdomdocument.h"

 class VAbstractTool: public VDataTool
 {
--- a/tools/vdatatool.h
+++ b/tools/vdatatool.h
@ -22,7 +22,7 @@
 #ifndef VDATATOOL_H
 #define VDATATOOL_H

-#include <container/vcontainer.h>
+#include "../container/vcontainer.h"

 //We need QObject class because we use qobject_cast.
 class VDataTool : public QObject
--- a/xml/vdomdocument.cpp
+++ b/xml/vdomdocument.cpp
@ -20,19 +20,19 @@
 ****************************************************************************/

 #include "vdomdocument.h"
-#include <exception/vexceptionwrongparameterid.h>
-#include <exception/vexceptionconversionerror.h>
-#include <exception/vexceptionemptyparameter.h>
-#include <exception/vexceptionuniqueid.h>
-#include <tools/vtooldetail.h>
-#include <exception/vexceptionobjecterror.h>
-#include <exception/vexceptionbadid.h>
-#include <tools/drawTools/drawtools.h>
-#include <tools/modelingTools/modelingtools.h>
-#include <tools/nodeDetails/vnodepoint.h>
-#include <tools/nodeDetails/vnodespline.h>
-#include <tools/nodeDetails/vnodesplinepath.h>
-#include <tools/nodeDetails/vnodearc.h>
+#include "../exception/vexceptionwrongparameterid.h"
+#include "../exception/vexceptionconversionerror.h"
+#include "../exception/vexceptionemptyparameter.h"
+#include "../exception/vexceptionuniqueid.h"
+#include "../tools/vtooldetail.h"
+#include "../exception/vexceptionobjecterror.h"
+#include "../exception/vexceptionbadid.h"
+#include "../tools/drawTools/drawtools.h"
+#include "../tools/modelingTools/modelingtools.h"
+#include "../tools/nodeDetails/vnodepoint.h"
+#include "../tools/nodeDetails/vnodespline.h"
+#include "../tools/nodeDetails/vnodesplinepath.h"
+#include "../tools/nodeDetails/vnodearc.h"

 VDomDocument::VDomDocument(VContainer *data, QComboBox *comboBoxDraws, Draw::Draws *mode)
    : QDomDocument(), map(QHash<QString, QDomElement>()), nameActivDraw(QString()), data(data),
--- a/xml/vdomdocument.h
+++ b/xml/vdomdocument.h
@ -23,9 +23,9 @@
 #define VDOMDOCUMENT_H

 #include <QDomDocument>
-#include <container/vcontainer.h>
-#include <widgets/vmaingraphicsscene.h>
-#include <tools/vdatatool.h>
+#include "../container/vcontainer.h"
+#include "../widgets/vmaingraphicsscene.h"
+#include "../tools/vdatatool.h"
 #include "vtoolrecord.h"

 namespace Document