Wip Fix preprocessor on Cmake

sources/editor/arceditor.cpp

@@ -19,7 +19,7 @@
 
 #include "../QPropertyUndoCommand/qpropertyundocommand.h"
 #include "elementscene.h"
-#include "partarc.h"
+#include "graphicspart/partarc.h"
 #include "styleeditor.h"
 
 /**

sources/editor/editorcommands.h

@@ -17,8 +17,8 @@
 */
 #ifndef EDITOR_COMMANDS_H
 #define EDITOR_COMMANDS_H
+#include "../editor/graphicspart/customelementpart.h"
 #include "../qgimanager.h"
-#include "customelementpart.h"
 #include "elementcontent.h"
 #include "elementscene.h"
 #include "elementview.h"

sources/editor/elementprimitivedecorator.cpp

@@ -18,8 +18,8 @@
 #include "elementprimitivedecorator.h"
 
 #include "../QetGraphicsItemModeler/qetgraphicshandleritem.h"
+#include "../editor/graphicspart/customelementpart.h"
 #include "../qet.h"
-#include "customelementpart.h"
 #include "editorcommands.h"
 #include "elementscene.h"
 

sources/editor/elementscene.cpp

@@ -25,14 +25,14 @@
 #include "elementcontent.h"
 #include "elementprimitivedecorator.h"
 #include "eseventinterface.h"
-#include "partarc.h"
-#include "partdynamictextfield.h"
-#include "partellipse.h"
-#include "partline.h"
-#include "partpolygon.h"
-#include "partrectangle.h"
-#include "partterminal.h"
-#include "parttext.h"
+#include "graphicspart/partarc.h"
+#include "graphicspart/partdynamictextfield.h"
+#include "graphicspart/partellipse.h"
+#include "graphicspart/partline.h"
+#include "graphicspart/partpolygon.h"
+#include "graphicspart/partrectangle.h"
+#include "graphicspart/partterminal.h"
+#include "graphicspart/parttext.h"
 #include "qetelementeditor.h"
 #include "ui/elementpropertieseditorwidget.h"
 

sources/editor/esevent/eseventaddarc.cpp

@@ -15,13 +15,14 @@
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <QObject>
-
-#include "elementscene.h"
-#include "partarc.h"
-#include "editorcommands.h"
 #include "eseventaddarc.h"
 
+#include "../editorcommands.h"
+#include "../elementscene.h"
+#include "../graphicspart/partarc.h"
+
+#include <QObject>
+
 /**
 	@brief ESEventAddArc::ESEventAddArc
 	@param scene

sources/editor/esevent/eseventadddynamictextfield.cpp

@@ -16,9 +16,10 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "eseventadddynamictextfield.h"
-#include "elementscene.h"
-#include "editorcommands.h"
-#include "partdynamictextfield.h"
+
+#include "../editorcommands.h"
+#include "../elementscene.h"
+#include "../graphicspart/partdynamictextfield.h"
 
 #include <QUndoStack>
 

sources/editor/esevent/eseventaddellipse.cpp

@@ -15,12 +15,13 @@
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <QObject>
-
 #include "eseventaddellipse.h"
-#include "partellipse.h"
-#include "editorcommands.h"
-#include "elementscene.h"
+
+#include "../editorcommands.h"
+#include "../elementscene.h"
+#include "../graphicspart/partellipse.h"
+
+#include <QObject>
 
 /**
 	@brief ESEventAddEllipse::ESEventAddEllipse

sources/editor/esevent/eseventaddline.cpp

@@ -15,15 +15,16 @@
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
+#include "eseventaddline.h"
+
+#include "../editorcommands.h"
+#include "../elementscene.h"
+#include "../graphicspart/partline.h"
+#include "../qetelementeditor.h"
+
 #include <QGraphicsSceneMouseEvent>
 #include <QObject>
 
-#include "eseventaddline.h"
-#include "elementscene.h"
-#include "qetelementeditor.h"
-#include "partline.h"
-#include "editorcommands.h"
-
 /**
 	@brief ESEventAddLine::ESEventAddLine
 	Constructor

sources/editor/esevent/eseventaddpolygon.cpp

@@ -15,12 +15,13 @@
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <QObject>
-
 #include "eseventaddpolygon.h"
-#include "elementscene.h"
-#include "partpolygon.h"
-#include "editorcommands.h"
+
+#include "../editorcommands.h"
+#include "../elementscene.h"
+#include "../graphicspart/partpolygon.h"
+
+#include <QObject>
 
 /**
 	@brief ESEventAddPolygon::ESEventAddPolygon

sources/editor/esevent/eseventaddrect.cpp

@@ -15,12 +15,13 @@
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <QObject>
-
 #include "eseventaddrect.h"
-#include "elementscene.h"
-#include "partrectangle.h"
-#include "editorcommands.h"
+
+#include "../editorcommands.h"
+#include "../elementscene.h"
+#include "../graphicspart/partrectangle.h"
+
+#include <QObject>
 
 /**
 	@brief ESEventAddRect::ESEventAddRect

sources/editor/esevent/eseventaddterminal.cpp

@@ -15,13 +15,14 @@
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <QObject>
-
-#include "partterminal.h"
-#include "editorcommands.h"
-#include "elementscene.h"
 #include "eseventaddterminal.h"
 
+#include "../editorcommands.h"
+#include "../elementscene.h"
+#include "../graphicspart/partterminal.h"
+
+#include <QObject>
+
 /**
 	@brief ESEventAddTerminal::ESEventAddTerminal
 	@param scene

sources/editor/esevent/eseventaddtext.cpp

@@ -15,12 +15,13 @@
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <QObject>
-
 #include "eseventaddtext.h"
-#include "parttext.h"
-#include "editorcommands.h"
-#include "elementscene.h"
+
+#include "../editorcommands.h"
+#include "../elementscene.h"
+#include "../graphicspart/parttext.h"
+
+#include <QObject>
 
 /**
 	@brief ESEventAddText::ESEventAddText

sources/editor/esevent/eseventinterface.cpp

@@ -16,8 +16,10 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "eseventinterface.h"
-#include "elementscene.h"
-#include "qetelementeditor.h"
+
+#include "../elementscene.h"
+#include "../qetelementeditor.h"
+
 #include <QGraphicsSceneMouseEvent>
 
 ESEventInterface::ESEventInterface(ElementScene *scene) :

sources/editor/graphicspart/customelementgraphicpart.cpp

@@ -17,8 +17,8 @@
 */
 #include "customelementgraphicpart.h"
 
-#include "../QPropertyUndoCommand/qpropertyundocommand.h"
-#include "elementscene.h"
+#include "../../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../elementscene.h"
 
 #include <QRegularExpression>
 

sources/editor/graphicspart/customelementpart.cpp

@@ -16,7 +16,8 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "customelementpart.h"
-#include "qetelementeditor.h"
+
+#include "../qetelementeditor.h"
 
 /// @return le QETElementEditor auquel cet editeur appartient
 QETElementEditor *CustomElementPart::elementEditor() const

sources/editor/graphicspart/customelementpart.h

@@ -18,7 +18,7 @@
 #ifndef CUSTOM_ELEMENT_PART_H
 #define CUSTOM_ELEMENT_PART_H
 
-#include "../qet.h"
+#include "../../qet.h"
 
 class CustomElement;
 class ElementPrimitiveDecorator;

sources/editor/graphicspart/partarc.cpp

@@ -17,10 +17,10 @@
 */
 #include "partarc.h"
 
-#include "../QPropertyUndoCommand/qpropertyundocommand.h"
-#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h"
-#include "../QetGraphicsItemModeler/qetgraphicshandlerutility.h"
-#include "elementscene.h"
+#include "../../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../../QetGraphicsItemModeler/qetgraphicshandleritem.h"
+#include "../../QetGraphicsItemModeler/qetgraphicshandlerutility.h"
+#include "../elementscene.h"
 
 /**
 	@brief PartArc::PartArc

sources/editor/graphicspart/partdynamictextfield.cpp

@@ -17,9 +17,9 @@
 */
 #include "partdynamictextfield.h"
 
-#include "../QPropertyUndoCommand/qpropertyundocommand.h"
-#include "../qetapp.h"
-#include "elementscene.h"
+#include "../../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../../qetapp.h"
+#include "../elementscene.h"
 
 #include <QColor>
 #include <QFont>

sources/editor/graphicspart/partellipse.cpp

@@ -17,10 +17,10 @@
 */
 #include "partellipse.h"
 
-#include "../QPropertyUndoCommand/qpropertyundocommand.h"
-#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h"
-#include "../QetGraphicsItemModeler/qetgraphicshandlerutility.h"
-#include "elementscene.h"
+#include "../../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../../QetGraphicsItemModeler/qetgraphicshandleritem.h"
+#include "../../QetGraphicsItemModeler/qetgraphicshandlerutility.h"
+#include "../elementscene.h"
 
 /**
 	@brief PartEllipse::PartEllipse

sources/editor/graphicspart/partline.cpp

@@ -17,9 +17,9 @@
 */
 #include "partline.h"
 
-#include "../QPropertyUndoCommand/qpropertyundocommand.h"
-#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h"
-#include "elementscene.h"
+#include "../../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../../QetGraphicsItemModeler/qetgraphicshandleritem.h"
+#include "../elementscene.h"
 
 #include <cmath>
 

sources/editor/graphicspart/partline.h

@@ -18,7 +18,7 @@
 #ifndef PART_LINE_H
 #define PART_LINE_H
 
-#include "../qet.h"
+#include "../../qet.h"
 #include "customelementgraphicpart.h"
 
 class QPropertyUndoCommand;

sources/editor/graphicspart/partpolygon.cpp

@@ -17,12 +17,12 @@
 */
 #include "partpolygon.h"
 
-#include "../QPropertyUndoCommand/qpropertyundocommand.h"
-#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h"
-#include "../QetGraphicsItemModeler/qetgraphicshandlerutility.h"
-#include "../qeticons.h"
-#include "elementscene.h"
-#include "qetelementeditor.h"
+#include "../../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../../QetGraphicsItemModeler/qetgraphicshandleritem.h"
+#include "../../QetGraphicsItemModeler/qetgraphicshandlerutility.h"
+#include "../../qeticons.h"
+#include "../elementscene.h"
+#include "../qetelementeditor.h"
 
 /**
 	@brief PartPolygon::PartPolygon

sources/editor/graphicspart/partrectangle.cpp

@@ -17,10 +17,10 @@
 */
 #include "partrectangle.h"
 
-#include "../QPropertyUndoCommand/qpropertyundocommand.h"
-#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h"
-#include "../QetGraphicsItemModeler/qetgraphicshandlerutility.h"
-#include "elementscene.h"
+#include "../../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../../QetGraphicsItemModeler/qetgraphicshandleritem.h"
+#include "../../QetGraphicsItemModeler/qetgraphicshandlerutility.h"
+#include "../elementscene.h"
 
 /**
 	@brief PartRectangle::PartRectangle

sources/editor/graphicspart/partterminal.cpp

@@ -17,7 +17,7 @@
 */
 #include "partterminal.h"
 
-#include "../qetgraphicsitem/terminal.h"
+#include "../../qetgraphicsitem/terminal.h"
 
 /**
 	@brief PartTerminal::PartTerminal

sources/editor/graphicspart/partterminal.h

@@ -18,10 +18,10 @@
 #ifndef PART_TERMINAL_H
 #define PART_TERMINAL_H
 
+#include "../../properties/terminaldata.h"
 #include "customelementgraphicpart.h"
-#include "QUuid"
-#include "terminaldata.h"
 
+#include <QUuid>
 
 /**
 	This class represents a terminal which may be used to compose the drawing of

sources/editor/graphicspart/parttext.cpp

@@ -17,11 +17,11 @@
 */
 #include "parttext.h"
 
-#include "../QPropertyUndoCommand/qpropertyundocommand.h"
-#include "../qetapp.h"
-#include "elementprimitivedecorator.h"
-#include "elementscene.h"
-#include "texteditor.h"
+#include "../../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../../qetapp.h"
+#include "../elementprimitivedecorator.h"
+#include "../elementscene.h"
+#include "../ui/texteditor.h"
 
 /**
 	Constructeur

sources/editor/graphicspart/parttext.h

@@ -17,7 +17,7 @@
 */
 #ifndef PART_TEXT_H
 #define PART_TEXT_H
-#include "../qetapp.h"
+#include "../../qetapp.h"
 #include "customelementpart.h"
 
 #include <QtWidgets>

sources/editor/qetelementeditor.cpp

@@ -17,6 +17,7 @@
 */
 #include "qetelementeditor.h"
 
+#include "../editor/graphicspart/customelementpart.h"
 #include "../elementdialog.h"
 #include "../newelementwizard.h"
 #include "../qet.h"
@@ -24,7 +25,6 @@
 #include "../qeticons.h"
 #include "../qetmessagebox.h"
 #include "../recentfiles.h"
-#include "customelementpart.h"
 #include "editorcommands.h"
 #include "elementitemeditor.h"
 #include "elementscene.h"

sources/editor/styleeditor.cpp

@@ -18,8 +18,8 @@
 #include "styleeditor.h"
 
 #include "../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../editor/graphicspart/customelementgraphicpart.h"
 #include "../qeticons.h"
-#include "customelementgraphicpart.h"
 
 #include <QCheckBox>
 #include <QComboBox>

sources/editor/terminaleditor.cpp

@@ -18,8 +18,8 @@
 #include "terminaleditor.h"
 
 #include "../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../editor/graphicspart/partterminal.h"
 #include "../qeticons.h"
-#include "partterminal.h"
 
 #include <QComboBox>
 #include <QDoubleSpinBox>

sources/editor/ui/dynamictextfieldeditor.cpp

@@ -17,14 +17,14 @@
 */
 #include "dynamictextfieldeditor.h"
 
-#include "../QPropertyUndoCommand/qpropertyundocommand.h"
-#include "../qetapp.h"
-#include "../qetinformation.h"
+#include "../../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../../editor/graphicspart/customelementpart.h"
+#include "../../qetapp.h"
+#include "../../qetinformation.h"
+#include "../qetelementeditor.h"
 #include "alignmenttextdialog.h"
 #include "compositetexteditdialog.h"
-#include "customelementpart.h"
 #include "partdynamictextfield.h"
-#include "qetelementeditor.h"
 #include "ui_dynamictextfieldeditor.h"
 
 #include <QColorDialog>

sources/editor/ui/dynamictextfieldeditor.h

@@ -18,8 +18,8 @@
 #ifndef DYNAMICTEXTFIELDEDITOR_H
 #define DYNAMICTEXTFIELDEDITOR_H
 
-#include "elementitemeditor.h"
-#include "partdynamictextfield.h"
+#include "../elementitemeditor.h"
+#include "../graphicspart/partdynamictextfield.h"
 
 namespace Ui {
 	class DynamicTextFieldEditor;

sources/editor/ui/elementpropertieseditorwidget.cpp

@@ -17,8 +17,8 @@
 */
 #include "elementpropertieseditorwidget.h"
 
-#include "../qetapp.h"
-#include "../qetinformation.h"
+#include "../../qetapp.h"
+#include "../../qetinformation.h"
 #include "ui_elementpropertieseditorwidget.h"
 
 #include <QItemDelegate>

sources/editor/ui/elementpropertieseditorwidget.h

@@ -18,7 +18,7 @@
 #ifndef ELEMENTPROPERTIESEDITORWIDGET_H
 #define ELEMENTPROPERTIESEDITORWIDGET_H
 
-#include "../diagramcontext.h"
+#include "../../diagramcontext.h"
 
 #include <QAbstractButton>
 #include <QDialog>

sources/editor/ui/ellipseeditor.cpp

@@ -17,10 +17,10 @@
 */
 #include "ellipseeditor.h"
 
-#include "../QPropertyUndoCommand/qpropertyundocommand.h"
-#include "elementscene.h"
-#include "partellipse.h"
-#include "styleeditor.h"
+#include "../../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../elementscene.h"
+#include "../graphicspart/partellipse.h"
+#include "../styleeditor.h"
 #include "ui_ellipseeditor.h"
 
 /**

sources/editor/ui/ellipseeditor.h

@@ -18,7 +18,7 @@
 #ifndef ELLIPSEEDITOR_H
 #define ELLIPSEEDITOR_H
 
-#include "elementitemeditor.h"
+#include "../elementitemeditor.h"
 
 namespace Ui {
 	class EllipseEditor;

sources/editor/ui/lineeditor.cpp

@@ -17,9 +17,9 @@
 */
 #include "lineeditor.h"
 
-#include "../QPropertyUndoCommand/qpropertyundocommand.h"
-#include "../qeticons.h"
-#include "elementitemeditor.h"
+#include "../../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../../qeticons.h"
+#include "../elementitemeditor.h"
 #include "elementscene.h"
 #include "partline.h"
 #include "styleeditor.h"

sources/editor/ui/lineeditor.h

@@ -18,7 +18,7 @@
 #ifndef LINEEDITOR_H
 #define LINEEDITOR_H
 
-#include "elementitemeditor.h"
+#include "../elementitemeditor.h"
 
 namespace Ui {
     class LineEditor;

sources/editor/ui/polygoneditor.cpp

@@ -17,11 +17,11 @@
 */
 #include "polygoneditor.h"
 
-#include "../QPropertyUndoCommand/qpropertyundocommand.h"
-#include "../qetmessagebox.h"
-#include "elementscene.h"
-#include "partpolygon.h"
-#include "styleeditor.h"
+#include "../../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../../qetmessagebox.h"
+#include "../elementscene.h"
+#include "../graphicspart/partpolygon.h"
+#include "../styleeditor.h"
 #include "ui_polygoneditor.h"
 
 /**

sources/editor/ui/polygoneditor.h

@@ -18,7 +18,7 @@
 #ifndef POLYGONEDITOR_H
 #define POLYGONEDITOR_H
 
-#include "elementitemeditor.h"
+#include "../elementitemeditor.h"
 
 class StyleEditor;
 class PartPolygon;

sources/editor/ui/rectangleeditor.cpp

@@ -17,11 +17,11 @@
 */
 #include "rectangleeditor.h"
 
-#include "../QPropertyUndoCommand/qpropertyundocommand.h"
-#include "../qeticons.h"
-#include "elementscene.h"
-#include "partrectangle.h"
-#include "styleeditor.h"
+#include "../../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../../qeticons.h"
+#include "../elementscene.h"
+#include "../graphicspart/partrectangle.h"
+#include "../styleeditor.h"
 #include "ui_rectangleeditor.h"
 
 /**

sources/editor/ui/rectangleeditor.h

@@ -18,7 +18,8 @@
 #ifndef RECTANGLEEDITOR_H
 #define RECTANGLEEDITOR_H
 
-#include "elementitemeditor.h"
+#include "../elementitemeditor.h"
+
 #include <QWidget>
 
 class StyleEditor;

sources/editor/ui/texteditor.cpp

@@ -17,8 +17,8 @@
 */
 #include "texteditor.h"
 
-#include "../QPropertyUndoCommand/qpropertyundocommand.h"
-#include "parttext.h"
+#include "../../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../graphicspart/parttext.h"
 #include "ui_texteditor.h"
 
 #include <cassert>

sources/editor/ui/texteditor.h

@@ -18,10 +18,10 @@
 #ifndef TEXTEDITOR_H
 #define TEXTEDITOR_H
 
-#include "elementitemeditor.h"
+#include "../elementitemeditor.h"
 
-#include <QWidget>
 #include <QPointer>
+#include <QWidget>
 
 class PartText;