Wip Fix preprocessor on Cmake

sources/factory/elementfactory.cpp

@@ -16,12 +16,14 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementfactory.h"
-#include "QDomElement"
-#include "simpleelement.h"
-#include "reportelement.h"
-#include "masterelement.h"
-#include "slaveelement.h"
-#include "terminalelement.h"
+
+#include "../qetgraphicsitem/masterelement.h"
+#include "../qetgraphicsitem/reportelement.h"
+#include "../qetgraphicsitem/simpleelement.h"
+#include "../qetgraphicsitem/slaveelement.h"
+#include "../qetgraphicsitem/terminalelement.h"
+
+#include <QDomElement>
 
 ElementFactory* ElementFactory::factory_ = nullptr;
 /**

sources/factory/elementpicturefactory.cpp

@@ -18,9 +18,9 @@
 #include "elementpicturefactory.h"
 
 #include "../ElementsCollection/elementslocation.h"
+#include "../editor/graphicspart/partline.h"
 #include "../qet.h"
 #include "../qetapp.h"
-#include "partline.h"
 
 #include <QAbstractTextDocumentLayout>
 #include <QDomElement>

sources/factory/propertieseditorfactory.cpp

@@ -20,6 +20,8 @@
 #include "../PropertiesEditor/propertieseditorwidget.h"
 #include "../qetgraphicsitem/ViewItem/projectdbmodel.h"
 #include "../qetgraphicsitem/ViewItem/qetgraphicstableitem.h"
+#include "../qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.h"
+#include "../qetgraphicsitem/ViewItem/ui/projectdbmodelpropertieswidget.h"
 #include "../qetgraphicsitem/diagramimageitem.h"
 #include "../qetgraphicsitem/dynamicelementtextitem.h"
 #include "../qetgraphicsitem/element.h"
@@ -31,9 +33,8 @@
 #include "../ui/imagepropertieswidget.h"
 #include "../ui/inditextpropertieswidget.h"
 #include "../ui/shapegraphicsitempropertieswidget.h"
-#include "QGraphicsItem"
-#include "graphicstablepropertieseditor.h"
-#include "projectdbmodelpropertieswidget.h"
+
+#include <QGraphicsItem>
 
 /**
 	@brief PropertiesEditorFactory::propertiesEditor

sources/factory/qetgraphicstablefactory.cpp

@@ -17,14 +17,14 @@
 */
 #include "qetgraphicstablefactory.h"
 
+#include "../dataBase/ui/elementquerywidget.h"
+#include "../dataBase/ui/summaryquerywidget.h"
 #include "../diagram.h"
-#include "../projectdbmodel.h"
-#include "../qetgraphicsheaderitem.h"
-#include "../qetgraphicstableitem.h"
-#include "addtabledialog.h"
-#include "elementquerywidget.h"
-#include "qetutils.h"
-#include "summaryquerywidget.h"
+#include "../qetgraphicsitem/ViewItem/projectdbmodel.h"
+#include "../qetgraphicsitem/ViewItem/qetgraphicsheaderitem.h"
+#include "../qetgraphicsitem/ViewItem/qetgraphicstableitem.h"
+#include "../utils/qetutils.h"
+#include "ui/addtabledialog.h"
 
 #include <QDialog>
 

sources/factory/ui/addtabledialog.cpp

@@ -18,8 +18,8 @@
 #include "addtabledialog.h"
 
 #include "../../dataBase/ui/elementquerywidget.h"
+#include "../../ui/marginseditdialog.h"
 #include "../../utils/qetutils.h"
-#include "marginseditdialog.h"
 #include "ui_addtabledialog.h"
 
 #include <QFontDialog>

sources/factory/ui/addtabledialog.h

@@ -18,7 +18,7 @@
 #ifndef ADDTABLEDIALOG_H
 #define ADDTABLEDIALOG_H
 
-#include "../qetapp.h"
+#include "../../qetapp.h"
 
 #include <QDialog>