diff options
Diffstat (limited to 'src/svg/qsvggraphics_p.h')
-rw-r--r-- | src/svg/qsvggraphics_p.h | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/src/svg/qsvggraphics_p.h b/src/svg/qsvggraphics_p.h index 24768ac..33b5154 100644 --- a/src/svg/qsvggraphics_p.h +++ b/src/svg/qsvggraphics_p.h @@ -67,17 +67,17 @@ class QTextCharFormat; class Q_SVG_PRIVATE_EXPORT QSvgAnimation : public QSvgNode { public: - virtual void draw(QPainter *p, QSvgExtraStates &states); - virtual Type type() const; + void draw(QPainter *p, QSvgExtraStates &states) override; + Type type() const override; }; class Q_SVG_PRIVATE_EXPORT QSvgArc : public QSvgNode { public: QSvgArc(QSvgNode *parent, const QPainterPath &path); - virtual void draw(QPainter *p, QSvgExtraStates &states); - virtual Type type() const; - virtual QRectF bounds(QPainter *p, QSvgExtraStates &states) const; + void draw(QPainter *p, QSvgExtraStates &states) override; + Type type() const override; + QRectF bounds(QPainter *p, QSvgExtraStates &states) const override; private: QPainterPath m_path; }; @@ -86,9 +86,9 @@ class Q_SVG_PRIVATE_EXPORT QSvgEllipse : public QSvgNode { public: QSvgEllipse(QSvgNode *parent, const QRectF &rect); - virtual void draw(QPainter *p, QSvgExtraStates &states); - virtual Type type() const; - virtual QRectF bounds(QPainter *p, QSvgExtraStates &states) const; + void draw(QPainter *p, QSvgExtraStates &states) override; + Type type() const override; + QRectF bounds(QPainter *p, QSvgExtraStates &states) const override; private: QRectF m_bounds; }; @@ -97,7 +97,7 @@ class Q_SVG_PRIVATE_EXPORT QSvgCircle : public QSvgEllipse { public: QSvgCircle(QSvgNode *parent, const QRectF &rect) : QSvgEllipse(parent, rect) { } - virtual Type type() const; + Type type() const override; }; class Q_SVG_PRIVATE_EXPORT QSvgImage : public QSvgNode @@ -105,9 +105,9 @@ class Q_SVG_PRIVATE_EXPORT QSvgImage : public QSvgNode public: QSvgImage(QSvgNode *parent, const QImage &image, const QRect &bounds); - virtual void draw(QPainter *p, QSvgExtraStates &states); - virtual Type type() const; - virtual QRectF bounds(QPainter *p, QSvgExtraStates &states) const; + void draw(QPainter *p, QSvgExtraStates &states) override; + Type type() const override; + QRectF bounds(QPainter *p, QSvgExtraStates &states) const override; private: QImage m_image; QRect m_bounds; @@ -117,9 +117,9 @@ class Q_SVG_PRIVATE_EXPORT QSvgLine : public QSvgNode { public: QSvgLine(QSvgNode *parent, const QLineF &line); - virtual void draw(QPainter *p, QSvgExtraStates &states); - virtual Type type() const; - virtual QRectF bounds(QPainter *p, QSvgExtraStates &states) const; + void draw(QPainter *p, QSvgExtraStates &states) override; + Type type() const override; + QRectF bounds(QPainter *p, QSvgExtraStates &states) const override; private: QLineF m_line; }; @@ -128,9 +128,9 @@ class Q_SVG_PRIVATE_EXPORT QSvgPath : public QSvgNode { public: QSvgPath(QSvgNode *parent, const QPainterPath &qpath); - virtual void draw(QPainter *p, QSvgExtraStates &states); - virtual Type type() const; - virtual QRectF bounds(QPainter *p, QSvgExtraStates &states) const; + void draw(QPainter *p, QSvgExtraStates &states) override; + Type type() const override; + QRectF bounds(QPainter *p, QSvgExtraStates &states) const override; QPainterPath *qpath() { return &m_path; @@ -143,9 +143,9 @@ class Q_SVG_PRIVATE_EXPORT QSvgPolygon : public QSvgNode { public: QSvgPolygon(QSvgNode *parent, const QPolygonF &poly); - virtual void draw(QPainter *p, QSvgExtraStates &states); - virtual Type type() const; - virtual QRectF bounds(QPainter *p, QSvgExtraStates &states) const; + void draw(QPainter *p, QSvgExtraStates &states) override; + Type type() const override; + QRectF bounds(QPainter *p, QSvgExtraStates &states) const override; private: QPolygonF m_poly; }; @@ -154,9 +154,9 @@ class Q_SVG_PRIVATE_EXPORT QSvgPolyline : public QSvgNode { public: QSvgPolyline(QSvgNode *parent, const QPolygonF &poly); - virtual void draw(QPainter *p, QSvgExtraStates &states); - virtual Type type() const; - virtual QRectF bounds(QPainter *p, QSvgExtraStates &states) const; + void draw(QPainter *p, QSvgExtraStates &states) override; + Type type() const override; + QRectF bounds(QPainter *p, QSvgExtraStates &states) const override; private: QPolygonF m_poly; }; @@ -165,9 +165,9 @@ class Q_SVG_PRIVATE_EXPORT QSvgRect : public QSvgNode { public: QSvgRect(QSvgNode *paren, const QRectF &rect, int rx=0, int ry=0); - virtual Type type() const; - virtual void draw(QPainter *p, QSvgExtraStates &states); - virtual QRectF bounds(QPainter *p, QSvgExtraStates &states) const; + Type type() const override; + void draw(QPainter *p, QSvgExtraStates &states) override; + QRectF bounds(QPainter *p, QSvgExtraStates &states) const override; private: QRectF m_rect; int m_rx, m_ry; @@ -188,15 +188,15 @@ public: ~QSvgText(); void setTextArea(const QSizeF &size); - virtual void draw(QPainter *p, QSvgExtraStates &states); - virtual Type type() const; + void draw(QPainter *p, QSvgExtraStates &states) override; + Type type() const override; void addTspan(QSvgTspan *tspan) {m_tspans.append(tspan);} void addText(const QString &text); void addLineBreak() {m_tspans.append(LINEBREAK);} void setWhitespaceMode(WhitespaceMode mode) {m_mode = mode;} - //virtual QRectF bounds(QPainter *p, QSvgExtraStates &states) const; + //QRectF bounds(QPainter *p, QSvgExtraStates &states) const override; private: static QSvgTspan * const LINEBREAK; @@ -220,8 +220,8 @@ public: { } ~QSvgTspan() { }; - virtual Type type() const {return TSPAN;} - virtual void draw(QPainter *, QSvgExtraStates &) {Q_ASSERT(!"Tspans should be drawn through QSvgText::draw().");} + Type type() const override { return TSPAN; } + void draw(QPainter *, QSvgExtraStates &) override { Q_ASSERT(!"Tspans should be drawn through QSvgText::draw()."); } void addText(const QString &text) {m_text += text;} const QString &text() const {return m_text;} bool isTspan() const {return m_isTspan;} @@ -237,9 +237,9 @@ class QSvgUse : public QSvgNode { public: QSvgUse(const QPointF &start, QSvgNode *parent, QSvgNode *link); - virtual void draw(QPainter *p, QSvgExtraStates &states); - virtual Type type() const; - virtual QRectF bounds(QPainter *p, QSvgExtraStates &states) const; + void draw(QPainter *p, QSvgExtraStates &states) override; + Type type() const override; + QRectF bounds(QPainter *p, QSvgExtraStates &states) const override; private: QSvgNode *m_link; @@ -249,8 +249,8 @@ private: class QSvgVideo : public QSvgNode { public: - virtual void draw(QPainter *p, QSvgExtraStates &states); - virtual Type type() const; + void draw(QPainter *p, QSvgExtraStates &states) override; + Type type() const override; }; QT_END_NAMESPACE |