merge

2025-12-17 12:40:35 +01:00 · 2021-02-23 17:35:55 +01:00
parent b32a295b0c f97edad75a
commit ea364f9c4e
7393 changed files with 173795 additions and 176624 deletions
--- a/sources/titleblock/dimension.cpp
+++ b/sources/titleblock/dimension.cpp
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
--- a/sources/titleblock/dimension.h
+++ b/sources/titleblock/dimension.h
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
@@ -17,7 +17,7 @@
 */
 #ifndef TITLEBLOCK_SLASH_DIMENSION_H
 #define TITLEBLOCK_SLASH_DIMENSION_H
-#include "qet.h"
+#include "../qet.h"

 /**
 	This struct is a simple container associating a length with its type.
--- a/sources/titleblock/dimensionwidget.cpp
+++ b/sources/titleblock/dimensionwidget.cpp
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
--- a/sources/titleblock/dimensionwidget.h
+++ b/sources/titleblock/dimensionwidget.h
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
--- a/sources/titleblock/gridlayoutanimation.cpp
+++ b/sources/titleblock/gridlayoutanimation.cpp
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
--- a/sources/titleblock/gridlayoutanimation.h
+++ b/sources/titleblock/gridlayoutanimation.h
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
--- a/sources/titleblock/helpercell.cpp
+++ b/sources/titleblock/helpercell.cpp
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
--- a/sources/titleblock/helpercell.h
+++ b/sources/titleblock/helpercell.h
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
@@ -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
--- a/sources/titleblock/integrationmovetemplateshandler.cpp
+++ b/sources/titleblock/integrationmovetemplateshandler.cpp
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
@@ -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
--- a/sources/titleblock/integrationmovetemplateshandler.h
+++ b/sources/titleblock/integrationmovetemplateshandler.h
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
--- a/sources/titleblock/movetemplateshandler.h
+++ b/sources/titleblock/movetemplateshandler.h
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
@@ -17,10 +17,11 @@
 */
 #ifndef TITLEBLOCK_SLASH_MOVE_TEMPLATES_HANDLER_H
 #define TITLEBLOCK_SLASH_MOVE_TEMPLATES_HANDLER_H
-#include <QtCore>
-#include "qet.h"
+#include "../qet.h"
 #include "templatelocation.h"

+#include <QtCore>
+
 /**
 	This class defines the minimal interface required to implement an object
 	able to handle a title block template move or copy.
--- a/sources/titleblock/qettemplateeditor.cpp
+++ b/sources/titleblock/qettemplateeditor.cpp
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
@@ -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
--- a/sources/titleblock/qettemplateeditor.h
+++ b/sources/titleblock/qettemplateeditor.h
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
@@ -17,11 +17,12 @@
 */
 #ifndef TITLEBLOCK_SLASH_QET_TEMPLATE_EDITOR_H
 #define TITLEBLOCK_SLASH_QET_TEMPLATE_EDITOR_H
-#include <QtWidgets>
-#include "qetmainwindow.h"
-#include "qet.h"
-#include "templateview.h"
+#include "../qet.h"
+#include "../qetmainwindow.h"
 #include "templatelocation.h"
+#include "templateview.h"
+
+#include <QtWidgets>
 class ModifyTitleBlockCellCommand;
 class TitleBlockTemplateCommand;
 class TitleBlockTemplateCellWidget;
--- a/sources/titleblock/splittedhelpercell.cpp
+++ b/sources/titleblock/splittedhelpercell.cpp
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
--- a/sources/titleblock/splittedhelpercell.h
+++ b/sources/titleblock/splittedhelpercell.h
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
--- a/sources/titleblock/templatecellsset.cpp
+++ b/sources/titleblock/templatecellsset.cpp
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
@@ -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
--- a/sources/titleblock/templatecellsset.h
+++ b/sources/titleblock/templatecellsset.h
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
--- a/sources/titleblock/templatecellwidget.cpp
+++ b/sources/titleblock/templatecellwidget.cpp
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
@@ -16,14 +16,15 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "templatecellwidget.h"
-#include "titleblockcell.h"
-#include "nameslist.h"
-#include "titleblocktemplate.h"
+
+#include "../NameList/nameslist.h"
+#include "../NameList/ui/namelistdialog.h"
+#include "../NameList/ui/namelistwidget.h"
+#include "../qeticons.h"
+#include "../qetinformation.h"
+#include "../titleblockcell.h"
+#include "../titleblocktemplate.h"
 #include "templatecommands.h"
-#include "qeticons.h"
-#include "namelistdialog.h"
-#include "namelistwidget.h"
-#include "qetinformation.h"

 /**
 	@brief TitleBlockTemplateCellWidget::TitleBlockTemplateCellWidget
@@ -460,8 +461,9 @@ QString TitleBlockTemplateCellWidget::defaultVariablesString() const
 		"<li>%{projecttitle} : titre du projet</li>"
 		"<li>%{projectpath} : chemin du projet</li>"
 		"<li>%{projectfilename} : nom du fichier</li>"
-		"<li>%{saveddate} : date d'enregistrement du fichier format yyyy-MM-dd</li>"
+		"<li>%{saveddate} : date d'enregistrement du fichier format local</li>"
 		"<li>%{saveddate-eu} : date d'enregistrement du fichier format dd-MM-yyyy</li>"
+		"<li>%{saveddate-us} : date d'enregistrement du fichier format yyyy-MM-dd</li>"
 		"<li>%{savedtime} : heure d'enregistrement du fichier</li>"
 		"<li>%{savedfilename} : nom du fichier enregistré</li>"
 		"<li>%{savedfilepath} : chemin du fichier enregistré</li>"
--- a/sources/titleblock/templatecellwidget.h
+++ b/sources/titleblock/templatecellwidget.h
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
@@ -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;
--- a/sources/titleblock/templatecommands.cpp
+++ b/sources/titleblock/templatecommands.cpp
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
@@ -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)

--- a/sources/titleblock/templatecommands.h
+++ b/sources/titleblock/templatecommands.h
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
@@ -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;

--- a/sources/titleblock/templatedeleter.cpp
+++ b/sources/titleblock/templatedeleter.cpp
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
@@ -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
--- a/sources/titleblock/templatedeleter.h
+++ b/sources/titleblock/templatedeleter.h
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
--- a/sources/titleblock/templatelocation.cpp
+++ b/sources/titleblock/templatelocation.cpp
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
@@ -16,8 +16,9 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "templatelocation.h"
+
+#include "../qetapp.h"
 #include "templatescollection.h"
-#include "qetapp.h"

 #include <QRegularExpression>

--- a/sources/titleblock/templatelocation.h
+++ b/sources/titleblock/templatelocation.h
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
--- a/sources/titleblock/templatelocationchooser.cpp
+++ b/sources/titleblock/templatelocationchooser.cpp
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
@@ -16,8 +16,9 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "templatelocationchooser.h"
-#include "qetapp.h"
-#include "qetproject.h"
+
+#include "../qetapp.h"
+#include "../qetproject.h"
 #include "templatescollection.h"

 /**
--- a/sources/titleblock/templatelocationchooser.h
+++ b/sources/titleblock/templatelocationchooser.h
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
--- a/sources/titleblock/templatelocationsaver.cpp
+++ b/sources/titleblock/templatelocationsaver.cpp
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
@@ -16,8 +16,9 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "templatelocationsaver.h"
-#include "qetapp.h"
-#include "qetproject.h"
+
+#include "../qetapp.h"
+#include "../qetproject.h"
 #include "templatescollection.h"

 /**
--- a/sources/titleblock/templatelocationsaver.h
+++ b/sources/titleblock/templatelocationsaver.h
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
--- a/sources/titleblock/templatelogomanager.cpp
+++ b/sources/titleblock/templatelogomanager.cpp
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
@@ -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>

--- a/sources/titleblock/templatelogomanager.h
+++ b/sources/titleblock/templatelogomanager.h
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
--- a/sources/titleblock/templatescollection.cpp
+++ b/sources/titleblock/templatescollection.cpp
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
@@ -16,9 +16,10 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "templatescollection.h"
-#include "titleblocktemplate.h"
-#include "qetapp.h"
-#include "qetproject.h"
+
+#include "../qetapp.h"
+#include "../qetproject.h"
+#include "../titleblocktemplate.h"

 #include <QRegularExpression>

--- a/sources/titleblock/templatescollection.h
+++ b/sources/titleblock/templatescollection.h
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
@@ -18,10 +18,11 @@
 #ifndef TITLEBLOCK_SLASH_TEMPLATES_COLLECTION_H
 #define TITLEBLOCK_SLASH_TEMPLATES_COLLECTION_H
 #define TITLEBLOCKS_FILE_EXTENSION ".titleblock"
+#include "../qet.h"
+#include "templatelocation.h"
+
 #include <QtCore>
 #include <QtXml>
-#include "templatelocation.h"
-#include "qet.h"
 class TitleBlockTemplate;
 class QETProject;

--- a/sources/titleblock/templateview.cpp
+++ b/sources/titleblock/templateview.cpp
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
@@ -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
--- a/sources/titleblock/templateview.h
+++ b/sources/titleblock/templateview.h
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
@@ -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;
--- a/sources/titleblock/templatevisualcell.cpp
+++ b/sources/titleblock/templatevisualcell.cpp
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 	
 	QElectroTech is free software: you can redistribute it and/or modify
@@ -16,8 +16,9 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "templatevisualcell.h"
-#include "titleblocktemplate.h"
-#include "diagramcontext.h"
+
+#include "../diagramcontext.h"
+#include "../titleblocktemplate.h"

 /**
 	Constructor
--- a/sources/titleblock/templatevisualcell.h
+++ b/sources/titleblock/templatevisualcell.h
@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.

 	QElectroTech is free software: you can redistribute it and/or modify
@@ -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