Wip Fix preprocessor on Cmake

sources/ElementsCollection/elementcollectionhandler.h

@@ -18,8 +18,8 @@
 #ifndef ELEMENTCOLLECTIONHANDLER_H
 #define ELEMENTCOLLECTIONHANDLER_H
 
+#include "../NameList/nameslist.h"
 #include "elementslocation.h"
-#include "nameslist.h"
 
 class QWidget;
 

sources/ElementsCollection/elementscollectionmodel.cpp

@@ -16,13 +16,14 @@
 	along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementscollectionmodel.h"
+
+#include "../qetapp.h"
+#include "../qetproject.h"
+#include "elementcollectionhandler.h"
 #include "elementcollectionitem.h"
 #include "fileelementcollectionitem.h"
-#include "xmlprojectelementcollectionitem.h"
-#include "qetapp.h"
 #include "xmlelementcollection.h"
-#include "qetproject.h"
-#include "elementcollectionhandler.h"
+#include "xmlprojectelementcollectionitem.h"
 
 #include <QFutureWatcher>
 #include <QtConcurrent>

sources/ElementsCollection/elementscollectionwidget.cpp

@@ -16,26 +16,27 @@
 	along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementscollectionwidget.h"
-#include "elementscollectionmodel.h"
-#include "elementcollectionitem.h"
-#include "qeticons.h"
-#include "fileelementcollectionitem.h"
-#include "elementslocation.h"
-#include "qetapp.h"
-#include "qetmessagebox.h"
-#include "elementscategoryeditor.h"
-#include "newelementwizard.h"
-#include "xmlprojectelementcollectionitem.h"
-#include "qetproject.h"
-#include "qetelementeditor.h"
-#include "elementstreeview.h"
-#include "qetdiagrameditor.h"
 
-#include <QVBoxLayout>
-#include <QMenu>
+#include "../editor/qetelementeditor.h"
+#include "../elementscategoryeditor.h"
+#include "../newelementwizard.h"
+#include "../qetapp.h"
+#include "../qetdiagrameditor.h"
+#include "../qeticons.h"
+#include "../qetmessagebox.h"
+#include "../qetproject.h"
+#include "elementcollectionitem.h"
+#include "elementscollectionmodel.h"
+#include "elementslocation.h"
+#include "elementstreeview.h"
+#include "fileelementcollectionitem.h"
+#include "xmlprojectelementcollectionitem.h"
+
 #include <QDesktopServices>
-#include <QUrl>
+#include <QMenu>
 #include <QTimer>
+#include <QUrl>
+#include <QVBoxLayout>
 #include <QtGlobal>
 
 /**

sources/ElementsCollection/elementslocation.h

@@ -18,11 +18,12 @@
 #ifndef ELEMENTS_LOCATION_H
 #define ELEMENTS_LOCATION_H
 
-#include "nameslist.h"
-#include "diagramcontext.h"
-#include "pugixml.hpp"
-#include <QString>
+#include "../NameList/nameslist.h"
+#include "../diagramcontext.h"
+#include "../pugixml/pugixml.hpp"
+
 #include <QIcon>
+#include <QString>
 
 #ifndef Q_OS_LINUX
 #include "sstream"

sources/ElementsCollection/elementstreeview.cpp

@@ -16,11 +16,12 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementstreeview.h"
+
+#include "../qetgraphicsitem/element.h"
 #include "elementcollectionitem.h"
-#include "elementslocation.h"
 #include "elementfactory.h"
+#include "elementslocation.h"
 #include "qeticons.h"
-#include "element.h"
 
 #include <QDrag>
 #include <QStandardItemModel>

sources/ElementsCollection/xmlelementcollection.cpp

@@ -16,10 +16,11 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "xmlelementcollection.h"
-#include "nameslist.h"
-#include "qetxml.h"
+
+#include "../NameList/nameslist.h"
+#include "../qetproject.h"
+#include "../qetxml.h"
 #include "elementslocation.h"
-#include "qetproject.h"
 
 /**
 	@brief XmlElementCollection::XmlElementCollection