Mod Cmake en preprocessor

sources/ElementsCollection/elementcollectionhandler.cpp

@@ -16,12 +16,14 @@
 	along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementcollectionhandler.h"
+
+#include "../qetproject.h"
+#include "../qetxml.h"
 #include "renamedialog.h"
 #include "xmlelementcollection.h"
-#include "qetproject.h"
-#include "qetxml.h"
-#include <QFile>
+
 #include <QDir>
+#include <QFile>
 
 /******************************************************/
 

sources/ElementsCollection/elementslocation.cpp

@@ -16,13 +16,15 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementslocation.h"
-#include "qetapp.h"
-#include "xmlelementcollection.h"
-#include "qetproject.h"
-#include "elementscollectioncache.h"
-#include "elementpicturefactory.h"
+
+#include "../elementscollectioncache.h"
+#include "../qetapp.h"
+#include "../qetproject.h"
+#include "../qetxml.h"
 #include "element.h"
-#include "qetxml.h"
+#include "elementpicturefactory.h"
+#include "xmlelementcollection.h"
+
 #include <QPicture>
 
 // make this class usable with QVariant

sources/ElementsCollection/elementstreeview.cpp

@@ -18,10 +18,10 @@
 #include "elementstreeview.h"
 
 #include "../qetgraphicsitem/element.h"
+#include "../qeticons.h"
 #include "elementcollectionitem.h"
 #include "elementfactory.h"
 #include "elementslocation.h"
-#include "qeticons.h"
 
 #include <QDrag>
 #include <QStandardItemModel>

sources/ElementsCollection/fileelementcollectionitem.cpp

@@ -17,9 +17,10 @@
 */
 
 #include "fileelementcollectionitem.h"
+
+#include "../qetapp.h"
+#include "../qeticons.h"
 #include "elementslocation.h"
-#include "qetapp.h"
-#include "qeticons.h"
 
 #include <QDir>
 

sources/ElementsCollection/ui/renamedialog.h

@@ -18,8 +18,9 @@
 #ifndef RENAMEDIALOG_H
 #define RENAMEDIALOG_H
 
+#include "../qet.h"
+
 #include <QDialog>
-#include "qet.h"
 
 namespace Ui {
     class RenameDialog;

sources/ElementsCollection/xmlprojectelementcollectionitem.cpp

@@ -15,11 +15,12 @@
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "qetproject.h"
-#include "xmlelementcollection.h"
-#include "qeticons.h"
 #include "xmlprojectelementcollectionitem.h"
 
+#include "../qeticons.h"
+#include "../qetproject.h"
+#include "xmlelementcollection.h"
+
 /**
 	@brief XmlProjectElementCollectionItem::XmlProjectElementCollectionItem
 	Constructor

sources/SearchAndReplace/ui/replaceadvanceddialog.cpp

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

sources/SearchAndReplace/ui/replaceelementdialog.cpp

@@ -16,12 +16,13 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "replaceelementdialog.h"
-#include "ui_replaceelementdialog.h"
-#include "replaceelementdialog.h"
+
+#include "../qetapp.h"
+#include "../qetinformation.h"
 #include "elementinfopartwidget.h"
-#include "qetapp.h"
+#include "replaceelementdialog.h"
 #include "searchandreplaceworker.h"
-#include "qetinformation.h"
+#include "ui_replaceelementdialog.h"
 
 #include <QAbstractButton>
 

sources/dataBase/ui/elementquerywidget.cpp

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

sources/dataBase/ui/summaryquerywidget.cpp

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

sources/dvevent/dveventinterface.cpp

@@ -16,7 +16,9 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "dveventinterface.h"
-#include "diagramview.h"
+
+#include "../diagramview.h"
+
 #include <QMouseEvent>
 
 DVEventInterface::DVEventInterface(DiagramView *dv) :

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

sources/factory/ui/addtabledialog.h

@@ -18,9 +18,9 @@
 #ifndef ADDTABLEDIALOG_H
 #define ADDTABLEDIALOG_H
 
-#include <QDialog>
+#include "../qetapp.h"
 
-#include "qetapp.h"
+#include <QDialog>
 
 namespace Ui {
 class AddTableDialog;

sources/print/projectprintwindow.h

@@ -18,9 +18,9 @@
 #ifndef PROJECTPRINTWINDOW_H
 #define PROJECTPRINTWINDOW_H
 
-#include <QMainWindow>
+#include "../exportproperties.h"
 
-#include "exportproperties.h"
+#include <QMainWindow>
 #include <QPrinter>
 
 namespace Ui {

sources/properties/terminaldata.h

@@ -1,11 +1,11 @@
 #ifndef TERMINALDATA_H
 #define TERMINALDATA_H
 
+#include "../qet.h"
 #include "propertiesinterface.h"
-#include "qet.h"
 
-#include <QUuid>
 #include <QPointF>
+#include <QUuid>
 
 class QGraphicsObject;
 

sources/properties/xrefproperties.cpp

@@ -15,11 +15,12 @@
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <QMetaEnum>
-#include <QHash>
-
 #include "xrefproperties.h"
-#include "qetapp.h"
+
+#include "../qetapp.h"
+
+#include <QHash>
+#include <QMetaEnum>
 
 /**
 	@brief XRefProperties::XRefProperties

sources/qetgraphicsitem/ViewItem/qetgraphicsheaderitem.h

@@ -18,10 +18,10 @@
 #ifndef QETGRAPHICSHEADERITEM_H
 #define QETGRAPHICSHEADERITEM_H
 
-#include "qetapp.h"
+#include "../qetapp.h"
 
-#include <QGraphicsObject>
 #include <QFont>
+#include <QGraphicsObject>
 #include <QMargins>
 
 class QAbstractItemModel;

sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp

@@ -18,11 +18,11 @@
 #include "qetgraphicstableitem.h"
 
 #include "../../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../../createdxf.h"
 #include "../../diagram.h"
+#include "../../elementprovider.h"
 #include "../../qetxml.h"
 #include "../../utils/qetutils.h"
-#include "createdxf.h"
-#include "elementprovider.h"
 #include "projectdbmodel.h"
 #include "qetgraphicsheaderitem.h"
 

sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.h

@@ -18,9 +18,10 @@
 #ifndef GRAPHICSTABLEPROPERTIESEDITOR_H
 #define GRAPHICSTABLEPROPERTIESEDITOR_H
 
-#include "PropertiesEditor/propertieseditorwidget.h"
-#include <QPointer>
+#include "../PropertiesEditor/propertieseditorwidget.h"
+
 #include <QButtonGroup>
+#include <QPointer>
 
 namespace Ui {
 class GraphicsTablePropertiesEditor;

sources/qetgraphicsitem/ViewItem/ui/projectdbmodelpropertieswidget.h

@@ -18,7 +18,7 @@
 #ifndef PROJECTDBMODELPROPERTIESWIDGET_H
 #define PROJECTDBMODELPROPERTIESWIDGET_H
 
-#include "PropertiesEditor/propertieseditorwidget.h"
+#include "../PropertiesEditor/propertieseditorwidget.h"
 
 class ProjectDBModel;
 

sources/qetgraphicsitem/conductor.cpp

@@ -17,18 +17,18 @@
 */
 #include "../qetgraphicsitem/conductor.h"
 
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
 #include "../autoNum/numerotationcontextcommands.h"
+#include "../conductorautonumerotation.h"
+#include "../conductorsegment.h"
+#include "../conductorsegmentprofile.h"
 #include "../diagram.h"
+#include "../diagramcommands.h"
+#include "../qetdiagrameditor.h"
 #include "../qetgraphicsitem/terminal.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
-#include "conductorautonumerotation.h"
 #include "conductorpropertiesdialog.h"
-#include "conductorsegment.h"
-#include "conductorsegmentprofile.h"
 #include "conductortextitem.h"
-#include "diagramcommands.h"
 #include "element.h"
-#include "qetdiagrameditor.h"
 
 #include <QMultiHash>
 #include <QtDebug>

sources/qetgraphicsitem/conductortextitem.cpp

@@ -18,8 +18,8 @@
 #include "conductortextitem.h"
 
 #include "../diagram.h"
+#include "../diagramcommands.h"
 #include "../qetgraphicsitem/conductor.h"
-#include "diagramcommands.h"
 
 /**
 	Constructeur

sources/qetgraphicsitem/crossrefitem.h

@@ -18,11 +18,11 @@
 #ifndef CROSSREFITEM_H
 #define CROSSREFITEM_H
 
-#include <QGraphicsObject>
-#include <QPicture>
-#include <QMultiMap>
+#include "../properties/xrefproperties.h"
 
-#include"properties/xrefproperties.h"
+#include <QGraphicsObject>
+#include <QMultiMap>
+#include <QPicture>
 
 class Element;
 class DynamicElementTextItem;

sources/qetgraphicsitem/slaveelement.h

@@ -18,8 +18,8 @@
 #ifndef SLAVEELEMENT_H
 #define SLAVEELEMENT_H
 
+#include "../../properties/xrefproperties.h"
 #include "element.h"
-#include"properties/xrefproperties.h"
 
 class SlaveElement : public Element
 {

sources/titleblock/helpercell.h

@@ -17,8 +17,9 @@
 */
 #ifndef TITLEBLOCK_SLASH_HELPER_CELL_H
 #define TITLEBLOCK_SLASH_HELPER_CELL_H
+#include "../qet.h"
+
 #include <QtWidgets>
-#include "qet.h"
 
 /**
 	This class implements a helper widget for cells that indicate the length of

sources/titleblock/integrationmovetemplateshandler.cpp

@@ -16,8 +16,9 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "integrationmovetemplateshandler.h"
+
+#include "../qetmessagebox.h"
 #include "templatescollection.h"
-#include "qetmessagebox.h"
 
 /**
 	Constructor

sources/titleblock/qettemplateeditor.cpp

@@ -16,16 +16,16 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "qettemplateeditor.h"
-#include "qetmessagebox.h"
-#include "qeticons.h"
-#include "qetapp.h"
-#include "qetproject.h"
+
+#include "../qetapp.h"
+#include "../qeticons.h"
+#include "../qetmessagebox.h"
+#include "../qetproject.h"
 #include "templatecellwidget.h"
 #include "templatecommands.h"
-#include "templateview.h"
 #include "templatelocationsaver.h"
 #include "templatelogomanager.h"
-#include "templatecellwidget.h"
+#include "templateview.h"
 
 /**
 	@param parent parent QWidget of this window

sources/titleblock/templatecellsset.cpp

@@ -16,12 +16,13 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <QMultiMap>
-
 #include "templatecellsset.h"
-#include "templatevisualcell.h"
+
+#include "../titleblockcell.h"
 #include "templateview.h"
-#include "titleblockcell.h"
+#include "templatevisualcell.h"
+
+#include <QMultiMap>
 
 /**
 	Constructor

sources/titleblock/templatecellwidget.h

@@ -17,8 +17,9 @@
 */
 #ifndef TITLEBLOCK_SLASH_TEMPLATE_CELL_WIDGET_H
 #define TITLEBLOCK_SLASH_TEMPLATE_CELL_WIDGET_H
+#include "../qet.h"
+
 #include <QtWidgets>
-#include "qet.h"
 class ModifyTitleBlockCellCommand;
 class TitleBlockTemplate;
 class TitleBlockCell;

sources/titleblock/templatecommands.cpp

@@ -16,10 +16,11 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "templatecommands.h"
-#include "templatevisualcell.h"
-#include "templateview.h"
-#include "titleblockcell.h"
+
+#include "../titleblockcell.h"
 #include "dimension.h"
+#include "templateview.h"
+#include "templatevisualcell.h"
 #define TITLEBLOCK_DEFAULT_ROW_HEIGHT TitleBlockDimension(25)
 #define TITLEBLOCK_DEFAULT_COL_WIDTH  TitleBlockDimension(50)
 

sources/titleblock/templatecommands.h

@@ -18,11 +18,12 @@
 #ifndef TITLEBLOCK_SLASH_TEMPLATE_COMMANDS_H
 #define TITLEBLOCK_SLASH_TEMPLATE_COMMANDS_H
 #define MODIFY_TITLE_BLOCK_CELL_COMMAND_ID 6378
-#include <QtCore>
-#include <QUndoCommand>
+#include "../titleblockcell.h"
 #include "dimension.h"
 #include "templatecellsset.h"
-#include "titleblockcell.h"
+
+#include <QUndoCommand>
+#include <QtCore>
 class TitleBlockTemplateView;
 class TitleBlockTemplate;
 

sources/titleblock/templatedeleter.cpp

@@ -16,8 +16,9 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "templatedeleter.h"
-#include "qetmessagebox.h"
-#include "qetproject.h"
+
+#include "../qetmessagebox.h"
+#include "../qetproject.h"
 /**
 	Constructor
 	@param tbt_location Location of the title block template to be deleted

sources/titleblock/templatelogomanager.cpp

@@ -16,8 +16,9 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "templatelogomanager.h"
-#include "titleblocktemplate.h"
-#include "qeticons.h"
+
+#include "../qeticons.h"
+#include "../titleblocktemplate.h"
 
 #include <QStandardPaths>
 

sources/titleblock/templateview.cpp

@@ -16,14 +16,15 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "templateview.h"
-#include "templatevisualcell.h"
+
+#include "../qeticons.h"
+#include "dimensionwidget.h"
 #include "gridlayoutanimation.h"
 #include "helpercell.h"
 #include "splittedhelpercell.h"
-#include "templatecommands.h"
 #include "templatecellsset.h"
-#include "dimensionwidget.h"
-#include "qeticons.h"
+#include "templatecommands.h"
+#include "templatevisualcell.h"
 #define ROW_OFFSET 2
 #define COL_OFFSET 1
 #define DEFAULT_PREVIEW_WIDTH 600

sources/titleblock/templateview.h

@@ -17,8 +17,9 @@
 */
 #ifndef TITLEBLOCK_SLASH_TEMPLATE_VIEW_H
 #define TITLEBLOCK_SLASH_TEMPLATE_VIEW_H
+#include "../titleblocktemplate.h"
+
 #include <QGraphicsView>
-#include "titleblocktemplate.h"
 class HelperCell;
 class SplittedHelperCell;
 class TitleBlockTemplateCommand;

sources/titleblock/templatevisualcell.cpp

@@ -18,7 +18,7 @@
 #include "templatevisualcell.h"
 
 #include "../diagramcontext.h"
-#include "titleblocktemplate.h"
+#include "../titleblocktemplate.h"
 
 /**
 	Constructor

sources/titleblock/templatevisualcell.h

@@ -17,10 +17,11 @@
 */
 #ifndef TITLEBLOCK_SLASH_QET_TEMPLATE_VISUAL_CELL_H
 #define TITLEBLOCK_SLASH_QET_TEMPLATE_VISUAL_CELL_H
+#include "../qet.h"
+
 #include <QtWidgets>
-#include "qet.h"
 class TitleBlockTemplate;
-#include "titleblockcell.h"
+#include "../titleblockcell.h"
 
 /**
 	This class implements a preview widget for cells that compose a title

sources/ui/aboutqetdialog.cpp

@@ -16,10 +16,12 @@
 	along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
 */
 #include "aboutqetdialog.h"
+
+#include "../machine_info.h"
+#include "../qet.h"
+#include "../qetapp.h"
 #include "ui_aboutqetdialog.h"
-#include "qet.h"
-#include "qetapp.h"
-#include "machine_info.h"
+
 #include <QDate>
 
 /**

sources/ui/abstractelementpropertieseditorwidget.h

@@ -18,7 +18,8 @@
 #ifndef ABSTRACTELEMENTPROPERTIESEDITORWIDGET_H
 #define ABSTRACTELEMENTPROPERTIESEDITORWIDGET_H
 
-#include "PropertiesEditor/propertieseditorwidget.h"
+#include "../PropertiesEditor/propertieseditorwidget.h"
+
 #include <QPointer>
 
 class Element;

sources/ui/configpage/generalconfigurationpage.cpp

@@ -16,13 +16,14 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "generalconfigurationpage.h"
-#include "ui_generalconfigurationpage.h"
-#include "qeticons.h"
-#include "qetapp.h"
 
-#include <QSettings>
-#include <QFontDialog>
+#include "../qetapp.h"
+#include "../qeticons.h"
+#include "ui_generalconfigurationpage.h"
+
 #include <QFileDialog>
+#include <QFontDialog>
+#include <QSettings>
 
 /**
 	@brief GeneralConfigurationPage::GeneralConfigurationPage

sources/ui/configpage/generalconfigurationpage.h

@@ -18,8 +18,9 @@
 #ifndef GENERALCONFIGURATIONPAGE_H
 #define GENERALCONFIGURATIONPAGE_H
 
+#include "../configpage.h"
+
 #include <QWidget>
-#include "configpage.h"
 
 namespace Ui {
 	class GeneralConfigurationPage;

sources/ui/imagepropertieswidget.h

@@ -18,7 +18,7 @@
 #ifndef IMAGEPROPERTIESWIDGET_H
 #define IMAGEPROPERTIESWIDGET_H
 
-#include "PropertiesEditor/propertieseditorwidget.h"
+#include "../PropertiesEditor/propertieseditorwidget.h"
 
 class DiagramImageItem;
 

sources/ui/inditextpropertieswidget.h

@@ -18,7 +18,8 @@
 #ifndef INDITEXTPROPERTIESWIDGET_H
 #define INDITEXTPROPERTIESWIDGET_H
 
-#include "PropertiesEditor/propertieseditorwidget.h"
+#include "../PropertiesEditor/propertieseditorwidget.h"
+
 #include <QPointer>
 class IndependentTextItem;
 

sources/ui/masterpropertieswidget.cpp

@@ -16,13 +16,15 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "masterpropertieswidget.h"
+
+#include "../diagram.h"
+#include "../diagramposition.h"
+#include "../elementprovider.h"
+#include "element.h"
+#include "linkelementcommand.h"
 #include "ui_masterpropertieswidget.h"
+
 #include <QListWidgetItem>
-#include <diagramposition.h>
-#include <elementprovider.h>
-#include <diagram.h>
-#include <element.h>
-#include <linkelementcommand.h>
 
 /**
 	@brief MasterPropertiesWidget::MasterPropertiesWidget

sources/ui/shapegraphicsitempropertieswidget.h

@@ -18,7 +18,7 @@
 #ifndef SHAPEGRAPHICSITEMPROPERTIESWIDGET_H
 #define SHAPEGRAPHICSITEMPROPERTIESWIDGET_H
 
-#include "PropertiesEditor/propertieseditorwidget.h"
+#include "../PropertiesEditor/propertieseditorwidget.h"
 
 namespace Ui {
 	class ShapeGraphicsItemPropertiesWidget;

sources/undocommand/rotatetextscommand.cpp

@@ -18,10 +18,10 @@
 #include "rotatetextscommand.h"
 
 #include "../diagram.h"
+#include "../diagramcontent.h"
 #include "../qetapp.h"
 #include "../qtextorientationspinboxwidget.h"
 #include "conductortextitem.h"
-#include "diagramcontent.h"
 #include "diagramtextitem.h"
 #include "elementtextitemgroup.h"
 

sources/utils/macosxopenevent.cpp

@@ -16,7 +16,9 @@
 	along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
 */
 #include "macosxopenevent.h"
-#include "singleapplication.h"
+
+#include "SingleApplication/singleapplication.h"
+
 #include <QFileOpenEvent>
 
 /**