Wip Fix preprocessor on Cmake

2025-12-29 23:40:51 +01:00 · 2020-12-08 19:57:35 +01:00
parent 1871b7ad12
commit 10c4c3d528
181 changed files with 1052 additions and 900 deletions
--- a/sources/qetgraphicsitem/ViewItem/projectdbmodel.cpp
+++ b/sources/qetgraphicsitem/ViewItem/projectdbmodel.cpp
@@ -16,11 +16,12 @@
 				along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "projectdbmodel.h"
+
+#include "../../qetapp.h"
+#include "../../qetinformation.h"
+#include "../../qetproject.h"
+#include "../../qetxml.h"
 #include "projectdatabase.h"
-#include "qetproject.h"
-#include "qetxml.h"
-#include "qetapp.h"
-#include "qetinformation.h"

 #include <QSqlError>
 #include <QSqlRecord>
--- a/sources/qetgraphicsitem/ViewItem/qetgraphicsheaderitem.cpp
+++ b/sources/qetgraphicsitem/ViewItem/qetgraphicsheaderitem.cpp
@@ -16,10 +16,11 @@
 	along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
 */
 #include "qetgraphicsheaderitem.h"
+
+#include "../../createdxf.h"
+#include "../../qetxml.h"
+#include "../../utils/qetutils.h"
 #include "qabstractitemmodel.h"
-#include "qetxml.h"
-#include "qetutils.h"
-#include "createdxf.h"

 #include <QFontMetrics>
 #include <QPainter>
--- a/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp
+++ b/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp
@@ -16,20 +16,21 @@
 	along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
 */
 #include "qetgraphicstableitem.h"
-#include "diagram.h"
-#include "qetgraphicsheaderitem.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
-#include "qetxml.h"
-#include "elementprovider.h"
-#include "qetutils.h"
-#include "projectdbmodel.h"
+
+#include "../../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../../diagram.h"
+#include "../../qetxml.h"
+#include "../../utils/qetutils.h"
 #include "createdxf.h"
+#include "elementprovider.h"
+#include "projectdbmodel.h"
+#include "qetgraphicsheaderitem.h"

 #include <QAbstractItemModel>
 #include <QFontMetrics>
-#include <QPainter>
 #include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
+#include <QPainter>

 static int no_model_height = 20;
 static int no_model_width = 40;
--- a/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.h
+++ b/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.h
@@ -18,11 +18,11 @@
 #ifndef QetGraphicsTableItem_H
 #define QetGraphicsTableItem_H

-#include <QFont>
+#include "../../QetGraphicsItemModeler/qetgraphicshandleritem.h"
+#include "../../qetapp.h"
+#include "../../qetgraphicsitem/qetgraphicsitem.h"

-#include "qetgraphicsitem.h"
-#include "qetapp.h"
-#include "QetGraphicsItemModeler/qetgraphicshandleritem.h"
+#include <QFont>

 class QAbstractItemModel;
 class QetGraphicsHeaderItem;
--- a/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.cpp
+++ b/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.cpp
@@ -16,15 +16,16 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "graphicstablepropertieseditor.h"
-#include "ui_graphicstablepropertieseditor.h"
-#include "qetgraphicstableitem.h"
-#include "qetgraphicsheaderitem.h"
-#include "diagram.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
+
+#include "../../../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../../../diagram.h"
+#include "../../../elementprovider.h"
+#include "../../../utils/qetutils.h"
+#include "../qetgraphicsheaderitem.h"
+#include "../qetgraphicstableitem.h"
 #include "itemmodelcommand.h"
 #include "propertieseditorfactory.h"
-#include "elementprovider.h"
-#include "qetutils.h"
+#include "ui_graphicstablepropertieseditor.h"

 #include <QAbstractItemModel>
 #include <QFontDialog>
--- a/sources/qetgraphicsitem/ViewItem/ui/projectdbmodelpropertieswidget.cpp
+++ b/sources/qetgraphicsitem/ViewItem/ui/projectdbmodelpropertieswidget.cpp
@@ -16,11 +16,12 @@
 	along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
 */
 #include "projectdbmodelpropertieswidget.h"
+
+#include "../../../dataBase/ui/elementquerywidget.h"
+#include "../../../dataBase/ui/summaryquerywidget.h"
+#include "../../../qetproject.h"
+#include "../projectdbmodel.h"
 #include "ui_projectdbmodelpropertieswidget.h"
-#include "projectdbmodel.h"
-#include "qetproject.h"
-#include "elementquerywidget.h"
-#include "summaryquerywidget.h"

 #include <QDialogButtonBox>

--- a/sources/qetgraphicsitem/conductor.cpp
+++ b/sources/qetgraphicsitem/conductor.cpp
@@ -15,22 +15,23 @@
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <QtDebug>
-#include <QMultiHash>
+#include "../qetgraphicsitem/conductor.h"

-#include "conductor.h"
+#include "../autoNum/numerotationcontextcommands.h"
+#include "../diagram.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 "element.h"
-#include "diagram.h"
 #include "diagramcommands.h"
+#include "element.h"
 #include "qetdiagrameditor.h"
-#include "terminal.h"
-#include "conductorautonumerotation.h"
-#include "conductorpropertiesdialog.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
-#include "numerotationcontextcommands.h"
+
+#include <QMultiHash>
+#include <QtDebug>

 #define PR(x) qDebug() << #x " = " << x;

--- a/sources/qetgraphicsitem/conductor.h
+++ b/sources/qetgraphicsitem/conductor.h
@@ -17,10 +17,10 @@
 */
 #ifndef CONDUCTOR_H
 #define CONDUCTOR_H
+#include "../autoNum/assignvariables.h"
+#include "../conductorproperties.h"

-#include "conductorproperties.h"
 #include <QGraphicsPathItem>
-#include "assignvariables.h"

 class ConductorProfile;
 class ConductorSegmentProfile;
--- a/sources/qetgraphicsitem/conductortextitem.cpp
+++ b/sources/qetgraphicsitem/conductortextitem.cpp
@@ -16,9 +16,10 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "conductortextitem.h"
-#include "conductor.h"
+
+#include "../diagram.h"
+#include "../qetgraphicsitem/conductor.h"
 #include "diagramcommands.h"
-#include "diagram.h"

 /**
 	Constructeur
--- a/sources/qetgraphicsitem/crossrefitem.cpp
+++ b/sources/qetgraphicsitem/crossrefitem.cpp
@@ -16,14 +16,15 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "crossrefitem.h"
-#include "element.h"
-#include "qetapp.h"
-#include "diagramposition.h"
-#include "diagram.h"
-#include "qgraphicsitemutility.h"
-#include "assignvariables.h"
+
+#include "../autoNum/assignvariables.h"
+#include "../diagram.h"
+#include "../diagramposition.h"
+#include "../qetapp.h"
 #include "dynamicelementtextitem.h"
+#include "element.h"
 #include "elementtextitemgroup.h"
+#include "qgraphicsitemutility.h"

 //define the height of the header.
 static int header = 5;
--- a/sources/qetgraphicsitem/diagramimageitem.cpp
+++ b/sources/qetgraphicsitem/diagramimageitem.cpp
@@ -16,8 +16,9 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "diagramimageitem.h"
-#include "diagram.h"
-#include "PropertiesEditor/propertieseditordialog.h"
+
+#include "../PropertiesEditor/propertieseditordialog.h"
+#include "../diagram.h"
 #include "imagepropertieswidget.h"

 /**
--- a/sources/qetgraphicsitem/diagramtextitem.cpp
+++ b/sources/qetgraphicsitem/diagramtextitem.cpp
@@ -16,10 +16,11 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "diagramtextitem.h"
-#include "diagramcommands.h"
-#include "qetapp.h"
-#include "richtext/richtexteditor_p.h"
-#include "diagram.h"
+
+#include "../diagram.h"
+#include "../diagramcommands.h"
+#include "../qetapp.h"
+#include "../richtext/richtexteditor_p.h"

 /**
 	@brief DiagramTextItem::DiagramTextItem
--- a/sources/qetgraphicsitem/dynamicelementtextitem.cpp
+++ b/sources/qetgraphicsitem/dynamicelementtextitem.cpp
@@ -16,15 +16,16 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "dynamicelementtextitem.h"
-#include "element.h"
-#include "qetapp.h"
-#include "diagram.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
-#include "terminal.h"
-#include "conductor.h"
-#include "elementtextitemgroup.h"
+
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../diagram.h"
+#include "../qetapp.h"
+#include "../qetgraphicsitem/conductor.h"
+#include "../qetgraphicsitem/terminal.h"
+#include "../qetinformation.h"
 #include "crossrefitem.h"
-#include "qetinformation.h"
+#include "element.h"
+#include "elementtextitemgroup.h"

 #include <QDomDocument>
 #include <QDomElement>
--- a/sources/qetgraphicsitem/dynamicelementtextitem.h
+++ b/sources/qetgraphicsitem/dynamicelementtextitem.h
@@ -18,11 +18,12 @@
 #ifndef DYNAMICELEMENTTEXTITEM_H
 #define DYNAMICELEMENTTEXTITEM_H

+#include "../properties/xrefproperties.h"
 #include "diagramtextitem.h"
-#include "xrefproperties.h"
 #include "element.h"
-#include <QUuid>
+
 #include <QPointer>
+#include <QUuid>

 class Element;
 class Conductor;
--- a/sources/qetgraphicsitem/element.cpp
+++ b/sources/qetgraphicsitem/element.cpp
@@ -16,24 +16,26 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "element.h"
-#include "diagram.h"
-#include "conductor.h"
-#include "diagramcommands.h"
-#include <utility>
-#include "elementprovider.h"
-#include "diagramposition.h"
-#include "terminal.h"
-#include "terminaldata.h"
-#include "PropertiesEditor/propertieseditordialog.h"
-#include "elementpropertieswidget.h"
-#include "numerotationcontextcommands.h"
-#include "diagramcontext.h"
-#include "changeelementinformationcommand.h"
+
+#include "../PropertiesEditor/propertieseditordialog.h"
+#include "../diagram.h"
+#include "../diagramcommands.h"
+#include "../diagramcontext.h"
+#include "../diagramposition.h"
+#include "../elementpicturefactory.h"
+#include "../elementpropertieswidget.h"
+#include "../elementprovider.h"
+#include "../numerotationcontextcommands.h"
+#include "../properties/terminaldata.h"
+#include "../qetgraphicsitem/conductor.h"
+#include "../qetgraphicsitem/terminal.h"
+#include "../undocommand/changeelementinformationcommand.h"
 #include "dynamicelementtextitem.h"
 #include "elementtextitemgroup.h"
-#include "elementpicturefactory.h"
 #include "iostream"
+
 #include <QDomElement>
+#include <utility>

 class ElementXmlRetroCompatibility
 {
--- a/sources/qetgraphicsitem/element.h
+++ b/sources/qetgraphicsitem/element.h
@@ -18,16 +18,16 @@
 #ifndef ELEMENT_H
 #define ELEMENT_H

-#include <algorithm>
-#include <QPicture>
-#include <QHash>
-
-#include "qet.h"
+#include "../ElementsCollection/elementslocation.h"
+#include "../NameList/nameslist.h"
+#include "../autoNum/assignvariables.h"
+#include "../diagramcontext.h"
+#include "../qet.h"
 #include "qetgraphicsitem.h"
-#include "diagramcontext.h"
-#include "assignvariables.h"
-#include "elementslocation.h"
-#include "nameslist.h"
+
+#include <QHash>
+#include <QPicture>
+#include <algorithm>

 class QETProject;
 class Terminal;
--- a/sources/qetgraphicsitem/elementtextitemgroup.cpp
+++ b/sources/qetgraphicsitem/elementtextitemgroup.cpp
@@ -16,18 +16,19 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementtextitemgroup.h"
+
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../diagram.h"
+#include "../qetapp.h"
+#include "../undocommand/addelementtextcommand.h"
+#include "crossrefitem.h"
 #include "dynamicelementtextitem.h"
 #include "element.h"
-#include "diagram.h"
-#include "addelementtextcommand.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
-#include "crossrefitem.h"
-#include "qetapp.h"
 #include "masterelement.h"
 #include "qgraphicsitemutility.h"

-#include <QPainter>
 #include <QGraphicsSceneMouseEvent>
+#include <QPainter>
 #include <utility>

 /**
--- a/sources/qetgraphicsitem/independenttextitem.cpp
+++ b/sources/qetgraphicsitem/independenttextitem.cpp
@@ -16,10 +16,11 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "independenttextitem.h"
-#include "qet.h"
-#include "diagram.h"
-#include "diagramcommands.h"
-#include "qetapp.h"
+
+#include "../diagram.h"
+#include "../diagramcommands.h"
+#include "../qet.h"
+#include "../qetapp.h"

 #include <QDomElement>
 #include <QSettings>
--- a/sources/qetgraphicsitem/masterelement.cpp
+++ b/sources/qetgraphicsitem/masterelement.cpp
@@ -16,9 +16,11 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "masterelement.h"
+
+#include "../diagram.h"
 #include "crossrefitem.h"
-#include "diagram.h"
 #include "dynamicelementtextitem.h"
+
 #include <QRegularExpression>

 /**
--- a/sources/qetgraphicsitem/qetgraphicsitem.cpp
+++ b/sources/qetgraphicsitem/qetgraphicsitem.cpp
@@ -16,7 +16,8 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "qetgraphicsitem.h"
-#include "diagram.h"
+
+#include "../diagram.h"

 /**
 	@brief QetGraphicsItem::QetGraphicsItem
--- a/sources/qetgraphicsitem/qetgraphicsitem.h
+++ b/sources/qetgraphicsitem/qetgraphicsitem.h
@@ -18,8 +18,9 @@
 #ifndef QETGRAPHICSITEM_H
 #define QETGRAPHICSITEM_H

+#include "../qet.h"
+
 #include <QGraphicsObject>
-#include "qet.h"

 class Diagram;

--- a/sources/qetgraphicsitem/qetshapeitem.cpp
+++ b/sources/qetgraphicsitem/qetshapeitem.cpp
@@ -16,16 +16,17 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "qetshapeitem.h"
-#include "createdxf.h"
-#include "diagram.h"
-#include "qet.h"
-#include "shapegraphicsitempropertieswidget.h"
-#include "PropertiesEditor/propertieseditordialog.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
-#include "QetGraphicsItemModeler/qetgraphicshandlerutility.h"
-#include "qetxml.h"
-#include "diagramview.h"
-#include "qeticons.h"
+
+#include "../PropertiesEditor/propertieseditordialog.h"
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../QetGraphicsItemModeler/qetgraphicshandlerutility.h"
+#include "../createdxf.h"
+#include "../diagram.h"
+#include "../diagramview.h"
+#include "../qet.h"
+#include "../qeticons.h"
+#include "../qetxml.h"
+#include "../shapegraphicsitempropertieswidget.h"

 /**
 	@brief QetShapeItem::QetShapeItem
--- a/sources/qetgraphicsitem/qetshapeitem.h
+++ b/sources/qetgraphicsitem/qetshapeitem.h
@@ -18,9 +18,10 @@
 #ifndef QETSHAPEITEM_H
 #define QETSHAPEITEM_H

-#include <QPen>
+#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h"
 #include "qetgraphicsitem.h"
-#include "QetGraphicsItemModeler/qetgraphicshandleritem.h"
+
+#include <QPen>

 class QDomElement;
 class QDomDocument;
--- a/sources/qetgraphicsitem/qgraphicsitemutility.cpp
+++ b/sources/qetgraphicsitem/qgraphicsitemutility.cpp
@@ -16,10 +16,12 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "qgraphicsitemutility.h"
+
+#include "../diagram.h"
 #include "element.h"
-#include "diagram.h"
-#include <QGraphicsItem>
+
 #include <QDebug>
+#include <QGraphicsItem>

 /**
 	@brief centerToParentBottom
--- a/sources/qetgraphicsitem/reportelement.cpp
+++ b/sources/qetgraphicsitem/reportelement.cpp
@@ -16,11 +16,12 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "reportelement.h"
-#include "diagramposition.h"
-#include "qetproject.h"
-#include "diagram.h"
-#include "terminal.h"
-#include "conductor.h"
+
+#include "../diagram.h"
+#include "../diagramposition.h"
+#include "../qetgraphicsitem/conductor.h"
+#include "../qetgraphicsitem/terminal.h"
+#include "../qetproject.h"
 #include "dynamicelementtextitem.h"

 ReportElement::ReportElement(const ElementsLocation &location, const QString& link_type,QGraphicsItem *qgi, int *state) :
--- a/sources/qetgraphicsitem/simpleelement.cpp
+++ b/sources/qetgraphicsitem/simpleelement.cpp
@@ -16,7 +16,8 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "simpleelement.h"
-#include "diagram.h"
+
+#include "../diagram.h"

 /**
 	@brief SimpleElement::SimpleElement
--- a/sources/qetgraphicsitem/slaveelement.cpp
+++ b/sources/qetgraphicsitem/slaveelement.cpp
@@ -16,9 +16,10 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "slaveelement.h"
-#include "diagramposition.h"
-#include "qetapp.h"
-#include "diagram.h"
+
+#include "../diagram.h"
+#include "../diagramposition.h"
+#include "../qetapp.h"
 #include "dynamicelementtextitem.h"

 /**
--- a/sources/qetgraphicsitem/terminal.cpp
+++ b/sources/qetgraphicsitem/terminal.cpp
@@ -15,17 +15,18 @@
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "terminal.h"
+#include "../qetgraphicsitem/terminal.h"

-#include <utility>
-#include "diagram.h"
-#include "qetgraphicsitem/element.h"
-#include "qetgraphicsitem/conductor.h"
-#include "diagramcommands.h"
-#include "conductorautonumerotation.h"
+#include "../conductorautonumerotation.h"
+#include "../diagram.h"
+#include "../diagramcommands.h"
+#include "../qetgraphicsitem/conductor.h"
+#include "../qetgraphicsitem/element.h"
 #include "conductortextitem.h"
 #include "terminaldata.h"

+#include <utility>
+
 QColor Terminal::neutralColor      = QColor(Qt::blue);
 QColor Terminal::allowedColor      = QColor(Qt::darkGreen);
 QColor Terminal::warningColor      = QColor("#ff8000");
--- a/sources/qetgraphicsitem/terminal.h
+++ b/sources/qetgraphicsitem/terminal.h
@@ -17,9 +17,10 @@
 */
 #ifndef TERMINAL_H
 #define TERMINAL_H
+#include "../qet.h"
+
 #include <QtWidgets>
 #include <QtXml>
-#include "qet.h"
 class Conductor;
 class Diagram;
 class Element;