Mod Cmake en preprocessor

sources/editor/arceditor.cpp

@@ -16,10 +16,11 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "arceditor.h"
-#include "styleeditor.h"
-#include "partarc.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
+
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
 #include "elementscene.h"
+#include "partarc.h"
+#include "styleeditor.h"
 
 /**
 	Constructeur

sources/editor/editorcommands.h

@@ -17,11 +17,11 @@
 */
 #ifndef EDITOR_COMMANDS_H
 #define EDITOR_COMMANDS_H
+#include "../qgimanager.h"
 #include "customelementpart.h"
-#include "elementview.h"
-#include "elementscene.h"
 #include "elementcontent.h"
-#include "qgimanager.h"
+#include "elementscene.h"
+#include "elementview.h"
 
 /**
 	@brief The ElementEditionCommand class

sources/editor/elementprimitivedecorator.cpp

@@ -16,15 +16,17 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementprimitivedecorator.h"
-#include "elementscene.h"
+
+#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h"
+#include "../qet.h"
 #include "customelementpart.h"
 #include "editorcommands.h"
-#include "qet.h"
-#include <QPainter>
-#include <QGraphicsSceneHoverEvent>
-#include <QStyleOptionGraphicsItem>
+#include "elementscene.h"
+
 #include <QGraphicsScene>
-#include "QetGraphicsItemModeler/qetgraphicshandleritem.h"
+#include <QGraphicsSceneHoverEvent>
+#include <QPainter>
+#include <QStyleOptionGraphicsItem>
 
 /**
 	Constructor

sources/editor/elementprimitivedecorator.h

@@ -18,8 +18,9 @@
 #ifndef ELEMENTPRIMITIVEDECORATOR_H
 #define ELEMENTPRIMITIVEDECORATOR_H
 
+#include "../qet.h"
+
 #include <QGraphicsObject>
-#include "qet.h"
 
 class ElementEditionCommand;
 class ElementScene;

sources/editor/elementview.cpp

@@ -16,9 +16,10 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementview.h"
-#include "qetelementeditor.h"
-#include "qetapp.h"
+
+#include "../qetapp.h"
 #include "pastepartscommand.h"
+#include "qetelementeditor.h"
 /**
 	Constructeur
 	@param scene ElementScene visualisee par cette ElementView

sources/editor/graphicspart/customelementgraphicpart.cpp

@@ -16,8 +16,9 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "customelementgraphicpart.h"
+
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
 #include "elementscene.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
 
 #include <QRegularExpression>
 

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

@@ -16,11 +16,11 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "partarc.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
-#include "elementscene.h"
-#include "QetGraphicsItemModeler/qetgraphicshandleritem.h"
-#include "QetGraphicsItemModeler/qetgraphicshandlerutility.h"
 
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h"
+#include "../QetGraphicsItemModeler/qetgraphicshandlerutility.h"
+#include "elementscene.h"
 
 /**
 	@brief PartArc::PartArc

sources/editor/graphicspart/partdynamictextfield.cpp

@@ -16,13 +16,14 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "partdynamictextfield.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
-#include "qetapp.h"
+
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../qetapp.h"
 #include "elementscene.h"
 
-#include <QGraphicsSceneMouseEvent>
-#include <QFont>
 #include <QColor>
+#include <QFont>
+#include <QGraphicsSceneMouseEvent>
 
 PartDynamicTextField::PartDynamicTextField(QETElementEditor *editor, QGraphicsItem *parent) :
 	QGraphicsTextItem(parent),

sources/editor/graphicspart/partellipse.cpp

@@ -16,10 +16,11 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "partellipse.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
+
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h"
+#include "../QetGraphicsItemModeler/qetgraphicshandlerutility.h"
 #include "elementscene.h"
-#include "QetGraphicsItemModeler/qetgraphicshandleritem.h"
-#include "QetGraphicsItemModeler/qetgraphicshandlerutility.h"
 
 /**
 	@brief PartEllipse::PartEllipse

sources/editor/graphicspart/partline.cpp

@@ -16,11 +16,12 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "partline.h"
-#include <cmath>
-#include "elementscene.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
-#include "QetGraphicsItemModeler/qetgraphicshandleritem.h"
 
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h"
+#include "elementscene.h"
+
+#include <cmath>
 
 /**
 	@brief PartLine::PartLine

sources/editor/graphicspart/partline.h

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

sources/editor/graphicspart/partpolygon.cpp

@@ -16,13 +16,13 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "partpolygon.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
-#include "elementscene.h"
-#include "QetGraphicsItemModeler/qetgraphicshandleritem.h"
-#include "qetelementeditor.h"
-#include "qeticons.h"
-#include "QetGraphicsItemModeler/qetgraphicshandlerutility.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

@@ -16,10 +16,11 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #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"
 
 /**
 	@brief PartRectangle::PartRectangle

sources/editor/graphicspart/parttext.cpp

@@ -16,11 +16,12 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "parttext.h"
-#include "texteditor.h"
+
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../qetapp.h"
 #include "elementprimitivedecorator.h"
 #include "elementscene.h"
-#include "qetapp.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
+#include "texteditor.h"
 
 /**
 	Constructeur

sources/editor/graphicspart/parttext.h

@@ -17,9 +17,10 @@
 */
 #ifndef PART_TEXT_H
 #define PART_TEXT_H
-#include <QtWidgets>
+#include "../qetapp.h"
 #include "customelementpart.h"
-#include "qetapp.h"
+
+#include <QtWidgets>
 
 class TextEditor;
 class ElementPrimitiveDecorator;

sources/editor/qetelementeditor.cpp

@@ -16,18 +16,19 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "qetelementeditor.h"
-#include "qet.h"
-#include "qetapp.h"
+
+#include "../elementdialog.h"
+#include "../newelementwizard.h"
+#include "../qet.h"
+#include "../qetapp.h"
+#include "../qeticons.h"
+#include "../qetmessagebox.h"
+#include "../recentfiles.h"
+#include "customelementpart.h"
+#include "editorcommands.h"
+#include "elementitemeditor.h"
 #include "elementscene.h"
 #include "elementview.h"
-#include "customelementpart.h"
-#include "newelementwizard.h"
-#include "elementitemeditor.h"
-#include "elementdialog.h"
-#include "recentfiles.h"
-#include "qeticons.h"
-#include "qetmessagebox.h"
-#include "editorcommands.h"
 
 // editeurs de primitives
 #include "arceditor.h"

sources/editor/styleeditor.cpp

@@ -16,13 +16,15 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "styleeditor.h"
+
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../qeticons.h"
 #include "customelementgraphicpart.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
-#include "qeticons.h"
-#include <QComboBox>
+
 #include <QCheckBox>
-#include <QVBoxLayout>
+#include <QComboBox>
 #include <QLabel>
+#include <QVBoxLayout>
 
 /**
 	Constructeur

sources/editor/terminaleditor.cpp

@@ -16,14 +16,16 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "terminaleditor.h"
+
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../qeticons.h"
 #include "partterminal.h"
-#include "qeticons.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
-#include <QDoubleSpinBox>
+
 #include <QComboBox>
-#include <QVBoxLayout>
+#include <QDoubleSpinBox>
 #include <QHBoxLayout>
 #include <QLabel>
+#include <QVBoxLayout>
 
 /**
 	@brief TerminalEditor::TerminalEditor

sources/editor/ui/dynamictextfieldeditor.cpp

@@ -16,20 +16,21 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "dynamictextfieldeditor.h"
-#include "ui_dynamictextfieldeditor.h"
+
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../qetapp.h"
+#include "../qetinformation.h"
+#include "alignmenttextdialog.h"
+#include "compositetexteditdialog.h"
 #include "customelementpart.h"
 #include "partdynamictextfield.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
 #include "qetelementeditor.h"
-#include "qetapp.h"
-#include "compositetexteditdialog.h"
-#include "alignmenttextdialog.h"
-#include "qetinformation.h"
-#include <assert.h>
+#include "ui_dynamictextfieldeditor.h"
 
-#include <QPointer>
-#include <QGraphicsItem>
 #include <QColorDialog>
+#include <QGraphicsItem>
+#include <QPointer>
+#include <assert.h>
 
 DynamicTextFieldEditor::DynamicTextFieldEditor(
 	QETElementEditor *editor, PartDynamicTextField *text_field, QWidget *parent) :

sources/editor/ui/elementpropertieseditorwidget.cpp

@@ -16,9 +16,10 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementpropertieseditorwidget.h"
+
+#include "../qetapp.h"
+#include "../qetinformation.h"
 #include "ui_elementpropertieseditorwidget.h"
-#include "qetapp.h"
-#include "qetinformation.h"
 
 #include <QItemDelegate>
 

sources/editor/ui/elementpropertieseditorwidget.h

@@ -18,9 +18,10 @@
 #ifndef ELEMENTPROPERTIESEDITORWIDGET_H
 #define ELEMENTPROPERTIESEDITORWIDGET_H
 
-#include <QDialog>
+#include "../diagramcontext.h"
+
 #include <QAbstractButton>
-#include "diagramcontext.h"
+#include <QDialog>
 
 namespace Ui {
 	class ElementPropertiesEditorWidget;

sources/editor/ui/ellipseeditor.cpp

@@ -16,11 +16,12 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "ellipseeditor.h"
-#include "ui_ellipseeditor.h"
+
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "elementscene.h"
 #include "partellipse.h"
 #include "styleeditor.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
-#include "elementscene.h"
+#include "ui_ellipseeditor.h"
 
 /**
  * @brief EllipseEditor::EllipseEditor

sources/editor/ui/lineeditor.cpp

@@ -16,13 +16,14 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "lineeditor.h"
-#include "ui_lineeditor.h"
+
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../qeticons.h"
 #include "elementitemeditor.h"
-#include "styleeditor.h"
-#include "partline.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
 #include "elementscene.h"
-#include "qeticons.h"
+#include "partline.h"
+#include "styleeditor.h"
+#include "ui_lineeditor.h"
 
 /**
 	@brief LineEditor::LineEditor

sources/editor/ui/polygoneditor.cpp

@@ -16,12 +16,13 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "polygoneditor.h"
-#include "ui_polygoneditor.h"
-#include "partpolygon.h"
+
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../qetmessagebox.h"
 #include "elementscene.h"
-#include "qetmessagebox.h"
+#include "partpolygon.h"
 #include "styleeditor.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
+#include "ui_polygoneditor.h"
 
 /**
 	@brief PolygonEditor::PolygonEditor

sources/editor/ui/rectangleeditor.cpp

@@ -16,12 +16,13 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "rectangleeditor.h"
-#include "ui_rectangleeditor.h"
-#include "styleeditor.h"
-#include "partrectangle.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
+
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../qeticons.h"
 #include "elementscene.h"
-#include "qeticons.h"
+#include "partrectangle.h"
+#include "styleeditor.h"
+#include "ui_rectangleeditor.h"
 
 /**
 	@brief RectangleEditor::RectangleEditor

sources/editor/ui/texteditor.cpp

@@ -16,9 +16,11 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "texteditor.h"
-#include "ui_texteditor.h"
+
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
 #include "parttext.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
+#include "ui_texteditor.h"
+
 #include <cassert>
 
 /**