Fixed issues with include paths.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-08-05 13:41:02 +03:00
parent ed0fb20028
commit 75e9e9b2ee
20 changed files with 68 additions and 66 deletions

View File

@ -27,9 +27,9 @@
*************************************************************************/ *************************************************************************/
#include "vcmdexport.h" #include "vcmdexport.h"
#include "dialogs/dialoglayoutsettings.h" #include "../dialogs/dialoglayoutsettings.h"
#include "dialogs/dialogsavelayout.h" #include "../dialogs/dialogsavelayout.h"
#include "xml/vdomdocument.h" #include "../ifc/xml/vdomdocument.h"
#include "../vformat/vmeasurements.h" #include "../vformat/vmeasurements.h"
#include "../vmisc/commandoptions.h" #include "../vmisc/commandoptions.h"
#include "../vmisc/vsettings.h" #include "../vmisc/vsettings.h"

View File

@ -29,11 +29,11 @@
#include "mainwindow.h" #include "mainwindow.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include "../vgeometry/vspline.h" #include "../vgeometry/vspline.h"
#include "exception/vexceptionobjecterror.h" #include "../ifc/exception/vexceptionobjecterror.h"
#include "exception/vexceptionconversionerror.h" #include "../ifc/exception/vexceptionconversionerror.h"
#include "exception/vexceptionemptyparameter.h" #include "../ifc/exception/vexceptionemptyparameter.h"
#include "exception/vexceptionwrongid.h" #include "../ifc/exception/vexceptionwrongid.h"
#include "exception/vexceptionundo.h" #include "../ifc/exception/vexceptionundo.h"
#include "version.h" #include "version.h"
#include "core/vapplication.h" #include "core/vapplication.h"
#include "../vmisc/undoevent.h" #include "../vmisc/undoevent.h"

View File

@ -27,8 +27,8 @@
*************************************************************************/ *************************************************************************/
#include "vabstractconverter.h" #include "vabstractconverter.h"
#include "exception/vexception.h" #include "../exception/vexception.h"
#include "exception/vexceptionwrongid.h" #include "../exception/vexceptionwrongid.h"
#include <QFile> #include <QFile>
#include <QFileInfo> #include <QFileInfo>

View File

@ -27,8 +27,8 @@
*************************************************************************/ *************************************************************************/
#include "vabstractpattern.h" #include "vabstractpattern.h"
#include "exception/vexceptionbadid.h" #include "../exception/vexceptionbadid.h"
#include "exception/vexceptionemptyparameter.h" #include "../exception/vexceptionemptyparameter.h"
#include "vpatternconverter.h" #include "vpatternconverter.h"
#include "../qmuparser/qmutokenparser.h" #include "../qmuparser/qmutokenparser.h"
#include "../exception/vexceptionobjecterror.h" #include "../exception/vexceptionobjecterror.h"

View File

@ -27,10 +27,10 @@
*************************************************************************/ *************************************************************************/
#include "vdomdocument.h" #include "vdomdocument.h"
#include "exception/vexceptionconversionerror.h" #include "../exception/vexceptionconversionerror.h"
#include "exception/vexceptionemptyparameter.h" #include "../exception/vexceptionemptyparameter.h"
#include "exception/vexceptionbadid.h" #include "../exception/vexceptionbadid.h"
#include "exception/vexceptionwrongid.h" #include "../exception/vexceptionwrongid.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
# include "../vmisc/backport/qsavefile.h" # include "../vmisc/backport/qsavefile.h"

View File

@ -27,8 +27,8 @@
*************************************************************************/ *************************************************************************/
#include "vpatternconverter.h" #include "vpatternconverter.h"
#include "exception/vexception.h" #include "../exception/vexception.h"
#include "exception/vexceptionemptyparameter.h" #include "../exception/vexceptionemptyparameter.h"
#include "../qmuparser/qmutokenparser.h" #include "../qmuparser/qmutokenparser.h"
#include <QDir> #include <QDir>

View File

@ -27,7 +27,7 @@
*************************************************************************/ *************************************************************************/
#include "vvitconverter.h" #include "vvitconverter.h"
#include "exception/vexception.h" #include "../exception/vexception.h"
#include <QFile> #include <QFile>

View File

@ -27,7 +27,7 @@
*************************************************************************/ *************************************************************************/
#include "vvstconverter.h" #include "vvstconverter.h"
#include "exception/vexception.h" #include "../exception/vexception.h"
#include <QFile> #include <QFile>

View File

@ -26,7 +26,7 @@
#define DL_ENTITIES_H #define DL_ENTITIES_H
#include "dl_global.h" #include "dl_global.h"
#include "dxfdef.h" #include "../dxfdef.h"
#include <string> #include <string>
#include <vector> #include <vector>

View File

@ -38,7 +38,9 @@
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
#include <QModelIndex> #include <QModelIndex>
#include <def.h>
#include "def.h"
class QTextCodec; class QTextCodec;
class QxtCsvModelPrivate; class QxtCsvModelPrivate;

View File

@ -29,7 +29,7 @@
#ifndef VARCRADIUS_H #ifndef VARCRADIUS_H
#define VARCRADIUS_H #define VARCRADIUS_H
#include "../vpatterndb/variables/vcurvevariable.h" #include "vcurvevariable.h"
#include "../ifc/ifcdef.h" #include "../ifc/ifcdef.h"
class VArc; class VArc;

View File

@ -29,7 +29,7 @@
#ifndef VCURVEANGLE_H #ifndef VCURVEANGLE_H
#define VCURVEANGLE_H #define VCURVEANGLE_H
#include "../vpatterndb/variables/vcurvevariable.h" #include "vcurvevariable.h"
class VAbstractCurve; class VAbstractCurve;
class VSpline; class VSpline;

View File

@ -29,7 +29,7 @@
#ifndef VCURVELENGTH_H #ifndef VCURVELENGTH_H
#define VCURVELENGTH_H #define VCURVELENGTH_H
#include "../vpatterndb/variables/vcurvevariable.h" #include "vcurvevariable.h"
#include "../ifc/ifcdef.h" #include "../ifc/ifcdef.h"
class VAbstractCurve; class VAbstractCurve;

View File

@ -29,7 +29,7 @@
#ifndef VLINEANGLE_H #ifndef VLINEANGLE_H
#define VLINEANGLE_H #define VLINEANGLE_H
#include "../vpatterndb/variables/vinternalvariable.h" #include "vinternalvariable.h"
class VPointF; class VPointF;
class VLineAngleData; class VLineAngleData;

View File

@ -29,7 +29,7 @@
#ifndef VLINELENGTH_H #ifndef VLINELENGTH_H
#define VLINELENGTH_H #define VLINELENGTH_H
#include "../vpatterndb/variables/vinternalvariable.h" #include "vinternalvariable.h"
#include "../ifc/ifcdef.h" #include "../ifc/ifcdef.h"
class VPointF; class VPointF;

View File

@ -29,7 +29,7 @@
#ifndef VVARIABLE_H #ifndef VVARIABLE_H
#define VVARIABLE_H #define VVARIABLE_H
#include "../vpatterndb/variables/vinternalvariable.h" #include "vinternalvariable.h"
#include "../ifc/ifcdef.h" #include "../ifc/ifcdef.h"
class VVariableData; class VVariableData;

View File

@ -29,41 +29,41 @@
#ifndef TOOLDIALOGS_H #ifndef TOOLDIALOGS_H
#define TOOLDIALOGS_H #define TOOLDIALOGS_H
#include "dialogs/tools/dialogalongline.h" #include "tools/dialogalongline.h"
#include "dialogs/tools/dialogarc.h" #include "tools/dialogarc.h"
#include "dialogs/tools/dialogarcwithlength.h" #include "tools/dialogarcwithlength.h"
#include "dialogs/tools/dialogbisector.h" #include "tools/dialogbisector.h"
#include "dialogs/tools/dialogdetail.h" #include "tools/dialogdetail.h"
#include "dialogs/tools/dialogendline.h" #include "tools/dialogendline.h"
#include "dialogs/tools/dialogline.h" #include "tools/dialogline.h"
#include "dialogs/tools/dialoglineintersect.h" #include "tools/dialoglineintersect.h"
#include "dialogs/tools/dialognormal.h" #include "tools/dialognormal.h"
#include "dialogs/tools/dialogpointofcontact.h" #include "tools/dialogpointofcontact.h"
#include "dialogs/tools/dialogshoulderpoint.h" #include "tools/dialogshoulderpoint.h"
#include "dialogs/tools/dialogsinglepoint.h" #include "tools/dialogsinglepoint.h"
#include "dialogs/tools/dialogspline.h" #include "tools/dialogspline.h"
#include "dialogs/tools/dialogcubicbezier.h" #include "tools/dialogcubicbezier.h"
#include "dialogs/tools/dialogsplinepath.h" #include "tools/dialogsplinepath.h"
#include "dialogs/tools/dialogcubicbezierpath.h" #include "tools/dialogcubicbezierpath.h"
#include "dialogs/tools/dialogheight.h" #include "tools/dialogheight.h"
#include "dialogs/tools/dialogcutarc.h" #include "tools/dialogcutarc.h"
#include "dialogs/tools/dialogcutspline.h" #include "tools/dialogcutspline.h"
#include "dialogs/tools/dialogcutsplinepath.h" #include "tools/dialogcutsplinepath.h"
#include "dialogs/tools/dialoguniondetails.h" #include "tools/dialoguniondetails.h"
#include "dialogs/tools/dialogtriangle.h" #include "tools/dialogtriangle.h"
#include "dialogs/tools/dialogpointofintersection.h" #include "tools/dialogpointofintersection.h"
#include "dialogs/tools/dialoglineintersectaxis.h" #include "tools/dialoglineintersectaxis.h"
#include "dialogs/tools/dialogcurveintersectaxis.h" #include "tools/dialogcurveintersectaxis.h"
#include "dialogs/tools/dialogpointofintersectionarcs.h" #include "tools/dialogpointofintersectionarcs.h"
#include "dialogs/tools/dialogpointofintersectioncircles.h" #include "tools/dialogpointofintersectioncircles.h"
#include "dialogs/tools/dialogpointofintersectioncurves.h" #include "tools/dialogpointofintersectioncurves.h"
#include "dialogs/tools/dialogpointfromcircleandtangent.h" #include "tools/dialogpointfromcircleandtangent.h"
#include "dialogs/tools/dialogpointfromarcandtangent.h" #include "tools/dialogpointfromarcandtangent.h"
#include "dialogs/tools/dialogtruedarts.h" #include "tools/dialogtruedarts.h"
#include "dialogs/tools/dialoggroup.h" #include "tools/dialoggroup.h"
#include "dialogs/tools/dialogrotation.h" #include "tools/dialogrotation.h"
#include "dialogs/support/dialogeditwrongformula.h" #include "support/dialogeditwrongformula.h"
#include "dialogs/support/dialogundo.h" #include "support/dialogundo.h"
#endif // TOOLDIALOGS_H #endif // TOOLDIALOGS_H

View File

@ -30,7 +30,7 @@
#define VABSTRACTSPLINE_H #define VABSTRACTSPLINE_H
#include "../vdrawtool.h" #include "../vdrawtool.h"
#include "visualization/line/visline.h" #include "../../../visualization/line/visline.h"
#include <QGraphicsPathItem> #include <QGraphicsPathItem>

View File

@ -30,7 +30,7 @@
#define VDRAWTOOL_H #define VDRAWTOOL_H
#include "../vabstracttool.h" #include "../vabstracttool.h"
#include "dialogs/tools/dialogtool.h" #include "../../dialogs/tools/dialogtool.h"
#include "../vwidgets/vmaingraphicsview.h" #include "../vwidgets/vmaingraphicsview.h"
#include <QMenu> #include <QMenu>

View File

@ -33,7 +33,7 @@
#include "../ifc/xml/vabstractpattern.h" #include "../ifc/xml/vabstractpattern.h"
#include "../vmisc/vabstractapplication.h" #include "../vmisc/vabstractapplication.h"
#include "../vwidgets/vmaingraphicsscene.h" #include "../vwidgets/vmaingraphicsscene.h"
#include "visualization/visualization.h" #include "../visualization/visualization.h"
class QDomElement; class QDomElement;
class QLineF; class QLineF;