kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-03-25 08:49:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Modernize-use-override refactors code

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5009 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2017-08-05 02:10:01 +00:00
parent 9f9b127c04
commit 31f36b8625
161 changed files with 857 additions and 857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sources/qetgraphicsitem/commentitem.h
View File

@@ -34,7 +34,7 @@ class CommentItem : public QGraphicsObject
public:
explicit CommentItem(Element *elmt);
virtual QRectF boundingRect() const;
QRectF boundingRect() const override;
signals:
@@ -43,8 +43,8 @@ class CommentItem : public QGraphicsObject
void updateLabel();
protected:
virtual void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
virtual void mouseDoubleClickEvent (QGraphicsSceneMouseEvent * event );
void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
void mouseDoubleClickEvent (QGraphicsSceneMouseEvent * event ) override;
virtual bool setTextParent ();
private:

24
sources/qetgraphicsitem/conductor.h
View File

@@ -53,7 +53,7 @@ class Conductor : public QObject, public QGraphicsPathItem
public:
Conductor(Terminal *, Terminal *);
virtual ~Conductor();
~Conductor() override;
bool isValid() const;
@@ -72,7 +72,7 @@ class Conductor : public QObject, public QGraphicsPathItem
* Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a conductor.
* @return the QGraphicsItem type
*/
virtual int type() const { return Type; }
int type() const override { return Type; }
Diagram *diagram() const;
ConductorTextItem *textItem() const;
void updatePath(const QRectF & = QRectF());
@@ -82,9 +82,9 @@ class Conductor : public QObject, public QGraphicsPathItem
void updatePathAnimate(const int = 1) {updatePath();}
int fakePath() {return 1;}
void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
QRectF boundingRect() const;
virtual QPainterPath shape() const;
void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override;
QRectF boundingRect() const override;
QPainterPath shape() const override;
virtual QPainterPath nearShape() const;
qreal length() const;
ConductorSegment *middleSegment();
@@ -132,13 +132,13 @@ class Conductor : public QObject, public QGraphicsPathItem
void displayedTextChanged();
protected:
virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
virtual QVariant itemChange(GraphicsItemChange, const QVariant &);
virtual bool sceneEventFilter(QGraphicsItem *watched, QEvent *event);
void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override;
void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override;
QVariant itemChange(GraphicsItemChange, const QVariant &) override;
bool sceneEventFilter(QGraphicsItem *watched, QEvent *event) override;
private:
void adjusteHandlerPos();

18
sources/qetgraphicsitem/conductortextitem.h
View File

@@ -34,16 +34,16 @@ class ConductorTextItem : public DiagramTextItem
public:
ConductorTextItem(Conductor * = nullptr);
ConductorTextItem(const QString &, Conductor * = nullptr);
virtual ~ConductorTextItem();
~ConductorTextItem() override;
private:
ConductorTextItem(const ConductorTextItem &);
public:
enum { Type = UserType + 1006 };
Conductor *parentConductor() const;
virtual void fromXml(const QDomElement &);
void fromXml(const QDomElement &) override;
virtual void toXml (QDomElement &xml) const;
virtual int type() const { return Type; }
int type() const override { return Type; }
virtual bool wasMovedByUser() const;
virtual bool wasRotateByUser() const;
virtual void forceMovedByUser(bool);
@@ -52,12 +52,12 @@ class ConductorTextItem : public DiagramTextItem
virtual void setPos(qreal x, qreal y);
protected:
virtual void mousePressEvent (QGraphicsSceneMouseEvent *event);
virtual void mouseMoveEvent (QGraphicsSceneMouseEvent *event);
virtual void mouseReleaseEvent (QGraphicsSceneMouseEvent *event);
virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *);
virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *);
virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *);
void mousePressEvent (QGraphicsSceneMouseEvent *event) override;
void mouseMoveEvent (QGraphicsSceneMouseEvent *event) override;
void mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override;
void hoverEnterEvent(QGraphicsSceneHoverEvent *) override;
void hoverLeaveEvent(QGraphicsSceneHoverEvent *) override;
void hoverMoveEvent(QGraphicsSceneHoverEvent *) override;
// attributes
private:

18
sources/qetgraphicsitem/crossrefitem.h
View File

@@ -42,10 +42,10 @@ class CrossRefItem : public QGraphicsObject
//Methods
public:
explicit CrossRefItem(Element *elmt);
~CrossRefItem();
~CrossRefItem() override;
enum { Type = UserType + 1009 };
virtual int type() const { return Type; }
int type() const override { return Type; }
enum CONTACTS {
NO = 1,
@@ -58,8 +58,8 @@ class CrossRefItem : public QGraphicsObject
Delay = 48
};
QRectF boundingRect () const;
virtual QPainterPath shape () const;
QRectF boundingRect () const override;
QPainterPath shape () const override;
QString elementPositionText (const Element *elmt, const bool &add_prefix = false) const;
public slots:
@@ -68,11 +68,11 @@ class CrossRefItem : public QGraphicsObject
void autoPos ();
protected:
virtual void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
virtual void mouseDoubleClickEvent (QGraphicsSceneMouseEvent * event );
virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event);
virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
void mouseDoubleClickEvent (QGraphicsSceneMouseEvent * event ) override;
void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
void hoverMoveEvent(QGraphicsSceneHoverEvent *event) override;
void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override;
private:
void buildHeaderContact ();

28
sources/qetgraphicsitem/customelement.h
View File

@@ -38,7 +38,7 @@ class CustomElement : public FixedElement
public:
CustomElement (const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr);
virtual ~CustomElement();
~CustomElement() override;
private:
CustomElement(const CustomElement &);
@@ -62,20 +62,20 @@ class CustomElement : public FixedElement
// methods
public:
virtual QList<Terminal *> terminals() const;
virtual QList<Conductor *> conductors() const;
virtual QList<ElementTextItem *> texts() const;
virtual QList<QLineF *> lines() const;
virtual QList<QRectF *> rectangles() const;
virtual QList<QRectF *> circles() const;
virtual QList<QVector<QPointF> *> polygons() const;
virtual QList<QVector<qreal> *> arcs() const;
virtual int terminalsCount() const;
virtual void paint(QPainter *, const QStyleOptionGraphicsItem *);
QString typeId() const;
QList<Terminal *> terminals() const override;
QList<Conductor *> conductors() const override;
QList<ElementTextItem *> texts() const override;
QList<QLineF *> lines() const override;
QList<QRectF *> rectangles() const override;
QList<QRectF *> circles() const override;
QList<QVector<QPointF> *> polygons() const override;
QList<QVector<qreal> *> arcs() const override;
int terminalsCount() const override;
void paint(QPainter *, const QStyleOptionGraphicsItem *) override;
QString typeId() const override;
ElementsLocation location() const;
QString name() const;
ElementTextItem* taggedText(const QString &tagg) const;
QString name() const override;
ElementTextItem* taggedText(const QString &tagg) const override;
protected:
virtual bool buildFromXml(const QDomElement &, int * = nullptr);

12
sources/qetgraphicsitem/diagramimageitem.h
View File

@@ -35,7 +35,7 @@ class DiagramImageItem : public QetGraphicsItem {
public:
DiagramImageItem(QetGraphicsItem * = nullptr);
DiagramImageItem(const QPixmap &pixmap, QetGraphicsItem * = nullptr);
virtual ~DiagramImageItem();
~DiagramImageItem() override;
// attributes
public:
@@ -48,17 +48,17 @@ class DiagramImageItem : public QetGraphicsItem {
DiagramImageItem
@return the QGraphicsItem type
*/
virtual int type() const { return Type; }
int type() const override { return Type; }
virtual bool fromXml(const QDomElement &);
virtual QDomElement toXml(QDomDocument &) const;
virtual void editProperty();
void editProperty() override;
void setPixmap(const QPixmap &pixmap);
virtual QRectF boundingRect() const;
virtual QString name() const;
QRectF boundingRect() const override;
QString name() const override;
protected:
virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override;
protected:
QPixmap pixmap_;

22
sources/qetgraphicsitem/diagramtextitem.h
View File

@@ -49,7 +49,7 @@ class DiagramTextItem : public QGraphicsTextItem
public:
enum { Type = UserType + 1004 };
virtual int type() const override { return Type; }
int type() const override { return Type; }
Diagram *diagram() const;
virtual void fromXml(const QDomElement &) = 0;
@@ -73,18 +73,18 @@ class DiagramTextItem : public QGraphicsTextItem
void setNoEditable(bool e = true) {m_no_editable = e;}
protected:
virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override;
virtual void focusInEvent(QFocusEvent *) override;
virtual void focusOutEvent(QFocusEvent *) override;
void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override;
void focusInEvent(QFocusEvent *) override;
void focusOutEvent(QFocusEvent *) override;
virtual void mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event) override;
virtual void mousePressEvent (QGraphicsSceneMouseEvent *event) override;
virtual void mouseMoveEvent (QGraphicsSceneMouseEvent *event) override;
virtual void mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override;
void mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event) override;
void mousePressEvent (QGraphicsSceneMouseEvent *event) override;
void mouseMoveEvent (QGraphicsSceneMouseEvent *event) override;
void mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override;
virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *) override;
virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *) override;
virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *) override;
void hoverEnterEvent(QGraphicsSceneHoverEvent *) override;
void hoverLeaveEvent(QGraphicsSceneHoverEvent *) override;
void hoverMoveEvent(QGraphicsSceneHoverEvent *) override;
virtual void applyRotation(const qreal &);

12
sources/qetgraphicsitem/dynamicelementtextitem.h
View File

@@ -44,7 +44,7 @@ class DynamicElementTextItem : public DiagramTextItem
ElementInfo
};
enum {Type = UserType + 1010};
virtual int type() const override {return Type;}
int type() const override {return Type;}
signals:
void taggChanged(QString tagg);
@@ -53,13 +53,13 @@ class DynamicElementTextItem : public DiagramTextItem
public:
DynamicElementTextItem(Element *parent_element);
virtual ~DynamicElementTextItem() override;
~DynamicElementTextItem() override;
private:
DynamicElementTextItem(const DynamicElementTextItem &);
public:
virtual QDomElement toXml(QDomDocument &dom_doc) const override;
virtual void fromXml(const QDomElement &dom_elmt) override;
QDomElement toXml(QDomDocument &dom_doc) const override;
void fromXml(const QDomElement &dom_elmt) override;
Element *ParentElement() const;
@@ -72,8 +72,8 @@ class DynamicElementTextItem : public DiagramTextItem
static QString xmlTaggName() {return QString("dynamic_elmt_text");}
protected:
virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
private:
Element *m_parent_element = nullptr;

22
sources/qetgraphicsitem/element.h
View File

@@ -42,7 +42,7 @@ class Element : public QetGraphicsItem
// constructors, destructor
public:
Element(QGraphicsItem * = nullptr);
virtual ~Element();
~Element() override;
private:
Element(const Element &);
@@ -53,7 +53,7 @@ class Element : public QetGraphicsItem
* @return the QGraphicsItem type
*/
enum { Type = UserType + 1000 };
virtual int type() const { return Type; }
int type() const override { return Type; }
/**
* @brief The kind enum
@@ -164,13 +164,13 @@ class Element : public QetGraphicsItem
/// @return This element type ID
virtual QString typeId() const = 0;
/// @return the human name for this element
virtual QString name() const = 0;
QString name() const override = 0;
virtual bool isHighlighted() const;
virtual void setHighlighted(bool);
void displayHelpLine(bool b = true);
void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
QRectF boundingRect() const;
void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override;
QRectF boundingRect() const override;
QSize setSize(int, int);
QSize size() const;
QPixmap pixmap();
@@ -183,8 +183,8 @@ class Element : public QetGraphicsItem
void select();
void deselect();
virtual void rotateBy(const qreal &);
virtual void editProperty();
void rotateBy(const qreal &) override;
void editProperty() override;
// methods related to XML import/export
static bool valideXml(QDomElement &);
@@ -210,10 +210,10 @@ class Element : public QetGraphicsItem
void etiToElementLabels(ElementTextItem*);
protected:
virtual void mouseMoveEvent ( QGraphicsSceneMouseEvent *event );
virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent *event );
virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * );
virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * );
void mouseMoveEvent ( QGraphicsSceneMouseEvent *event ) override;
void mouseReleaseEvent ( QGraphicsSceneMouseEvent *event ) override;
void hoverEnterEvent ( QGraphicsSceneHoverEvent * ) override;
void hoverLeaveEvent ( QGraphicsSceneHoverEvent * ) override;
private:
bool m_mouse_over;

18
sources/qetgraphicsitem/elementtextitem.h
View File

@@ -33,12 +33,12 @@ class ElementTextItem : public DiagramTextItem {
public:
ElementTextItem(Element * = nullptr);
ElementTextItem(const QString &, Element * = nullptr);
virtual ~ElementTextItem();
~ElementTextItem() override;
// attributes
public:
enum { Type = UserType + 1003 };
virtual int type () const { return Type; }
int type () const override { return Type; }
private:
Element *parent_element_;
@@ -50,8 +50,8 @@ class ElementTextItem : public DiagramTextItem {
// methods
public:
Element *parentElement () const;
void fromXml ( const QDomElement & );
QDomElement toXml ( QDomDocument & ) const;
void fromXml ( const QDomElement & ) override;
QDomElement toXml ( QDomDocument & ) const override;
void setOriginalPos ( const QPointF & );
QPointF originalPos () const;
void setOriginalRotationAngle ( const qreal & );
@@ -66,11 +66,11 @@ class ElementTextItem : public DiagramTextItem {
void adjustItemPosition(int = 0);
protected:
virtual void mouseDoubleClickEvent ( QGraphicsSceneMouseEvent *event );
virtual void mouseMoveEvent ( QGraphicsSceneMouseEvent *event );
virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent *event );
virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent *event );
virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent *event );
void mouseDoubleClickEvent ( QGraphicsSceneMouseEvent *event ) override;
void mouseMoveEvent ( QGraphicsSceneMouseEvent *event ) override;
void mouseReleaseEvent ( QGraphicsSceneMouseEvent *event ) override;
void hoverEnterEvent ( QGraphicsSceneHoverEvent *event ) override;
void hoverLeaveEvent ( QGraphicsSceneHoverEvent *event ) override;
private:
void build ();

14
sources/qetgraphicsitem/fixedelement.h
View File

@@ -30,15 +30,15 @@ class FixedElement : public Element {
// constructors, destructor
public:
FixedElement(QGraphicsItem * = nullptr);
virtual ~FixedElement();
~FixedElement() override;
// methods
public:
int minTerminalsCount() const;
int maxTerminalsCount() const;
virtual int terminalsCount() const = 0;
virtual void paint(QPainter *, const QStyleOptionGraphicsItem *) = 0;
virtual QString typeId() const = 0;
virtual QString name() const = 0;
int minTerminalsCount() const override;
int maxTerminalsCount() const override;
int terminalsCount() const override = 0;
void paint(QPainter *, const QStyleOptionGraphicsItem *) override = 0;
QString typeId() const override = 0;
QString name() const override = 0;
};
#endif

6
sources/qetgraphicsitem/ghostelement.h
View File

@@ -37,12 +37,12 @@ class GhostElement : public CustomElement {
// constructor, destructor
public:
GhostElement(const ElementsLocation &, QGraphicsItem * = nullptr);
virtual ~GhostElement();
~GhostElement() override;
// methods
public:
virtual bool fromXml(QDomElement &, QHash<int, Terminal *> &, bool = false);
virtual kind linkType() const {return Simple;}
bool fromXml(QDomElement &, QHash<int, Terminal *> &, bool = false) override;
kind linkType() const override {return Simple;}
protected:
QRectF minimalBoundingRect() const;

8
sources/qetgraphicsitem/independenttextitem.h
View File

@@ -30,7 +30,7 @@ class IndependentTextItem : public DiagramTextItem {
public:
IndependentTextItem();
IndependentTextItem(const QString &);
virtual ~IndependentTextItem();
~IndependentTextItem() override;
// attributes
public:
@@ -43,9 +43,9 @@ class IndependentTextItem : public DiagramTextItem {
IndependentTextItem.
@return le type de QGraphicsItem
*/
virtual int type() const { return Type; }
virtual void fromXml(const QDomElement &);
virtual QDomElement toXml(QDomDocument &) const;
int type() const override { return Type; }
void fromXml(const QDomElement &) override;
QDomElement toXml(QDomDocument &) const override;
private:
QPointF mouse_to_origin_movement_;

10
sources/qetgraphicsitem/masterelement.h
View File

@@ -34,12 +34,12 @@ class MasterElement : public CustomElement
public:
explicit MasterElement(const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr);
~MasterElement();
~MasterElement() override;
virtual void linkToElement (Element *elmt);
virtual void unlinkAllElements ();
virtual void unlinkElement (Element *elmt);
virtual void initLink (QETProject *project);
void linkToElement (Element *elmt) override;
void unlinkAllElements () override;
void unlinkElement (Element *elmt) override;
void initLink (QETProject *project) override;
public slots:
void updateLabel(DiagramContext old_info, DiagramContext new_info);

10
sources/qetgraphicsitem/qetgraphicsitem.h
View File

@@ -29,7 +29,7 @@ class QetGraphicsItem : public QGraphicsObject
public:
//constructor destructor
QetGraphicsItem(QGraphicsItem *parent = nullptr);
virtual ~QetGraphicsItem() = 0;
~QetGraphicsItem() override = 0;
//public methode
Diagram *diagram () const;
@@ -46,10 +46,10 @@ class QetGraphicsItem : public QGraphicsObject
//protected method
protected:
virtual void mousePressEvent(QGraphicsSceneMouseEvent *e);
virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *e);
virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *e);
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *e);
void mousePressEvent(QGraphicsSceneMouseEvent *e) override;
void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *e) override;
void mouseMoveEvent(QGraphicsSceneMouseEvent *e) override;
void mouseReleaseEvent(QGraphicsSceneMouseEvent *e) override;
protected:
bool is_movable_;

24
sources/qetgraphicsitem/qetshapeitem.h
View File

@@ -57,10 +57,10 @@ class QetShapeItem : public QetGraphicsItem
enum { Type = UserType + 1008 };
QetShapeItem(QPointF, QPointF = QPointF(0,0), ShapeType = Line, QGraphicsItem *parent = nullptr);
virtual ~QetShapeItem();
~QetShapeItem() override;
//Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a QetShapeItem @return the QGraphicsItem type
virtual int type() const { return Type; }
int type() const override { return Type; }
///METHODS
QPen pen() const {return m_pen;}
@@ -73,8 +73,8 @@ class QetShapeItem : public QetGraphicsItem
virtual QDomElement toXml (QDomDocument &document) const;
virtual bool toDXF (const QString &filepath);
virtual void editProperty();
virtual QString name() const;
void editProperty() override;
QString name() const override;
void setP2 (const QPointF &P2);
QLineF line() const{return QLineF(m_P1, m_P2);}
@@ -91,16 +91,16 @@ class QetShapeItem : public QetGraphicsItem
void setNextPoint (QPointF P);
void removePoints (int number = 1);
QRectF boundingRect() const;
QPainterPath shape() const;
QRectF boundingRect() const override;
QPainterPath shape() const override;
protected:
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
virtual void hoverEnterEvent (QGraphicsSceneHoverEvent *event);
virtual void hoverLeaveEvent (QGraphicsSceneHoverEvent *event);
virtual void mouseReleaseEvent (QGraphicsSceneMouseEvent *event);
virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);
virtual bool sceneEventFilter(QGraphicsItem *watched, QEvent *event);
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
void hoverEnterEvent (QGraphicsSceneHoverEvent *event) override;
void hoverLeaveEvent (QGraphicsSceneHoverEvent *event) override;
void mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override;
QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
bool sceneEventFilter(QGraphicsItem *watched, QEvent *event) override;
private:
void switchResizeMode();

8
sources/qetgraphicsitem/reportelement.h
View File

@@ -33,10 +33,10 @@ class ReportElement : public CustomElement
public :
explicit ReportElement(const ElementsLocation &,QString link_type, QGraphicsItem * = nullptr, int * = nullptr);
~ReportElement();
virtual void linkToElement(Element *);
virtual void unlinkAllElements();
virtual void unlinkElement(Element *elmt);
~ReportElement() override;
void linkToElement(Element *) override;
void unlinkAllElements() override;
void unlinkElement(Element *elmt) override;
private:
void conductorWasAdded(Conductor *conductor);

4
sources/qetgraphicsitem/simpleelement.h
View File

@@ -33,9 +33,9 @@ class SimpleElement : public CustomElement {
public :
explicit SimpleElement(const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr);
~SimpleElement();
~SimpleElement() override;
virtual void initLink(QETProject *project);
void initLink(QETProject *project) override;
public slots:
void updateLabel(DiagramContext old_info, DiagramContext new_info);

8
sources/qetgraphicsitem/slaveelement.h
View File

@@ -26,10 +26,10 @@ class SlaveElement : public CustomElement
Q_OBJECT
public:
explicit SlaveElement (const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr);
~SlaveElement();
virtual void linkToElement(Element *elmt);
virtual void unlinkAllElements();
virtual void unlinkElement(Element *elmt);
~SlaveElement() override;
void linkToElement(Element *elmt) override;
void unlinkAllElements() override;
void unlinkElement(Element *elmt) override;
signals:

20
sources/qetgraphicsitem/terminal.h
View File

@@ -40,7 +40,7 @@ class Terminal : public QGraphicsObject
Terminal(QPointF, Qet::Orientation, Element * = nullptr);
Terminal(qreal, qreal, Qet::Orientation, Element * = nullptr);
Terminal(QPointF, Qet::Orientation, QString number, QString name, bool hiddenName, Element * = nullptr);
virtual ~Terminal();
~Terminal() override;
private:
Terminal(const Terminal &);
@@ -49,12 +49,12 @@ class Terminal : public QGraphicsObject
public:
//Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a Terminal
//@return the QGraphicsItem type
virtual int type() const { return Type; }
int type() const override { return Type; }
void paint (QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
void paint (QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override;
void drawHelpLine (bool draw = true);
QLineF HelpLine () const;
QRectF boundingRect () const;
QRectF boundingRect () const override;
// methods to manage conductors attached to the terminal
Terminal* alignedWithTerminal () const;
@@ -82,12 +82,12 @@ class Terminal : public QGraphicsObject
protected:
// methods related to events management
void hoverEnterEvent (QGraphicsSceneHoverEvent *);
void hoverMoveEvent (QGraphicsSceneHoverEvent *);
void hoverLeaveEvent (QGraphicsSceneHoverEvent *);
void mousePressEvent (QGraphicsSceneMouseEvent *);
void mouseMoveEvent (QGraphicsSceneMouseEvent *);
void mouseReleaseEvent(QGraphicsSceneMouseEvent *);
void hoverEnterEvent (QGraphicsSceneHoverEvent *) override;
void hoverMoveEvent (QGraphicsSceneHoverEvent *) override;
void hoverLeaveEvent (QGraphicsSceneHoverEvent *) override;
void mousePressEvent (QGraphicsSceneMouseEvent *) override;
void mouseMoveEvent (QGraphicsSceneMouseEvent *) override;
void mouseReleaseEvent(QGraphicsSceneMouseEvent *) override;
// attributes
public:

4
sources/qetgraphicsitem/terminalelement.h
View File

@@ -28,8 +28,8 @@ class TerminalElement : public CustomElement
Q_OBJECT
public:
TerminalElement(const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr);
~TerminalElement();
virtual void initLink(QETProject *project);
~TerminalElement() override;
void initLink(QETProject *project) override;
public slots:
void updateLabel(DiagramContext old_info, DiagramContext new_info);