From bc3bc3f99477c3e7d2bbce1f47445ea13b3925ac Mon Sep 17 00:00:00 2001 From: dismine Date: Wed, 6 Nov 2013 17:49:07 +0200 Subject: [PATCH] Refactoring include for Visual Studio. --HG-- branch : develop --- container/vcontainer.cpp | 2 +- dialogs/dialogincrements.cpp | 4 +- dialogs/dialogtool.cpp | 2 +- dialogs/dialogtool.h | 2 +- geometry/varc.cpp | 2 +- geometry/vspline.h | 2 +- geometry/vsplinepath.cpp | 2 +- geometry/vsplinepath.h | 2 +- tools/drawTools/drawTools.pri | 40 ------------------- tools/drawTools/vtoolbisector.cpp | 2 +- tools/drawTools/vtoolendline.cpp | 2 +- tools/drawTools/vtoolnormal.cpp | 2 +- tools/drawTools/vtoolpointofcontact.cpp | 2 +- tools/drawTools/vtoolshoulderpoint.cpp | 2 +- tools/modelingTools/modelingTools.pri | 38 ------------------ tools/modelingTools/vmodelingbisector.cpp | 2 +- tools/modelingTools/vmodelingendline.cpp | 2 +- tools/modelingTools/vmodelingnormal.cpp | 2 +- .../modelingTools/vmodelingpointofcontact.cpp | 2 +- .../modelingTools/vmodelingshoulderpoint.cpp | 2 +- tools/nodeDetails/nodeDetails.pri | 14 ------- tools/vabstracttool.h | 2 +- tools/vdatatool.h | 2 +- xml/vdomdocument.cpp | 26 ++++++------ xml/vdomdocument.h | 6 +-- 25 files changed, 37 insertions(+), 129 deletions(-) delete mode 100644 tools/drawTools/drawTools.pri delete mode 100644 tools/modelingTools/modelingTools.pri delete mode 100644 tools/nodeDetails/nodeDetails.pri diff --git a/container/vcontainer.cpp b/container/vcontainer.cpp index 2a6daca3d..b99b862b8 100644 --- a/container/vcontainer.cpp +++ b/container/vcontainer.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vcontainer.h" -#include +#include "../exception/vexceptionbadid.h" qint64 VContainer::_id = 0; diff --git a/dialogs/dialogincrements.cpp b/dialogs/dialogincrements.cpp index 0dd5e7298..3a499d8f3 100644 --- a/dialogs/dialogincrements.cpp +++ b/dialogs/dialogincrements.cpp @@ -21,8 +21,8 @@ #include "dialogincrements.h" #include "ui_dialogincrements.h" -#include -#include +#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) diff --git a/dialogs/dialogtool.cpp b/dialogs/dialogtool.cpp index 3f3e0133a..beaa36183 100644 --- a/dialogs/dialogtool.cpp +++ b/dialogs/dialogtool.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "dialogtool.h" -#include +#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), diff --git a/dialogs/dialogtool.h b/dialogs/dialogtool.h index 02eea1fad..119eba2e9 100644 --- a/dialogs/dialogtool.h +++ b/dialogs/dialogtool.h @@ -23,7 +23,7 @@ #define DIALOGTOOL_H #include -#include +#include "../container/vcontainer.h" class DialogTool : public QDialog { diff --git a/geometry/varc.cpp b/geometry/varc.cpp index 14528dd22..d7f5ef860 100644 --- a/geometry/varc.cpp +++ b/geometry/varc.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "varc.h" -#include +#include "../exception/vexception.h" VArc::VArc () : f1(0), formulaF1(QString()), f2(0), formulaF2(QString()), radius(0), formulaRadius(QString()), diff --git a/geometry/vspline.h b/geometry/vspline.h index cc85542c0..abbc90121 100644 --- a/geometry/vspline.h +++ b/geometry/vspline.h @@ -22,7 +22,7 @@ #ifndef VSPLINE_H #define VSPLINE_H -#include +#include "../container/vpointf.h" #define M_2PI 6.28318530717958647692528676655900576 diff --git a/geometry/vsplinepath.cpp b/geometry/vsplinepath.cpp index efbeacd20..23c5d45b0 100644 --- a/geometry/vsplinepath.cpp +++ b/geometry/vsplinepath.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vsplinepath.h" -#include +#include "../exception/vexception.h" VSplinePath::VSplinePath() : path(QVector()), kCurve(1), mode(Draw::Calculation), points(QHash()), idObject(0){} diff --git a/geometry/vsplinepath.h b/geometry/vsplinepath.h index 6ac235ec7..94279c109 100644 --- a/geometry/vsplinepath.h +++ b/geometry/vsplinepath.h @@ -23,7 +23,7 @@ #define VSPLINEPATH_H #include "vsplinepoint.h" -#include +#include "../container/vpointf.h" #include "vspline.h" #include diff --git a/tools/drawTools/drawTools.pri b/tools/drawTools/drawTools.pri deleted file mode 100644 index 54cf0341c..000000000 --- a/tools/drawTools/drawTools.pri +++ /dev/null @@ -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 diff --git a/tools/drawTools/vtoolbisector.cpp b/tools/drawTools/vtoolbisector.cpp index 26af32886..7c7795591 100644 --- a/tools/drawTools/vtoolbisector.cpp +++ b/tools/drawTools/vtoolbisector.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vtoolbisector.h" -#include +#include "../../container/calculator.h" const QString VToolBisector::ToolType = QStringLiteral("bisector"); diff --git a/tools/drawTools/vtoolendline.cpp b/tools/drawTools/vtoolendline.cpp index cbd18add4..38e5f0057 100644 --- a/tools/drawTools/vtoolendline.cpp +++ b/tools/drawTools/vtoolendline.cpp @@ -21,7 +21,7 @@ #include "vtoolendline.h" #include "widgets/vmaingraphicsscene.h" -#include +#include "../../container/calculator.h" const QString VToolEndLine::ToolType = QStringLiteral("endLine"); diff --git a/tools/drawTools/vtoolnormal.cpp b/tools/drawTools/vtoolnormal.cpp index 967d7c2c6..69fd7d764 100644 --- a/tools/drawTools/vtoolnormal.cpp +++ b/tools/drawTools/vtoolnormal.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vtoolnormal.h" -#include +#include "../../container/calculator.h" const QString VToolNormal::ToolType = QStringLiteral("normal"); diff --git a/tools/drawTools/vtoolpointofcontact.cpp b/tools/drawTools/vtoolpointofcontact.cpp index 35ee84e7c..885f82775 100644 --- a/tools/drawTools/vtoolpointofcontact.cpp +++ b/tools/drawTools/vtoolpointofcontact.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vtoolpointofcontact.h" -#include +#include "../../container/calculator.h" const QString VToolPointOfContact::ToolType = QStringLiteral("pointOfContact"); diff --git a/tools/drawTools/vtoolshoulderpoint.cpp b/tools/drawTools/vtoolshoulderpoint.cpp index 894a448f1..efc4ff838 100644 --- a/tools/drawTools/vtoolshoulderpoint.cpp +++ b/tools/drawTools/vtoolshoulderpoint.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vtoolshoulderpoint.h" -#include +#include "../../container/calculator.h" const QString VToolShoulderPoint::ToolType = QStringLiteral("shoulder"); diff --git a/tools/modelingTools/modelingTools.pri b/tools/modelingTools/modelingTools.pri deleted file mode 100644 index 165b67fe5..000000000 --- a/tools/modelingTools/modelingTools.pri +++ /dev/null @@ -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 diff --git a/tools/modelingTools/vmodelingbisector.cpp b/tools/modelingTools/vmodelingbisector.cpp index 34870255b..1524260e8 100644 --- a/tools/modelingTools/vmodelingbisector.cpp +++ b/tools/modelingTools/vmodelingbisector.cpp @@ -21,7 +21,7 @@ #include "vmodelingbisector.h" #include "../drawTools/vtoolbisector.h" -#include +#include "../../container/calculator.h" const QString VModelingBisector::ToolType = QStringLiteral("bisector"); diff --git a/tools/modelingTools/vmodelingendline.cpp b/tools/modelingTools/vmodelingendline.cpp index d5d2349d8..db778dbc4 100644 --- a/tools/modelingTools/vmodelingendline.cpp +++ b/tools/modelingTools/vmodelingendline.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vmodelingendline.h" -#include +#include "../../container/calculator.h" const QString VModelingEndLine::ToolType = QStringLiteral("endLine"); diff --git a/tools/modelingTools/vmodelingnormal.cpp b/tools/modelingTools/vmodelingnormal.cpp index 57e0da070..bafd2f52f 100644 --- a/tools/modelingTools/vmodelingnormal.cpp +++ b/tools/modelingTools/vmodelingnormal.cpp @@ -21,7 +21,7 @@ #include "vmodelingnormal.h" #include "../drawTools/vtoolnormal.h" -#include +#include "../../container/calculator.h" const QString VModelingNormal::ToolType = QStringLiteral("normal"); diff --git a/tools/modelingTools/vmodelingpointofcontact.cpp b/tools/modelingTools/vmodelingpointofcontact.cpp index f87a094ad..035aa437d 100644 --- a/tools/modelingTools/vmodelingpointofcontact.cpp +++ b/tools/modelingTools/vmodelingpointofcontact.cpp @@ -21,7 +21,7 @@ #include "vmodelingpointofcontact.h" #include "../drawTools/vtoolpointofcontact.h" -#include +#include "../../container/calculator.h" const QString VModelingPointOfContact::ToolType = QStringLiteral("pointOfContact"); diff --git a/tools/modelingTools/vmodelingshoulderpoint.cpp b/tools/modelingTools/vmodelingshoulderpoint.cpp index ac27b5392..ee5cdd3ec 100644 --- a/tools/modelingTools/vmodelingshoulderpoint.cpp +++ b/tools/modelingTools/vmodelingshoulderpoint.cpp @@ -21,7 +21,7 @@ #include "vmodelingshoulderpoint.h" #include "../drawTools/vtoolshoulderpoint.h" -#include +#include "../../container/calculator.h" const QString VModelingShoulderPoint::ToolType = QStringLiteral("shoulder"); diff --git a/tools/nodeDetails/nodeDetails.pri b/tools/nodeDetails/nodeDetails.pri deleted file mode 100644 index c79444f12..000000000 --- a/tools/nodeDetails/nodeDetails.pri +++ /dev/null @@ -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 diff --git a/tools/vabstracttool.h b/tools/vabstracttool.h index a5a398d56..e917552b1 100644 --- a/tools/vabstracttool.h +++ b/tools/vabstracttool.h @@ -23,7 +23,7 @@ #define VABSTRACTTOOL_H #include "vdatatool.h" -#include +#include "../xml/vdomdocument.h" class VAbstractTool: public VDataTool { diff --git a/tools/vdatatool.h b/tools/vdatatool.h index 9b8dda925..4c9aa6285 100644 --- a/tools/vdatatool.h +++ b/tools/vdatatool.h @@ -22,7 +22,7 @@ #ifndef VDATATOOL_H #define VDATATOOL_H -#include +#include "../container/vcontainer.h" //We need QObject class because we use qobject_cast. class VDataTool : public QObject diff --git a/xml/vdomdocument.cpp b/xml/vdomdocument.cpp index 76c73c831..5fb79c282 100644 --- a/xml/vdomdocument.cpp +++ b/xml/vdomdocument.cpp @@ -20,19 +20,19 @@ ****************************************************************************/ #include "vdomdocument.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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()), nameActivDraw(QString()), data(data), diff --git a/xml/vdomdocument.h b/xml/vdomdocument.h index fbd67550b..6000638b9 100644 --- a/xml/vdomdocument.h +++ b/xml/vdomdocument.h @@ -23,9 +23,9 @@ #define VDOMDOCUMENT_H #include -#include -#include -#include +#include "../container/vcontainer.h" +#include "../widgets/vmaingraphicsscene.h" +#include "../tools/vdatatool.h" #include "vtoolrecord.h" namespace Document