From 026804bc372633d25a4063649ba3ab567cbb1e1f Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 8 Oct 2015 21:11:50 +0300 Subject: [PATCH] Fix for build on drone.io. --HG-- branch : develop --- src/app/tape/mapplication.cpp | 2 +- src/app/tape/version.h | 2 +- src/app/valentina/core/vcmdexport.h | 2 +- src/app/valentina/core/vformulaproperty.cpp | 6 +++--- src/app/valentina/core/vformulaproperty.h | 2 +- src/app/valentina/core/vformulapropertyeditor.cpp | 4 ++-- src/app/valentina/core/vformulapropertyeditor.h | 2 +- .../valentina/core/vtooloptionspropertybrowser.cpp | 14 +++++++------- .../valentina/core/vtooloptionspropertybrowser.h | 6 +++--- src/app/valentina/dialogs/dialoghistory.cpp | 14 +++++++------- src/app/valentina/dialogs/dialoghistory.h | 2 +- src/app/valentina/dialogs/dialoglayoutprogress.h | 2 +- src/app/valentina/dialogs/dialoglayoutsettings.cpp | 4 ++-- src/app/valentina/dialogs/dialoglayoutsettings.h | 6 +++--- src/app/valentina/dialogs/dialognewpattern.cpp | 6 +++--- src/app/valentina/dialogs/dialogsavelayout.cpp | 2 +- src/app/valentina/mainwindowsnogui.h | 2 +- src/app/valentina/version.h | 2 +- src/libs/vmisc/vcommonsettings.h | 2 +- src/libs/vmisc/vsettings.h | 2 +- src/libs/vtools/dialogs/tools/dialogdetail.h | 2 +- src/libs/vtools/dialogs/tools/dialogheight.cpp | 6 +++--- .../vtools/dialogs/tools/dialoglineintersect.cpp | 6 +++--- .../dialogs/tools/dialogpointfromarcandtangent.cpp | 6 +++--- .../tools/dialogpointofintersectionarcs.cpp | 6 +++--- src/libs/vtools/dialogs/tools/dialogspline.cpp | 4 ++-- src/libs/vtools/dialogs/tools/dialogsplinepath.cpp | 4 ++-- src/libs/vtools/dialogs/tools/dialogsplinepath.h | 2 +- .../vtools/dialogs/tools/dialoguniondetails.cpp | 4 ++-- .../toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp | 4 ++-- .../toollinepoint/vtoollinepoint.cpp | 2 +- src/libs/vtools/tools/drawTools/vtoolline.cpp | 2 +- src/libs/vtools/undocommands/vundocommand.cpp | 2 +- src/libs/vtools/visualization/visualization.h | 2 +- src/test/ParserTest/main.cpp | 2 +- src/test/ValentinaTest/tst_nameregexp.cpp | 2 +- src/test/ValentinaTest/tst_vabstractdetail.cpp | 2 +- src/test/ValentinaTest/tst_varc.cpp | 2 +- src/test/ValentinaTest/tst_vlayoutdetail.cpp | 2 +- src/test/ValentinaTest/tst_vposter.cpp | 2 +- src/test/ValentinaTest/tst_vspline.cpp | 2 +- 41 files changed, 75 insertions(+), 75 deletions(-) diff --git a/src/app/tape/mapplication.cpp b/src/app/tape/mapplication.cpp index 54815c177..a38e4d886 100644 --- a/src/app/tape/mapplication.cpp +++ b/src/app/tape/mapplication.cpp @@ -53,7 +53,7 @@ Q_LOGGING_CATEGORY(mApp, "m.application") #if QT_VERSION < QT_VERSION_CHECK(5, 2, 0) -# include "../../libs/vmisc/backport/qcommandlineparser.h" +# include "../vmisc/backport/qcommandlineparser.h" #else # include #endif diff --git a/src/app/tape/version.h b/src/app/tape/version.h index c829a7999..7fc1cfe1b 100644 --- a/src/app/tape/version.h +++ b/src/app/tape/version.h @@ -29,7 +29,7 @@ #ifndef VERSION_H #define VERSION_H -#include "../../libs/vmisc/projectversion.h" +#include "../vmisc/projectversion.h" #define VER_INTERNALNAME_STR "Tape" #define VER_ORIGINALFILENAME_STR "tape.exe" diff --git a/src/app/valentina/core/vcmdexport.h b/src/app/valentina/core/vcmdexport.h index bd1a56bd5..f6d067e53 100644 --- a/src/app/valentina/core/vcmdexport.h +++ b/src/app/valentina/core/vcmdexport.h @@ -8,7 +8,7 @@ #include "../vmisc/vsysexits.h" #if QT_VERSION < QT_VERSION_CHECK(5, 2, 0) -# include "../libs/vmisc/backport/qcommandlineparser.h" +# include "../vmisc/backport/qcommandlineparser.h" #else # include #endif diff --git a/src/app/valentina/core/vformulaproperty.cpp b/src/app/valentina/core/vformulaproperty.cpp index 6be529d65..ec116ae6e 100644 --- a/src/app/valentina/core/vformulaproperty.cpp +++ b/src/app/valentina/core/vformulaproperty.cpp @@ -29,10 +29,10 @@ #include "vformulaproperty.h" #include "vformulapropertyeditor.h" -#include "../../libs/vpropertyexplorer/vproperty_p.h" +#include "../vpropertyexplorer/vproperty_p.h" #include "vformulapropertyeditor.h" -#include "../../libs/vpropertyexplorer/vproperties.h" -#include "../../libs/vpatterndb/vformula.h" +#include "../vpropertyexplorer/vproperties.h" +#include "../vpatterndb/vformula.h" enum class ChildType : char {Invalid = 0, Value = 1, Formula = 2}; diff --git a/src/app/valentina/core/vformulaproperty.h b/src/app/valentina/core/vformulaproperty.h index 7e21aa11e..b5ca10648 100644 --- a/src/app/valentina/core/vformulaproperty.h +++ b/src/app/valentina/core/vformulaproperty.h @@ -29,7 +29,7 @@ #ifndef VFORMULAPROPERTY_H #define VFORMULAPROPERTY_H -#include "../../libs/vpropertyexplorer/vproperty.h" +#include "../vpropertyexplorer/vproperty.h" class VFormula; diff --git a/src/app/valentina/core/vformulapropertyeditor.cpp b/src/app/valentina/core/vformulapropertyeditor.cpp index b64c276c7..3b4a6901c 100644 --- a/src/app/valentina/core/vformulapropertyeditor.cpp +++ b/src/app/valentina/core/vformulapropertyeditor.cpp @@ -34,8 +34,8 @@ #include #include -#include "../../libs/vpropertyexplorer/vproperty.h" -#include "../../libs/vtools/dialogs/support/dialogeditwrongformula.h" +#include "../vpropertyexplorer/vproperty.h" +#include "../vtools/dialogs/support/dialogeditwrongformula.h" using namespace VPE; diff --git a/src/app/valentina/core/vformulapropertyeditor.h b/src/app/valentina/core/vformulapropertyeditor.h index 991dc0b27..2f9d73064 100644 --- a/src/app/valentina/core/vformulapropertyeditor.h +++ b/src/app/valentina/core/vformulapropertyeditor.h @@ -35,7 +35,7 @@ #include #include -#include "../../libs/vpatterndb/vformula.h" +#include "../vpatterndb/vformula.h" class VFormulaPropertyEditor : public QWidget { diff --git a/src/app/valentina/core/vtooloptionspropertybrowser.cpp b/src/app/valentina/core/vtooloptionspropertybrowser.cpp index 016058e2d..58447ca0f 100644 --- a/src/app/valentina/core/vtooloptionspropertybrowser.cpp +++ b/src/app/valentina/core/vtooloptionspropertybrowser.cpp @@ -27,15 +27,15 @@ *************************************************************************/ #include "vtooloptionspropertybrowser.h" -#include "../../libs/vtools/tools/drawTools/drawtools.h" +#include "../vtools/tools/drawTools/drawtools.h" #include "../core/vapplication.h" -#include "../../libs/vwidgets/vmaingraphicsview.h" -#include "../../libs/vwidgets/vgraphicssimpletextitem.h" -#include "../../libs/vwidgets/vcontrolpointspline.h" -#include "../../libs/vwidgets/vsimplepoint.h" -#include "../../libs/vpropertyexplorer/vproperties.h" +#include "../vwidgets/vmaingraphicsview.h" +#include "../vwidgets/vgraphicssimpletextitem.h" +#include "../vwidgets/vcontrolpointspline.h" +#include "../vwidgets/vsimplepoint.h" +#include "../vpropertyexplorer/vproperties.h" #include "vformulaproperty.h" -#include "../../libs/vpatterndb/vformula.h" +#include "../vpatterndb/vformula.h" #include #include diff --git a/src/app/valentina/core/vtooloptionspropertybrowser.h b/src/app/valentina/core/vtooloptionspropertybrowser.h index 134d5398a..71c7e8f2d 100644 --- a/src/app/valentina/core/vtooloptionspropertybrowser.h +++ b/src/app/valentina/core/vtooloptionspropertybrowser.h @@ -32,9 +32,9 @@ #include #include -#include "../../libs/vpropertyexplorer/vproperty.h" -#include "../../libs/vpropertyexplorer/vpropertymodel.h" -#include "../../libs/vpropertyexplorer/vpropertyformview.h" +#include "../vpropertyexplorer/vproperty.h" +#include "../vpropertyexplorer/vpropertymodel.h" +#include "../vpropertyexplorer/vpropertyformview.h" class QDockWidget; class QGraphicsItem; diff --git a/src/app/valentina/dialogs/dialoghistory.cpp b/src/app/valentina/dialogs/dialoghistory.cpp index 8359d4864..f9a8465fd 100644 --- a/src/app/valentina/dialogs/dialoghistory.cpp +++ b/src/app/valentina/dialogs/dialoghistory.cpp @@ -28,13 +28,13 @@ #include "dialoghistory.h" #include "ui_dialoghistory.h" -#include "../../libs/vgeometry/varc.h" -#include "../../libs/vgeometry/vsplinepath.h" -#include "../../libs/vgeometry/vpointf.h" -#include "../../libs/vtools/tools/vabstracttool.h" -#include "../../libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h" -#include "../../libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h" -#include "../../libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h" +#include "../vgeometry/varc.h" +#include "../vgeometry/vsplinepath.h" +#include "../vgeometry/vpointf.h" +#include "../vtools/tools/vabstracttool.h" +#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h" +#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h" +#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h" #include "../xml/vpattern.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/valentina/dialogs/dialoghistory.h b/src/app/valentina/dialogs/dialoghistory.h index fc327c107..6d1d555d0 100644 --- a/src/app/valentina/dialogs/dialoghistory.h +++ b/src/app/valentina/dialogs/dialoghistory.h @@ -29,7 +29,7 @@ #ifndef DIALOGHISTORY_H #define DIALOGHISTORY_H -#include "../../libs/vtools/dialogs/tools/dialogtool.h" +#include "../vtools/dialogs/tools/dialogtool.h" #include diff --git a/src/app/valentina/dialogs/dialoglayoutprogress.h b/src/app/valentina/dialogs/dialoglayoutprogress.h index c1a91b9d2..376392879 100644 --- a/src/app/valentina/dialogs/dialoglayoutprogress.h +++ b/src/app/valentina/dialogs/dialoglayoutprogress.h @@ -31,7 +31,7 @@ #include -#include "../../libs/vlayout/vlayoutdef.h" +#include "../vlayout/vlayoutdef.h" namespace Ui { diff --git a/src/app/valentina/dialogs/dialoglayoutsettings.cpp b/src/app/valentina/dialogs/dialoglayoutsettings.cpp index dd561e43d..00c9d8dae 100644 --- a/src/app/valentina/dialogs/dialoglayoutsettings.cpp +++ b/src/app/valentina/dialogs/dialoglayoutsettings.cpp @@ -29,8 +29,8 @@ #include "dialoglayoutsettings.h" #include "ui_dialoglayoutsettings.h" #include "../core/vapplication.h" -#include "../../libs/ifc/xml/vdomdocument.h" -#include "../../libs/vmisc/vsettings.h" +#include "../ifc/xml/vdomdocument.h" +#include "../vmisc/vsettings.h" #include #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) diff --git a/src/app/valentina/dialogs/dialoglayoutsettings.h b/src/app/valentina/dialogs/dialoglayoutsettings.h index 7ea7f8c1d..bb5106fff 100644 --- a/src/app/valentina/dialogs/dialoglayoutsettings.h +++ b/src/app/valentina/dialogs/dialoglayoutsettings.h @@ -32,9 +32,9 @@ #include #include -#include "../../libs/vlayout/vbank.h" -#include "../../libs/ifc/ifcdef.h" -#include "../../libs/vlayout/vlayoutgenerator.h" +#include "../vlayout/vbank.h" +#include "../ifc/ifcdef.h" +#include "../vlayout/vlayoutgenerator.h" namespace Ui { diff --git a/src/app/valentina/dialogs/dialognewpattern.cpp b/src/app/valentina/dialogs/dialognewpattern.cpp index 85cb81b96..b68b461e5 100644 --- a/src/app/valentina/dialogs/dialognewpattern.cpp +++ b/src/app/valentina/dialogs/dialognewpattern.cpp @@ -29,9 +29,9 @@ #include "dialognewpattern.h" #include "ui_dialognewpattern.h" #include "../core/vapplication.h" -#include "../../libs/vmisc/vsettings.h" -#include "../../libs/vpatterndb/vcontainer.h" -#include "../../libs/ifc/xml/vdomdocument.h" +#include "../vmisc/vsettings.h" +#include "../vpatterndb/vcontainer.h" +#include "../ifc/xml/vdomdocument.h" #include #include diff --git a/src/app/valentina/dialogs/dialogsavelayout.cpp b/src/app/valentina/dialogs/dialogsavelayout.cpp index 2261082e8..11d554fda 100644 --- a/src/app/valentina/dialogs/dialogsavelayout.cpp +++ b/src/app/valentina/dialogs/dialogsavelayout.cpp @@ -30,7 +30,7 @@ #include "ui_dialogsavelayout.h" #include "../options.h" #include "../core/vapplication.h" -#include "../../libs/vmisc/vsettings.h" +#include "../vmisc/vsettings.h" #include #include diff --git a/src/app/valentina/mainwindowsnogui.h b/src/app/valentina/mainwindowsnogui.h index 0a96d6563..9bf87984d 100644 --- a/src/app/valentina/mainwindowsnogui.h +++ b/src/app/valentina/mainwindowsnogui.h @@ -35,7 +35,7 @@ #include "../vlayout/vlayoutdetail.h" #include "xml/vpattern.h" #include "dialogs/dialogsavelayout.h" -#include "../../libs/vlayout/vlayoutgenerator.h" +#include "../vlayout/vlayoutgenerator.h" class QGraphicsScene; diff --git a/src/app/valentina/version.h b/src/app/valentina/version.h index cb113799c..0a38656fc 100644 --- a/src/app/valentina/version.h +++ b/src/app/valentina/version.h @@ -29,7 +29,7 @@ #ifndef VERSION_H #define VERSION_H -#include "../../libs/vmisc/projectversion.h" +#include "../vmisc/projectversion.h" #define VER_INTERNALNAME_STR "Valentina" #define VER_ORIGINALFILENAME_STR "valentina.exe" diff --git a/src/libs/vmisc/vcommonsettings.h b/src/libs/vmisc/vcommonsettings.h index 8c4b39f10..cee31a4a0 100644 --- a/src/libs/vmisc/vcommonsettings.h +++ b/src/libs/vmisc/vcommonsettings.h @@ -30,7 +30,7 @@ #define VCOMMONSETTINGS_H #include -#include "../../libs/vlayout/vbank.h" +#include "../vlayout/vbank.h" class VCommonSettings : public QSettings { diff --git a/src/libs/vmisc/vsettings.h b/src/libs/vmisc/vsettings.h index 9a6f38913..12da5c4ab 100644 --- a/src/libs/vmisc/vsettings.h +++ b/src/libs/vmisc/vsettings.h @@ -30,7 +30,7 @@ #define VSETTINGS_H #include "vcommonsettings.h" -#include "../../libs/vlayout/vbank.h" +#include "../vlayout/vbank.h" class VSettings : public VCommonSettings { diff --git a/src/libs/vtools/dialogs/tools/dialogdetail.h b/src/libs/vtools/dialogs/tools/dialogdetail.h index 4930de5d2..dbdc6ec94 100644 --- a/src/libs/vtools/dialogs/tools/dialogdetail.h +++ b/src/libs/vtools/dialogs/tools/dialogdetail.h @@ -31,7 +31,7 @@ #include "ui_dialogdetail.h" #include "dialogtool.h" -#include "../../libs/vpatterndb/vdetail.h" +#include "../vpatterndb/vdetail.h" /** * @brief The DialogDetail class dialog for ToolDetai. Help create detail and edit option. diff --git a/src/libs/vtools/dialogs/tools/dialogheight.cpp b/src/libs/vtools/dialogs/tools/dialogheight.cpp index 0273ae424..1f96321c7 100644 --- a/src/libs/vtools/dialogs/tools/dialogheight.cpp +++ b/src/libs/vtools/dialogs/tools/dialogheight.cpp @@ -29,11 +29,11 @@ #include "dialogheight.h" #include "ui_dialogheight.h" -#include "../../libs/vgeometry/vpointf.h" -#include "../../libs/vpatterndb/vcontainer.h" +#include "../vgeometry/vpointf.h" +#include "../vpatterndb/vcontainer.h" #include "../../tools/vabstracttool.h" #include "../../visualization/vistoolheight.h" -#include "../../libs/vwidgets/vmaingraphicsscene.h" +#include "../vwidgets/vmaingraphicsscene.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp b/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp index 23537d3c0..2797b6316 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp +++ b/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp @@ -29,10 +29,10 @@ #include "dialoglineintersect.h" #include "ui_dialoglineintersect.h" -#include "../../libs/vgeometry/vpointf.h" -#include "../../libs/vpatterndb/vcontainer.h" +#include "../vgeometry/vpointf.h" +#include "../vpatterndb/vcontainer.h" #include "../../visualization/vistoollineintersect.h" -#include "../../libs/vwidgets/vmaingraphicsscene.h" +#include "../vwidgets/vmaingraphicsscene.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp index d26d09e45..b5f912bb1 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp @@ -29,10 +29,10 @@ #include "dialogpointfromarcandtangent.h" #include "ui_dialogpointfromarcandtangent.h" -#include "../../libs/vgeometry/vpointf.h" -#include "../../libs/vpatterndb/vcontainer.h" +#include "../vgeometry/vpointf.h" +#include "../vpatterndb/vcontainer.h" #include "../../visualization/vistoolpointfromarcandtangent.h" -#include "../../libs/vwidgets/vmaingraphicsscene.h" +#include "../vwidgets/vmaingraphicsscene.h" //--------------------------------------------------------------------------------------------------------------------- DialogPointFromArcAndTangent::DialogPointFromArcAndTangent(const VContainer *data, const quint32 &toolId, diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp index b5f0239ee..faacacf58 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp @@ -29,10 +29,10 @@ #include "dialogpointofintersectionarcs.h" #include "ui_dialogpointofintersectionarcs.h" -#include "../../libs/vgeometry/vpointf.h" -#include "../../libs/vpatterndb/vcontainer.h" +#include "../vgeometry/vpointf.h" +#include "../vpatterndb/vcontainer.h" #include "../../visualization/vistoolpointofintersectionarcs.h" -#include "../../libs/vwidgets/vmaingraphicsscene.h" +#include "../vwidgets/vmaingraphicsscene.h" //--------------------------------------------------------------------------------------------------------------------- DialogPointOfIntersectionArcs::DialogPointOfIntersectionArcs(const VContainer *data, const quint32 &toolId, diff --git a/src/libs/vtools/dialogs/tools/dialogspline.cpp b/src/libs/vtools/dialogs/tools/dialogspline.cpp index f65f13f2b..99aefe467 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogspline.cpp @@ -29,8 +29,8 @@ #include "dialogspline.h" #include "ui_dialogspline.h" -#include "../../libs/vgeometry/vpointf.h" -#include "../../libs/vpatterndb/vcontainer.h" +#include "../vgeometry/vpointf.h" +#include "../vpatterndb/vcontainer.h" #include "../../visualization/vistoolspline.h" #include diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp index 36f9c8137..25362f9d2 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp @@ -28,8 +28,8 @@ #include "dialogsplinepath.h" #include "ui_dialogsplinepath.h" -#include "../../libs/vgeometry/vsplinepoint.h" -#include "../../libs/vpatterndb/vcontainer.h" +#include "../vgeometry/vsplinepoint.h" +#include "../vpatterndb/vcontainer.h" #include "../../visualization/vistoolsplinepath.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.h b/src/libs/vtools/dialogs/tools/dialogsplinepath.h index 7e5642eaa..c10146364 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.h +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.h @@ -30,7 +30,7 @@ #define DIALOGSPLINEPATH_H #include "dialogtool.h" -#include "../../libs/vgeometry/vsplinepath.h" +#include "../vgeometry/vsplinepath.h" namespace Ui { diff --git a/src/libs/vtools/dialogs/tools/dialoguniondetails.cpp b/src/libs/vtools/dialogs/tools/dialoguniondetails.cpp index 494125f8f..d139a4f66 100644 --- a/src/libs/vtools/dialogs/tools/dialoguniondetails.cpp +++ b/src/libs/vtools/dialogs/tools/dialoguniondetails.cpp @@ -28,8 +28,8 @@ #include "dialoguniondetails.h" #include "ui_dialoguniondetails.h" -#include "../../libs/vpatterndb/vdetail.h" -#include "../../libs/vpatterndb/vcontainer.h" +#include "../vpatterndb/vdetail.h" +#include "../vpatterndb/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp index 57593505b..30d34336d 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp @@ -27,8 +27,8 @@ *************************************************************************/ #include "vtoolcut.h" -#include "../../libs/vgeometry/vpointf.h" -#include "../../libs/vpatterndb/vformula.h" +#include "../vgeometry/vpointf.h" +#include "../vpatterndb/vformula.h" //--------------------------------------------------------------------------------------------------------------------- VToolCut::VToolCut(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &formula, diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp index c35620db3..77d315320 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vtoollinepoint.h" -#include "../../libs/vgeometry/vpointf.h" +#include "../vgeometry/vpointf.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/libs/vtools/tools/drawTools/vtoolline.cpp b/src/libs/vtools/tools/drawTools/vtoolline.cpp index 462426451..8756c2c09 100644 --- a/src/libs/vtools/tools/drawTools/vtoolline.cpp +++ b/src/libs/vtools/tools/drawTools/vtoolline.cpp @@ -29,7 +29,7 @@ #include "vtoolline.h" #include "../../dialogs/tools/dialogline.h" #include -#include "../../libs/vgeometry/vpointf.h" +#include "../vgeometry/vpointf.h" #include "../../dialogs/tools/dialogline.h" #include "../../visualization/vistoolline.h" diff --git a/src/libs/vtools/undocommands/vundocommand.cpp b/src/libs/vtools/undocommands/vundocommand.cpp index 8ec73d30b..b7732829e 100644 --- a/src/libs/vtools/undocommands/vundocommand.cpp +++ b/src/libs/vtools/undocommands/vundocommand.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vundocommand.h" -#include "../../libs/vmisc/def.h" +#include "../vmisc/def.h" Q_LOGGING_CATEGORY(vUndo, "v.undo") diff --git a/src/libs/vtools/visualization/visualization.h b/src/libs/vtools/visualization/visualization.h index 5f3e76128..f5a1193e5 100644 --- a/src/libs/vtools/visualization/visualization.h +++ b/src/libs/vtools/visualization/visualization.h @@ -35,7 +35,7 @@ #include "../vmisc/vabstractapplication.h" #include "../vwidgets/vmaingraphicsscene.h" #include "../vmisc/logging.h" -#include "../../libs/vpatterndb/vcontainer.h" +#include "../vpatterndb/vcontainer.h" Q_DECLARE_LOGGING_CATEGORY(vVis) diff --git a/src/test/ParserTest/main.cpp b/src/test/ParserTest/main.cpp index d53e71096..a10f78021 100644 --- a/src/test/ParserTest/main.cpp +++ b/src/test/ParserTest/main.cpp @@ -29,7 +29,7 @@ #include #include #include -#include "../../libs/qmuparser/qmuparsertest.h" +#include "../qmuparser/qmuparsertest.h" using namespace qmu; diff --git a/src/test/ValentinaTest/tst_nameregexp.cpp b/src/test/ValentinaTest/tst_nameregexp.cpp index edad988c3..5bf7921bb 100644 --- a/src/test/ValentinaTest/tst_nameregexp.cpp +++ b/src/test/ValentinaTest/tst_nameregexp.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "tst_nameregexp.h" -#include "../../libs/qmuparser/qmudef.h" +#include "../qmuparser/qmudef.h" #include diff --git a/src/test/ValentinaTest/tst_vabstractdetail.cpp b/src/test/ValentinaTest/tst_vabstractdetail.cpp index 99a1c9d96..60db36b21 100644 --- a/src/test/ValentinaTest/tst_vabstractdetail.cpp +++ b/src/test/ValentinaTest/tst_vabstractdetail.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "tst_vabstractdetail.h" -#include "../../libs/vlayout/vabstractdetail.h" +#include "../vlayout/vabstractdetail.h" #include #include diff --git a/src/test/ValentinaTest/tst_varc.cpp b/src/test/ValentinaTest/tst_varc.cpp index bc9d8d34f..a24cd3809 100644 --- a/src/test/ValentinaTest/tst_varc.cpp +++ b/src/test/ValentinaTest/tst_varc.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "tst_varc.h" -#include "../../libs/vgeometry/varc.h" +#include "../vgeometry/varc.h" #include diff --git a/src/test/ValentinaTest/tst_vlayoutdetail.cpp b/src/test/ValentinaTest/tst_vlayoutdetail.cpp index 5f342838c..bd8d806b9 100644 --- a/src/test/ValentinaTest/tst_vlayoutdetail.cpp +++ b/src/test/ValentinaTest/tst_vlayoutdetail.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "tst_vlayoutdetail.h" -#include "../../libs/vlayout/vlayoutdetail.h" +#include "../vlayout/vlayoutdetail.h" #include diff --git a/src/test/ValentinaTest/tst_vposter.cpp b/src/test/ValentinaTest/tst_vposter.cpp index 78c053261..d7ad28f91 100644 --- a/src/test/ValentinaTest/tst_vposter.cpp +++ b/src/test/ValentinaTest/tst_vposter.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "tst_vposter.h" -#include "../../libs/vlayout/vposter.h" +#include "../vlayout/vposter.h" #include #include diff --git a/src/test/ValentinaTest/tst_vspline.cpp b/src/test/ValentinaTest/tst_vspline.cpp index 770e2c7c7..034807dc0 100644 --- a/src/test/ValentinaTest/tst_vspline.cpp +++ b/src/test/ValentinaTest/tst_vspline.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "tst_vspline.h" -#include "../../libs/vgeometry/vspline.h" +#include "../vgeometry/vspline.h" #include