From d15443cf930fb068f8bb0bb81d5cfaca4b8ae37a Mon Sep 17 00:00:00 2001 From: Simon De Backer Date: Thu, 10 Dec 2020 18:44:03 +0100 Subject: [PATCH] Wip Fix preprocessor on Cmake --- sources/ElementsCollection/ui/renamedialog.h | 2 +- .../ui/replaceadvanceddialog.h | 2 +- .../ui/searchandreplacewidget.cpp | 8 +- sources/autoNum/ui/autonumberingdockwidget.h | 4 +- sources/dataBase/ui/elementquerywidget.cpp | 4 +- sources/dataBase/ui/summaryquerywidget.cpp | 4 +- sources/diagramevent/diagrameventaddimage.cpp | 2 +- sources/diagramevent/diagrameventaddshape.h | 2 +- sources/diagramevent/diagrameventaddtext.cpp | 2 +- sources/editor/arceditor.cpp | 2 +- sources/editor/editorcommands.h | 2 +- sources/editor/elementprimitivedecorator.cpp | 2 +- sources/editor/elementscene.cpp | 16 +- sources/editor/esevent/eseventaddarc.cpp | 11 +- .../esevent/eseventadddynamictextfield.cpp | 7 +- sources/editor/esevent/eseventaddellipse.cpp | 11 +- sources/editor/esevent/eseventaddline.cpp | 13 +- sources/editor/esevent/eseventaddpolygon.cpp | 11 +- sources/editor/esevent/eseventaddrect.cpp | 11 +- sources/editor/esevent/eseventaddterminal.cpp | 11 +- sources/editor/esevent/eseventaddtext.cpp | 11 +- sources/editor/esevent/eseventinterface.cpp | 6 +- .../graphicspart/customelementgraphicpart.cpp | 4 +- .../editor/graphicspart/customelementpart.cpp | 3 +- .../editor/graphicspart/customelementpart.h | 2 +- sources/editor/graphicspart/partarc.cpp | 8 +- .../graphicspart/partdynamictextfield.cpp | 6 +- sources/editor/graphicspart/partellipse.cpp | 8 +- sources/editor/graphicspart/partline.cpp | 6 +- sources/editor/graphicspart/partline.h | 2 +- sources/editor/graphicspart/partpolygon.cpp | 12 +- sources/editor/graphicspart/partrectangle.cpp | 8 +- sources/editor/graphicspart/partterminal.cpp | 2 +- sources/editor/graphicspart/partterminal.h | 4 +- sources/editor/graphicspart/parttext.cpp | 10 +- sources/editor/graphicspart/parttext.h | 2 +- sources/editor/qetelementeditor.cpp | 2 +- sources/editor/styleeditor.cpp | 2 +- sources/editor/terminaleditor.cpp | 2 +- sources/editor/ui/dynamictextfieldeditor.cpp | 10 +- sources/editor/ui/dynamictextfieldeditor.h | 4 +- .../ui/elementpropertieseditorwidget.cpp | 4 +- .../editor/ui/elementpropertieseditorwidget.h | 2 +- sources/editor/ui/ellipseeditor.cpp | 8 +- sources/editor/ui/ellipseeditor.h | 2 +- sources/editor/ui/lineeditor.cpp | 6 +- sources/editor/ui/lineeditor.h | 2 +- sources/editor/ui/polygoneditor.cpp | 10 +- sources/editor/ui/polygoneditor.h | 2 +- sources/editor/ui/rectangleeditor.cpp | 10 +- sources/editor/ui/rectangleeditor.h | 3 +- sources/editor/ui/texteditor.cpp | 4 +- sources/editor/ui/texteditor.h | 4 +- sources/projectconfigpages.cpp | 164 +++++++++--------- sources/projectview.cpp | 2 +- sources/qetapp.cpp | 6 +- sources/qetdiagrameditor.cpp | 14 +- sources/qetgraphicsitem/diagramimageitem.cpp | 2 +- sources/qetgraphicsitem/qetshapeitem.cpp | 2 +- sources/qetgraphicsitem/terminal.cpp | 2 +- .../ui/configpage/generalconfigurationpage.h | 2 +- 61 files changed, 253 insertions(+), 239 deletions(-) diff --git a/sources/ElementsCollection/ui/renamedialog.h b/sources/ElementsCollection/ui/renamedialog.h index 568834ceb..dfdbfe1de 100644 --- a/sources/ElementsCollection/ui/renamedialog.h +++ b/sources/ElementsCollection/ui/renamedialog.h @@ -18,7 +18,7 @@ #ifndef RENAMEDIALOG_H #define RENAMEDIALOG_H -#include "../qet.h" +#include "../../qet.h" #include diff --git a/sources/SearchAndReplace/ui/replaceadvanceddialog.h b/sources/SearchAndReplace/ui/replaceadvanceddialog.h index c7189df36..aa424b532 100644 --- a/sources/SearchAndReplace/ui/replaceadvanceddialog.h +++ b/sources/SearchAndReplace/ui/replaceadvanceddialog.h @@ -18,7 +18,7 @@ #ifndef REPLACEADVANCEDDIALOG_H #define REPLACEADVANCEDDIALOG_H -#include "searchandreplaceworker.h" +#include "../searchandreplaceworker.h" #include diff --git a/sources/SearchAndReplace/ui/searchandreplacewidget.cpp b/sources/SearchAndReplace/ui/searchandreplacewidget.cpp index 2058be08f..2630c05e7 100644 --- a/sources/SearchAndReplace/ui/searchandreplacewidget.cpp +++ b/sources/SearchAndReplace/ui/searchandreplacewidget.cpp @@ -22,14 +22,14 @@ #include "../../diagramcontent.h" #include "../../qetapp.h" #include "../../qetdiagrameditor.h" +#include "../../qetgraphicsitem/conductor.h" +#include "../../qetgraphicsitem/dynamicelementtextitem.h" #include "../../qetgraphicsitem/element.h" +#include "../../qetgraphicsitem/elementtextitemgroup.h" +#include "../../qetgraphicsitem/independenttextitem.h" #include "../../qeticons.h" #include "../../qetinformation.h" #include "../../qetproject.h" -#include "conductor.h" -#include "dynamicelementtextitem.h" -#include "elementtextitemgroup.h" -#include "independenttextitem.h" #include "replaceadvanceddialog.h" #include "replaceconductordialog.h" #include "replaceelementdialog.h" diff --git a/sources/autoNum/ui/autonumberingdockwidget.h b/sources/autoNum/ui/autonumberingdockwidget.h index 7892234af..b3d711d74 100644 --- a/sources/autoNum/ui/autonumberingdockwidget.h +++ b/sources/autoNum/ui/autonumberingdockwidget.h @@ -18,8 +18,8 @@ #ifndef AUTONUMBERINGDOCKWIDGET_H #define AUTONUMBERINGDOCKWIDGET_H -#include "../projectview.h" -#include "../qetproject.h" +#include "../../projectview.h" +#include "../../qetproject.h" #include diff --git a/sources/dataBase/ui/elementquerywidget.cpp b/sources/dataBase/ui/elementquerywidget.cpp index 0b937a591..abe8324b6 100644 --- a/sources/dataBase/ui/elementquerywidget.cpp +++ b/sources/dataBase/ui/elementquerywidget.cpp @@ -17,8 +17,8 @@ */ #include "elementquerywidget.h" -#include "../qetapp.h" -#include "../qetinformation.h" +#include "../../qetapp.h" +#include "../../qetinformation.h" #include "ui_elementquerywidget.h" #include diff --git a/sources/dataBase/ui/summaryquerywidget.cpp b/sources/dataBase/ui/summaryquerywidget.cpp index cd952646d..38d843a7c 100644 --- a/sources/dataBase/ui/summaryquerywidget.cpp +++ b/sources/dataBase/ui/summaryquerywidget.cpp @@ -17,8 +17,8 @@ */ #include "summaryquerywidget.h" -#include "../qetapp.h" -#include "../qetinformation.h" +#include "../../qetapp.h" +#include "../../qetinformation.h" #include "ui_summaryquerywidget.h" #include diff --git a/sources/diagramevent/diagrameventaddimage.cpp b/sources/diagramevent/diagrameventaddimage.cpp index 339dd5eb5..3184fe63f 100644 --- a/sources/diagramevent/diagrameventaddimage.cpp +++ b/sources/diagramevent/diagrameventaddimage.cpp @@ -20,7 +20,7 @@ #include "../diagram.h" #include "../diagramcommands.h" -#include "../diagramimageitem.h" +#include "../qetgraphicsitem/diagramimageitem.h" /** @brief DiagramEventAddImage::DiagramEventAddImage diff --git a/sources/diagramevent/diagrameventaddshape.h b/sources/diagramevent/diagrameventaddshape.h index a079a5909..947f7bf23 100644 --- a/sources/diagramevent/diagrameventaddshape.h +++ b/sources/diagramevent/diagrameventaddshape.h @@ -18,8 +18,8 @@ #ifndef DIAGRAMEVENTADDSHAPE_H #define DIAGRAMEVENTADDSHAPE_H +#include "../qetgraphicsitem/qetshapeitem.h" #include "diagrameventinterface.h" -#include "qetshapeitem.h" /** @brief The DiagramEventAddShape class diff --git a/sources/diagramevent/diagrameventaddtext.cpp b/sources/diagramevent/diagrameventaddtext.cpp index ec717208d..9613707ba 100644 --- a/sources/diagramevent/diagrameventaddtext.cpp +++ b/sources/diagramevent/diagrameventaddtext.cpp @@ -20,7 +20,7 @@ #include "../diagram.h" #include "../diagramcommands.h" -#include "../independenttextitem.h" +#include "../qetgraphicsitem/independenttextitem.h" /** @brief DiagramEventAddText::DiagramEventAddText diff --git a/sources/editor/arceditor.cpp b/sources/editor/arceditor.cpp index bbc581989..1d19381d4 100644 --- a/sources/editor/arceditor.cpp +++ b/sources/editor/arceditor.cpp @@ -19,7 +19,7 @@ #include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "elementscene.h" -#include "partarc.h" +#include "graphicspart/partarc.h" #include "styleeditor.h" /** diff --git a/sources/editor/editorcommands.h b/sources/editor/editorcommands.h index af7628b99..445a88d3e 100644 --- a/sources/editor/editorcommands.h +++ b/sources/editor/editorcommands.h @@ -17,8 +17,8 @@ */ #ifndef EDITOR_COMMANDS_H #define EDITOR_COMMANDS_H +#include "../editor/graphicspart/customelementpart.h" #include "../qgimanager.h" -#include "customelementpart.h" #include "elementcontent.h" #include "elementscene.h" #include "elementview.h" diff --git a/sources/editor/elementprimitivedecorator.cpp b/sources/editor/elementprimitivedecorator.cpp index 97eef726c..21469ab25 100644 --- a/sources/editor/elementprimitivedecorator.cpp +++ b/sources/editor/elementprimitivedecorator.cpp @@ -18,8 +18,8 @@ #include "elementprimitivedecorator.h" #include "../QetGraphicsItemModeler/qetgraphicshandleritem.h" +#include "../editor/graphicspart/customelementpart.h" #include "../qet.h" -#include "customelementpart.h" #include "editorcommands.h" #include "elementscene.h" diff --git a/sources/editor/elementscene.cpp b/sources/editor/elementscene.cpp index ee1cafbbf..d79508262 100644 --- a/sources/editor/elementscene.cpp +++ b/sources/editor/elementscene.cpp @@ -25,14 +25,14 @@ #include "elementcontent.h" #include "elementprimitivedecorator.h" #include "eseventinterface.h" -#include "partarc.h" -#include "partdynamictextfield.h" -#include "partellipse.h" -#include "partline.h" -#include "partpolygon.h" -#include "partrectangle.h" -#include "partterminal.h" -#include "parttext.h" +#include "graphicspart/partarc.h" +#include "graphicspart/partdynamictextfield.h" +#include "graphicspart/partellipse.h" +#include "graphicspart/partline.h" +#include "graphicspart/partpolygon.h" +#include "graphicspart/partrectangle.h" +#include "graphicspart/partterminal.h" +#include "graphicspart/parttext.h" #include "qetelementeditor.h" #include "ui/elementpropertieseditorwidget.h" diff --git a/sources/editor/esevent/eseventaddarc.cpp b/sources/editor/esevent/eseventaddarc.cpp index 2fc758287..599c986d8 100644 --- a/sources/editor/esevent/eseventaddarc.cpp +++ b/sources/editor/esevent/eseventaddarc.cpp @@ -15,13 +15,14 @@ You should have received a copy of the GNU General Public License along with QElectroTech. If not, see . */ -#include - -#include "elementscene.h" -#include "partarc.h" -#include "editorcommands.h" #include "eseventaddarc.h" +#include "../editorcommands.h" +#include "../elementscene.h" +#include "../graphicspart/partarc.h" + +#include + /** @brief ESEventAddArc::ESEventAddArc @param scene diff --git a/sources/editor/esevent/eseventadddynamictextfield.cpp b/sources/editor/esevent/eseventadddynamictextfield.cpp index 32e14989d..923e84510 100644 --- a/sources/editor/esevent/eseventadddynamictextfield.cpp +++ b/sources/editor/esevent/eseventadddynamictextfield.cpp @@ -16,9 +16,10 @@ along with QElectroTech. If not, see . */ #include "eseventadddynamictextfield.h" -#include "elementscene.h" -#include "editorcommands.h" -#include "partdynamictextfield.h" + +#include "../editorcommands.h" +#include "../elementscene.h" +#include "../graphicspart/partdynamictextfield.h" #include diff --git a/sources/editor/esevent/eseventaddellipse.cpp b/sources/editor/esevent/eseventaddellipse.cpp index 485228fbf..a20a67e7a 100644 --- a/sources/editor/esevent/eseventaddellipse.cpp +++ b/sources/editor/esevent/eseventaddellipse.cpp @@ -15,12 +15,13 @@ You should have received a copy of the GNU General Public License along with QElectroTech. If not, see . */ -#include - #include "eseventaddellipse.h" -#include "partellipse.h" -#include "editorcommands.h" -#include "elementscene.h" + +#include "../editorcommands.h" +#include "../elementscene.h" +#include "../graphicspart/partellipse.h" + +#include /** @brief ESEventAddEllipse::ESEventAddEllipse diff --git a/sources/editor/esevent/eseventaddline.cpp b/sources/editor/esevent/eseventaddline.cpp index bca0880f9..2c9737c23 100644 --- a/sources/editor/esevent/eseventaddline.cpp +++ b/sources/editor/esevent/eseventaddline.cpp @@ -15,15 +15,16 @@ You should have received a copy of the GNU General Public License along with QElectroTech. If not, see . */ +#include "eseventaddline.h" + +#include "../editorcommands.h" +#include "../elementscene.h" +#include "../graphicspart/partline.h" +#include "../qetelementeditor.h" + #include #include -#include "eseventaddline.h" -#include "elementscene.h" -#include "qetelementeditor.h" -#include "partline.h" -#include "editorcommands.h" - /** @brief ESEventAddLine::ESEventAddLine Constructor diff --git a/sources/editor/esevent/eseventaddpolygon.cpp b/sources/editor/esevent/eseventaddpolygon.cpp index 75f7cd6aa..c91d2773a 100644 --- a/sources/editor/esevent/eseventaddpolygon.cpp +++ b/sources/editor/esevent/eseventaddpolygon.cpp @@ -15,12 +15,13 @@ You should have received a copy of the GNU General Public License along with QElectroTech. If not, see . */ -#include - #include "eseventaddpolygon.h" -#include "elementscene.h" -#include "partpolygon.h" -#include "editorcommands.h" + +#include "../editorcommands.h" +#include "../elementscene.h" +#include "../graphicspart/partpolygon.h" + +#include /** @brief ESEventAddPolygon::ESEventAddPolygon diff --git a/sources/editor/esevent/eseventaddrect.cpp b/sources/editor/esevent/eseventaddrect.cpp index 4a85fe1a4..9b464595b 100644 --- a/sources/editor/esevent/eseventaddrect.cpp +++ b/sources/editor/esevent/eseventaddrect.cpp @@ -15,12 +15,13 @@ You should have received a copy of the GNU General Public License along with QElectroTech. If not, see . */ -#include - #include "eseventaddrect.h" -#include "elementscene.h" -#include "partrectangle.h" -#include "editorcommands.h" + +#include "../editorcommands.h" +#include "../elementscene.h" +#include "../graphicspart/partrectangle.h" + +#include /** @brief ESEventAddRect::ESEventAddRect diff --git a/sources/editor/esevent/eseventaddterminal.cpp b/sources/editor/esevent/eseventaddterminal.cpp index 3e34a5072..7b449a78a 100644 --- a/sources/editor/esevent/eseventaddterminal.cpp +++ b/sources/editor/esevent/eseventaddterminal.cpp @@ -15,13 +15,14 @@ You should have received a copy of the GNU General Public License along with QElectroTech. If not, see . */ -#include - -#include "partterminal.h" -#include "editorcommands.h" -#include "elementscene.h" #include "eseventaddterminal.h" +#include "../editorcommands.h" +#include "../elementscene.h" +#include "../graphicspart/partterminal.h" + +#include + /** @brief ESEventAddTerminal::ESEventAddTerminal @param scene diff --git a/sources/editor/esevent/eseventaddtext.cpp b/sources/editor/esevent/eseventaddtext.cpp index 6ddcfbbc0..01592475d 100644 --- a/sources/editor/esevent/eseventaddtext.cpp +++ b/sources/editor/esevent/eseventaddtext.cpp @@ -15,12 +15,13 @@ You should have received a copy of the GNU General Public License along with QElectroTech. If not, see . */ -#include - #include "eseventaddtext.h" -#include "parttext.h" -#include "editorcommands.h" -#include "elementscene.h" + +#include "../editorcommands.h" +#include "../elementscene.h" +#include "../graphicspart/parttext.h" + +#include /** @brief ESEventAddText::ESEventAddText diff --git a/sources/editor/esevent/eseventinterface.cpp b/sources/editor/esevent/eseventinterface.cpp index 0cc2825dc..3ab356ef9 100644 --- a/sources/editor/esevent/eseventinterface.cpp +++ b/sources/editor/esevent/eseventinterface.cpp @@ -16,8 +16,10 @@ along with QElectroTech. If not, see . */ #include "eseventinterface.h" -#include "elementscene.h" -#include "qetelementeditor.h" + +#include "../elementscene.h" +#include "../qetelementeditor.h" + #include ESEventInterface::ESEventInterface(ElementScene *scene) : diff --git a/sources/editor/graphicspart/customelementgraphicpart.cpp b/sources/editor/graphicspart/customelementgraphicpart.cpp index eae184a80..4e466425c 100644 --- a/sources/editor/graphicspart/customelementgraphicpart.cpp +++ b/sources/editor/graphicspart/customelementgraphicpart.cpp @@ -17,8 +17,8 @@ */ #include "customelementgraphicpart.h" -#include "../QPropertyUndoCommand/qpropertyundocommand.h" -#include "elementscene.h" +#include "../../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../elementscene.h" #include diff --git a/sources/editor/graphicspart/customelementpart.cpp b/sources/editor/graphicspart/customelementpart.cpp index 979267b76..27e3e6ca4 100644 --- a/sources/editor/graphicspart/customelementpart.cpp +++ b/sources/editor/graphicspart/customelementpart.cpp @@ -16,7 +16,8 @@ along with QElectroTech. If not, see . */ #include "customelementpart.h" -#include "qetelementeditor.h" + +#include "../qetelementeditor.h" /// @return le QETElementEditor auquel cet editeur appartient QETElementEditor *CustomElementPart::elementEditor() const diff --git a/sources/editor/graphicspart/customelementpart.h b/sources/editor/graphicspart/customelementpart.h index f254a1463..cb7b38a70 100644 --- a/sources/editor/graphicspart/customelementpart.h +++ b/sources/editor/graphicspart/customelementpart.h @@ -18,7 +18,7 @@ #ifndef CUSTOM_ELEMENT_PART_H #define CUSTOM_ELEMENT_PART_H -#include "../qet.h" +#include "../../qet.h" class CustomElement; class ElementPrimitiveDecorator; diff --git a/sources/editor/graphicspart/partarc.cpp b/sources/editor/graphicspart/partarc.cpp index ac9321a9a..aca3fdb50 100644 --- a/sources/editor/graphicspart/partarc.cpp +++ b/sources/editor/graphicspart/partarc.cpp @@ -17,10 +17,10 @@ */ #include "partarc.h" -#include "../QPropertyUndoCommand/qpropertyundocommand.h" -#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h" -#include "../QetGraphicsItemModeler/qetgraphicshandlerutility.h" -#include "elementscene.h" +#include "../../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../../QetGraphicsItemModeler/qetgraphicshandleritem.h" +#include "../../QetGraphicsItemModeler/qetgraphicshandlerutility.h" +#include "../elementscene.h" /** @brief PartArc::PartArc diff --git a/sources/editor/graphicspart/partdynamictextfield.cpp b/sources/editor/graphicspart/partdynamictextfield.cpp index 1f3b446a5..7a76a4141 100644 --- a/sources/editor/graphicspart/partdynamictextfield.cpp +++ b/sources/editor/graphicspart/partdynamictextfield.cpp @@ -17,9 +17,9 @@ */ #include "partdynamictextfield.h" -#include "../QPropertyUndoCommand/qpropertyundocommand.h" -#include "../qetapp.h" -#include "elementscene.h" +#include "../../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../../qetapp.h" +#include "../elementscene.h" #include #include diff --git a/sources/editor/graphicspart/partellipse.cpp b/sources/editor/graphicspart/partellipse.cpp index 752b07fd6..0b618555a 100644 --- a/sources/editor/graphicspart/partellipse.cpp +++ b/sources/editor/graphicspart/partellipse.cpp @@ -17,10 +17,10 @@ */ #include "partellipse.h" -#include "../QPropertyUndoCommand/qpropertyundocommand.h" -#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h" -#include "../QetGraphicsItemModeler/qetgraphicshandlerutility.h" -#include "elementscene.h" +#include "../../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../../QetGraphicsItemModeler/qetgraphicshandleritem.h" +#include "../../QetGraphicsItemModeler/qetgraphicshandlerutility.h" +#include "../elementscene.h" /** @brief PartEllipse::PartEllipse diff --git a/sources/editor/graphicspart/partline.cpp b/sources/editor/graphicspart/partline.cpp index 3dc5080a9..215e5bc46 100644 --- a/sources/editor/graphicspart/partline.cpp +++ b/sources/editor/graphicspart/partline.cpp @@ -17,9 +17,9 @@ */ #include "partline.h" -#include "../QPropertyUndoCommand/qpropertyundocommand.h" -#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h" -#include "elementscene.h" +#include "../../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../../QetGraphicsItemModeler/qetgraphicshandleritem.h" +#include "../elementscene.h" #include diff --git a/sources/editor/graphicspart/partline.h b/sources/editor/graphicspart/partline.h index 9b78be296..a864dbdcf 100644 --- a/sources/editor/graphicspart/partline.h +++ b/sources/editor/graphicspart/partline.h @@ -18,7 +18,7 @@ #ifndef PART_LINE_H #define PART_LINE_H -#include "../qet.h" +#include "../../qet.h" #include "customelementgraphicpart.h" class QPropertyUndoCommand; diff --git a/sources/editor/graphicspart/partpolygon.cpp b/sources/editor/graphicspart/partpolygon.cpp index af7f7b909..05c7ccc7a 100644 --- a/sources/editor/graphicspart/partpolygon.cpp +++ b/sources/editor/graphicspart/partpolygon.cpp @@ -17,12 +17,12 @@ */ #include "partpolygon.h" -#include "../QPropertyUndoCommand/qpropertyundocommand.h" -#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h" -#include "../QetGraphicsItemModeler/qetgraphicshandlerutility.h" -#include "../qeticons.h" -#include "elementscene.h" -#include "qetelementeditor.h" +#include "../../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../../QetGraphicsItemModeler/qetgraphicshandleritem.h" +#include "../../QetGraphicsItemModeler/qetgraphicshandlerutility.h" +#include "../../qeticons.h" +#include "../elementscene.h" +#include "../qetelementeditor.h" /** @brief PartPolygon::PartPolygon diff --git a/sources/editor/graphicspart/partrectangle.cpp b/sources/editor/graphicspart/partrectangle.cpp index 7c84e8011..ca5e86470 100644 --- a/sources/editor/graphicspart/partrectangle.cpp +++ b/sources/editor/graphicspart/partrectangle.cpp @@ -17,10 +17,10 @@ */ #include "partrectangle.h" -#include "../QPropertyUndoCommand/qpropertyundocommand.h" -#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h" -#include "../QetGraphicsItemModeler/qetgraphicshandlerutility.h" -#include "elementscene.h" +#include "../../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../../QetGraphicsItemModeler/qetgraphicshandleritem.h" +#include "../../QetGraphicsItemModeler/qetgraphicshandlerutility.h" +#include "../elementscene.h" /** @brief PartRectangle::PartRectangle diff --git a/sources/editor/graphicspart/partterminal.cpp b/sources/editor/graphicspart/partterminal.cpp index fea1f9a85..36f992fb4 100644 --- a/sources/editor/graphicspart/partterminal.cpp +++ b/sources/editor/graphicspart/partterminal.cpp @@ -17,7 +17,7 @@ */ #include "partterminal.h" -#include "../qetgraphicsitem/terminal.h" +#include "../../qetgraphicsitem/terminal.h" /** @brief PartTerminal::PartTerminal diff --git a/sources/editor/graphicspart/partterminal.h b/sources/editor/graphicspart/partterminal.h index 0f323acff..65b3891ec 100644 --- a/sources/editor/graphicspart/partterminal.h +++ b/sources/editor/graphicspart/partterminal.h @@ -18,10 +18,10 @@ #ifndef PART_TERMINAL_H #define PART_TERMINAL_H +#include "../../properties/terminaldata.h" #include "customelementgraphicpart.h" -#include "QUuid" -#include "terminaldata.h" +#include /** This class represents a terminal which may be used to compose the drawing of diff --git a/sources/editor/graphicspart/parttext.cpp b/sources/editor/graphicspart/parttext.cpp index 0b020ebba..5a60fd615 100644 --- a/sources/editor/graphicspart/parttext.cpp +++ b/sources/editor/graphicspart/parttext.cpp @@ -17,11 +17,11 @@ */ #include "parttext.h" -#include "../QPropertyUndoCommand/qpropertyundocommand.h" -#include "../qetapp.h" -#include "elementprimitivedecorator.h" -#include "elementscene.h" -#include "texteditor.h" +#include "../../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../../qetapp.h" +#include "../elementprimitivedecorator.h" +#include "../elementscene.h" +#include "../ui/texteditor.h" /** Constructeur diff --git a/sources/editor/graphicspart/parttext.h b/sources/editor/graphicspart/parttext.h index fba95ca39..5b46d2597 100644 --- a/sources/editor/graphicspart/parttext.h +++ b/sources/editor/graphicspart/parttext.h @@ -17,7 +17,7 @@ */ #ifndef PART_TEXT_H #define PART_TEXT_H -#include "../qetapp.h" +#include "../../qetapp.h" #include "customelementpart.h" #include diff --git a/sources/editor/qetelementeditor.cpp b/sources/editor/qetelementeditor.cpp index 531e00ccc..75680e397 100644 --- a/sources/editor/qetelementeditor.cpp +++ b/sources/editor/qetelementeditor.cpp @@ -17,6 +17,7 @@ */ #include "qetelementeditor.h" +#include "../editor/graphicspart/customelementpart.h" #include "../elementdialog.h" #include "../newelementwizard.h" #include "../qet.h" @@ -24,7 +25,6 @@ #include "../qeticons.h" #include "../qetmessagebox.h" #include "../recentfiles.h" -#include "customelementpart.h" #include "editorcommands.h" #include "elementitemeditor.h" #include "elementscene.h" diff --git a/sources/editor/styleeditor.cpp b/sources/editor/styleeditor.cpp index 40c82dc6b..ab23516a2 100644 --- a/sources/editor/styleeditor.cpp +++ b/sources/editor/styleeditor.cpp @@ -18,8 +18,8 @@ #include "styleeditor.h" #include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../editor/graphicspart/customelementgraphicpart.h" #include "../qeticons.h" -#include "customelementgraphicpart.h" #include #include diff --git a/sources/editor/terminaleditor.cpp b/sources/editor/terminaleditor.cpp index 7c4621604..de389aaef 100644 --- a/sources/editor/terminaleditor.cpp +++ b/sources/editor/terminaleditor.cpp @@ -18,8 +18,8 @@ #include "terminaleditor.h" #include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../editor/graphicspart/partterminal.h" #include "../qeticons.h" -#include "partterminal.h" #include #include diff --git a/sources/editor/ui/dynamictextfieldeditor.cpp b/sources/editor/ui/dynamictextfieldeditor.cpp index c7b817381..61706d055 100644 --- a/sources/editor/ui/dynamictextfieldeditor.cpp +++ b/sources/editor/ui/dynamictextfieldeditor.cpp @@ -17,14 +17,14 @@ */ #include "dynamictextfieldeditor.h" -#include "../QPropertyUndoCommand/qpropertyundocommand.h" -#include "../qetapp.h" -#include "../qetinformation.h" +#include "../../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../../editor/graphicspart/customelementpart.h" +#include "../../qetapp.h" +#include "../../qetinformation.h" +#include "../qetelementeditor.h" #include "alignmenttextdialog.h" #include "compositetexteditdialog.h" -#include "customelementpart.h" #include "partdynamictextfield.h" -#include "qetelementeditor.h" #include "ui_dynamictextfieldeditor.h" #include diff --git a/sources/editor/ui/dynamictextfieldeditor.h b/sources/editor/ui/dynamictextfieldeditor.h index 2d5630f52..aa5b7b3d6 100644 --- a/sources/editor/ui/dynamictextfieldeditor.h +++ b/sources/editor/ui/dynamictextfieldeditor.h @@ -18,8 +18,8 @@ #ifndef DYNAMICTEXTFIELDEDITOR_H #define DYNAMICTEXTFIELDEDITOR_H -#include "elementitemeditor.h" -#include "partdynamictextfield.h" +#include "../elementitemeditor.h" +#include "../graphicspart/partdynamictextfield.h" namespace Ui { class DynamicTextFieldEditor; diff --git a/sources/editor/ui/elementpropertieseditorwidget.cpp b/sources/editor/ui/elementpropertieseditorwidget.cpp index cccdfc749..fab1fcd25 100644 --- a/sources/editor/ui/elementpropertieseditorwidget.cpp +++ b/sources/editor/ui/elementpropertieseditorwidget.cpp @@ -17,8 +17,8 @@ */ #include "elementpropertieseditorwidget.h" -#include "../qetapp.h" -#include "../qetinformation.h" +#include "../../qetapp.h" +#include "../../qetinformation.h" #include "ui_elementpropertieseditorwidget.h" #include diff --git a/sources/editor/ui/elementpropertieseditorwidget.h b/sources/editor/ui/elementpropertieseditorwidget.h index ccc637a7b..30e5c8218 100644 --- a/sources/editor/ui/elementpropertieseditorwidget.h +++ b/sources/editor/ui/elementpropertieseditorwidget.h @@ -18,7 +18,7 @@ #ifndef ELEMENTPROPERTIESEDITORWIDGET_H #define ELEMENTPROPERTIESEDITORWIDGET_H -#include "../diagramcontext.h" +#include "../../diagramcontext.h" #include #include diff --git a/sources/editor/ui/ellipseeditor.cpp b/sources/editor/ui/ellipseeditor.cpp index a44e0bd15..7c69e12e6 100644 --- a/sources/editor/ui/ellipseeditor.cpp +++ b/sources/editor/ui/ellipseeditor.cpp @@ -17,10 +17,10 @@ */ #include "ellipseeditor.h" -#include "../QPropertyUndoCommand/qpropertyundocommand.h" -#include "elementscene.h" -#include "partellipse.h" -#include "styleeditor.h" +#include "../../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../elementscene.h" +#include "../graphicspart/partellipse.h" +#include "../styleeditor.h" #include "ui_ellipseeditor.h" /** diff --git a/sources/editor/ui/ellipseeditor.h b/sources/editor/ui/ellipseeditor.h index c58d25ff9..771bf822c 100644 --- a/sources/editor/ui/ellipseeditor.h +++ b/sources/editor/ui/ellipseeditor.h @@ -18,7 +18,7 @@ #ifndef ELLIPSEEDITOR_H #define ELLIPSEEDITOR_H -#include "elementitemeditor.h" +#include "../elementitemeditor.h" namespace Ui { class EllipseEditor; diff --git a/sources/editor/ui/lineeditor.cpp b/sources/editor/ui/lineeditor.cpp index c1af44861..b5eabb612 100644 --- a/sources/editor/ui/lineeditor.cpp +++ b/sources/editor/ui/lineeditor.cpp @@ -17,9 +17,9 @@ */ #include "lineeditor.h" -#include "../QPropertyUndoCommand/qpropertyundocommand.h" -#include "../qeticons.h" -#include "elementitemeditor.h" +#include "../../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../../qeticons.h" +#include "../elementitemeditor.h" #include "elementscene.h" #include "partline.h" #include "styleeditor.h" diff --git a/sources/editor/ui/lineeditor.h b/sources/editor/ui/lineeditor.h index 8ae22f6db..294488cc7 100644 --- a/sources/editor/ui/lineeditor.h +++ b/sources/editor/ui/lineeditor.h @@ -18,7 +18,7 @@ #ifndef LINEEDITOR_H #define LINEEDITOR_H -#include "elementitemeditor.h" +#include "../elementitemeditor.h" namespace Ui { class LineEditor; diff --git a/sources/editor/ui/polygoneditor.cpp b/sources/editor/ui/polygoneditor.cpp index 93295a507..872514005 100644 --- a/sources/editor/ui/polygoneditor.cpp +++ b/sources/editor/ui/polygoneditor.cpp @@ -17,11 +17,11 @@ */ #include "polygoneditor.h" -#include "../QPropertyUndoCommand/qpropertyundocommand.h" -#include "../qetmessagebox.h" -#include "elementscene.h" -#include "partpolygon.h" -#include "styleeditor.h" +#include "../../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../../qetmessagebox.h" +#include "../elementscene.h" +#include "../graphicspart/partpolygon.h" +#include "../styleeditor.h" #include "ui_polygoneditor.h" /** diff --git a/sources/editor/ui/polygoneditor.h b/sources/editor/ui/polygoneditor.h index d99125cd9..e710b43f7 100644 --- a/sources/editor/ui/polygoneditor.h +++ b/sources/editor/ui/polygoneditor.h @@ -18,7 +18,7 @@ #ifndef POLYGONEDITOR_H #define POLYGONEDITOR_H -#include "elementitemeditor.h" +#include "../elementitemeditor.h" class StyleEditor; class PartPolygon; diff --git a/sources/editor/ui/rectangleeditor.cpp b/sources/editor/ui/rectangleeditor.cpp index 95e366931..a89fe3311 100644 --- a/sources/editor/ui/rectangleeditor.cpp +++ b/sources/editor/ui/rectangleeditor.cpp @@ -17,11 +17,11 @@ */ #include "rectangleeditor.h" -#include "../QPropertyUndoCommand/qpropertyundocommand.h" -#include "../qeticons.h" -#include "elementscene.h" -#include "partrectangle.h" -#include "styleeditor.h" +#include "../../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../../qeticons.h" +#include "../elementscene.h" +#include "../graphicspart/partrectangle.h" +#include "../styleeditor.h" #include "ui_rectangleeditor.h" /** diff --git a/sources/editor/ui/rectangleeditor.h b/sources/editor/ui/rectangleeditor.h index 94c7480d1..1c593ea24 100644 --- a/sources/editor/ui/rectangleeditor.h +++ b/sources/editor/ui/rectangleeditor.h @@ -18,7 +18,8 @@ #ifndef RECTANGLEEDITOR_H #define RECTANGLEEDITOR_H -#include "elementitemeditor.h" +#include "../elementitemeditor.h" + #include class StyleEditor; diff --git a/sources/editor/ui/texteditor.cpp b/sources/editor/ui/texteditor.cpp index ffbbf56f1..201e18e01 100644 --- a/sources/editor/ui/texteditor.cpp +++ b/sources/editor/ui/texteditor.cpp @@ -17,8 +17,8 @@ */ #include "texteditor.h" -#include "../QPropertyUndoCommand/qpropertyundocommand.h" -#include "parttext.h" +#include "../../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../graphicspart/parttext.h" #include "ui_texteditor.h" #include diff --git a/sources/editor/ui/texteditor.h b/sources/editor/ui/texteditor.h index cedc54b4e..c7fe4647d 100644 --- a/sources/editor/ui/texteditor.h +++ b/sources/editor/ui/texteditor.h @@ -18,10 +18,10 @@ #ifndef TEXTEDITOR_H #define TEXTEDITOR_H -#include "elementitemeditor.h" +#include "../elementitemeditor.h" -#include #include +#include class PartText; diff --git a/sources/projectconfigpages.cpp b/sources/projectconfigpages.cpp index 608ced22d..2727cd75c 100644 --- a/sources/projectconfigpages.cpp +++ b/sources/projectconfigpages.cpp @@ -30,7 +30,8 @@ #include "ui/reportpropertiewidget.h" #include "ui/titleblockpropertieswidget.h" #include "ui/xrefpropertieswidget.h" -#include "ui_autonumberingmanagementw.h" + +//#include "ui_autonumberingmanagementw.h" #include @@ -530,93 +531,94 @@ void ProjectAutoNumConfigPage::applyAutoNum() */ void ProjectAutoNumConfigPage::applyManagement() { - int from; - int to; - //Apply to Entire Project - if (m_amw->ui->m_apply_project_rb->isChecked()) { - from = 0; - to = project()->diagrams().size() - 1; - } - //Apply to selected Folios - else { - from = m_amw->ui->m_from_folios_cb->itemData(m_amw->ui->m_from_folios_cb->currentIndex()).toInt(); - to = m_amw->ui->m_to_folios_cb->itemData(m_amw->ui->m_to_folios_cb->currentIndex()).toInt(); - } + // int from; + // int to; + // //Apply to Entire Project + // if (m_amw->ui->m_apply_project_rb->isChecked()) { + // from = 0; + // to = project()->diagrams().size() - 1; + // } + // //Apply to selected Folios + // else { + // from = + //m_amw->ui->m_from_folios_cb->itemData(m_amw->ui->m_from_folios_cb->currentIndex()).toInt(); + // to = + //m_amw->ui->m_to_folios_cb->itemData(m_amw->ui->m_to_folios_cb->currentIndex()).toInt(); + // } - //Conductor Autonumbering Update Policy - //Allow Both Existent and New Conductors - if (m_amw->ui->m_both_conductor_rb->isChecked()) { - //Unfreeze Existent and New Conductors - project()->freezeExistentConductorLabel(false, from,to); - project()->freezeNewConductorLabel(false, from,to); - project()->setFreezeNewConductors(false); - } - //Allow Only New - else if (m_amw->ui->m_new_conductor_rb->isChecked()) { - //Freeze Existent and Unfreeze New Conductors - project()->freezeExistentConductorLabel(true, from,to); - project()->freezeNewConductorLabel(false, from,to); - project()->setFreezeNewConductors(false); - } - //Allow Only Existent - else if (m_amw->ui->m_existent_conductor_rb->isChecked()) { - //Freeze Existent and Unfreeze New Conductors - project()->freezeExistentConductorLabel(false, from,to); - project()->freezeNewConductorLabel(true, from,to); - project()->setFreezeNewConductors(true); - } - //Disable - else if (m_amw->ui->m_disable_conductor_rb->isChecked()) { - //Freeze Existent and New Elements, Set Freeze Element Project Wide - project()->freezeExistentConductorLabel(true, from,to); - project()->freezeNewConductorLabel(true, from,to); - project()->setFreezeNewConductors(true); - } + // //Conductor Autonumbering Update Policy + // //Allow Both Existent and New Conductors + // if (m_amw->ui->m_both_conductor_rb->isChecked()) { + // //Unfreeze Existent and New Conductors + // project()->freezeExistentConductorLabel(false, from,to); + // project()->freezeNewConductorLabel(false, from,to); + // project()->setFreezeNewConductors(false); + // } + // //Allow Only New + // else if (m_amw->ui->m_new_conductor_rb->isChecked()) { + // //Freeze Existent and Unfreeze New Conductors + // project()->freezeExistentConductorLabel(true, from,to); + // project()->freezeNewConductorLabel(false, from,to); + // project()->setFreezeNewConductors(false); + // } + // //Allow Only Existent + // else if (m_amw->ui->m_existent_conductor_rb->isChecked()) { + // //Freeze Existent and Unfreeze New Conductors + // project()->freezeExistentConductorLabel(false, from,to); + // project()->freezeNewConductorLabel(true, from,to); + // project()->setFreezeNewConductors(true); + // } + // //Disable + // else if (m_amw->ui->m_disable_conductor_rb->isChecked()) { + // //Freeze Existent and New Elements, Set Freeze Element Project Wide + // project()->freezeExistentConductorLabel(true, from,to); + // project()->freezeNewConductorLabel(true, from,to); + // project()->setFreezeNewConductors(true); + // } - //Element Autonumbering Update Policy - //Allow Both Existent and New Elements - if (m_amw->ui->m_both_element_rb->isChecked()) { - //Unfreeze Existent and New Elements - project()->freezeExistentElementLabel(false, from,to); - project()->freezeNewElementLabel(false, from,to); - project()->setFreezeNewElements(false); - } - //Allow Only New - else if (m_amw->ui->m_new_element_rb->isChecked()) { - //Freeze Existent and Unfreeze New Elements - project()->freezeExistentElementLabel(true, from,to); - project()->freezeNewElementLabel(false, from,to); - project()->setFreezeNewElements(false); - } - //Allow Only Existent - else if (m_amw->ui->m_existent_element_rb->isChecked()) { - //Freeze New and Unfreeze Existent Elements, Set Freeze Element Project Wide - project()->freezeExistentElementLabel(false, from,to); - project()->freezeNewElementLabel(true, from,to); - project()->setFreezeNewElements(true); - } - //Disable - else if (m_amw->ui->m_disable_element_rb->isChecked()) { - //Freeze Existent and New Elements, Set Freeze Element Project Wide - project()->freezeExistentElementLabel(true, from,to); - project()->freezeNewElementLabel(true, from,to); - project()->setFreezeNewElements(true); - } + // //Element Autonumbering Update Policy + // //Allow Both Existent and New Elements + // if (m_amw->ui->m_both_element_rb->isChecked()) { + // //Unfreeze Existent and New Elements + // project()->freezeExistentElementLabel(false, from,to); + // project()->freezeNewElementLabel(false, from,to); + // project()->setFreezeNewElements(false); + // } + // //Allow Only New + // else if (m_amw->ui->m_new_element_rb->isChecked()) { + // //Freeze Existent and Unfreeze New Elements + // project()->freezeExistentElementLabel(true, from,to); + // project()->freezeNewElementLabel(false, from,to); + // project()->setFreezeNewElements(false); + // } + // //Allow Only Existent + // else if (m_amw->ui->m_existent_element_rb->isChecked()) { + // //Freeze New and Unfreeze Existent Elements, Set Freeze Element + //Project Wide project()->freezeExistentElementLabel(false, from,to); + // project()->freezeNewElementLabel(true, from,to); + // project()->setFreezeNewElements(true); + // } + // //Disable + // else if (m_amw->ui->m_disable_element_rb->isChecked()) { + // //Freeze Existent and New Elements, Set Freeze Element Project Wide + // project()->freezeExistentElementLabel(true, from,to); + // project()->freezeNewElementLabel(true, from,to); + // project()->setFreezeNewElements(true); + // } - //Folio Autonumbering Status - if (m_amw->ui->m_both_folio_rb->isChecked()) { + // //Folio Autonumbering Status + // if (m_amw->ui->m_both_folio_rb->isChecked()) { - } - else if (m_amw->ui->m_new_folio_rb->isChecked()) { + // } + // else if (m_amw->ui->m_new_folio_rb->isChecked()) { - } - else if (m_amw->ui->m_existent_folio_rb->isChecked()) { + // } + // else if (m_amw->ui->m_existent_folio_rb->isChecked()) { - } - else if (m_amw->ui->m_disable_folio_rb->isChecked()) { - - } + // } + // else if (m_amw->ui->m_disable_folio_rb->isChecked()) { + // } } /** diff --git a/sources/projectview.cpp b/sources/projectview.cpp index fca16ac94..58259fdd6 100644 --- a/sources/projectview.cpp +++ b/sources/projectview.cpp @@ -27,7 +27,7 @@ #include "qeticons.h" #include "qetmessagebox.h" #include "qetproject.h" -#include "qettemplateeditor.h" +#include "titleblock/qettemplateeditor.h" #include "ui/borderpropertieswidget.h" #include "ui/conductorpropertieswidget.h" #include "ui/dialogwaiting.h" diff --git a/sources/qetapp.cpp b/sources/qetapp.cpp index 2eb12531f..135bdb80e 100644 --- a/sources/qetapp.cpp +++ b/sources/qetapp.cpp @@ -17,24 +17,24 @@ */ #include "qetapp.h" -#include "aboutqetdialog.h" #include "configdialog.h" #include "configpages.h" #include "editor/qetelementeditor.h" #include "elementscollectioncache.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 "titleblock/qettemplateeditor.h" #include "titleblock/templatescollection.h" #include "titleblocktemplate.h" +#include "ui/aboutqetdialog.h" +#include "ui/configpage/generalconfigurationpage.h" #include #include diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index 09b4f5f15..d4000eb66 100644 --- a/sources/qetdiagrameditor.cpp +++ b/sources/qetdiagrameditor.cpp @@ -17,20 +17,18 @@ */ #include "qetdiagrameditor.h" +#include "ElementsCollection/elementscollectionwidget.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 "diagramevent/diagrameventaddimage.h" +#include "diagramevent/diagrameventaddshape.h" +#include "diagramevent/diagrameventaddtext.h" #include "diagramview.h" -#include "dialogwaiting.h" -#include "elementscollectionwidget.h" #include "elementspanelwidget.h" #include "factory/qetgraphicstablefactory.h" -#include "projectprintwindow.h" +#include "print/projectprintwindow.h" #include "qetgraphicsitem/ViewItem/qetgraphicstableitem.h" #include "qetgraphicsitem/conductortextitem.h" #include "qetgraphicsitem/dynamicelementtextitem.h" @@ -38,6 +36,8 @@ #include "qetmessagebox.h" #include "recentfiles.h" #include "ui/bomexportdialog.h" +#include "ui/diagrampropertieseditordockwidget.h" +#include "ui/dialogwaiting.h" #include "undocommand/addelementtextcommand.h" #include "undocommand/rotateselectioncommand.h" #include "undocommand/rotatetextscommand.h" diff --git a/sources/qetgraphicsitem/diagramimageitem.cpp b/sources/qetgraphicsitem/diagramimageitem.cpp index 5d53252d2..7e00311dc 100644 --- a/sources/qetgraphicsitem/diagramimageitem.cpp +++ b/sources/qetgraphicsitem/diagramimageitem.cpp @@ -19,7 +19,7 @@ #include "../PropertiesEditor/propertieseditordialog.h" #include "../diagram.h" -#include "imagepropertieswidget.h" +#include "../ui/imagepropertieswidget.h" /** @brief DiagramImageItem::DiagramImageItem diff --git a/sources/qetgraphicsitem/qetshapeitem.cpp b/sources/qetgraphicsitem/qetshapeitem.cpp index 21a7b143e..93cc3cd33 100644 --- a/sources/qetgraphicsitem/qetshapeitem.cpp +++ b/sources/qetgraphicsitem/qetshapeitem.cpp @@ -26,7 +26,7 @@ #include "../qet.h" #include "../qeticons.h" #include "../qetxml.h" -#include "../shapegraphicsitempropertieswidget.h" +#include "../ui/shapegraphicsitempropertieswidget.h" /** @brief QetShapeItem::QetShapeItem diff --git a/sources/qetgraphicsitem/terminal.cpp b/sources/qetgraphicsitem/terminal.cpp index ac731e87c..ff382f265 100644 --- a/sources/qetgraphicsitem/terminal.cpp +++ b/sources/qetgraphicsitem/terminal.cpp @@ -20,10 +20,10 @@ #include "../conductorautonumerotation.h" #include "../diagram.h" #include "../diagramcommands.h" +#include "../properties/terminaldata.h" #include "../qetgraphicsitem/conductor.h" #include "../qetgraphicsitem/element.h" #include "conductortextitem.h" -#include "terminaldata.h" #include diff --git a/sources/ui/configpage/generalconfigurationpage.h b/sources/ui/configpage/generalconfigurationpage.h index 10afe5037..02f69cf0d 100644 --- a/sources/ui/configpage/generalconfigurationpage.h +++ b/sources/ui/configpage/generalconfigurationpage.h @@ -18,7 +18,7 @@ #ifndef GENERALCONFIGURATIONPAGE_H #define GENERALCONFIGURATIONPAGE_H -#include "../configpage.h" +#include "../../configpage.h" #include