From 10c4c3d52816d3440ca2397c2de70e7a37a154d8 Mon Sep 17 00:00:00 2001 From: Simon De Backer Date: Tue, 8 Dec 2020 19:57:35 +0100 Subject: [PATCH] Wip Fix preprocessor on Cmake --- CMakeLists.txt | 13 +++--- .../elementcollectionhandler.h | 2 +- .../elementscollectionmodel.cpp | 9 ++-- .../elementscollectionwidget.cpp | 35 +++++++-------- sources/ElementsCollection/elementslocation.h | 9 ++-- .../ElementsCollection/elementstreeview.cpp | 5 ++- .../xmlelementcollection.cpp | 7 +-- sources/NameList/nameslist.cpp | 3 +- sources/NameList/nameslist.h | 3 +- sources/NameList/ui/namelistwidget.h | 6 +-- .../searchandreplaceworker.cpp | 18 ++++---- .../SearchAndReplace/searchandreplaceworker.h | 6 +-- .../ui/replaceconductordialog.h | 2 +- .../ui/replaceelementdialog.h | 3 +- .../SearchAndReplace/ui/replacefoliowidget.h | 8 ++-- .../ui/searchandreplacewidget.cpp | 31 ++++++------- .../ui/searchandreplacewidget.h | 12 +++--- sources/autoNum/assignvariables.cpp | 13 +++--- sources/autoNum/assignvariables.h | 11 +++-- sources/autoNum/numerotationcontext.cpp | 5 ++- .../autoNum/numerotationcontextcommands.cpp | 3 +- .../autoNum/ui/autonumberingdockwidget.cpp | 13 +++--- sources/autoNum/ui/autonumberingdockwidget.h | 5 ++- .../autoNum/ui/autonumberingmanagementw.cpp | 16 ++++--- sources/autoNum/ui/folioautonumbering.cpp | 6 ++- sources/autoNum/ui/folioautonumbering.h | 3 +- sources/autoNum/ui/numparteditorw.h | 5 ++- sources/autoNum/ui/selectautonumw.cpp | 15 ++++--- sources/autoNum/ui/selectautonumw.h | 5 ++- sources/bordertitleblock.cpp | 19 ++++---- sources/bordertitleblock.h | 7 +-- sources/conductorautonumerotation.cpp | 13 +++--- sources/conductorautonumerotation.h | 3 +- sources/conductornumexport.cpp | 9 ++-- sources/conductorprofile.cpp | 5 ++- sources/configpages.cpp | 31 ++++++------- sources/configpages.h | 9 ++-- sources/dataBase/projectdatabase.cpp | 17 ++++---- sources/diagram.cpp | 42 +++++++++--------- sources/diagram.h | 20 ++++----- sources/diagramcommands.cpp | 13 +++--- sources/diagramcontent.cpp | 24 ++++++----- sources/diagramcontext.h | 17 ++++---- .../diagramevent/diagrameventaddelement.cpp | 10 ++--- sources/diagramevent/diagrameventaddelement.h | 2 +- sources/diagramevent/diagrameventaddimage.cpp | 7 +-- sources/diagramevent/diagrameventaddshape.cpp | 5 ++- sources/diagramevent/diagrameventaddtext.cpp | 7 +-- .../diagramevent/diagrameventinterface.cpp | 5 ++- sources/diagramview.cpp | 25 ++++++----- sources/diagramview.h | 7 +-- sources/editor/elementscene.cpp | 33 +++++++------- sources/editor/elementscene.h | 9 ++-- .../graphicspart/partdynamictextfield.h | 4 +- sources/editor/graphicspart/partterminal.cpp | 3 +- sources/editor/qetelementeditor.h | 7 ++- sources/elementdialog.cpp | 21 ++++----- sources/elementdialog.h | 3 +- sources/elementprovider.cpp | 6 ++- sources/elementscategoryeditor.cpp | 11 ++--- sources/elementscategoryeditor.h | 3 +- sources/elementscollectioncache.cpp | 5 ++- sources/elementscollectioncache.h | 3 +- sources/elementsmover.cpp | 17 ++++---- sources/elementspanel.cpp | 7 +-- sources/elementspanel.h | 2 +- sources/elementspanelwidget.cpp | 9 ++-- sources/elementtextpattern.cpp | 21 ++++----- sources/elementtextsmover.cpp | 8 ++-- sources/exportdialog.cpp | 43 ++++++++++--------- sources/factory/elementpicturefactory.cpp | 17 ++++---- sources/factory/propertieseditorfactory.cpp | 30 ++++++------- sources/factory/qetgraphicstablefactory.cpp | 12 +++--- sources/factory/ui/addtabledialog.cpp | 7 +-- sources/genericpanel.cpp | 12 +++--- sources/machine_info.cpp | 2 +- sources/main.cpp | 9 ++-- sources/newelementwizard.cpp | 11 ++--- sources/newelementwizard.h | 3 +- sources/print/projectprintwindow.cpp | 8 ++-- sources/projectconfigpages.cpp | 22 +++++----- sources/projectview.cpp | 21 ++++----- sources/projectview.h | 8 ++-- sources/qetapp.cpp | 25 +++++------ sources/qetapp.h | 14 +++--- sources/qetdiagrameditor.cpp | 40 ++++++++--------- sources/qetdiagrameditor.h | 8 ++-- .../ViewItem/projectdbmodel.cpp | 9 ++-- .../ViewItem/qetgraphicsheaderitem.cpp | 7 +-- .../ViewItem/qetgraphicstableitem.cpp | 17 ++++---- .../ViewItem/qetgraphicstableitem.h | 8 ++-- .../ui/graphicstablepropertieseditor.cpp | 15 ++++--- .../ui/projectdbmodelpropertieswidget.cpp | 9 ++-- sources/qetgraphicsitem/conductor.cpp | 21 ++++----- sources/qetgraphicsitem/conductor.h | 4 +- sources/qetgraphicsitem/conductortextitem.cpp | 5 ++- sources/qetgraphicsitem/crossrefitem.cpp | 13 +++--- sources/qetgraphicsitem/diagramimageitem.cpp | 5 ++- sources/qetgraphicsitem/diagramtextitem.cpp | 9 ++-- .../dynamicelementtextitem.cpp | 17 ++++---- .../qetgraphicsitem/dynamicelementtextitem.h | 5 ++- sources/qetgraphicsitem/element.cpp | 30 +++++++------ sources/qetgraphicsitem/element.h | 18 ++++---- .../qetgraphicsitem/elementtextitemgroup.cpp | 13 +++--- .../qetgraphicsitem/independenttextitem.cpp | 9 ++-- sources/qetgraphicsitem/masterelement.cpp | 4 +- sources/qetgraphicsitem/qetgraphicsitem.cpp | 3 +- sources/qetgraphicsitem/qetgraphicsitem.h | 3 +- sources/qetgraphicsitem/qetshapeitem.cpp | 21 ++++----- sources/qetgraphicsitem/qetshapeitem.h | 5 ++- .../qetgraphicsitem/qgraphicsitemutility.cpp | 6 ++- sources/qetgraphicsitem/reportelement.cpp | 11 ++--- sources/qetgraphicsitem/simpleelement.cpp | 3 +- sources/qetgraphicsitem/slaveelement.cpp | 7 +-- sources/qetgraphicsitem/terminal.cpp | 15 ++++--- sources/qetgraphicsitem/terminal.h | 3 +- sources/qetproject.cpp | 26 +++++------ sources/qetproject.h | 18 ++++---- sources/qetxml.cpp | 5 ++- sources/titleblock/dimension.h | 2 +- sources/titleblock/movetemplateshandler.h | 5 ++- sources/titleblock/qettemplateeditor.h | 9 ++-- sources/titleblock/templatecellwidget.cpp | 15 ++++--- sources/titleblock/templatelocation.cpp | 3 +- .../titleblock/templatelocationchooser.cpp | 5 ++- sources/titleblock/templatelocationsaver.cpp | 5 ++- sources/titleblock/templatescollection.cpp | 7 +-- sources/titleblock/templatescollection.h | 5 ++- sources/titleblock/templatevisualcell.cpp | 3 +- sources/titleblockcell.h | 2 +- sources/titleblocktemplate.cpp | 5 ++- sources/titleblocktemplate.h | 9 ++-- sources/ui/alignmenttextdialog.cpp | 3 +- sources/ui/bomexportdialog.cpp | 10 ++--- sources/ui/borderpropertieswidget.cpp | 3 +- sources/ui/borderpropertieswidget.h | 3 +- sources/ui/compositetexteditdialog.cpp | 13 +++--- sources/ui/conductorpropertiesdialog.cpp | 9 ++-- sources/ui/conductorpropertiesdialog.h | 3 +- sources/ui/conductorpropertieswidget.cpp | 7 +-- sources/ui/conductorpropertieswidget.h | 3 +- sources/ui/diagramcontextwidget.h | 3 +- sources/ui/diagrampropertiesdialog.cpp | 9 ++-- .../ui/diagrampropertieseditordockwidget.cpp | 7 +-- .../ui/diagrampropertieseditordockwidget.h | 2 +- sources/ui/diagramselection.h | 6 +-- sources/ui/dynamicelementtextitemeditor.cpp | 20 ++++----- sources/ui/dynamicelementtextmodel.cpp | 33 +++++++------- sources/ui/dynamicelementtextmodel.h | 6 +-- sources/ui/elementinfowidget.cpp | 13 +++--- sources/ui/elementinfowidget.h | 5 ++- sources/ui/elementpropertieswidget.cpp | 25 +++++------ sources/ui/imagepropertieswidget.cpp | 9 ++-- sources/ui/importelementdialog.h | 3 +- sources/ui/inditextpropertieswidget.cpp | 14 +++--- sources/ui/linksingleelementwidget.cpp | 13 +++--- sources/ui/linksingleelementwidget.h | 6 +-- sources/ui/multipastedialog.cpp | 17 ++++---- sources/ui/multipastedialog.h | 5 ++- sources/ui/potentialselectordialog.cpp | 23 +++++----- sources/ui/potentialselectordialog.h | 5 ++- sources/ui/projectpropertiesdialog.cpp | 8 ++-- .../ui/shapegraphicsitempropertieswidget.cpp | 13 +++--- sources/ui/titleblockpropertieswidget.cpp | 10 +++-- sources/ui/titleblockpropertieswidget.h | 11 ++--- sources/ui/xrefpropertieswidget.h | 6 +-- sources/undocommand/addelementtextcommand.cpp | 14 +++--- .../changeelementinformationcommand.cpp | 6 ++- .../changeelementinformationcommand.h | 3 +- .../undocommand/changetitleblockcommand.cpp | 3 +- sources/undocommand/changetitleblockcommand.h | 4 +- .../deleteqgraphicsitemcommand.cpp | 21 ++++----- .../undocommand/deleteqgraphicsitemcommand.h | 6 +-- sources/undocommand/linkelementcommand.cpp | 11 ++--- .../undocommand/rotateselectioncommand.cpp | 21 ++++----- sources/undocommand/rotatetextscommand.cpp | 9 ++-- sources/utils/conductorcreator.cpp | 15 ++++--- sources/utils/conductorcreator.h | 6 +-- tests/catch/CMakeLists.txt | 19 ++++++-- tests/catch/tst_My_test.cpp | 19 -------- tests/googletest/CMakeLists.txt | 17 ++++++-- 181 files changed, 1052 insertions(+), 900 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3fccadebf..7762e7da8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,10 +83,7 @@ find_package( PrintSupport REQUIRED ) - -if(DEFINED ENV{ok_simon}) -add_executable( - ${PROJECT_NAME} +set(QET_SRC_FILES ${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) diff --git a/sources/ElementsCollection/elementcollectionhandler.h b/sources/ElementsCollection/elementcollectionhandler.h index 14128e7f9..3ceab51f3 100644 --- a/sources/ElementsCollection/elementcollectionhandler.h +++ b/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; diff --git a/sources/ElementsCollection/elementscollectionmodel.cpp b/sources/ElementsCollection/elementscollectionmodel.cpp index 04b53c451..4974f3a0d 100644 --- a/sources/ElementsCollection/elementscollectionmodel.cpp +++ b/sources/ElementsCollection/elementscollectionmodel.cpp @@ -16,13 +16,14 @@ along with QElectroTech. If not, see . */ #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 #include diff --git a/sources/ElementsCollection/elementscollectionwidget.cpp b/sources/ElementsCollection/elementscollectionwidget.cpp index 4dab2daea..4dbbfb50b 100644 --- a/sources/ElementsCollection/elementscollectionwidget.cpp +++ b/sources/ElementsCollection/elementscollectionwidget.cpp @@ -16,26 +16,27 @@ along with QElectroTech. If not, see . */ #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 -#include +#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 -#include +#include #include +#include +#include #include /** diff --git a/sources/ElementsCollection/elementslocation.h b/sources/ElementsCollection/elementslocation.h index 24ede4f96..763b7fe81 100644 --- a/sources/ElementsCollection/elementslocation.h +++ b/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 +#include "../NameList/nameslist.h" +#include "../diagramcontext.h" +#include "../pugixml/pugixml.hpp" + #include +#include #ifndef Q_OS_LINUX #include "sstream" diff --git a/sources/ElementsCollection/elementstreeview.cpp b/sources/ElementsCollection/elementstreeview.cpp index 70a53fbb9..90d93e5bc 100644 --- a/sources/ElementsCollection/elementstreeview.cpp +++ b/sources/ElementsCollection/elementstreeview.cpp @@ -16,11 +16,12 @@ along with QElectroTech. If not, see . */ #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 #include diff --git a/sources/ElementsCollection/xmlelementcollection.cpp b/sources/ElementsCollection/xmlelementcollection.cpp index 308194d7c..d0e8d2c60 100644 --- a/sources/ElementsCollection/xmlelementcollection.cpp +++ b/sources/ElementsCollection/xmlelementcollection.cpp @@ -16,10 +16,11 @@ along with QElectroTech. If not, see . */ #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 diff --git a/sources/NameList/nameslist.cpp b/sources/NameList/nameslist.cpp index 73e5d8e4f..e7efcc81f 100644 --- a/sources/NameList/nameslist.cpp +++ b/sources/NameList/nameslist.cpp @@ -16,7 +16,8 @@ along with QElectroTech. If not, see . */ #include "nameslist.h" -#include "qetapp.h" + +#include "../qetapp.h" // make this class usable with QVariant int NamesList::MetaTypeId = qRegisterMetaType("NamesList"); diff --git a/sources/NameList/nameslist.h b/sources/NameList/nameslist.h index bb21881bc..03e22513f 100644 --- a/sources/NameList/nameslist.h +++ b/sources/NameList/nameslist.h @@ -17,8 +17,9 @@ */ #ifndef NAMES_LIST_H #define NAMES_LIST_H +#include "../pugixml/pugixml.hpp" + #include -#include "pugixml.hpp" /** Cette classe represente une liste de noms, utilisee par les elements et categories pour embarquer un meme nom en plusieurs diff --git a/sources/NameList/ui/namelistwidget.h b/sources/NameList/ui/namelistwidget.h index 45074c980..815763cb0 100644 --- a/sources/NameList/ui/namelistwidget.h +++ b/sources/NameList/ui/namelistwidget.h @@ -18,10 +18,10 @@ #ifndef NAMELISTWIDGET_H #define NAMELISTWIDGET_H -#include -#include +#include "../nameslist.h" -#include "nameslist.h" +#include +#include namespace Ui { class NameListWidget; diff --git a/sources/SearchAndReplace/searchandreplaceworker.cpp b/sources/SearchAndReplace/searchandreplaceworker.cpp index 62c320663..052933653 100644 --- a/sources/SearchAndReplace/searchandreplaceworker.cpp +++ b/sources/SearchAndReplace/searchandreplaceworker.cpp @@ -16,16 +16,16 @@ along with QElectroTech. If not, see . */ #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() { diff --git a/sources/SearchAndReplace/searchandreplaceworker.h b/sources/SearchAndReplace/searchandreplaceworker.h index 903b09f62..ac11992d9 100644 --- a/sources/SearchAndReplace/searchandreplaceworker.h +++ b/sources/SearchAndReplace/searchandreplaceworker.h @@ -18,10 +18,10 @@ #ifndef SEARCHANDREPLACEWORKER_H #define SEARCHANDREPLACEWORKER_H -#include +#include "../conductorproperties.h" +#include "../titleblockproperties.h" -#include "titleblockproperties.h" -#include "conductorproperties.h" +#include class Diagram; class Element; diff --git a/sources/SearchAndReplace/ui/replaceconductordialog.h b/sources/SearchAndReplace/ui/replaceconductordialog.h index a6e3b771d..2fae90e0e 100644 --- a/sources/SearchAndReplace/ui/replaceconductordialog.h +++ b/sources/SearchAndReplace/ui/replaceconductordialog.h @@ -18,7 +18,7 @@ #ifndef REPLACECONDUCTORDIALOG_H #define REPLACECONDUCTORDIALOG_H -#include "conductorproperties.h" +#include "../../conductorproperties.h" #include diff --git a/sources/SearchAndReplace/ui/replaceelementdialog.h b/sources/SearchAndReplace/ui/replaceelementdialog.h index 55938b1bc..5371bf421 100644 --- a/sources/SearchAndReplace/ui/replaceelementdialog.h +++ b/sources/SearchAndReplace/ui/replaceelementdialog.h @@ -18,8 +18,9 @@ #ifndef REPLACEELEMENTDIALOG_H #define REPLACEELEMENTDIALOG_H +#include "../../diagramcontext.h" + #include -#include "diagramcontext.h" class ElementInfoPartWidget; diff --git a/sources/SearchAndReplace/ui/replacefoliowidget.h b/sources/SearchAndReplace/ui/replacefoliowidget.h index 199c54764..94a12b80f 100644 --- a/sources/SearchAndReplace/ui/replacefoliowidget.h +++ b/sources/SearchAndReplace/ui/replacefoliowidget.h @@ -18,11 +18,11 @@ #ifndef REPLACEFOLIOWIDGET_H #define REPLACEFOLIOWIDGET_H -#include -#include +#include "../../diagramcontext.h" +#include "../../titleblockproperties.h" -#include "diagramcontext.h" -#include "titleblockproperties.h" +#include +#include class DiagramContextWidget; class QDialogButtonBox; diff --git a/sources/SearchAndReplace/ui/searchandreplacewidget.cpp b/sources/SearchAndReplace/ui/searchandreplacewidget.cpp index 3b3391751..2058be08f 100644 --- a/sources/SearchAndReplace/ui/searchandreplacewidget.cpp +++ b/sources/SearchAndReplace/ui/searchandreplacewidget.cpp @@ -16,24 +16,25 @@ along with QElectroTech. If not, see . */ #include "searchandreplacewidget.h" -#include "ui_searchandreplacewidget.h" -#include "qetdiagrameditor.h" -#include "qetproject.h" -#include "diagram.h" -#include "qeticons.h" -#include "element.h" -#include "independenttextitem.h" + +#include "../../QWidgetAnimation/qwidgetanimation.h" +#include "../../diagram.h" +#include "../../diagramcontent.h" +#include "../../qetapp.h" +#include "../../qetdiagrameditor.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 "qetinformation.h" -#include "diagramcontent.h" +#include "independenttextitem.h" +#include "replaceadvanceddialog.h" +#include "replaceconductordialog.h" +#include "replaceelementdialog.h" +#include "replacefoliowidget.h" +#include "ui_searchandreplacewidget.h" #include diff --git a/sources/SearchAndReplace/ui/searchandreplacewidget.h b/sources/SearchAndReplace/ui/searchandreplacewidget.h index f10956ee9..eba3138e3 100644 --- a/sources/SearchAndReplace/ui/searchandreplacewidget.h +++ b/sources/SearchAndReplace/ui/searchandreplacewidget.h @@ -18,13 +18,13 @@ #ifndef SEARCHANDREPLACEWIDGET_H #define SEARCHANDREPLACEWIDGET_H -#include -#include +#include "../../QWidgetAnimation/qwidgetanimation.h" +#include "../../qetgraphicsitem/element.h" +#include "../../qetgraphicsitem/independenttextitem.h" +#include "../searchandreplaceworker.h" -#include "element.h" -#include "independenttextitem.h" -#include "searchandreplaceworker.h" -#include "QWidgetAnimation/qwidgetanimation.h" +#include +#include class QTreeWidgetItem; class QETDiagramEditor; diff --git a/sources/autoNum/assignvariables.cpp b/sources/autoNum/assignvariables.cpp index 2f257ab3e..cc1e9315b 100644 --- a/sources/autoNum/assignvariables.cpp +++ b/sources/autoNum/assignvariables.cpp @@ -16,14 +16,15 @@ along with QElectroTech. If not, see . */ #include "assignvariables.h" -#include "diagram.h" -#include "element.h" -#include "diagramposition.h" -#include "qetapp.h" -#include "qetxml.h" -#include +#include "../diagram.h" +#include "../diagramposition.h" +#include "../qetapp.h" +#include "../qetgraphicsitem/element.h" +#include "../qetxml.h" + #include +#include #include namespace autonum diff --git a/sources/autoNum/assignvariables.h b/sources/autoNum/assignvariables.h index ee99c4dae..5d7b9b35f 100644 --- a/sources/autoNum/assignvariables.h +++ b/sources/autoNum/assignvariables.h @@ -17,13 +17,12 @@ */ #ifndef ASSIGNVARIABLES_H #define ASSIGNVARIABLES_H - -#include -#include -#include - +#include "../diagramcontext.h" #include "numerotationcontext.h" -#include "diagramcontext.h" + +#include +#include +#include class Diagram; class Element; diff --git a/sources/autoNum/numerotationcontext.cpp b/sources/autoNum/numerotationcontext.cpp index a94fe7ec9..e25f05137 100644 --- a/sources/autoNum/numerotationcontext.cpp +++ b/sources/autoNum/numerotationcontext.cpp @@ -16,10 +16,11 @@ along with QElectroTech. If not, see . */ #include "numerotationcontext.h" -#include "qet.h" -#include +#include "../qet.h" + #include +#include /** Constructor diff --git a/sources/autoNum/numerotationcontextcommands.cpp b/sources/autoNum/numerotationcontextcommands.cpp index 706162a20..ea33553a7 100644 --- a/sources/autoNum/numerotationcontextcommands.cpp +++ b/sources/autoNum/numerotationcontextcommands.cpp @@ -16,7 +16,8 @@ along with QElectroTech. If not, see . */ #include "numerotationcontextcommands.h" -#include "diagram.h" + +#include "../diagram.h" /** @brief Constructor diff --git a/sources/autoNum/ui/autonumberingdockwidget.cpp b/sources/autoNum/ui/autonumberingdockwidget.cpp index 39a42e524..84d4a08fd 100644 --- a/sources/autoNum/ui/autonumberingdockwidget.cpp +++ b/sources/autoNum/ui/autonumberingdockwidget.cpp @@ -16,13 +16,14 @@ along with QElectroTech. If not, see . */ #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 diff --git a/sources/autoNum/ui/autonumberingdockwidget.h b/sources/autoNum/ui/autonumberingdockwidget.h index ce4da5919..7892234af 100644 --- a/sources/autoNum/ui/autonumberingdockwidget.h +++ b/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 namespace Ui { diff --git a/sources/autoNum/ui/autonumberingmanagementw.cpp b/sources/autoNum/ui/autonumberingmanagementw.cpp index 5b9d4d3a3..b4a7b4a98 100644 --- a/sources/autoNum/ui/autonumberingmanagementw.cpp +++ b/sources/autoNum/ui/autonumberingmanagementw.cpp @@ -16,15 +16,17 @@ along with QElectroTech. If not, see . */ #include "autonumberingmanagementw.h" -#include "ui_autonumberingmanagementw.h" -#include "numparteditorw.h" -#include -#include "numerotationcontextcommands.h" + +#include "../../diagram.h" +#include "../../qetproject.h" +#include "../numerotationcontextcommands.h" #include "formulaautonumberingw.h" -#include "ui_formulaautonumberingw.h" +#include "numparteditorw.h" #include "qdebug.h" -#include "qetproject.h" -#include "diagram.h" +#include "ui_autonumberingmanagementw.h" +#include "ui_formulaautonumberingw.h" + +#include /** @brief AutoNumberingManagementW::AutoNumberingManagementW diff --git a/sources/autoNum/ui/folioautonumbering.cpp b/sources/autoNum/ui/folioautonumbering.cpp index 99fcd8add..a41626c48 100644 --- a/sources/autoNum/ui/folioautonumbering.cpp +++ b/sources/autoNum/ui/folioautonumbering.cpp @@ -16,12 +16,14 @@ along with QElectroTech. If not, see . */ #include "folioautonumbering.h" + +#include "../../diagram.h" +#include "../../qetproject.h" #include "ui_folioautonumbering.h" + #include #include #include -#include "qetproject.h" -#include "diagram.h" /** Constructor */ diff --git a/sources/autoNum/ui/folioautonumbering.h b/sources/autoNum/ui/folioautonumbering.h index e7b65848f..1ec7f4d01 100644 --- a/sources/autoNum/ui/folioautonumbering.h +++ b/sources/autoNum/ui/folioautonumbering.h @@ -18,8 +18,9 @@ #ifndef FOLIOAUTONUMBERING_H #define FOLIOAUTONUMBERING_H +#include "../numerotationcontext.h" + #include -#include "numerotationcontext.h" class NumPartEditorW; class QAbstractButton; diff --git a/sources/autoNum/ui/numparteditorw.h b/sources/autoNum/ui/numparteditorw.h index 26948e7b6..1ebd8c563 100644 --- a/sources/autoNum/ui/numparteditorw.h +++ b/sources/autoNum/ui/numparteditorw.h @@ -18,9 +18,10 @@ #ifndef NUMPARTEDITORW_H #define NUMPARTEDITORW_H -#include +#include "../numerotationcontext.h" + #include -#include "numerotationcontext.h" +#include namespace Ui { class NumPartEditorW; diff --git a/sources/autoNum/ui/selectautonumw.cpp b/sources/autoNum/ui/selectautonumw.cpp index a19a415ca..f34c67b1c 100644 --- a/sources/autoNum/ui/selectautonumw.cpp +++ b/sources/autoNum/ui/selectautonumw.cpp @@ -16,14 +16,15 @@ along with QElectroTech. If not, see . */ #include "selectautonumw.h" -#include "ui_selectautonumw.h" -#include "numparteditorw.h" -#include -#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 /** @brief SelectAutonumW::SelectAutonumW diff --git a/sources/autoNum/ui/selectautonumw.h b/sources/autoNum/ui/selectautonumw.h index 0037a84e3..f9f43ec92 100644 --- a/sources/autoNum/ui/selectautonumw.h +++ b/sources/autoNum/ui/selectautonumw.h @@ -18,10 +18,11 @@ #ifndef SELECTAUTONUMW_H #define SELECTAUTONUMW_H -#include -#include "numerotationcontext.h" +#include "../numerotationcontext.h" #include "formulaautonumberingw.h" +#include + class NumPartEditorW; class QAbstractButton; class FormulaAutonumberingW; diff --git a/sources/bordertitleblock.cpp b/sources/bordertitleblock.cpp index 026bab62f..63ed0a4d9 100644 --- a/sources/bordertitleblock.cpp +++ b/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 . */ -#include -#include -#include - -#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 +#include +#include #define MIN_COLUMN_COUNT 3 #define MIN_ROW_COUNT 3 diff --git a/sources/bordertitleblock.h b/sources/bordertitleblock.h index 39a7f93a6..4432b1841 100644 --- a/sources/bordertitleblock.h +++ b/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 #include #include -#include -#include "numerotationcontext.h" class QPainter; class DiagramPosition; class TitleBlockTemplate; diff --git a/sources/conductorautonumerotation.cpp b/sources/conductorautonumerotation.cpp index 2ef7eb843..fba5f4c68 100644 --- a/sources/conductorautonumerotation.cpp +++ b/sources/conductorautonumerotation.cpp @@ -16,14 +16,15 @@ along with QElectroTech. If not, see . */ #include "conductorautonumerotation.h" -#include "numerotationcontextcommands.h" -#include "qetdiagrameditor.h" -#include "conductor.h" + +#include "QPropertyUndoCommand/qpropertyundocommand.h" +#include "autoNum/assignvariables.h" +#include "autoNum/numerotationcontextcommands.h" #include "diagram.h" #include "qet.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" -#include "potentialselectordialog.h" -#include "assignvariables.h" +#include "qetdiagrameditor.h" +#include "qetgraphicsitem/conductor.h" +#include "ui/potentialselectordialog.h" /** @brief ConductorAutoNumerotation::ConductorAutoNumerotation diff --git a/sources/conductorautonumerotation.h b/sources/conductorautonumerotation.h index 90c7d18d7..479382781 100644 --- a/sources/conductorautonumerotation.h +++ b/sources/conductorautonumerotation.h @@ -18,8 +18,9 @@ #ifndef CONDUCTORAUTONUMEROTATION_H #define CONDUCTORAUTONUMEROTATION_H +#include "autoNum/assignvariables.h" + #include -#include "assignvariables.h" class Diagram; class Conductor; diff --git a/sources/conductornumexport.cpp b/sources/conductornumexport.cpp index f7c4ebf14..fa4480115 100644 --- a/sources/conductornumexport.cpp +++ b/sources/conductornumexport.cpp @@ -16,12 +16,13 @@ along with QElectroTech. If not, see . */ #include "conductornumexport.h" + #include "diagram.h" #include "diagramcontent.h" -#include "conductor.h" -#include "terminal.h" -#include "element.h" -#include "conductortextitem.h" +#include "qetgraphicsitem/conductor.h" +#include "qetgraphicsitem/conductortextitem.h" +#include "qetgraphicsitem/element.h" +#include "qetgraphicsitem/terminal.h" #include diff --git a/sources/conductorprofile.cpp b/sources/conductorprofile.cpp index edc5a02a5..42afc4385 100644 --- a/sources/conductorprofile.cpp +++ b/sources/conductorprofile.cpp @@ -16,9 +16,10 @@ along with QElectroTech. If not, see . */ #include "conductorprofile.h" -#include "qetgraphicsitem/conductor.h" + #include "conductorsegmentprofile.h" -#include "terminal.h" +#include "qetgraphicsitem/conductor.h" +#include "qetgraphicsitem/terminal.h" /// Constructeur ConductorProfile::ConductorProfile() diff --git a/sources/configpages.cpp b/sources/configpages.cpp index caa5101e6..b945abbc8 100644 --- a/sources/configpages.cpp +++ b/sources/configpages.cpp @@ -16,25 +16,26 @@ along with QElectroTech. If not, see . */ -#include +#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 +#include #include #include -#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 diff --git a/sources/configpages.h b/sources/configpages.h index 6315096fa..a9d514a62 100644 --- a/sources/configpages.h +++ b/sources/configpages.h @@ -17,11 +17,12 @@ */ #ifndef CONFIG_PAGES_H #define CONFIG_PAGES_H -#include -#include #include "configpage.h" -#include "projectpropertiesdialog.h" -#include "titleblockpropertieswidget.h" +#include "ui/projectpropertiesdialog.h" +#include "ui/titleblockpropertieswidget.h" + +#include +#include class BorderPropertiesWidget; class ConductorPropertiesWidget; class TitleBlockPropertiesWidget; diff --git a/sources/dataBase/projectdatabase.cpp b/sources/dataBase/projectdatabase.cpp index a96de8468..f0924eb64 100644 --- a/sources/dataBase/projectdatabase.cpp +++ b/sources/dataBase/projectdatabase.cpp @@ -16,16 +16,17 @@ along with QElectroTech. If not, see . */ #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 +#include "../diagram.h" +#include "../diagramposition.h" +#include "../elementprovider.h" +#include "../qetapp.h" +#include "../qetgraphicsitem/element.h" +#include "../qetinformation.h" +#include "../qetproject.h" + #include +#include #if defined(Q_OS_LINUX) || defined(Q_OS_WINDOWS) #include diff --git a/sources/diagram.cpp b/sources/diagram.cpp index f93e0bcfe..40bdffe9c 100644 --- a/sources/diagram.cpp +++ b/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 . */ -#include -#include -#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 +#include int Diagram::xGrid = 10; int Diagram::yGrid = 10; diff --git a/sources/diagram.h b/sources/diagram.h index f0df1ff60..00c5bfba6 100644 --- a/sources/diagram.h +++ b/sources/diagram.h @@ -17,20 +17,20 @@ */ #ifndef DIAGRAM_H #define DIAGRAM_H -#include -#include -#include -#include - +#include "autoNum/numerotationcontext.h" #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 +#include +#include +#include class Conductor; class CustomElement; diff --git a/sources/diagramcommands.cpp b/sources/diagramcommands.cpp index 3589c5b94..13cb89c24 100644 --- a/sources/diagramcommands.cpp +++ b/sources/diagramcommands.cpp @@ -16,16 +16,17 @@ along with QElectroTech. If not, see . */ #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 QString itemText(const QetGraphicsItem *item) { diff --git a/sources/diagramcontent.cpp b/sources/diagramcontent.cpp index ba858918e..109cb13a7 100644 --- a/sources/diagramcontent.cpp +++ b/sources/diagramcontent.cpp @@ -16,18 +16,20 @@ along with QElectroTech. If not, see . */ #include "diagramcontent.h" -#include -#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 "conductortextitem.h" -#include "qetgraphicstableitem.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 /** @brief DiagramContent::DiagramContent diff --git a/sources/diagramcontext.h b/sources/diagramcontext.h index f887b0ff6..66a733f23 100644 --- a/sources/diagramcontext.h +++ b/sources/diagramcontext.h @@ -1,34 +1,35 @@ /* Copyright 2006-2020 The QElectroTech Team This file is part of QElectroTech. - + QElectroTech is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. - + QElectroTech is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with QElectroTech. If not, see . */ #ifndef DIAGRAM_CONTEXT_H #define DIAGRAM_CONTEXT_H +#include "pugixml/pugixml.hpp" + #include #include #include #include -#include #include - -#include "pugixml.hpp" +#include /** 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 - to fetch the informations they need to do their rendering, or element for retrieve information about itself + pairs) of a diagram at a given time. It is notably used by titleblock + templates to fetch the informations they need to do their rendering, or + element for retrieve information about itself */ /** diff --git a/sources/diagramevent/diagrameventaddelement.cpp b/sources/diagramevent/diagrameventaddelement.cpp index a780ec70e..5183d8c54 100644 --- a/sources/diagramevent/diagrameventaddelement.cpp +++ b/sources/diagramevent/diagrameventaddelement.cpp @@ -16,12 +16,12 @@ along with QElectroTech. If not, see . */ #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 diff --git a/sources/diagramevent/diagrameventaddelement.h b/sources/diagramevent/diagrameventaddelement.h index f06387792..ffd24a80d 100644 --- a/sources/diagramevent/diagrameventaddelement.h +++ b/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; diff --git a/sources/diagramevent/diagrameventaddimage.cpp b/sources/diagramevent/diagrameventaddimage.cpp index b17e74628..339dd5eb5 100644 --- a/sources/diagramevent/diagrameventaddimage.cpp +++ b/sources/diagramevent/diagrameventaddimage.cpp @@ -17,9 +17,10 @@ */ #include "diagrameventaddimage.h" -#include "diagram.h" -#include "diagramimageitem.h" -#include "diagramcommands.h" + +#include "../diagram.h" +#include "../diagramcommands.h" +#include "../diagramimageitem.h" /** @brief DiagramEventAddImage::DiagramEventAddImage diff --git a/sources/diagramevent/diagrameventaddshape.cpp b/sources/diagramevent/diagrameventaddshape.cpp index be9d69f34..146aaa954 100644 --- a/sources/diagramevent/diagrameventaddshape.cpp +++ b/sources/diagramevent/diagrameventaddshape.cpp @@ -16,8 +16,9 @@ along with QElectroTech. If not, see . */ #include "diagrameventaddshape.h" -#include "diagram.h" -#include "diagramcommands.h" + +#include "../diagram.h" +#include "../diagramcommands.h" /** @brief DiagramEventAddShape::DiagramEventAddShape diff --git a/sources/diagramevent/diagrameventaddtext.cpp b/sources/diagramevent/diagrameventaddtext.cpp index 0be6ba235..ec717208d 100644 --- a/sources/diagramevent/diagrameventaddtext.cpp +++ b/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 diff --git a/sources/diagramevent/diagrameventinterface.cpp b/sources/diagramevent/diagrameventinterface.cpp index 6f3ef1a29..994ddcc4e 100644 --- a/sources/diagramevent/diagrameventinterface.cpp +++ b/sources/diagramevent/diagrameventinterface.cpp @@ -16,11 +16,12 @@ along with QElectroTech. If not, see . */ #include "diagrameventinterface.h" -#include "diagram.h" + +#include "../diagram.h" + #include #include - DiagramEventInterface::DiagramEventInterface(Diagram *diagram) : m_diagram(diagram), m_running(false), diff --git a/sources/diagramview.cpp b/sources/diagramview.cpp index 92adfef12..649479b16 100644 --- a/sources/diagramview.cpp +++ b/sources/diagramview.cpp @@ -16,23 +16,22 @@ along with QElectroTech. If not, see . */ #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 "dveventinterface.h" -#include "diagrameventaddelement.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" -#include "multipastedialog.h" -#include "changetitleblockcommand.h" -#include "conductorcreator.h" +#include "titleblock/integrationmovetemplateshandler.h" +#include "ui/diagrampropertiesdialog.h" +#include "ui/multipastedialog.h" +#include "undocommand/changetitleblockcommand.h" +#include "utils/conductorcreator.h" #include diff --git a/sources/diagramview.h b/sources/diagramview.h index 0b2c3a0fa..a62afad44 100644 --- a/sources/diagramview.h +++ b/sources/diagramview.h @@ -18,10 +18,11 @@ #ifndef DIAGRAMVIEW_H #define DIAGRAMVIEW_H -#include +#include "ElementsCollection/elementslocation.h" +#include "titleblock/templatelocation.h" + #include -#include "elementslocation.h" -#include "templatelocation.h" +#include class Conductor; class Diagram; diff --git a/sources/editor/elementscene.cpp b/sources/editor/elementscene.cpp index d1ab2d4da..ee1cafbbf 100644 --- a/sources/editor/elementscene.cpp +++ b/sources/editor/elementscene.cpp @@ -16,28 +16,29 @@ along with QElectroTech. If not, see . */ #include "elementscene.h" -#include "qetelementeditor.h" -#include "elementprimitivedecorator.h" -#include -#include "partline.h" -#include "partrectangle.h" -#include "partellipse.h" -#include "partpolygon.h" -#include "partterminal.h" -#include "parttext.h" -#include "partarc.h" + +#include "../NameList/ui/namelistdialog.h" +#include "../NameList/ui/namelistwidget.h" +#include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../QetGraphicsItemModeler/qetgraphicshandleritem.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 "namelistdialog.h" -#include "namelistwidget.h" +#include "partellipse.h" +#include "partline.h" +#include "partpolygon.h" +#include "partrectangle.h" +#include "partterminal.h" +#include "parttext.h" +#include "qetelementeditor.h" +#include "ui/elementpropertieseditorwidget.h" -#include #include +#include +#include /** @brief ElementScene::ElementScene diff --git a/sources/editor/elementscene.h b/sources/editor/elementscene.h index 5199c9d5d..167599d7a 100644 --- a/sources/editor/elementscene.h +++ b/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 #include -#include "qgimanager.h" -#include "elementcontent.h" -#include "diagramcontext.h" -#include "nameslist.h" class CustomElementPart; class ElementEditionCommand; diff --git a/sources/editor/graphicspart/partdynamictextfield.h b/sources/editor/graphicspart/partdynamictextfield.h index 2ed40a123..de28bc4ca 100644 --- a/sources/editor/graphicspart/partdynamictextfield.h +++ b/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 diff --git a/sources/editor/graphicspart/partterminal.cpp b/sources/editor/graphicspart/partterminal.cpp index 9fe3728a5..fea1f9a85 100644 --- a/sources/editor/graphicspart/partterminal.cpp +++ b/sources/editor/graphicspart/partterminal.cpp @@ -16,7 +16,8 @@ along with QElectroTech. If not, see . */ #include "partterminal.h" -#include "terminal.h" + +#include "../qetgraphicsitem/terminal.h" /** @brief PartTerminal::PartTerminal diff --git a/sources/editor/qetelementeditor.h b/sources/editor/qetelementeditor.h index ea4d7bbd6..ce8ec243c 100644 --- a/sources/editor/qetelementeditor.h +++ b/sources/editor/qetelementeditor.h @@ -17,11 +17,10 @@ */ #ifndef CUSTOM_ELEMENT_EDITOR_H #define CUSTOM_ELEMENT_EDITOR_H -#include "qetmainwindow.h" -#include "qet.h" +#include "../ElementsCollection/elementslocation.h" +#include "../qet.h" +#include "../qetmainwindow.h" #include "elementscene.h" -#include "elementslocation.h" - class ElementItemEditor; class ElementView; diff --git a/sources/elementdialog.cpp b/sources/elementdialog.cpp index 777911865..d4d6147f0 100644 --- a/sources/elementdialog.cpp +++ b/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 . */ -#include -#include -#include -#include -#include -#include - #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 +#include +#include +#include +#include +#include /** @brief ElementDialog::ElementDialog diff --git a/sources/elementdialog.h b/sources/elementdialog.h index ef9c5ab10..cbfd330be 100644 --- a/sources/elementdialog.h +++ b/sources/elementdialog.h @@ -18,8 +18,9 @@ #ifndef ELEMENT_DIALOG_H #define ELEMENT_DIALOG_H +#include "ElementsCollection/elementslocation.h" + #include -#include "elementslocation.h" class QDialogButtonBox; class QFileNameEdit; diff --git a/sources/elementprovider.cpp b/sources/elementprovider.cpp index 186aef0a0..4fd7560d2 100644 --- a/sources/elementprovider.cpp +++ b/sources/elementprovider.cpp @@ -16,10 +16,12 @@ along with QElectroTech. If not, see . */ #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 /** diff --git a/sources/elementscategoryeditor.cpp b/sources/elementscategoryeditor.cpp index 5848b6206..ee74f5aab 100644 --- a/sources/elementscategoryeditor.cpp +++ b/sources/elementscategoryeditor.cpp @@ -16,16 +16,17 @@ along with QElectroTech. If not, see . */ #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 "namelistwidget.h" +#include "qfilenameedit.h" #include -#include -#include #include +#include +#include /** @brief ElementsCategoryEditor::ElementsCategoryEditor diff --git a/sources/elementscategoryeditor.h b/sources/elementscategoryeditor.h index aab809c66..60457ef51 100644 --- a/sources/elementscategoryeditor.h +++ b/sources/elementscategoryeditor.h @@ -18,8 +18,9 @@ #ifndef ELEMENTS_CATEGORY_EDITOR_H #define ELEMENTS_CATEGORY_EDITOR_H +#include "ElementsCollection/elementslocation.h" + #include -#include "elementslocation.h" class NameListWidget; class QFileNameEdit; diff --git a/sources/elementscollectioncache.cpp b/sources/elementscollectioncache.cpp index 94b2ba35a..d4b811c38 100644 --- a/sources/elementscollectioncache.cpp +++ b/sources/elementscollectioncache.cpp @@ -16,13 +16,14 @@ along with QElectroTech. If not, see . */ #include "elementscollectioncache.h" + #include "factory/elementfactory.h" -#include "element.h" #include "qet.h" +#include "qetgraphicsitem/element.h" #include -#include #include +#include /** Construct a cache for elements collections. diff --git a/sources/elementscollectioncache.h b/sources/elementscollectioncache.h index 3044f3e2e..a45a94c0c 100644 --- a/sources/elementscollectioncache.h +++ b/sources/elementscollectioncache.h @@ -18,8 +18,9 @@ #ifndef ELEMENTS_COLLECTION_CACHE_H #define ELEMENTS_COLLECTION_CACHE_H +#include "ElementsCollection/elementslocation.h" + #include -#include "elementslocation.h" /** This class implements a SQLite cache for data related to elements diff --git a/sources/elementsmover.cpp b/sources/elementsmover.cpp index c25c7be7d..0f14f838d 100644 --- a/sources/elementsmover.cpp +++ b/sources/elementsmover.cpp @@ -16,16 +16,17 @@ along with QElectroTech. If not, see . */ #include "elementsmover.h" -#include "conductor.h" -#include "conductortextitem.h" + +#include "conductorautonumerotation.h" #include "diagram.h" #include "diagramcommands.h" -#include "element.h" -#include "independenttextitem.h" -#include "diagramimageitem.h" -#include "conductorautonumerotation.h" -#include "dynamicelementtextitem.h" -#include "elementtextitemgroup.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" /** @brief ElementsMover::ElementsMover Constructor diff --git a/sources/elementspanel.cpp b/sources/elementspanel.cpp index bc26e58ff..f38309e71 100644 --- a/sources/elementspanel.cpp +++ b/sources/elementspanel.cpp @@ -16,11 +16,12 @@ along with QElectroTech. If not, see . */ #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 diff --git a/sources/elementspanel.h b/sources/elementspanel.h index 6a2269214..d7a86079a 100644 --- a/sources/elementspanel.h +++ b/sources/elementspanel.h @@ -19,7 +19,7 @@ #define PANELAPPAREILS_H #include "genericpanel.h" -#include "templatelocation.h" +#include "titleblock/templatelocation.h" class QETProject; class Diagram; diff --git a/sources/elementspanelwidget.cpp b/sources/elementspanelwidget.cpp index 5f70c0728..d5e373742 100644 --- a/sources/elementspanelwidget.cpp +++ b/sources/elementspanelwidget.cpp @@ -16,13 +16,14 @@ along with QElectroTech. If not, see . */ #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 diff --git a/sources/elementtextpattern.cpp b/sources/elementtextpattern.cpp index 6e35ce502..a0cc4557f 100644 --- a/sources/elementtextpattern.cpp +++ b/sources/elementtextpattern.cpp @@ -16,22 +16,23 @@ along with QElectroTech. If not, see . */ #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 "deleteqgraphicsitemcommand.h" +#include "qet.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 -#include #include +#include +#include #include #include -#include #include /** diff --git a/sources/elementtextsmover.cpp b/sources/elementtextsmover.cpp index d7a5ed66d..88107718c 100644 --- a/sources/elementtextsmover.cpp +++ b/sources/elementtextsmover.cpp @@ -16,10 +16,12 @@ along with QElectroTech. If not, see . */ #include "elementtextsmover.h" -#include "diagram.h" + #include "QPropertyUndoCommand/qpropertyundocommand.h" -#include "dynamicelementtextitem.h" -#include "elementtextitemgroup.h" +#include "diagram.h" +#include "qetgraphicsitem/dynamicelementtextitem.h" +#include "qetgraphicsitem/elementtextitemgroup.h" + #include /** diff --git a/sources/exportdialog.cpp b/sources/exportdialog.cpp index f79f6bdc5..06fd7ce61 100644 --- a/sources/exportdialog.cpp +++ b/sources/exportdialog.cpp @@ -1,43 +1,44 @@ /* Copyright 2006-2020 The QElectroTech Team This file is part of QElectroTech. - + QElectroTech is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. - + QElectroTech is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with QElectroTech. If not, see . */ #include "exportdialog.h" -#include -#include -#include -#include + +#include "conductorsegment.h" +#include "createdxf.h" +#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 +#include +#include +#include +#include /** Constructeur diff --git a/sources/factory/elementpicturefactory.cpp b/sources/factory/elementpicturefactory.cpp index f0bd3a795..7e24480db 100644 --- a/sources/factory/elementpicturefactory.cpp +++ b/sources/factory/elementpicturefactory.cpp @@ -16,19 +16,20 @@ along with QElectroTech. If not, see . */ #include "elementpicturefactory.h" -#include "elementslocation.h" -#include "qet.h" -#include "qetapp.h" + +#include "../ElementsCollection/elementslocation.h" +#include "../qet.h" +#include "../qetapp.h" #include "partline.h" -#include -#include -#include -#include -#include #include +#include #include +#include +#include #include +#include +#include ElementPictureFactory* ElementPictureFactory::m_factory = nullptr; diff --git a/sources/factory/propertieseditorfactory.cpp b/sources/factory/propertieseditorfactory.cpp index d01407f79..e02c762f5 100644 --- a/sources/factory/propertieseditorfactory.cpp +++ b/sources/factory/propertieseditorfactory.cpp @@ -16,24 +16,24 @@ along with QElectroTech. If not, see . */ #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 diff --git a/sources/factory/qetgraphicstablefactory.cpp b/sources/factory/qetgraphicstablefactory.cpp index b3025f85f..c7c81a023 100644 --- a/sources/factory/qetgraphicstablefactory.cpp +++ b/sources/factory/qetgraphicstablefactory.cpp @@ -16,14 +16,14 @@ along with QElectroTech. If not, see . */ #include "qetgraphicstablefactory.h" -#include "qetgraphicstableitem.h" -#include "projectdbmodel.h" -#include "elementquerywidget.h" -#include "diagram.h" -#include "qetgraphicsheaderitem.h" + +#include "../diagram.h" +#include "../projectdbmodel.h" +#include "../qetgraphicsheaderitem.h" +#include "../qetgraphicstableitem.h" #include "addtabledialog.h" -#include "qetutils.h" #include "elementquerywidget.h" +#include "qetutils.h" #include "summaryquerywidget.h" #include diff --git a/sources/factory/ui/addtabledialog.cpp b/sources/factory/ui/addtabledialog.cpp index b547813ee..5c74bb89e 100644 --- a/sources/factory/ui/addtabledialog.cpp +++ b/sources/factory/ui/addtabledialog.cpp @@ -16,10 +16,11 @@ along with QElectroTech. If not, see . */ #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 diff --git a/sources/genericpanel.cpp b/sources/genericpanel.cpp index e125616bb..bee830671 100644 --- a/sources/genericpanel.cpp +++ b/sources/genericpanel.cpp @@ -16,13 +16,15 @@ along with QElectroTech. If not, see . */ #include "genericpanel.h" -#include -#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 /** Constructor diff --git a/sources/machine_info.cpp b/sources/machine_info.cpp index fdc2cb778..f708e2f44 100644 --- a/sources/machine_info.cpp +++ b/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 diff --git a/sources/main.cpp b/sources/main.cpp index ca966e2d2..0f91acfdc 100644 --- a/sources/main.cpp +++ b/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 . */ -#include "qetapp.h" -#include "singleapplication.h" -#include "qet.h" -#include "macosxopenevent.h" +#include "../SingleApplication/singleapplication.h" #include "machine_info.h" +#include "qet.h" +#include "qetapp.h" +#include "utils/macosxopenevent.h" + #include /** diff --git a/sources/newelementwizard.cpp b/sources/newelementwizard.cpp index 2ed23594e..440f860ae 100644 --- a/sources/newelementwizard.cpp +++ b/sources/newelementwizard.cpp @@ -16,12 +16,13 @@ along with QElectroTech. If not, see . */ #include "newelementwizard.h" -#include "namelistwidget.h" -#include "qetelementeditor.h" -#include "qfilenameedit.h" + +#include "ElementsCollection/elementcollectionitem.h" +#include "ElementsCollection/elementscollectionmodel.h" +#include "NameList/ui/namelistwidget.h" +#include "editor/qetelementeditor.h" #include "qetmessagebox.h" -#include "elementscollectionmodel.h" -#include "elementcollectionitem.h" +#include "qfilenameedit.h" /** Constructeur diff --git a/sources/newelementwizard.h b/sources/newelementwizard.h index 4e064326d..aefeb7c40 100644 --- a/sources/newelementwizard.h +++ b/sources/newelementwizard.h @@ -18,8 +18,9 @@ #ifndef NEW_ELEMENT_WIZARD_H #define NEW_ELEMENT_WIZARD_H +#include "ElementsCollection/elementslocation.h" + #include -#include "elementslocation.h" class NameListWidget; class QFileNameEdit; diff --git a/sources/print/projectprintwindow.cpp b/sources/print/projectprintwindow.cpp index 3c9341556..d7e9a146f 100644 --- a/sources/print/projectprintwindow.cpp +++ b/sources/print/projectprintwindow.cpp @@ -16,11 +16,11 @@ along with QElectroTech. If not, see . */ #include "projectprintwindow.h" -#include "ui_projectprintwindow.h" -#include "qetproject.h" -#include "diagram.h" -#include "qeticons.h" +#include "../diagram.h" +#include "../qeticons.h" +#include "../qetproject.h" +#include "ui_projectprintwindow.h" #include #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove diff --git a/sources/projectconfigpages.cpp b/sources/projectconfigpages.cpp index a26b4d547..608ced22d 100644 --- a/sources/projectconfigpages.cpp +++ b/sources/projectconfigpages.cpp @@ -16,22 +16,24 @@ along with QElectroTech. If not, see . */ #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 "conductorpropertieswidget.h" -#include "diagramcontextwidget.h" -#include "titleblockpropertieswidget.h" -#include +#include "ui/borderpropertieswidget.h" +#include "ui/conductorpropertieswidget.h" +#include "ui/diagramcontextwidget.h" #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 + /** Constructor @param project Project this page is editing. diff --git a/sources/projectview.cpp b/sources/projectview.cpp index 173f5c4e8..fca16ac94 100644 --- a/sources/projectview.cpp +++ b/sources/projectview.cpp @@ -16,22 +16,23 @@ along with QElectroTech. If not, see . */ #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 "xmlelementcollection.h" -#include "autoNum/assignvariables.h" -#include "dialogwaiting.h" +#include "ui/borderpropertieswidget.h" +#include "ui/conductorpropertieswidget.h" +#include "ui/dialogwaiting.h" +#include "ui/projectpropertiesdialog.h" +#include "ui/titleblockpropertieswidget.h" /** Constructeur diff --git a/sources/projectview.h b/sources/projectview.h index 391cc989f..d33907ef1 100644 --- a/sources/projectview.h +++ b/sources/projectview.h @@ -18,12 +18,12 @@ #ifndef PROJECT_VIEW_H #define PROJECT_VIEW_H +#include "qetresult.h" +#include "titleblock/templatelocation.h" + +#include #include #include -#include - -#include "templatelocation.h" -#include "qetresult.h" #ifdef Q_OS_MACOS diff --git a/sources/qetapp.cpp b/sources/qetapp.cpp index 3a67a33e9..2eb12531f 100644 --- a/sources/qetapp.cpp +++ b/sources/qetapp.cpp @@ -16,24 +16,25 @@ along with QElectroTech. If not, see . */ #include "qetapp.h" + +#include "aboutqetdialog.h" #include "configdialog.h" #include "configpages.h" -#include "qetdiagrameditor.h" -#include "qetelementeditor.h" +#include "editor/qetelementeditor.h" #include "elementscollectioncache.h" -#include "titleblocktemplate.h" -#include "qettemplateeditor.h" +#include "factory/elementfactory.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 "templatescollection.h" -#include "generalconfigurationpage.h" -#include "qetmessagebox.h" -#include "projectview.h" -#include "elementpicturefactory.h" -#include "aboutqetdialog.h" -#include "factory/elementfactory.h" +#include "titleblock/templatescollection.h" +#include "titleblocktemplate.h" #include #include diff --git a/sources/qetapp.h b/sources/qetapp.h index 8c37a81ba..fb5eaaded 100644 --- a/sources/qetapp.h +++ b/sources/qetapp.h @@ -18,14 +18,14 @@ #ifndef QET_APP_H #define QET_APP_H -#include -#include -#include -#include - -#include "elementslocation.h" -#include "templatelocation.h" +#include "ElementsCollection/elementslocation.h" #include "qetarguments.h" +#include "titleblock/templatelocation.h" + +#include +#include +#include +#include class QSplashScreen; class QMenu; diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index 478fd5976..09b4f5f15 100644 --- a/sources/qetdiagrameditor.cpp +++ b/sources/qetdiagrameditor.cpp @@ -16,34 +16,34 @@ along with QElectroTech. If not, see . */ #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 "diagrameventaddshape.h" -#include "diagrameventaddimage.h" -#include "diagrameventaddtext.h" -#include "elementscollectionwidget.h" -#include "autonumberingdockwidget.h" -#include "dynamicelementtextitem.h" -#include "conductortextitem.h" +#include "recentfiles.h" +#include "ui/bomexportdialog.h" +#include "undocommand/addelementtextcommand.h" #include "undocommand/rotateselectioncommand.h" -#include "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 "undocommand/rotatetextscommand.h" #include - /** @brief QETDiagramEditor::QETDiagramEditor Constructor diff --git a/sources/qetdiagrameditor.h b/sources/qetdiagrameditor.h index 3af663805..1b84453e1 100644 --- a/sources/qetdiagrameditor.h +++ b/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 +#include #include #include -#include #include -#include "qetmainwindow.h" -#include "searchandreplacewidget.h" - class QMdiSubWindow; class QETProject; class QETResult; diff --git a/sources/qetgraphicsitem/ViewItem/projectdbmodel.cpp b/sources/qetgraphicsitem/ViewItem/projectdbmodel.cpp index a69fa1995..0789de0c9 100644 --- a/sources/qetgraphicsitem/ViewItem/projectdbmodel.cpp +++ b/sources/qetgraphicsitem/ViewItem/projectdbmodel.cpp @@ -16,11 +16,12 @@ along with QElectroTech. If not, see . */ #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 #include diff --git a/sources/qetgraphicsitem/ViewItem/qetgraphicsheaderitem.cpp b/sources/qetgraphicsitem/ViewItem/qetgraphicsheaderitem.cpp index 8301e0548..1d31f7ac1 100644 --- a/sources/qetgraphicsitem/ViewItem/qetgraphicsheaderitem.cpp +++ b/sources/qetgraphicsitem/ViewItem/qetgraphicsheaderitem.cpp @@ -16,10 +16,11 @@ along with QElectroTech. If not, see . */ #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 #include diff --git a/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp b/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp index 419097764..906f5d5ce 100644 --- a/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp +++ b/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp @@ -16,20 +16,21 @@ along with QElectroTech. If not, see . */ #include "qetgraphicstableitem.h" -#include "diagram.h" -#include "qetgraphicsheaderitem.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" -#include "qetxml.h" -#include "elementprovider.h" -#include "qetutils.h" -#include "projectdbmodel.h" + +#include "../../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../../diagram.h" +#include "../../qetxml.h" +#include "../../utils/qetutils.h" #include "createdxf.h" +#include "elementprovider.h" +#include "projectdbmodel.h" +#include "qetgraphicsheaderitem.h" #include #include -#include #include #include +#include static int no_model_height = 20; static int no_model_width = 40; diff --git a/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.h b/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.h index bb0e7c3ee..4bd029892 100644 --- a/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.h +++ b/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.h @@ -18,11 +18,11 @@ #ifndef QetGraphicsTableItem_H #define QetGraphicsTableItem_H -#include +#include "../../QetGraphicsItemModeler/qetgraphicshandleritem.h" +#include "../../qetapp.h" +#include "../../qetgraphicsitem/qetgraphicsitem.h" -#include "qetgraphicsitem.h" -#include "qetapp.h" -#include "QetGraphicsItemModeler/qetgraphicshandleritem.h" +#include class QAbstractItemModel; class QetGraphicsHeaderItem; diff --git a/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.cpp b/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.cpp index 19d4bb262..fe11e8121 100644 --- a/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.cpp +++ b/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.cpp @@ -16,15 +16,16 @@ along with QElectroTech. If not, see . */ #include "graphicstablepropertieseditor.h" -#include "ui_graphicstablepropertieseditor.h" -#include "qetgraphicstableitem.h" -#include "qetgraphicsheaderitem.h" -#include "diagram.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" + +#include "../../../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../../../diagram.h" +#include "../../../elementprovider.h" +#include "../../../utils/qetutils.h" +#include "../qetgraphicsheaderitem.h" +#include "../qetgraphicstableitem.h" #include "itemmodelcommand.h" #include "propertieseditorfactory.h" -#include "elementprovider.h" -#include "qetutils.h" +#include "ui_graphicstablepropertieseditor.h" #include #include diff --git a/sources/qetgraphicsitem/ViewItem/ui/projectdbmodelpropertieswidget.cpp b/sources/qetgraphicsitem/ViewItem/ui/projectdbmodelpropertieswidget.cpp index 414a70a1c..f7d90be79 100644 --- a/sources/qetgraphicsitem/ViewItem/ui/projectdbmodelpropertieswidget.cpp +++ b/sources/qetgraphicsitem/ViewItem/ui/projectdbmodelpropertieswidget.cpp @@ -16,11 +16,12 @@ along with QElectroTech. If not, see . */ #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 diff --git a/sources/qetgraphicsitem/conductor.cpp b/sources/qetgraphicsitem/conductor.cpp index b77fa014f..ea350a35a 100644 --- a/sources/qetgraphicsitem/conductor.cpp +++ b/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 . */ -#include -#include +#include "../qetgraphicsitem/conductor.h" -#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 "conductorpropertiesdialog.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" -#include "numerotationcontextcommands.h" + +#include +#include #define PR(x) qDebug() << #x " = " << x; diff --git a/sources/qetgraphicsitem/conductor.h b/sources/qetgraphicsitem/conductor.h index 2bc04ac8e..54ee0ac66 100644 --- a/sources/qetgraphicsitem/conductor.h +++ b/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 -#include "assignvariables.h" class ConductorProfile; class ConductorSegmentProfile; diff --git a/sources/qetgraphicsitem/conductortextitem.cpp b/sources/qetgraphicsitem/conductortextitem.cpp index e15c24429..cdad14981 100644 --- a/sources/qetgraphicsitem/conductortextitem.cpp +++ b/sources/qetgraphicsitem/conductortextitem.cpp @@ -16,9 +16,10 @@ along with QElectroTech. If not, see . */ #include "conductortextitem.h" -#include "conductor.h" + +#include "../diagram.h" +#include "../qetgraphicsitem/conductor.h" #include "diagramcommands.h" -#include "diagram.h" /** Constructeur diff --git a/sources/qetgraphicsitem/crossrefitem.cpp b/sources/qetgraphicsitem/crossrefitem.cpp index 30fed63f0..2f9e3f371 100644 --- a/sources/qetgraphicsitem/crossrefitem.cpp +++ b/sources/qetgraphicsitem/crossrefitem.cpp @@ -16,14 +16,15 @@ along with QElectroTech. If not, see . */ #include "crossrefitem.h" -#include "element.h" -#include "qetapp.h" -#include "diagramposition.h" -#include "diagram.h" -#include "qgraphicsitemutility.h" -#include "assignvariables.h" + +#include "../autoNum/assignvariables.h" +#include "../diagram.h" +#include "../diagramposition.h" +#include "../qetapp.h" #include "dynamicelementtextitem.h" +#include "element.h" #include "elementtextitemgroup.h" +#include "qgraphicsitemutility.h" //define the height of the header. static int header = 5; diff --git a/sources/qetgraphicsitem/diagramimageitem.cpp b/sources/qetgraphicsitem/diagramimageitem.cpp index d1f4471ae..5d53252d2 100644 --- a/sources/qetgraphicsitem/diagramimageitem.cpp +++ b/sources/qetgraphicsitem/diagramimageitem.cpp @@ -16,8 +16,9 @@ along with QElectroTech. If not, see . */ #include "diagramimageitem.h" -#include "diagram.h" -#include "PropertiesEditor/propertieseditordialog.h" + +#include "../PropertiesEditor/propertieseditordialog.h" +#include "../diagram.h" #include "imagepropertieswidget.h" /** diff --git a/sources/qetgraphicsitem/diagramtextitem.cpp b/sources/qetgraphicsitem/diagramtextitem.cpp index 75818083a..bd98f180b 100644 --- a/sources/qetgraphicsitem/diagramtextitem.cpp +++ b/sources/qetgraphicsitem/diagramtextitem.cpp @@ -16,10 +16,11 @@ along with QElectroTech. If not, see . */ #include "diagramtextitem.h" -#include "diagramcommands.h" -#include "qetapp.h" -#include "richtext/richtexteditor_p.h" -#include "diagram.h" + +#include "../diagram.h" +#include "../diagramcommands.h" +#include "../qetapp.h" +#include "../richtext/richtexteditor_p.h" /** @brief DiagramTextItem::DiagramTextItem diff --git a/sources/qetgraphicsitem/dynamicelementtextitem.cpp b/sources/qetgraphicsitem/dynamicelementtextitem.cpp index afa3c9e44..d66fc1ebc 100644 --- a/sources/qetgraphicsitem/dynamicelementtextitem.cpp +++ b/sources/qetgraphicsitem/dynamicelementtextitem.cpp @@ -16,15 +16,16 @@ along with QElectroTech. If not, see . */ #include "dynamicelementtextitem.h" -#include "element.h" -#include "qetapp.h" -#include "diagram.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" -#include "terminal.h" -#include "conductor.h" -#include "elementtextitemgroup.h" + +#include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../diagram.h" +#include "../qetapp.h" +#include "../qetgraphicsitem/conductor.h" +#include "../qetgraphicsitem/terminal.h" +#include "../qetinformation.h" #include "crossrefitem.h" -#include "qetinformation.h" +#include "element.h" +#include "elementtextitemgroup.h" #include #include diff --git a/sources/qetgraphicsitem/dynamicelementtextitem.h b/sources/qetgraphicsitem/dynamicelementtextitem.h index 69bdaf930..390c59825 100644 --- a/sources/qetgraphicsitem/dynamicelementtextitem.h +++ b/sources/qetgraphicsitem/dynamicelementtextitem.h @@ -18,11 +18,12 @@ #ifndef DYNAMICELEMENTTEXTITEM_H #define DYNAMICELEMENTTEXTITEM_H +#include "../properties/xrefproperties.h" #include "diagramtextitem.h" -#include "xrefproperties.h" #include "element.h" -#include + #include +#include class Element; class Conductor; diff --git a/sources/qetgraphicsitem/element.cpp b/sources/qetgraphicsitem/element.cpp index 401bf644d..14581b9f7 100644 --- a/sources/qetgraphicsitem/element.cpp +++ b/sources/qetgraphicsitem/element.cpp @@ -16,24 +16,26 @@ along with QElectroTech. If not, see . */ #include "element.h" -#include "diagram.h" -#include "conductor.h" -#include "diagramcommands.h" -#include -#include "elementprovider.h" -#include "diagramposition.h" -#include "terminal.h" -#include "terminaldata.h" -#include "PropertiesEditor/propertieseditordialog.h" -#include "elementpropertieswidget.h" -#include "numerotationcontextcommands.h" -#include "diagramcontext.h" -#include "changeelementinformationcommand.h" + +#include "../PropertiesEditor/propertieseditordialog.h" +#include "../diagram.h" +#include "../diagramcommands.h" +#include "../diagramcontext.h" +#include "../diagramposition.h" +#include "../elementpicturefactory.h" +#include "../elementpropertieswidget.h" +#include "../elementprovider.h" +#include "../numerotationcontextcommands.h" +#include "../properties/terminaldata.h" +#include "../qetgraphicsitem/conductor.h" +#include "../qetgraphicsitem/terminal.h" +#include "../undocommand/changeelementinformationcommand.h" #include "dynamicelementtextitem.h" #include "elementtextitemgroup.h" -#include "elementpicturefactory.h" #include "iostream" + #include +#include class ElementXmlRetroCompatibility { diff --git a/sources/qetgraphicsitem/element.h b/sources/qetgraphicsitem/element.h index be31e69db..95ab13871 100644 --- a/sources/qetgraphicsitem/element.h +++ b/sources/qetgraphicsitem/element.h @@ -18,16 +18,16 @@ #ifndef ELEMENT_H #define ELEMENT_H -#include -#include -#include - -#include "qet.h" +#include "../ElementsCollection/elementslocation.h" +#include "../NameList/nameslist.h" +#include "../autoNum/assignvariables.h" +#include "../diagramcontext.h" +#include "../qet.h" #include "qetgraphicsitem.h" -#include "diagramcontext.h" -#include "assignvariables.h" -#include "elementslocation.h" -#include "nameslist.h" + +#include +#include +#include class QETProject; class Terminal; diff --git a/sources/qetgraphicsitem/elementtextitemgroup.cpp b/sources/qetgraphicsitem/elementtextitemgroup.cpp index aca072633..c0b587bac 100644 --- a/sources/qetgraphicsitem/elementtextitemgroup.cpp +++ b/sources/qetgraphicsitem/elementtextitemgroup.cpp @@ -16,18 +16,19 @@ along with QElectroTech. If not, see . */ #include "elementtextitemgroup.h" + +#include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../diagram.h" +#include "../qetapp.h" +#include "../undocommand/addelementtextcommand.h" +#include "crossrefitem.h" #include "dynamicelementtextitem.h" #include "element.h" -#include "diagram.h" -#include "addelementtextcommand.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" -#include "crossrefitem.h" -#include "qetapp.h" #include "masterelement.h" #include "qgraphicsitemutility.h" -#include #include +#include #include /** diff --git a/sources/qetgraphicsitem/independenttextitem.cpp b/sources/qetgraphicsitem/independenttextitem.cpp index 7868f543c..ece71c387 100644 --- a/sources/qetgraphicsitem/independenttextitem.cpp +++ b/sources/qetgraphicsitem/independenttextitem.cpp @@ -16,10 +16,11 @@ along with QElectroTech. If not, see . */ #include "independenttextitem.h" -#include "qet.h" -#include "diagram.h" -#include "diagramcommands.h" -#include "qetapp.h" + +#include "../diagram.h" +#include "../diagramcommands.h" +#include "../qet.h" +#include "../qetapp.h" #include #include diff --git a/sources/qetgraphicsitem/masterelement.cpp b/sources/qetgraphicsitem/masterelement.cpp index 92d22328c..afff272e3 100644 --- a/sources/qetgraphicsitem/masterelement.cpp +++ b/sources/qetgraphicsitem/masterelement.cpp @@ -16,9 +16,11 @@ along with QElectroTech. If not, see . */ #include "masterelement.h" + +#include "../diagram.h" #include "crossrefitem.h" -#include "diagram.h" #include "dynamicelementtextitem.h" + #include /** diff --git a/sources/qetgraphicsitem/qetgraphicsitem.cpp b/sources/qetgraphicsitem/qetgraphicsitem.cpp index 059182e20..eecc67be7 100644 --- a/sources/qetgraphicsitem/qetgraphicsitem.cpp +++ b/sources/qetgraphicsitem/qetgraphicsitem.cpp @@ -16,7 +16,8 @@ along with QElectroTech. If not, see . */ #include "qetgraphicsitem.h" -#include "diagram.h" + +#include "../diagram.h" /** @brief QetGraphicsItem::QetGraphicsItem diff --git a/sources/qetgraphicsitem/qetgraphicsitem.h b/sources/qetgraphicsitem/qetgraphicsitem.h index eba811c35..2bc995137 100644 --- a/sources/qetgraphicsitem/qetgraphicsitem.h +++ b/sources/qetgraphicsitem/qetgraphicsitem.h @@ -18,8 +18,9 @@ #ifndef QETGRAPHICSITEM_H #define QETGRAPHICSITEM_H +#include "../qet.h" + #include -#include "qet.h" class Diagram; diff --git a/sources/qetgraphicsitem/qetshapeitem.cpp b/sources/qetgraphicsitem/qetshapeitem.cpp index b7a79f9e8..21a7b143e 100644 --- a/sources/qetgraphicsitem/qetshapeitem.cpp +++ b/sources/qetgraphicsitem/qetshapeitem.cpp @@ -16,16 +16,17 @@ along with QElectroTech. If not, see . */ #include "qetshapeitem.h" -#include "createdxf.h" -#include "diagram.h" -#include "qet.h" -#include "shapegraphicsitempropertieswidget.h" -#include "PropertiesEditor/propertieseditordialog.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" -#include "QetGraphicsItemModeler/qetgraphicshandlerutility.h" -#include "qetxml.h" -#include "diagramview.h" -#include "qeticons.h" + +#include "../PropertiesEditor/propertieseditordialog.h" +#include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../QetGraphicsItemModeler/qetgraphicshandlerutility.h" +#include "../createdxf.h" +#include "../diagram.h" +#include "../diagramview.h" +#include "../qet.h" +#include "../qeticons.h" +#include "../qetxml.h" +#include "../shapegraphicsitempropertieswidget.h" /** @brief QetShapeItem::QetShapeItem diff --git a/sources/qetgraphicsitem/qetshapeitem.h b/sources/qetgraphicsitem/qetshapeitem.h index 166a20203..cb6c79309 100644 --- a/sources/qetgraphicsitem/qetshapeitem.h +++ b/sources/qetgraphicsitem/qetshapeitem.h @@ -18,9 +18,10 @@ #ifndef QETSHAPEITEM_H #define QETSHAPEITEM_H -#include +#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h" #include "qetgraphicsitem.h" -#include "QetGraphicsItemModeler/qetgraphicshandleritem.h" + +#include class QDomElement; class QDomDocument; diff --git a/sources/qetgraphicsitem/qgraphicsitemutility.cpp b/sources/qetgraphicsitem/qgraphicsitemutility.cpp index 88c8b90cc..827231561 100644 --- a/sources/qetgraphicsitem/qgraphicsitemutility.cpp +++ b/sources/qetgraphicsitem/qgraphicsitemutility.cpp @@ -16,10 +16,12 @@ along with QElectroTech. If not, see . */ #include "qgraphicsitemutility.h" + +#include "../diagram.h" #include "element.h" -#include "diagram.h" -#include + #include +#include /** @brief centerToParentBottom diff --git a/sources/qetgraphicsitem/reportelement.cpp b/sources/qetgraphicsitem/reportelement.cpp index 90c76928d..7cb3365fc 100644 --- a/sources/qetgraphicsitem/reportelement.cpp +++ b/sources/qetgraphicsitem/reportelement.cpp @@ -16,11 +16,12 @@ along with QElectroTech. If not, see . */ #include "reportelement.h" -#include "diagramposition.h" -#include "qetproject.h" -#include "diagram.h" -#include "terminal.h" -#include "conductor.h" + +#include "../diagram.h" +#include "../diagramposition.h" +#include "../qetgraphicsitem/conductor.h" +#include "../qetgraphicsitem/terminal.h" +#include "../qetproject.h" #include "dynamicelementtextitem.h" ReportElement::ReportElement(const ElementsLocation &location, const QString& link_type,QGraphicsItem *qgi, int *state) : diff --git a/sources/qetgraphicsitem/simpleelement.cpp b/sources/qetgraphicsitem/simpleelement.cpp index 87098dff3..f908ade1a 100644 --- a/sources/qetgraphicsitem/simpleelement.cpp +++ b/sources/qetgraphicsitem/simpleelement.cpp @@ -16,7 +16,8 @@ along with QElectroTech. If not, see . */ #include "simpleelement.h" -#include "diagram.h" + +#include "../diagram.h" /** @brief SimpleElement::SimpleElement diff --git a/sources/qetgraphicsitem/slaveelement.cpp b/sources/qetgraphicsitem/slaveelement.cpp index 2289981b9..166d35e0c 100644 --- a/sources/qetgraphicsitem/slaveelement.cpp +++ b/sources/qetgraphicsitem/slaveelement.cpp @@ -16,9 +16,10 @@ along with QElectroTech. If not, see . */ #include "slaveelement.h" -#include "diagramposition.h" -#include "qetapp.h" -#include "diagram.h" + +#include "../diagram.h" +#include "../diagramposition.h" +#include "../qetapp.h" #include "dynamicelementtextitem.h" /** diff --git a/sources/qetgraphicsitem/terminal.cpp b/sources/qetgraphicsitem/terminal.cpp index a3de13335..ac731e87c 100644 --- a/sources/qetgraphicsitem/terminal.cpp +++ b/sources/qetgraphicsitem/terminal.cpp @@ -15,17 +15,18 @@ You should have received a copy of the GNU General Public License along with QElectroTech. If not, see . */ -#include "terminal.h" +#include "../qetgraphicsitem/terminal.h" -#include -#include "diagram.h" -#include "qetgraphicsitem/element.h" -#include "qetgraphicsitem/conductor.h" -#include "diagramcommands.h" -#include "conductorautonumerotation.h" +#include "../conductorautonumerotation.h" +#include "../diagram.h" +#include "../diagramcommands.h" +#include "../qetgraphicsitem/conductor.h" +#include "../qetgraphicsitem/element.h" #include "conductortextitem.h" #include "terminaldata.h" +#include + QColor Terminal::neutralColor = QColor(Qt::blue); QColor Terminal::allowedColor = QColor(Qt::darkGreen); QColor Terminal::warningColor = QColor("#ff8000"); diff --git a/sources/qetgraphicsitem/terminal.h b/sources/qetgraphicsitem/terminal.h index 7e0ca59f6..f7ef43864 100644 --- a/sources/qetgraphicsitem/terminal.h +++ b/sources/qetgraphicsitem/terminal.h @@ -17,9 +17,10 @@ */ #ifndef TERMINAL_H #define TERMINAL_H +#include "../qet.h" + #include #include -#include "qet.h" class Conductor; class Diagram; class Element; diff --git a/sources/qetproject.cpp b/sources/qetproject.cpp index 5d059ec2b..a22a57b9c 100644 --- a/sources/qetproject.cpp +++ b/sources/qetproject.cpp @@ -16,28 +16,28 @@ along with QElectroTech. If not, see . */ - #include "qetproject.h" + +#include "ElementsCollection/xmlelementcollection.h" +#include "autoNum/assignvariables.h" +#include "autoNum/numerotationcontext.h" +#include "autoNum/numerotationcontextcommands.h" #include "diagram.h" #include "qetapp.h" -#include "qetresult.h" -#include "movetemplateshandler.h" #include "qetmessagebox.h" +#include "qetresult.h" +#include "titleblock/integrationmovetemplateshandler.h" +#include "titleblock/movetemplateshandler.h" #include "titleblocktemplate.h" #include "ui/dialogwaiting.h" -#include "numerotationcontext.h" -#include "integrationmovetemplateshandler.h" -#include "xmlelementcollection.h" -#include "importelementdialog.h" -#include "numerotationcontextcommands.h" -#include "assignvariables.h" +#include "ui/importelementdialog.h" -#include -#include -#include -#include #include +#include +#include +#include #include +#include static int BACKUP_INTERVAL = 120000; //interval in ms of backup = 2min diff --git a/sources/qetproject.h b/sources/qetproject.h index 49eb07974..a90cf0691 100644 --- a/sources/qetproject.h +++ b/sources/qetproject.h @@ -18,18 +18,18 @@ #ifndef QET_PROJECT_H #define QET_PROJECT_H -#include -#include - -#include "nameslist.h" -#include "elementslocation.h" +#include "ElementsCollection/elementslocation.h" +#include "NameList/nameslist.h" #include "borderproperties.h" #include "conductorproperties.h" -#include "titleblockproperties.h" -#include "templatescollection.h" +#include "dataBase/projectdatabase.h" +#include "properties/reportproperties.h" #include "properties/xrefproperties.h" -#include "projectdatabase.h" -#include "reportproperties.h" +#include "titleblock/templatescollection.h" +#include "titleblockproperties.h" + +#include +#include class Diagram; class ElementsLocation; diff --git a/sources/qetxml.cpp b/sources/qetxml.cpp index a70d74949..fbaa9bf4f 100644 --- a/sources/qetxml.cpp +++ b/sources/qetxml.cpp @@ -16,11 +16,12 @@ along with QElectroTech. If not, see . */ #include "qetxml.h" -#include "nameslist.h" -#include +#include "NameList/nameslist.h" + #include #include +#include /** @brief QETXML::penToXml diff --git a/sources/titleblock/dimension.h b/sources/titleblock/dimension.h index 2fcfe6fef..3b1d009e5 100644 --- a/sources/titleblock/dimension.h +++ b/sources/titleblock/dimension.h @@ -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. diff --git a/sources/titleblock/movetemplateshandler.h b/sources/titleblock/movetemplateshandler.h index ac5b3b1ce..5ff797f09 100644 --- a/sources/titleblock/movetemplateshandler.h +++ b/sources/titleblock/movetemplateshandler.h @@ -17,10 +17,11 @@ */ #ifndef TITLEBLOCK_SLASH_MOVE_TEMPLATES_HANDLER_H #define TITLEBLOCK_SLASH_MOVE_TEMPLATES_HANDLER_H -#include -#include "qet.h" +#include "../qet.h" #include "templatelocation.h" +#include + /** This class defines the minimal interface required to implement an object able to handle a title block template move or copy. diff --git a/sources/titleblock/qettemplateeditor.h b/sources/titleblock/qettemplateeditor.h index 4ca4b0ba2..56f8eafa7 100644 --- a/sources/titleblock/qettemplateeditor.h +++ b/sources/titleblock/qettemplateeditor.h @@ -17,11 +17,12 @@ */ #ifndef TITLEBLOCK_SLASH_QET_TEMPLATE_EDITOR_H #define TITLEBLOCK_SLASH_QET_TEMPLATE_EDITOR_H -#include -#include "qetmainwindow.h" -#include "qet.h" -#include "templateview.h" +#include "../qet.h" +#include "../qetmainwindow.h" #include "templatelocation.h" +#include "templateview.h" + +#include class ModifyTitleBlockCellCommand; class TitleBlockTemplateCommand; class TitleBlockTemplateCellWidget; diff --git a/sources/titleblock/templatecellwidget.cpp b/sources/titleblock/templatecellwidget.cpp index d6410fb6a..4ff938612 100644 --- a/sources/titleblock/templatecellwidget.cpp +++ b/sources/titleblock/templatecellwidget.cpp @@ -16,14 +16,15 @@ along with QElectroTech. If not, see . */ #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 diff --git a/sources/titleblock/templatelocation.cpp b/sources/titleblock/templatelocation.cpp index 365a846bf..7013a572b 100644 --- a/sources/titleblock/templatelocation.cpp +++ b/sources/titleblock/templatelocation.cpp @@ -16,8 +16,9 @@ along with QElectroTech. If not, see . */ #include "templatelocation.h" + +#include "../qetapp.h" #include "templatescollection.h" -#include "qetapp.h" #include diff --git a/sources/titleblock/templatelocationchooser.cpp b/sources/titleblock/templatelocationchooser.cpp index 6f809f750..6e77aac3e 100644 --- a/sources/titleblock/templatelocationchooser.cpp +++ b/sources/titleblock/templatelocationchooser.cpp @@ -16,8 +16,9 @@ along with QElectroTech. If not, see . */ #include "templatelocationchooser.h" -#include "qetapp.h" -#include "qetproject.h" + +#include "../qetapp.h" +#include "../qetproject.h" #include "templatescollection.h" /** diff --git a/sources/titleblock/templatelocationsaver.cpp b/sources/titleblock/templatelocationsaver.cpp index 20ef826fb..987895662 100644 --- a/sources/titleblock/templatelocationsaver.cpp +++ b/sources/titleblock/templatelocationsaver.cpp @@ -16,8 +16,9 @@ along with QElectroTech. If not, see . */ #include "templatelocationsaver.h" -#include "qetapp.h" -#include "qetproject.h" + +#include "../qetapp.h" +#include "../qetproject.h" #include "templatescollection.h" /** diff --git a/sources/titleblock/templatescollection.cpp b/sources/titleblock/templatescollection.cpp index cb2ed3d7a..1261a39e7 100644 --- a/sources/titleblock/templatescollection.cpp +++ b/sources/titleblock/templatescollection.cpp @@ -16,9 +16,10 @@ along with QElectroTech. If not, see . */ #include "templatescollection.h" -#include "titleblocktemplate.h" -#include "qetapp.h" -#include "qetproject.h" + +#include "../qetapp.h" +#include "../qetproject.h" +#include "../titleblocktemplate.h" #include diff --git a/sources/titleblock/templatescollection.h b/sources/titleblock/templatescollection.h index d7ad4416c..b86e41bdc 100644 --- a/sources/titleblock/templatescollection.h +++ b/sources/titleblock/templatescollection.h @@ -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 #include -#include "templatelocation.h" -#include "qet.h" class TitleBlockTemplate; class QETProject; diff --git a/sources/titleblock/templatevisualcell.cpp b/sources/titleblock/templatevisualcell.cpp index 80e525111..ef536de45 100644 --- a/sources/titleblock/templatevisualcell.cpp +++ b/sources/titleblock/templatevisualcell.cpp @@ -16,8 +16,9 @@ along with QElectroTech. If not, see . */ #include "templatevisualcell.h" + +#include "../diagramcontext.h" #include "titleblocktemplate.h" -#include "diagramcontext.h" /** Constructor diff --git a/sources/titleblockcell.h b/sources/titleblockcell.h index bb3325100..0e3983f4a 100644 --- a/sources/titleblockcell.h +++ b/sources/titleblockcell.h @@ -17,7 +17,7 @@ */ #ifndef TITLEBLOCK_CELL_H #define TITLEBLOCK_CELL_H -#include "nameslist.h" +#include "NameList/nameslist.h" /** This class is a container for the various parameters of a titleblock cell diff --git a/sources/titleblocktemplate.cpp b/sources/titleblocktemplate.cpp index 2c6c102ff..424b61ee8 100644 --- a/sources/titleblocktemplate.cpp +++ b/sources/titleblocktemplate.cpp @@ -16,10 +16,11 @@ along with QElectroTech. If not, see . */ #include "titleblocktemplate.h" + +#include "NameList/nameslist.h" +#include "createdxf.h" #include "qet.h" #include "qetapp.h" -#include "nameslist.h" -#include "createdxf.h" // uncomment the line below to get more debug information //#define TITLEBLOCK_TEMPLATE_DEBUG diff --git a/sources/titleblocktemplate.h b/sources/titleblocktemplate.h index d68a26fcf..7a8b0db89 100644 --- a/sources/titleblocktemplate.h +++ b/sources/titleblocktemplate.h @@ -17,12 +17,13 @@ */ #ifndef TITLEBLOCK_TEMPLATE_H #define TITLEBLOCK_TEMPLATE_H -#include -#include #include "diagramcontext.h" -#include "titleblockcell.h" -#include "dimension.h" #include "qet.h" +#include "titleblock/dimension.h" +#include "titleblockcell.h" + +#include +#include /** @brief The TitleBlockTemplate class diff --git a/sources/ui/alignmenttextdialog.cpp b/sources/ui/alignmenttextdialog.cpp index faff36c1f..66064e05c 100644 --- a/sources/ui/alignmenttextdialog.cpp +++ b/sources/ui/alignmenttextdialog.cpp @@ -16,8 +16,9 @@ along with QElectroTech. If not, see . */ #include "alignmenttextdialog.h" + +#include "../qetgraphicsitem/dynamicelementtextitem.h" #include "ui_alignmenttextdialog.h" -#include "dynamicelementtextitem.h" AlignmentTextDialog::AlignmentTextDialog(Qt::Alignment alignment, QWidget *parent) : QDialog(parent), diff --git a/sources/ui/bomexportdialog.cpp b/sources/ui/bomexportdialog.cpp index 23dd7e8aa..968635fd7 100644 --- a/sources/ui/bomexportdialog.cpp +++ b/sources/ui/bomexportdialog.cpp @@ -16,17 +16,17 @@ along with QElectroTech. If not, see . */ #include "bomexportdialog.h" + +#include "../dataBase/ui/elementquerywidget.h" +#include "../qetapp.h" +#include "../qetinformation.h" +#include "../qetproject.h" #include "ui_bomexportdialog.h" -#include "elementquerywidget.h" -#include "qetproject.h" -#include "qetapp.h" -#include "qetinformation.h" #include #include #include - /** @brief BOMExportDialog::BOMExportDialog @param project diff --git a/sources/ui/borderpropertieswidget.cpp b/sources/ui/borderpropertieswidget.cpp index 5479d3254..f531f1b90 100644 --- a/sources/ui/borderpropertieswidget.cpp +++ b/sources/ui/borderpropertieswidget.cpp @@ -16,8 +16,9 @@ along with QElectroTech. If not, see . */ #include "borderpropertieswidget.h" + +#include "../diagram.h" #include "ui_borderpropertieswidget.h" -#include "diagram.h" /** @brief BorderPropertiesWidget::BorderPropertiesWidget diff --git a/sources/ui/borderpropertieswidget.h b/sources/ui/borderpropertieswidget.h index 65044ef0e..26ed053df 100644 --- a/sources/ui/borderpropertieswidget.h +++ b/sources/ui/borderpropertieswidget.h @@ -18,8 +18,9 @@ #ifndef BORDERPROPERTIESWIDGET_H #define BORDERPROPERTIESWIDGET_H +#include "../borderproperties.h" + #include -#include "borderproperties.h" namespace Ui { class BorderPropertiesWidget; diff --git a/sources/ui/compositetexteditdialog.cpp b/sources/ui/compositetexteditdialog.cpp index e665b2099..7a600d824 100644 --- a/sources/ui/compositetexteditdialog.cpp +++ b/sources/ui/compositetexteditdialog.cpp @@ -1,12 +1,13 @@ #include "compositetexteditdialog.h" -#include +#include "../qetapp.h" +#include "../qetgraphicsitem/conductor.h" +#include "../qetgraphicsitem/dynamicelementtextitem.h" +#include "../qetgraphicsitem/element.h" +#include "../qetinformation.h" #include "ui_compositetexteditdialog.h" -#include "dynamicelementtextitem.h" -#include "element.h" -#include "qetapp.h" -#include "conductor.h" -#include "qetinformation.h" + +#include CompositeTextEditDialog::CompositeTextEditDialog(DynamicElementTextItem *text, QWidget *parent) : QDialog(parent), diff --git a/sources/ui/conductorpropertiesdialog.cpp b/sources/ui/conductorpropertiesdialog.cpp index 1f09f111e..43020a5c4 100644 --- a/sources/ui/conductorpropertiesdialog.cpp +++ b/sources/ui/conductorpropertiesdialog.cpp @@ -17,11 +17,12 @@ */ #include "conductorpropertiesdialog.h" -#include "ui_conductorpropertiesdialog.h" -#include "conductor.h" + +#include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../diagram.h" +#include "../qetgraphicsitem/conductor.h" #include "conductorpropertieswidget.h" -#include "diagram.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" +#include "ui_conductorpropertiesdialog.h" /** @brief ConductorPropertiesDialog::ConductorPropertiesDialog diff --git a/sources/ui/conductorpropertiesdialog.h b/sources/ui/conductorpropertiesdialog.h index 248fa5e6f..fef796fbf 100644 --- a/sources/ui/conductorpropertiesdialog.h +++ b/sources/ui/conductorpropertiesdialog.h @@ -19,8 +19,9 @@ #ifndef CONDUCTORPROPERTIESDIALOG_H #define CONDUCTORPROPERTIESDIALOG_H +#include "../conductorproperties.h" + #include -#include "conductorproperties.h" class Conductor; class ConductorPropertiesWidget; diff --git a/sources/ui/conductorpropertieswidget.cpp b/sources/ui/conductorpropertieswidget.cpp index 0af0dd27b..71b367622 100644 --- a/sources/ui/conductorpropertieswidget.cpp +++ b/sources/ui/conductorpropertieswidget.cpp @@ -16,10 +16,11 @@ along with QElectroTech. If not, see . */ #include "conductorpropertieswidget.h" + +#include "../conductorproperties.h" +#include "../qetapp.h" +#include "../qtextorientationspinboxwidget.h" #include "ui_conductorpropertieswidget.h" -#include "conductorproperties.h" -#include "qetapp.h" -#include "qtextorientationspinboxwidget.h" /** @brief ConductorPropertiesWidget::ConductorPropertiesWidget diff --git a/sources/ui/conductorpropertieswidget.h b/sources/ui/conductorpropertieswidget.h index 37cc9d68b..dd80149e4 100644 --- a/sources/ui/conductorpropertieswidget.h +++ b/sources/ui/conductorpropertieswidget.h @@ -18,8 +18,9 @@ #ifndef CONDUCTORPROPERTIESWIDGET_H #define CONDUCTORPROPERTIESWIDGET_H +#include "../conductorproperties.h" + #include -#include "conductorproperties.h" class QTextOrientationSpinBoxWidget; class QComboBox; class QPushButton; diff --git a/sources/ui/diagramcontextwidget.h b/sources/ui/diagramcontextwidget.h index c8091060b..a3adaa7ca 100644 --- a/sources/ui/diagramcontextwidget.h +++ b/sources/ui/diagramcontextwidget.h @@ -18,8 +18,9 @@ #ifndef DIAGRAMCONTEXTWIDGET_H #define DIAGRAMCONTEXTWIDGET_H +#include "../diagramcontext.h" + #include -#include "diagramcontext.h" namespace Ui { class DiagramContextWidget; diff --git a/sources/ui/diagrampropertiesdialog.cpp b/sources/ui/diagrampropertiesdialog.cpp index ede80324d..ead25f189 100644 --- a/sources/ui/diagrampropertiesdialog.cpp +++ b/sources/ui/diagrampropertiesdialog.cpp @@ -16,13 +16,14 @@ along with QElectroTech. If not, see . */ #include "diagrampropertiesdialog.h" + +#include "../diagram.h" +#include "../diagramcommands.h" +#include "../undocommand/changetitleblockcommand.h" #include "borderpropertieswidget.h" -#include "titleblockpropertieswidget.h" #include "conductorpropertieswidget.h" -#include "diagramcommands.h" #include "projectpropertiesdialog.h" -#include "diagram.h" -#include "changetitleblockcommand.h" +#include "titleblockpropertieswidget.h" /** @brief DiagramPropertiesDialog::DiagramPropertiesDialog diff --git a/sources/ui/diagrampropertieseditordockwidget.cpp b/sources/ui/diagrampropertieseditordockwidget.cpp index 4c9c9f3e9..7e9941d83 100644 --- a/sources/ui/diagrampropertieseditordockwidget.cpp +++ b/sources/ui/diagrampropertieseditordockwidget.cpp @@ -16,9 +16,10 @@ along with QElectroTech. If not, see . */ #include "diagrampropertieseditordockwidget.h" -#include "diagram.h" -#include "PropertiesEditor/propertieseditorwidget.h" -#include "propertieseditorfactory.h" + +#include "../PropertiesEditor/propertieseditorwidget.h" +#include "../diagram.h" +#include "../propertieseditorfactory.h" /** @brief DiagramPropertiesEditorDockWidget::DiagramPropertiesEditorDockWidget diff --git a/sources/ui/diagrampropertieseditordockwidget.h b/sources/ui/diagrampropertieseditordockwidget.h index fc30148fd..d9c3cabd7 100644 --- a/sources/ui/diagrampropertieseditordockwidget.h +++ b/sources/ui/diagrampropertieseditordockwidget.h @@ -18,7 +18,7 @@ #ifndef DIAGRAMPROPERTIESEDITORDOCKWIDGET_H #define DIAGRAMPROPERTIESEDITORDOCKWIDGET_H -#include "PropertiesEditor/propertieseditordockwidget.h" +#include "../PropertiesEditor/propertieseditordockwidget.h" class Diagram; diff --git a/sources/ui/diagramselection.h b/sources/ui/diagramselection.h index 572092655..3e954c4d9 100644 --- a/sources/ui/diagramselection.h +++ b/sources/ui/diagramselection.h @@ -18,10 +18,10 @@ #ifndef DIAGRAMSELECTION_H #define DIAGRAMSELECTION_H -#include +#include "../diagram.h" +#include "../qetproject.h" -#include "diagram.h" -#include "qetproject.h" +#include namespace Ui { class diagramselection; diff --git a/sources/ui/dynamicelementtextitemeditor.cpp b/sources/ui/dynamicelementtextitemeditor.cpp index 25fb9da85..833931164 100644 --- a/sources/ui/dynamicelementtextitemeditor.cpp +++ b/sources/ui/dynamicelementtextitemeditor.cpp @@ -16,17 +16,17 @@ along with QElectroTech. If not, see . */ #include "dynamicelementtextitemeditor.h" -#include "ui_dynamicelementtextitemeditor.h" -#include "dynamicelementtextitem.h" -#include "element.h" + +#include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../diagram.h" +#include "../dynamicelementtextitem.h" +#include "../elementtextitemgroup.h" +#include "../elementtextpattern.h" +#include "../qetgraphicsitem/element.h" +#include "../ui_dynamicelementtextitemeditor.h" +#include "../undocommand/addelementtextcommand.h" +#include "../undocommand/deleteqgraphicsitemcommand.h" #include "dynamicelementtextmodel.h" -#include "diagram.h" -#include "undocommand/deleteqgraphicsitemcommand.h" -#include "undocommand/addelementtextcommand.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" -#include "elementtextitemgroup.h" -#include "deleteqgraphicsitemcommand.h" -#include "elementtextpattern.h" #include #include diff --git a/sources/ui/dynamicelementtextmodel.cpp b/sources/ui/dynamicelementtextmodel.cpp index 8550f89ad..86aadc088 100644 --- a/sources/ui/dynamicelementtextmodel.cpp +++ b/sources/ui/dynamicelementtextmodel.cpp @@ -16,25 +16,26 @@ along with QElectroTech. If not, see . */ #include "dynamicelementtextmodel.h" -#include "dynamicelementtextitem.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" -#include "element.h" -#include "compositetexteditdialog.h" -#include "terminal.h" -#include "conductor.h" -#include "elementtextitemgroup.h" -#include "qeticons.h" -#include "diagram.h" -#include "addelementtextcommand.h" -#include "alignmenttextdialog.h" -#include "qetinformation.h" -#include "qetapp.h" -#include -#include +#include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../diagram.h" +#include "../dynamicelementtextitem.h" +#include "../elementtextitemgroup.h" +#include "../qetapp.h" +#include "../qetgraphicsitem/conductor.h" +#include "../qetgraphicsitem/element.h" +#include "../qetgraphicsitem/terminal.h" +#include "../qeticons.h" +#include "../qetinformation.h" +#include "../undocommand/addelementtextcommand.h" +#include "alignmenttextdialog.h" +#include "compositetexteditdialog.h" + #include -#include #include +#include +#include +#include #include static int src_txt_row = 0; diff --git a/sources/ui/dynamicelementtextmodel.h b/sources/ui/dynamicelementtextmodel.h index ca0c3ff3d..c6c9a4d4c 100644 --- a/sources/ui/dynamicelementtextmodel.h +++ b/sources/ui/dynamicelementtextmodel.h @@ -18,11 +18,11 @@ #ifndef DYNAMICELEMENTTEXTMODEL_H #define DYNAMICELEMENTTEXTMODEL_H -#include -#include +#include "../qetgraphicsitem/dynamicelementtextitem.h" +#include +#include #include -#include "dynamicelementtextitem.h" class QUndoCommand; class ElementTextItemGroup; diff --git a/sources/ui/elementinfowidget.cpp b/sources/ui/elementinfowidget.cpp index 96f3fc785..d7edff7e4 100644 --- a/sources/ui/elementinfowidget.cpp +++ b/sources/ui/elementinfowidget.cpp @@ -16,13 +16,14 @@ along with QElectroTech. If not, see . */ #include "elementinfowidget.h" -#include "ui_elementinfowidget.h" -#include "qetapp.h" -#include "changeelementinformationcommand.h" -#include "diagram.h" + +#include "../diagram.h" +#include "../qetapp.h" +#include "../qetgraphicsitem/element.h" +#include "../qetinformation.h" +#include "../ui_elementinfowidget.h" +#include "../undocommand/changeelementinformationcommand.h" #include "elementinfopartwidget.h" -#include "element.h" -#include "qetinformation.h" /** @brief ElementInfoWidget::ElementInfoWidget diff --git a/sources/ui/elementinfowidget.h b/sources/ui/elementinfowidget.h index b0316cde1..42b3bf740 100644 --- a/sources/ui/elementinfowidget.h +++ b/sources/ui/elementinfowidget.h @@ -18,9 +18,10 @@ #ifndef ELEMENTINFOWIDGET_H #define ELEMENTINFOWIDGET_H -#include +#include "../diagramcontext.h" #include "abstractelementpropertieseditorwidget.h" -#include "diagramcontext.h" + +#include class Element; class QUndoCommand; diff --git a/sources/ui/elementpropertieswidget.cpp b/sources/ui/elementpropertieswidget.cpp index 704d8afb4..ced36e94b 100644 --- a/sources/ui/elementpropertieswidget.cpp +++ b/sources/ui/elementpropertieswidget.cpp @@ -16,21 +16,22 @@ along with QElectroTech. If not, see . */ #include "elementpropertieswidget.h" -#include "element.h" -#include "elementinfowidget.h" -#include "masterpropertieswidget.h" -#include "linksingleelementwidget.h" -#include "diagram.h" -#include "diagramposition.h" -#include "qeticons.h" -#include "dynamicelementtextitemeditor.h" -#include "dynamicelementtextitem.h" -#include "elementtextitemgroup.h" -#include "qetapp.h" -#include +#include "../diagram.h" +#include "../diagramposition.h" +#include "../dynamicelementtextitem.h" +#include "../elementtextitemgroup.h" +#include "../qetapp.h" +#include "../qetgraphicsitem/element.h" +#include "../qeticons.h" +#include "dynamicelementtextitemeditor.h" +#include "elementinfowidget.h" +#include "linksingleelementwidget.h" +#include "masterpropertieswidget.h" + #include #include +#include /** @brief ElementPropertiesWidget::ElementPropertiesWidget diff --git a/sources/ui/imagepropertieswidget.cpp b/sources/ui/imagepropertieswidget.cpp index c65d41e96..5361d2758 100644 --- a/sources/ui/imagepropertieswidget.cpp +++ b/sources/ui/imagepropertieswidget.cpp @@ -16,10 +16,11 @@ along with QElectroTech. If not, see . */ #include "imagepropertieswidget.h" -#include "ui_imagepropertieswidget.h" -#include "diagramimageitem.h" -#include "diagram.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" + +#include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../diagram.h" +#include "../diagramimageitem.h" +#include "../ui_imagepropertieswidget.h" /** @brief ImagePropertiesWidget::ImagePropertiesWidget diff --git a/sources/ui/importelementdialog.h b/sources/ui/importelementdialog.h index 18f87067c..481389854 100644 --- a/sources/ui/importelementdialog.h +++ b/sources/ui/importelementdialog.h @@ -18,8 +18,9 @@ #ifndef IMPORTELEMENTDIALOG_H #define IMPORTELEMENTDIALOG_H +#include "../qet.h" + #include -#include "qet.h" namespace Ui { class ImportElementDialog; diff --git a/sources/ui/inditextpropertieswidget.cpp b/sources/ui/inditextpropertieswidget.cpp index fd651cd8b..ae7905257 100644 --- a/sources/ui/inditextpropertieswidget.cpp +++ b/sources/ui/inditextpropertieswidget.cpp @@ -16,13 +16,15 @@ along with QElectroTech. If not, see . */ #include "inditextpropertieswidget.h" -#include "ui_inditextpropertieswidget.h" -#include "independenttextitem.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" -#include "diagram.h" -#include "diagramcommands.h" -#include + +#include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../diagram.h" +#include "../diagramcommands.h" +#include "../independenttextitem.h" +#include "../ui_inditextpropertieswidget.h" + #include +#include /** @brief IndiTextPropertiesWidget::IndiTextPropertiesWidget diff --git a/sources/ui/linksingleelementwidget.cpp b/sources/ui/linksingleelementwidget.cpp index b7f0f47cd..9d6efcff0 100644 --- a/sources/ui/linksingleelementwidget.cpp +++ b/sources/ui/linksingleelementwidget.cpp @@ -16,12 +16,13 @@ along with QElectroTech. If not, see . */ #include "linksingleelementwidget.h" -#include "ui_linksingleelementwidget.h" -#include "diagram.h" -#include "elementprovider.h" -#include "linkelementcommand.h" -#include "diagramposition.h" -#include "conductor.h" + +#include "../diagram.h" +#include "../diagramposition.h" +#include "../elementprovider.h" +#include "../qetgraphicsitem/conductor.h" +#include "../ui_linksingleelementwidget.h" +#include "../undocommand/linkelementcommand.h" #include diff --git a/sources/ui/linksingleelementwidget.h b/sources/ui/linksingleelementwidget.h index cd436322e..4a0705597 100644 --- a/sources/ui/linksingleelementwidget.h +++ b/sources/ui/linksingleelementwidget.h @@ -18,11 +18,11 @@ #ifndef LINKSINGLEELEMENTWIDGET_H #define LINKSINGLEELEMENTWIDGET_H -#include - -#include "element.h" +#include "../qetgraphicsitem/element.h" #include "abstractelementpropertieseditorwidget.h" +#include + class QTreeWidgetItem; namespace Ui { diff --git a/sources/ui/multipastedialog.cpp b/sources/ui/multipastedialog.cpp index ea0bf2753..1da333af2 100644 --- a/sources/ui/multipastedialog.cpp +++ b/sources/ui/multipastedialog.cpp @@ -16,15 +16,16 @@ along with QElectroTech. If not, see . */ -#include -#include - #include "multipastedialog.h" -#include "ui_multipastedialog.h" -#include "diagram.h" -#include "diagramcommands.h" -#include "element.h" -#include "conductorautonumerotation.h" + +#include "../conductorautonumerotation.h" +#include "../diagram.h" +#include "../diagramcommands.h" +#include "../qetgraphicsitem/element.h" +#include "../ui_multipastedialog.h" + +#include +#include MultiPasteDialog::MultiPasteDialog(Diagram *diagram, QWidget *parent) : QDialog(parent), diff --git a/sources/ui/multipastedialog.h b/sources/ui/multipastedialog.h index 3691f5924..9f53de858 100644 --- a/sources/ui/multipastedialog.h +++ b/sources/ui/multipastedialog.h @@ -18,10 +18,11 @@ #ifndef MULTIPASTEDIALOG_H #define MULTIPASTEDIALOG_H -#include -#include "diagramcontent.h" +#include "../diagramcontent.h" #include "QDomDocument" +#include + class Diagram; namespace Ui { diff --git a/sources/ui/potentialselectordialog.cpp b/sources/ui/potentialselectordialog.cpp index baf5f1396..cff46fbe4 100644 --- a/sources/ui/potentialselectordialog.cpp +++ b/sources/ui/potentialselectordialog.cpp @@ -16,20 +16,21 @@ along with QElectroTech. If not, see . */ -#include -#include - #include "potentialselectordialog.h" -#include "ui_potentialselectordialog.h" -#include "conductor.h" -#include "terminal.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" -#include "diagram.h" -#include "element.h" -#include "reportelement.h" -#include "assignvariables.h" + +#include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../autoNum/assignvariables.h" +#include "../diagram.h" +#include "../qetgraphicsitem/conductor.h" +#include "../qetgraphicsitem/element.h" +#include "../qetgraphicsitem/terminal.h" +#include "../reportelement.h" +#include "../ui_potentialselectordialog.h" #include "formulaassistantdialog.h" +#include +#include + //### BEGIN PRIVATE CLASS ###// /** diff --git a/sources/ui/potentialselectordialog.h b/sources/ui/potentialselectordialog.h index 2fc9f0830..79dafc0e2 100644 --- a/sources/ui/potentialselectordialog.h +++ b/sources/ui/potentialselectordialog.h @@ -18,9 +18,10 @@ #ifndef POTENTIALSELECTORDIALOG_H #define POTENTIALSELECTORDIALOG_H +#include "../autoNum/assignvariables.h" +#include "../conductorproperties.h" + #include -#include "conductorproperties.h" -#include "assignvariables.h" class Conductor; class QUndoCommand; class Element; diff --git a/sources/ui/projectpropertiesdialog.cpp b/sources/ui/projectpropertiesdialog.cpp index 716d8f236..143117a0b 100644 --- a/sources/ui/projectpropertiesdialog.cpp +++ b/sources/ui/projectpropertiesdialog.cpp @@ -16,10 +16,12 @@ along with QElectroTech. If not, see . */ #include "projectpropertiesdialog.h" -#include "configdialog.h" -#include "projectconfigpages.h" + +#include "../configdialog.h" +#include "../configpages.h" +#include "../projectconfigpages.h" + #include -#include "configpages.h" /** @brief ProjectPropertiesDialog::ProjectPropertiesDialog diff --git a/sources/ui/shapegraphicsitempropertieswidget.cpp b/sources/ui/shapegraphicsitempropertieswidget.cpp index 97c07e465..ed2759c65 100644 --- a/sources/ui/shapegraphicsitempropertieswidget.cpp +++ b/sources/ui/shapegraphicsitempropertieswidget.cpp @@ -16,13 +16,14 @@ along with QElectroTech. If not, see . */ -#include - #include "shapegraphicsitempropertieswidget.h" -#include "ui_shapegraphicsitempropertieswidget.h" -#include "qetshapeitem.h" -#include "diagram.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" + +#include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../diagram.h" +#include "../qetshapeitem.h" +#include "../ui_shapegraphicsitempropertieswidget.h" + +#include /** @brief ShapeGraphicsItemPropertiesWidget::ShapeGraphicsItemPropertiesWidget diff --git a/sources/ui/titleblockpropertieswidget.cpp b/sources/ui/titleblockpropertieswidget.cpp index 21c5fb1cf..7b4345981 100644 --- a/sources/ui/titleblockpropertieswidget.cpp +++ b/sources/ui/titleblockpropertieswidget.cpp @@ -16,11 +16,13 @@ along with QElectroTech. If not, see . */ #include "titleblockpropertieswidget.h" + +#include "../qetapp.h" +#include "../qeticons.h" +#include "../titleblock/templatescollection.h" +#include "../titleblocktemplate.h" #include "ui_titleblockpropertieswidget.h" -#include "templatescollection.h" -#include "qeticons.h" -#include "titleblocktemplate.h" -#include "qetapp.h" + #include #include diff --git a/sources/ui/titleblockpropertieswidget.h b/sources/ui/titleblockpropertieswidget.h index 2aacd5810..45a2afc75 100644 --- a/sources/ui/titleblockpropertieswidget.h +++ b/sources/ui/titleblockpropertieswidget.h @@ -18,12 +18,13 @@ #ifndef TITLEBLOCKPROPERTIESWIDGET_H #define TITLEBLOCKPROPERTIESWIDGET_H -#include "qetproject.h" -#include -#include "titleblockproperties.h" +#include "../autoNum/numerotationcontext.h" +#include "../qet.h" +#include "../qetproject.h" +#include "../titleblockproperties.h" #include "diagramcontextwidget.h" -#include "qet.h" -#include "numerotationcontext.h" + +#include class NumerotationContext; class QETProject; diff --git a/sources/ui/xrefpropertieswidget.h b/sources/ui/xrefpropertieswidget.h index bd7471cd4..ea6d826f3 100644 --- a/sources/ui/xrefpropertieswidget.h +++ b/sources/ui/xrefpropertieswidget.h @@ -18,10 +18,10 @@ #ifndef XREFPROPERTIESWIDGET_H #define XREFPROPERTIESWIDGET_H -#include -#include +#include "../properties/xrefproperties.h" -#include "properties/xrefproperties.h" +#include +#include namespace Ui { class XRefPropertiesWidget; diff --git a/sources/undocommand/addelementtextcommand.cpp b/sources/undocommand/addelementtextcommand.cpp index df1e996d9..b1c810722 100644 --- a/sources/undocommand/addelementtextcommand.cpp +++ b/sources/undocommand/addelementtextcommand.cpp @@ -1,29 +1,29 @@ /* Copyright 2006-2020 The QElectroTech Team This file is part of QElectroTech. - + QElectroTech is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. - + QElectroTech is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with QElectroTech. If not, see . */ #include "addelementtextcommand.h" -#include "element.h" -#include "dynamicelementtextitem.h" -#include "elementtextitemgroup.h" + +#include "../qetgraphicsitem/dynamicelementtextitem.h" +#include "../qetgraphicsitem/element.h" +#include "../qetgraphicsitem/elementtextitemgroup.h" #include #include - /************************ * AddElementTextCommand* * **********************/ diff --git a/sources/undocommand/changeelementinformationcommand.cpp b/sources/undocommand/changeelementinformationcommand.cpp index 3d643db27..108f5dda8 100644 --- a/sources/undocommand/changeelementinformationcommand.cpp +++ b/sources/undocommand/changeelementinformationcommand.cpp @@ -16,8 +16,10 @@ along with QElectroTech. If not, see . */ #include "changeelementinformationcommand.h" -#include "element.h" -#include "diagram.h" + +#include "../diagram.h" +#include "../qetgraphicsitem/element.h" + #include /** diff --git a/sources/undocommand/changeelementinformationcommand.h b/sources/undocommand/changeelementinformationcommand.h index 9fc8db087..20ef0d3d7 100644 --- a/sources/undocommand/changeelementinformationcommand.h +++ b/sources/undocommand/changeelementinformationcommand.h @@ -18,8 +18,9 @@ #ifndef CHANGEELEMENTINFORMATIONCOMMAND_H #define CHANGEELEMENTINFORMATIONCOMMAND_H +#include "../diagramcontext.h" + #include -#include "diagramcontext.h" class Element; diff --git a/sources/undocommand/changetitleblockcommand.cpp b/sources/undocommand/changetitleblockcommand.cpp index fac92c5c1..fa54cc232 100644 --- a/sources/undocommand/changetitleblockcommand.cpp +++ b/sources/undocommand/changetitleblockcommand.cpp @@ -17,7 +17,8 @@ */ #include "changetitleblockcommand.h" -#include "diagram.h" + +#include "../diagram.h" /** @brief ChangeTitleBlockCommand::ChangeTitleBlockCommand diff --git a/sources/undocommand/changetitleblockcommand.h b/sources/undocommand/changetitleblockcommand.h index 1d33098a6..8b06384d0 100644 --- a/sources/undocommand/changetitleblockcommand.h +++ b/sources/undocommand/changetitleblockcommand.h @@ -18,9 +18,9 @@ #ifndef CHANGETITLEBLOCKCOMMAND_H #define CHANGETITLEBLOCKCOMMAND_H -#include +#include "../titleblockproperties.h" -#include "titleblockproperties.h" +#include class Diagram; /** diff --git a/sources/undocommand/deleteqgraphicsitemcommand.cpp b/sources/undocommand/deleteqgraphicsitemcommand.cpp index 4e3f2a76b..4033999f7 100644 --- a/sources/undocommand/deleteqgraphicsitemcommand.cpp +++ b/sources/undocommand/deleteqgraphicsitemcommand.cpp @@ -16,17 +16,18 @@ along with QElectroTech. If not, see . */ #include "deleteqgraphicsitemcommand.h" -#include "dynamicelementtextitem.h" -#include "diagram.h" -#include "element.h" -#include "conductor.h" -#include "conductortextitem.h" -#include "elementtextitemgroup.h" + +#include "../conductortextitem.h" +#include "../diagram.h" +#include "../diagramcommands.h" +#include "../dynamicelementtextitem.h" +#include "../elementtextitemgroup.h" +#include "../qetdiagrameditor.h" +#include "../qetgraphicsitem/conductor.h" +#include "../qetgraphicsitem/element.h" +#include "../qetgraphicsitem/terminal.h" +#include "../qetgraphicstableitem.h" #include "addelementtextcommand.h" -#include "terminal.h" -#include "diagramcommands.h" -#include "qetgraphicstableitem.h" -#include "qetdiagrameditor.h" /** @brief DeleteQGraphicsItemCommand::DeleteQGraphicsItemCommand diff --git a/sources/undocommand/deleteqgraphicsitemcommand.h b/sources/undocommand/deleteqgraphicsitemcommand.h index b2c3ba400..a4b1f338a 100644 --- a/sources/undocommand/deleteqgraphicsitemcommand.h +++ b/sources/undocommand/deleteqgraphicsitemcommand.h @@ -18,10 +18,10 @@ #ifndef DELETEQGRAPHICSITEMCOMMAND_H #define DELETEQGRAPHICSITEMCOMMAND_H -#include -#include +#include "../diagramcontent.h" -#include "diagramcontent.h" +#include +#include class Diagram; class ElementTextItemGroup; diff --git a/sources/undocommand/linkelementcommand.cpp b/sources/undocommand/linkelementcommand.cpp index 1a56fb981..3a8984962 100644 --- a/sources/undocommand/linkelementcommand.cpp +++ b/sources/undocommand/linkelementcommand.cpp @@ -16,11 +16,12 @@ along with QElectroTech. If not, see . */ #include "linkelementcommand.h" -#include "element.h" -#include "diagram.h" -#include "conductorautonumerotation.h" -#include "conductor.h" -#include "potentialselectordialog.h" + +#include "../conductorautonumerotation.h" +#include "../diagram.h" +#include "../potentialselectordialog.h" +#include "../qetgraphicsitem/conductor.h" +#include "../qetgraphicsitem/element.h" /** @brief LinkElementCommand::LinkElementCommand diff --git a/sources/undocommand/rotateselectioncommand.cpp b/sources/undocommand/rotateselectioncommand.cpp index 2a66cecd9..03b7618e6 100644 --- a/sources/undocommand/rotateselectioncommand.cpp +++ b/sources/undocommand/rotateselectioncommand.cpp @@ -16,16 +16,17 @@ along with QElectroTech. If not, see . */ #include "rotateselectioncommand.h" -#include "element.h" -#include "conductortextitem.h" -#include "independenttextitem.h" -#include "dynamicelementtextitem.h" -#include "elementtextitemgroup.h" -#include "diagramimageitem.h" -#include "diagram.h" -#include "conductor.h" -#include "qet.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" + +#include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../conductortextitem.h" +#include "../diagram.h" +#include "../diagramimageitem.h" +#include "../dynamicelementtextitem.h" +#include "../elementtextitemgroup.h" +#include "../independenttextitem.h" +#include "../qet.h" +#include "../qetgraphicsitem/conductor.h" +#include "../qetgraphicsitem/element.h" #include diff --git a/sources/undocommand/rotatetextscommand.cpp b/sources/undocommand/rotatetextscommand.cpp index c0e46909e..c0dbc8147 100644 --- a/sources/undocommand/rotatetextscommand.cpp +++ b/sources/undocommand/rotatetextscommand.cpp @@ -16,13 +16,14 @@ along with QElectroTech. If not, see . */ #include "rotatetextscommand.h" + +#include "../diagram.h" +#include "../qetapp.h" +#include "../qtextorientationspinboxwidget.h" +#include "conductortextitem.h" #include "diagramcontent.h" -#include "diagram.h" #include "diagramtextitem.h" #include "elementtextitemgroup.h" -#include "conductortextitem.h" -#include "qetapp.h" -#include "qtextorientationspinboxwidget.h" /** @brief RotateTextsCommand::RotateTextsCommand diff --git a/sources/utils/conductorcreator.cpp b/sources/utils/conductorcreator.cpp index 06a8f68f2..bf901dfcc 100644 --- a/sources/utils/conductorcreator.cpp +++ b/sources/utils/conductorcreator.cpp @@ -16,14 +16,15 @@ along with QElectroTech. If not, see . */ #include "conductorcreator.h" -#include "diagram.h" + +#include "../conductorautonumerotation.h" +#include "../diagram.h" +#include "../diagramcommands.h" +#include "../potentialselectordialog.h" +#include "../qetgraphicsitem/conductor.h" +#include "../qetgraphicsitem/element.h" +#include "../qetgraphicsitem/terminal.h" #include "qgraphicsitem.h" -#include "terminal.h" -#include "conductor.h" -#include "potentialselectordialog.h" -#include "diagramcommands.h" -#include "conductorautonumerotation.h" -#include "element.h" #include diff --git a/sources/utils/conductorcreator.h b/sources/utils/conductorcreator.h index 02bc5e56b..16c78483b 100644 --- a/sources/utils/conductorcreator.h +++ b/sources/utils/conductorcreator.h @@ -23,13 +23,11 @@ class QPolygonF; class Terminal; class Conductor; -#include "conductorproperties.h" -#include "conductorproperties.h" -#include "assignvariables.h" +#include "../autoNum/assignvariables.h" +#include "../conductorproperties.h" #include - /** @brief The ConductorCreator class This class create one or several or several conductors diff --git a/tests/catch/CMakeLists.txt b/tests/catch/CMakeLists.txt index 26b75e338..4e314703f 100644 --- a/tests/catch/CMakeLists.txt +++ b/tests/catch/CMakeLists.txt @@ -17,6 +17,7 @@ cmake_minimum_required(VERSION 3.5) message("_____________________________________________________________________") + project(C_unittests LANGUAGES CXX) if(DEFINED ENV{QET_DIR}) @@ -32,7 +33,12 @@ SET(CMAKE_CXX_STANDARD 17) find_package(Qt5Gui REQUIRED) find_package(Qt5Xml REQUIRED) +find_package(Qt5Svg REQUIRED) +find_package(Qt5Sql REQUIRED) +find_package(Qt5Concurrent REQUIRED) find_package(Qt5Widgets REQUIRED) +find_package(KF5WidgetsAddons) +find_package(KF5CoreAddons) Include(FetchContent) @@ -43,21 +49,28 @@ FetchContent_Declare( FetchContent_MakeAvailable(Catch2) + add_executable( ${PROJECT_NAME} tst_My_test.cpp + src/borderproperties_test.cpp main.cpp - ${QET_DIR}/sources/borderproperties.h - ${QET_DIR}/sources/borderproperties.cpp) + ${QET_DIR}/sources/borderproperties.cpp + ${QET_DIR}/sources/borderproperties.h) target_link_libraries( ${PROJECT_NAME} PUBLIC Catch2::Catch2 PRIVATE + KF5::WidgetsAddons + KF5::CoreAddons Qt5::Gui Qt5::Xml - Qt5::Widgets) + Qt5::Svg + Qt5::Sql + Qt5::Widgets + Qt5::Concurrent) if (DEFINED ENV{CATCH_INCLUDE_DIR}) set(CATCH_INCLUDE_DIR $ENV{CATCH_INCLUDE_DIR}) diff --git a/tests/catch/tst_My_test.cpp b/tests/catch/tst_My_test.cpp index 5d2303511..2f75acacc 100644 --- a/tests/catch/tst_My_test.cpp +++ b/tests/catch/tst_My_test.cpp @@ -1,22 +1,3 @@ -#include "../../sources/borderproperties.h" - #include TEST_CASE("My first test with Catch2", "[fancy]") { REQUIRE(0 == 0); } - -TEST_CASE("BorderProperties") -{ - int var = 5; - BorderProperties My; - My.columns_count = var; - My.columns_header_height = var; - - CHECK(My.columns_count - 1 == var); // test zal falen maar test de vogende - CHECK( - My.columns_header_height - 1 - == var); // test zal falen maar test de vogende - REQUIRE(0 == 0); - REQUIRE(1 == 0); // test zal falen en stopt - REQUIRE(0 == 0); // not testit - REQUIRE(1 == 0); // not testit -} diff --git a/tests/googletest/CMakeLists.txt b/tests/googletest/CMakeLists.txt index c52a8046f..042cc2339 100644 --- a/tests/googletest/CMakeLists.txt +++ b/tests/googletest/CMakeLists.txt @@ -17,6 +17,7 @@ cmake_minimum_required(VERSION 3.5) message("_____________________________________________________________________") + project(G_unittests LANGUAGES CXX) if(DEFINED ENV{QET_DIR}) @@ -32,7 +33,12 @@ SET(CMAKE_CXX_STANDARD 17) find_package(Qt5Gui REQUIRED) find_package(Qt5Xml REQUIRED) +find_package(Qt5Svg REQUIRED) +find_package(Qt5Sql REQUIRED) +find_package(Qt5Concurrent REQUIRED) find_package(Qt5Widgets REQUIRED) +find_package(KF5WidgetsAddons) +find_package(KF5CoreAddons) Include(FetchContent) @@ -46,16 +52,19 @@ FetchContent_MakeAvailable(GTest) add_executable( ${PROJECT_NAME} tst_My_test.cpp - main.cpp - ${QET_DIR}/sources/borderproperties.h - ${QET_DIR}/sources/borderproperties.cpp) + main.cpp) target_link_libraries( ${PROJECT_NAME} PUBLIC gtest gtest_main PRIVATE + KF5::WidgetsAddons + KF5::CoreAddons Qt5::Gui Qt5::Xml - Qt5::Widgets) + Qt5::Svg + Qt5::Sql + Qt5::Widgets + Qt5::Concurrent)