Wip Fix preprocessor on Cmake

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 <QDir>

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 <QPicture>

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 <QDrag>

sources/SearchAndReplace/ui/replaceadvanceddialog.cpp

@@ -17,8 +17,8 @@
 */
 #include "replaceadvanceddialog.h"
 
-#include "../qetapp.h"
+#include "../../qetapp.h"
-#include "../qetinformation.h"
+#include "../../qetinformation.h"
 #include "ui_replaceadvanceddialog.h"
 
 #include <QAbstractButton>

sources/SearchAndReplace/ui/replaceconductordialog.cpp

@@ -16,11 +16,12 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "replaceconductordialog.h"
-#include "ui_replaceconductordialog.h"
-#include "searchandreplaceworker.h"
 
-#include <QPainter>
+#include "../searchandreplaceworker.h"
+#include "ui_replaceconductordialog.h"
+
 #include <QColorDialog>
+#include <QPainter>
 
 typedef SearchAndReplaceWorker sarw;
 

sources/SearchAndReplace/ui/replaceelementdialog.cpp

@@ -17,11 +17,11 @@
 */
 #include "replaceelementdialog.h"
 
-#include "../qetapp.h"
+#include "../../qetapp.h"
-#include "../qetinformation.h"
+#include "../../qetinformation.h"
-#include "elementinfopartwidget.h"
+#include "../../ui/elementinfopartwidget.h"
+#include "../searchandreplaceworker.h"
 #include "replaceelementdialog.h"
-#include "searchandreplaceworker.h"
 #include "ui_replaceelementdialog.h"
 
 #include <QAbstractButton>

sources/SearchAndReplace/ui/replacefoliowidget.cpp

@@ -16,9 +16,10 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "replacefoliowidget.h"
+
+#include "../../ui/diagramcontextwidget.h"
+#include "../searchandreplaceworker.h"
 #include "ui_replacefoliowidget.h"
-#include "diagramcontextwidget.h"
-#include "searchandreplaceworker.h"
 
 #include <QDialogButtonBox>
 

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

sources/editor/UndoCommand/pastepartscommand.cpp

@@ -16,8 +16,9 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "pastepartscommand.h"
-#include "elementview.h"
+
-#include "partterminal.h"
+#include "../elementview.h"
+#include "../graphicspart/partterminal.h"
 
 /**
 	@brief PastePartsCommand::PastePartsCommand

sources/editor/UndoCommand/pastepartscommand.h

@@ -18,8 +18,8 @@
 #ifndef PASTEPARTSCOMMAND_H
 #define PASTEPARTSCOMMAND_H
 
-#include "editorcommands.h"
+#include "../editorcommands.h"
-#include "elementcontent.h"
+#include "../elementcontent.h"
 
 class ElementView;
 

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"

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

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"
-
+#include "esevent/eseventaddarc.h"
-// editeurs de primitives
+#include "esevent/eseventadddynamictextfield.h"
-#include "arceditor.h"
+#include "esevent/eseventaddellipse.h"
-#include "ellipseeditor.h"
+#include "esevent/eseventaddline.h"
-#include "lineeditor.h"
+#include "esevent/eseventaddpolygon.h"
-#include "polygoneditor.h"
+#include "esevent/eseventaddrect.h"
-#include "rectangleeditor.h"
+#include "esevent/eseventaddterminal.h"
-#include "terminaleditor.h"
+#include "esevent/eseventaddtext.h"
-#include "texteditor.h"
+#include "graphicspart/partterminal.h"
-#include "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 <QMessageBox>
-#include <QTextStream>
-#include <QFileDialog>
 #include <QFile>
+#include <QFileDialog>
+#include <QMessageBox>
 #include <QModelIndex>
+#include <QTextStream>
 #include <utility>
 
 /*

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 <QColorDialog>

sources/editor/ui/lineeditor.cpp

@@ -20,9 +20,9 @@
 #include "../../QPropertyUndoCommand/qpropertyundocommand.h"
 #include "../../qeticons.h"
 #include "../elementitemeditor.h"
-#include "elementscene.h"
+#include "../elementscene.h"
-#include "partline.h"
+#include "../graphicspart/partline.h"
-#include "styleeditor.h"
+#include "../styleeditor.h"
 #include "ui_lineeditor.h"
 
 /**

sources/factory/elementfactory.cpp

@@ -16,12 +16,14 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementfactory.h"
-#include "QDomElement"
+
-#include "simpleelement.h"
+#include "../qetgraphicsitem/masterelement.h"
-#include "reportelement.h"
+#include "../qetgraphicsitem/reportelement.h"
-#include "masterelement.h"
+#include "../qetgraphicsitem/simpleelement.h"
-#include "slaveelement.h"
+#include "../qetgraphicsitem/slaveelement.h"
-#include "terminalelement.h"
+#include "../qetgraphicsitem/terminalelement.h"
+
+#include <QDomElement>
 
 ElementFactory* ElementFactory::factory_ = nullptr;
 /**

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 <QAbstractTextDocumentLayout>
 #include <QDomElement>

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 <QGraphicsItem>
-#include "projectdbmodelpropertieswidget.h"
 
 /**
 	@brief PropertiesEditorFactory::propertiesEditor

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 "../qetgraphicsitem/ViewItem/projectdbmodel.h"
-#include "../qetgraphicsheaderitem.h"
+#include "../qetgraphicsitem/ViewItem/qetgraphicsheaderitem.h"
-#include "../qetgraphicstableitem.h"
+#include "../qetgraphicsitem/ViewItem/qetgraphicstableitem.h"
-#include "addtabledialog.h"
+#include "../utils/qetutils.h"
-#include "elementquerywidget.h"
+#include "ui/addtabledialog.h"
-#include "qetutils.h"
-#include "summaryquerywidget.h"
 
 #include <QDialog>
 

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 <QFontDialog>

sources/factory/ui/addtabledialog.h

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

sources/print/projectprintwindow.cpp

@@ -22,7 +22,6 @@
 #include "../qetproject.h"
 #include "ui_projectprintwindow.h"
 
-#include <QPrintPreviewWidget>
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove
 #	include <QDesktopWidget>
 #else
@@ -34,6 +33,7 @@
 #include <QPageSetupDialog>
 #include <QPainter>
 #include <QPrintDialog>
+#include <QPrintPreviewWidget>
 #include <QScreen>
 
 /**

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 <QSqlError>
 #include <QSqlRecord>

sources/qetgraphicsitem/ViewItem/qetgraphicsheaderitem.h

@@ -18,7 +18,7 @@
 #ifndef QETGRAPHICSHEADERITEM_H
 #define QETGRAPHICSHEADERITEM_H
 
-#include "../qetapp.h"
+#include "../../qetapp.h"
 
 #include <QFont>
 #include <QGraphicsObject>

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 <QAbstractItemModel>

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 <QButtonGroup>
 #include <QPointer>

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;
 

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"
 

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"

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

sources/ui/configpage/generalconfigurationpage.cpp

@@ -17,8 +17,8 @@
 */
 #include "generalconfigurationpage.h"
 
-#include "../qetapp.h"
+#include "../../qetapp.h"
-#include "../qeticons.h"
+#include "../../qeticons.h"
 #include "ui_generalconfigurationpage.h"
 
 #include <QFileDialog>

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

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"

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"

sources/ui/elementinfopartwidget.cpp

@@ -17,9 +17,10 @@
 */
 #include "elementinfopartwidget.h"
 
-#include <utility>
+#include "../SearchAndReplace/searchandreplaceworker.h"
 #include "ui_elementinfopartwidget.h"
-#include "searchandreplaceworker.h"
+
+#include <utility>
 
 typedef SearchAndReplaceWorker sarw;
 

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"

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"
 
 /**

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 <QLineEdit>

sources/ui/masterpropertieswidget.cpp

@@ -20,8 +20,8 @@
 #include "../diagram.h"
 #include "../diagramposition.h"
 #include "../elementprovider.h"
-#include "element.h"
+#include "../qetgraphicsitem/element.h"
-#include "linkelementcommand.h"
+#include "../undocommand/linkelementcommand.h"
 #include "ui_masterpropertieswidget.h"
 
 #include <QListWidgetItem>

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"
 

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 <QHash>

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"
 
 /**

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

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 <QGraphicsItem>
 

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

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 <QPolygonF>