From 6da9c58458f689b9f97902f2e87c875e2e682919 Mon Sep 17 00:00:00 2001 From: Simon De Backer Date: Thu, 10 Dec 2020 21:19:45 +0100 Subject: [PATCH] Wip Fix preprocessor on Cmake --- .../elementcollectionhandler.cpp | 2 +- .../ElementsCollection/elementslocation.cpp | 4 +- .../ElementsCollection/elementstreeview.cpp | 2 +- .../ui/replaceadvanceddialog.cpp | 4 +- .../ui/replaceconductordialog.cpp | 7 +-- .../ui/replaceelementdialog.cpp | 8 ++-- .../ui/replacefoliowidget.cpp | 5 ++- .../diagramevent/diagrameventaddelement.cpp | 2 +- .../editor/UndoCommand/pastepartscommand.cpp | 5 ++- .../editor/UndoCommand/pastepartscommand.h | 4 +- sources/editor/elementscene.cpp | 2 +- sources/editor/elementview.cpp | 2 +- sources/editor/qetelementeditor.cpp | 43 +++++++++---------- sources/editor/ui/dynamictextfieldeditor.cpp | 6 +-- sources/editor/ui/lineeditor.cpp | 6 +-- sources/factory/elementfactory.cpp | 14 +++--- sources/factory/elementpicturefactory.cpp | 2 +- sources/factory/propertieseditorfactory.cpp | 7 +-- sources/factory/qetgraphicstablefactory.cpp | 14 +++--- sources/factory/ui/addtabledialog.cpp | 2 +- sources/factory/ui/addtabledialog.h | 2 +- sources/print/projectprintwindow.cpp | 12 +++--- .../ViewItem/projectdbmodel.cpp | 2 +- .../ViewItem/qetgraphicsheaderitem.h | 2 +- .../ui/graphicstablepropertieseditor.cpp | 4 +- .../ui/graphicstablepropertieseditor.h | 2 +- .../ui/projectdbmodelpropertieswidget.h | 2 +- sources/qetgraphicsitem/conductor.cpp | 2 +- sources/qetgraphicsitem/element.cpp | 6 +-- sources/qetgraphicsitem/slaveelement.h | 2 +- .../configpage/generalconfigurationpage.cpp | 4 +- .../ui/diagrampropertieseditordockwidget.cpp | 2 +- sources/ui/dynamicelementtextitemeditor.cpp | 4 +- sources/ui/dynamicelementtextmodel.cpp | 4 +- sources/ui/elementinfopartwidget.cpp | 5 ++- sources/ui/elementpropertieswidget.cpp | 4 +- sources/ui/imagepropertieswidget.cpp | 2 +- sources/ui/inditextpropertieswidget.cpp | 2 +- sources/ui/masterpropertieswidget.cpp | 4 +- sources/ui/potentialselectordialog.cpp | 2 +- .../ui/shapegraphicsitempropertieswidget.cpp | 2 +- .../deleteqgraphicsitemcommand.cpp | 8 ++-- sources/undocommand/linkelementcommand.cpp | 2 +- .../undocommand/rotateselectioncommand.cpp | 10 ++--- sources/undocommand/rotatetextscommand.cpp | 6 +-- sources/utils/conductorcreator.cpp | 2 +- 46 files changed, 122 insertions(+), 118 deletions(-) diff --git a/sources/ElementsCollection/elementcollectionhandler.cpp b/sources/ElementsCollection/elementcollectionhandler.cpp index e64ee1219..19c457ab3 100644 --- a/sources/ElementsCollection/elementcollectionhandler.cpp +++ b/sources/ElementsCollection/elementcollectionhandler.cpp @@ -19,7 +19,7 @@ #include "../qetproject.h" #include "../qetxml.h" -#include "renamedialog.h" +#include "ui/renamedialog.h" #include "xmlelementcollection.h" #include diff --git a/sources/ElementsCollection/elementslocation.cpp b/sources/ElementsCollection/elementslocation.cpp index fff5ac9df..634963789 100644 --- a/sources/ElementsCollection/elementslocation.cpp +++ b/sources/ElementsCollection/elementslocation.cpp @@ -18,11 +18,11 @@ #include "elementslocation.h" #include "../elementscollectioncache.h" +#include "../factory/elementpicturefactory.h" #include "../qetapp.h" +#include "../qetgraphicsitem/element.h" #include "../qetproject.h" #include "../qetxml.h" -#include "element.h" -#include "elementpicturefactory.h" #include "xmlelementcollection.h" #include diff --git a/sources/ElementsCollection/elementstreeview.cpp b/sources/ElementsCollection/elementstreeview.cpp index a17e682b6..1e4312ddc 100644 --- a/sources/ElementsCollection/elementstreeview.cpp +++ b/sources/ElementsCollection/elementstreeview.cpp @@ -17,10 +17,10 @@ */ #include "elementstreeview.h" +#include "../factory/elementfactory.h" #include "../qetgraphicsitem/element.h" #include "../qeticons.h" #include "elementcollectionitem.h" -#include "elementfactory.h" #include "elementslocation.h" #include diff --git a/sources/SearchAndReplace/ui/replaceadvanceddialog.cpp b/sources/SearchAndReplace/ui/replaceadvanceddialog.cpp index f956179fe..5ca5a9177 100644 --- a/sources/SearchAndReplace/ui/replaceadvanceddialog.cpp +++ b/sources/SearchAndReplace/ui/replaceadvanceddialog.cpp @@ -17,8 +17,8 @@ */ #include "replaceadvanceddialog.h" -#include "../qetapp.h" -#include "../qetinformation.h" +#include "../../qetapp.h" +#include "../../qetinformation.h" #include "ui_replaceadvanceddialog.h" #include diff --git a/sources/SearchAndReplace/ui/replaceconductordialog.cpp b/sources/SearchAndReplace/ui/replaceconductordialog.cpp index 3b167045f..bbeb1cd7f 100644 --- a/sources/SearchAndReplace/ui/replaceconductordialog.cpp +++ b/sources/SearchAndReplace/ui/replaceconductordialog.cpp @@ -16,11 +16,12 @@ along with QElectroTech. If not, see . */ #include "replaceconductordialog.h" -#include "ui_replaceconductordialog.h" -#include "searchandreplaceworker.h" -#include +#include "../searchandreplaceworker.h" +#include "ui_replaceconductordialog.h" + #include +#include typedef SearchAndReplaceWorker sarw; diff --git a/sources/SearchAndReplace/ui/replaceelementdialog.cpp b/sources/SearchAndReplace/ui/replaceelementdialog.cpp index cef50845e..3c36574d6 100644 --- a/sources/SearchAndReplace/ui/replaceelementdialog.cpp +++ b/sources/SearchAndReplace/ui/replaceelementdialog.cpp @@ -17,11 +17,11 @@ */ #include "replaceelementdialog.h" -#include "../qetapp.h" -#include "../qetinformation.h" -#include "elementinfopartwidget.h" +#include "../../qetapp.h" +#include "../../qetinformation.h" +#include "../../ui/elementinfopartwidget.h" +#include "../searchandreplaceworker.h" #include "replaceelementdialog.h" -#include "searchandreplaceworker.h" #include "ui_replaceelementdialog.h" #include diff --git a/sources/SearchAndReplace/ui/replacefoliowidget.cpp b/sources/SearchAndReplace/ui/replacefoliowidget.cpp index a86d78d2e..8e18c5874 100644 --- a/sources/SearchAndReplace/ui/replacefoliowidget.cpp +++ b/sources/SearchAndReplace/ui/replacefoliowidget.cpp @@ -16,9 +16,10 @@ along with QElectroTech. If not, see . */ #include "replacefoliowidget.h" + +#include "../../ui/diagramcontextwidget.h" +#include "../searchandreplaceworker.h" #include "ui_replacefoliowidget.h" -#include "diagramcontextwidget.h" -#include "searchandreplaceworker.h" #include diff --git a/sources/diagramevent/diagrameventaddelement.cpp b/sources/diagramevent/diagrameventaddelement.cpp index 5183d8c54..189971451 100644 --- a/sources/diagramevent/diagrameventaddelement.cpp +++ b/sources/diagramevent/diagrameventaddelement.cpp @@ -20,8 +20,8 @@ #include "../conductorautonumerotation.h" #include "../diagram.h" #include "../diagramcommands.h" +#include "../factory/elementfactory.h" #include "../qetgraphicsitem/element.h" -#include "elementfactory.h" /** @brief DiagramEventAddElement::DiagramEventAddElement diff --git a/sources/editor/UndoCommand/pastepartscommand.cpp b/sources/editor/UndoCommand/pastepartscommand.cpp index 73444af19..021907138 100644 --- a/sources/editor/UndoCommand/pastepartscommand.cpp +++ b/sources/editor/UndoCommand/pastepartscommand.cpp @@ -16,8 +16,9 @@ along with QElectroTech. If not, see . */ #include "pastepartscommand.h" -#include "elementview.h" -#include "partterminal.h" + +#include "../elementview.h" +#include "../graphicspart/partterminal.h" /** @brief PastePartsCommand::PastePartsCommand diff --git a/sources/editor/UndoCommand/pastepartscommand.h b/sources/editor/UndoCommand/pastepartscommand.h index 34841f6d1..c1b99316a 100644 --- a/sources/editor/UndoCommand/pastepartscommand.h +++ b/sources/editor/UndoCommand/pastepartscommand.h @@ -18,8 +18,8 @@ #ifndef PASTEPARTSCOMMAND_H #define PASTEPARTSCOMMAND_H -#include "editorcommands.h" -#include "elementcontent.h" +#include "../editorcommands.h" +#include "../elementcontent.h" class ElementView; diff --git a/sources/editor/elementscene.cpp b/sources/editor/elementscene.cpp index d79508262..76be82edb 100644 --- a/sources/editor/elementscene.cpp +++ b/sources/editor/elementscene.cpp @@ -24,7 +24,7 @@ #include "editorcommands.h" #include "elementcontent.h" #include "elementprimitivedecorator.h" -#include "eseventinterface.h" +#include "esevent/eseventinterface.h" #include "graphicspart/partarc.h" #include "graphicspart/partdynamictextfield.h" #include "graphicspart/partellipse.h" diff --git a/sources/editor/elementview.cpp b/sources/editor/elementview.cpp index a931362ab..ec1363068 100644 --- a/sources/editor/elementview.cpp +++ b/sources/editor/elementview.cpp @@ -18,7 +18,7 @@ #include "elementview.h" #include "../qetapp.h" -#include "pastepartscommand.h" +#include "UndoCommand/pastepartscommand.h" #include "qetelementeditor.h" /** Constructeur diff --git a/sources/editor/qetelementeditor.cpp b/sources/editor/qetelementeditor.cpp index 75680e397..5f08e1f4f 100644 --- a/sources/editor/qetelementeditor.cpp +++ b/sources/editor/qetelementeditor.cpp @@ -25,37 +25,34 @@ #include "../qeticons.h" #include "../qetmessagebox.h" #include "../recentfiles.h" +#include "arceditor.h" #include "editorcommands.h" #include "elementitemeditor.h" #include "elementscene.h" #include "elementview.h" - -// editeurs de primitives -#include "arceditor.h" -#include "ellipseeditor.h" -#include "lineeditor.h" -#include "polygoneditor.h" -#include "rectangleeditor.h" -#include "terminaleditor.h" -#include "texteditor.h" -#include "partterminal.h" +#include "esevent/eseventaddarc.h" +#include "esevent/eseventadddynamictextfield.h" +#include "esevent/eseventaddellipse.h" +#include "esevent/eseventaddline.h" +#include "esevent/eseventaddpolygon.h" +#include "esevent/eseventaddrect.h" +#include "esevent/eseventaddterminal.h" +#include "esevent/eseventaddtext.h" +#include "graphicspart/partterminal.h" #include "styleeditor.h" -#include "dynamictextfieldeditor.h" +#include "terminaleditor.h" +#include "ui/dynamictextfieldeditor.h" +#include "ui/ellipseeditor.h" +#include "ui/lineeditor.h" +#include "ui/polygoneditor.h" +#include "ui/rectangleeditor.h" +#include "ui/texteditor.h" -#include "eseventaddline.h" -#include "eseventaddrect.h" -#include "eseventaddellipse.h" -#include "eseventaddpolygon.h" -#include "eseventaddarc.h" -#include "eseventaddtext.h" -#include "eseventaddterminal.h" -#include "eseventadddynamictextfield.h" - -#include -#include -#include #include +#include +#include #include +#include #include /* diff --git a/sources/editor/ui/dynamictextfieldeditor.cpp b/sources/editor/ui/dynamictextfieldeditor.cpp index 61706d055..e60005a31 100644 --- a/sources/editor/ui/dynamictextfieldeditor.cpp +++ b/sources/editor/ui/dynamictextfieldeditor.cpp @@ -19,12 +19,12 @@ #include "../../QPropertyUndoCommand/qpropertyundocommand.h" #include "../../editor/graphicspart/customelementpart.h" +#include "../../editor/graphicspart/partdynamictextfield.h" #include "../../qetapp.h" #include "../../qetinformation.h" +#include "../../ui/alignmenttextdialog.h" +#include "../../ui/compositetexteditdialog.h" #include "../qetelementeditor.h" -#include "alignmenttextdialog.h" -#include "compositetexteditdialog.h" -#include "partdynamictextfield.h" #include "ui_dynamictextfieldeditor.h" #include diff --git a/sources/editor/ui/lineeditor.cpp b/sources/editor/ui/lineeditor.cpp index b5eabb612..31ff7d3f5 100644 --- a/sources/editor/ui/lineeditor.cpp +++ b/sources/editor/ui/lineeditor.cpp @@ -20,9 +20,9 @@ #include "../../QPropertyUndoCommand/qpropertyundocommand.h" #include "../../qeticons.h" #include "../elementitemeditor.h" -#include "elementscene.h" -#include "partline.h" -#include "styleeditor.h" +#include "../elementscene.h" +#include "../graphicspart/partline.h" +#include "../styleeditor.h" #include "ui_lineeditor.h" /** diff --git a/sources/factory/elementfactory.cpp b/sources/factory/elementfactory.cpp index c41c4e097..7eb71f595 100644 --- a/sources/factory/elementfactory.cpp +++ b/sources/factory/elementfactory.cpp @@ -16,12 +16,14 @@ along with QElectroTech. If not, see . */ #include "elementfactory.h" -#include "QDomElement" -#include "simpleelement.h" -#include "reportelement.h" -#include "masterelement.h" -#include "slaveelement.h" -#include "terminalelement.h" + +#include "../qetgraphicsitem/masterelement.h" +#include "../qetgraphicsitem/reportelement.h" +#include "../qetgraphicsitem/simpleelement.h" +#include "../qetgraphicsitem/slaveelement.h" +#include "../qetgraphicsitem/terminalelement.h" + +#include ElementFactory* ElementFactory::factory_ = nullptr; /** diff --git a/sources/factory/elementpicturefactory.cpp b/sources/factory/elementpicturefactory.cpp index 7e24480db..609efa91a 100644 --- a/sources/factory/elementpicturefactory.cpp +++ b/sources/factory/elementpicturefactory.cpp @@ -18,9 +18,9 @@ #include "elementpicturefactory.h" #include "../ElementsCollection/elementslocation.h" +#include "../editor/graphicspart/partline.h" #include "../qet.h" #include "../qetapp.h" -#include "partline.h" #include #include diff --git a/sources/factory/propertieseditorfactory.cpp b/sources/factory/propertieseditorfactory.cpp index e02c762f5..15c81b3f2 100644 --- a/sources/factory/propertieseditorfactory.cpp +++ b/sources/factory/propertieseditorfactory.cpp @@ -20,6 +20,8 @@ #include "../PropertiesEditor/propertieseditorwidget.h" #include "../qetgraphicsitem/ViewItem/projectdbmodel.h" #include "../qetgraphicsitem/ViewItem/qetgraphicstableitem.h" +#include "../qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.h" +#include "../qetgraphicsitem/ViewItem/ui/projectdbmodelpropertieswidget.h" #include "../qetgraphicsitem/diagramimageitem.h" #include "../qetgraphicsitem/dynamicelementtextitem.h" #include "../qetgraphicsitem/element.h" @@ -31,9 +33,8 @@ #include "../ui/imagepropertieswidget.h" #include "../ui/inditextpropertieswidget.h" #include "../ui/shapegraphicsitempropertieswidget.h" -#include "QGraphicsItem" -#include "graphicstablepropertieseditor.h" -#include "projectdbmodelpropertieswidget.h" + +#include /** @brief PropertiesEditorFactory::propertiesEditor diff --git a/sources/factory/qetgraphicstablefactory.cpp b/sources/factory/qetgraphicstablefactory.cpp index c7c81a023..b82ad3766 100644 --- a/sources/factory/qetgraphicstablefactory.cpp +++ b/sources/factory/qetgraphicstablefactory.cpp @@ -17,14 +17,14 @@ */ #include "qetgraphicstablefactory.h" +#include "../dataBase/ui/elementquerywidget.h" +#include "../dataBase/ui/summaryquerywidget.h" #include "../diagram.h" -#include "../projectdbmodel.h" -#include "../qetgraphicsheaderitem.h" -#include "../qetgraphicstableitem.h" -#include "addtabledialog.h" -#include "elementquerywidget.h" -#include "qetutils.h" -#include "summaryquerywidget.h" +#include "../qetgraphicsitem/ViewItem/projectdbmodel.h" +#include "../qetgraphicsitem/ViewItem/qetgraphicsheaderitem.h" +#include "../qetgraphicsitem/ViewItem/qetgraphicstableitem.h" +#include "../utils/qetutils.h" +#include "ui/addtabledialog.h" #include diff --git a/sources/factory/ui/addtabledialog.cpp b/sources/factory/ui/addtabledialog.cpp index 5c74bb89e..d9b2e9c77 100644 --- a/sources/factory/ui/addtabledialog.cpp +++ b/sources/factory/ui/addtabledialog.cpp @@ -18,8 +18,8 @@ #include "addtabledialog.h" #include "../../dataBase/ui/elementquerywidget.h" +#include "../../ui/marginseditdialog.h" #include "../../utils/qetutils.h" -#include "marginseditdialog.h" #include "ui_addtabledialog.h" #include diff --git a/sources/factory/ui/addtabledialog.h b/sources/factory/ui/addtabledialog.h index a2d6053b0..37083fc43 100644 --- a/sources/factory/ui/addtabledialog.h +++ b/sources/factory/ui/addtabledialog.h @@ -18,7 +18,7 @@ #ifndef ADDTABLEDIALOG_H #define ADDTABLEDIALOG_H -#include "../qetapp.h" +#include "../../qetapp.h" #include diff --git a/sources/print/projectprintwindow.cpp b/sources/print/projectprintwindow.cpp index d7e9a146f..e72777318 100644 --- a/sources/print/projectprintwindow.cpp +++ b/sources/print/projectprintwindow.cpp @@ -22,18 +22,18 @@ #include "../qetproject.h" #include "ui_projectprintwindow.h" -#include -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove -#include +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove +# include #else -#if TODO_LIST -#pragma message("@TODO remove code for QT 6 or later") -#endif +# if TODO_LIST +# pragma message("@TODO remove code for QT 6 or later") +# endif #endif #include #include #include #include +#include #include /** diff --git a/sources/qetgraphicsitem/ViewItem/projectdbmodel.cpp b/sources/qetgraphicsitem/ViewItem/projectdbmodel.cpp index 0789de0c9..81b471237 100644 --- a/sources/qetgraphicsitem/ViewItem/projectdbmodel.cpp +++ b/sources/qetgraphicsitem/ViewItem/projectdbmodel.cpp @@ -17,11 +17,11 @@ */ #include "projectdbmodel.h" +#include "../../dataBase/projectdatabase.h" #include "../../qetapp.h" #include "../../qetinformation.h" #include "../../qetproject.h" #include "../../qetxml.h" -#include "projectdatabase.h" #include #include diff --git a/sources/qetgraphicsitem/ViewItem/qetgraphicsheaderitem.h b/sources/qetgraphicsitem/ViewItem/qetgraphicsheaderitem.h index b66b3a193..a7a7eb109 100644 --- a/sources/qetgraphicsitem/ViewItem/qetgraphicsheaderitem.h +++ b/sources/qetgraphicsitem/ViewItem/qetgraphicsheaderitem.h @@ -18,7 +18,7 @@ #ifndef QETGRAPHICSHEADERITEM_H #define QETGRAPHICSHEADERITEM_H -#include "../qetapp.h" +#include "../../qetapp.h" #include #include diff --git a/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.cpp b/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.cpp index fe11e8121..c55bde448 100644 --- a/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.cpp +++ b/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.cpp @@ -20,11 +20,11 @@ #include "../../../QPropertyUndoCommand/qpropertyundocommand.h" #include "../../../diagram.h" #include "../../../elementprovider.h" +#include "../../../factory/propertieseditorfactory.h" +#include "../../../undocommand/itemmodelcommand.h" #include "../../../utils/qetutils.h" #include "../qetgraphicsheaderitem.h" #include "../qetgraphicstableitem.h" -#include "itemmodelcommand.h" -#include "propertieseditorfactory.h" #include "ui_graphicstablepropertieseditor.h" #include diff --git a/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.h b/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.h index 3503f6f6f..4e185f033 100644 --- a/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.h +++ b/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.h @@ -18,7 +18,7 @@ #ifndef GRAPHICSTABLEPROPERTIESEDITOR_H #define GRAPHICSTABLEPROPERTIESEDITOR_H -#include "../PropertiesEditor/propertieseditorwidget.h" +#include "../../../PropertiesEditor/propertieseditorwidget.h" #include #include diff --git a/sources/qetgraphicsitem/ViewItem/ui/projectdbmodelpropertieswidget.h b/sources/qetgraphicsitem/ViewItem/ui/projectdbmodelpropertieswidget.h index de3e14850..4ea81b016 100644 --- a/sources/qetgraphicsitem/ViewItem/ui/projectdbmodelpropertieswidget.h +++ b/sources/qetgraphicsitem/ViewItem/ui/projectdbmodelpropertieswidget.h @@ -18,7 +18,7 @@ #ifndef PROJECTDBMODELPROPERTIESWIDGET_H #define PROJECTDBMODELPROPERTIESWIDGET_H -#include "../PropertiesEditor/propertieseditorwidget.h" +#include "../../../PropertiesEditor/propertieseditorwidget.h" class ProjectDBModel; diff --git a/sources/qetgraphicsitem/conductor.cpp b/sources/qetgraphicsitem/conductor.cpp index 6cbf1b79b..4a62f3294 100644 --- a/sources/qetgraphicsitem/conductor.cpp +++ b/sources/qetgraphicsitem/conductor.cpp @@ -26,7 +26,7 @@ #include "../diagramcommands.h" #include "../qetdiagrameditor.h" #include "../qetgraphicsitem/terminal.h" -#include "conductorpropertiesdialog.h" +#include "../ui/conductorpropertiesdialog.h" #include "conductortextitem.h" #include "element.h" diff --git a/sources/qetgraphicsitem/element.cpp b/sources/qetgraphicsitem/element.cpp index 14581b9f7..748faf265 100644 --- a/sources/qetgraphicsitem/element.cpp +++ b/sources/qetgraphicsitem/element.cpp @@ -18,17 +18,17 @@ #include "element.h" #include "../PropertiesEditor/propertieseditordialog.h" +#include "../autoNum/numerotationcontextcommands.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 "../factory/elementpicturefactory.h" #include "../properties/terminaldata.h" #include "../qetgraphicsitem/conductor.h" #include "../qetgraphicsitem/terminal.h" +#include "../ui/elementpropertieswidget.h" #include "../undocommand/changeelementinformationcommand.h" #include "dynamicelementtextitem.h" #include "elementtextitemgroup.h" diff --git a/sources/qetgraphicsitem/slaveelement.h b/sources/qetgraphicsitem/slaveelement.h index bcb3e3aa5..44830d49d 100644 --- a/sources/qetgraphicsitem/slaveelement.h +++ b/sources/qetgraphicsitem/slaveelement.h @@ -18,7 +18,7 @@ #ifndef SLAVEELEMENT_H #define SLAVEELEMENT_H -#include "../../properties/xrefproperties.h" +#include "../properties/xrefproperties.h" #include "element.h" class SlaveElement : public Element diff --git a/sources/ui/configpage/generalconfigurationpage.cpp b/sources/ui/configpage/generalconfigurationpage.cpp index 0b8b1fd89..79d93da44 100644 --- a/sources/ui/configpage/generalconfigurationpage.cpp +++ b/sources/ui/configpage/generalconfigurationpage.cpp @@ -17,8 +17,8 @@ */ #include "generalconfigurationpage.h" -#include "../qetapp.h" -#include "../qeticons.h" +#include "../../qetapp.h" +#include "../../qeticons.h" #include "ui_generalconfigurationpage.h" #include diff --git a/sources/ui/diagrampropertieseditordockwidget.cpp b/sources/ui/diagrampropertieseditordockwidget.cpp index 7e9941d83..f77c6da04 100644 --- a/sources/ui/diagrampropertieseditordockwidget.cpp +++ b/sources/ui/diagrampropertieseditordockwidget.cpp @@ -19,7 +19,7 @@ #include "../PropertiesEditor/propertieseditorwidget.h" #include "../diagram.h" -#include "../propertieseditorfactory.h" +#include "../factory/propertieseditorfactory.h" /** @brief DiagramPropertiesEditorDockWidget::DiagramPropertiesEditorDockWidget diff --git a/sources/ui/dynamicelementtextitemeditor.cpp b/sources/ui/dynamicelementtextitemeditor.cpp index 833931164..64405516f 100644 --- a/sources/ui/dynamicelementtextitemeditor.cpp +++ b/sources/ui/dynamicelementtextitemeditor.cpp @@ -19,10 +19,10 @@ #include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "../diagram.h" -#include "../dynamicelementtextitem.h" -#include "../elementtextitemgroup.h" #include "../elementtextpattern.h" +#include "../qetgraphicsitem/dynamicelementtextitem.h" #include "../qetgraphicsitem/element.h" +#include "../qetgraphicsitem/elementtextitemgroup.h" #include "../ui_dynamicelementtextitemeditor.h" #include "../undocommand/addelementtextcommand.h" #include "../undocommand/deleteqgraphicsitemcommand.h" diff --git a/sources/ui/dynamicelementtextmodel.cpp b/sources/ui/dynamicelementtextmodel.cpp index 86aadc088..a658fcbf9 100644 --- a/sources/ui/dynamicelementtextmodel.cpp +++ b/sources/ui/dynamicelementtextmodel.cpp @@ -19,11 +19,11 @@ #include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "../diagram.h" -#include "../dynamicelementtextitem.h" -#include "../elementtextitemgroup.h" #include "../qetapp.h" #include "../qetgraphicsitem/conductor.h" +#include "../qetgraphicsitem/dynamicelementtextitem.h" #include "../qetgraphicsitem/element.h" +#include "../qetgraphicsitem/elementtextitemgroup.h" #include "../qetgraphicsitem/terminal.h" #include "../qeticons.h" #include "../qetinformation.h" diff --git a/sources/ui/elementinfopartwidget.cpp b/sources/ui/elementinfopartwidget.cpp index f407c7990..fc318a98c 100644 --- a/sources/ui/elementinfopartwidget.cpp +++ b/sources/ui/elementinfopartwidget.cpp @@ -17,9 +17,10 @@ */ #include "elementinfopartwidget.h" -#include +#include "../SearchAndReplace/searchandreplaceworker.h" #include "ui_elementinfopartwidget.h" -#include "searchandreplaceworker.h" + +#include typedef SearchAndReplaceWorker sarw; diff --git a/sources/ui/elementpropertieswidget.cpp b/sources/ui/elementpropertieswidget.cpp index ced36e94b..8ca57241d 100644 --- a/sources/ui/elementpropertieswidget.cpp +++ b/sources/ui/elementpropertieswidget.cpp @@ -19,10 +19,10 @@ #include "../diagram.h" #include "../diagramposition.h" -#include "../dynamicelementtextitem.h" -#include "../elementtextitemgroup.h" #include "../qetapp.h" +#include "../qetgraphicsitem/dynamicelementtextitem.h" #include "../qetgraphicsitem/element.h" +#include "../qetgraphicsitem/elementtextitemgroup.h" #include "../qeticons.h" #include "dynamicelementtextitemeditor.h" #include "elementinfowidget.h" diff --git a/sources/ui/imagepropertieswidget.cpp b/sources/ui/imagepropertieswidget.cpp index 5361d2758..820452cfa 100644 --- a/sources/ui/imagepropertieswidget.cpp +++ b/sources/ui/imagepropertieswidget.cpp @@ -19,7 +19,7 @@ #include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "../diagram.h" -#include "../diagramimageitem.h" +#include "../qetgraphicsitem/diagramimageitem.h" #include "../ui_imagepropertieswidget.h" /** diff --git a/sources/ui/inditextpropertieswidget.cpp b/sources/ui/inditextpropertieswidget.cpp index ae7905257..53ff1612c 100644 --- a/sources/ui/inditextpropertieswidget.cpp +++ b/sources/ui/inditextpropertieswidget.cpp @@ -20,7 +20,7 @@ #include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "../diagram.h" #include "../diagramcommands.h" -#include "../independenttextitem.h" +#include "../qetgraphicsitem/independenttextitem.h" #include "../ui_inditextpropertieswidget.h" #include diff --git a/sources/ui/masterpropertieswidget.cpp b/sources/ui/masterpropertieswidget.cpp index b33ec0676..189f04957 100644 --- a/sources/ui/masterpropertieswidget.cpp +++ b/sources/ui/masterpropertieswidget.cpp @@ -20,8 +20,8 @@ #include "../diagram.h" #include "../diagramposition.h" #include "../elementprovider.h" -#include "element.h" -#include "linkelementcommand.h" +#include "../qetgraphicsitem/element.h" +#include "../undocommand/linkelementcommand.h" #include "ui_masterpropertieswidget.h" #include diff --git a/sources/ui/potentialselectordialog.cpp b/sources/ui/potentialselectordialog.cpp index cff46fbe4..730a8565d 100644 --- a/sources/ui/potentialselectordialog.cpp +++ b/sources/ui/potentialselectordialog.cpp @@ -23,8 +23,8 @@ #include "../diagram.h" #include "../qetgraphicsitem/conductor.h" #include "../qetgraphicsitem/element.h" +#include "../qetgraphicsitem/reportelement.h" #include "../qetgraphicsitem/terminal.h" -#include "../reportelement.h" #include "../ui_potentialselectordialog.h" #include "formulaassistantdialog.h" diff --git a/sources/ui/shapegraphicsitempropertieswidget.cpp b/sources/ui/shapegraphicsitempropertieswidget.cpp index ed2759c65..4e60db0ff 100644 --- a/sources/ui/shapegraphicsitempropertieswidget.cpp +++ b/sources/ui/shapegraphicsitempropertieswidget.cpp @@ -20,7 +20,7 @@ #include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "../diagram.h" -#include "../qetshapeitem.h" +#include "../qetgraphicsitem/qetshapeitem.h" #include "../ui_shapegraphicsitempropertieswidget.h" #include diff --git a/sources/undocommand/deleteqgraphicsitemcommand.cpp b/sources/undocommand/deleteqgraphicsitemcommand.cpp index 4033999f7..6b4855942 100644 --- a/sources/undocommand/deleteqgraphicsitemcommand.cpp +++ b/sources/undocommand/deleteqgraphicsitemcommand.cpp @@ -17,16 +17,16 @@ */ #include "deleteqgraphicsitemcommand.h" -#include "../conductortextitem.h" #include "../diagram.h" #include "../diagramcommands.h" -#include "../dynamicelementtextitem.h" -#include "../elementtextitemgroup.h" #include "../qetdiagrameditor.h" +#include "../qetgraphicsitem/ViewItem/qetgraphicstableitem.h" #include "../qetgraphicsitem/conductor.h" +#include "../qetgraphicsitem/conductortextitem.h" +#include "../qetgraphicsitem/dynamicelementtextitem.h" #include "../qetgraphicsitem/element.h" +#include "../qetgraphicsitem/elementtextitemgroup.h" #include "../qetgraphicsitem/terminal.h" -#include "../qetgraphicstableitem.h" #include "addelementtextcommand.h" /** diff --git a/sources/undocommand/linkelementcommand.cpp b/sources/undocommand/linkelementcommand.cpp index 3a8984962..ecbd27f6d 100644 --- a/sources/undocommand/linkelementcommand.cpp +++ b/sources/undocommand/linkelementcommand.cpp @@ -19,9 +19,9 @@ #include "../conductorautonumerotation.h" #include "../diagram.h" -#include "../potentialselectordialog.h" #include "../qetgraphicsitem/conductor.h" #include "../qetgraphicsitem/element.h" +#include "../ui/potentialselectordialog.h" /** @brief LinkElementCommand::LinkElementCommand diff --git a/sources/undocommand/rotateselectioncommand.cpp b/sources/undocommand/rotateselectioncommand.cpp index 03b7618e6..90b5f6f4c 100644 --- a/sources/undocommand/rotateselectioncommand.cpp +++ b/sources/undocommand/rotateselectioncommand.cpp @@ -18,15 +18,15 @@ #include "rotateselectioncommand.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/conductortextitem.h" +#include "../qetgraphicsitem/diagramimageitem.h" +#include "../qetgraphicsitem/dynamicelementtextitem.h" #include "../qetgraphicsitem/element.h" +#include "../qetgraphicsitem/elementtextitemgroup.h" +#include "../qetgraphicsitem/independenttextitem.h" #include diff --git a/sources/undocommand/rotatetextscommand.cpp b/sources/undocommand/rotatetextscommand.cpp index 8d0dad64c..18d7221f8 100644 --- a/sources/undocommand/rotatetextscommand.cpp +++ b/sources/undocommand/rotatetextscommand.cpp @@ -20,10 +20,10 @@ #include "../diagram.h" #include "../diagramcontent.h" #include "../qetapp.h" +#include "../qetgraphicsitem/conductortextitem.h" +#include "../qetgraphicsitem/diagramtextitem.h" +#include "../qetgraphicsitem/elementtextitemgroup.h" #include "../qtextorientationspinboxwidget.h" -#include "conductortextitem.h" -#include "diagramtextitem.h" -#include "elementtextitemgroup.h" /** @brief RotateTextsCommand::RotateTextsCommand diff --git a/sources/utils/conductorcreator.cpp b/sources/utils/conductorcreator.cpp index bf901dfcc..144c1484d 100644 --- a/sources/utils/conductorcreator.cpp +++ b/sources/utils/conductorcreator.cpp @@ -20,10 +20,10 @@ #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 "../ui/potentialselectordialog.h" #include "qgraphicsitem.h" #include