Wip Fix preprocessor on Cmake

sources/autoNum/assignvariables.cpp

@@ -16,14 +16,15 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "assignvariables.h"
-#include "diagram.h"
-#include "element.h"
-#include "diagramposition.h"
-#include "qetapp.h"
-#include "qetxml.h"
 
-#include <QVariant>
+#include "../diagram.h"
+#include "../diagramposition.h"
+#include "../qetapp.h"
+#include "../qetgraphicsitem/element.h"
+#include "../qetxml.h"
+
 #include <QStringList>
+#include <QVariant>
 #include <utility>
 
 namespace autonum

sources/autoNum/assignvariables.h

@@ -17,13 +17,12 @@
 */
 #ifndef ASSIGNVARIABLES_H
 #define ASSIGNVARIABLES_H
-
-#include <QString>
-#include <QPointF>
-#include <QStringList>
-
+#include "../diagramcontext.h"
 #include "numerotationcontext.h"
-#include "diagramcontext.h"
+
+#include <QPointF>
+#include <QString>
+#include <QStringList>
 
 class Diagram;
 class Element;

sources/autoNum/numerotationcontext.cpp

@@ -16,10 +16,11 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "numerotationcontext.h"
-#include "qet.h"
 
-#include <utility>
+#include "../qet.h"
+
 #include <QRegularExpression>
+#include <utility>
 
 /**
 	Constructor

sources/autoNum/numerotationcontextcommands.cpp

@@ -16,7 +16,8 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "numerotationcontextcommands.h"
-#include "diagram.h"
+
+#include "../diagram.h"
 
 /**
 	@brief Constructor

sources/autoNum/ui/autonumberingdockwidget.cpp

@@ -16,13 +16,14 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "autonumberingdockwidget.h"
-#include "qetapp.h"
+
+#include "../../diagram.h"
+#include "../../diagramview.h"
+#include "../../qetapp.h"
+#include "../../titleblockproperties.h"
+#include "../../ui/projectpropertiesdialog.h"
+#include "../numerotationcontext.h"
 #include "ui_autonumberingdockwidget.h"
-#include "diagramview.h"
-#include "diagram.h"
-#include "titleblockproperties.h"
-#include "numerotationcontext.h"
-#include "projectpropertiesdialog.h"
 
 /**
 	@brief AutoNumberingDockWidget::AutoNumberingDockWidget

sources/autoNum/ui/autonumberingdockwidget.h

@@ -18,8 +18,9 @@
 #ifndef AUTONUMBERINGDOCKWIDGET_H
 #define AUTONUMBERINGDOCKWIDGET_H
 
-#include "qetproject.h"
-#include "projectview.h"
+#include "../projectview.h"
+#include "../qetproject.h"
+
 #include <QDockWidget>
 
 namespace Ui {

sources/autoNum/ui/autonumberingmanagementw.cpp

@@ -16,15 +16,17 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "autonumberingmanagementw.h"
-#include "ui_autonumberingmanagementw.h"
-#include "numparteditorw.h"
-#include <QMessageBox>
-#include "numerotationcontextcommands.h"
+
+#include "../../diagram.h"
+#include "../../qetproject.h"
+#include "../numerotationcontextcommands.h"
 #include "formulaautonumberingw.h"
-#include "ui_formulaautonumberingw.h"
+#include "numparteditorw.h"
 #include "qdebug.h"
-#include "qetproject.h"
-#include "diagram.h"
+#include "ui_autonumberingmanagementw.h"
+#include "ui_formulaautonumberingw.h"
+
+#include <QMessageBox>
 
 /**
 	@brief AutoNumberingManagementW::AutoNumberingManagementW

sources/autoNum/ui/folioautonumbering.cpp

@@ -16,12 +16,14 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "folioautonumbering.h"
+
+#include "../../diagram.h"
+#include "../../qetproject.h"
 #include "ui_folioautonumbering.h"
+
 #include <QMessageBox>
 #include <QPushButton>
 #include <QtWidgets>
-#include "qetproject.h"
-#include "diagram.h"
 /**
 	Constructor
 */

sources/autoNum/ui/folioautonumbering.h

@@ -18,8 +18,9 @@
 #ifndef FOLIOAUTONUMBERING_H
 #define FOLIOAUTONUMBERING_H
 
+#include "../numerotationcontext.h"
+
 #include <QWidget>
-#include "numerotationcontext.h"
 
 class NumPartEditorW;
 class QAbstractButton;

sources/autoNum/ui/numparteditorw.h

@@ -18,9 +18,10 @@
 #ifndef NUMPARTEDITORW_H
 #define NUMPARTEDITORW_H
 
-#include <QWidget>
+#include "../numerotationcontext.h"
+
 #include <QValidator>
-#include "numerotationcontext.h"
+#include <QWidget>
 
 namespace Ui {
 	class NumPartEditorW;

sources/autoNum/ui/selectautonumw.cpp

@@ -16,14 +16,15 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "selectautonumw.h"
-#include "ui_selectautonumw.h"
-#include "numparteditorw.h"
-#include <QMessageBox>
-#include "numerotationcontextcommands.h"
-#include "formulaautonumberingw.h"
-#include "ui_formulaautonumberingw.h"
-#include "assignvariables.h"
 
+#include "../assignvariables.h"
+#include "../numerotationcontextcommands.h"
+#include "formulaautonumberingw.h"
+#include "numparteditorw.h"
+#include "ui_formulaautonumberingw.h"
+#include "ui_selectautonumw.h"
+
+#include <QMessageBox>
 
 /**
 	@brief SelectAutonumW::SelectAutonumW

sources/autoNum/ui/selectautonumw.h

@@ -18,10 +18,11 @@
 #ifndef SELECTAUTONUMW_H
 #define SELECTAUTONUMW_H
 
-#include <QWidget>
-#include "numerotationcontext.h"
+#include "../numerotationcontext.h"
 #include "formulaautonumberingw.h"
 
+#include <QWidget>
+
 class NumPartEditorW;
 class QAbstractButton;
 class FormulaAutonumberingW;