Mod Cmake en preprocessor

sources/ElementsCollection/elementcollectionhandler.cpp

@@ -16,12 +16,14 @@
 	along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementcollectionhandler.h"
+
+#include "../qetproject.h"
+#include "../qetxml.h"
 #include "renamedialog.h"
 #include "xmlelementcollection.h"
-#include "qetproject.h"
-#include "qetxml.h"
-#include <QFile>
+
 #include <QDir>
+#include <QFile>
 
 /******************************************************/
 

sources/ElementsCollection/elementslocation.cpp

@@ -16,13 +16,15 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementslocation.h"
-#include "qetapp.h"
-#include "xmlelementcollection.h"
-#include "qetproject.h"
-#include "elementscollectioncache.h"
-#include "elementpicturefactory.h"
+
+#include "../elementscollectioncache.h"
+#include "../qetapp.h"
+#include "../qetproject.h"
+#include "../qetxml.h"
 #include "element.h"
-#include "qetxml.h"
+#include "elementpicturefactory.h"
+#include "xmlelementcollection.h"
+
 #include <QPicture>
 
 // make this class usable with QVariant

sources/ElementsCollection/elementstreeview.cpp

@@ -18,10 +18,10 @@
 #include "elementstreeview.h"
 
 #include "../qetgraphicsitem/element.h"
+#include "../qeticons.h"
 #include "elementcollectionitem.h"
 #include "elementfactory.h"
 #include "elementslocation.h"
-#include "qeticons.h"
 
 #include <QDrag>
 #include <QStandardItemModel>

sources/ElementsCollection/fileelementcollectionitem.cpp

@@ -17,9 +17,10 @@
 */
 
 #include "fileelementcollectionitem.h"
+
+#include "../qetapp.h"
+#include "../qeticons.h"
 #include "elementslocation.h"
-#include "qetapp.h"
-#include "qeticons.h"
 
 #include <QDir>
 

sources/ElementsCollection/ui/renamedialog.h

@@ -18,8 +18,9 @@
 #ifndef RENAMEDIALOG_H
 #define RENAMEDIALOG_H
 
+#include "../qet.h"
+
 #include <QDialog>
-#include "qet.h"
 
 namespace Ui {
     class RenameDialog;

sources/ElementsCollection/xmlprojectelementcollectionitem.cpp

@@ -15,11 +15,12 @@
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "qetproject.h"
-#include "xmlelementcollection.h"
-#include "qeticons.h"
 #include "xmlprojectelementcollectionitem.h"
 
+#include "../qeticons.h"
+#include "../qetproject.h"
+#include "xmlelementcollection.h"
+
 /**
 	@brief XmlProjectElementCollectionItem::XmlProjectElementCollectionItem
 	Constructor