Wip Fix preprocessor on Cmake

sources/undocommand/addelementtextcommand.cpp

@@ -1,29 +1,29 @@
 /*
 	Copyright 2006-2020 The QElectroTech Team
 	This file is part of QElectroTech.
-	
+
 	QElectroTech is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 2 of the License, or
 	(at your option) any later version.
-	
+
 	QElectroTech is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "addelementtextcommand.h"
-#include "element.h"
-#include "dynamicelementtextitem.h"
-#include "elementtextitemgroup.h"
+
+#include "../qetgraphicsitem/dynamicelementtextitem.h"
+#include "../qetgraphicsitem/element.h"
+#include "../qetgraphicsitem/elementtextitemgroup.h"
 
 #include <QGraphicsScene>
 #include <utility>
 
-
 /************************
  * AddElementTextCommand*
  * **********************/

sources/undocommand/changeelementinformationcommand.cpp

@@ -16,8 +16,10 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "changeelementinformationcommand.h"
-#include "element.h"
-#include "diagram.h"
+
+#include "../diagram.h"
+#include "../qetgraphicsitem/element.h"
+
 #include <QObject>
 
 /**

sources/undocommand/changeelementinformationcommand.h

@@ -18,8 +18,9 @@
 #ifndef CHANGEELEMENTINFORMATIONCOMMAND_H
 #define CHANGEELEMENTINFORMATIONCOMMAND_H
 
+#include "../diagramcontext.h"
+
 #include <QUndoCommand>
-#include "diagramcontext.h"
 
 class Element;
 

sources/undocommand/changetitleblockcommand.cpp

@@ -17,7 +17,8 @@
 */
 
 #include "changetitleblockcommand.h"
-#include "diagram.h"
+
+#include "../diagram.h"
 
 /**
 	@brief ChangeTitleBlockCommand::ChangeTitleBlockCommand

sources/undocommand/changetitleblockcommand.h

@@ -18,9 +18,9 @@
 #ifndef CHANGETITLEBLOCKCOMMAND_H
 #define CHANGETITLEBLOCKCOMMAND_H
 
-#include <QUndoCommand>
+#include "../titleblockproperties.h"
 
-#include "titleblockproperties.h"
+#include <QUndoCommand>
 
 class Diagram;
 /**

sources/undocommand/deleteqgraphicsitemcommand.cpp

@@ -16,17 +16,18 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "deleteqgraphicsitemcommand.h"
-#include "dynamicelementtextitem.h"
-#include "diagram.h"
-#include "element.h"
-#include "conductor.h"
-#include "conductortextitem.h"
-#include "elementtextitemgroup.h"
+
+#include "../conductortextitem.h"
+#include "../diagram.h"
+#include "../diagramcommands.h"
+#include "../dynamicelementtextitem.h"
+#include "../elementtextitemgroup.h"
+#include "../qetdiagrameditor.h"
+#include "../qetgraphicsitem/conductor.h"
+#include "../qetgraphicsitem/element.h"
+#include "../qetgraphicsitem/terminal.h"
+#include "../qetgraphicstableitem.h"
 #include "addelementtextcommand.h"
-#include "terminal.h"
-#include "diagramcommands.h"
-#include "qetgraphicstableitem.h"
-#include "qetdiagrameditor.h"
 
 /**
 	@brief DeleteQGraphicsItemCommand::DeleteQGraphicsItemCommand

sources/undocommand/deleteqgraphicsitemcommand.h

@@ -18,10 +18,10 @@
 #ifndef DELETEQGRAPHICSITEMCOMMAND_H
 #define DELETEQGRAPHICSITEMCOMMAND_H
 
-#include <QUndoCommand>
-#include <QHash>
+#include "../diagramcontent.h"
 
-#include "diagramcontent.h"
+#include <QHash>
+#include <QUndoCommand>
 
 class Diagram;
 class ElementTextItemGroup;

sources/undocommand/linkelementcommand.cpp

@@ -16,11 +16,12 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "linkelementcommand.h"
-#include "element.h"
-#include "diagram.h"
-#include "conductorautonumerotation.h"
-#include "conductor.h"
-#include "potentialselectordialog.h"
+
+#include "../conductorautonumerotation.h"
+#include "../diagram.h"
+#include "../potentialselectordialog.h"
+#include "../qetgraphicsitem/conductor.h"
+#include "../qetgraphicsitem/element.h"
 
 /**
 	@brief LinkElementCommand::LinkElementCommand

sources/undocommand/rotateselectioncommand.cpp

@@ -16,16 +16,17 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "rotateselectioncommand.h"
-#include "element.h"
-#include "conductortextitem.h"
-#include "independenttextitem.h"
-#include "dynamicelementtextitem.h"
-#include "elementtextitemgroup.h"
-#include "diagramimageitem.h"
-#include "diagram.h"
-#include "conductor.h"
-#include "qet.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
+
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../conductortextitem.h"
+#include "../diagram.h"
+#include "../diagramimageitem.h"
+#include "../dynamicelementtextitem.h"
+#include "../elementtextitemgroup.h"
+#include "../independenttextitem.h"
+#include "../qet.h"
+#include "../qetgraphicsitem/conductor.h"
+#include "../qetgraphicsitem/element.h"
 
 #include <QGraphicsItem>
 

sources/undocommand/rotatetextscommand.cpp

@@ -16,13 +16,14 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "rotatetextscommand.h"
+
+#include "../diagram.h"
+#include "../qetapp.h"
+#include "../qtextorientationspinboxwidget.h"
+#include "conductortextitem.h"
 #include "diagramcontent.h"
-#include "diagram.h"
 #include "diagramtextitem.h"
 #include "elementtextitemgroup.h"
-#include "conductortextitem.h"
-#include "qetapp.h"
-#include "qtextorientationspinboxwidget.h"
 
 /**
 	@brief RotateTextsCommand::RotateTextsCommand