Wip Fix preprocessor on Cmake

CMakeLists.txt

@@ -83,10 +83,7 @@ find_package(
   PrintSupport
  REQUIRED
  )
-
+set(QET_SRC_FILES
-if(DEFINED ENV{ok_simon})
-add_executable(
-  ${PROJECT_NAME}
   ${QET_DIR}/sources/borderproperties.cpp
   ${QET_DIR}/sources/borderproperties.h
   ${QET_DIR}/sources/bordertitleblock.cpp
@@ -596,7 +593,11 @@ add_executable(
   ${QET_DIR}/sources/utils/qetutils.cpp
   ${QET_DIR}/sources/utils/qetutils.h
   )
-
+if(DEFINED ENV{ok_simon})
+add_executable(
+  ${PROJECT_NAME}
+  ${QET_SRC_FILES}
+  )
 target_link_libraries(
   ${PROJECT_NAME}
   PUBLIC
@@ -649,5 +650,7 @@ target_link_libraries(
  else()
    message("ok_simon is not set, assuming QET WILL_FAIL to COMPILE")
 endif()
+
+
 # Add sub directories
 add_subdirectory(tests)

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 "xmlprojectelementcollectionitem.h"
-#include "elementcollectionhandler.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 "../editor/qetelementeditor.h"
-#include <QMenu>
+#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 "../NameList/nameslist.h"
-#include "diagramcontext.h"
+#include "../diagramcontext.h"
-#include "pugixml.hpp"
+#include "../pugixml/pugixml.hpp"
-#include <QString>
+
 #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

sources/NameList/nameslist.cpp

@@ -16,7 +16,8 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "nameslist.h"
-#include "qetapp.h"
+
+#include "../qetapp.h"
 
 // make this class usable with QVariant
 int NamesList::MetaTypeId = qRegisterMetaType<NamesList>("NamesList");

sources/NameList/nameslist.h

@@ -17,8 +17,9 @@
 */
 #ifndef NAMES_LIST_H
 #define NAMES_LIST_H
+#include "../pugixml/pugixml.hpp"
+
 #include <QtXml>
-#include "pugixml.hpp"
 /**
 	Cette classe represente une liste de noms, utilisee
 	par les elements et categories pour embarquer un meme nom en plusieurs

sources/NameList/ui/namelistwidget.h

@@ -18,10 +18,10 @@
 #ifndef NAMELISTWIDGET_H
 #define NAMELISTWIDGET_H
 
-#include <QWidget>
+#include "../nameslist.h"
-#include <QHash>
 
-#include "nameslist.h"
+#include <QHash>
+#include <QWidget>
 
 namespace Ui {
 	class NameListWidget;

sources/SearchAndReplace/searchandreplaceworker.cpp

@@ -16,16 +16,16 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "searchandreplaceworker.h"
-#include "diagram.h"
-#include "changetitleblockcommand.h"
-#include "changeelementinformationcommand.h"
-#include "element.h"
-#include "qetapp.h"
-#include "independenttextitem.h"
-#include "diagramcommands.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
-#include "qetinformation.h"
 
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../diagram.h"
+#include "../diagramcommands.h"
+#include "../qetapp.h"
+#include "../qetgraphicsitem/element.h"
+#include "../qetgraphicsitem/independenttextitem.h"
+#include "../qetinformation.h"
+#include "../undocommand/changeelementinformationcommand.h"
+#include "../undocommand/changetitleblockcommand.h"
 
 SearchAndReplaceWorker::SearchAndReplaceWorker()
 {

sources/SearchAndReplace/searchandreplaceworker.h

@@ -18,10 +18,10 @@
 #ifndef SEARCHANDREPLACEWORKER_H
 #define SEARCHANDREPLACEWORKER_H
 
-#include <QDate>
+#include "../conductorproperties.h"
+#include "../titleblockproperties.h"
 
-#include "titleblockproperties.h"
+#include <QDate>
-#include "conductorproperties.h"
 
 class Diagram;
 class Element;

sources/SearchAndReplace/ui/replaceconductordialog.h

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

sources/SearchAndReplace/ui/replaceelementdialog.h

@@ -18,8 +18,9 @@
 #ifndef REPLACEELEMENTDIALOG_H
 #define REPLACEELEMENTDIALOG_H
 
+#include "../../diagramcontext.h"
+
 #include <QDialog>
-#include "diagramcontext.h"
 
 class ElementInfoPartWidget;
 

sources/SearchAndReplace/ui/replacefoliowidget.h

@@ -18,11 +18,11 @@
 #ifndef REPLACEFOLIOWIDGET_H
 #define REPLACEFOLIOWIDGET_H
 
-#include <QWidget>
+#include "../../diagramcontext.h"
-#include <QDialog>
+#include "../../titleblockproperties.h"
 
-#include "diagramcontext.h"
+#include <QDialog>
-#include "titleblockproperties.h"
+#include <QWidget>
 
 class DiagramContextWidget;
 class QDialogButtonBox;

sources/SearchAndReplace/ui/searchandreplacewidget.cpp

@@ -16,24 +16,25 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "searchandreplacewidget.h"
-#include "ui_searchandreplacewidget.h"
+
-#include "qetdiagrameditor.h"
+#include "../../QWidgetAnimation/qwidgetanimation.h"
-#include "qetproject.h"
+#include "../../diagram.h"
-#include "diagram.h"
+#include "../../diagramcontent.h"
-#include "qeticons.h"
+#include "../../qetapp.h"
-#include "element.h"
+#include "../../qetdiagrameditor.h"
-#include "independenttextitem.h"
+#include "../../qetgraphicsitem/element.h"
+#include "../../qeticons.h"
+#include "../../qetinformation.h"
+#include "../../qetproject.h"
 #include "conductor.h"
-#include "replacefoliowidget.h"
-#include "replaceelementdialog.h"
-#include "qetapp.h"
-#include "replaceconductordialog.h"
-#include "replaceadvanceddialog.h"
 #include "dynamicelementtextitem.h"
 #include "elementtextitemgroup.h"
-#include "QWidgetAnimation/qwidgetanimation.h"
+#include "independenttextitem.h"
-#include "qetinformation.h"
+#include "replaceadvanceddialog.h"
-#include "diagramcontent.h"
+#include "replaceconductordialog.h"
+#include "replaceelementdialog.h"
+#include "replacefoliowidget.h"
+#include "ui_searchandreplacewidget.h"
 
 #include <QSettings>
 

sources/SearchAndReplace/ui/searchandreplacewidget.h

@@ -18,13 +18,13 @@
 #ifndef SEARCHANDREPLACEWIDGET_H
 #define SEARCHANDREPLACEWIDGET_H
 
-#include <QWidget>
+#include "../../QWidgetAnimation/qwidgetanimation.h"
-#include <QTreeWidgetItemIterator>
+#include "../../qetgraphicsitem/element.h"
+#include "../../qetgraphicsitem/independenttextitem.h"
+#include "../searchandreplaceworker.h"
 
-#include "element.h"
+#include <QTreeWidgetItemIterator>
-#include "independenttextitem.h"
+#include <QWidget>
-#include "searchandreplaceworker.h"
-#include "QWidgetAnimation/qwidgetanimation.h"
 
 class QTreeWidgetItem;
 class QETDiagramEditor;

sources/autoNum/assignvariables.cpp

@@ -16,14 +16,15 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "assignvariables.h"
-#include "diagram.h"
-#include "element.h"
-#include "diagramposition.h"
-#include "qetapp.h"
-#include "qetxml.h"
 
-#include <QVariant>
+#include "../diagram.h"
+#include "../diagramposition.h"
+#include "../qetapp.h"
+#include "../qetgraphicsitem/element.h"
+#include "../qetxml.h"
+
 #include <QStringList>
+#include <QVariant>
 #include <utility>
 
 namespace autonum

sources/autoNum/assignvariables.h

@@ -17,13 +17,12 @@
 */
 #ifndef ASSIGNVARIABLES_H
 #define ASSIGNVARIABLES_H
-
+#include "../diagramcontext.h"
-#include <QString>
-#include <QPointF>
-#include <QStringList>
-
 #include "numerotationcontext.h"
-#include "diagramcontext.h"
+
+#include <QPointF>
+#include <QString>
+#include <QStringList>
 
 class Diagram;
 class Element;

sources/autoNum/numerotationcontext.cpp

@@ -16,10 +16,11 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "numerotationcontext.h"
-#include "qet.h"
 
-#include <utility>
+#include "../qet.h"
+
 #include <QRegularExpression>
+#include <utility>
 
 /**
 	Constructor

sources/autoNum/numerotationcontextcommands.cpp

@@ -16,7 +16,8 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "numerotationcontextcommands.h"
-#include "diagram.h"
+
+#include "../diagram.h"
 
 /**
 	@brief Constructor

sources/autoNum/ui/autonumberingdockwidget.cpp

@@ -16,13 +16,14 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "autonumberingdockwidget.h"
-#include "qetapp.h"
+
+#include "../../diagram.h"
+#include "../../diagramview.h"
+#include "../../qetapp.h"
+#include "../../titleblockproperties.h"
+#include "../../ui/projectpropertiesdialog.h"
+#include "../numerotationcontext.h"
 #include "ui_autonumberingdockwidget.h"
-#include "diagramview.h"
-#include "diagram.h"
-#include "titleblockproperties.h"
-#include "numerotationcontext.h"
-#include "projectpropertiesdialog.h"
 
 /**
 	@brief AutoNumberingDockWidget::AutoNumberingDockWidget

sources/autoNum/ui/autonumberingdockwidget.h

@@ -18,8 +18,9 @@
 #ifndef AUTONUMBERINGDOCKWIDGET_H
 #define AUTONUMBERINGDOCKWIDGET_H
 
-#include "qetproject.h"
+#include "../projectview.h"
-#include "projectview.h"
+#include "../qetproject.h"
+
 #include <QDockWidget>
 
 namespace Ui {

sources/autoNum/ui/autonumberingmanagementw.cpp

@@ -16,15 +16,17 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "autonumberingmanagementw.h"
-#include "ui_autonumberingmanagementw.h"
+
-#include "numparteditorw.h"
+#include "../../diagram.h"
-#include <QMessageBox>
+#include "../../qetproject.h"
-#include "numerotationcontextcommands.h"
+#include "../numerotationcontextcommands.h"
 #include "formulaautonumberingw.h"
-#include "ui_formulaautonumberingw.h"
+#include "numparteditorw.h"
 #include "qdebug.h"
-#include "qetproject.h"
+#include "ui_autonumberingmanagementw.h"
-#include "diagram.h"
+#include "ui_formulaautonumberingw.h"
+
+#include <QMessageBox>
 
 /**
 	@brief AutoNumberingManagementW::AutoNumberingManagementW

sources/autoNum/ui/folioautonumbering.cpp

@@ -16,12 +16,14 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "folioautonumbering.h"
+
+#include "../../diagram.h"
+#include "../../qetproject.h"
 #include "ui_folioautonumbering.h"
+
 #include <QMessageBox>
 #include <QPushButton>
 #include <QtWidgets>
-#include "qetproject.h"
-#include "diagram.h"
 /**
 	Constructor
 */

sources/autoNum/ui/folioautonumbering.h

@@ -18,8 +18,9 @@
 #ifndef FOLIOAUTONUMBERING_H
 #define FOLIOAUTONUMBERING_H
 
+#include "../numerotationcontext.h"
+
 #include <QWidget>
-#include "numerotationcontext.h"
 
 class NumPartEditorW;
 class QAbstractButton;

sources/autoNum/ui/numparteditorw.h

@@ -18,9 +18,10 @@
 #ifndef NUMPARTEDITORW_H
 #define NUMPARTEDITORW_H
 
-#include <QWidget>
+#include "../numerotationcontext.h"
+
 #include <QValidator>
-#include "numerotationcontext.h"
+#include <QWidget>
 
 namespace Ui {
 	class NumPartEditorW;

sources/autoNum/ui/selectautonumw.cpp

@@ -16,14 +16,15 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "selectautonumw.h"
-#include "ui_selectautonumw.h"
-#include "numparteditorw.h"
-#include <QMessageBox>
-#include "numerotationcontextcommands.h"
-#include "formulaautonumberingw.h"
-#include "ui_formulaautonumberingw.h"
-#include "assignvariables.h"
 
+#include "../assignvariables.h"
+#include "../numerotationcontextcommands.h"
+#include "formulaautonumberingw.h"
+#include "numparteditorw.h"
+#include "ui_formulaautonumberingw.h"
+#include "ui_selectautonumw.h"
+
+#include <QMessageBox>
 
 /**
 	@brief SelectAutonumW::SelectAutonumW

sources/autoNum/ui/selectautonumw.h

@@ -18,10 +18,11 @@
 #ifndef SELECTAUTONUMW_H
 #define SELECTAUTONUMW_H
 
-#include <QWidget>
+#include "../numerotationcontext.h"
-#include "numerotationcontext.h"
 #include "formulaautonumberingw.h"
 
+#include <QWidget>
+
 class NumPartEditorW;
 class QAbstractButton;
 class FormulaAutonumberingW;

sources/bordertitleblock.cpp

@@ -15,18 +15,19 @@
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <QPainter>
-#include <utility>
-#include <QLocale>
-
-#include "titleblocktemplate.h"
-#include "titleblocktemplaterenderer.h"
 #include "bordertitleblock.h"
-#include "diagramposition.h"
+
-#include "qetapp.h"
-#include "math.h"
 #include "createdxf.h"
 #include "diagram.h"
+#include "diagramposition.h"
+#include "math.h"
+#include "qetapp.h"
+#include "titleblocktemplate.h"
+#include "titleblocktemplaterenderer.h"
+
+#include <QLocale>
+#include <QPainter>
+#include <utility>
 
 #define MIN_COLUMN_COUNT 3
 #define MIN_ROW_COUNT 3

sources/bordertitleblock.h

@@ -17,13 +17,14 @@
 */
 #ifndef BORDERTITLEBLOCK_H
 #define BORDERTITLEBLOCK_H
+#include "autoNum/numerotationcontext.h"
+#include "borderproperties.h"
 #include "diagramcontext.h"
 #include "titleblockproperties.h"
-#include "borderproperties.h"
+
+#include <QDate>
 #include <QObject>
 #include <QRectF>
-#include <QDate>
-#include "numerotationcontext.h"
 class QPainter;
 class DiagramPosition;
 class TitleBlockTemplate;

sources/conductorautonumerotation.cpp

@@ -16,14 +16,15 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "conductorautonumerotation.h"
-#include "numerotationcontextcommands.h"
+
-#include "qetdiagrameditor.h"
+#include "QPropertyUndoCommand/qpropertyundocommand.h"
-#include "conductor.h"
+#include "autoNum/assignvariables.h"
+#include "autoNum/numerotationcontextcommands.h"
 #include "diagram.h"
 #include "qet.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
+#include "qetdiagrameditor.h"
-#include "potentialselectordialog.h"
+#include "qetgraphicsitem/conductor.h"
-#include "assignvariables.h"
+#include "ui/potentialselectordialog.h"
 
 /**
 	@brief ConductorAutoNumerotation::ConductorAutoNumerotation

sources/conductorautonumerotation.h

@@ -18,8 +18,9 @@
 #ifndef CONDUCTORAUTONUMEROTATION_H
 #define CONDUCTORAUTONUMEROTATION_H
 
+#include "autoNum/assignvariables.h"
+
 #include <QList>
-#include "assignvariables.h"
 
 class Diagram;
 class Conductor;

sources/conductornumexport.cpp

@@ -16,12 +16,13 @@
 	along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
 */
 #include "conductornumexport.h"
+
 #include "diagram.h"
 #include "diagramcontent.h"
-#include "conductor.h"
+#include "qetgraphicsitem/conductor.h"
-#include "terminal.h"
+#include "qetgraphicsitem/conductortextitem.h"
-#include "element.h"
+#include "qetgraphicsitem/element.h"
-#include "conductortextitem.h"
+#include "qetgraphicsitem/terminal.h"
 
 #include <QFileDialog>
 

sources/conductorprofile.cpp

@@ -16,9 +16,10 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "conductorprofile.h"
-#include "qetgraphicsitem/conductor.h"
+
 #include "conductorsegmentprofile.h"
-#include "terminal.h"
+#include "qetgraphicsitem/conductor.h"
+#include "qetgraphicsitem/terminal.h"
 
 /// Constructeur
 ConductorProfile::ConductorProfile()

sources/configpages.cpp

@@ -16,25 +16,26 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <QFontDialog>
+#include "configpages.h"
+
+#include "NameList/nameslist.h"
+#include "bordertitleblock.h"
+#include "exportpropertieswidget.h"
+#include "properties/reportproperties.h"
+#include "qetapp.h"
+#include "qeticons.h"
+#include "qetproject.h"
+#include "ui/borderpropertieswidget.h"
+#include "ui/conductorpropertieswidget.h"
+#include "ui/reportpropertiewidget.h"
+#include "ui/titleblockpropertieswidget.h"
+#include "ui/xrefpropertieswidget.h"
+
 #include <QFont>
+#include <QFontDialog>
 #include <QSizePolicy>
 #include <utility>
 
-#include "configpages.h"
-#include "borderpropertieswidget.h"
-#include "conductorpropertieswidget.h"
-#include "titleblockpropertieswidget.h"
-#include "bordertitleblock.h"
-#include "qeticons.h"
-#include "exportpropertieswidget.h"
-#include "ui/reportpropertiewidget.h"
-#include "ui/xrefpropertieswidget.h"
-#include "qetproject.h"
-#include "reportproperties.h"
-#include "qetapp.h"
-#include "nameslist.h"
-
 /**
 	@brief NewDiagramPage::NewDiagramPage
 	Default constructor

sources/configpages.h

@@ -17,11 +17,12 @@
 */
 #ifndef CONFIG_PAGES_H
 #define CONFIG_PAGES_H
-#include <QtWidgets>
-#include <QDialog>
 #include "configpage.h"
-#include "projectpropertiesdialog.h"
+#include "ui/projectpropertiesdialog.h"
-#include "titleblockpropertieswidget.h"
+#include "ui/titleblockpropertieswidget.h"
+
+#include <QDialog>
+#include <QtWidgets>
 class BorderPropertiesWidget;
 class ConductorPropertiesWidget;
 class TitleBlockPropertiesWidget;

sources/dataBase/projectdatabase.cpp

@@ -16,16 +16,17 @@
 		along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "projectdatabase.h"
-#include "qetapp.h"
-#include "qetproject.h"
-#include "elementprovider.h"
-#include "element.h"
-#include "diagram.h"
-#include "diagramposition.h"
-#include "qetinformation.h"
 
-#include <QSqlError>
+#include "../diagram.h"
+#include "../diagramposition.h"
+#include "../elementprovider.h"
+#include "../qetapp.h"
+#include "../qetgraphicsitem/element.h"
+#include "../qetinformation.h"
+#include "../qetproject.h"
+
 #include <QLocale>
+#include <QSqlError>
 
 #if defined(Q_OS_LINUX) || defined(Q_OS_WINDOWS)
 #include <QSqlDriver>

sources/diagram.cpp

@@ -15,32 +15,34 @@
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <math.h>
-#include <cassert>
-#include "qetgraphicsitem/conductor.h"
-#include "qetgraphicsitem/conductortextitem.h"
-#include "factory/elementfactory.h"
 #include "diagram.h"
+
+#include "ElementsCollection/elementcollectionhandler.h"
+#include "QPropertyUndoCommand/qpropertyundocommand.h"
 #include "diagramcommands.h"
 #include "diagramcontent.h"
+#include "diagramevent/diagrameventinterface.h"
 #include "diagramposition.h"
-#include "exportdialog.h"
-#include "qetgraphicsitem/independenttextitem.h"
-#include "qetgraphicsitem/diagramimageitem.h"
-#include "qetgraphicsitem/qetshapeitem.h"
-#include "terminal.h"
-#include "diagrameventinterface.h"
-#include "qetapp.h"
-#include "elementcollectionhandler.h"
-#include "element.h"
 #include "diagramview.h"
-#include "dynamicelementtextitem.h"
-#include "elementtextitemgroup.h"
-#include "undocommand/addelementtextcommand.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
-#include "qetgraphicstableitem.h"
-#include "qetxml.h"
 #include "elementprovider.h"
+#include "exportdialog.h"
+#include "factory/elementfactory.h"
+#include "qetapp.h"
+#include "qetgraphicsitem/ViewItem/qetgraphicstableitem.h"
+#include "qetgraphicsitem/conductor.h"
+#include "qetgraphicsitem/conductortextitem.h"
+#include "qetgraphicsitem/diagramimageitem.h"
+#include "qetgraphicsitem/dynamicelementtextitem.h"
+#include "qetgraphicsitem/element.h"
+#include "qetgraphicsitem/elementtextitemgroup.h"
+#include "qetgraphicsitem/independenttextitem.h"
+#include "qetgraphicsitem/qetshapeitem.h"
+#include "qetgraphicsitem/terminal.h"
+#include "qetxml.h"
+#include "undocommand/addelementtextcommand.h"
+
+#include <cassert>
+#include <math.h>
 
 int Diagram::xGrid  = 10;
 int Diagram::yGrid  = 10;

sources/diagram.h

@@ -17,20 +17,20 @@
 */
 #ifndef DIAGRAM_H
 #define DIAGRAM_H
-#include <QtWidgets>
+#include "autoNum/numerotationcontext.h"
-#include <QtXml>
-#include <QHash>
-#include <QUuid>
-
 #include "bordertitleblock.h"
 #include "conductorproperties.h"
-#include "exportproperties.h"
-#include "qgimanager.h"
-#include "numerotationcontext.h"
-#include "qetproject.h"
-#include "properties/xrefproperties.h"
 #include "elementsmover.h"
 #include "elementtextsmover.h"
+#include "exportproperties.h"
+#include "properties/xrefproperties.h"
+#include "qetproject.h"
+#include "qgimanager.h"
+
+#include <QHash>
+#include <QUuid>
+#include <QtWidgets>
+#include <QtXml>
 
 class Conductor;
 class CustomElement;

sources/diagramcommands.cpp

@@ -16,16 +16,17 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "diagramcommands.h"
-#include "qetgraphicsitem/element.h"
+
+#include "diagram.h"
 #include "qetgraphicsitem/conductor.h"
 #include "qetgraphicsitem/conductortextitem.h"
-#include "diagram.h"
+#include "qetgraphicsitem/diagramimageitem.h"
+#include "qetgraphicsitem/diagramtextitem.h"
+#include "qetgraphicsitem/element.h"
+#include "qetgraphicsitem/elementtextitemgroup.h"
 #include "qetgraphicsitem/independenttextitem.h"
 #include "qgimanager.h"
-#include "diagram.h"
+
-#include "qetgraphicsitem/diagramtextitem.h"
-#include "qetgraphicsitem/diagramimageitem.h"
-#include "elementtextitemgroup.h"
 #include <QPropertyAnimation>
 
 QString itemText(const QetGraphicsItem *item) {

sources/diagramcontent.cpp

@@ -16,18 +16,20 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "diagramcontent.h"
-#include <QGraphicsItem>
+
-#include "element.h"
-#include "independenttextitem.h"
-#include "conductor.h"
-#include "diagramimageitem.h"
-#include "qetshapeitem.h"
-#include "dynamicelementtextitem.h"
-#include "elementtextitemgroup.h"
 #include "diagram.h"
-#include "terminal.h"
+#include "qetgraphicsitem/ViewItem/qetgraphicstableitem.h"
-#include "conductortextitem.h"
+#include "qetgraphicsitem/conductor.h"
-#include "qetgraphicstableitem.h"
+#include "qetgraphicsitem/conductortextitem.h"
+#include "qetgraphicsitem/diagramimageitem.h"
+#include "qetgraphicsitem/dynamicelementtextitem.h"
+#include "qetgraphicsitem/element.h"
+#include "qetgraphicsitem/elementtextitemgroup.h"
+#include "qetgraphicsitem/independenttextitem.h"
+#include "qetgraphicsitem/qetshapeitem.h"
+#include "qetgraphicsitem/terminal.h"
+
+#include <QGraphicsItem>
 
 /**
 	@brief DiagramContent::DiagramContent

sources/diagramcontext.h

@@ -17,18 +17,19 @@
 */
 #ifndef DIAGRAM_CONTEXT_H
 #define DIAGRAM_CONTEXT_H
+#include "pugixml/pugixml.hpp"
+
 #include <QDomElement>
 #include <QHash>
 #include <QSettings>
 #include <QString>
-#include <QVariant>
 #include <QStringList>
-
+#include <QVariant>
-#include "pugixml.hpp"
 /**
 	This class represents a diagram context, i.e. the data (a list of key/value
-	pairs) of a diagram at a given time. It is notably used by titleblock templates
+	pairs) of a diagram at a given time. It is notably used by titleblock
-	to fetch the informations they need to do their rendering, or element for retrieve information about itself
+   templates to fetch the informations they need to do their rendering, or
+   element for retrieve information about itself
 */
 
 /**

sources/diagramevent/diagrameventaddelement.cpp

@@ -16,12 +16,12 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "diagrameventaddelement.h"
-#include "elementfactory.h"
-#include "diagram.h"
-#include "element.h"
-#include "diagramcommands.h"
-#include "conductorautonumerotation.h"
 
+#include "../conductorautonumerotation.h"
+#include "../diagram.h"
+#include "../diagramcommands.h"
+#include "../qetgraphicsitem/element.h"
+#include "elementfactory.h"
 
 /**
 	@brief DiagramEventAddElement::DiagramEventAddElement

sources/diagramevent/diagrameventaddelement.h

@@ -18,8 +18,8 @@
 #ifndef DIAGRAMEVENTADDELEMENT_H
 #define DIAGRAMEVENTADDELEMENT_H
 
+#include "../ElementsCollection/elementslocation.h"
 #include "diagrameventinterface.h"
-#include "elementslocation.h"
 
 class Element;
 

sources/diagramevent/diagrameventaddimage.cpp

@@ -17,9 +17,10 @@
 */
 
 #include "diagrameventaddimage.h"
-#include "diagram.h"
+
-#include "diagramimageitem.h"
+#include "../diagram.h"
-#include "diagramcommands.h"
+#include "../diagramcommands.h"
+#include "../diagramimageitem.h"
 
 /**
 	@brief DiagramEventAddImage::DiagramEventAddImage

sources/diagramevent/diagrameventaddshape.cpp

@@ -16,8 +16,9 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "diagrameventaddshape.h"
-#include "diagram.h"
+
-#include "diagramcommands.h"
+#include "../diagram.h"
+#include "../diagramcommands.h"
 
 /**
 	@brief DiagramEventAddShape::DiagramEventAddShape

sources/diagramevent/diagrameventaddtext.cpp

@@ -17,9 +17,10 @@
 */
 
 #include "diagrameventaddtext.h"
-#include "independenttextitem.h"
+
-#include "diagramcommands.h"
+#include "../diagram.h"
-#include "diagram.h"
+#include "../diagramcommands.h"
+#include "../independenttextitem.h"
 
 /**
 	@brief DiagramEventAddText::DiagramEventAddText

sources/diagramevent/diagrameventinterface.cpp

@@ -16,11 +16,12 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "diagrameventinterface.h"
-#include "diagram.h"
+
+#include "../diagram.h"
+
 #include <QGraphicsSceneMouseEvent>
 #include <QKeyEvent>
 
-
 DiagramEventInterface::DiagramEventInterface(Diagram *diagram) :
 	m_diagram(diagram),
 	m_running(false),

sources/diagramview.cpp

@@ -16,23 +16,22 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "diagramview.h"
-#include "diagramcommands.h"
 
+#include "QPropertyUndoCommand/qpropertyundocommand.h"
+#include "diagramcommands.h"
+#include "diagramevent/diagrameventaddelement.h"
+#include "dvevent/dveventinterface.h"
+#include "projectview.h"
+#include "qetdiagrameditor.h"
+#include "qetgraphicsitem/conductor.h"
 #include "qetgraphicsitem/conductortextitem.h"
 #include "qetgraphicsitem/independenttextitem.h"
-#include "qetgraphicsitem/conductor.h"
-
-#include "projectview.h"
-#include "integrationmovetemplateshandler.h"
-#include "qetdiagrameditor.h"
 #include "qeticons.h"
-#include "diagrampropertiesdialog.h"
+#include "titleblock/integrationmovetemplateshandler.h"
-#include "dveventinterface.h"
+#include "ui/diagrampropertiesdialog.h"
-#include "diagrameventaddelement.h"
+#include "ui/multipastedialog.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
+#include "undocommand/changetitleblockcommand.h"
-#include "multipastedialog.h"
+#include "utils/conductorcreator.h"
-#include "changetitleblockcommand.h"
-#include "conductorcreator.h"
 
 #include <QDropEvent>
 

sources/diagramview.h

@@ -18,10 +18,11 @@
 #ifndef DIAGRAMVIEW_H
 #define DIAGRAMVIEW_H
 
-#include <QGraphicsView>
+#include "ElementsCollection/elementslocation.h"
+#include "titleblock/templatelocation.h"
+
 #include <QClipboard>
-#include "elementslocation.h"
+#include <QGraphicsView>
-#include "templatelocation.h"
 
 class Conductor;
 class Diagram;

sources/editor/elementscene.cpp

@@ -16,28 +16,29 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementscene.h"
-#include "qetelementeditor.h"
+
-#include "elementprimitivedecorator.h"
+#include "../NameList/ui/namelistdialog.h"
-#include <cmath>
+#include "../NameList/ui/namelistwidget.h"
-#include "partline.h"
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
-#include "partrectangle.h"
+#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h"
-#include "partellipse.h"
-#include "partpolygon.h"
-#include "partterminal.h"
-#include "parttext.h"
-#include "partarc.h"
 #include "editorcommands.h"
 #include "elementcontent.h"
-#include "ui/elementpropertieseditorwidget.h"
+#include "elementprimitivedecorator.h"
 #include "eseventinterface.h"
-#include "QetGraphicsItemModeler/qetgraphicshandleritem.h"
+#include "partarc.h"
 #include "partdynamictextfield.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
+#include "partellipse.h"
-#include "namelistdialog.h"
+#include "partline.h"
-#include "namelistwidget.h"
+#include "partpolygon.h"
+#include "partrectangle.h"
+#include "partterminal.h"
+#include "parttext.h"
+#include "qetelementeditor.h"
+#include "ui/elementpropertieseditorwidget.h"
 
-#include <algorithm>
 #include <QKeyEvent>
+#include <algorithm>
+#include <cmath>
 
 /**
 	@brief ElementScene::ElementScene

sources/editor/elementscene.h

@@ -17,12 +17,13 @@
 */
 #ifndef ELEMENT_SCENE_H
 #define ELEMENT_SCENE_H
+#include "../NameList/nameslist.h"
+#include "../diagramcontext.h"
+#include "../qgimanager.h"
+#include "elementcontent.h"
+
 #include <QtWidgets>
 #include <QtXml>
-#include "qgimanager.h"
-#include "elementcontent.h"
-#include "diagramcontext.h"
-#include "nameslist.h"
 
 class CustomElementPart;
 class ElementEditionCommand;

sources/editor/graphicspart/partdynamictextfield.h

@@ -18,9 +18,9 @@
 #ifndef PARTDYNAMICTEXTFIELD_H
 #define PARTDYNAMICTEXTFIELD_H
 
-#include "customelementpart.h"
+#include "../../qetgraphicsitem/dynamicelementtextitem.h"
 #include "QGraphicsTextItem"
-#include "dynamicelementtextitem.h"
+#include "customelementpart.h"
 
 /**
 	@brief The PartDynamicTextField class

sources/editor/graphicspart/partterminal.cpp

@@ -16,7 +16,8 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "partterminal.h"
-#include "terminal.h"
+
+#include "../qetgraphicsitem/terminal.h"
 
 /**
 	@brief PartTerminal::PartTerminal

sources/editor/qetelementeditor.h

@@ -17,11 +17,10 @@
 */
 #ifndef CUSTOM_ELEMENT_EDITOR_H
 #define CUSTOM_ELEMENT_EDITOR_H
-#include "qetmainwindow.h"
+#include "../ElementsCollection/elementslocation.h"
-#include "qet.h"
+#include "../qet.h"
+#include "../qetmainwindow.h"
 #include "elementscene.h"
-#include "elementslocation.h"
-
 
 class ElementItemEditor;
 class ElementView;

sources/elementdialog.cpp

@@ -15,19 +15,20 @@
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QTreeView>
-#include <QDialogButtonBox>
-#include <QPushButton>
-#include <QtConcurrent>
-
 #include "elementdialog.h"
+
+#include "ElementsCollection/elementcollectionitem.h"
+#include "ElementsCollection/elementscollectionmodel.h"
 #include "qetapp.h"
-#include "qfilenameedit.h"
-#include "elementcollectionitem.h"
-#include "elementscollectionmodel.h"
 #include "qetmessagebox.h"
+#include "qfilenameedit.h"
+
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QPushButton>
+#include <QTreeView>
+#include <QVBoxLayout>
+#include <QtConcurrent>
 
 /**
 	@brief ElementDialog::ElementDialog

sources/elementdialog.h

@@ -18,8 +18,9 @@
 #ifndef ELEMENT_DIALOG_H
 #define ELEMENT_DIALOG_H
 
+#include "ElementsCollection/elementslocation.h"
+
 #include <QDialog>
-#include "elementslocation.h"
 
 class QDialogButtonBox;
 class QFileNameEdit;

sources/elementprovider.cpp

@@ -16,10 +16,12 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementprovider.h"
-#include "qetproject.h"
+
 #include "diagram.h"
+#include "qetgraphicsitem/ViewItem/qetgraphicstableitem.h"
 #include "qetgraphicsitem/element.h"
-#include "qetgraphicstableitem.h"
+#include "qetproject.h"
+
 #include <QAbstractItemModel>
 
 /**

sources/elementscategoryeditor.cpp

@@ -16,16 +16,17 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementscategoryeditor.h"
+
+#include "ElementsCollection/elementcollectionhandler.h"
+#include "NameList/ui/namelistwidget.h"
 #include "qet.h"
-#include "qfilenameedit.h"
 #include "qetmessagebox.h"
-#include "elementcollectionhandler.h"
+#include "qfilenameedit.h"
-#include "namelistwidget.h"
 
 #include <QDialogButtonBox>
-#include <QVBoxLayout>
-#include <QLabel>
 #include <QHBoxLayout>
+#include <QLabel>
+#include <QVBoxLayout>
 
 /**
 	@brief ElementsCategoryEditor::ElementsCategoryEditor

sources/elementscategoryeditor.h

@@ -18,8 +18,9 @@
 #ifndef ELEMENTS_CATEGORY_EDITOR_H
 #define ELEMENTS_CATEGORY_EDITOR_H
 
+#include "ElementsCollection/elementslocation.h"
+
 #include <QDialog>
-#include "elementslocation.h"
 
 class NameListWidget;
 class QFileNameEdit;

sources/elementscollectioncache.cpp

@@ -16,13 +16,14 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementscollectioncache.h"
+
 #include "factory/elementfactory.h"
-#include "element.h"
 #include "qet.h"
+#include "qetgraphicsitem/element.h"
 
 #include <QImageWriter>
-#include <QSqlQuery>
 #include <QSqlError>
+#include <QSqlQuery>
 
 /**
 	Construct a cache for elements collections.

sources/elementscollectioncache.h

@@ -18,8 +18,9 @@
 #ifndef ELEMENTS_COLLECTION_CACHE_H
 #define ELEMENTS_COLLECTION_CACHE_H
 
+#include "ElementsCollection/elementslocation.h"
+
 #include <QSqlDatabase>
-#include "elementslocation.h"
 
 /**
 	This class implements a SQLite cache for data related to elements

sources/elementsmover.cpp

@@ -16,16 +16,17 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementsmover.h"
-#include "conductor.h"
+
-#include "conductortextitem.h"
+#include "conductorautonumerotation.h"
 #include "diagram.h"
 #include "diagramcommands.h"
-#include "element.h"
+#include "qetgraphicsitem/conductor.h"
-#include "independenttextitem.h"
+#include "qetgraphicsitem/conductortextitem.h"
-#include "diagramimageitem.h"
+#include "qetgraphicsitem/diagramimageitem.h"
-#include "conductorautonumerotation.h"
+#include "qetgraphicsitem/dynamicelementtextitem.h"
-#include "dynamicelementtextitem.h"
+#include "qetgraphicsitem/element.h"
-#include "elementtextitemgroup.h"
+#include "qetgraphicsitem/elementtextitemgroup.h"
+#include "qetgraphicsitem/independenttextitem.h"
 
 /**
 	@brief ElementsMover::ElementsMover Constructor

sources/elementspanel.cpp

@@ -16,11 +16,12 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementspanel.h"
-#include "qetapp.h"
+
-#include "qetproject.h"
 #include "diagram.h"
+#include "qetapp.h"
 #include "qeticons.h"
-#include "templatescollection.h"
+#include "qetproject.h"
+#include "titleblock/templatescollection.h"
 
 /*
 	Lorsque le flag ENABLE_PANEL_DND_CHECKS est defini, le panel d'elements

sources/elementspanel.h

@@ -19,7 +19,7 @@
 #define PANELAPPAREILS_H
 
 #include "genericpanel.h"
-#include "templatelocation.h"
+#include "titleblock/templatelocation.h"
 
 class QETProject;
 class Diagram;

sources/elementspanelwidget.cpp

@@ -16,13 +16,14 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementspanelwidget.h"
-#include "qetelementeditor.h"
+
+#include "diagram.h"
+#include "editor/qetelementeditor.h"
 #include "elementscategoryeditor.h"
 #include "qetapp.h"
-#include "qetproject.h"
-#include "diagram.h"
 #include "qeticons.h"
-#include "templatedeleter.h"
+#include "qetproject.h"
+#include "titleblock/templatedeleter.h"
 
 /*
 	When the ENABLE_PANEL_WIDGET_DND_CHECKS flag is set, the panel

sources/elementtextpattern.cpp

@@ -16,22 +16,23 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementtextpattern.h"
-#include "qetapp.h"
+
-#include "element.h"
-#include "qet.h"
-#include "dynamicelementtextitem.h"
-#include "elementtextitemgroup.h"
-#include "addelementtextcommand.h"
 #include "diagram.h"
-#include "importelementtextpatterndialog.h"
+#include "qet.h"
-#include "deleteqgraphicsitemcommand.h"
+#include "qetapp.h"
+#include "qetgraphicsitem/dynamicelementtextitem.h"
+#include "qetgraphicsitem/element.h"
+#include "qetgraphicsitem/elementtextitemgroup.h"
+#include "ui/importelementtextpatterndialog.h"
+#include "undocommand/addelementtextcommand.h"
+#include "undocommand/deleteqgraphicsitemcommand.h"
 
 #include <QDir>
-#include <QInputDialog>
 #include <QGraphicsScene>
+#include <QGraphicsView>
+#include <QInputDialog>
 #include <QMessageBox>
 #include <QObject>
-#include <QGraphicsView>
 #include <QStringList>
 
 /**

sources/elementtextsmover.cpp

@@ -16,10 +16,12 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementtextsmover.h"
-#include "diagram.h"
+
 #include "QPropertyUndoCommand/qpropertyundocommand.h"
-#include "dynamicelementtextitem.h"
+#include "diagram.h"
-#include "elementtextitemgroup.h"
+#include "qetgraphicsitem/dynamicelementtextitem.h"
+#include "qetgraphicsitem/elementtextitemgroup.h"
+
 #include <QObject>
 
 /**

sources/exportdialog.cpp

@@ -16,28 +16,29 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "exportdialog.h"
-#include <QSvgGenerator>
+
-#include <cmath>
+#include "conductorsegment.h"
-#include <QtXml>
+#include "createdxf.h"
-#include <utility>
+#include "exportpropertieswidget.h"
+#include "factory/elementpicturefactory.h"
+#include "qetgraphicsitem/ViewItem/qetgraphicstableitem.h"
+#include "qetgraphicsitem/conductor.h"
+#include "qetgraphicsitem/conductortextitem.h"
+#include "qetgraphicsitem/diagramimageitem.h"
+#include "qetgraphicsitem/diagramtextitem.h"
+#include "qetgraphicsitem/dynamicelementtextitem.h"
+#include "qetgraphicsitem/element.h"
+#include "qetgraphicsitem/independenttextitem.h"
+#include "qetgraphicsitem/qetshapeitem.h"
+#include "qetgraphicsitem/terminal.h"
 #include "qeticons.h"
 #include "qetmessagebox.h"
-#include "exportpropertieswidget.h"
-#include "createdxf.h"
-#include "conductorsegment.h"
-#include "qetgraphicsitem/conductor.h"
-#include "qetgraphicsitem/diagramtextitem.h"
-#include "qetgraphicsitem/conductortextitem.h"
-#include "qetgraphicsitem/independenttextitem.h"
-#include "qetgraphicsitem/diagramimageitem.h"
-#include "qetgraphicsitem/qetshapeitem.h"
-#include "qetgraphicsitem/ViewItem/qetgraphicstableitem.h"
-#include "elementpicturefactory.h"
-#include "element.h"
-#include "dynamicelementtextitem.h"
-#include "terminal.h"
 
 #include <QGraphicsSimpleTextItem>
+#include <QSvgGenerator>
+#include <QtXml>
+#include <cmath>
+#include <utility>
 
 /**
 	Constructeur

sources/factory/elementpicturefactory.cpp

@@ -16,19 +16,20 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementpicturefactory.h"
-#include "elementslocation.h"
+
-#include "qet.h"
+#include "../ElementsCollection/elementslocation.h"
-#include "qetapp.h"
+#include "../qet.h"
+#include "../qetapp.h"
 #include "partline.h"
 
-#include <QDomElement>
-#include <QPainter>
-#include <QTextDocument>
-#include <QPicture>
-#include <iostream>
 #include <QAbstractTextDocumentLayout>
+#include <QDomElement>
 #include <QGraphicsSimpleTextItem>
+#include <QPainter>
+#include <QPicture>
 #include <QRegularExpression>
+#include <QTextDocument>
+#include <iostream>
 
 ElementPictureFactory* ElementPictureFactory::m_factory = nullptr;
 

sources/factory/propertieseditorfactory.cpp

@@ -16,24 +16,24 @@
 		along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "propertieseditorfactory.h"
+
+#include "../PropertiesEditor/propertieseditorwidget.h"
+#include "../qetgraphicsitem/ViewItem/projectdbmodel.h"
+#include "../qetgraphicsitem/ViewItem/qetgraphicstableitem.h"
+#include "../qetgraphicsitem/diagramimageitem.h"
+#include "../qetgraphicsitem/dynamicelementtextitem.h"
+#include "../qetgraphicsitem/element.h"
+#include "../qetgraphicsitem/elementtextitemgroup.h"
+#include "../qetgraphicsitem/independenttextitem.h"
+#include "../qetgraphicsitem/qetshapeitem.h"
+#include "../ui/dynamicelementtextitemeditor.h"
+#include "../ui/elementpropertieswidget.h"
+#include "../ui/imagepropertieswidget.h"
+#include "../ui/inditextpropertieswidget.h"
+#include "../ui/shapegraphicsitempropertieswidget.h"
 #include "QGraphicsItem"
-#include "element.h"
-#include "PropertiesEditor/propertieseditorwidget.h"
-#include "elementpropertieswidget.h"
-#include "element.h"
-#include "independenttextitem.h"
-#include "inditextpropertieswidget.h"
-#include "diagramimageitem.h"
-#include "imagepropertieswidget.h"
-#include "qetshapeitem.h"
-#include "shapegraphicsitempropertieswidget.h"
-#include "dynamicelementtextitem.h"
-#include "dynamicelementtextitemeditor.h"
-#include "elementtextitemgroup.h"
-#include "qetgraphicstableitem.h"
 #include "graphicstablepropertieseditor.h"
 #include "projectdbmodelpropertieswidget.h"
-#include "projectdbmodel.h"
 
 /**
 	@brief PropertiesEditorFactory::propertiesEditor

sources/factory/qetgraphicstablefactory.cpp

@@ -16,14 +16,14 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "qetgraphicstablefactory.h"
-#include "qetgraphicstableitem.h"
+
-#include "projectdbmodel.h"
+#include "../diagram.h"
-#include "elementquerywidget.h"
+#include "../projectdbmodel.h"
-#include "diagram.h"
+#include "../qetgraphicsheaderitem.h"
-#include "qetgraphicsheaderitem.h"
+#include "../qetgraphicstableitem.h"
 #include "addtabledialog.h"
-#include "qetutils.h"
 #include "elementquerywidget.h"
+#include "qetutils.h"
 #include "summaryquerywidget.h"
 
 #include <QDialog>

sources/factory/ui/addtabledialog.cpp

@@ -16,10 +16,11 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "addtabledialog.h"
-#include "ui_addtabledialog.h"
+
-#include "elementquerywidget.h"
+#include "../../dataBase/ui/elementquerywidget.h"
+#include "../../utils/qetutils.h"
 #include "marginseditdialog.h"
-#include "qetutils.h"
+#include "ui_addtabledialog.h"
 
 #include <QFontDialog>
 

sources/genericpanel.cpp

@@ -16,13 +16,15 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "genericpanel.h"
-#include <QTreeWidgetItem>
+
-#include "qetproject.h"
 #include "diagram.h"
-#include "titleblock/templatescollection.h"
-#include "titleblock/templatelocation.h"
-#include "qeticons.h"
 #include "qetapp.h"
+#include "qeticons.h"
+#include "qetproject.h"
+#include "titleblock/templatelocation.h"
+#include "titleblock/templatescollection.h"
+
+#include <QTreeWidgetItem>
 
 /**
 	Constructor

sources/machine_info.cpp

@@ -118,7 +118,7 @@ void Machine_info::send_info_to_debug()
 		<< QLibraryInfo::path(QLibraryInfo::SettingsPath);
 #endif
 #endif
-	qInfo()<< "GitRevision " + QString(GIT_COMMIT_SHA);
+	qInfo() << "GitRevision " + QString(GIT_COMMIT_SHA);
 	qInfo()<< "QElectroTech V " + QET::displayedVersion;
 	qInfo()<< tr("Compilation : ") + pc.built.version;
 	qInfo()<< "Built with Qt " + pc.built.QT

sources/main.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 "qetapp.h"
+#include "../SingleApplication/singleapplication.h"
-#include "singleapplication.h"
-#include "qet.h"
-#include "macosxopenevent.h"
 #include "machine_info.h"
+#include "qet.h"
+#include "qetapp.h"
+#include "utils/macosxopenevent.h"
+
 #include <QStyleFactory>
 
 /**

sources/newelementwizard.cpp

@@ -16,12 +16,13 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "newelementwizard.h"
-#include "namelistwidget.h"
+
-#include "qetelementeditor.h"
+#include "ElementsCollection/elementcollectionitem.h"
-#include "qfilenameedit.h"
+#include "ElementsCollection/elementscollectionmodel.h"
+#include "NameList/ui/namelistwidget.h"
+#include "editor/qetelementeditor.h"
 #include "qetmessagebox.h"
-#include "elementscollectionmodel.h"
+#include "qfilenameedit.h"
-#include "elementcollectionitem.h"
 
 /**
 	Constructeur

sources/newelementwizard.h

@@ -18,8 +18,9 @@
 #ifndef NEW_ELEMENT_WIZARD_H
 #define NEW_ELEMENT_WIZARD_H
 
+#include "ElementsCollection/elementslocation.h"
+
 #include <QWizard>
-#include "elementslocation.h"
 
 class NameListWidget;
 class QFileNameEdit;

sources/print/projectprintwindow.cpp

@@ -16,11 +16,11 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "projectprintwindow.h"
-#include "ui_projectprintwindow.h"
 
-#include "qetproject.h"
+#include "../diagram.h"
-#include "diagram.h"
+#include "../qeticons.h"
-#include "qeticons.h"
+#include "../qetproject.h"
+#include "ui_projectprintwindow.h"
 
 #include <QPrintPreviewWidget>
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)	// ### Qt 6: remove

sources/projectconfigpages.cpp

@@ -16,22 +16,24 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "projectconfigpages.h"
+
+#include "autoNum/numerotationcontext.h"
+#include "autoNum/ui/autonumberingmanagementw.h"
+#include "autoNum/ui/folioautonumbering.h"
+#include "autoNum/ui/formulaautonumberingw.h"
+#include "autoNum/ui/selectautonumw.h"
 #include "qeticons.h"
 #include "qetproject.h"
-#include "borderpropertieswidget.h"
+#include "ui/borderpropertieswidget.h"
-#include "conductorpropertieswidget.h"
+#include "ui/conductorpropertieswidget.h"
-#include "diagramcontextwidget.h"
+#include "ui/diagramcontextwidget.h"
-#include "titleblockpropertieswidget.h"
-#include <QtWidgets>
 #include "ui/reportpropertiewidget.h"
+#include "ui/titleblockpropertieswidget.h"
 #include "ui/xrefpropertieswidget.h"
-#include "selectautonumw.h"
-#include "numerotationcontext.h"
-#include "folioautonumbering.h"
-#include "formulaautonumberingw.h"
-#include "autonumberingmanagementw.h"
 #include "ui_autonumberingmanagementw.h"
 
+#include <QtWidgets>
+
 /**
 	Constructor
 	@param project Project this page is editing.

sources/projectview.cpp

@@ -16,22 +16,23 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "projectview.h"
-#include "qetproject.h"
+
-#include "diagramview.h"
+#include "ElementsCollection/xmlelementcollection.h"
+#include "autoNum/assignvariables.h"
 #include "diagram.h"
+#include "diagramview.h"
+#include "editor/qetelementeditor.h"
 #include "exportdialog.h"
 #include "qetapp.h"
-#include "qetelementeditor.h"
-#include "borderpropertieswidget.h"
-#include "titleblockpropertieswidget.h"
-#include "conductorpropertieswidget.h"
 #include "qeticons.h"
 #include "qetmessagebox.h"
+#include "qetproject.h"
 #include "qettemplateeditor.h"
-#include "projectpropertiesdialog.h"
+#include "ui/borderpropertieswidget.h"
-#include "xmlelementcollection.h"
+#include "ui/conductorpropertieswidget.h"
-#include "autoNum/assignvariables.h"
+#include "ui/dialogwaiting.h"
-#include "dialogwaiting.h"
+#include "ui/projectpropertiesdialog.h"
+#include "ui/titleblockpropertieswidget.h"
 
 /**
 	Constructeur

sources/projectview.h

@@ -18,12 +18,12 @@
 #ifndef PROJECT_VIEW_H
 #define PROJECT_VIEW_H
 
+#include "qetresult.h"
+#include "titleblock/templatelocation.h"
+
+#include <QTabBar>
 #include <QWidget>
 #include <QtWidgets>
-#include <QTabBar>
-
-#include "templatelocation.h"
-#include "qetresult.h"
 
 #ifdef Q_OS_MACOS
 

sources/qetapp.cpp

@@ -16,24 +16,25 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "qetapp.h"
+
+#include "aboutqetdialog.h"
 #include "configdialog.h"
 #include "configpages.h"
-#include "qetdiagrameditor.h"
+#include "editor/qetelementeditor.h"
-#include "qetelementeditor.h"
 #include "elementscollectioncache.h"
-#include "titleblocktemplate.h"
+#include "factory/elementfactory.h"
-#include "qettemplateeditor.h"
+#include "factory/elementpicturefactory.h"
+#include "generalconfigurationpage.h"
+#include "projectview.h"
+#include "qetdiagrameditor.h"
+#include "qeticons.h"
+#include "qetmessagebox.h"
 #include "qetproject.h"
+#include "qettemplateeditor.h"
 #include "qtextorientationspinboxwidget.h"
 #include "recentfiles.h"
-#include "qeticons.h"
+#include "titleblock/templatescollection.h"
-#include "templatescollection.h"
+#include "titleblocktemplate.h"
-#include "generalconfigurationpage.h"
-#include "qetmessagebox.h"
-#include "projectview.h"
-#include "elementpicturefactory.h"
-#include "aboutqetdialog.h"
-#include "factory/elementfactory.h"
 
 #include <cstdlib>
 #include <iostream>

sources/qetapp.h

@@ -18,14 +18,14 @@
 #ifndef QET_APP_H
 #define QET_APP_H
 
-#include <QTranslator>
+#include "ElementsCollection/elementslocation.h"
-#include <QSystemTrayIcon>
-#include <QPalette>
-#include <QByteArray>
-
-#include "elementslocation.h"
-#include "templatelocation.h"
 #include "qetarguments.h"
+#include "titleblock/templatelocation.h"
+
+#include <QByteArray>
+#include <QPalette>
+#include <QSystemTrayIcon>
+#include <QTranslator>
 
 class QSplashScreen;
 class QMenu;

sources/qetdiagrameditor.cpp

@@ -16,34 +16,34 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "qetdiagrameditor.h"
+
+#include "QWidgetAnimation/qwidgetanimation.h"
+#include "autoNum/ui/autonumberingdockwidget.h"
+#include "conductornumexport.h"
+#include "diagramcommands.h"
+#include "diagrameventaddimage.h"
+#include "diagrameventaddshape.h"
+#include "diagrameventaddtext.h"
+#include "diagrampropertieseditordockwidget.h"
 #include "diagramview.h"
+#include "dialogwaiting.h"
+#include "elementscollectionwidget.h"
 #include "elementspanelwidget.h"
-#include "recentfiles.h"
+#include "factory/qetgraphicstablefactory.h"
+#include "projectprintwindow.h"
+#include "qetgraphicsitem/ViewItem/qetgraphicstableitem.h"
+#include "qetgraphicsitem/conductortextitem.h"
+#include "qetgraphicsitem/dynamicelementtextitem.h"
 #include "qeticons.h"
 #include "qetmessagebox.h"
-#include "diagrampropertieseditordockwidget.h"
+#include "recentfiles.h"
-#include "diagrameventaddshape.h"
+#include "ui/bomexportdialog.h"
-#include "diagrameventaddimage.h"
+#include "undocommand/addelementtextcommand.h"
-#include "diagrameventaddtext.h"
-#include "elementscollectionwidget.h"
-#include "autonumberingdockwidget.h"
-#include "dynamicelementtextitem.h"
-#include "conductortextitem.h"
 #include "undocommand/rotateselectioncommand.h"
-#include "rotatetextscommand.h"
+#include "undocommand/rotatetextscommand.h"
-#include "diagramcommands.h"
-#include "dialogwaiting.h"
-#include "addelementtextcommand.h"
-#include "conductornumexport.h"
-#include "qetgraphicstableitem.h"
-#include "bomexportdialog.h"
-#include "QWidgetAnimation/qwidgetanimation.h"
-#include "qetgraphicstablefactory.h"
-#include "projectprintwindow.h"
 
 #include <KAutoSaveFile>
 
-
 /**
 	@brief QETDiagramEditor::QETDiagramEditor
 	Constructor

sources/qetdiagrameditor.h

@@ -18,15 +18,15 @@
 #ifndef QET_DIAGRAM_EDITOR_H
 #define QET_DIAGRAM_EDITOR_H
 
+#include "SearchAndReplace/ui/searchandreplacewidget.h"
+#include "qetmainwindow.h"
+
 #include <QActionGroup>
+#include <QDir>
 #include <QMdiArea>
 #include <QSignalMapper>
-#include <QDir>
 #include <QUndoGroup>
 
-#include "qetmainwindow.h"
-#include "searchandreplacewidget.h"
-
 class QMdiSubWindow;
 class QETProject;
 class QETResult;

sources/qetgraphicsitem/ViewItem/projectdbmodel.cpp

@@ -16,11 +16,12 @@
 				along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "projectdbmodel.h"
+
+#include "../../qetapp.h"
+#include "../../qetinformation.h"
+#include "../../qetproject.h"
+#include "../../qetxml.h"
 #include "projectdatabase.h"
-#include "qetproject.h"
-#include "qetxml.h"
-#include "qetapp.h"
-#include "qetinformation.h"
 
 #include <QSqlError>
 #include <QSqlRecord>

sources/qetgraphicsitem/ViewItem/qetgraphicsheaderitem.cpp

@@ -16,10 +16,11 @@
 	along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
 */
 #include "qetgraphicsheaderitem.h"
+
+#include "../../createdxf.h"
+#include "../../qetxml.h"
+#include "../../utils/qetutils.h"
 #include "qabstractitemmodel.h"
-#include "qetxml.h"
-#include "qetutils.h"
-#include "createdxf.h"
 
 #include <QFontMetrics>
 #include <QPainter>

sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp

@@ -16,20 +16,21 @@
 	along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
 */
 #include "qetgraphicstableitem.h"
-#include "diagram.h"
+
-#include "qetgraphicsheaderitem.h"
+#include "../../QPropertyUndoCommand/qpropertyundocommand.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../../diagram.h"
-#include "qetxml.h"
+#include "../../qetxml.h"
-#include "elementprovider.h"
+#include "../../utils/qetutils.h"
-#include "qetutils.h"
-#include "projectdbmodel.h"
 #include "createdxf.h"
+#include "elementprovider.h"
+#include "projectdbmodel.h"
+#include "qetgraphicsheaderitem.h"
 
 #include <QAbstractItemModel>
 #include <QFontMetrics>
-#include <QPainter>
 #include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
+#include <QPainter>
 
 static int no_model_height = 20;
 static int no_model_width = 40;

sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.h

@@ -18,11 +18,11 @@
 #ifndef QetGraphicsTableItem_H
 #define QetGraphicsTableItem_H
 
-#include <QFont>
+#include "../../QetGraphicsItemModeler/qetgraphicshandleritem.h"
+#include "../../qetapp.h"
+#include "../../qetgraphicsitem/qetgraphicsitem.h"
 
-#include "qetgraphicsitem.h"
+#include <QFont>
-#include "qetapp.h"
-#include "QetGraphicsItemModeler/qetgraphicshandleritem.h"
 
 class QAbstractItemModel;
 class QetGraphicsHeaderItem;

sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.cpp

@@ -16,15 +16,16 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "graphicstablepropertieseditor.h"
-#include "ui_graphicstablepropertieseditor.h"
+
-#include "qetgraphicstableitem.h"
+#include "../../../QPropertyUndoCommand/qpropertyundocommand.h"
-#include "qetgraphicsheaderitem.h"
+#include "../../../diagram.h"
-#include "diagram.h"
+#include "../../../elementprovider.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../../../utils/qetutils.h"
+#include "../qetgraphicsheaderitem.h"
+#include "../qetgraphicstableitem.h"
 #include "itemmodelcommand.h"
 #include "propertieseditorfactory.h"
-#include "elementprovider.h"
+#include "ui_graphicstablepropertieseditor.h"
-#include "qetutils.h"
 
 #include <QAbstractItemModel>
 #include <QFontDialog>

sources/qetgraphicsitem/ViewItem/ui/projectdbmodelpropertieswidget.cpp

@@ -16,11 +16,12 @@
 	along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
 */
 #include "projectdbmodelpropertieswidget.h"
+
+#include "../../../dataBase/ui/elementquerywidget.h"
+#include "../../../dataBase/ui/summaryquerywidget.h"
+#include "../../../qetproject.h"
+#include "../projectdbmodel.h"
 #include "ui_projectdbmodelpropertieswidget.h"
-#include "projectdbmodel.h"
-#include "qetproject.h"
-#include "elementquerywidget.h"
-#include "summaryquerywidget.h"
 
 #include <QDialogButtonBox>
 

sources/qetgraphicsitem/conductor.cpp

@@ -15,22 +15,23 @@
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <QtDebug>
+#include "../qetgraphicsitem/conductor.h"
-#include <QMultiHash>
 
-#include "conductor.h"
+#include "../autoNum/numerotationcontextcommands.h"
+#include "../diagram.h"
+#include "../qetgraphicsitem/terminal.h"
+#include "QPropertyUndoCommand/qpropertyundocommand.h"
+#include "conductorautonumerotation.h"
+#include "conductorpropertiesdialog.h"
 #include "conductorsegment.h"
 #include "conductorsegmentprofile.h"
 #include "conductortextitem.h"
-#include "element.h"
-#include "diagram.h"
 #include "diagramcommands.h"
+#include "element.h"
 #include "qetdiagrameditor.h"
-#include "terminal.h"
+
-#include "conductorautonumerotation.h"
+#include <QMultiHash>
-#include "conductorpropertiesdialog.h"
+#include <QtDebug>
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
-#include "numerotationcontextcommands.h"
 
 #define PR(x) qDebug() << #x " = " << x;
 

sources/qetgraphicsitem/conductor.h

@@ -17,10 +17,10 @@
 */
 #ifndef CONDUCTOR_H
 #define CONDUCTOR_H
+#include "../autoNum/assignvariables.h"
+#include "../conductorproperties.h"
 
-#include "conductorproperties.h"
 #include <QGraphicsPathItem>
-#include "assignvariables.h"
 
 class ConductorProfile;
 class ConductorSegmentProfile;

sources/qetgraphicsitem/conductortextitem.cpp

@@ -16,9 +16,10 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "conductortextitem.h"
-#include "conductor.h"
+
+#include "../diagram.h"
+#include "../qetgraphicsitem/conductor.h"
 #include "diagramcommands.h"
-#include "diagram.h"
 
 /**
 	Constructeur

sources/qetgraphicsitem/crossrefitem.cpp

@@ -16,14 +16,15 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "crossrefitem.h"
-#include "element.h"
+
-#include "qetapp.h"
+#include "../autoNum/assignvariables.h"
-#include "diagramposition.h"
+#include "../diagram.h"
-#include "diagram.h"
+#include "../diagramposition.h"
-#include "qgraphicsitemutility.h"
+#include "../qetapp.h"
-#include "assignvariables.h"
 #include "dynamicelementtextitem.h"
+#include "element.h"
 #include "elementtextitemgroup.h"
+#include "qgraphicsitemutility.h"
 
 //define the height of the header.
 static int header = 5;

sources/qetgraphicsitem/diagramimageitem.cpp

@@ -16,8 +16,9 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "diagramimageitem.h"
-#include "diagram.h"
+
-#include "PropertiesEditor/propertieseditordialog.h"
+#include "../PropertiesEditor/propertieseditordialog.h"
+#include "../diagram.h"
 #include "imagepropertieswidget.h"
 
 /**

sources/qetgraphicsitem/diagramtextitem.cpp

@@ -16,10 +16,11 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "diagramtextitem.h"
-#include "diagramcommands.h"
+
-#include "qetapp.h"
+#include "../diagram.h"
-#include "richtext/richtexteditor_p.h"
+#include "../diagramcommands.h"
-#include "diagram.h"
+#include "../qetapp.h"
+#include "../richtext/richtexteditor_p.h"
 
 /**
 	@brief DiagramTextItem::DiagramTextItem

sources/qetgraphicsitem/dynamicelementtextitem.cpp

@@ -16,15 +16,16 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "dynamicelementtextitem.h"
-#include "element.h"
+
-#include "qetapp.h"
+#include "../QPropertyUndoCommand/qpropertyundocommand.h"
-#include "diagram.h"
+#include "../diagram.h"
-#include "QPropertyUndoCommand/qpropertyundocommand.h"
+#include "../qetapp.h"
-#include "terminal.h"
+#include "../qetgraphicsitem/conductor.h"
-#include "conductor.h"
+#include "../qetgraphicsitem/terminal.h"
-#include "elementtextitemgroup.h"
+#include "../qetinformation.h"
 #include "crossrefitem.h"
-#include "qetinformation.h"
+#include "element.h"
+#include "elementtextitemgroup.h"
 
 #include <QDomDocument>
 #include <QDomElement>