Refactoring include for Visual Studio.

--HG--
branch : develop
This commit is contained in:
dismine 2013-11-06 19:06:00 +02:00
parent b9a99cd0cf
commit 95b4a34e6c
50 changed files with 69 additions and 69 deletions

View File

@ -24,10 +24,10 @@
#include "vstandarttablecell.h" #include "vstandarttablecell.h"
#include "vincrementtablerow.h" #include "vincrementtablerow.h"
#include "geometry/varc.h" #include "../geometry/varc.h"
#include "geometry/vsplinepath.h" #include "../geometry/vsplinepath.h"
#include "geometry/vdetail.h" #include "../geometry/vdetail.h"
#include "widgets/vitem.h" #include "../widgets/vitem.h"
/** /**
* @brief The VContainer class * @brief The VContainer class

View File

@ -21,9 +21,9 @@
#include "dialoghistory.h" #include "dialoghistory.h"
#include "ui_dialoghistory.h" #include "ui_dialoghistory.h"
#include "geometry/varc.h" #include "../geometry/varc.h"
#include "geometry/vspline.h" #include "../geometry/vspline.h"
#include "geometry/vsplinepath.h" #include "../geometry/vsplinepath.h"
#include <QDebug> #include <QDebug>
DialogHistory::DialogHistory(VContainer *data, VDomDocument *doc, QWidget *parent) DialogHistory::DialogHistory(VContainer *data, VDomDocument *doc, QWidget *parent)

View File

@ -23,7 +23,7 @@
#define DIALOGHISTORY_H #define DIALOGHISTORY_H
#include "dialogtool.h" #include "dialogtool.h"
#include "xml/vdomdocument.h" #include "../xml/vdomdocument.h"
namespace Ui namespace Ui
{ {

View File

@ -23,7 +23,7 @@
#define DIALOGINCREMENTS_H #define DIALOGINCREMENTS_H
#include "dialogtool.h" #include "dialogtool.h"
#include "xml/vdomdocument.h" #include "../xml/vdomdocument.h"
namespace Ui namespace Ui
{ {

View File

@ -21,7 +21,7 @@
#include "dialogsplinepath.h" #include "dialogsplinepath.h"
#include "ui_dialogsplinepath.h" #include "ui_dialogsplinepath.h"
#include "geometry/vsplinepoint.h" #include "../geometry/vsplinepoint.h"
DialogSplinePath::DialogSplinePath(const VContainer *data, Draw::Draws mode, QWidget *parent) DialogSplinePath::DialogSplinePath(const VContainer *data, Draw::Draws mode, QWidget *parent)
:DialogTool(data, mode, parent), ui(new Ui::DialogSplinePath), path(VSplinePath()) :DialogTool(data, mode, parent), ui(new Ui::DialogSplinePath), path(VSplinePath())

View File

@ -23,7 +23,7 @@
#define DIALOGSPLINEPATH_H #define DIALOGSPLINEPATH_H
#include "dialogtool.h" #include "dialogtool.h"
#include "geometry/vsplinepath.h" #include "../geometry/vsplinepath.h"
namespace Ui namespace Ui
{ {

View File

@ -23,7 +23,7 @@
#define VNODEDETAIL_H #define VNODEDETAIL_H
#include <QMetaType> #include <QMetaType>
#include "options.h" #include "../options.h"
namespace NodeDetail namespace NodeDetail
{ {

View File

@ -20,7 +20,7 @@
****************************************************************************/ ****************************************************************************/
#include "vtoolalongline.h" #include "vtoolalongline.h"
#include "container/calculator.h" #include "../../container/calculator.h"
const QString VToolAlongLine::ToolType = QStringLiteral("alongLine"); const QString VToolAlongLine::ToolType = QStringLiteral("alongLine");

View File

@ -23,7 +23,7 @@
#define VTOOLALONGLINE_H #define VTOOLALONGLINE_H
#include "vtoollinepoint.h" #include "vtoollinepoint.h"
#include "dialogs/dialogalongline.h" #include "../../dialogs/dialogalongline.h"
class VToolAlongLine : public VToolLinePoint class VToolAlongLine : public VToolLinePoint
{ {

View File

@ -20,7 +20,7 @@
****************************************************************************/ ****************************************************************************/
#include "vtoolarc.h" #include "vtoolarc.h"
#include "container/calculator.h" #include "../../container/calculator.h"
const QString VToolArc::TagName = QStringLiteral("arc"); const QString VToolArc::TagName = QStringLiteral("arc");
const QString VToolArc::ToolType = QStringLiteral("simple"); const QString VToolArc::ToolType = QStringLiteral("simple");

View File

@ -24,8 +24,8 @@
#include "vdrawtool.h" #include "vdrawtool.h"
#include <QGraphicsPathItem> #include <QGraphicsPathItem>
#include "dialogs/dialogarc.h" #include "../../dialogs/dialogarc.h"
#include "widgets/vcontrolpointspline.h" #include "../../widgets/vcontrolpointspline.h"
class VToolArc :public VDrawTool, public QGraphicsPathItem class VToolArc :public VDrawTool, public QGraphicsPathItem
{ {

View File

@ -23,7 +23,7 @@
#define VTOOLBISECTOR_H #define VTOOLBISECTOR_H
#include "vtoollinepoint.h" #include "vtoollinepoint.h"
#include "dialogs/dialogbisector.h" #include "../../dialogs/dialogbisector.h"
class VToolBisector : public VToolLinePoint class VToolBisector : public VToolLinePoint
{ {

View File

@ -20,7 +20,7 @@
****************************************************************************/ ****************************************************************************/
#include "vtoolendline.h" #include "vtoolendline.h"
#include "widgets/vmaingraphicsscene.h" #include "../../widgets/vmaingraphicsscene.h"
#include "../../container/calculator.h" #include "../../container/calculator.h"
const QString VToolEndLine::ToolType = QStringLiteral("endLine"); const QString VToolEndLine::ToolType = QStringLiteral("endLine");

View File

@ -23,7 +23,7 @@
#define VTOOLENDLINE_H #define VTOOLENDLINE_H
#include "vtoollinepoint.h" #include "vtoollinepoint.h"
#include "dialogs/dialogendline.h" #include "../../dialogs/dialogendline.h"
class VToolEndLine : public VToolLinePoint class VToolEndLine : public VToolLinePoint
{ {

View File

@ -23,7 +23,7 @@
#define VTOOLHEIGHT_H #define VTOOLHEIGHT_H
#include "vtoollinepoint.h" #include "vtoollinepoint.h"
#include "dialogs/dialogheight.h" #include "../../dialogs/dialogheight.h"
class VToolHeight: public VToolLinePoint class VToolHeight: public VToolLinePoint
{ {

View File

@ -23,8 +23,8 @@
#define VTOOLLINE_H #define VTOOLLINE_H
#include "vdrawtool.h" #include "vdrawtool.h"
#include "QGraphicsLineItem" #include <QGraphicsLineItem>
#include "dialogs/dialogline.h" #include "../../dialogs/dialogline.h"
class VToolLine: public VDrawTool, public QGraphicsLineItem class VToolLine: public VDrawTool, public QGraphicsLineItem
{ {

View File

@ -23,7 +23,7 @@
#define VTOOLLINEINTERSECT_H #define VTOOLLINEINTERSECT_H
#include "vtoolpoint.h" #include "vtoolpoint.h"
#include "dialogs/dialoglineintersect.h" #include "../../dialogs/dialoglineintersect.h"
class VToolLineIntersect:public VToolPoint class VToolLineIntersect:public VToolPoint
{ {

View File

@ -23,7 +23,7 @@
#define VTOOLNORMAL_H #define VTOOLNORMAL_H
#include "vtoollinepoint.h" #include "vtoollinepoint.h"
#include "dialogs/dialognormal.h" #include "../../dialogs/dialognormal.h"
class VToolNormal : public VToolLinePoint class VToolNormal : public VToolLinePoint
{ {

View File

@ -23,7 +23,7 @@
#define VTOOLPOINT_H #define VTOOLPOINT_H
#include "vdrawtool.h" #include "vdrawtool.h"
#include "widgets/vgraphicssimpletextitem.h" #include "../../widgets/vgraphicssimpletextitem.h"
class VToolPoint: public VDrawTool, public QGraphicsEllipseItem class VToolPoint: public VDrawTool, public QGraphicsEllipseItem
{ {

View File

@ -23,7 +23,7 @@
#define VTOOLPOINTOFCONTACT_H #define VTOOLPOINTOFCONTACT_H
#include "vtoolpoint.h" #include "vtoolpoint.h"
#include "dialogs/dialogpointofcontact.h" #include "../../dialogs/dialogpointofcontact.h"
class VToolPointOfContact : public VToolPoint class VToolPointOfContact : public VToolPoint
{ {

View File

@ -23,7 +23,7 @@
#define VTOOLPOINTOFINTERSECTION_H #define VTOOLPOINTOFINTERSECTION_H
#include "vtoolpoint.h" #include "vtoolpoint.h"
#include "dialogs/dialogpointofintersection.h" #include "../../dialogs/dialogpointofintersection.h"
class VToolPointOfIntersection : public VToolPoint class VToolPointOfIntersection : public VToolPoint
{ {

View File

@ -23,7 +23,7 @@
#define VTOOLSHOULDERPOINT_H #define VTOOLSHOULDERPOINT_H
#include "vtoollinepoint.h" #include "vtoollinepoint.h"
#include "dialogs/dialogshoulderpoint.h" #include "../../dialogs/dialogshoulderpoint.h"
class VToolShoulderPoint : public VToolLinePoint class VToolShoulderPoint : public VToolLinePoint
{ {

View File

@ -22,8 +22,8 @@
#ifndef VTOOLSINGLEPOINT_H #ifndef VTOOLSINGLEPOINT_H
#define VTOOLSINGLEPOINT_H #define VTOOLSINGLEPOINT_H
#include "dialogs/dialogsinglepoint.h"
#include "vtoolpoint.h" #include "vtoolpoint.h"
#include "../../dialogs/dialogsinglepoint.h"
class VToolSinglePoint : public VToolPoint class VToolSinglePoint : public VToolPoint
{ {

View File

@ -20,7 +20,7 @@
****************************************************************************/ ****************************************************************************/
#include "vtoolspline.h" #include "vtoolspline.h"
#include "geometry/vspline.h" #include "../../geometry/vspline.h"
const QString VToolSpline::TagName = QStringLiteral("spline"); const QString VToolSpline::TagName = QStringLiteral("spline");
const QString VToolSpline::ToolType = QStringLiteral("simple"); const QString VToolSpline::ToolType = QStringLiteral("simple");

View File

@ -24,9 +24,9 @@
#include "vdrawtool.h" #include "vdrawtool.h"
#include <QGraphicsPathItem> #include <QGraphicsPathItem>
#include "dialogs/dialogspline.h" #include "../../dialogs/dialogspline.h"
#include "widgets/vcontrolpointspline.h" #include "../../widgets/vcontrolpointspline.h"
#include "geometry/vsplinepath.h" #include "../../geometry/vsplinepath.h"
class VToolSpline:public VDrawTool, public QGraphicsPathItem class VToolSpline:public VDrawTool, public QGraphicsPathItem
{ {

View File

@ -24,8 +24,8 @@
#include "vdrawtool.h" #include "vdrawtool.h"
#include <QGraphicsPathItem> #include <QGraphicsPathItem>
#include "dialogs/dialogsplinepath.h" #include "../../dialogs/dialogsplinepath.h"
#include "widgets/vcontrolpointspline.h" #include "../../widgets/vcontrolpointspline.h"
class VToolSplinePath:public VDrawTool, public QGraphicsPathItem class VToolSplinePath:public VDrawTool, public QGraphicsPathItem
{ {

View File

@ -23,7 +23,7 @@
#define VTOOLTRIANGLE_H #define VTOOLTRIANGLE_H
#include "vtoolpoint.h" #include "vtoolpoint.h"
#include "dialogs/dialogtriangle.h" #include "../../dialogs/dialogtriangle.h"
class VToolTriangle : public VToolPoint class VToolTriangle : public VToolPoint
{ {

View File

@ -20,7 +20,7 @@
****************************************************************************/ ****************************************************************************/
#include "vmodelingalongline.h" #include "vmodelingalongline.h"
#include "container/calculator.h" #include "../../container/calculator.h"
const QString VModelingAlongLine::ToolType = QStringLiteral("alongLine"); const QString VModelingAlongLine::ToolType = QStringLiteral("alongLine");

View File

@ -23,7 +23,7 @@
#define VMODELINGALONGLINE_H #define VMODELINGALONGLINE_H
#include "vmodelinglinepoint.h" #include "vmodelinglinepoint.h"
#include "dialogs/dialogalongline.h" #include "../../dialogs/dialogalongline.h"
class VModelingAlongLine : public VModelingLinePoint class VModelingAlongLine : public VModelingLinePoint
{ {

View File

@ -20,7 +20,7 @@
****************************************************************************/ ****************************************************************************/
#include "vmodelingarc.h" #include "vmodelingarc.h"
#include "container/calculator.h" #include "../../container/calculator.h"
const QString VModelingArc::TagName = QStringLiteral("arc"); const QString VModelingArc::TagName = QStringLiteral("arc");
const QString VModelingArc::ToolType = QStringLiteral("simple"); const QString VModelingArc::ToolType = QStringLiteral("simple");

View File

@ -24,8 +24,8 @@
#include "vmodelingtool.h" #include "vmodelingtool.h"
#include <QGraphicsPathItem> #include <QGraphicsPathItem>
#include "dialogs/dialogarc.h" #include "../../dialogs/dialogarc.h"
#include "widgets/vcontrolpointspline.h" #include "../../widgets/vcontrolpointspline.h"
class VModelingArc :public VModelingTool, public QGraphicsPathItem class VModelingArc :public VModelingTool, public QGraphicsPathItem
{ {

View File

@ -23,7 +23,7 @@
#define VMODELINGBISECTOR_H #define VMODELINGBISECTOR_H
#include "vmodelinglinepoint.h" #include "vmodelinglinepoint.h"
#include "dialogs/dialogbisector.h" #include "../../dialogs/dialogbisector.h"
class VModelingBisector : public VModelingLinePoint class VModelingBisector : public VModelingLinePoint
{ {

View File

@ -23,7 +23,7 @@
#define VMODELINGENDLINE_H #define VMODELINGENDLINE_H
#include "vmodelinglinepoint.h" #include "vmodelinglinepoint.h"
#include "dialogs/dialogendline.h" #include "../../dialogs/dialogendline.h"
class VModelingEndLine : public VModelingLinePoint class VModelingEndLine : public VModelingLinePoint
{ {

View File

@ -23,7 +23,7 @@
#define VMODELINGHEIGHT_H #define VMODELINGHEIGHT_H
#include "vmodelinglinepoint.h" #include "vmodelinglinepoint.h"
#include "dialogs/dialogheight.h" #include "../../dialogs/dialogheight.h"
class VModelingHeight : public VModelingLinePoint class VModelingHeight : public VModelingLinePoint
{ {

View File

@ -23,8 +23,8 @@
#define VMODELINGLINE_H #define VMODELINGLINE_H
#include "vmodelingtool.h" #include "vmodelingtool.h"
#include "QGraphicsLineItem" #include <QGraphicsLineItem>
#include "dialogs/dialogline.h" #include "../../dialogs/dialogline.h"
class VModelingLine: public VModelingTool, public QGraphicsLineItem class VModelingLine: public VModelingTool, public QGraphicsLineItem
{ {

View File

@ -23,7 +23,7 @@
#define VMODELINGLINEINTERSECT_H #define VMODELINGLINEINTERSECT_H
#include "vmodelingpoint.h" #include "vmodelingpoint.h"
#include "dialogs/dialoglineintersect.h" #include "../../dialogs/dialoglineintersect.h"
class VModelingLineIntersect:public VModelingPoint class VModelingLineIntersect:public VModelingPoint
{ {

View File

@ -23,7 +23,7 @@
#define VMODELINGNORMAL_H #define VMODELINGNORMAL_H
#include "vmodelinglinepoint.h" #include "vmodelinglinepoint.h"
#include "dialogs/dialognormal.h" #include "../../dialogs/dialognormal.h"
class VModelingNormal : public VModelingLinePoint class VModelingNormal : public VModelingLinePoint
{ {

View File

@ -20,7 +20,7 @@
****************************************************************************/ ****************************************************************************/
#include "vmodelingpoint.h" #include "vmodelingpoint.h"
#include "container/vpointf.h" #include "../../container/vpointf.h"
const QString VModelingPoint::TagName = QStringLiteral("point"); const QString VModelingPoint::TagName = QStringLiteral("point");

View File

@ -23,7 +23,7 @@
#define VMODELINGPOINT_H #define VMODELINGPOINT_H
#include "vmodelingtool.h" #include "vmodelingtool.h"
#include "widgets/vgraphicssimpletextitem.h" #include "../../widgets/vgraphicssimpletextitem.h"
class VModelingPoint: public VModelingTool, public QGraphicsEllipseItem class VModelingPoint: public VModelingTool, public QGraphicsEllipseItem
{ {

View File

@ -23,7 +23,7 @@
#define VMODELINGPOINTOFCONTACT_H #define VMODELINGPOINTOFCONTACT_H
#include "vmodelingpoint.h" #include "vmodelingpoint.h"
#include "dialogs/dialogpointofcontact.h" #include "../../dialogs/dialogpointofcontact.h"
class VModelingPointOfContact : public VModelingPoint class VModelingPointOfContact : public VModelingPoint
{ {

View File

@ -23,7 +23,7 @@
#define VMODELINGPOINTOFINTERSECTION_H #define VMODELINGPOINTOFINTERSECTION_H
#include "vmodelingpoint.h" #include "vmodelingpoint.h"
#include "dialogs/dialogpointofintersection.h" #include "../../dialogs/dialogpointofintersection.h"
class VModelingPointOfIntersection : public VModelingPoint class VModelingPointOfIntersection : public VModelingPoint
{ {

View File

@ -23,7 +23,7 @@
#define VMODELINGSHOULDERPOINT_H #define VMODELINGSHOULDERPOINT_H
#include "vmodelinglinepoint.h" #include "vmodelinglinepoint.h"
#include "dialogs/dialogshoulderpoint.h" #include "../../dialogs/dialogshoulderpoint.h"
class VModelingShoulderPoint : public VModelingLinePoint class VModelingShoulderPoint : public VModelingLinePoint
{ {

View File

@ -20,7 +20,7 @@
****************************************************************************/ ****************************************************************************/
#include "vmodelingspline.h" #include "vmodelingspline.h"
#include "geometry/vspline.h" #include "../../geometry/vspline.h"
const QString VModelingSpline::TagName = QStringLiteral("spline"); const QString VModelingSpline::TagName = QStringLiteral("spline");
const QString VModelingSpline::ToolType = QStringLiteral("simple"); const QString VModelingSpline::ToolType = QStringLiteral("simple");

View File

@ -24,9 +24,9 @@
#include "vmodelingtool.h" #include "vmodelingtool.h"
#include <QGraphicsPathItem> #include <QGraphicsPathItem>
#include "dialogs/dialogspline.h" #include "../../dialogs/dialogspline.h"
#include "widgets/vcontrolpointspline.h" #include "../../widgets/vcontrolpointspline.h"
#include "geometry/vsplinepath.h" #include "../../geometry/vsplinepath.h"
class VModelingSpline:public VModelingTool, public QGraphicsPathItem class VModelingSpline:public VModelingTool, public QGraphicsPathItem
{ {

View File

@ -24,8 +24,8 @@
#include "vmodelingtool.h" #include "vmodelingtool.h"
#include <QGraphicsPathItem> #include <QGraphicsPathItem>
#include "dialogs/dialogsplinepath.h" #include "../../dialogs/dialogsplinepath.h"
#include "widgets/vcontrolpointspline.h" #include "../../widgets/vcontrolpointspline.h"
class VModelingSplinePath:public VModelingTool, public QGraphicsPathItem class VModelingSplinePath:public VModelingTool, public QGraphicsPathItem
{ {

View File

@ -24,7 +24,7 @@
#include "vmodelingpoint.h" #include "vmodelingpoint.h"
#include "../drawTools/vtooltriangle.h" #include "../drawTools/vtooltriangle.h"
#include "dialogs/dialogtriangle.h" #include "../../dialogs/dialogtriangle.h"
class VModelingTriangle : public VModelingPoint class VModelingTriangle : public VModelingPoint
{ {

View File

@ -23,7 +23,7 @@
#define VNODEPOINT_H #define VNODEPOINT_H
#include "vabstractnode.h" #include "vabstractnode.h"
#include "widgets/vgraphicssimpletextitem.h" #include "../../widgets/vgraphicssimpletextitem.h"
class VNodePoint: public VAbstractNode, public QGraphicsEllipseItem class VNodePoint: public VAbstractNode, public QGraphicsEllipseItem
{ {

View File

@ -24,7 +24,7 @@
#include "vabstracttool.h" #include "vabstracttool.h"
#include <QGraphicsPathItem> #include <QGraphicsPathItem>
#include "dialogs/dialogdetail.h" #include "../dialogs/dialogdetail.h"
class VToolDetail: public VAbstractTool, public QGraphicsPathItem class VToolDetail: public VAbstractTool, public QGraphicsPathItem
{ {

View File

@ -20,11 +20,11 @@
****************************************************************************/ ****************************************************************************/
#include "vapplication.h" #include "vapplication.h"
#include "exception/vexceptionobjecterror.h" #include "../exception/vexceptionobjecterror.h"
#include "exception/vexceptionbadid.h" #include "../exception/vexceptionbadid.h"
#include "exception/vexceptionconversionerror.h" #include "../exception/vexceptionconversionerror.h"
#include "exception/vexceptionemptyparameter.h" #include "../exception/vexceptionemptyparameter.h"
#include "exception/vexceptionwrongparameterid.h" #include "../exception/vexceptionwrongparameterid.h"
// reimplemented from QApplication so we can throw exceptions in slots // reimplemented from QApplication so we can throw exceptions in slots
bool VApplication::notify(QObject *receiver, QEvent *event) bool VApplication::notify(QObject *receiver, QEvent *event)

View File

@ -24,7 +24,7 @@
#include <QGraphicsEllipseItem> #include <QGraphicsEllipseItem>
#include <QObject> #include <QObject>
#include "geometry/vsplinepath.h" #include "../geometry/vsplinepath.h"
class VControlPointSpline : public QObject, public QGraphicsEllipseItem class VControlPointSpline : public QObject, public QGraphicsEllipseItem
{ {