Mod Cmake en preprocessor

sources/titleblock/helpercell.h

@@ -17,8 +17,9 @@
 */
 #ifndef TITLEBLOCK_SLASH_HELPER_CELL_H
 #define TITLEBLOCK_SLASH_HELPER_CELL_H
+#include "../qet.h"
+
 #include <QtWidgets>
-#include "qet.h"
 
 /**
 	This class implements a helper widget for cells that indicate the length of

sources/titleblock/integrationmovetemplateshandler.cpp

@@ -16,8 +16,9 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "integrationmovetemplateshandler.h"
+
+#include "../qetmessagebox.h"
 #include "templatescollection.h"
-#include "qetmessagebox.h"
 
 /**
 	Constructor

sources/titleblock/qettemplateeditor.cpp

@@ -16,16 +16,16 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "qettemplateeditor.h"
-#include "qetmessagebox.h"
-#include "qeticons.h"
-#include "qetapp.h"
-#include "qetproject.h"
+
+#include "../qetapp.h"
+#include "../qeticons.h"
+#include "../qetmessagebox.h"
+#include "../qetproject.h"
 #include "templatecellwidget.h"
 #include "templatecommands.h"
-#include "templateview.h"
 #include "templatelocationsaver.h"
 #include "templatelogomanager.h"
-#include "templatecellwidget.h"
+#include "templateview.h"
 
 /**
 	@param parent parent QWidget of this window

sources/titleblock/templatecellsset.cpp

@@ -16,12 +16,13 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <QMultiMap>
-
 #include "templatecellsset.h"
-#include "templatevisualcell.h"
+
+#include "../titleblockcell.h"
 #include "templateview.h"
-#include "titleblockcell.h"
+#include "templatevisualcell.h"
+
+#include <QMultiMap>
 
 /**
 	Constructor

sources/titleblock/templatecellwidget.h

@@ -17,8 +17,9 @@
 */
 #ifndef TITLEBLOCK_SLASH_TEMPLATE_CELL_WIDGET_H
 #define TITLEBLOCK_SLASH_TEMPLATE_CELL_WIDGET_H
+#include "../qet.h"
+
 #include <QtWidgets>
-#include "qet.h"
 class ModifyTitleBlockCellCommand;
 class TitleBlockTemplate;
 class TitleBlockCell;

sources/titleblock/templatecommands.cpp

@@ -16,10 +16,11 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "templatecommands.h"
-#include "templatevisualcell.h"
-#include "templateview.h"
-#include "titleblockcell.h"
+
+#include "../titleblockcell.h"
 #include "dimension.h"
+#include "templateview.h"
+#include "templatevisualcell.h"
 #define TITLEBLOCK_DEFAULT_ROW_HEIGHT TitleBlockDimension(25)
 #define TITLEBLOCK_DEFAULT_COL_WIDTH  TitleBlockDimension(50)
 

sources/titleblock/templatecommands.h

@@ -18,11 +18,12 @@
 #ifndef TITLEBLOCK_SLASH_TEMPLATE_COMMANDS_H
 #define TITLEBLOCK_SLASH_TEMPLATE_COMMANDS_H
 #define MODIFY_TITLE_BLOCK_CELL_COMMAND_ID 6378
-#include <QtCore>
-#include <QUndoCommand>
+#include "../titleblockcell.h"
 #include "dimension.h"
 #include "templatecellsset.h"
-#include "titleblockcell.h"
+
+#include <QUndoCommand>
+#include <QtCore>
 class TitleBlockTemplateView;
 class TitleBlockTemplate;
 

sources/titleblock/templatedeleter.cpp

@@ -16,8 +16,9 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "templatedeleter.h"
-#include "qetmessagebox.h"
-#include "qetproject.h"
+
+#include "../qetmessagebox.h"
+#include "../qetproject.h"
 /**
 	Constructor
 	@param tbt_location Location of the title block template to be deleted

sources/titleblock/templatelogomanager.cpp

@@ -16,8 +16,9 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "templatelogomanager.h"
-#include "titleblocktemplate.h"
-#include "qeticons.h"
+
+#include "../qeticons.h"
+#include "../titleblocktemplate.h"
 
 #include <QStandardPaths>
 

sources/titleblock/templateview.cpp

@@ -16,14 +16,15 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "templateview.h"
-#include "templatevisualcell.h"
+
+#include "../qeticons.h"
+#include "dimensionwidget.h"
 #include "gridlayoutanimation.h"
 #include "helpercell.h"
 #include "splittedhelpercell.h"
-#include "templatecommands.h"
 #include "templatecellsset.h"
-#include "dimensionwidget.h"
-#include "qeticons.h"
+#include "templatecommands.h"
+#include "templatevisualcell.h"
 #define ROW_OFFSET 2
 #define COL_OFFSET 1
 #define DEFAULT_PREVIEW_WIDTH 600

sources/titleblock/templateview.h

@@ -17,8 +17,9 @@
 */
 #ifndef TITLEBLOCK_SLASH_TEMPLATE_VIEW_H
 #define TITLEBLOCK_SLASH_TEMPLATE_VIEW_H
+#include "../titleblocktemplate.h"
+
 #include <QGraphicsView>
-#include "titleblocktemplate.h"
 class HelperCell;
 class SplittedHelperCell;
 class TitleBlockTemplateCommand;

sources/titleblock/templatevisualcell.cpp

@@ -18,7 +18,7 @@
 #include "templatevisualcell.h"
 
 #include "../diagramcontext.h"
-#include "titleblocktemplate.h"
+#include "../titleblocktemplate.h"
 
 /**
 	Constructor

sources/titleblock/templatevisualcell.h

@@ -17,10 +17,11 @@
 */
 #ifndef TITLEBLOCK_SLASH_QET_TEMPLATE_VISUAL_CELL_H
 #define TITLEBLOCK_SLASH_QET_TEMPLATE_VISUAL_CELL_H
+#include "../qet.h"
+
 #include <QtWidgets>
-#include "qet.h"
 class TitleBlockTemplate;
-#include "titleblockcell.h"
+#include "../titleblockcell.h"
 
 /**
 	This class implements a preview widget for cells that compose a title