Fix build on Qt\5.3\msvc2013_64_opengl.

--HG--
branch : develop

src/libs/fervor/fervor.pro

@@ -67,3 +67,5 @@ CONFIG(release, debug|release){
         }
     }
 }
+
+include (../libs.pri)

src/libs/ifc/exception/vexception.cpp

@@ -31,7 +31,7 @@
 #include <QByteArray>
 #include <QtGlobal>
 
-#include "exception/../ifcdef.h"
+#include "../ifcdef.h"
 
 //Q_LOGGING_CATEGORY(vExcep, "v.excep") //Commented because don't use now
 

src/libs/ifc/exception/vexceptionbadid.cpp

@@ -28,7 +28,7 @@
 
 #include "vexceptionbadid.h"
 
-#include "exception/vexception.h"
+#include "vexception.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/libs/ifc/exception/vexceptionconversionerror.cpp

@@ -30,7 +30,7 @@
 
 #include <QtGlobal>
 
-#include "exception/vexception.h"
+#include "vexception.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/libs/ifc/exception/vexceptionconversionerror.h

@@ -32,7 +32,7 @@
 #include <qcompilerdetection.h>
 #include <QString>
 
-#include "exception/../ifcdef.h"
+#include "../ifcdef.h"
 #include "vexception.h"
 
 /**

src/libs/ifc/exception/vexceptionemptyparameter.cpp

@@ -31,7 +31,7 @@
 #include <QDomElement>
 #include <QTextStream>
 
-#include "exception/vexception.h"
+#include "vexception.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/libs/ifc/exception/vexceptionobjecterror.cpp

@@ -31,7 +31,7 @@
 #include <QDomElement>
 #include <QTextStream>
 
-#include "exception/vexception.h"
+#include "vexception.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/libs/ifc/exception/vexceptionobjecterror.h

@@ -33,7 +33,7 @@
 #include <QString>
 #include <QtGlobal>
 
-#include "exception/../ifcdef.h"
+#include "../ifcdef.h"
 #include "vexception.h"
 
 class QDomElement;

src/libs/ifc/exception/vexceptionundo.cpp

@@ -28,7 +28,7 @@
 
 #include "vexceptionundo.h"
 
-#include "exception/vexception.h"
+#include "vexception.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VExceptionUndo::VExceptionUndo(const QString &what)

src/libs/ifc/exception/vexceptionwrongid.cpp

@@ -31,7 +31,7 @@
 #include <QDomElement>
 #include <QTextStream>
 
-#include "exception/vexception.h"
+#include "vexception.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/libs/ifc/exception/vexceptionwrongid.h

@@ -33,7 +33,7 @@
 #include <QString>
 #include <QtGlobal>
 
-#include "exception/../ifcdef.h"
+#include "../ifcdef.h"
 #include "vexception.h"
 
 class QDomElement;

src/libs/ifc/ifc.pro

@@ -76,7 +76,4 @@ CONFIG(release, debug|release){
     }
 }
 
-win32-msvc*{
+include (../libs.pri)
-    #VMisc static library
-    INCLUDEPATH += $$PWD/../vmisc
-}

src/libs/ifc/xml/vabstractconverter.cpp

@@ -45,7 +45,7 @@
 
 #include "../exception/vexception.h"
 #include "../exception/vexceptionwrongid.h"
-#include "xml/vdomdocument.h"
+#include "vdomdocument.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VAbstractConverter::VAbstractConverter(const QString &fileName)

src/libs/ifc/xml/vabstractmconverter.cpp

@@ -33,7 +33,7 @@
 #include <QStringData>
 #include <QStringDataPtr>
 
-#include "xml/vabstractconverter.h"
+#include "vabstractconverter.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VAbstractMConverter::VAbstractMConverter(const QString &fileName)

src/libs/ifc/xml/vabstractpattern.cpp

@@ -43,13 +43,13 @@
 #include "../exception/vexceptionemptyparameter.h"
 #include "../exception/vexceptionobjecterror.h"
 #include "../qmuparser/qmutokenparser.h"
-#include "../vpatterndb/../ifc/exception/vexceptionbadid.h"
+#include "../ifc/exception/vexceptionbadid.h"
-#include "../vpatterndb/../vgeometry/../ifc/ifcdef.h"
+#include "../ifc/ifcdef.h"
 #include "../vpatterndb/vcontainer.h"
 #include "../vtools/tools/vdatatool.h"
 #include "vpatternconverter.h"
-#include "xml/vdomdocument.h"
+#include "vdomdocument.h"
-#include "xml/vtoolrecord.h"
+#include "vtoolrecord.h"
 
 class QDomElement;
 

src/libs/ifc/xml/vdomdocument.cpp

@@ -35,9 +35,9 @@
 #include "../exception/vexceptionconversionerror.h"
 #include "../exception/vexceptionemptyparameter.h"
 #include "../exception/vexceptionwrongid.h"
+#include "../exception/vexception.h"
 #include "../vmisc/logging.h"
-#include "xml/../exception/../ifcdef.h"
+#include "../ifcdef.h"
-#include "xml/../exception/vexception.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
 #   include "../vmisc/backport/qsavefile.h"

src/libs/ifc/xml/vpatternconverter.cpp

@@ -45,7 +45,7 @@
 #include "../exception/vexceptionemptyparameter.h"
 #include "../qmuparser/qmutokenparser.h"
 #include "../vmisc/def.h"
-#include "xml/vabstractconverter.h"
+#include "vabstractconverter.h"
 
 class QDomElement;
 

src/libs/ifc/xml/vvitconverter.cpp

@@ -43,7 +43,7 @@
 
 #include "../exception/vexception.h"
 #include "../vmisc/def.h"
-#include "xml/vabstractmconverter.h"
+#include "vabstractmconverter.h"
 
 /*
  * Version rules:

src/libs/ifc/xml/vvstconverter.cpp

@@ -43,7 +43,7 @@
 
 #include "../exception/vexception.h"
 #include "../vmisc/def.h"
-#include "xml/vabstractmconverter.h"
+#include "vabstractmconverter.h"
 
 /*
  * Version rules:

src/libs/libs.pri

@@ -0,0 +1,32 @@
+#VTools static library
+INCLUDEPATH += $$PWD/vtools
+
+#VWidgets static library
+INCLUDEPATH += $$PWD/vwidgets
+
+#VFormat static library
+INCLUDEPATH += $$PWD/vformat
+
+#VPatternDB static library
+INCLUDEPATH += $$PWD/vpatterndb
+
+# Fervor static library
+INCLUDEPATH += $$PWD/fervor
+
+#VMisc static library
+INCLUDEPATH += $$PWD/vmisc
+
+#VGeometry static library
+INCLUDEPATH += $$PWD/vgeometry
+
+# IFC static library
+INCLUDEPATH += $$PWD/ifc
+
+#VLayout static library
+INCLUDEPATH += $$PWD/vlayout
+
+#QMuParser library
+INCLUDEPATH += $${PWD}/qmuparser
+
+#VPropertyExplorer library
+INCLUDEPATH += $${PWD}/vpropertyexplorer

src/libs/qmuparser/qmuparser.pro

@@ -102,3 +102,5 @@ CONFIG(release, debug|release){
         }
     }
 }
+
+include (../libs.pri)

src/libs/vdxf/vdxf.pro

@@ -65,7 +65,4 @@ CONFIG(release, debug|release){
     }
 }
 
-win32-msvc*{
+include (../libs.pri)
-    #VMisc static library
-    INCLUDEPATH += $$PWD/../vmisc
-}

src/libs/vformat/vformat.pro

@@ -68,3 +68,5 @@ CONFIG(release, debug|release){
         }
     }
 }
+
+include (../libs.pri)

src/libs/vformat/vmeasurements.cpp

@@ -47,9 +47,9 @@
 #include "../ifc/exception/vexceptionemptyparameter.h"
 #include "../ifc/xml/vvitconverter.h"
 #include "../ifc/xml/vvstconverter.h"
+#include "../ifc/ifcdef.h"
 #include "../qmuparser/qmutokenparser.h"
-#include "../vpatterndb/../qmuparser/qmuparsererror.h"
+#include "../qmuparser/qmuparsererror.h"
-#include "../vpatterndb/../vgeometry/../ifc/ifcdef.h"
 #include "../vpatterndb/calculator.h"
 #include "../vpatterndb/variables/vmeasurement.h"
 #include "../vpatterndb/vcontainer.h"

src/libs/vformat/vmeasurements.h

@@ -37,7 +37,7 @@
 #include <QtGlobal>
 
 #include "../ifc/xml/vdomdocument.h"
-#include "../vpatterndb/../vmisc/def.h"
+#include "../vmisc/def.h"
 #include "../vpatterndb/vcontainer.h"
 
 class QDate;

src/libs/vgeometry/vabstractarc.cpp

@@ -30,7 +30,7 @@
 
 #include <QLineF>
 
-#include "../ifc/../vmisc/def.h"
+#include "../vmisc/def.h"
 #include "vabstractarc_p.h"
 #include "vpointf.h"
 

src/libs/vgeometry/vabstractcubicbezier.cpp

@@ -35,7 +35,7 @@
 #include <QPoint>
 #include <QtDebug>
 
-#include "../ifc/../vmisc/def.h"
+#include "../vmisc/def.h"
 #include "../vgeometry/vpointf.h"
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vgeometry/vabstractcubicbezierpath.cpp

@@ -30,8 +30,8 @@
 
 #include <QPainterPath>
 
-#include "../ifc/../vmisc/def.h"
+#include "../vmisc/def.h"
-#include "../ifc/exception/../ifcdef.h"
+#include "../ifc/ifcdef.h"
 #include "../ifc/exception/vexception.h"
 #include "vpointf.h"
 #include "vspline.h"

src/libs/vgeometry/varc.cpp

@@ -32,7 +32,7 @@
 #include <QLineF>
 #include <QPointF>
 
-#include "../ifc/../vmisc/def.h"
+#include "../vmisc/def.h"
 #include "../ifc/ifcdef.h"
 #include "vabstractcurve.h"
 #include "varc_p.h"

src/libs/vgeometry/vellipticalarc.cpp

@@ -33,7 +33,7 @@
 #include <QLineF>
 #include <QPoint>
 
-#include "../ifc/../vmisc/def.h"
+#include "../vmisc/def.h"
 #include "../ifc/ifcdef.h"
 #include "../vmisc/vabstractapplication.h"
 #include "vabstractcurve.h"

src/libs/vgeometry/vgeometry.pro

@@ -64,3 +64,5 @@ CONFIG(release, debug|release){
         }
     }
 }
+
+include (../libs.pri)

src/libs/vgeometry/vgobject.cpp

@@ -36,7 +36,7 @@
 #include <QPointF>
 #include <QRectF>
 
-#include "../ifc/../vmisc/def.h"
+#include "../vmisc/def.h"
 #include "../ifc/ifcdef.h"
 #include "vgobject_p.h"
 

src/libs/vlayout/vlayout.pro

@@ -75,3 +75,5 @@ CONFIG(release, debug|release){
 
 RESOURCES += \
     share/icons.qrc
+
+include (../libs.pri)

src/libs/vmisc/vcommonsettings.cpp

@@ -40,7 +40,7 @@
 #include <QVariant>
 #include <QtDebug>
 
-#include "../ifc/../vmisc/def.h"
+#include "../vmisc/def.h"
 
 class QDate;
 

src/libs/vmisc/vmisc.pro

@@ -102,3 +102,5 @@ CONFIG(debug, debug|release){
     message("Build revision:" $${HG_HESH})
     DEFINES += "BUILD_REVISION=\\\"$${HG_HESH}\\\"" # Make available build revision number in sources.
 }
+
+include (../libs.pri)

src/libs/vmisc/vsettings.cpp

@@ -38,7 +38,7 @@
 #include <QStringDataPtr>
 #include <QVariant>
 
-#include "../ifc/../vmisc/def.h"
+#include "../vmisc/def.h"
 
 class QMarginsF;
 

src/libs/vobj/vobj.pro

@@ -62,3 +62,5 @@ CONFIG(release, debug|release){
         }
     }
 }
+
+include (../libs.pri)

src/libs/vpatterndb/calculator.cpp

@@ -33,7 +33,7 @@
 #include <QStringDataPtr>
 #include <QStringList>
 
-#include "../ifc/../vmisc/def.h"
+#include "../vmisc/def.h"
 #include "../qmuparser/qmuparsererror.h"
 
 using namespace qmu;

src/libs/vpatterndb/variables/varcradius.cpp

@@ -31,9 +31,9 @@
 #include <QMessageLogger>
 #include <QString>
 
-#include "../vgeometry/../ifc/ifcdef.h"
+#include "../ifc/ifcdef.h"
 #include "../vgeometry/varc.h"
-#include "variables/vcurvevariable.h"
+#include "vcurvevariable.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VArcRadius::VArcRadius()

src/libs/vpatterndb/variables/varcradius.h

@@ -32,7 +32,7 @@
 #include <qcompilerdetection.h>
 #include <QtGlobal>
 
-#include "../ifc/../vmisc/def.h"
+#include "../vmisc/def.h"
 #include "../ifc/ifcdef.h"
 #include "vcurvevariable.h"
 

src/libs/vpatterndb/variables/vcurveangle.cpp

@@ -31,11 +31,11 @@
 #include <QLatin1String>
 #include <QMessageLogger>
 
-#include "../vgeometry/../ifc/../vmisc/def.h"
+#include "../vmisc/def.h"
-#include "../vgeometry/../ifc/ifcdef.h"
+#include "../ifc/ifcdef.h"
 #include "../vgeometry/vabstractcurve.h"
 #include "../vgeometry/vspline.h"
-#include "variables/vcurvevariable.h"
+#include "vcurvevariable.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VCurveAngle::VCurveAngle()

src/libs/vpatterndb/variables/vcurvelength.cpp

@@ -31,10 +31,10 @@
 #include <QLatin1String>
 #include <QMessageLogger>
 
-#include "../vgeometry/../ifc/ifcdef.h"
+#include "../ifc/ifcdef.h"
 #include "../vgeometry/vabstractcurve.h"
 #include "../vgeometry/vspline.h"
-#include "variables/vcurvevariable.h"
+#include "vcurvevariable.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VCurveLength::VCurveLength()

src/libs/vpatterndb/variables/vcurvelength.h

@@ -33,7 +33,7 @@
 #include <QString>
 #include <QtGlobal>
 
-#include "../ifc/../vmisc/def.h"
+#include "../vmisc/def.h"
 #include "../ifc/ifcdef.h"
 #include "vcurvevariable.h"
 

src/libs/vpatterndb/variables/vcurvevariable.cpp

@@ -28,9 +28,9 @@
 
 #include "vcurvevariable.h"
 
-#include "../ifc/../vmisc/def.h"
+#include "../vmisc/def.h"
-#include "../vgeometry/../ifc/ifcdef.h"
+#include "../ifc/ifcdef.h"
-#include "variables/vinternalvariable.h"
+#include "vinternalvariable.h"
 #include "vcurvevariable_p.h"
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vpatterndb/variables/vincrement.cpp

@@ -28,8 +28,8 @@
 
 #include "vincrement.h"
 
-#include "../ifc/../vmisc/def.h"
+#include "../vmisc/def.h"
-#include "variables/vvariable.h"
+#include "vvariable.h"
 #include "vincrement_p.h"
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vpatterndb/variables/vlineangle.cpp

@@ -34,10 +34,10 @@
 #include <QPointF>
 #include <QString>
 
-#include "../ifc/../vmisc/def.h"
+#include "../vmisc/def.h"
 #include "../ifc/ifcdef.h"
 #include "../vgeometry/vpointf.h"
-#include "variables/vinternalvariable.h"
+#include "vinternalvariable.h"
 #include "vlineangle_p.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)

src/libs/vpatterndb/variables/vlinelength.cpp

@@ -35,7 +35,7 @@
 
 #include "../ifc/ifcdef.h"
 #include "../vgeometry/vpointf.h"
-#include "variables/vinternalvariable.h"
+#include "vinternalvariable.h"
 #include "vlinelength_p.h"
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vpatterndb/variables/vlinelength.h

@@ -34,7 +34,7 @@
 #include <QTypeInfo>
 #include <QtGlobal>
 
-#include "../ifc/../vmisc/def.h"
+#include "../vmisc/def.h"
 #include "../ifc/ifcdef.h"
 #include "vinternalvariable.h"
 

src/libs/vpatterndb/variables/vmeasurement.cpp

@@ -33,8 +33,8 @@
 #include <QMessageLogger>
 #include <QtDebug>
 
-#include "../vgeometry/../ifc/ifcdef.h"
+#include "../ifc/ifcdef.h"
-#include "variables/vvariable.h"
+#include "vvariable.h"
 #include "vmeasurement_p.h"
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vpatterndb/variables/vmeasurement.h

@@ -37,7 +37,7 @@
 #include <QTypeInfo>
 #include <QtGlobal>
 
-#include "../ifc/../vmisc/def.h"
+#include "../vmisc/def.h"
 #include "../ifc/ifcdef.h"
 #include "vvariable.h"
 

src/libs/vpatterndb/variables/vvariable.cpp

@@ -31,7 +31,7 @@
 #include <QMessageLogger>
 #include <QtDebug>
 
-#include "variables/vinternalvariable.h"
+#include "vinternalvariable.h"
 #include "vvariable_p.h"
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vpatterndb/variables/vvariable.h

@@ -35,7 +35,7 @@
 #include <QTypeInfo>
 #include <QtGlobal>
 
-#include "../ifc/../vmisc/def.h"
+#include "../vmisc/def.h"
 #include "../ifc/ifcdef.h"
 #include "vinternalvariable.h"
 

src/libs/vpatterndb/vcontainer.cpp

@@ -42,7 +42,7 @@
 #include "../vgeometry/vpointf.h"
 #include "../vgeometry/vspline.h"
 #include "../vgeometry/varc.h"
-#include "../vmisc/../vmisc/diagnostic.h"
+#include "../vmisc/diagnostic.h"
 #include "../vmisc/logging.h"
 #include "../vmisc/vabstractapplication.h"
 #include "variables/varcradius.h"

src/libs/vpatterndb/vcontainer.h

@@ -44,9 +44,9 @@
 #include <QtGlobal>
 #include <new>
 
-#include "../ifc/../vmisc/def.h"
+#include "../vmisc/def.h"
 #include "../ifc/exception/vexceptionbadid.h"
-#include "../vgeometry/../ifc/ifcdef.h"
+#include "../ifc/ifcdef.h"
 #include "../vgeometry/vabstractcubicbezierpath.h"
 #include "../vgeometry/vabstractcurve.h"
 #include "../vgeometry/vgobject.h"

src/libs/vpatterndb/vdetail.cpp

@@ -39,7 +39,7 @@
 #include <QtDebug>
 #include <new>
 
-#include "../ifc/../vmisc/def.h"
+#include "../vmisc/def.h"
 #include "../vgeometry/vabstractcurve.h"
 #include "../vgeometry/vgobject.h"
 #include "../vgeometry/vpointf.h"

src/libs/vpatterndb/vformula.cpp

@@ -34,9 +34,9 @@
 #include <QScopedPointer>
 #include <QtDebug>
 
-#include "../ifc/../vmisc/def.h"
 #include "../qmuparser/qmuparsererror.h"
 #include "../vgeometry/../ifc/ifcdef.h"
+#include "../vmisc/def.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/vcommonsettings.h"
 #include "calculator.h"

src/libs/vpatterndb/vpatterndb.pro

@@ -66,7 +66,4 @@ CONFIG(release, debug|release){
     }
 }
 
-win32-msvc*{
+include (../libs.pri)
-    #VMisc static library
-    INCLUDEPATH += $$PWD/../vmisc
-}

src/libs/vpatterndb/vtranslatevars.cpp

@@ -36,12 +36,12 @@
 #include <QString>
 #include <QtDebug>
 
-#include "../ifc/../vmisc/def.h"
 #include "../ifc/ifcdef.h"
 #include "../qmuparser/qmuparsererror.h"
 #include "../qmuparser/qmutokenparser.h"
 #include "../qmuparser/qmutranslation.h"
-#include "../vmisc/../vpatterndb/vtranslatevars.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../vmisc/def.h"
 #include "../vmisc/vabstractapplication.h"
 #include "vtranslatemeasurements.h"
 

src/libs/vpropertyexplorer/vpropertyexplorer.pro

@@ -100,3 +100,5 @@ CONFIG(release, debug|release){
         }
     }
 }
+
+include (../libs.pri)

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

@@ -52,21 +52,21 @@
 #include <Qt>
 #include <new>
 
-#include "../../../vpatterndb/vcontainer.h"
+#include "../vpatterndb/vcontainer.h"
-#include "../../../vpatterndb/vtranslatevars.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../vpatterndb/variables/varcradius.h"
+#include "../vpatterndb/variables/vcurveangle.h"
+#include "../vpatterndb/variables/vcurvelength.h"
+#include "../vpatterndb/variables/vincrement.h"
+#include "../vpatterndb/variables/vlineangle.h"
+#include "../vpatterndb/variables/vlinelength.h"
+#include "../vpatterndb/variables/vmeasurement.h"
 #include "../ifc/xml/vdomdocument.h"
 #include "../vmisc/def.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/vcommonsettings.h"
-#include "dialogs/support/../tools/dialogtool.h"
+#include "../tools/dialogtool.h"
 #include "ui_dialogeditwrongformula.h"
-#include "variables/varcradius.h"
-#include "variables/vcurveangle.h"
-#include "variables/vcurvelength.h"
-#include "variables/vincrement.h"
-#include "variables/vlineangle.h"
-#include "variables/vlinelength.h"
-#include "variables/vmeasurement.h"
 
 class QCloseEvent;
 class QShowEvent;

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

@@ -33,8 +33,8 @@
 #include <QPushButton>
 #include <Qt>
 
-#include "../../../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractapplication.h"
-#include "dialogs/support/../../../ifc/exception/../../vmisc/vcommonsettings.h"
+#include "../vmisc/vcommonsettings.h"
 #include "ui_dialogundo.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialogalongline.cpp

@@ -41,9 +41,9 @@
 #include <QToolButton>
 #include <new>
 
-#include "../../../vpatterndb/vtranslatevars.h"
 #include "../../tools/vabstracttool.h"
 #include "../../visualization/line/vistoolalongline.h"
+#include "../../visualization/visualization.h"
 #include "../ifc/xml/vabstractpattern.h"
 #include "../ifc/xml/vdomdocument.h"
 #include "../support/dialogeditwrongformula.h"
@@ -52,9 +52,9 @@
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/vcommonsettings.h"
 #include "../vpatterndb/vcontainer.h"
-#include "dialogs/tools/../../tools/../visualization/visualization.h"
+#include "../vpatterndb/variables/vlinelength.h"
+#include "../vpatterndb/vtranslatevars.h"
 #include "ui_dialogalongline.h"
-#include "variables/vlinelength.h"
 
 class QCloseEvent;
 class QWidget;

src/libs/vtools/dialogs/tools/dialogalongline.h

@@ -36,7 +36,6 @@
 #include <QtGlobal>
 
 #include "../vmisc/def.h"
-#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialogarc.cpp

@@ -38,13 +38,13 @@
 #include <QToolButton>
 #include <Qt>
 
-#include "../../../ifc/xml/vdomdocument.h"
+#include "../ifc/xml/vdomdocument.h"
-#include "../../../vpatterndb/vtranslatevars.h"
+#include "../vpatterndb/vtranslatevars.h"
 #include "../../visualization/path/vistoolarc.h"
+#include "../../visualization/visualization.h"
 #include "../support/dialogeditwrongformula.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/vcommonsettings.h"
-#include "dialogs/tools/../../visualization/path/../visualization.h"
 #include "ui_dialogarc.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialogarc.h

@@ -36,7 +36,6 @@
 #include <QtGlobal>
 
 #include "../vmisc/def.h"
-#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp

@@ -38,13 +38,13 @@
 #include <QToolButton>
 #include <Qt>
 
-#include "../../../ifc/xml/vdomdocument.h"
+#include "../ifc/xml/vdomdocument.h"
-#include "../../../vpatterndb/vtranslatevars.h"
+#include "../vpatterndb/vtranslatevars.h"
 #include "../../visualization/path/vistoolarcwithlength.h"
 #include "../support/dialogeditwrongformula.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/vcommonsettings.h"
-#include "dialogs/tools/../../visualization/path/../visualization.h"
+#include "../../visualization/visualization.h"
 #include "ui_dialogarcwithlength.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialogarcwithlength.h

@@ -36,7 +36,6 @@
 #include <QtGlobal>
 
 #include "../vmisc/def.h"
-#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialogbisector.cpp

@@ -41,13 +41,13 @@
 
 #include "../../tools/vabstracttool.h"
 #include "../../visualization/line/vistoolbisector.h"
+#include "../../visualization/visualization.h"
 #include "../ifc/xml/vabstractpattern.h"
 #include "../ifc/xml/vdomdocument.h"
 #include "../support/dialogeditwrongformula.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/vcommonsettings.h"
 #include "../vpatterndb/vtranslatevars.h"
-#include "dialogs/tools/../../tools/../visualization/visualization.h"
 #include "ui_dialogbisector.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialogbisector.h

@@ -36,7 +36,6 @@
 #include <QtGlobal>
 
 #include "../vmisc/def.h"
-#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp

@@ -36,10 +36,10 @@
 #include <new>
 
 #include "../../visualization/path/vistoolcubicbezier.h"
+#include "../../visualization/visualization.h"
 #include "../vgeometry/vpointf.h"
 #include "../vpatterndb/vcontainer.h"
-#include "dialogs/tools/../../visualization/path/../visualization.h"
+#include "dialogtool.h"
-#include "dialogs/tools/dialogtool.h"
 #include "ui_dialogcubicbezier.h"
 
 class QWidget;

src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp

@@ -45,12 +45,12 @@
 #include <new>
 
 #include "../../visualization/path/vistoolcubicbezierpath.h"
-#include "../vgeometry/../ifc/ifcdef.h"
+#include "../../visualization/visualization.h"
+#include "../ifc/ifcdef.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vpatterndb/vcontainer.h"
 #include "../vwidgets/vabstractmainwindow.h"
-#include "dialogs/tools/../../visualization/path/../visualization.h"
+#include "dialogtool.h"
-#include "dialogs/tools/dialogtool.h"
 #include "ui_dialogcubicbezierpath.h"
 
 class QWidget;

src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp

@@ -40,18 +40,18 @@
 #include <QToolButton>
 #include <new>
 
-#include "../../../vgeometry/vpointf.h"
+#include "../vgeometry/vpointf.h"
-#include "../../../vpatterndb/vcontainer.h"
+#include "../vpatterndb/vcontainer.h"
-#include "../../../vpatterndb/vtranslatevars.h"
+#include "../vpatterndb/vtranslatevars.h"
-#include "../../../vwidgets/vmaingraphicsscene.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "../vwidgets/vabstractmainwindow.h"
 #include "../../tools/vabstracttool.h"
 #include "../../visualization/line/vistoolcurveintersectaxis.h"
+#include "../../visualization/visualization.h"
 #include "../ifc/xml/vabstractpattern.h"
 #include "../support/dialogeditwrongformula.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/vcommonsettings.h"
-#include "../vwidgets/vabstractmainwindow.h"
-#include "dialogs/tools/../../tools/../visualization/visualization.h"
 #include "ui_dialogcurveintersectaxis.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h

@@ -36,7 +36,6 @@
 #include <QtGlobal>
 
 #include "../vmisc/def.h"
-#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialogcutarc.cpp

@@ -35,14 +35,14 @@
 #include <QPushButton>
 #include <QToolButton>
 
-#include "../../../vpatterndb/vtranslatevars.h"
+#include "../vpatterndb/vtranslatevars.h"
 #include "../../visualization/path/vistoolcutarc.h"
+#include "../../visualization/visualization.h"
 #include "../ifc/xml/vabstractpattern.h"
 #include "../ifc/xml/vdomdocument.h"
 #include "../support/dialogeditwrongformula.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/vcommonsettings.h"
-#include "dialogs/tools/../../visualization/path/../visualization.h"
 #include "ui_dialogcutarc.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialogcutarc.h

@@ -36,7 +36,6 @@
 #include <QtGlobal>
 
 #include "../vmisc/def.h"
-#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialogcutspline.cpp

@@ -35,14 +35,14 @@
 #include <QPushButton>
 #include <QToolButton>
 
-#include "../../../vpatterndb/vtranslatevars.h"
+#include "../vpatterndb/vtranslatevars.h"
 #include "../../visualization/path/vistoolcutspline.h"
+#include "../../visualization/visualization.h"
 #include "../ifc/xml/vabstractpattern.h"
 #include "../ifc/xml/vdomdocument.h"
 #include "../support/dialogeditwrongformula.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/vcommonsettings.h"
-#include "dialogs/tools/../../visualization/path/../visualization.h"
 #include "ui_dialogcutspline.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialogcutspline.h

@@ -36,7 +36,6 @@
 #include <QtGlobal>
 
 #include "../vmisc/def.h"
-#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp

@@ -35,14 +35,14 @@
 #include <QPushButton>
 #include <QToolButton>
 
-#include "../../../vpatterndb/vtranslatevars.h"
+#include "../vpatterndb/vtranslatevars.h"
 #include "../../visualization/path/vistoolcutsplinepath.h"
+#include "../../visualization/visualization.h"
 #include "../ifc/xml/vabstractpattern.h"
 #include "../ifc/xml/vdomdocument.h"
 #include "../support/dialogeditwrongformula.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/vcommonsettings.h"
-#include "dialogs/tools/../../visualization/path/../visualization.h"
 #include "ui_dialogcutsplinepath.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialogcutsplinepath.h

@@ -36,7 +36,6 @@
 #include <QtGlobal>
 
 #include "../vmisc/def.h"
-#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialogdetail.cpp

@@ -59,11 +59,11 @@
 #include <QtDebug>
 #include <new>
 
-#include "../../../ifc/xml/vdomdocument.h"
+#include "../ifc/xml/vdomdocument.h"
-#include "../../../vpatterndb/vcontainer.h"
+#include "../vpatterndb/vcontainer.h"
 #include "../vgeometry/vgobject.h"
 #include "../vmisc/vabstractapplication.h"
-#include "dialogs/tools/dialogtool.h"
+#include "dialogtool.h"
 #include "vnodedetail.h"
 
 class QPointF;

src/libs/vtools/dialogs/tools/dialogendline.cpp

@@ -40,19 +40,19 @@
 #include <QToolButton>
 #include <new>
 
-#include "../../../vgeometry/vpointf.h"
+#include "../vgeometry/vpointf.h"
-#include "../../../vpatterndb/vcontainer.h"
+#include "../vpatterndb/vcontainer.h"
-#include "../../../vpatterndb/vtranslatevars.h"
+#include "../vpatterndb/vtranslatevars.h"
-#include "../../../vwidgets/vmaingraphicsscene.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "../vwidgets/vabstractmainwindow.h"
 #include "../../tools/vabstracttool.h"
 #include "../../visualization/line/vistoolendline.h"
+#include "../../visualization/visualization.h"
 #include "../ifc/xml/vabstractpattern.h"
 #include "../ifc/xml/vdomdocument.h"
 #include "../support/dialogeditwrongformula.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/vcommonsettings.h"
-#include "../vwidgets/vabstractmainwindow.h"
-#include "dialogs/tools/../../tools/../visualization/visualization.h"
 #include "ui_dialogendline.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialogendline.h

@@ -36,7 +36,6 @@
 #include <QtGlobal>
 
 #include "../vmisc/def.h"
-#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialoggroup.h

@@ -36,7 +36,6 @@
 #include <QString>
 #include <QtGlobal>
 
-#include "../vtools/tools/drawTools/../../dialogs/tools/dialogtool.h"
 #include "dialogtool.h"
 
 class QWidget;

src/libs/vtools/dialogs/tools/dialogheight.cpp

@@ -42,14 +42,14 @@
 
 #include "../../tools/vabstracttool.h"
 #include "../../visualization/line/vistoolheight.h"
+#include "../../visualization/visualization.h"
+#include "../../visualization/line/visline.h"
 #include "../ifc/xml/vabstractpattern.h"
 #include "../vgeometry/vgobject.h"
 #include "../vgeometry/vpointf.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vpatterndb/vcontainer.h"
-#include "dialogs/tools/../../visualization/line/../visualization.h"
+#include "dialogtool.h"
-#include "dialogs/tools/../../visualization/line/visline.h"
-#include "dialogs/tools/dialogtool.h"
 #include "ui_dialogheight.h"
 
 class QWidget;

src/libs/vtools/dialogs/tools/dialogline.cpp

@@ -37,9 +37,9 @@
 #include <QVariant>
 
 #include "../../tools/vabstracttool.h"
+#include "../../visualization/visualization.h"
 #include "../../visualization/line/vistoolline.h"
-#include "../vgeometry/../ifc/ifcdef.h"
+#include "../ifc/ifcdef.h"
-#include "dialogs/tools/../../tools/../visualization/visualization.h"
 #include "dialogs/tools/dialogtool.h"
 #include "ui_dialogline.h"
 

src/libs/vtools/dialogs/tools/dialoglineintersect.cpp

@@ -41,13 +41,13 @@
 #include <QSharedPointer>
 #include <new>
 
+#include "../../visualization/visualization.h"
 #include "../../visualization/line/vistoollineintersect.h"
 #include "../ifc/xml/vabstractpattern.h"
 #include "../vgeometry/vpointf.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vpatterndb/vcontainer.h"
-#include "dialogs/tools/../../visualization/line/../visualization.h"
+#include "dialogtool.h"
-#include "dialogs/tools/dialogtool.h"
 #include "ui_dialoglineintersect.h"
 
 class QWidget;

src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp

@@ -44,18 +44,18 @@
 #include <QToolButton>
 #include <new>
 
-#include "../../../vgeometry/vpointf.h"
+#include "../vgeometry/vpointf.h"
-#include "../../../vpatterndb/vcontainer.h"
+#include "../vpatterndb/vcontainer.h"
-#include "../../../vpatterndb/vtranslatevars.h"
+#include "../vpatterndb/vtranslatevars.h"
-#include "../../../vwidgets/vmaingraphicsscene.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "../vwidgets/vabstractmainwindow.h"
 #include "../../tools/vabstracttool.h"
 #include "../../visualization/line/vistoollineintersectaxis.h"
+#include "../../visualization/visualization.h"
 #include "../ifc/xml/vabstractpattern.h"
 #include "../support/dialogeditwrongformula.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/vcommonsettings.h"
-#include "../vwidgets/vabstractmainwindow.h"
-#include "dialogs/tools/../../tools/../visualization/visualization.h"
 #include "ui_dialoglineintersectaxis.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h

@@ -36,7 +36,6 @@
 #include <QtGlobal>
 
 #include "../vmisc/def.h"
-#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialognormal.cpp

@@ -39,15 +39,15 @@
 #include <QPushButton>
 #include <QToolButton>
 
-#include "../../../vpatterndb/vtranslatevars.h"
+#include "../vpatterndb/vtranslatevars.h"
 #include "../../tools/vabstracttool.h"
 #include "../../visualization/line/vistoolnormal.h"
+#include "../../visualization/visualization.h"
 #include "../ifc/xml/vabstractpattern.h"
 #include "../ifc/xml/vdomdocument.h"
 #include "../support/dialogeditwrongformula.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/vcommonsettings.h"
-#include "dialogs/tools/../../tools/../visualization/visualization.h"
 #include "ui_dialognormal.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialognormal.h

@@ -36,7 +36,6 @@
 #include <QtGlobal>
 
 #include "../vmisc/def.h"
-#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp

@@ -32,9 +32,9 @@
 #include <QLineEdit>
 #include <QPointer>
 
+#include "../../visualization/visualization.h"
 #include "../../visualization/line/vistoolpointfromarcandtangent.h"
 #include "../vmisc/vabstractapplication.h"
-#include "dialogs/tools/../../visualization/line/../visualization.h"
 #include "dialogs/tools/dialogtool.h"
 #include "ui_dialogpointfromarcandtangent.h"
 

src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp

@@ -41,13 +41,13 @@
 #include <QToolButton>
 #include <Qt>
 
-#include "../../../vpatterndb/vtranslatevars.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../../visualization/visualization.h"
 #include "../../visualization/line/vistoolpointfromcircleandtangent.h"
 #include "../ifc/xml/vdomdocument.h"
 #include "../support/dialogeditwrongformula.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/vcommonsettings.h"
-#include "dialogs/tools/../../visualization/line/../visualization.h"
 #include "ui_dialogpointfromcircleandtangent.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h

@@ -37,7 +37,6 @@
 
 #include "../ifc/xml/vabstractpattern.h"
 #include "../vmisc/def.h"
-#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp

@@ -39,14 +39,14 @@
 #include <QSet>
 #include <QToolButton>
 
-#include "../../../vpatterndb/vtranslatevars.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../../visualization/visualization.h"
 #include "../../visualization/line/vistoolpointofcontact.h"
 #include "../ifc/xml/vabstractpattern.h"
 #include "../ifc/xml/vdomdocument.h"
 #include "../support/dialogeditwrongformula.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/vcommonsettings.h"
-#include "dialogs/tools/../../visualization/line/../visualization.h"
 #include "ui_dialogpointofcontact.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialogpointofcontact.h

@@ -36,7 +36,6 @@
 #include <QtGlobal>
 
 #include "../vmisc/def.h"
-#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 #include "ui_dialogpointofcontact.h"
 

src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp

@@ -34,12 +34,12 @@
 #include <QLineEdit>
 #include <QPointer>
 
+#include "../../visualization/visualization.h"
 #include "../../visualization/line/vistoolpointofintersection.h"
 #include "../ifc/xml/vabstractpattern.h"
-#include "../vgeometry/../ifc/ifcdef.h"
+#include "../ifc/ifcdef.h"
 #include "../vmisc/vabstractapplication.h"
-#include "dialogs/tools/../../visualization/line/../visualization.h"
+#include "dialogtool.h"
-#include "dialogs/tools/dialogtool.h"
 #include "ui_dialogpointofintersection.h"
 
 class QWidget;

src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp

@@ -34,9 +34,9 @@
 #include <QLineEdit>
 #include <QPointer>
 
+#include "../../visualization/visualization.h"
 #include "../../visualization/line/vistoolpointofintersectionarcs.h"
 #include "../vmisc/vabstractapplication.h"
-#include "dialogs/tools/../../visualization/line/../visualization.h"
 #include "dialogs/tools/dialogtool.h"
 #include "ui_dialogpointofintersectionarcs.h"
 

src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp

@@ -41,13 +41,13 @@
 #include <QToolButton>
 #include <Qt>
 
-#include "../../../vpatterndb/vtranslatevars.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../../visualization/visualization.h"
 #include "../../visualization/line/vistoolpointofintersectioncircles.h"
 #include "../ifc/xml/vdomdocument.h"
 #include "../support/dialogeditwrongformula.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/vcommonsettings.h"
-#include "dialogs/tools/../../visualization/line/../visualization.h"
 #include "ui_dialogpointofintersectioncircles.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h

@@ -37,7 +37,6 @@
 
 #include "../ifc/xml/vabstractpattern.h"
 #include "../vmisc/def.h"
-#include "dialogs/tools/../support/../tools/dialogtool.h"
 #include "dialogtool.h"
 
 class QCloseEvent;

src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp

@@ -36,9 +36,9 @@
 #include <QPushButton>
 
 #include "../../visualization/path/vistoolpointofintersectioncurves.h"
+#include "../../visualization/visualization.h"
 #include "../vmisc/vabstractapplication.h"
-#include "dialogs/tools/../../visualization/path/../visualization.h"
+#include "dialogtool.h"
-#include "dialogs/tools/dialogtool.h"
 #include "ui_dialogpointofintersectioncurves.h"
 
 class QWidget;