Wip Fix preprocessor on Cmake

This commit is contained in:
Simon De Backer
2020-12-10 18:44:03 +01:00
parent 3fe0adc66e
commit d15443cf93
61 changed files with 253 additions and 239 deletions
@@ -17,8 +17,8 @@
*/
#include "customelementgraphicpart.h"
#include "../QPropertyUndoCommand/qpropertyundocommand.h"
#include "elementscene.h"
#include "../../QPropertyUndoCommand/qpropertyundocommand.h"
#include "../elementscene.h"
#include <QRegularExpression>
@@ -16,7 +16,8 @@
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/
#include "customelementpart.h"
#include "qetelementeditor.h"
#include "../qetelementeditor.h"
/// @return le QETElementEditor auquel cet editeur appartient
QETElementEditor *CustomElementPart::elementEditor() const
@@ -18,7 +18,7 @@
#ifndef CUSTOM_ELEMENT_PART_H
#define CUSTOM_ELEMENT_PART_H
#include "../qet.h"
#include "../../qet.h"
class CustomElement;
class ElementPrimitiveDecorator;
+4 -4
View File
@@ -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
@@ -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 <QColor>
#include <QFont>
+4 -4
View File
@@ -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
+3 -3
View File
@@ -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 <cmath>
+1 -1
View File
@@ -18,7 +18,7 @@
#ifndef PART_LINE_H
#define PART_LINE_H
#include "../qet.h"
#include "../../qet.h"
#include "customelementgraphicpart.h"
class QPropertyUndoCommand;
+6 -6
View File
@@ -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
@@ -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
+1 -1
View File
@@ -17,7 +17,7 @@
*/
#include "partterminal.h"
#include "../qetgraphicsitem/terminal.h"
#include "../../qetgraphicsitem/terminal.h"
/**
@brief PartTerminal::PartTerminal
+2 -2
View File
@@ -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 <QUuid>
/**
This class represents a terminal which may be used to compose the drawing of
+5 -5
View File
@@ -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
+1 -1
View File
@@ -17,7 +17,7 @@
*/
#ifndef PART_TEXT_H
#define PART_TEXT_H
#include "../qetapp.h"
#include "../../qetapp.h"
#include "customelementpart.h"
#include <QtWidgets>