Wip Fix preprocessor on Cmake

2026-01-05 20:20:52 +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/ui/alignmenttextdialog.cpp
+++ b/sources/ui/alignmenttextdialog.cpp
@@ -16,8 +16,9 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "alignmenttextdialog.h"
+
+#include "../qetgraphicsitem/dynamicelementtextitem.h"
 #include "ui_alignmenttextdialog.h"
-#include "dynamicelementtextitem.h"

 AlignmentTextDialog::AlignmentTextDialog(Qt::Alignment alignment, QWidget *parent) :
 	QDialog(parent),
--- a/sources/ui/bomexportdialog.cpp
+++ b/sources/ui/bomexportdialog.cpp
@@ -16,17 +16,17 @@
   along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "bomexportdialog.h"
+
+#include "../dataBase/ui/elementquerywidget.h"
+#include "../qetapp.h"
+#include "../qetinformation.h"
+#include "../qetproject.h"
 #include "ui_bomexportdialog.h"
-#include "elementquerywidget.h"
-#include "qetproject.h"
-#include "qetapp.h"
-#include "qetinformation.h"

 #include <QMessageBox>
 #include <QSqlError>
 #include <QSqlRecord>

-
 /**
 	@brief BOMExportDialog::BOMExportDialog
 	@param project
--- a/sources/ui/borderpropertieswidget.cpp
+++ b/sources/ui/borderpropertieswidget.cpp
@@ -16,8 +16,9 @@
 	along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
 */
 #include "borderpropertieswidget.h"
+
+#include "../diagram.h"
 #include "ui_borderpropertieswidget.h"
-#include "diagram.h"

 /**
 	@brief BorderPropertiesWidget::BorderPropertiesWidget
--- a/sources/ui/borderpropertieswidget.h
+++ b/sources/ui/borderpropertieswidget.h
@@ -18,8 +18,9 @@
 #ifndef BORDERPROPERTIESWIDGET_H
 #define BORDERPROPERTIESWIDGET_H

+#include "../borderproperties.h"
+
 #include <QWidget>
-#include "borderproperties.h"

 namespace Ui {
 	class BorderPropertiesWidget;
--- a/sources/ui/compositetexteditdialog.cpp
+++ b/sources/ui/compositetexteditdialog.cpp
@@ -1,12 +1,13 @@
 #include "compositetexteditdialog.h"

-#include <utility>
+#include "../qetapp.h"
+#include "../qetgraphicsitem/conductor.h"
+#include "../qetgraphicsitem/dynamicelementtextitem.h"
+#include "../qetgraphicsitem/element.h"
+#include "../qetinformation.h"
 #include "ui_compositetexteditdialog.h"
-#include "dynamicelementtextitem.h"
-#include "element.h"
-#include "qetapp.h"
-#include "conductor.h"
-#include "qetinformation.h"
+
+#include <utility>

 CompositeTextEditDialog::CompositeTextEditDialog(DynamicElementTextItem *text, QWidget *parent) :
 	QDialog(parent),
--- a/sources/ui/conductorpropertiesdialog.cpp
+++ b/sources/ui/conductorpropertiesdialog.cpp
@@ -17,11 +17,12 @@
 */

 #include "conductorpropertiesdialog.h"
-#include "ui_conductorpropertiesdialog.h"
-#include "conductor.h"
+
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../diagram.h"
+#include "../qetgraphicsitem/conductor.h"
 #include "conductorpropertieswidget.h"
-#include "diagram.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
+#include "ui_conductorpropertiesdialog.h"

 /**
 	@brief ConductorPropertiesDialog::ConductorPropertiesDialog
--- a/sources/ui/conductorpropertiesdialog.h
+++ b/sources/ui/conductorpropertiesdialog.h
@@ -19,8 +19,9 @@
 #ifndef CONDUCTORPROPERTIESDIALOG_H
 #define CONDUCTORPROPERTIESDIALOG_H

+#include "../conductorproperties.h"
+
 #include <QDialog>
-#include "conductorproperties.h"

 class Conductor;
 class ConductorPropertiesWidget;
--- a/sources/ui/conductorpropertieswidget.cpp
+++ b/sources/ui/conductorpropertieswidget.cpp
@@ -16,10 +16,11 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "conductorpropertieswidget.h"
+
+#include "../conductorproperties.h"
+#include "../qetapp.h"
+#include "../qtextorientationspinboxwidget.h"
 #include "ui_conductorpropertieswidget.h"
-#include "conductorproperties.h"
-#include "qetapp.h"
-#include "qtextorientationspinboxwidget.h"

 /**
 	@brief ConductorPropertiesWidget::ConductorPropertiesWidget
--- a/sources/ui/conductorpropertieswidget.h
+++ b/sources/ui/conductorpropertieswidget.h
@@ -18,8 +18,9 @@
 #ifndef CONDUCTORPROPERTIESWIDGET_H
 #define CONDUCTORPROPERTIESWIDGET_H

+#include "../conductorproperties.h"
+
 #include <QWidget>
-#include "conductorproperties.h"
 class QTextOrientationSpinBoxWidget;
 class QComboBox;
 class QPushButton;
--- a/sources/ui/diagramcontextwidget.h
+++ b/sources/ui/diagramcontextwidget.h
@@ -18,8 +18,9 @@
 #ifndef DIAGRAMCONTEXTWIDGET_H
 #define DIAGRAMCONTEXTWIDGET_H

+#include "../diagramcontext.h"
+
 #include <QWidget>
-#include "diagramcontext.h"

 namespace Ui {
 	class DiagramContextWidget;
--- a/sources/ui/diagrampropertiesdialog.cpp
+++ b/sources/ui/diagrampropertiesdialog.cpp
@@ -16,13 +16,14 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "diagrampropertiesdialog.h"
+
+#include "../diagram.h"
+#include "../diagramcommands.h"
+#include "../undocommand/changetitleblockcommand.h"
 #include "borderpropertieswidget.h"
-#include "titleblockpropertieswidget.h"
 #include "conductorpropertieswidget.h"
-#include "diagramcommands.h"
 #include "projectpropertiesdialog.h"
-#include "diagram.h"
-#include "changetitleblockcommand.h"
+#include "titleblockpropertieswidget.h"

 /**
 	@brief DiagramPropertiesDialog::DiagramPropertiesDialog
--- a/sources/ui/diagrampropertieseditordockwidget.cpp
+++ b/sources/ui/diagrampropertieseditordockwidget.cpp
@@ -16,9 +16,10 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "diagrampropertieseditordockwidget.h"
-#include "diagram.h"
-#include "PropertiesEditor/propertieseditorwidget.h"
-#include "propertieseditorfactory.h"
+
+#include "../PropertiesEditor/propertieseditorwidget.h"
+#include "../diagram.h"
+#include "../propertieseditorfactory.h"

 /**
 	@brief DiagramPropertiesEditorDockWidget::DiagramPropertiesEditorDockWidget
--- a/sources/ui/diagrampropertieseditordockwidget.h
+++ b/sources/ui/diagrampropertieseditordockwidget.h
@@ -18,7 +18,7 @@
 #ifndef DIAGRAMPROPERTIESEDITORDOCKWIDGET_H
 #define DIAGRAMPROPERTIESEDITORDOCKWIDGET_H

-#include "PropertiesEditor/propertieseditordockwidget.h"
+#include "../PropertiesEditor/propertieseditordockwidget.h"

 class Diagram;

--- a/sources/ui/diagramselection.h
+++ b/sources/ui/diagramselection.h
@@ -18,10 +18,10 @@
 #ifndef DIAGRAMSELECTION_H
 #define DIAGRAMSELECTION_H

-#include <QWidget>
+#include "../diagram.h"
+#include "../qetproject.h"

-#include "diagram.h"
-#include "qetproject.h"
+#include <QWidget>

 namespace Ui {
 	class diagramselection;
--- a/sources/ui/dynamicelementtextitemeditor.cpp
+++ b/sources/ui/dynamicelementtextitemeditor.cpp
@@ -16,17 +16,17 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "dynamicelementtextitemeditor.h"
-#include "ui_dynamicelementtextitemeditor.h"
-#include "dynamicelementtextitem.h"
-#include "element.h"
+
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../diagram.h"
+#include "../dynamicelementtextitem.h"
+#include "../elementtextitemgroup.h"
+#include "../elementtextpattern.h"
+#include "../qetgraphicsitem/element.h"
+#include "../ui_dynamicelementtextitemeditor.h"
+#include "../undocommand/addelementtextcommand.h"
+#include "../undocommand/deleteqgraphicsitemcommand.h"
 #include "dynamicelementtextmodel.h"
-#include "diagram.h"
-#include "undocommand/deleteqgraphicsitemcommand.h"
-#include "undocommand/addelementtextcommand.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
-#include "elementtextitemgroup.h"
-#include "deleteqgraphicsitemcommand.h"
-#include "elementtextpattern.h"

 #include <QTreeView>
 #include <QUndoCommand>
--- a/sources/ui/dynamicelementtextmodel.cpp
+++ b/sources/ui/dynamicelementtextmodel.cpp
@@ -16,25 +16,26 @@
 	along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
 */
 #include "dynamicelementtextmodel.h"
-#include "dynamicelementtextitem.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
-#include "element.h"
-#include "compositetexteditdialog.h"
-#include "terminal.h"
-#include "conductor.h"
-#include "elementtextitemgroup.h"
-#include "qeticons.h"
-#include "diagram.h"
-#include "addelementtextcommand.h"
-#include "alignmenttextdialog.h"
-#include "qetinformation.h"
-#include "qetapp.h"

-#include <QStandardItem>
-#include <QHash>
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../diagram.h"
+#include "../dynamicelementtextitem.h"
+#include "../elementtextitemgroup.h"
+#include "../qetapp.h"
+#include "../qetgraphicsitem/conductor.h"
+#include "../qetgraphicsitem/element.h"
+#include "../qetgraphicsitem/terminal.h"
+#include "../qeticons.h"
+#include "../qetinformation.h"
+#include "../undocommand/addelementtextcommand.h"
+#include "alignmenttextdialog.h"
+#include "compositetexteditdialog.h"
+
 #include <QColorDialog>
-#include <QModelIndex>
 #include <QComboBox>
+#include <QHash>
+#include <QModelIndex>
+#include <QStandardItem>
 #include <QUndoCommand>

 static int src_txt_row   = 0;
--- a/sources/ui/dynamicelementtextmodel.h
+++ b/sources/ui/dynamicelementtextmodel.h
@@ -18,11 +18,11 @@
 #ifndef DYNAMICELEMENTTEXTMODEL_H
 #define DYNAMICELEMENTTEXTMODEL_H

-#include <QStandardItemModel>
-#include <QHash>
+#include "../qetgraphicsitem/dynamicelementtextitem.h"

+#include <QHash>
+#include <QStandardItemModel>
 #include <qstyleditemdelegate.h>
-#include "dynamicelementtextitem.h"

 class QUndoCommand;
 class ElementTextItemGroup;
--- a/sources/ui/elementinfowidget.cpp
+++ b/sources/ui/elementinfowidget.cpp
@@ -16,13 +16,14 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementinfowidget.h"
-#include "ui_elementinfowidget.h"
-#include "qetapp.h"
-#include "changeelementinformationcommand.h"
-#include "diagram.h"
+
+#include "../diagram.h"
+#include "../qetapp.h"
+#include "../qetgraphicsitem/element.h"
+#include "../qetinformation.h"
+#include "../ui_elementinfowidget.h"
+#include "../undocommand/changeelementinformationcommand.h"
 #include "elementinfopartwidget.h"
-#include "element.h"
-#include "qetinformation.h"

 /**
 	@brief ElementInfoWidget::ElementInfoWidget
--- a/sources/ui/elementinfowidget.h
+++ b/sources/ui/elementinfowidget.h
@@ -18,9 +18,10 @@
 #ifndef ELEMENTINFOWIDGET_H
 #define ELEMENTINFOWIDGET_H

-#include <QWidget>
+#include "../diagramcontext.h"
 #include "abstractelementpropertieseditorwidget.h"
-#include "diagramcontext.h"
+
+#include <QWidget>

 class Element;
 class QUndoCommand;
--- a/sources/ui/elementpropertieswidget.cpp
+++ b/sources/ui/elementpropertieswidget.cpp
@@ -16,21 +16,22 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementpropertieswidget.h"
-#include "element.h"
-#include "elementinfowidget.h"
-#include "masterpropertieswidget.h"
-#include "linksingleelementwidget.h"
-#include "diagram.h"
-#include "diagramposition.h"
-#include "qeticons.h"
-#include "dynamicelementtextitemeditor.h"
-#include "dynamicelementtextitem.h"
-#include "elementtextitemgroup.h"
-#include "qetapp.h"

-#include <QVBoxLayout>
+#include "../diagram.h"
+#include "../diagramposition.h"
+#include "../dynamicelementtextitem.h"
+#include "../elementtextitemgroup.h"
+#include "../qetapp.h"
+#include "../qetgraphicsitem/element.h"
+#include "../qeticons.h"
+#include "dynamicelementtextitemeditor.h"
+#include "elementinfowidget.h"
+#include "linksingleelementwidget.h"
+#include "masterpropertieswidget.h"
+
 #include <QLabel>
 #include <QUndoStack>
+#include <QVBoxLayout>

 /**
 	@brief ElementPropertiesWidget::ElementPropertiesWidget
--- a/sources/ui/imagepropertieswidget.cpp
+++ b/sources/ui/imagepropertieswidget.cpp
@@ -16,10 +16,11 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "imagepropertieswidget.h"
-#include "ui_imagepropertieswidget.h"
-#include "diagramimageitem.h"
-#include "diagram.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
+
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../diagram.h"
+#include "../diagramimageitem.h"
+#include "../ui_imagepropertieswidget.h"

 /**
 	@brief ImagePropertiesWidget::ImagePropertiesWidget
--- a/sources/ui/importelementdialog.h
+++ b/sources/ui/importelementdialog.h
@@ -18,8 +18,9 @@
 #ifndef IMPORTELEMENTDIALOG_H
 #define IMPORTELEMENTDIALOG_H

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

 namespace Ui {
 	class ImportElementDialog;
--- a/sources/ui/inditextpropertieswidget.cpp
+++ b/sources/ui/inditextpropertieswidget.cpp
@@ -16,13 +16,15 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "inditextpropertieswidget.h"
-#include "ui_inditextpropertieswidget.h"
-#include "independenttextitem.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
-#include "diagram.h"
-#include "diagramcommands.h"
-#include <QtGlobal>
+
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../diagram.h"
+#include "../diagramcommands.h"
+#include "../independenttextitem.h"
+#include "../ui_inditextpropertieswidget.h"
+
 #include <QLineEdit>
+#include <QtGlobal>

 /**
 	@brief IndiTextPropertiesWidget::IndiTextPropertiesWidget
--- a/sources/ui/linksingleelementwidget.cpp
+++ b/sources/ui/linksingleelementwidget.cpp
@@ -16,12 +16,13 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "linksingleelementwidget.h"
-#include "ui_linksingleelementwidget.h"
-#include "diagram.h"
-#include "elementprovider.h"
-#include "linkelementcommand.h"
-#include "diagramposition.h"
-#include "conductor.h"
+
+#include "../diagram.h"
+#include "../diagramposition.h"
+#include "../elementprovider.h"
+#include "../qetgraphicsitem/conductor.h"
+#include "../ui_linksingleelementwidget.h"
+#include "../undocommand/linkelementcommand.h"

 #include <QTreeWidgetItem>

--- a/sources/ui/linksingleelementwidget.h
+++ b/sources/ui/linksingleelementwidget.h
@@ -18,11 +18,11 @@
 #ifndef LINKSINGLEELEMENTWIDGET_H
 #define LINKSINGLEELEMENTWIDGET_H

-#include <QHash>
-
-#include "element.h"
+#include "../qetgraphicsitem/element.h"
 #include "abstractelementpropertieseditorwidget.h"

+#include <QHash>
+
 class QTreeWidgetItem;

 namespace Ui {
--- a/sources/ui/multipastedialog.cpp
+++ b/sources/ui/multipastedialog.cpp
@@ -16,15 +16,16 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <QSettings>
-#include <QHash>
-
 #include "multipastedialog.h"
-#include "ui_multipastedialog.h"
-#include "diagram.h"
-#include "diagramcommands.h"
-#include "element.h"
-#include "conductorautonumerotation.h"
+
+#include "../conductorautonumerotation.h"
+#include "../diagram.h"
+#include "../diagramcommands.h"
+#include "../qetgraphicsitem/element.h"
+#include "../ui_multipastedialog.h"
+
+#include <QHash>
+#include <QSettings>

 MultiPasteDialog::MultiPasteDialog(Diagram *diagram, QWidget *parent) :
 	QDialog(parent),
--- a/sources/ui/multipastedialog.h
+++ b/sources/ui/multipastedialog.h
@@ -18,10 +18,11 @@
 #ifndef MULTIPASTEDIALOG_H
 #define MULTIPASTEDIALOG_H

-#include <QDialog>
-#include "diagramcontent.h"
+#include "../diagramcontent.h"
 #include "QDomDocument"

+#include <QDialog>
+
 class Diagram;

 namespace Ui {
--- a/sources/ui/potentialselectordialog.cpp
+++ b/sources/ui/potentialselectordialog.cpp
@@ -16,20 +16,21 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <QRadioButton>
-#include <QHash>
-
 #include "potentialselectordialog.h"
-#include "ui_potentialselectordialog.h"
-#include "conductor.h"
-#include "terminal.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
-#include "diagram.h"
-#include "element.h"
-#include "reportelement.h"
-#include "assignvariables.h"
+
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../autoNum/assignvariables.h"
+#include "../diagram.h"
+#include "../qetgraphicsitem/conductor.h"
+#include "../qetgraphicsitem/element.h"
+#include "../qetgraphicsitem/terminal.h"
+#include "../reportelement.h"
+#include "../ui_potentialselectordialog.h"
 #include "formulaassistantdialog.h"

+#include <QHash>
+#include <QRadioButton>
+
 //### BEGIN PRIVATE CLASS ###//

 /**
--- a/sources/ui/potentialselectordialog.h
+++ b/sources/ui/potentialselectordialog.h
@@ -18,9 +18,10 @@
 #ifndef POTENTIALSELECTORDIALOG_H
 #define POTENTIALSELECTORDIALOG_H

+#include "../autoNum/assignvariables.h"
+#include "../conductorproperties.h"
+
 #include <QDialog>
-#include "conductorproperties.h"
-#include "assignvariables.h"
 class Conductor;
 class QUndoCommand;
 class Element;
--- a/sources/ui/projectpropertiesdialog.cpp
+++ b/sources/ui/projectpropertiesdialog.cpp
@@ -16,10 +16,12 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "projectpropertiesdialog.h"
-#include "configdialog.h"
-#include "projectconfigpages.h"
+
+#include "../configdialog.h"
+#include "../configpages.h"
+#include "../projectconfigpages.h"
+
 #include <QObject>
-#include "configpages.h"

 /**
 	@brief ProjectPropertiesDialog::ProjectPropertiesDialog
--- a/sources/ui/shapegraphicsitempropertieswidget.cpp
+++ b/sources/ui/shapegraphicsitempropertieswidget.cpp
@@ -16,13 +16,14 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <QHash>
-
 #include "shapegraphicsitempropertieswidget.h"
-#include "ui_shapegraphicsitempropertieswidget.h"
-#include "qetshapeitem.h"
-#include "diagram.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
+
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../diagram.h"
+#include "../qetshapeitem.h"
+#include "../ui_shapegraphicsitempropertieswidget.h"
+
+#include <QHash>

 /**
 	@brief ShapeGraphicsItemPropertiesWidget::ShapeGraphicsItemPropertiesWidget
--- a/sources/ui/titleblockpropertieswidget.cpp
+++ b/sources/ui/titleblockpropertieswidget.cpp
@@ -16,11 +16,13 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "titleblockpropertieswidget.h"
+
+#include "../qetapp.h"
+#include "../qeticons.h"
+#include "../titleblock/templatescollection.h"
+#include "../titleblocktemplate.h"
 #include "ui_titleblockpropertieswidget.h"
-#include "templatescollection.h"
-#include "qeticons.h"
-#include "titleblocktemplate.h"
-#include "qetapp.h"
+
 #include <QMenu>
 #include <utility>

--- a/sources/ui/titleblockpropertieswidget.h
+++ b/sources/ui/titleblockpropertieswidget.h
@@ -18,12 +18,13 @@
 #ifndef TITLEBLOCKPROPERTIESWIDGET_H
 #define TITLEBLOCKPROPERTIESWIDGET_H

-#include "qetproject.h"
-#include <QWidget>
-#include "titleblockproperties.h"
+#include "../autoNum/numerotationcontext.h"
+#include "../qet.h"
+#include "../qetproject.h"
+#include "../titleblockproperties.h"
 #include "diagramcontextwidget.h"
-#include "qet.h"
-#include "numerotationcontext.h"
+
+#include <QWidget>

 class NumerotationContext;
 class QETProject;
--- a/sources/ui/xrefpropertieswidget.h
+++ b/sources/ui/xrefpropertieswidget.h
@@ -18,10 +18,10 @@
 #ifndef XREFPROPERTIESWIDGET_H
 #define XREFPROPERTIESWIDGET_H

-#include <QWidget>
-#include <QHash>
+#include "../properties/xrefproperties.h"

-#include "properties/xrefproperties.h"
+#include <QHash>
+#include <QWidget>

 namespace Ui {
 	class XRefPropertiesWidget;