From 7e3dc203dcba70a526bd96e3ffea44b617a63e6f Mon Sep 17 00:00:00 2001 From: dismine Date: Sun, 8 Jun 2014 21:10:57 +0300 Subject: [PATCH] Use forward declaration. --HG-- branch : feature --- src/app/container/calculator.cpp | 1 + src/app/container/calculator.h | 4 ++-- src/app/container/vcontainer.cpp | 4 ++-- src/app/container/vcontainer.h | 3 --- src/app/dialogs/app/configdialog.h | 2 +- src/app/dialogs/app/dialoghistory.cpp | 5 ++--- src/app/dialogs/app/dialoghistory.h | 4 +++- src/app/dialogs/app/dialogincrements.cpp | 6 ++---- src/app/dialogs/app/dialogincrements.h | 5 +++-- .../dialogs/app/dialogindividualmeasurements.cpp | 4 +--- .../dialogs/app/dialogindividualmeasurements.h | 3 ++- src/app/dialogs/app/dialogpatternproperties.cpp | 2 +- src/app/dialogs/app/dialogpatternproperties.h | 3 ++- .../dialogs/app/dialogstandardmeasurements.cpp | 2 +- src/app/dialogs/app/dialogstandardmeasurements.h | 3 ++- src/app/dialogs/app/pages.cpp | 1 + src/app/dialogs/app/pages.h | 8 +++++++- src/app/dialogs/tools/dialogarc.cpp | 4 +++- src/app/dialogs/tools/dialogbisector.cpp | 3 ++- src/app/dialogs/tools/dialogcutarc.cpp | 3 +++ src/app/dialogs/tools/dialogcutspline.cpp | 3 +++ src/app/dialogs/tools/dialogcutsplinepath.cpp | 3 +++ src/app/dialogs/tools/dialogdetail.cpp | 6 +++++- src/app/dialogs/tools/dialogdetail.h | 1 + src/app/dialogs/tools/dialogeditwrongformula.cpp | 2 -- src/app/dialogs/tools/dialogendline.cpp | 3 ++- src/app/dialogs/tools/dialogheight.cpp | 3 ++- src/app/dialogs/tools/dialogline.cpp | 3 ++- src/app/dialogs/tools/dialoglineintersect.cpp | 3 ++- src/app/dialogs/tools/dialognormal.cpp | 2 -- src/app/dialogs/tools/dialogpointofcontact.cpp | 3 ++- .../dialogs/tools/dialogpointofintersection.cpp | 3 ++- src/app/dialogs/tools/dialogshoulderpoint.cpp | 3 ++- src/app/dialogs/tools/dialogsinglepoint.cpp | 2 -- src/app/dialogs/tools/dialogspline.cpp | 3 ++- src/app/dialogs/tools/dialogsplinepath.cpp | 3 +-- src/app/dialogs/tools/dialogtool.cpp | 7 ++++--- src/app/dialogs/tools/dialogtool.h | 16 +++++++++------- src/app/dialogs/tools/dialogtriangle.cpp | 4 ++-- src/app/dialogs/tools/dialoguniondetails.cpp | 2 ++ src/app/exception/vexception.cpp | 6 +++--- src/app/exception/vexception.h | 4 ++-- src/app/exception/vexceptionemptyparameter.cpp | 3 +-- src/app/exception/vexceptionemptyparameter.h | 2 +- src/app/exception/vexceptionobjecterror.cpp | 1 + src/app/exception/vexceptionobjecterror.h | 2 +- src/app/exception/vexceptionwrongid.cpp | 1 + src/app/exception/vexceptionwrongid.h | 2 +- src/app/geometry/varc.cpp | 8 ++++---- src/app/geometry/varc.h | 5 +---- src/app/geometry/vdetail.cpp | 1 + src/app/geometry/vdetail.h | 4 ++-- src/app/geometry/vequidistant.cpp | 6 ++++++ src/app/geometry/vequidistant.h | 8 ++++++-- src/app/geometry/vgobject.h | 4 ---- src/app/geometry/vnodedetail.h | 1 - src/app/geometry/vpointf.cpp | 12 ++++++++++++ src/app/geometry/vpointf.h | 16 +++------------- src/app/geometry/vspline.cpp | 6 ++++-- src/app/geometry/vspline.h | 9 +++------ src/app/geometry/vsplinepath.h | 7 ++----- src/app/geometry/vsplinepoint.h | 1 - src/app/mainwindow.cpp | 1 + src/app/options.cpp | 1 + src/app/options.h | 7 +++---- src/app/stable.h | 1 + src/app/tools/drawTools/vdrawtool.cpp | 4 ++-- src/app/tools/drawTools/vdrawtool.h | 2 ++ src/app/tools/drawTools/vtoolalongline.cpp | 2 +- src/app/tools/drawTools/vtoolarc.cpp | 1 + src/app/tools/drawTools/vtoolbisector.cpp | 1 + src/app/tools/drawTools/vtoolcutarc.cpp | 2 ++ src/app/tools/drawTools/vtoolcutspline.cpp | 3 +++ src/app/tools/drawTools/vtoolcutsplinepath.cpp | 3 +++ src/app/tools/drawTools/vtoolendline.cpp | 1 + src/app/tools/drawTools/vtoolheight.cpp | 1 + src/app/tools/drawTools/vtoolline.cpp | 2 ++ src/app/tools/drawTools/vtoolline.h | 1 - src/app/tools/drawTools/vtoollineintersect.cpp | 1 + src/app/tools/drawTools/vtoollinepoint.cpp | 1 + src/app/tools/drawTools/vtoolnormal.cpp | 1 + src/app/tools/drawTools/vtoolpoint.cpp | 2 ++ src/app/tools/drawTools/vtoolpoint.h | 4 +++- src/app/tools/drawTools/vtoolpointofcontact.cpp | 1 + .../tools/drawTools/vtoolpointofintersection.cpp | 1 + src/app/tools/drawTools/vtoolshoulderpoint.cpp | 1 + src/app/tools/drawTools/vtoolsinglepoint.cpp | 5 +++-- src/app/tools/drawTools/vtoolspline.h | 1 - src/app/tools/drawTools/vtooltriangle.cpp | 1 + src/app/tools/nodeDetails/vabstractnode.cpp | 1 + src/app/tools/nodeDetails/vnodearc.cpp | 2 +- src/app/tools/nodeDetails/vnodearc.h | 1 + src/app/tools/nodeDetails/vnodepoint.cpp | 3 ++- src/app/tools/nodeDetails/vnodepoint.h | 5 ++++- src/app/tools/nodeDetails/vnodespline.cpp | 2 +- src/app/tools/nodeDetails/vnodespline.h | 1 + src/app/tools/nodeDetails/vnodesplinepath.cpp | 2 +- src/app/tools/nodeDetails/vnodesplinepath.h | 1 + src/app/tools/vabstracttool.cpp | 1 + src/app/tools/vabstracttool.h | 4 ++-- src/app/tools/vdatatool.cpp | 2 +- src/app/tools/vdatatool.h | 2 ++ src/app/tools/vtooldetail.cpp | 5 +++++ src/app/tools/vtooldetail.h | 7 +++++-- src/app/tools/vtooluniondetails.cpp | 4 ++++ src/app/tools/vtooluniondetails.h | 6 +++++- src/app/widgets/vapplication.cpp | 9 ++++++--- src/app/widgets/vapplication.h | 4 ++-- src/app/widgets/vgraphicssimpletextitem.cpp | 2 -- src/app/widgets/vgraphicssimpletextitem.h | 1 + src/app/widgets/vmaingraphicsscene.cpp | 2 -- src/app/widgets/vtablegraphicsview.cpp | 1 - src/app/widgets/vtranslation.h | 1 - src/app/xml/vdomdocument.h | 4 +--- src/app/xml/vindividualmeasurements.h | 1 - src/app/xml/vpattern.cpp | 8 ++++---- src/app/xml/vpattern.h | 6 +++--- src/libs/qmuparser/qmuparser.cpp | 6 +++++- src/libs/qmuparser/qmuparserbase.cpp | 11 ++++++----- src/libs/qmuparser/qmuparserbase.h | 2 -- src/libs/qmuparser/qmuparserbytecode.cpp | 9 +++++---- src/libs/qmuparser/qmuparserbytecode.h | 1 - src/libs/qmuparser/qmuparsertest.cpp | 6 +++++- 123 files changed, 258 insertions(+), 171 deletions(-) diff --git a/src/app/container/calculator.cpp b/src/app/container/calculator.cpp index ec8c82358..2c7680b17 100644 --- a/src/app/container/calculator.cpp +++ b/src/app/container/calculator.cpp @@ -30,6 +30,7 @@ #include #include #include "../widgets/vapplication.h" +#include "vcontainer.h" using namespace qmu; diff --git a/src/app/container/calculator.h b/src/app/container/calculator.h index 39fb1a520..1d0b62e0e 100644 --- a/src/app/container/calculator.h +++ b/src/app/container/calculator.h @@ -29,10 +29,10 @@ #ifndef CALCULATOR_H #define CALCULATOR_H -#include "vcontainer.h" - #include "../../libs/qmuparser/qmuparser.h" +class VContainer; + /** * @brief The Calculator class for calculation formula. * diff --git a/src/app/container/vcontainer.cpp b/src/app/container/vcontainer.cpp index 020535ca8..cc62e1a08 100644 --- a/src/app/container/vcontainer.cpp +++ b/src/app/container/vcontainer.cpp @@ -27,10 +27,10 @@ *************************************************************************/ #include "vcontainer.h" - #include -#include #include "../widgets/vapplication.h" +#include "../geometry/varc.h" +#include "../geometry/vsplinepath.h" quint32 VContainer::_id = 0; diff --git a/src/app/container/vcontainer.h b/src/app/container/vcontainer.h index 29ff7d00c..9855e9be5 100644 --- a/src/app/container/vcontainer.h +++ b/src/app/container/vcontainer.h @@ -31,10 +31,7 @@ #include "vmeasurement.h" #include "vincrement.h" -#include "../geometry/varc.h" -#include "../geometry/vsplinepath.h" #include "../geometry/vdetail.h" -#include "../widgets/vitem.h" #include "../geometry/vgobject.h" #include "../exception/vexceptionbadid.h" diff --git a/src/app/dialogs/app/configdialog.h b/src/app/dialogs/app/configdialog.h index 3af959906..19fe29611 100644 --- a/src/app/dialogs/app/configdialog.h +++ b/src/app/dialogs/app/configdialog.h @@ -30,11 +30,11 @@ #define CONFIGDIALOG_H #include -#include #include "pages.h" class QListWidgetItem; class QStackedWidget; +class QListWidget; class ConfigDialog : public QDialog { diff --git a/src/app/dialogs/app/dialoghistory.cpp b/src/app/dialogs/app/dialoghistory.cpp index d2221cb94..15c4d68ff 100644 --- a/src/app/dialogs/app/dialoghistory.cpp +++ b/src/app/dialogs/app/dialoghistory.cpp @@ -29,14 +29,13 @@ #include "dialoghistory.h" #include "ui_dialoghistory.h" #include "../../geometry/varc.h" -#include "../../geometry/vspline.h" #include "../../geometry/vsplinepath.h" +#include "../../geometry/vpointf.h" #include "../../tools/vabstracttool.h" #include "../../tools/drawTools/vtoolcutspline.h" #include "../../tools/drawTools/vtoolcutsplinepath.h" #include "../../tools/drawTools/vtoolcutarc.h" -#include -#include +#include "../../xml/vpattern.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/dialogs/app/dialoghistory.h b/src/app/dialogs/app/dialoghistory.h index 971ab7188..08ab4208f 100644 --- a/src/app/dialogs/app/dialoghistory.h +++ b/src/app/dialogs/app/dialoghistory.h @@ -30,7 +30,9 @@ #define DIALOGHISTORY_H #include "../tools/dialogtool.h" -#include "../../xml/vpattern.h" + +class VPattern; +class VToolRecord; namespace Ui { diff --git a/src/app/dialogs/app/dialogincrements.cpp b/src/app/dialogs/app/dialogincrements.cpp index 07a6c1c1d..91fe138a0 100644 --- a/src/app/dialogs/app/dialogincrements.cpp +++ b/src/app/dialogs/app/dialogincrements.cpp @@ -30,15 +30,13 @@ #include "ui_dialogincrements.h" #include "../../widgets/doubledelegate.h" #include "../../widgets/textdelegate.h" -#include "../../exception/vexception.h" #include "../../xml/vstandardmeasurements.h" +#include "../../xml/vpattern.h" +#include "../../xml/vindividualmeasurements.h" -#include -#include #include #include #include -#include //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/dialogs/app/dialogincrements.h b/src/app/dialogs/app/dialogincrements.h index d53aab35d..2b4d18e03 100644 --- a/src/app/dialogs/app/dialogincrements.h +++ b/src/app/dialogs/app/dialogincrements.h @@ -30,8 +30,9 @@ #define DIALOGINCREMENTS_H #include "../tools/dialogtool.h" -#include "../../xml/vpattern.h" -#include "../../xml/vindividualmeasurements.h" + +class VPattern; +class VIndividualMeasurements; namespace Ui { diff --git a/src/app/dialogs/app/dialogindividualmeasurements.cpp b/src/app/dialogs/app/dialogindividualmeasurements.cpp index 234bdb4b2..affede943 100644 --- a/src/app/dialogs/app/dialogindividualmeasurements.cpp +++ b/src/app/dialogs/app/dialogindividualmeasurements.cpp @@ -28,13 +28,11 @@ #include "dialogindividualmeasurements.h" #include "ui_dialogindividualmeasurements.h" -#include #include "../../xml/vindividualmeasurements.h" -#include #include #include #include "../../widgets/vapplication.h" -#include +#include "../../container/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- DialogIndividualMeasurements::DialogIndividualMeasurements(VContainer *data, const QString &patternPieceName, diff --git a/src/app/dialogs/app/dialogindividualmeasurements.h b/src/app/dialogs/app/dialogindividualmeasurements.h index 3e2527051..160da77d8 100644 --- a/src/app/dialogs/app/dialogindividualmeasurements.h +++ b/src/app/dialogs/app/dialogindividualmeasurements.h @@ -30,7 +30,8 @@ #define DIALOGINDIVIDUALMEASUREMENTS_H #include -#include "../../container/vcontainer.h" + +class VContainer; namespace Ui { diff --git a/src/app/dialogs/app/dialogpatternproperties.cpp b/src/app/dialogs/app/dialogpatternproperties.cpp index bc0efe0e0..10a7a0ccc 100644 --- a/src/app/dialogs/app/dialogpatternproperties.cpp +++ b/src/app/dialogs/app/dialogpatternproperties.cpp @@ -29,7 +29,7 @@ #include "dialogpatternproperties.h" #include "ui_dialogpatternproperties.h" #include -#include +#include "../../xml/vpattern.h" //--------------------------------------------------------------------------------------------------------------------- DialogPatternProperties::DialogPatternProperties(VPattern *doc, QWidget *parent) : diff --git a/src/app/dialogs/app/dialogpatternproperties.h b/src/app/dialogs/app/dialogpatternproperties.h index d24ca735a..c099058a5 100644 --- a/src/app/dialogs/app/dialogpatternproperties.h +++ b/src/app/dialogs/app/dialogpatternproperties.h @@ -30,7 +30,8 @@ #define DIALOGPATTERNPROPERTIES_H #include -#include "../../xml/vpattern.h" + +class VPattern; namespace Ui { diff --git a/src/app/dialogs/app/dialogstandardmeasurements.cpp b/src/app/dialogs/app/dialogstandardmeasurements.cpp index 01d2b10dd..996f61253 100644 --- a/src/app/dialogs/app/dialogstandardmeasurements.cpp +++ b/src/app/dialogs/app/dialogstandardmeasurements.cpp @@ -31,7 +31,7 @@ #include #include "../../xml/vstandardmeasurements.h" #include "../../widgets/vapplication.h" -#include +#include "../../container/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- DialogStandardMeasurements::DialogStandardMeasurements(VContainer *data, const QString &patternPieceName, diff --git a/src/app/dialogs/app/dialogstandardmeasurements.h b/src/app/dialogs/app/dialogstandardmeasurements.h index 864c8c798..59d8c33e2 100644 --- a/src/app/dialogs/app/dialogstandardmeasurements.h +++ b/src/app/dialogs/app/dialogstandardmeasurements.h @@ -30,7 +30,8 @@ #define DIALOGSTANDARDMEASUREMENTS_H #include -#include "../../container/vcontainer.h" + +class VContainer; namespace Ui { diff --git a/src/app/dialogs/app/pages.cpp b/src/app/dialogs/app/pages.cpp index d33ae0dfe..13dfcb629 100644 --- a/src/app/dialogs/app/pages.cpp +++ b/src/app/dialogs/app/pages.cpp @@ -29,6 +29,7 @@ #include "pages.h" #include "../../options.h" #include "../../widgets/vapplication.h" +#include "../../widgets/vmaingraphicsview.h" //--------------------------------------------------------------------------------------------------------------------- ConfigurationPage::ConfigurationPage(QWidget *parent): diff --git a/src/app/dialogs/app/pages.h b/src/app/dialogs/app/pages.h index aaa708e14..0ed86761a 100644 --- a/src/app/dialogs/app/pages.h +++ b/src/app/dialogs/app/pages.h @@ -29,7 +29,13 @@ #ifndef PAGES_H #define PAGES_H -#include +#include + +class QCheckBox; +class QSpinBox; +class QComboBox; +class QGroupBox; +class QLineEdit; class ConfigurationPage : public QWidget { diff --git a/src/app/dialogs/tools/dialogarc.cpp b/src/app/dialogs/tools/dialogarc.cpp index 3e773f20c..f89723839 100644 --- a/src/app/dialogs/tools/dialogarc.cpp +++ b/src/app/dialogs/tools/dialogarc.cpp @@ -30,7 +30,9 @@ #include "ui_dialogarc.h" #include -#include + +#include "../../geometry/vpointf.h" +#include "../../container/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/dialogs/tools/dialogbisector.cpp b/src/app/dialogs/tools/dialogbisector.cpp index ec59cd269..6e4f50e81 100644 --- a/src/app/dialogs/tools/dialogbisector.cpp +++ b/src/app/dialogs/tools/dialogbisector.cpp @@ -29,7 +29,8 @@ #include "dialogbisector.h" #include "ui_dialogbisector.h" -#include +#include "../../geometry/vpointf.h" +#include "../../container/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/dialogs/tools/dialogcutarc.cpp b/src/app/dialogs/tools/dialogcutarc.cpp index 0a43e7e6d..55132134e 100644 --- a/src/app/dialogs/tools/dialogcutarc.cpp +++ b/src/app/dialogs/tools/dialogcutarc.cpp @@ -29,6 +29,9 @@ #include "dialogcutarc.h" #include "ui_dialogcutarc.h" +#include "../../geometry/varc.h" +#include "../../container/vcontainer.h" + //--------------------------------------------------------------------------------------------------------------------- /** * @brief DialogCutArc create dialog. diff --git a/src/app/dialogs/tools/dialogcutspline.cpp b/src/app/dialogs/tools/dialogcutspline.cpp index 43dc0d012..622c02f76 100644 --- a/src/app/dialogs/tools/dialogcutspline.cpp +++ b/src/app/dialogs/tools/dialogcutspline.cpp @@ -29,6 +29,9 @@ #include "dialogcutspline.h" #include "ui_dialogcutspline.h" +#include "../../geometry/vspline.h" +#include "../../container/vcontainer.h" + //--------------------------------------------------------------------------------------------------------------------- /** * @brief DialogCutSpline create dialog. diff --git a/src/app/dialogs/tools/dialogcutsplinepath.cpp b/src/app/dialogs/tools/dialogcutsplinepath.cpp index 7de7b87db..fd7bbfcbb 100644 --- a/src/app/dialogs/tools/dialogcutsplinepath.cpp +++ b/src/app/dialogs/tools/dialogcutsplinepath.cpp @@ -29,6 +29,9 @@ #include "dialogcutsplinepath.h" #include "ui_dialogcutsplinepath.h" +#include "../../geometry/vsplinepath.h" +#include "../../container/vcontainer.h" + //--------------------------------------------------------------------------------------------------------------------- /** * @brief DialogCutSplinePath create dialog. diff --git a/src/app/dialogs/tools/dialogdetail.cpp b/src/app/dialogs/tools/dialogdetail.cpp index ab20e9b45..6d75f1ef4 100644 --- a/src/app/dialogs/tools/dialogdetail.cpp +++ b/src/app/dialogs/tools/dialogdetail.cpp @@ -28,9 +28,13 @@ #include "dialogdetail.h" -#include #include +#include "../../geometry/varc.h" +#include "../../geometry/vpointf.h" +#include "../../geometry/vsplinepath.h" +#include "../../container/vcontainer.h" + //--------------------------------------------------------------------------------------------------------------------- /** * @brief DialogDetail create dialog diff --git a/src/app/dialogs/tools/dialogdetail.h b/src/app/dialogs/tools/dialogdetail.h index adcf69a34..adaa2067e 100644 --- a/src/app/dialogs/tools/dialogdetail.h +++ b/src/app/dialogs/tools/dialogdetail.h @@ -31,6 +31,7 @@ #include "ui_dialogdetail.h" #include "dialogtool.h" +#include "../../geometry/vdetail.h" /** * @brief The DialogDetail class dialog for ToolDetai. Help create detail and edit option. diff --git a/src/app/dialogs/tools/dialogeditwrongformula.cpp b/src/app/dialogs/tools/dialogeditwrongformula.cpp index f82e5ef4b..33fcbed3a 100644 --- a/src/app/dialogs/tools/dialogeditwrongformula.cpp +++ b/src/app/dialogs/tools/dialogeditwrongformula.cpp @@ -29,8 +29,6 @@ #include "dialogeditwrongformula.h" #include "ui_dialogeditwrongformula.h" -#include - //--------------------------------------------------------------------------------------------------------------------- DialogEditWrongFormula::DialogEditWrongFormula(const VContainer *data, QWidget *parent) :DialogTool(data, parent), ui(new Ui::DialogEditWrongFormula), formula(QString()) diff --git a/src/app/dialogs/tools/dialogendline.cpp b/src/app/dialogs/tools/dialogendline.cpp index 88dac3ec4..1aa7782b3 100644 --- a/src/app/dialogs/tools/dialogendline.cpp +++ b/src/app/dialogs/tools/dialogendline.cpp @@ -29,7 +29,8 @@ #include "dialogendline.h" #include "ui_dialogendline.h" -#include +#include "../../geometry/vpointf.h" +#include "../../container/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/dialogs/tools/dialogheight.cpp b/src/app/dialogs/tools/dialogheight.cpp index 7a6b80b32..082d87c47 100644 --- a/src/app/dialogs/tools/dialogheight.cpp +++ b/src/app/dialogs/tools/dialogheight.cpp @@ -29,7 +29,8 @@ #include "dialogheight.h" #include "ui_dialogheight.h" -#include +#include "../../geometry/vpointf.h" +#include "../../container/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/dialogs/tools/dialogline.cpp b/src/app/dialogs/tools/dialogline.cpp index 6682ca5a1..6ff5fd3a3 100644 --- a/src/app/dialogs/tools/dialogline.cpp +++ b/src/app/dialogs/tools/dialogline.cpp @@ -29,7 +29,8 @@ #include "dialogline.h" #include "ui_dialogline.h" -#include +#include "../../geometry/vpointf.h" +#include "../../container/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/dialogs/tools/dialoglineintersect.cpp b/src/app/dialogs/tools/dialoglineintersect.cpp index 8dd42b279..577decc3c 100644 --- a/src/app/dialogs/tools/dialoglineintersect.cpp +++ b/src/app/dialogs/tools/dialoglineintersect.cpp @@ -29,7 +29,8 @@ #include "dialoglineintersect.h" #include "ui_dialoglineintersect.h" -#include +#include "../../geometry/vpointf.h" +#include "../../container/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/dialogs/tools/dialognormal.cpp b/src/app/dialogs/tools/dialognormal.cpp index 1f4f57ebc..def5affab 100644 --- a/src/app/dialogs/tools/dialognormal.cpp +++ b/src/app/dialogs/tools/dialognormal.cpp @@ -29,8 +29,6 @@ #include "dialognormal.h" #include "ui_dialognormal.h" -#include - //--------------------------------------------------------------------------------------------------------------------- /** * @brief DialogNormal create dialog diff --git a/src/app/dialogs/tools/dialogpointofcontact.cpp b/src/app/dialogs/tools/dialogpointofcontact.cpp index 67c3d0d64..c66b8955c 100644 --- a/src/app/dialogs/tools/dialogpointofcontact.cpp +++ b/src/app/dialogs/tools/dialogpointofcontact.cpp @@ -28,7 +28,8 @@ #include "dialogpointofcontact.h" -#include +#include "../../geometry/vpointf.h" +#include "../../container/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/dialogs/tools/dialogpointofintersection.cpp b/src/app/dialogs/tools/dialogpointofintersection.cpp index 5683f9b75..b4f4f00ee 100644 --- a/src/app/dialogs/tools/dialogpointofintersection.cpp +++ b/src/app/dialogs/tools/dialogpointofintersection.cpp @@ -29,7 +29,8 @@ #include "dialogpointofintersection.h" #include "ui_dialogpointofintersection.h" -#include +#include "../../geometry/vpointf.h" +#include "../../container/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/dialogs/tools/dialogshoulderpoint.cpp b/src/app/dialogs/tools/dialogshoulderpoint.cpp index e0a3d5937..d47629bea 100644 --- a/src/app/dialogs/tools/dialogshoulderpoint.cpp +++ b/src/app/dialogs/tools/dialogshoulderpoint.cpp @@ -29,7 +29,8 @@ #include "dialogshoulderpoint.h" #include "ui_dialogshoulderpoint.h" -#include +#include "../../geometry/vpointf.h" +#include "../../container/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/dialogs/tools/dialogsinglepoint.cpp b/src/app/dialogs/tools/dialogsinglepoint.cpp index 544529cf4..c508eadbd 100644 --- a/src/app/dialogs/tools/dialogsinglepoint.cpp +++ b/src/app/dialogs/tools/dialogsinglepoint.cpp @@ -29,8 +29,6 @@ #include "dialogsinglepoint.h" #include "ui_dialogsinglepoint.h" -#include - //--------------------------------------------------------------------------------------------------------------------- /** * @brief DialogSinglePoint create dialog diff --git a/src/app/dialogs/tools/dialogspline.cpp b/src/app/dialogs/tools/dialogspline.cpp index b0d065189..9b0ccae43 100644 --- a/src/app/dialogs/tools/dialogspline.cpp +++ b/src/app/dialogs/tools/dialogspline.cpp @@ -29,7 +29,8 @@ #include "dialogspline.h" #include "ui_dialogspline.h" -#include +#include "../../geometry/vpointf.h" +#include "../../container/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/dialogs/tools/dialogsplinepath.cpp b/src/app/dialogs/tools/dialogsplinepath.cpp index b68ceef6d..066786ebe 100644 --- a/src/app/dialogs/tools/dialogsplinepath.cpp +++ b/src/app/dialogs/tools/dialogsplinepath.cpp @@ -29,8 +29,7 @@ #include "dialogsplinepath.h" #include "ui_dialogsplinepath.h" #include "../../geometry/vsplinepoint.h" - -#include +#include "../../container/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/dialogs/tools/dialogtool.cpp b/src/app/dialogs/tools/dialogtool.cpp index 6953004de..92496546e 100644 --- a/src/app/dialogs/tools/dialogtool.cpp +++ b/src/app/dialogs/tools/dialogtool.cpp @@ -28,10 +28,11 @@ #include "dialogtool.h" #include "../../container/calculator.h" -#include "../../geometry/vgobject.h" +#include "../../container/vcontainer.h" +#include "../../geometry/varc.h" +#include "../../geometry/vpointf.h" +#include "../../geometry/vsplinepath.h" #include "../../tools/vabstracttool.h" - -#include #include "../../../libs/qmuparser/qmuparsererror.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogtool.h b/src/app/dialogs/tools/dialogtool.h index f88612a11..029191aec 100644 --- a/src/app/dialogs/tools/dialogtool.h +++ b/src/app/dialogs/tools/dialogtool.h @@ -29,17 +29,19 @@ #ifndef DIALOGTOOL_H #define DIALOGTOOL_H -#include #include -#include -#include -#include -#include #include -#include -#include "../../container/vcontainer.h" #include "../../widgets/vapplication.h" +class QDoubleSpinBox; +class QLabel; +class QRadioButton; +class QComboBox; +class QListWidgetItem; +class QLineEdit; +class QListWidget; +class VContainer; + namespace ComboMode { /** diff --git a/src/app/dialogs/tools/dialogtriangle.cpp b/src/app/dialogs/tools/dialogtriangle.cpp index be953b2f9..ec87941e2 100644 --- a/src/app/dialogs/tools/dialogtriangle.cpp +++ b/src/app/dialogs/tools/dialogtriangle.cpp @@ -28,8 +28,8 @@ #include "dialogtriangle.h" #include "ui_dialogtriangle.h" - -#include +#include "../../geometry/vpointf.h" +#include "../../container/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/dialogs/tools/dialoguniondetails.cpp b/src/app/dialogs/tools/dialoguniondetails.cpp index ff6302e5a..2aa4a22b5 100644 --- a/src/app/dialogs/tools/dialoguniondetails.cpp +++ b/src/app/dialogs/tools/dialoguniondetails.cpp @@ -28,6 +28,8 @@ #include "dialoguniondetails.h" #include "ui_dialoguniondetails.h" +#include "../../geometry/vdetail.h" +#include "../../container/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/exception/vexception.cpp b/src/app/exception/vexception.cpp index e5d63c59c..5722e1f16 100644 --- a/src/app/exception/vexception.cpp +++ b/src/app/exception/vexception.cpp @@ -28,10 +28,10 @@ #include "vexception.h" #include -#include -#include #include "../options.h" -#include + +class QSpacerItem; +class QGridLayout; //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/exception/vexception.h b/src/app/exception/vexception.h index d6b18deb4..f524ee751 100644 --- a/src/app/exception/vexception.h +++ b/src/app/exception/vexception.h @@ -32,8 +32,8 @@ #include #include -#include -#include + +class QWidget; /** * @brief The VException class parent for all exception. Could be use for abstract exception diff --git a/src/app/exception/vexceptionemptyparameter.cpp b/src/app/exception/vexceptionemptyparameter.cpp index df8ce5051..b9d63e056 100644 --- a/src/app/exception/vexceptionemptyparameter.cpp +++ b/src/app/exception/vexceptionemptyparameter.cpp @@ -27,8 +27,7 @@ *************************************************************************/ #include "vexceptionemptyparameter.h" - -#include +#include //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/exception/vexceptionemptyparameter.h b/src/app/exception/vexceptionemptyparameter.h index f7fd2df2b..fbb61a2a2 100644 --- a/src/app/exception/vexceptionemptyparameter.h +++ b/src/app/exception/vexceptionemptyparameter.h @@ -31,7 +31,7 @@ #include "vexception.h" -#include +class QDomElement; /** * @brief The VExceptionEmptyParameter class for exception empty parameter diff --git a/src/app/exception/vexceptionobjecterror.cpp b/src/app/exception/vexceptionobjecterror.cpp index 5db24a2f1..b97257ddd 100644 --- a/src/app/exception/vexceptionobjecterror.cpp +++ b/src/app/exception/vexceptionobjecterror.cpp @@ -28,6 +28,7 @@ #include "vexceptionobjecterror.h" #include +#include //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/exception/vexceptionobjecterror.h b/src/app/exception/vexceptionobjecterror.h index 95570d11b..3e0759c53 100644 --- a/src/app/exception/vexceptionobjecterror.h +++ b/src/app/exception/vexceptionobjecterror.h @@ -31,7 +31,7 @@ #include "vexception.h" -#include +class QDomElement; /** * @brief The VExceptionObjectError class for exception object error diff --git a/src/app/exception/vexceptionwrongid.cpp b/src/app/exception/vexceptionwrongid.cpp index e058fd5dd..edc4c989e 100644 --- a/src/app/exception/vexceptionwrongid.cpp +++ b/src/app/exception/vexceptionwrongid.cpp @@ -28,6 +28,7 @@ #include "vexceptionwrongid.h" #include +#include //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/exception/vexceptionwrongid.h b/src/app/exception/vexceptionwrongid.h index 12e85bcd3..4f4bb0aad 100644 --- a/src/app/exception/vexceptionwrongid.h +++ b/src/app/exception/vexceptionwrongid.h @@ -31,7 +31,7 @@ #include "vexception.h" -#include +class QDomElement; /** * @brief The VExceptionWrongId class for exception wrong id diff --git a/src/app/geometry/varc.cpp b/src/app/geometry/varc.cpp index ef7805b7c..53afc19ff 100644 --- a/src/app/geometry/varc.cpp +++ b/src/app/geometry/varc.cpp @@ -27,12 +27,12 @@ *************************************************************************/ #include "varc.h" -#include "vspline.h" -#include "../exception/vexception.h" #include -#include -class QRectF; +#ifdef Q_OS_WIN32 +# include // for M_PI on Windows +#endif /*Q_OS_WIN32*/ + //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/geometry/varc.h b/src/app/geometry/varc.h index fdaa8cbeb..3aeec81b2 100644 --- a/src/app/geometry/varc.h +++ b/src/app/geometry/varc.h @@ -30,11 +30,8 @@ #define VARC_H #include "vgobject.h" -#include -#include "../options.h" #include "vpointf.h" -class QString; -class QLineF; + class QPainterPath; /** diff --git a/src/app/geometry/vdetail.cpp b/src/app/geometry/vdetail.cpp index bfa7f346f..8363d860d 100644 --- a/src/app/geometry/vdetail.cpp +++ b/src/app/geometry/vdetail.cpp @@ -28,6 +28,7 @@ #include "vdetail.h" #include +#include //--------------------------------------------------------------------------------------------------------------------- VDetail::VDetail() diff --git a/src/app/geometry/vdetail.h b/src/app/geometry/vdetail.h index 373a50cbf..a43bc0963 100644 --- a/src/app/geometry/vdetail.h +++ b/src/app/geometry/vdetail.h @@ -30,10 +30,10 @@ #define VDETAIL_H #include "vnodedetail.h" - -#include #include +class QString; + namespace Detail { /** diff --git a/src/app/geometry/vequidistant.cpp b/src/app/geometry/vequidistant.cpp index c80f34324..c6ea4def8 100644 --- a/src/app/geometry/vequidistant.cpp +++ b/src/app/geometry/vequidistant.cpp @@ -26,9 +26,15 @@ ** *************************************************************************/ +#include "varc.h" #include "vequidistant.h" +#include "vpointf.h" +#include "vspline.h" +#include "vsplinepath.h" #include "../widgets/vapplication.h" #include +#include +#include "../container/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- QPainterPath VEquidistant::ContourPath(const quint32 &idDetail, const VContainer *data) const diff --git a/src/app/geometry/vequidistant.h b/src/app/geometry/vequidistant.h index d92ff2487..aa640739d 100644 --- a/src/app/geometry/vequidistant.h +++ b/src/app/geometry/vequidistant.h @@ -29,8 +29,12 @@ #ifndef VEQUIDISTANT_H #define VEQUIDISTANT_H -#include -#include "../container/vcontainer.h" +#include "vdetail.h" + +class QPainterPath; +class VContainer; +class QPointF; +class QLineF; /** * @brief The VEquidistant class calculate equidistant for detail. diff --git a/src/app/geometry/vgobject.h b/src/app/geometry/vgobject.h index 29a6d71ad..fae9abc7a 100644 --- a/src/app/geometry/vgobject.h +++ b/src/app/geometry/vgobject.h @@ -30,10 +30,6 @@ #define VGOBJECT_H #include "../options.h" -#include "../exception/vexception.h" -#include -#include - namespace GObject { diff --git a/src/app/geometry/vnodedetail.h b/src/app/geometry/vnodedetail.h index 72b11d893..6e0c54969 100644 --- a/src/app/geometry/vnodedetail.h +++ b/src/app/geometry/vnodedetail.h @@ -29,7 +29,6 @@ #ifndef VNODEDETAIL_H #define VNODEDETAIL_H -#include #include "../options.h" namespace NodeDetail diff --git a/src/app/geometry/vpointf.cpp b/src/app/geometry/vpointf.cpp index 76889fa04..a921e4c7c 100644 --- a/src/app/geometry/vpointf.cpp +++ b/src/app/geometry/vpointf.cpp @@ -27,6 +27,8 @@ *************************************************************************/ #include "vpointf.h" +#include +#include //--------------------------------------------------------------------------------------------------------------------- /** @@ -78,3 +80,13 @@ QString VPointF::name() const { return _name; } + +//--------------------------------------------------------------------------------------------------------------------- +/** + * @brief toQPointF convert to QPointF + * @return QPointF point + */ +QPointF VPointF::toQPointF() const +{ + return QPointF(_x, _y); +} diff --git a/src/app/geometry/vpointf.h b/src/app/geometry/vpointf.h index 04955e1ee..bf8e7c617 100644 --- a/src/app/geometry/vpointf.h +++ b/src/app/geometry/vpointf.h @@ -29,11 +29,11 @@ #ifndef VPOINTF_H #define VPOINTF_H -#include -#include -#include "../options.h" #include "vgobject.h" +class QPointF; +class QString; + /** * @brief The VPointF class keep data of point. */ @@ -111,16 +111,6 @@ inline void VPointF::setMy(qreal my) _my = my; } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief toQPointF convert to QPointF - * @return QPointF point - */ -inline QPointF VPointF::toQPointF() const -{ - return QPointF(_x, _y); -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief x return x coordinate diff --git a/src/app/geometry/vspline.cpp b/src/app/geometry/vspline.cpp index 1289ad14b..aa25fbad7 100644 --- a/src/app/geometry/vspline.cpp +++ b/src/app/geometry/vspline.cpp @@ -27,9 +27,11 @@ *************************************************************************/ #include "vspline.h" -#include #include -#include + +#ifdef Q_OS_WIN32 +# include // for M_PI on Windows +#endif /*Q_OS_WIN32*/ //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/geometry/vspline.h b/src/app/geometry/vspline.h index 5fb8f1659..c5dedf3cb 100644 --- a/src/app/geometry/vspline.h +++ b/src/app/geometry/vspline.h @@ -32,11 +32,8 @@ #include "vpointf.h" #include "vgobject.h" -#include -#include -#include - -class QString; +class QLineF; +class QPainterPath; #define M_2PI 6.28318530717958647692528676655900576 @@ -52,6 +49,7 @@ public: quint32 idObject = 0, Valentina::Draws mode = Valentina::Calculation); VSpline (VPointF p1, QPointF p2, QPointF p3, VPointF p4, qreal kCurve, quint32 idObject = 0, Valentina::Draws mode = Valentina::Calculation); + VSpline &operator=(const VSpline &spl); VPointF GetP1 () const; QPointF GetP2 () const; QPointF GetP3 () const; @@ -72,7 +70,6 @@ public: // cppcheck-suppress unusedFunction static QVector SplinePoints(const QPointF &p1, const QPointF &p4, qreal angle1, qreal angle2, qreal kAsm1, qreal kAsm2, qreal kCurve); - VSpline &operator=(const VSpline &spl); protected: static QVector GetPoints (const QPointF &p1, const QPointF &p2, const QPointF &p3, const QPointF &p4 ); private: diff --git a/src/app/geometry/vsplinepath.h b/src/app/geometry/vsplinepath.h index f162da02a..42a3fac0c 100644 --- a/src/app/geometry/vsplinepath.h +++ b/src/app/geometry/vsplinepath.h @@ -29,12 +29,9 @@ #ifndef VSPLINEPATH_H #define VSPLINEPATH_H -#include "vsplinepoint.h" -#include "vpointf.h" -#include "vspline.h" #include "vgobject.h" -#include -#include "../container/vcontainer.h" +#include "vspline.h" +#include "vsplinepoint.h" namespace SplinePoint { diff --git a/src/app/geometry/vsplinepoint.h b/src/app/geometry/vsplinepoint.h index 95a07a911..f19826c5e 100644 --- a/src/app/geometry/vsplinepoint.h +++ b/src/app/geometry/vsplinepoint.h @@ -29,7 +29,6 @@ #ifndef VSPLINEPOINT_H #define VSPLINEPOINT_H -#include #include "vpointf.h" /** diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp index 847c63986..66ef96266 100644 --- a/src/app/mainwindow.cpp +++ b/src/app/mainwindow.cpp @@ -36,6 +36,7 @@ #include "exception/vexceptionwrongid.h" #include "version.h" #include "xml/vstandardmeasurements.h" +#include "xml/vindividualmeasurements.h" #include "widgets/vapplication.h" #include diff --git a/src/app/options.cpp b/src/app/options.cpp index 0cd5de7f8..06a2adb8e 100644 --- a/src/app/options.cpp +++ b/src/app/options.cpp @@ -27,6 +27,7 @@ *************************************************************************/ #include "options.h" +#include // Keep synchronize all names with initialization in VApllication class. //measurements diff --git a/src/app/options.h b/src/app/options.h index 53cdb7c61..d832eb9ac 100644 --- a/src/app/options.h +++ b/src/app/options.h @@ -30,15 +30,14 @@ #define OPTIONS_H #include -#include -#include -#include #include #ifdef Q_OS_WIN32 -#include +# include #endif /*Q_OS_WIN32*/ +class QString; + #define SceneSize 50000 namespace Valentina diff --git a/src/app/stable.h b/src/app/stable.h index 22bf1261b..c49a78395 100644 --- a/src/app/stable.h +++ b/src/app/stable.h @@ -35,6 +35,7 @@ #endif /* Add C includes here */ +#include #if defined __cplusplus /* Add C++ includes here */ diff --git a/src/app/tools/drawTools/vdrawtool.cpp b/src/app/tools/drawTools/vdrawtool.cpp index 797750657..265e15c90 100644 --- a/src/app/tools/drawTools/vdrawtool.cpp +++ b/src/app/tools/drawTools/vdrawtool.cpp @@ -29,8 +29,8 @@ #include "vdrawtool.h" #include -#include -#include +#include "dialogs/tools/dialogeditwrongformula.h" +#include "container/calculator.h" #include "../../xml/vundocommands.h" qreal VDrawTool::factor = 1; diff --git a/src/app/tools/drawTools/vdrawtool.h b/src/app/tools/drawTools/vdrawtool.h index 842ca5bc7..3718d2253 100644 --- a/src/app/tools/drawTools/vdrawtool.h +++ b/src/app/tools/drawTools/vdrawtool.h @@ -35,6 +35,8 @@ #include #include #include "../../dialogs/tools/dialogtool.h" +#include "../../widgets/vmaingraphicsscene.h" +#include "../../xml/vpattern.h" /** * @brief The VDrawTool abstract class for all draw tool. diff --git a/src/app/tools/drawTools/vtoolalongline.cpp b/src/app/tools/drawTools/vtoolalongline.cpp index b6ca59ec2..40e046af1 100644 --- a/src/app/tools/drawTools/vtoolalongline.cpp +++ b/src/app/tools/drawTools/vtoolalongline.cpp @@ -29,7 +29,7 @@ #include "vtoolalongline.h" #include "../../container/calculator.h" #include "../../dialogs/tools/dialogalongline.h" - +#include "../../geometry/vpointf.h" #include "exception/vexceptionobjecterror.h" const QString VToolAlongLine::ToolType = QStringLiteral("alongLine"); diff --git a/src/app/tools/drawTools/vtoolarc.cpp b/src/app/tools/drawTools/vtoolarc.cpp index 9664f2528..6cc624f2e 100644 --- a/src/app/tools/drawTools/vtoolarc.cpp +++ b/src/app/tools/drawTools/vtoolarc.cpp @@ -30,6 +30,7 @@ #include "../../container/calculator.h" #include "../../dialogs/tools/dialogarc.h" #include +#include "../../geometry/varc.h" const QString VToolArc::TagName = QStringLiteral("arc"); const QString VToolArc::ToolType = QStringLiteral("simple"); diff --git a/src/app/tools/drawTools/vtoolbisector.cpp b/src/app/tools/drawTools/vtoolbisector.cpp index 07a136106..03b8aef62 100644 --- a/src/app/tools/drawTools/vtoolbisector.cpp +++ b/src/app/tools/drawTools/vtoolbisector.cpp @@ -29,6 +29,7 @@ #include "vtoolbisector.h" #include "../../container/calculator.h" #include "../../dialogs/tools/dialogbisector.h" +#include "../../geometry/vpointf.h" const QString VToolBisector::ToolType = QStringLiteral("bisector"); diff --git a/src/app/tools/drawTools/vtoolcutarc.cpp b/src/app/tools/drawTools/vtoolcutarc.cpp index 50521d867..b40651ae9 100644 --- a/src/app/tools/drawTools/vtoolcutarc.cpp +++ b/src/app/tools/drawTools/vtoolcutarc.cpp @@ -29,6 +29,8 @@ #include "vtoolcutarc.h" #include "../../container/calculator.h" #include "../../dialogs/tools/dialogcutarc.h" +#include "../../geometry/vpointf.h" +#include "../../geometry/varc.h" const QString VToolCutArc::ToolType = QStringLiteral("cutArc"); const QString VToolCutArc::AttrArc = QStringLiteral("arc"); diff --git a/src/app/tools/drawTools/vtoolcutspline.cpp b/src/app/tools/drawTools/vtoolcutspline.cpp index 4e74b31d6..83240a84a 100644 --- a/src/app/tools/drawTools/vtoolcutspline.cpp +++ b/src/app/tools/drawTools/vtoolcutspline.cpp @@ -29,6 +29,9 @@ #include "vtoolcutspline.h" #include "../../container/calculator.h" #include "../../dialogs/tools/dialogcutspline.h" +#include "../../geometry/vpointf.h" + +#include const QString VToolCutSpline::ToolType = QStringLiteral("cutSpline"); const QString VToolCutSpline::AttrSpline = QStringLiteral("spline"); diff --git a/src/app/tools/drawTools/vtoolcutsplinepath.cpp b/src/app/tools/drawTools/vtoolcutsplinepath.cpp index e21db71cd..63b25a8bf 100644 --- a/src/app/tools/drawTools/vtoolcutsplinepath.cpp +++ b/src/app/tools/drawTools/vtoolcutsplinepath.cpp @@ -29,6 +29,9 @@ #include "vtoolcutsplinepath.h" #include "../../container/calculator.h" #include "../../dialogs/tools/dialogcutsplinepath.h" +#include "../../geometry/vpointf.h" + +#include "../../geometry/vsplinepath.h" const QString VToolCutSplinePath::ToolType = QStringLiteral("cutSplinePath"); const QString VToolCutSplinePath::AttrSplinePath = QStringLiteral("splinePath"); diff --git a/src/app/tools/drawTools/vtoolendline.cpp b/src/app/tools/drawTools/vtoolendline.cpp index 107a6e107..95d2c384c 100644 --- a/src/app/tools/drawTools/vtoolendline.cpp +++ b/src/app/tools/drawTools/vtoolendline.cpp @@ -31,6 +31,7 @@ #include "../../container/calculator.h" #include "../../dialogs/tools/dialogendline.h" #include "../../dialogs/tools/dialogeditwrongformula.h" +#include "../../geometry/vpointf.h" const QString VToolEndLine::ToolType = QStringLiteral("endLine"); diff --git a/src/app/tools/drawTools/vtoolheight.cpp b/src/app/tools/drawTools/vtoolheight.cpp index 88b92801e..240e1eb84 100644 --- a/src/app/tools/drawTools/vtoolheight.cpp +++ b/src/app/tools/drawTools/vtoolheight.cpp @@ -28,6 +28,7 @@ #include "vtoolheight.h" #include "../../dialogs/tools/dialogheight.h" +#include "../../geometry/vpointf.h" const QString VToolHeight::ToolType = QStringLiteral("height"); diff --git a/src/app/tools/drawTools/vtoolline.cpp b/src/app/tools/drawTools/vtoolline.cpp index 49014357d..c7a2418f5 100644 --- a/src/app/tools/drawTools/vtoolline.cpp +++ b/src/app/tools/drawTools/vtoolline.cpp @@ -29,6 +29,8 @@ #include "vtoolline.h" #include "../../dialogs/tools/dialogline.h" #include +#include "../../geometry/vpointf.h" +#include "../../dialogs/tools/dialogline.h" const QString VToolLine::TagName = QStringLiteral("line"); diff --git a/src/app/tools/drawTools/vtoolline.h b/src/app/tools/drawTools/vtoolline.h index 6302a26e5..6c0ee309d 100644 --- a/src/app/tools/drawTools/vtoolline.h +++ b/src/app/tools/drawTools/vtoolline.h @@ -31,7 +31,6 @@ #include "vdrawtool.h" #include -#include "../../dialogs/tools/dialogline.h" /** * @brief The VToolLine class tool for creation line. diff --git a/src/app/tools/drawTools/vtoollineintersect.cpp b/src/app/tools/drawTools/vtoollineintersect.cpp index b73cafaf0..768563317 100644 --- a/src/app/tools/drawTools/vtoollineintersect.cpp +++ b/src/app/tools/drawTools/vtoollineintersect.cpp @@ -28,6 +28,7 @@ #include "vtoollineintersect.h" #include "../../dialogs/tools/dialoglineintersect.h" +#include "../../geometry/vpointf.h" const QString VToolLineIntersect::ToolType = QStringLiteral("lineIntersect"); diff --git a/src/app/tools/drawTools/vtoollinepoint.cpp b/src/app/tools/drawTools/vtoollinepoint.cpp index c5dc5d5a7..6b892d680 100644 --- a/src/app/tools/drawTools/vtoollinepoint.cpp +++ b/src/app/tools/drawTools/vtoollinepoint.cpp @@ -27,6 +27,7 @@ *************************************************************************/ #include "vtoollinepoint.h" +#include "../../geometry/vpointf.h" //--------------------------------------------------------------------------------------------------------------------- VToolLinePoint::VToolLinePoint(VPattern *doc, VContainer *data, const quint32 &id, diff --git a/src/app/tools/drawTools/vtoolnormal.cpp b/src/app/tools/drawTools/vtoolnormal.cpp index ef5b9ba9b..c575a750d 100644 --- a/src/app/tools/drawTools/vtoolnormal.cpp +++ b/src/app/tools/drawTools/vtoolnormal.cpp @@ -29,6 +29,7 @@ #include "vtoolnormal.h" #include "../../container/calculator.h" #include "../../dialogs/tools/dialognormal.h" +#include "../../geometry/vpointf.h" const QString VToolNormal::ToolType = QStringLiteral("normal"); diff --git a/src/app/tools/drawTools/vtoolpoint.cpp b/src/app/tools/drawTools/vtoolpoint.cpp index 563e749a2..e054b5c61 100644 --- a/src/app/tools/drawTools/vtoolpoint.cpp +++ b/src/app/tools/drawTools/vtoolpoint.cpp @@ -28,6 +28,8 @@ #include "vtoolpoint.h" #include +#include "../../geometry/vpointf.h" +#include "../../widgets/vgraphicssimpletextitem.h" const QString VToolPoint::TagName = QStringLiteral("point"); diff --git a/src/app/tools/drawTools/vtoolpoint.h b/src/app/tools/drawTools/vtoolpoint.h index ab505e14e..31e155283 100644 --- a/src/app/tools/drawTools/vtoolpoint.h +++ b/src/app/tools/drawTools/vtoolpoint.h @@ -30,7 +30,9 @@ #define VTOOLPOINT_H #include "vdrawtool.h" -#include "../../widgets/vgraphicssimpletextitem.h" + +class VPointF; +class VGraphicsSimpleTextItem; /** * @brief The VToolPoint class parent for all tools what create points. diff --git a/src/app/tools/drawTools/vtoolpointofcontact.cpp b/src/app/tools/drawTools/vtoolpointofcontact.cpp index 25d942d7c..79a9ed9c4 100644 --- a/src/app/tools/drawTools/vtoolpointofcontact.cpp +++ b/src/app/tools/drawTools/vtoolpointofcontact.cpp @@ -29,6 +29,7 @@ #include "vtoolpointofcontact.h" #include "../../container/calculator.h" #include "../../dialogs/tools/dialogpointofcontact.h" +#include "../../geometry/vpointf.h" const QString VToolPointOfContact::ToolType = QStringLiteral("pointOfContact"); diff --git a/src/app/tools/drawTools/vtoolpointofintersection.cpp b/src/app/tools/drawTools/vtoolpointofintersection.cpp index 9ff688a39..0fd0ef287 100644 --- a/src/app/tools/drawTools/vtoolpointofintersection.cpp +++ b/src/app/tools/drawTools/vtoolpointofintersection.cpp @@ -28,6 +28,7 @@ #include "vtoolpointofintersection.h" #include "../../dialogs/tools/dialogpointofintersection.h" +#include "../../geometry/vpointf.h" const QString VToolPointOfIntersection::ToolType = QStringLiteral("pointOfIntersection"); diff --git a/src/app/tools/drawTools/vtoolshoulderpoint.cpp b/src/app/tools/drawTools/vtoolshoulderpoint.cpp index 354aec712..e9b079991 100644 --- a/src/app/tools/drawTools/vtoolshoulderpoint.cpp +++ b/src/app/tools/drawTools/vtoolshoulderpoint.cpp @@ -29,6 +29,7 @@ #include "vtoolshoulderpoint.h" #include "../../container/calculator.h" #include "../../dialogs/tools/dialogshoulderpoint.h" +#include "../../geometry/vpointf.h" const QString VToolShoulderPoint::ToolType = QStringLiteral("shoulder"); diff --git a/src/app/tools/drawTools/vtoolsinglepoint.cpp b/src/app/tools/drawTools/vtoolsinglepoint.cpp index dc56afa12..c8ea5cfbe 100644 --- a/src/app/tools/drawTools/vtoolsinglepoint.cpp +++ b/src/app/tools/drawTools/vtoolsinglepoint.cpp @@ -28,8 +28,9 @@ #include "vtoolsinglepoint.h" #include "../../dialogs/tools/dialogsinglepoint.h" - -#include +#include "../../widgets/vgraphicssimpletextitem.h" +#include "../../xml/vundocommands.h" +#include "../../geometry/vpointf.h" const QString VToolSinglePoint::ToolType = QStringLiteral("single"); diff --git a/src/app/tools/drawTools/vtoolspline.h b/src/app/tools/drawTools/vtoolspline.h index a13f6655b..025f8cb95 100644 --- a/src/app/tools/drawTools/vtoolspline.h +++ b/src/app/tools/drawTools/vtoolspline.h @@ -30,7 +30,6 @@ #define VTOOLSPLINE_H #include "vabstractspline.h" -#include "../../geometry/vsplinepath.h" /** * @brief The VToolSpline class tool for creation spline. I mean bezier curve. diff --git a/src/app/tools/drawTools/vtooltriangle.cpp b/src/app/tools/drawTools/vtooltriangle.cpp index 28ca05b8c..c80391cd5 100644 --- a/src/app/tools/drawTools/vtooltriangle.cpp +++ b/src/app/tools/drawTools/vtooltriangle.cpp @@ -28,6 +28,7 @@ #include "vtooltriangle.h" #include "../../dialogs/tools/dialogtriangle.h" +#include "../../geometry/vpointf.h" const QString VToolTriangle::ToolType = QStringLiteral("triangle"); diff --git a/src/app/tools/nodeDetails/vabstractnode.cpp b/src/app/tools/nodeDetails/vabstractnode.cpp index eafadc8b0..2baf4fc59 100644 --- a/src/app/tools/nodeDetails/vabstractnode.cpp +++ b/src/app/tools/nodeDetails/vabstractnode.cpp @@ -28,6 +28,7 @@ #include "vabstractnode.h" #include +#include "../../xml/vpattern.h" const QString VAbstractNode::AttrIdObject = QStringLiteral("idObject"); const QString VAbstractNode::AttrIdTool = QStringLiteral("idTool"); diff --git a/src/app/tools/nodeDetails/vnodearc.cpp b/src/app/tools/nodeDetails/vnodearc.cpp index b87aeb9fb..63f520b12 100644 --- a/src/app/tools/nodeDetails/vnodearc.cpp +++ b/src/app/tools/nodeDetails/vnodearc.cpp @@ -28,8 +28,8 @@ #include "vnodearc.h" -#include #include "../../widgets/vapplication.h" +#include "../../geometry/varc.h" const QString VNodeArc::TagName = QStringLiteral("arc"); const QString VNodeArc::ToolType = QStringLiteral("modeling"); diff --git a/src/app/tools/nodeDetails/vnodearc.h b/src/app/tools/nodeDetails/vnodearc.h index cf22507bf..4c931ec29 100644 --- a/src/app/tools/nodeDetails/vnodearc.h +++ b/src/app/tools/nodeDetails/vnodearc.h @@ -31,6 +31,7 @@ #include "vabstractnode.h" #include +#include "../../xml/vpattern.h" /** * @brief The VNodeArc class arc detail node. diff --git a/src/app/tools/nodeDetails/vnodepoint.cpp b/src/app/tools/nodeDetails/vnodepoint.cpp index d6735f89c..fe872bef4 100644 --- a/src/app/tools/nodeDetails/vnodepoint.cpp +++ b/src/app/tools/nodeDetails/vnodepoint.cpp @@ -28,8 +28,9 @@ #include "vnodepoint.h" -#include #include "../../widgets/vapplication.h" +#include "../../geometry/vpointf.h" +#include "../../widgets/vgraphicssimpletextitem.h" const QString VNodePoint::TagName = QStringLiteral("point"); const QString VNodePoint::ToolType = QStringLiteral("modeling"); diff --git a/src/app/tools/nodeDetails/vnodepoint.h b/src/app/tools/nodeDetails/vnodepoint.h index e91de3354..dbb7c33a9 100644 --- a/src/app/tools/nodeDetails/vnodepoint.h +++ b/src/app/tools/nodeDetails/vnodepoint.h @@ -30,7 +30,10 @@ #define VNODEPOINT_H #include "vabstractnode.h" -#include "../../widgets/vgraphicssimpletextitem.h" +#include "../../xml/vpattern.h" + +class VPointF; +class VGraphicsSimpleTextItem; /** * @brief The VNodePoint class point detail node. diff --git a/src/app/tools/nodeDetails/vnodespline.cpp b/src/app/tools/nodeDetails/vnodespline.cpp index bebdb7042..70ca47377 100644 --- a/src/app/tools/nodeDetails/vnodespline.cpp +++ b/src/app/tools/nodeDetails/vnodespline.cpp @@ -28,8 +28,8 @@ #include "vnodespline.h" -#include #include "../../widgets/vapplication.h" +#include "../../geometry/vspline.h" const QString VNodeSpline::TagName = QStringLiteral("spline"); const QString VNodeSpline::ToolType = QStringLiteral("modelingSpline"); diff --git a/src/app/tools/nodeDetails/vnodespline.h b/src/app/tools/nodeDetails/vnodespline.h index 39fa1ac38..872bf6cd5 100644 --- a/src/app/tools/nodeDetails/vnodespline.h +++ b/src/app/tools/nodeDetails/vnodespline.h @@ -31,6 +31,7 @@ #include "vabstractnode.h" #include +#include "../../xml/vpattern.h" /** * @brief The VNodeSpline class spline detail node. diff --git a/src/app/tools/nodeDetails/vnodesplinepath.cpp b/src/app/tools/nodeDetails/vnodesplinepath.cpp index 8b2fc44fd..8020597f6 100644 --- a/src/app/tools/nodeDetails/vnodesplinepath.cpp +++ b/src/app/tools/nodeDetails/vnodesplinepath.cpp @@ -28,8 +28,8 @@ #include "vnodesplinepath.h" -#include #include "../../widgets/vapplication.h" +#include "../../geometry/vsplinepath.h" const QString VNodeSplinePath::TagName = QStringLiteral("spline"); const QString VNodeSplinePath::ToolType = QStringLiteral("modelingPath"); diff --git a/src/app/tools/nodeDetails/vnodesplinepath.h b/src/app/tools/nodeDetails/vnodesplinepath.h index 3518aef72..d83738b0d 100644 --- a/src/app/tools/nodeDetails/vnodesplinepath.h +++ b/src/app/tools/nodeDetails/vnodesplinepath.h @@ -31,6 +31,7 @@ #include "vabstractnode.h" #include +#include "../../xml/vpattern.h" /** * @brief The VNodeSplinePath class spline path detail node. diff --git a/src/app/tools/vabstracttool.cpp b/src/app/tools/vabstracttool.cpp index d22654351..8a4d4bb08 100644 --- a/src/app/tools/vabstracttool.cpp +++ b/src/app/tools/vabstracttool.cpp @@ -27,6 +27,7 @@ *************************************************************************/ #include "vabstracttool.h" +#include "../xml/vpattern.h" #include const QString VAbstractTool::AttrType = QStringLiteral("type"); diff --git a/src/app/tools/vabstracttool.h b/src/app/tools/vabstracttool.h index e31f8468b..1bdc129ef 100644 --- a/src/app/tools/vabstracttool.h +++ b/src/app/tools/vabstracttool.h @@ -30,8 +30,8 @@ #define VABSTRACTTOOL_H #include "vdatatool.h" -#include "../xml/vpattern.h" -#include + +class VPattern; /** * @brief The VAbstractTool abstract class for all tools. diff --git a/src/app/tools/vdatatool.cpp b/src/app/tools/vdatatool.cpp index ec16d4f67..9207c3337 100644 --- a/src/app/tools/vdatatool.cpp +++ b/src/app/tools/vdatatool.cpp @@ -39,7 +39,7 @@ VDataTool &VDataTool::operator =(const VDataTool &tool) { data = tool.getData(); _referens = tool.referens(); - return *this; + return *this; } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/tools/vdatatool.h b/src/app/tools/vdatatool.h index ceb185b34..8f50e492f 100644 --- a/src/app/tools/vdatatool.h +++ b/src/app/tools/vdatatool.h @@ -31,6 +31,8 @@ #include "../container/vcontainer.h" +class QObject; + //We need QObject class because we use qobject_cast. /** * @brief The VDataTool class need for getting access to data container of tool. diff --git a/src/app/tools/vtooldetail.cpp b/src/app/tools/vtooldetail.cpp index f165a5165..6c69b88b2 100644 --- a/src/app/tools/vtooldetail.cpp +++ b/src/app/tools/vtooldetail.cpp @@ -28,7 +28,12 @@ #include "vtooldetail.h" #include "nodeDetails/nodedetails.h" +#include "../geometry/varc.h" +#include "../geometry/vsplinepath.h" #include "../geometry/vequidistant.h" +#include "../widgets/vmaingraphicsscene.h" +#include "../dialogs/tools/dialogtool.h" +#include "../dialogs/tools/dialogdetail.h" #include #include #include diff --git a/src/app/tools/vtooldetail.h b/src/app/tools/vtooldetail.h index c6e69eab3..d650255f2 100644 --- a/src/app/tools/vtooldetail.h +++ b/src/app/tools/vtooldetail.h @@ -31,8 +31,11 @@ #include "vabstracttool.h" #include -#include "../dialogs/tools/dialogdetail.h" -#include "../dialogs/tools/dialogtool.h" +#include "../xml/vpattern.h" + +class VMainGraphicsScene; +class DialogTool; + /** * @brief The VToolDetail class for working with detail. */ diff --git a/src/app/tools/vtooluniondetails.cpp b/src/app/tools/vtooluniondetails.cpp index ed4dfbf26..50245d1c7 100644 --- a/src/app/tools/vtooluniondetails.cpp +++ b/src/app/tools/vtooluniondetails.cpp @@ -29,6 +29,10 @@ #include "vtooluniondetails.h" #include "nodeDetails/nodedetails.h" #include "vtooldetail.h" +#include "../geometry/vpointf.h" +#include "../geometry/varc.h" +#include "../geometry/vsplinepath.h" +#include "../dialogs/tools/dialoguniondetails.h" const QString VToolUnionDetails::TagName = QStringLiteral("tools"); const QString VToolUnionDetails::ToolType = QStringLiteral("unionDetails"); diff --git a/src/app/tools/vtooluniondetails.h b/src/app/tools/vtooluniondetails.h index be3cbe798..f4b6be093 100644 --- a/src/app/tools/vtooluniondetails.h +++ b/src/app/tools/vtooluniondetails.h @@ -30,7 +30,11 @@ #define VTOOLUNIONDETAILS_H #include "vabstracttool.h" -#include "../dialogs/tools/dialoguniondetails.h" +#include "../xml/vpattern.h" + +class VPointF; +class VMainGraphicsScene; +class DialogTool; /** * @brief The VToolUnionDetails class tool union details. diff --git a/src/app/widgets/vapplication.cpp b/src/app/widgets/vapplication.cpp index 7e5e11a96..9754ef21d 100644 --- a/src/app/widgets/vapplication.cpp +++ b/src/app/widgets/vapplication.cpp @@ -32,14 +32,17 @@ #include "../exception/vexceptionconversionerror.h" #include "../exception/vexceptionemptyparameter.h" #include "../exception/vexceptionwrongid.h" +#include "vmaingraphicsview.h" +#include "../container/calculator.h" -#include #include #include #include +#include -#include -#include +#ifdef Q_OS_WIN32 +# include // for M_PI on Windows +#endif /*Q_OS_WIN32*/ const qreal VApplication::PrintDPI = 96.0; diff --git a/src/app/widgets/vapplication.h b/src/app/widgets/vapplication.h index 07d6ccd3d..a923b3968 100644 --- a/src/app/widgets/vapplication.h +++ b/src/app/widgets/vapplication.h @@ -30,12 +30,12 @@ #define VAPPLICATION_H #include -#include #include "../options.h" -#include "vmaingraphicsview.h" #include "vtranslation.h" class VApplication; +class QUndoStack; +class VMainGraphicsView; #if defined(qApp) #undef qApp diff --git a/src/app/widgets/vgraphicssimpletextitem.cpp b/src/app/widgets/vgraphicssimpletextitem.cpp index 4cadfbbe2..d1498fed8 100644 --- a/src/app/widgets/vgraphicssimpletextitem.cpp +++ b/src/app/widgets/vgraphicssimpletextitem.cpp @@ -28,8 +28,6 @@ #include "vgraphicssimpletextitem.h" -#include - //--------------------------------------------------------------------------------------------------------------------- VGraphicsSimpleTextItem::VGraphicsSimpleTextItem(QGraphicsItem * parent) :QGraphicsSimpleTextItem(parent), fontSize(0) diff --git a/src/app/widgets/vgraphicssimpletextitem.h b/src/app/widgets/vgraphicssimpletextitem.h index 9593d0da8..9df392062 100644 --- a/src/app/widgets/vgraphicssimpletextitem.h +++ b/src/app/widgets/vgraphicssimpletextitem.h @@ -30,6 +30,7 @@ #define VGRAPHICSSIMPLETEXTITEM_H #include +#include /** * @brief The VGraphicsSimpleTextItem class pointer label. diff --git a/src/app/widgets/vmaingraphicsscene.cpp b/src/app/widgets/vmaingraphicsscene.cpp index f96733bce..839ef2fea 100644 --- a/src/app/widgets/vmaingraphicsscene.cpp +++ b/src/app/widgets/vmaingraphicsscene.cpp @@ -28,8 +28,6 @@ #include "vmaingraphicsscene.h" -#include - //--------------------------------------------------------------------------------------------------------------------- VMainGraphicsScene::VMainGraphicsScene() :QGraphicsScene(), horScrollBar(0), verScrollBar(0), scaleFactor(1), _transform(QTransform()) diff --git a/src/app/widgets/vtablegraphicsview.cpp b/src/app/widgets/vtablegraphicsview.cpp index 3ef25896f..79478647c 100644 --- a/src/app/widgets/vtablegraphicsview.cpp +++ b/src/app/widgets/vtablegraphicsview.cpp @@ -29,7 +29,6 @@ #include "vtablegraphicsview.h" #include -#include #include //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/widgets/vtranslation.h b/src/app/widgets/vtranslation.h index 8fec40fb5..edcd3b3a8 100644 --- a/src/app/widgets/vtranslation.h +++ b/src/app/widgets/vtranslation.h @@ -29,7 +29,6 @@ #ifndef VTRANSLATION_H #define VTRANSLATION_H -#include #include /** diff --git a/src/app/xml/vdomdocument.h b/src/app/xml/vdomdocument.h index 3dbc52476..ba658f7bd 100644 --- a/src/app/xml/vdomdocument.h +++ b/src/app/xml/vdomdocument.h @@ -29,11 +29,9 @@ #ifndef VDOMDOCUMENT_H #define VDOMDOCUMENT_H -#include "../container/vcontainer.h" - #include #include -#include "../options.h" +#include "../container/vcontainer.h" /* can be used like #if (V_FORMAT_VERSION >= V_FORMAT_VERSION_CHECK(4, 4, 0)) diff --git a/src/app/xml/vindividualmeasurements.h b/src/app/xml/vindividualmeasurements.h index 61b0c4823..46d2be660 100644 --- a/src/app/xml/vindividualmeasurements.h +++ b/src/app/xml/vindividualmeasurements.h @@ -30,7 +30,6 @@ #define VINDIVIDUALMEASUREMENTS_H #include "vdomdocument.h" -#include /* VIT_VERSION is (major << 16) + (minor << 8) + patch. diff --git a/src/app/xml/vpattern.cpp b/src/app/xml/vpattern.cpp index 8eb844288..cbecbd9ac 100644 --- a/src/app/xml/vpattern.cpp +++ b/src/app/xml/vpattern.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vpattern.h" - +#include "../tools/vdatatool.h" #include "../tools/vtooldetail.h" #include "../tools/vtooluniondetails.h" #include "../tools/drawTools/drawtools.h" @@ -35,12 +35,12 @@ #include "../exception/vexceptionobjecterror.h" #include "../exception/vexceptionwrongid.h" #include "../exception/vexceptionconversionerror.h" +#include "../exception/vexceptionemptyparameter.h" #include "vstandardmeasurements.h" #include "vindividualmeasurements.h" - -#include #include "../../libs/qmuparser/qmuparsererror.h" -#include +#include "../geometry/varc.h" +#include const QString VPattern::TagPattern = QStringLiteral("pattern"); const QString VPattern::TagCalculation = QStringLiteral("calculation"); diff --git a/src/app/xml/vpattern.h b/src/app/xml/vpattern.h index 77324570c..bb491e015 100644 --- a/src/app/xml/vpattern.h +++ b/src/app/xml/vpattern.h @@ -30,10 +30,10 @@ #define VPATTERN_H #include "vdomdocument.h" -#include "../widgets/vmaingraphicsscene.h" -#include "../tools/vdatatool.h" #include "vtoolrecord.h" -#include + +class VDataTool; +class VMainGraphicsScene; namespace Document { diff --git a/src/libs/qmuparser/qmuparser.cpp b/src/libs/qmuparser/qmuparser.cpp index 4772f42ec..dd3f1b228 100644 --- a/src/libs/qmuparser/qmuparser.cpp +++ b/src/libs/qmuparser/qmuparser.cpp @@ -21,7 +21,11 @@ ******************************************************************************************************/ #include "qmuparser.h" -#include + +#ifdef Q_OS_WIN32 +# include // for M_PI on Windows +#endif /*Q_OS_WIN32*/ + #include using namespace std; diff --git a/src/libs/qmuparser/qmuparserbase.cpp b/src/libs/qmuparser/qmuparserbase.cpp index cbfd20c94..10a55b563 100644 --- a/src/libs/qmuparser/qmuparserbase.cpp +++ b/src/libs/qmuparser/qmuparserbase.cpp @@ -21,16 +21,17 @@ ******************************************************************************************************/ #include "qmuparserbase.h" -#include -#include +//#include + +#ifdef Q_OS_WIN32 +# include // for M_PI on Windows +#endif /*Q_OS_WIN32*/ + #include #ifdef QMUP_USE_OPENMP #include #endif -#include "qmuparsererror.h" -#include "qmuparsertokenreader.h" - using namespace std; /** diff --git a/src/libs/qmuparser/qmuparserbase.h b/src/libs/qmuparser/qmuparserbase.h index c7727426b..d7d92c090 100644 --- a/src/libs/qmuparser/qmuparserbase.h +++ b/src/libs/qmuparser/qmuparserbase.h @@ -31,8 +31,6 @@ #include "qmuparserdef.h" #include "qmuparsertokenreader.h" #include "qmuparserbytecode.h" -#include "qmuparsererror.h" - namespace qmu { diff --git a/src/libs/qmuparser/qmuparserbytecode.cpp b/src/libs/qmuparser/qmuparserbytecode.cpp index 3634612eb..d49357c06 100644 --- a/src/libs/qmuparser/qmuparserbytecode.cpp +++ b/src/libs/qmuparser/qmuparserbytecode.cpp @@ -24,11 +24,12 @@ #include #include -#include -#include -#include "qmuparserdef.h" -#include "qmuparsererror.h" +#ifdef Q_OS_WIN32 +# include // for M_PI on Windows +#endif /*Q_OS_WIN32*/ + +#include #include "qmuparsertoken.h" diff --git a/src/libs/qmuparser/qmuparserbytecode.h b/src/libs/qmuparser/qmuparserbytecode.h index e32e37260..7140fe97d 100644 --- a/src/libs/qmuparser/qmuparserbytecode.h +++ b/src/libs/qmuparser/qmuparserbytecode.h @@ -24,7 +24,6 @@ #define QMUPARSERBYTECODE_H #include "qmuparserdef.h" -#include "qmuparsererror.h" #include "qmuparsertoken.h" /** diff --git a/src/libs/qmuparser/qmuparsertest.cpp b/src/libs/qmuparser/qmuparsertest.cpp index 7664df6a3..25869eeac 100644 --- a/src/libs/qmuparser/qmuparsertest.cpp +++ b/src/libs/qmuparser/qmuparsertest.cpp @@ -21,7 +21,11 @@ ******************************************************************************************************/ #include "qmuparsertest.h" -#include + +#ifdef Q_OS_WIN32 +# include // for M_PI on Windows +#endif /*Q_OS_WIN32*/ + #include #include #include "qmuparsererror.h"