Wip Fix preprocessor on Cmake

sources/ElementsCollection/ui/renamedialog.h

@@ -18,7 +18,7 @@
 #ifndef RENAMEDIALOG_H
 #define RENAMEDIALOG_H
 
-#include "../qet.h"
+#include "../../qet.h"
 
 #include <QDialog>
 

sources/SearchAndReplace/ui/replaceadvanceddialog.h

@@ -18,7 +18,7 @@
 #ifndef REPLACEADVANCEDDIALOG_H
 #define REPLACEADVANCEDDIALOG_H
 
-#include "searchandreplaceworker.h"
+#include "../searchandreplaceworker.h"
 
 #include <QDialog>
 

sources/SearchAndReplace/ui/searchandreplacewidget.cpp

@@ -22,14 +22,14 @@
 #include "../../diagramcontent.h"
 #include "../../qetapp.h"
 #include "../../qetdiagrameditor.h"
+#include "../../qetgraphicsitem/conductor.h"
+#include "../../qetgraphicsitem/dynamicelementtextitem.h"
 #include "../../qetgraphicsitem/element.h"
+#include "../../qetgraphicsitem/elementtextitemgroup.h"
+#include "../../qetgraphicsitem/independenttextitem.h"
 #include "../../qeticons.h"
 #include "../../qetinformation.h"
 #include "../../qetproject.h"
-#include "conductor.h"
-#include "dynamicelementtextitem.h"
-#include "elementtextitemgroup.h"
-#include "independenttextitem.h"
 #include "replaceadvanceddialog.h"
 #include "replaceconductordialog.h"
 #include "replaceelementdialog.h"

sources/autoNum/ui/autonumberingdockwidget.h

@@ -18,8 +18,8 @@
 #ifndef AUTONUMBERINGDOCKWIDGET_H
 #define AUTONUMBERINGDOCKWIDGET_H
 
-#include "../projectview.h"
-#include "../qetproject.h"
+#include "../../projectview.h"
+#include "../../qetproject.h"
 
 #include <QDockWidget>
 

sources/dataBase/ui/elementquerywidget.cpp

@@ -17,8 +17,8 @@
 */
 #include "elementquerywidget.h"
 
-#include "../qetapp.h"
-#include "../qetinformation.h"
+#include "../../qetapp.h"
+#include "../../qetinformation.h"
 #include "ui_elementquerywidget.h"
 
 #include <QRegularExpression>

sources/dataBase/ui/summaryquerywidget.cpp

@@ -17,8 +17,8 @@
 */
 #include "summaryquerywidget.h"
 
-#include "../qetapp.h"
-#include "../qetinformation.h"
+#include "../../qetapp.h"
+#include "../../qetinformation.h"
 #include "ui_summaryquerywidget.h"
 
 #include <QListWidgetItem>

sources/diagramevent/diagrameventaddimage.cpp

@@ -20,7 +20,7 @@
 
 #include "../diagram.h"
 #include "../diagramcommands.h"
-#include "../diagramimageitem.h"
+#include "../qetgraphicsitem/diagramimageitem.h"
 
 /**
 	@brief DiagramEventAddImage::DiagramEventAddImage

sources/diagramevent/diagrameventaddshape.h

@@ -18,8 +18,8 @@
 #ifndef DIAGRAMEVENTADDSHAPE_H
 #define DIAGRAMEVENTADDSHAPE_H
 
+#include "../qetgraphicsitem/qetshapeitem.h"
 #include "diagrameventinterface.h"
-#include "qetshapeitem.h"
 
 /**
 	@brief The DiagramEventAddShape class

sources/diagramevent/diagrameventaddtext.cpp

@@ -20,7 +20,7 @@
 
 #include "../diagram.h"
 #include "../diagramcommands.h"
-#include "../independenttextitem.h"
+#include "../qetgraphicsitem/independenttextitem.h"
 
 /**
 	@brief DiagramEventAddText::DiagramEventAddText

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;
 

sources/projectconfigpages.cpp

@@ -30,7 +30,8 @@
 #include "ui/reportpropertiewidget.h"
 #include "ui/titleblockpropertieswidget.h"
 #include "ui/xrefpropertieswidget.h"
-#include "ui_autonumberingmanagementw.h"
+
+//#include "ui_autonumberingmanagementw.h"
 
 #include <QtWidgets>
 
@@ -530,93 +531,94 @@ void ProjectAutoNumConfigPage::applyAutoNum()
 */
 void ProjectAutoNumConfigPage::applyManagement()
 {
-	int from;
-	int to;
-	//Apply to Entire Project
-	if (m_amw->ui->m_apply_project_rb->isChecked()) {
-		from = 0;
-		to = project()->diagrams().size() - 1;
-	}
-	//Apply to selected Folios
-	else {
-		from = m_amw->ui->m_from_folios_cb->itemData(m_amw->ui->m_from_folios_cb->currentIndex()).toInt();
-		to = m_amw->ui->m_to_folios_cb->itemData(m_amw->ui->m_to_folios_cb->currentIndex()).toInt();
-	}
+	//	int from;
+	//	int to;
+	//	//Apply to Entire Project
+	//	if (m_amw->ui->m_apply_project_rb->isChecked()) {
+	//		from = 0;
+	//		to = project()->diagrams().size() - 1;
+	//	}
+	//	//Apply to selected Folios
+	//	else {
+	//		from =
+	//m_amw->ui->m_from_folios_cb->itemData(m_amw->ui->m_from_folios_cb->currentIndex()).toInt();
+	//		to =
+	//m_amw->ui->m_to_folios_cb->itemData(m_amw->ui->m_to_folios_cb->currentIndex()).toInt();
+	//	}
 
-	//Conductor Autonumbering Update Policy
-	//Allow Both Existent and New Conductors
-	if (m_amw->ui->m_both_conductor_rb->isChecked()) {
-		//Unfreeze Existent and New Conductors
-		project()->freezeExistentConductorLabel(false, from,to);
-		project()->freezeNewConductorLabel(false, from,to);
-		project()->setFreezeNewConductors(false);
-	}
-	//Allow Only New
-	else if (m_amw->ui->m_new_conductor_rb->isChecked()) {
-		//Freeze Existent and Unfreeze New Conductors
-		project()->freezeExistentConductorLabel(true, from,to);
-		project()->freezeNewConductorLabel(false, from,to);
-		project()->setFreezeNewConductors(false);
-	}
-	//Allow Only Existent
-	else if (m_amw->ui->m_existent_conductor_rb->isChecked()) {
-		//Freeze Existent and Unfreeze New Conductors
-		project()->freezeExistentConductorLabel(false, from,to);
-		project()->freezeNewConductorLabel(true, from,to);
-		project()->setFreezeNewConductors(true);
-	}
-	//Disable
-	else if (m_amw->ui->m_disable_conductor_rb->isChecked()) {
-		//Freeze Existent and New Elements, Set Freeze Element Project Wide
-		project()->freezeExistentConductorLabel(true, from,to);
-		project()->freezeNewConductorLabel(true, from,to);
-		project()->setFreezeNewConductors(true);
-	}
+	//	//Conductor Autonumbering Update Policy
+	//	//Allow Both Existent and New Conductors
+	//	if (m_amw->ui->m_both_conductor_rb->isChecked()) {
+	//		//Unfreeze Existent and New Conductors
+	//		project()->freezeExistentConductorLabel(false, from,to);
+	//		project()->freezeNewConductorLabel(false, from,to);
+	//		project()->setFreezeNewConductors(false);
+	//	}
+	//	//Allow Only New
+	//	else if (m_amw->ui->m_new_conductor_rb->isChecked()) {
+	//		//Freeze Existent and Unfreeze New Conductors
+	//		project()->freezeExistentConductorLabel(true, from,to);
+	//		project()->freezeNewConductorLabel(false, from,to);
+	//		project()->setFreezeNewConductors(false);
+	//	}
+	//	//Allow Only Existent
+	//	else if (m_amw->ui->m_existent_conductor_rb->isChecked()) {
+	//		//Freeze Existent and Unfreeze New Conductors
+	//		project()->freezeExistentConductorLabel(false, from,to);
+	//		project()->freezeNewConductorLabel(true, from,to);
+	//		project()->setFreezeNewConductors(true);
+	//	}
+	//	//Disable
+	//	else if (m_amw->ui->m_disable_conductor_rb->isChecked()) {
+	//		//Freeze Existent and New Elements, Set Freeze Element Project Wide
+	//		project()->freezeExistentConductorLabel(true, from,to);
+	//		project()->freezeNewConductorLabel(true, from,to);
+	//		project()->setFreezeNewConductors(true);
+	//	}
 
-	//Element Autonumbering Update Policy
-	//Allow Both Existent and New Elements
-	if (m_amw->ui->m_both_element_rb->isChecked()) {
-		//Unfreeze Existent and New Elements
-		project()->freezeExistentElementLabel(false, from,to);
-		project()->freezeNewElementLabel(false, from,to);
-		project()->setFreezeNewElements(false);
-	}
-	//Allow Only New
-	else if (m_amw->ui->m_new_element_rb->isChecked()) {
-		//Freeze Existent and Unfreeze New Elements
-		project()->freezeExistentElementLabel(true, from,to);
-		project()->freezeNewElementLabel(false, from,to);
-		project()->setFreezeNewElements(false);
-	}
-	//Allow Only Existent
-	else if (m_amw->ui->m_existent_element_rb->isChecked()) {
-		//Freeze New and Unfreeze Existent Elements, Set Freeze Element Project Wide
-		project()->freezeExistentElementLabel(false, from,to);
-		project()->freezeNewElementLabel(true, from,to);
-		project()->setFreezeNewElements(true);
-	}
-	//Disable
-	else if (m_amw->ui->m_disable_element_rb->isChecked()) {
-		//Freeze Existent and New Elements, Set Freeze Element Project Wide
-		project()->freezeExistentElementLabel(true, from,to);
-		project()->freezeNewElementLabel(true, from,to);
-		project()->setFreezeNewElements(true);
-	}
+	//	//Element Autonumbering Update Policy
+	//	//Allow Both Existent and New Elements
+	//	if (m_amw->ui->m_both_element_rb->isChecked()) {
+	//		//Unfreeze Existent and New Elements
+	//		project()->freezeExistentElementLabel(false, from,to);
+	//		project()->freezeNewElementLabel(false, from,to);
+	//		project()->setFreezeNewElements(false);
+	//	}
+	//	//Allow Only New
+	//	else if (m_amw->ui->m_new_element_rb->isChecked()) {
+	//		//Freeze Existent and Unfreeze New Elements
+	//		project()->freezeExistentElementLabel(true, from,to);
+	//		project()->freezeNewElementLabel(false, from,to);
+	//		project()->setFreezeNewElements(false);
+	//	}
+	//	//Allow Only Existent
+	//	else if (m_amw->ui->m_existent_element_rb->isChecked()) {
+	//		//Freeze New and Unfreeze Existent Elements, Set Freeze Element
+	//Project Wide 		project()->freezeExistentElementLabel(false, from,to);
+	//		project()->freezeNewElementLabel(true, from,to);
+	//		project()->setFreezeNewElements(true);
+	//	}
+	//	//Disable
+	//	else if (m_amw->ui->m_disable_element_rb->isChecked()) {
+	//		//Freeze Existent and New Elements, Set Freeze Element Project Wide
+	//		project()->freezeExistentElementLabel(true, from,to);
+	//		project()->freezeNewElementLabel(true, from,to);
+	//		project()->setFreezeNewElements(true);
+	//	}
 
-	//Folio Autonumbering Status
-	if (m_amw->ui->m_both_folio_rb->isChecked()) {
+	//	//Folio Autonumbering Status
+	//	if (m_amw->ui->m_both_folio_rb->isChecked()) {
 
-	}
-	else if (m_amw->ui->m_new_folio_rb->isChecked()) {
+	//	}
+	//	else if (m_amw->ui->m_new_folio_rb->isChecked()) {
 
-	}
-	else if (m_amw->ui->m_existent_folio_rb->isChecked()) {
+	//	}
+	//	else if (m_amw->ui->m_existent_folio_rb->isChecked()) {
 
-	}
-	else if (m_amw->ui->m_disable_folio_rb->isChecked()) {
-
-	}
+	//	}
+	//	else if (m_amw->ui->m_disable_folio_rb->isChecked()) {
 
+	//	}
 }
 
 /**

sources/projectview.cpp

@@ -27,7 +27,7 @@
 #include "qeticons.h"
 #include "qetmessagebox.h"
 #include "qetproject.h"
-#include "qettemplateeditor.h"
+#include "titleblock/qettemplateeditor.h"
 #include "ui/borderpropertieswidget.h"
 #include "ui/conductorpropertieswidget.h"
 #include "ui/dialogwaiting.h"

sources/qetapp.cpp

@@ -17,24 +17,24 @@
 */
 #include "qetapp.h"
 
-#include "aboutqetdialog.h"
 #include "configdialog.h"
 #include "configpages.h"
 #include "editor/qetelementeditor.h"
 #include "elementscollectioncache.h"
 #include "factory/elementfactory.h"
 #include "factory/elementpicturefactory.h"
-#include "generalconfigurationpage.h"
 #include "projectview.h"
 #include "qetdiagrameditor.h"
 #include "qeticons.h"
 #include "qetmessagebox.h"
 #include "qetproject.h"
-#include "qettemplateeditor.h"
 #include "qtextorientationspinboxwidget.h"
 #include "recentfiles.h"
+#include "titleblock/qettemplateeditor.h"
 #include "titleblock/templatescollection.h"
 #include "titleblocktemplate.h"
+#include "ui/aboutqetdialog.h"
+#include "ui/configpage/generalconfigurationpage.h"
 
 #include <cstdlib>
 #include <iostream>

sources/qetdiagrameditor.cpp

@@ -17,20 +17,18 @@
 */
 #include "qetdiagrameditor.h"
 
+#include "ElementsCollection/elementscollectionwidget.h"
 #include "QWidgetAnimation/qwidgetanimation.h"
 #include "autoNum/ui/autonumberingdockwidget.h"
 #include "conductornumexport.h"
 #include "diagramcommands.h"
-#include "diagrameventaddimage.h"
-#include "diagrameventaddshape.h"
-#include "diagrameventaddtext.h"
-#include "diagrampropertieseditordockwidget.h"
+#include "diagramevent/diagrameventaddimage.h"
+#include "diagramevent/diagrameventaddshape.h"
+#include "diagramevent/diagrameventaddtext.h"
 #include "diagramview.h"
-#include "dialogwaiting.h"
-#include "elementscollectionwidget.h"
 #include "elementspanelwidget.h"
 #include "factory/qetgraphicstablefactory.h"
-#include "projectprintwindow.h"
+#include "print/projectprintwindow.h"
 #include "qetgraphicsitem/ViewItem/qetgraphicstableitem.h"
 #include "qetgraphicsitem/conductortextitem.h"
 #include "qetgraphicsitem/dynamicelementtextitem.h"
@@ -38,6 +36,8 @@
 #include "qetmessagebox.h"
 #include "recentfiles.h"
 #include "ui/bomexportdialog.h"
+#include "ui/diagrampropertieseditordockwidget.h"
+#include "ui/dialogwaiting.h"
 #include "undocommand/addelementtextcommand.h"
 #include "undocommand/rotateselectioncommand.h"
 #include "undocommand/rotatetextscommand.h"

sources/qetgraphicsitem/diagramimageitem.cpp

@@ -19,7 +19,7 @@
 
 #include "../PropertiesEditor/propertieseditordialog.h"
 #include "../diagram.h"
-#include "imagepropertieswidget.h"
+#include "../ui/imagepropertieswidget.h"
 
 /**
 	@brief DiagramImageItem::DiagramImageItem

sources/qetgraphicsitem/qetshapeitem.cpp

@@ -26,7 +26,7 @@
 #include "../qet.h"
 #include "../qeticons.h"
 #include "../qetxml.h"
-#include "../shapegraphicsitempropertieswidget.h"
+#include "../ui/shapegraphicsitempropertieswidget.h"
 
 /**
 	@brief QetShapeItem::QetShapeItem

sources/qetgraphicsitem/terminal.cpp

@@ -20,10 +20,10 @@
 #include "../conductorautonumerotation.h"
 #include "../diagram.h"
 #include "../diagramcommands.h"
+#include "../properties/terminaldata.h"
 #include "../qetgraphicsitem/conductor.h"
 #include "../qetgraphicsitem/element.h"
 #include "conductortextitem.h"
-#include "terminaldata.h"
 
 #include <utility>
 

sources/ui/configpage/generalconfigurationpage.h

@@ -18,7 +18,7 @@
 #ifndef GENERALCONFIGURATIONPAGE_H
 #define GENERALCONFIGURATIONPAGE_H
 
-#include "../configpage.h"
+#include "../../configpage.h"
 
 #include <QWidget>