From 08e644a8871e29eb6ea7e77b40d34db86845a0bc Mon Sep 17 00:00:00 2001 From: dismine Date: Thu, 21 Nov 2013 14:05:26 +0200 Subject: [PATCH] Fixed bugs compiling without Qt Creator. --HG-- branch : develop --- src/container/vcontainer.cpp | 2 ++ src/container/vincrementtablerow.h | 2 ++ src/container/vpointf.h | 4 ++++ src/container/vstandarttablerow.h | 2 ++ src/dialogs/dialogalongline.cpp | 2 ++ src/dialogs/dialogarc.cpp | 3 +++ src/dialogs/dialogbisector.cpp | 2 ++ src/dialogs/dialogdetail.cpp | 3 +++ src/dialogs/dialogendline.cpp | 2 ++ src/dialogs/dialogheight.cpp | 2 ++ src/dialogs/dialoghistory.cpp | 1 + src/dialogs/dialogincrements.cpp | 2 ++ src/dialogs/dialogline.cpp | 2 ++ src/dialogs/dialoglineintersect.cpp | 2 ++ src/dialogs/dialognormal.cpp | 2 ++ src/dialogs/dialogpointofcontact.cpp | 2 ++ src/dialogs/dialogpointofintersection.cpp | 2 ++ src/dialogs/dialogshoulderpoint.cpp | 2 ++ src/dialogs/dialogsinglepoint.cpp | 2 ++ src/dialogs/dialogspline.cpp | 2 ++ src/dialogs/dialogsplinepath.cpp | 2 ++ src/dialogs/dialogtool.cpp | 2 ++ src/dialogs/dialogtool.h | 5 +++++ src/dialogs/dialogtriangle.cpp | 2 ++ src/exception/vexception.h | 1 + src/exception/vexceptionemptyparameter.cpp | 2 ++ src/exception/vexceptionemptyparameter.h | 2 ++ src/exception/vexceptionobjecterror.h | 2 ++ src/exception/vexceptionuniqueid.cpp | 2 ++ src/exception/vexceptionuniqueid.h | 2 ++ src/exception/vexceptionwrongparameterid.h | 2 ++ src/geometry/varc.h | 2 ++ src/geometry/vdetail.h | 3 +++ src/geometry/vspline.cpp | 2 ++ src/geometry/vspline.h | 4 ++++ src/main.cpp | 1 + src/mainwindow.cpp | 8 ++++++++ src/tablewindow.h | 1 + src/tools/drawTools/vdrawtool.h | 3 +++ src/tools/modelingTools/vmodelingtool.h | 1 + src/tools/nodeDetails/vnodearc.cpp | 2 ++ src/tools/nodeDetails/vnodepoint.cpp | 2 ++ src/tools/nodeDetails/vnodespline.cpp | 2 ++ src/tools/nodeDetails/vnodesplinepath.cpp | 2 ++ src/widgets/doubledelegate.cpp | 2 ++ src/widgets/vapplication.cpp | 3 +++ src/widgets/vcontrolpointspline.cpp | 2 ++ src/widgets/vgraphicssimpletextitem.cpp | 2 ++ src/widgets/vitem.cpp | 3 +++ src/widgets/vmaingraphicsscene.cpp | 2 ++ src/widgets/vmaingraphicsscene.h | 1 + src/widgets/vmaingraphicsview.cpp | 5 +++++ src/widgets/vtablegraphicsview.cpp | 4 ++++ src/xml/vdomdocument.cpp | 2 ++ src/xml/vdomdocument.h | 5 ++++- src/xml/vtoolrecord.h | 4 ++++ 56 files changed, 134 insertions(+), 1 deletion(-) diff --git a/src/container/vcontainer.cpp b/src/container/vcontainer.cpp index 0aa373568..108909dc7 100644 --- a/src/container/vcontainer.cpp +++ b/src/container/vcontainer.cpp @@ -29,6 +29,8 @@ #include "vcontainer.h" #include "../exception/vexceptionbadid.h" +#include + qint64 VContainer::_id = 0; VContainer::VContainer() diff --git a/src/container/vincrementtablerow.h b/src/container/vincrementtablerow.h index 9b805ed2c..493967569 100644 --- a/src/container/vincrementtablerow.h +++ b/src/container/vincrementtablerow.h @@ -29,6 +29,8 @@ #ifndef VINCREMENTTABLEROW_H #define VINCREMENTTABLEROW_H +#include + /** * @brief The VIncrementTableRow class keep data row of increment table */ diff --git a/src/container/vpointf.h b/src/container/vpointf.h index ae9188a43..17260a385 100644 --- a/src/container/vpointf.h +++ b/src/container/vpointf.h @@ -29,6 +29,10 @@ #ifndef VPOINTF_H #define VPOINTF_H +#include +#include +#include "../options.h" + /** * @brief The VPointF class keep data of point. */ diff --git a/src/container/vstandarttablerow.h b/src/container/vstandarttablerow.h index 0a2dd2231..4a56dad47 100644 --- a/src/container/vstandarttablerow.h +++ b/src/container/vstandarttablerow.h @@ -29,6 +29,8 @@ #ifndef VSTANDARTTABLEROW_H #define VSTANDARTTABLEROW_H +#include + /** * @brief The VStandartTableRow class keep data row of standart table */ diff --git a/src/dialogs/dialogalongline.cpp b/src/dialogs/dialogalongline.cpp index a6d29a2f8..3cbe693c0 100644 --- a/src/dialogs/dialogalongline.cpp +++ b/src/dialogs/dialogalongline.cpp @@ -29,6 +29,8 @@ #include "dialogalongline.h" #include "ui_dialogalongline.h" +#include + DialogAlongLine::DialogAlongLine(const VContainer *data, Draw::Draws mode, QWidget *parent) :DialogTool(data, mode, parent), ui(new Ui::DialogAlongLine), number(0), pointName(QString()), typeLine(QString()), formula(QString()), firstPointId(0), secondPointId(0) diff --git a/src/dialogs/dialogarc.cpp b/src/dialogs/dialogarc.cpp index 8ef73f743..d9429dd36 100644 --- a/src/dialogs/dialogarc.cpp +++ b/src/dialogs/dialogarc.cpp @@ -29,6 +29,9 @@ #include "dialogarc.h" #include "ui_dialogarc.h" +#include +#include + DialogArc::DialogArc(const VContainer *data, Draw::Draws mode, QWidget *parent) :DialogTool(data, mode, parent), ui(new Ui::DialogArc), flagRadius(false), flagF1(false), flagF2(false), timerRadius(0), timerF1(0), timerF2(0), center(0), radius(QString()), f1(QString()), f2(QString()) diff --git a/src/dialogs/dialogbisector.cpp b/src/dialogs/dialogbisector.cpp index c9c3ec23a..1809dec13 100644 --- a/src/dialogs/dialogbisector.cpp +++ b/src/dialogs/dialogbisector.cpp @@ -29,6 +29,8 @@ #include "dialogbisector.h" #include "ui_dialogbisector.h" +#include + DialogBisector::DialogBisector(const VContainer *data, Draw::Draws mode, QWidget *parent) :DialogTool(data, mode, parent), ui(new Ui::DialogBisector), number(0), pointName(QString()), typeLine(QString()), formula(QString()), firstPointId(0), secondPointId(0), thirdPointId(0) diff --git a/src/dialogs/dialogdetail.cpp b/src/dialogs/dialogdetail.cpp index 83aab4f27..6b1b7ab9b 100644 --- a/src/dialogs/dialogdetail.cpp +++ b/src/dialogs/dialogdetail.cpp @@ -28,6 +28,9 @@ #include "dialogdetail.h" +#include +#include + DialogDetail::DialogDetail(const VContainer *data, Draw::Draws mode, QWidget *parent) :DialogTool(data, mode, parent), ui(), details(VDetail()), supplement(true), closed(true) { diff --git a/src/dialogs/dialogendline.cpp b/src/dialogs/dialogendline.cpp index 809dd4456..b00834019 100644 --- a/src/dialogs/dialogendline.cpp +++ b/src/dialogs/dialogendline.cpp @@ -29,6 +29,8 @@ #include "dialogendline.h" #include "ui_dialogendline.h" +#include + DialogEndLine::DialogEndLine(const VContainer *data, Draw::Draws mode, QWidget *parent) :DialogTool(data, mode, parent), ui(new Ui::DialogEndLine), pointName(QString()), typeLine(QString()), formula(QString()), angle(0), basePointId(0) diff --git a/src/dialogs/dialogheight.cpp b/src/dialogs/dialogheight.cpp index 9c3bfb8e7..1592c40bd 100644 --- a/src/dialogs/dialogheight.cpp +++ b/src/dialogs/dialogheight.cpp @@ -29,6 +29,8 @@ #include "dialogheight.h" #include "ui_dialogheight.h" +#include + DialogHeight::DialogHeight(const VContainer *data, Draw::Draws mode, QWidget *parent) :DialogTool(data, mode, parent), ui(new Ui::DialogHeight), number(0), pointName(QString()), typeLine(QString()), basePointId(0), p1LineId(0), p2LineId(0) diff --git a/src/dialogs/dialoghistory.cpp b/src/dialogs/dialoghistory.cpp index fb2dcb0ca..95c29a52e 100644 --- a/src/dialogs/dialoghistory.cpp +++ b/src/dialogs/dialoghistory.cpp @@ -32,6 +32,7 @@ #include "../geometry/vspline.h" #include "../geometry/vsplinepath.h" #include +#include DialogHistory::DialogHistory(VContainer *data, VDomDocument *doc, QWidget *parent) :DialogTool(data, Draw::Calculation, parent), ui(new Ui::DialogHistory), doc(doc), cursorRow(0), diff --git a/src/dialogs/dialogincrements.cpp b/src/dialogs/dialogincrements.cpp index f22ac2614..5a26b7848 100644 --- a/src/dialogs/dialogincrements.cpp +++ b/src/dialogs/dialogincrements.cpp @@ -31,6 +31,8 @@ #include "../widgets/doubledelegate.h" #include "../exception/vexception.h" +#include + 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/src/dialogs/dialogline.cpp b/src/dialogs/dialogline.cpp index 8a829db8a..bfb438486 100644 --- a/src/dialogs/dialogline.cpp +++ b/src/dialogs/dialogline.cpp @@ -29,6 +29,8 @@ #include "dialogline.h" #include "ui_dialogline.h" +#include + DialogLine::DialogLine(const VContainer *data, Draw::Draws mode, QWidget *parent) :DialogTool(data, mode, parent), ui(new Ui::DialogLine), number(0), firstPoint(0), secondPoint(0) { diff --git a/src/dialogs/dialoglineintersect.cpp b/src/dialogs/dialoglineintersect.cpp index 2c291b9e4..1a96777c5 100644 --- a/src/dialogs/dialoglineintersect.cpp +++ b/src/dialogs/dialoglineintersect.cpp @@ -29,6 +29,8 @@ #include "dialoglineintersect.h" #include "ui_dialoglineintersect.h" +#include + DialogLineIntersect::DialogLineIntersect(const VContainer *data, Draw::Draws mode, QWidget *parent) :DialogTool(data, mode, parent), ui(new Ui::DialogLineIntersect), number(0), pointName(QString()), p1Line1(0), p2Line1(0), p1Line2(0), p2Line2(0), flagPoint(true) diff --git a/src/dialogs/dialognormal.cpp b/src/dialogs/dialognormal.cpp index 289459d98..84e10f4eb 100644 --- a/src/dialogs/dialognormal.cpp +++ b/src/dialogs/dialognormal.cpp @@ -29,6 +29,8 @@ #include "dialognormal.h" #include "ui_dialognormal.h" +#include + DialogNormal::DialogNormal(const VContainer *data, Draw::Draws mode, QWidget *parent) :DialogTool(data, mode, parent), ui(new Ui::DialogNormal), number(0), pointName(QString()), typeLine(QString()), formula(QString()), angle(0), firstPointId(0), secondPointId(0) diff --git a/src/dialogs/dialogpointofcontact.cpp b/src/dialogs/dialogpointofcontact.cpp index 66443ed3f..864f727e7 100644 --- a/src/dialogs/dialogpointofcontact.cpp +++ b/src/dialogs/dialogpointofcontact.cpp @@ -28,6 +28,8 @@ #include "dialogpointofcontact.h" +#include + DialogPointOfContact::DialogPointOfContact(const VContainer *data, Draw::Draws mode, QWidget *parent) :DialogTool(data, mode, parent), ui(), number(0), pointName(QString()), radius(QString()), center(0), firstPoint(0), secondPoint(0) diff --git a/src/dialogs/dialogpointofintersection.cpp b/src/dialogs/dialogpointofintersection.cpp index 391912f67..3d14e2f3a 100644 --- a/src/dialogs/dialogpointofintersection.cpp +++ b/src/dialogs/dialogpointofintersection.cpp @@ -29,6 +29,8 @@ #include "dialogpointofintersection.h" #include "ui_dialogpointofintersection.h" +#include + DialogPointOfIntersection::DialogPointOfIntersection(const VContainer *data, Draw::Draws mode, QWidget *parent) :DialogTool(data, mode, parent), ui(new Ui::DialogPointOfIntersection), number(0), pointName(QString()), firstPointId(0), secondPointId(0) diff --git a/src/dialogs/dialogshoulderpoint.cpp b/src/dialogs/dialogshoulderpoint.cpp index a182dd88e..8b7bea2a1 100644 --- a/src/dialogs/dialogshoulderpoint.cpp +++ b/src/dialogs/dialogshoulderpoint.cpp @@ -29,6 +29,8 @@ #include "dialogshoulderpoint.h" #include "ui_dialogshoulderpoint.h" +#include + DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, Draw::Draws mode, QWidget *parent) :DialogTool(data, mode, parent), ui(new Ui::DialogShoulderPoint), number(0), pointName(QString()), typeLine(QString()), formula(QString()), p1Line(0), p2Line(0), pShoulder(0) diff --git a/src/dialogs/dialogsinglepoint.cpp b/src/dialogs/dialogsinglepoint.cpp index 752d0b141..01858fa6d 100644 --- a/src/dialogs/dialogsinglepoint.cpp +++ b/src/dialogs/dialogsinglepoint.cpp @@ -29,6 +29,8 @@ #include "dialogsinglepoint.h" #include "ui_dialogsinglepoint.h" +#include + DialogSinglePoint::DialogSinglePoint(const VContainer *data, QWidget *parent) :DialogTool(data, Draw::Calculation, parent), ui(new Ui::DialogSinglePoint), name(QString()), point(QPointF()) diff --git a/src/dialogs/dialogspline.cpp b/src/dialogs/dialogspline.cpp index 9e8849ae4..208e9f2d3 100644 --- a/src/dialogs/dialogspline.cpp +++ b/src/dialogs/dialogspline.cpp @@ -29,6 +29,8 @@ #include "dialogspline.h" #include "ui_dialogspline.h" +#include + DialogSpline::DialogSpline(const VContainer *data, Draw::Draws mode, QWidget *parent) :DialogTool(data, mode, parent), ui(new Ui::DialogSpline), number(0), p1(0), p4(0), angle1(0), angle2(0), kAsm1(1), kAsm2(1), kCurve(1) diff --git a/src/dialogs/dialogsplinepath.cpp b/src/dialogs/dialogsplinepath.cpp index f5984ed0c..17117e9ee 100644 --- a/src/dialogs/dialogsplinepath.cpp +++ b/src/dialogs/dialogsplinepath.cpp @@ -30,6 +30,8 @@ #include "ui_dialogsplinepath.h" #include "../geometry/vsplinepoint.h" +#include + DialogSplinePath::DialogSplinePath(const VContainer *data, Draw::Draws mode, QWidget *parent) :DialogTool(data, mode, parent), ui(new Ui::DialogSplinePath), path(VSplinePath()) { diff --git a/src/dialogs/dialogtool.cpp b/src/dialogs/dialogtool.cpp index 6484785c1..5ec5f3343 100644 --- a/src/dialogs/dialogtool.cpp +++ b/src/dialogs/dialogtool.cpp @@ -29,6 +29,8 @@ #include "dialogtool.h" #include "../container/calculator.h" +#include + DialogTool::DialogTool(const VContainer *data, Draw::Draws mode, QWidget *parent) :QDialog(parent), data(data), isInitialized(false), flagName(true), flagFormula(true), timerFormula(0), bOk(0), spinBoxAngle(0), lineEditFormula(0), listWidget(0), labelResultCalculation(0), labelDescription(0), diff --git a/src/dialogs/dialogtool.h b/src/dialogs/dialogtool.h index 074570314..ca3bff440 100644 --- a/src/dialogs/dialogtool.h +++ b/src/dialogs/dialogtool.h @@ -29,7 +29,12 @@ #ifndef DIALOGTOOL_H #define DIALOGTOOL_H +#include #include +#include +#include +#include +#include #include "../container/vcontainer.h" /** diff --git a/src/dialogs/dialogtriangle.cpp b/src/dialogs/dialogtriangle.cpp index 1580251ae..5c0625b4d 100644 --- a/src/dialogs/dialogtriangle.cpp +++ b/src/dialogs/dialogtriangle.cpp @@ -29,6 +29,8 @@ #include "dialogtriangle.h" #include "ui_dialogtriangle.h" +#include + DialogTriangle::DialogTriangle(const VContainer *data, Draw::Draws mode, QWidget *parent) :DialogTool(data, mode, parent), ui(new Ui::DialogTriangle), number(0), pointName(QString()), axisP1Id(0), axisP2Id(0), firstPointId(0), secondPointId(0) diff --git a/src/exception/vexception.h b/src/exception/vexception.h index 50be5067e..e0624d7e0 100644 --- a/src/exception/vexception.h +++ b/src/exception/vexception.h @@ -31,6 +31,7 @@ #define VEXCEPTION_H #include +#include /** * @brief The VException class parent for all exception. Could be use for abstract exception diff --git a/src/exception/vexceptionemptyparameter.cpp b/src/exception/vexceptionemptyparameter.cpp index af84d8ebd..c3fdf6b7a 100644 --- a/src/exception/vexceptionemptyparameter.cpp +++ b/src/exception/vexceptionemptyparameter.cpp @@ -28,6 +28,8 @@ #include "vexceptionemptyparameter.h" +#include + VExceptionEmptyParameter::VExceptionEmptyParameter(const QString &what, const QString &name, const QDomElement &domElement) : VException(what), name(name), tagText(QString()), tagName(QString()), lineNumber(-1) diff --git a/src/exception/vexceptionemptyparameter.h b/src/exception/vexceptionemptyparameter.h index 042c89e40..5dae4b74b 100644 --- a/src/exception/vexceptionemptyparameter.h +++ b/src/exception/vexceptionemptyparameter.h @@ -31,6 +31,8 @@ #include "vexception.h" +#include + /** * @brief The VExceptionEmptyParameter class for exception empty parameter */ diff --git a/src/exception/vexceptionobjecterror.h b/src/exception/vexceptionobjecterror.h index d1315596e..888fd4cd2 100644 --- a/src/exception/vexceptionobjecterror.h +++ b/src/exception/vexceptionobjecterror.h @@ -31,6 +31,8 @@ #include "vexception.h" +#include + /** * @brief The VExceptionObjectError class for exception object error */ diff --git a/src/exception/vexceptionuniqueid.cpp b/src/exception/vexceptionuniqueid.cpp index 10a3136ca..9232d0ca7 100644 --- a/src/exception/vexceptionuniqueid.cpp +++ b/src/exception/vexceptionuniqueid.cpp @@ -28,6 +28,8 @@ #include "vexceptionuniqueid.h" +#include + VExceptionUniqueId::VExceptionUniqueId(const QString &what, const QDomElement &domElement) :VException(what), tagText(QString()), tagName(QString()), lineNumber(-1) { diff --git a/src/exception/vexceptionuniqueid.h b/src/exception/vexceptionuniqueid.h index a1bb053ce..9b24fab35 100644 --- a/src/exception/vexceptionuniqueid.h +++ b/src/exception/vexceptionuniqueid.h @@ -31,6 +31,8 @@ #include "vexception.h" +#include + /** * @brief The VExceptionUniqueId class for exception unique id */ diff --git a/src/exception/vexceptionwrongparameterid.h b/src/exception/vexceptionwrongparameterid.h index 0f9d55383..65304c3f8 100644 --- a/src/exception/vexceptionwrongparameterid.h +++ b/src/exception/vexceptionwrongparameterid.h @@ -31,6 +31,8 @@ #include "vexception.h" +#include + /** * @brief The VExceptionWrongParameterId class for exception wrong parameter id */ diff --git a/src/geometry/varc.h b/src/geometry/varc.h index caab908cf..890e2db80 100644 --- a/src/geometry/varc.h +++ b/src/geometry/varc.h @@ -30,6 +30,8 @@ #define VARC_H #include "vspline.h" +#include +#include "../options.h" class QString; class QLineF; class QPainterPath; diff --git a/src/geometry/vdetail.h b/src/geometry/vdetail.h index f80289efa..958c8f421 100644 --- a/src/geometry/vdetail.h +++ b/src/geometry/vdetail.h @@ -31,6 +31,9 @@ #include "vnodedetail.h" +#include +#include + namespace Detail { /** diff --git a/src/geometry/vspline.cpp b/src/geometry/vspline.cpp index 572ce9342..54e5026a0 100644 --- a/src/geometry/vspline.cpp +++ b/src/geometry/vspline.cpp @@ -28,6 +28,8 @@ #include "vspline.h" +#include + VSpline::VSpline() :p1(0), p2(QPointF()), p3(QPointF()), p4(0), angle1(0), angle2(0), kAsm1(1), kAsm2(1), kCurve(1), points(QHash()), mode(Draw::Calculation), idObject(0), _name(QString()){} diff --git a/src/geometry/vspline.h b/src/geometry/vspline.h index 9d0db6340..5fc34cc7a 100644 --- a/src/geometry/vspline.h +++ b/src/geometry/vspline.h @@ -31,6 +31,10 @@ #include "../container/vpointf.h" +#include +#include +#include + class QString; #define M_2PI 6.28318530717958647692528676655900576 diff --git a/src/main.cpp b/src/main.cpp index 8a2cf8320..52f4bd901 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -29,6 +29,7 @@ #include "mainwindow.h" #include "widgets/vapplication.h" #include +#include #include "tablewindow.h" void myMessageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index f8f742463..abd97ea9c 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -36,6 +36,14 @@ #include "exception/vexceptionuniqueid.h" #include "version.h" +#include +#include +#include +#include +#include +#include +#include + MainWindow::MainWindow(QWidget *parent) :QMainWindow(parent), ui(new Ui::MainWindow), tool(Tool::ArrowTool), currentScene(0), sceneDraw(0), sceneDetails(0), mouseCoordinate(0), helpLabel(0), view(0), isInitialized(false), dialogTable(0), diff --git a/src/tablewindow.h b/src/tablewindow.h index d82380015..82ed71a95 100644 --- a/src/tablewindow.h +++ b/src/tablewindow.h @@ -29,6 +29,7 @@ #ifndef TABLEWINDOW_H #define TABLEWINDOW_H +#include #include #include "widgets/vitem.h" diff --git a/src/tools/drawTools/vdrawtool.h b/src/tools/drawTools/vdrawtool.h index fc0f1bea9..71e80bfa5 100644 --- a/src/tools/drawTools/vdrawtool.h +++ b/src/tools/drawTools/vdrawtool.h @@ -31,6 +31,9 @@ #include "../vabstracttool.h" +#include +#include + /** * @brief The VDrawTool class */ diff --git a/src/tools/modelingTools/vmodelingtool.h b/src/tools/modelingTools/vmodelingtool.h index 2387104c0..09c9b17b1 100644 --- a/src/tools/modelingTools/vmodelingtool.h +++ b/src/tools/modelingTools/vmodelingtool.h @@ -30,6 +30,7 @@ #define VMODELINGTOOL_H #include "../vabstracttool.h" +#include #include /** diff --git a/src/tools/nodeDetails/vnodearc.cpp b/src/tools/nodeDetails/vnodearc.cpp index 3ebf3808c..27ebfdea5 100644 --- a/src/tools/nodeDetails/vnodearc.cpp +++ b/src/tools/nodeDetails/vnodearc.cpp @@ -28,6 +28,8 @@ #include "vnodearc.h" +#include + const QString VNodeArc::TagName = QStringLiteral("arc"); const QString VNodeArc::ToolType = QStringLiteral("modeling"); diff --git a/src/tools/nodeDetails/vnodepoint.cpp b/src/tools/nodeDetails/vnodepoint.cpp index b4bdfeb85..f1ed87dc3 100644 --- a/src/tools/nodeDetails/vnodepoint.cpp +++ b/src/tools/nodeDetails/vnodepoint.cpp @@ -28,6 +28,8 @@ #include "vnodepoint.h" +#include + const QString VNodePoint::TagName = QStringLiteral("point"); const QString VNodePoint::ToolType = QStringLiteral("modeling"); diff --git a/src/tools/nodeDetails/vnodespline.cpp b/src/tools/nodeDetails/vnodespline.cpp index 56ed8fc25..ac89eaac7 100644 --- a/src/tools/nodeDetails/vnodespline.cpp +++ b/src/tools/nodeDetails/vnodespline.cpp @@ -28,6 +28,8 @@ #include "vnodespline.h" +#include + const QString VNodeSpline::TagName = QStringLiteral("spline"); const QString VNodeSpline::ToolType = QStringLiteral("modelingSpline"); diff --git a/src/tools/nodeDetails/vnodesplinepath.cpp b/src/tools/nodeDetails/vnodesplinepath.cpp index ebd70564f..250581c2d 100644 --- a/src/tools/nodeDetails/vnodesplinepath.cpp +++ b/src/tools/nodeDetails/vnodesplinepath.cpp @@ -28,6 +28,8 @@ #include "vnodesplinepath.h" +#include + const QString VNodeSplinePath::TagName = QStringLiteral("spline"); const QString VNodeSplinePath::ToolType = QStringLiteral("modelingPath"); diff --git a/src/widgets/doubledelegate.cpp b/src/widgets/doubledelegate.cpp index 7e5529553..36e865905 100644 --- a/src/widgets/doubledelegate.cpp +++ b/src/widgets/doubledelegate.cpp @@ -35,6 +35,8 @@ #include "doubledelegate.h" +#include + QWidget *DoubleSpinBoxDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const { diff --git a/src/widgets/vapplication.cpp b/src/widgets/vapplication.cpp index 34327663f..e3e40bab9 100644 --- a/src/widgets/vapplication.cpp +++ b/src/widgets/vapplication.cpp @@ -33,6 +33,9 @@ #include "../exception/vexceptionemptyparameter.h" #include "../exception/vexceptionwrongparameterid.h" +#include +#include + // reimplemented from QApplication so we can throw exceptions in slots bool VApplication::notify(QObject *receiver, QEvent *event) { diff --git a/src/widgets/vcontrolpointspline.cpp b/src/widgets/vcontrolpointspline.cpp index 8a81c7f0e..acd40cb39 100644 --- a/src/widgets/vcontrolpointspline.cpp +++ b/src/widgets/vcontrolpointspline.cpp @@ -28,6 +28,8 @@ #include "vcontrolpointspline.h" +#include + VControlPointSpline::VControlPointSpline(const qint32 &indexSpline, SplinePoint::Position position, const QPointF &controlPoint, const QPointF &splinePoint, QGraphicsItem *parent) diff --git a/src/widgets/vgraphicssimpletextitem.cpp b/src/widgets/vgraphicssimpletextitem.cpp index 5e34555ce..80a908fbb 100644 --- a/src/widgets/vgraphicssimpletextitem.cpp +++ b/src/widgets/vgraphicssimpletextitem.cpp @@ -28,6 +28,8 @@ #include "vgraphicssimpletextitem.h" +#include + VGraphicsSimpleTextItem::VGraphicsSimpleTextItem(QGraphicsItem * parent) :QGraphicsSimpleTextItem(parent), fontSize(0) { diff --git a/src/widgets/vitem.cpp b/src/widgets/vitem.cpp index 37c6614cc..9eea52f22 100644 --- a/src/widgets/vitem.cpp +++ b/src/widgets/vitem.cpp @@ -27,7 +27,10 @@ *************************************************************************/ #include "vitem.h" +#include "../options.h" + #include +#include VItem::VItem (const QPainterPath & path, int numInList, QGraphicsItem * parent ) :QGraphicsPathItem ( path, parent ), numInOutList(numInList), paper(0) diff --git a/src/widgets/vmaingraphicsscene.cpp b/src/widgets/vmaingraphicsscene.cpp index 6b5299fb9..95c1a41b2 100644 --- a/src/widgets/vmaingraphicsscene.cpp +++ b/src/widgets/vmaingraphicsscene.cpp @@ -28,6 +28,8 @@ #include "vmaingraphicsscene.h" +#include + VMainGraphicsScene::VMainGraphicsScene() :QGraphicsScene(), horScrollBar(0), verScrollBar(0), scaleFactor(1){} diff --git a/src/widgets/vmaingraphicsscene.h b/src/widgets/vmaingraphicsscene.h index ef8b99769..fccc36ead 100644 --- a/src/widgets/vmaingraphicsscene.h +++ b/src/widgets/vmaingraphicsscene.h @@ -30,6 +30,7 @@ #define VMAINGRAPHICSSCENE_H #include +#include "../options.h" /** * @brief The VMainGraphicsScene class diff --git a/src/widgets/vmaingraphicsview.cpp b/src/widgets/vmaingraphicsview.cpp index 8fc8fe703..162e2fc00 100644 --- a/src/widgets/vmaingraphicsview.cpp +++ b/src/widgets/vmaingraphicsview.cpp @@ -28,6 +28,11 @@ #include "vmaingraphicsview.h" +#include +#include +#include +#include + VMainGraphicsView::VMainGraphicsView(QWidget *parent) :QGraphicsView(parent), _numScheduledScalings(0) { diff --git a/src/widgets/vtablegraphicsview.cpp b/src/widgets/vtablegraphicsview.cpp index a60b22567..5b6b3c01c 100644 --- a/src/widgets/vtablegraphicsview.cpp +++ b/src/widgets/vtablegraphicsview.cpp @@ -28,6 +28,10 @@ #include "vtablegraphicsview.h" +#include +#include +#include + VTableGraphicsView::VTableGraphicsView(QGraphicsScene* pScene, QWidget *parent) :QGraphicsView(pScene, parent) { diff --git a/src/xml/vdomdocument.cpp b/src/xml/vdomdocument.cpp index a61dceb0d..fe556678f 100644 --- a/src/xml/vdomdocument.cpp +++ b/src/xml/vdomdocument.cpp @@ -41,6 +41,8 @@ #include "../tools/nodeDetails/vnodesplinepath.h" #include "../tools/nodeDetails/vnodearc.h" +#include + VDomDocument::VDomDocument(VContainer *data, QComboBox *comboBoxDraws, Draw::Draws *mode) : QDomDocument(), map(QHash()), nameActivDraw(QString()), data(data), tools(QHash()), history(QVector()), cursor(0), diff --git a/src/xml/vdomdocument.h b/src/xml/vdomdocument.h index b13cf58c0..866421445 100644 --- a/src/xml/vdomdocument.h +++ b/src/xml/vdomdocument.h @@ -29,12 +29,15 @@ #ifndef VDOMDOCUMENT_H #define VDOMDOCUMENT_H -#include #include "../container/vcontainer.h" #include "../widgets/vmaingraphicsscene.h" #include "../tools/vdatatool.h" #include "vtoolrecord.h" +#include +#include +#include + namespace Document { /** diff --git a/src/xml/vtoolrecord.h b/src/xml/vtoolrecord.h index 77ed466f3..bbd3d72e1 100644 --- a/src/xml/vtoolrecord.h +++ b/src/xml/vtoolrecord.h @@ -29,6 +29,10 @@ #ifndef VTOOLRECORD_H #define VTOOLRECORD_H +#include "../options.h" + +#include + /** * @brief The VToolRecord class */