Wip Fix preprocessor on Cmake

sources/editor/UndoCommand/pastepartscommand.cpp

@@ -16,8 +16,9 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "pastepartscommand.h"
-#include "elementview.h"
-#include "partterminal.h"
+
+#include "../elementview.h"
+#include "../graphicspart/partterminal.h"
 
 /**
 	@brief PastePartsCommand::PastePartsCommand

sources/editor/UndoCommand/pastepartscommand.h

@@ -18,8 +18,8 @@
 #ifndef PASTEPARTSCOMMAND_H
 #define PASTEPARTSCOMMAND_H
 
-#include "editorcommands.h"
-#include "elementcontent.h"
+#include "../editorcommands.h"
+#include "../elementcontent.h"
 
 class ElementView;
 

sources/editor/elementscene.cpp

@@ -24,7 +24,7 @@
 #include "editorcommands.h"
 #include "elementcontent.h"
 #include "elementprimitivedecorator.h"
-#include "eseventinterface.h"
+#include "esevent/eseventinterface.h"
 #include "graphicspart/partarc.h"
 #include "graphicspart/partdynamictextfield.h"
 #include "graphicspart/partellipse.h"

sources/editor/elementview.cpp

@@ -18,7 +18,7 @@
 #include "elementview.h"
 
 #include "../qetapp.h"
-#include "pastepartscommand.h"
+#include "UndoCommand/pastepartscommand.h"
 #include "qetelementeditor.h"
 /**
 	Constructeur

sources/editor/qetelementeditor.cpp

@@ -25,37 +25,34 @@
 #include "../qeticons.h"
 #include "../qetmessagebox.h"
 #include "../recentfiles.h"
+#include "arceditor.h"
 #include "editorcommands.h"
 #include "elementitemeditor.h"
 #include "elementscene.h"
 #include "elementview.h"
-
-// editeurs de primitives
-#include "arceditor.h"
-#include "ellipseeditor.h"
-#include "lineeditor.h"
-#include "polygoneditor.h"
-#include "rectangleeditor.h"
-#include "terminaleditor.h"
-#include "texteditor.h"
-#include "partterminal.h"
+#include "esevent/eseventaddarc.h"
+#include "esevent/eseventadddynamictextfield.h"
+#include "esevent/eseventaddellipse.h"
+#include "esevent/eseventaddline.h"
+#include "esevent/eseventaddpolygon.h"
+#include "esevent/eseventaddrect.h"
+#include "esevent/eseventaddterminal.h"
+#include "esevent/eseventaddtext.h"
+#include "graphicspart/partterminal.h"
 #include "styleeditor.h"
-#include "dynamictextfieldeditor.h"
+#include "terminaleditor.h"
+#include "ui/dynamictextfieldeditor.h"
+#include "ui/ellipseeditor.h"
+#include "ui/lineeditor.h"
+#include "ui/polygoneditor.h"
+#include "ui/rectangleeditor.h"
+#include "ui/texteditor.h"
 
-#include "eseventaddline.h"
-#include "eseventaddrect.h"
-#include "eseventaddellipse.h"
-#include "eseventaddpolygon.h"
-#include "eseventaddarc.h"
-#include "eseventaddtext.h"
-#include "eseventaddterminal.h"
-#include "eseventadddynamictextfield.h"
-
-#include <QMessageBox>
-#include <QTextStream>
-#include <QFileDialog>
 #include <QFile>
+#include <QFileDialog>
+#include <QMessageBox>
 #include <QModelIndex>
+#include <QTextStream>
 #include <utility>
 
 /*

sources/editor/ui/dynamictextfieldeditor.cpp

@@ -19,12 +19,12 @@
 
 #include "../../QPropertyUndoCommand/qpropertyundocommand.h"
 #include "../../editor/graphicspart/customelementpart.h"
+#include "../../editor/graphicspart/partdynamictextfield.h"
 #include "../../qetapp.h"
 #include "../../qetinformation.h"
+#include "../../ui/alignmenttextdialog.h"
+#include "../../ui/compositetexteditdialog.h"
 #include "../qetelementeditor.h"
-#include "alignmenttextdialog.h"
-#include "compositetexteditdialog.h"
-#include "partdynamictextfield.h"
 #include "ui_dynamictextfieldeditor.h"
 
 #include <QColorDialog>

sources/editor/ui/lineeditor.cpp

@@ -20,9 +20,9 @@
 #include "../../QPropertyUndoCommand/qpropertyundocommand.h"
 #include "../../qeticons.h"
 #include "../elementitemeditor.h"
-#include "elementscene.h"
-#include "partline.h"
-#include "styleeditor.h"
+#include "../elementscene.h"
+#include "../graphicspart/partline.h"
+#include "../styleeditor.h"
 #include "ui_lineeditor.h"
 
 /**