Mod Cmake en preprocessor

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>
 
 /**