Optimize includes.

src/app/tape/tmainwindow.cpp

@@ -41,6 +41,7 @@
 #include "../vpatterndb/calculator.h"
 #include "../vpatterndb/pmsystems.h"
 #include "../vpatterndb/measurements.h"
+#include "../vpatterndb/variables/vmeasurement.h"
 #include "../ifc/ifcdef.h"
 #include "../ifc/xml/vvitconverter.h"
 #include "../ifc/xml/vvstconverter.h"

src/app/valentina/dialogs/dialogincrements.cpp

@@ -36,6 +36,13 @@
 #include "../qmuparser/qmutokenparser.h"
 #include "../vpatterndb/vtranslatevars.h"
 #include "../vpatterndb/calculator.h"
+#include "../vpatterndb/variables/vincrement.h"
+#include "../vpatterndb/variables/vlinelength.h"
+#include "../vpatterndb/variables/vlineangle.h"
+#include "../vpatterndb/variables/vcurveangle.h"
+#include "../vpatterndb/variables/vcurvelength.h"
+#include "../vpatterndb/variables/vcurveclength.h"
+#include "../vpatterndb/variables/varcradius.h"
 #include "../vtools/dialogs/support/dialogeditwrongformula.h"
 
 #include <QFileDialog>

src/app/valentina/mainwindow.cpp

@@ -61,6 +61,9 @@
 #include "../vlayout/dialogs/dialoglayoutscale.h"
 #include "../vmisc/dialogs/dialogselectlanguage.h"
 
+#include "../vpatterndb/variables/vincrement.h"
+#include "../vpatterndb/variables/vmeasurement.h"
+
 #include "../vtools/undocommands/image/addbackgroundimage.h"
 #include "../vtools/undocommands/image/deletebackgroundimage.h"
 #include "../ifc/xml/utils.h"

src/app/valentina/xml/vpattern.cpp

@@ -57,6 +57,7 @@
 #include "../vpatterndb/floatItemData/vgrainlinedata.h"
 #include "../vpatterndb/vpiecepath.h"
 #include "../vpatterndb/vnodedetail.h"
+#include "../vpatterndb/variables/vincrement.h"
 
 #include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h"
 #include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h"

src/libs/vformat/vpatternrecipe.cpp

@@ -37,6 +37,8 @@
 #include "../vgeometry/vsplinepath.h"
 #include "../vgeometry/vcubicbezierpath.h"
 #include "../vpatterndb/calculator.h"
+#include "../vpatterndb/variables/vincrement.h"
+#include "../vpatterndb/variables/vmeasurement.h"
 
 #include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h"
 #include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h"

src/libs/vlayout/vlayoutpiece.cpp

@@ -50,6 +50,7 @@
 #include "../vpatterndb/floatItemData/vpatternlabeldata.h"
 #include "../vpatterndb/floatItemData/vpiecelabeldata.h"
 #include "../vpatterndb/floatItemData/vgrainlinedata.h"
+#include "../vpatterndb/variables/vmeasurement.h"
 #include "../vmisc/vabstractvalapplication.h"
 #include "../vmisc/compatibility.h"
 #include "../vmisc/literals.h"

src/libs/vlayout/vtextmanager.cpp

@@ -34,16 +34,14 @@
 #include <QApplication>
 #include <QDebug>
 #include <QFlags> // QFlags<Qt::Alignment>
+#include <QtMath>
 
 #include "../ifc/xml/vabstractpattern.h"
 #include "../vpatterndb/floatItemData/vpiecelabeldata.h"
 #include "../vmisc/vabstractvalapplication.h"
-#include "../vmisc/vmath.h"
-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
-#   include "../vmisc/vdatastreamenum.h"
-#endif
 #include "../vpatterndb/vcontainer.h"
 #include "../vpatterndb/calculator.h"
+#include "../vpatterndb/variables/vmeasurement.h"
 #include "vtextmanager.h"
 
 const quint32 TextLine::streamHeader = 0xA3881E49; // CRC-32Q string "TextLine"

src/libs/vpatterndb/variables.h

@@ -1,42 +0,0 @@
-/************************************************************************
- **
- **  @file   variables.h
- **  @author Roman Telezhynskyi <dismine(at)gmail.com>
- **  @date   28 7, 2014
- **
- **  @brief
- **  @copyright
- **  This source code is part of the Valentina project, a pattern making
- **  program, whose allow create and modeling patterns of clothing.
- **  Copyright (C) 2013-2015 Valentina project
- **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
- **
- **  Valentina is free software: you can redistribute it and/or modify
- **  it under the terms of the GNU General Public License as published by
- **  the Free Software Foundation, either version 3 of the License, or
- **  (at your option) any later version.
- **
- **  Valentina is distributed in the hope that it will be useful,
- **  but WITHOUT ANY WARRANTY; without even the implied warranty of
- **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- **  GNU General Public License for more details.
- **
- **  You should have received a copy of the GNU General Public License
- **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
- **
- *************************************************************************/
-
-#ifndef VARIABLES_H
-#define VARIABLES_H
-
-#include "variables/vinternalvariable.h"
-#include "variables/vmeasurement.h"
-#include "variables/vincrement.h"
-#include "variables/vcurvelength.h"
-#include "variables/vlinelength.h"
-#include "variables/vlineangle.h"
-#include "variables/varcradius.h"
-#include "variables/vcurveangle.h"
-#include "variables/vcurveclength.h"
-
-#endif // VARIABLES_H

src/libs/vpatterndb/variables/vlineangle.cpp

@@ -32,9 +32,9 @@
 #include <QMessageLogger>
 #include <QPointF>
 #include <QString>
+#include <QtMath>
 
 #include "../vmisc/def.h"
-#include "../vmisc/vmath.h"
 #include "../ifc/ifcdef.h"
 #include "../vgeometry/vpointf.h"
 #include "vinternalvariable.h"

src/libs/vpatterndb/vcontainer.h

@@ -46,14 +46,12 @@
 
 #include "../vmisc/def.h"
 #include "../ifc/exception/vexceptionbadid.h"
-#include "../ifc/ifcdef.h"
 #include "../vgeometry/vabstractcubicbezierpath.h"
 #include "../vgeometry/vabstractcurve.h"
 #include "../vgeometry/vgobject.h"
 #if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
 #endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
-#include "variables.h"
 #include "variables/vinternalvariable.h"
 #include "vpiece.h"
 #include "vpiecepath.h"

src/libs/vpatterndb/vpatterndb.pri

@@ -37,7 +37,6 @@ HEADERS += \
     $$PWD/vcontainer.h \
     $$PWD/stable.h \
     $$PWD/calculator.h \
-    $$PWD/variables.h \
     $$PWD/vnodedetail.h \
     $$PWD/vnodedetail_p.h \
     $$PWD/vtranslatevars.h \

src/libs/vtools/dialogs/support/dialogeditlabel.cpp

@@ -40,6 +40,7 @@
 #include "../vpatterndb/vpiece.h"
 #include "../vpatterndb/floatItemData/vpiecelabeldata.h"
 #include "../vpatterndb/calculator.h"
+#include "../vpatterndb/variables/vmeasurement.h"
 #include "../tools/dialogtool.h"
 
 #include <QDir>

src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp

@@ -58,6 +58,7 @@
 #include "../vpatterndb/variables/varcradius.h"
 #include "../vpatterndb/variables/vcurveangle.h"
 #include "../vpatterndb/variables/vcurvelength.h"
+#include "../vpatterndb/variables/vcurveclength.h"
 #include "../vpatterndb/variables/vincrement.h"
 #include "../vpatterndb/variables/vlineangle.h"
 #include "../vpatterndb/variables/vlinelength.h"

src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp

@@ -29,6 +29,7 @@
 #include "dialogpiecepath.h"
 #include "ui_dialogpiecepath.h"
 #include "../vpatterndb/vpiecenode.h"
+#include "../vpatterndb/variables/vincrement.h"
 #include "visualization/path/vistoolpiecepath.h"
 #include "../../../tools/vtoolseamallowance.h"
 #include "../../support/dialogeditwrongformula.h"

src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp

@@ -38,6 +38,8 @@
 #include "../vpatterndb/vpiecenode.h"
 #include "../vpatterndb/vpiecepath.h"
 #include "../vpatterndb/calculator.h"
+#include "../vpatterndb/variables/vincrement.h"
+#include "../vpatterndb/variables/vmeasurement.h"
 #include "visualization/path/vistoolpiece.h"
 #include "visualization/path/vispiecespecialpoints.h"
 #include "dialogpiecepath.h"

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp

@@ -47,6 +47,7 @@
 #include "../vmisc/vcommonsettings.h"
 #include "../vpatterndb/vcontainer.h"
 #include "../vpatterndb/vtranslatevars.h"
+#include "../vpatterndb/variables/vcurvelength.h"
 #include "../vwidgets/vmaingraphicsscene.h"
 #include "../../../../vabstracttool.h"
 #include "../../../vdrawtool.h"

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp

@@ -49,6 +49,7 @@
 #include "../vmisc/vcommonsettings.h"
 #include "../vpatterndb/vcontainer.h"
 #include "../vpatterndb/vtranslatevars.h"
+#include "../vpatterndb/variables/vcurvelength.h"
 #include "../vwidgets/vmaingraphicsscene.h"
 #include "../../../../vabstracttool.h"
 #include "../../../vdrawtool.h"

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp

@@ -52,6 +52,7 @@
 #include "../vmisc/vcommonsettings.h"
 #include "../vpatterndb/vcontainer.h"
 #include "../vpatterndb/vtranslatevars.h"
+#include "../vpatterndb/variables/vcurvelength.h"
 #include "../vwidgets/vmaingraphicsscene.h"
 #include "../../../../vabstracttool.h"
 #include "../../../vdrawtool.h"

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h

@@ -43,6 +43,7 @@
 #include "vtoolsinglepoint.h"
 
 template <class T> class QSharedPointer;
+class VArc;
 
 struct VToolPointFromArcAndTangentInitData : VToolSinglePointInitData
 {

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h

@@ -43,6 +43,7 @@
 #include "vtoolsinglepoint.h"
 
 template <class T> class QSharedPointer;
+class VArc;
 
 struct VToolPointOfIntersectionArcsInitData : VToolSinglePointInitData
 {

src/libs/vtools/tools/vtoolseamallowance.cpp

@@ -34,6 +34,7 @@
 #include "../vpatterndb/calculator.h"
 #include "../vpatterndb/floatItemData/vpatternlabeldata.h"
 #include "../vpatterndb/floatItemData/vpiecelabeldata.h"
+#include "../vpatterndb/variables/vincrement.h"
 #include "../vgeometry/varc.h"
 #include "../vgeometry/vpointf.h"
 #include "../vgeometry/vplacelabelitem.h"