From eb74919884f14c0ceebb63d512768ea1c8823b84 Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Fri, 2 Dec 2016 02:03:24 +0300 Subject: Add missing override and remove redundant virtual Change-Id: I9c6bc47803b5decb47787ad69f42259e85470f57 Reviewed-by: Edward Welbourne Reviewed-by: Eirik Aavitsland --- src/svg/qsvgstyle_p.h | 72 +++++++++++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'src/svg/qsvgstyle_p.h') diff --git a/src/svg/qsvgstyle_p.h b/src/svg/qsvgstyle_p.h index 90fb511..916c9fa 100644 --- a/src/svg/qsvgstyle_p.h +++ b/src/svg/qsvgstyle_p.h @@ -177,17 +177,17 @@ class Q_SVG_PRIVATE_EXPORT QSvgFillStyleProperty : public QSvgStyleProperty { public: virtual QBrush brush(QPainter *p, QSvgExtraStates &states) = 0; - virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states); - virtual void revert(QPainter *p, QSvgExtraStates &states); + void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states) override; + void revert(QPainter *p, QSvgExtraStates &states) override; }; class Q_SVG_PRIVATE_EXPORT QSvgQualityStyle : public QSvgStyleProperty { public: QSvgQualityStyle(int color); - virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states); - virtual void revert(QPainter *p, QSvgExtraStates &states); - virtual Type type() const; + void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states) override; + void revert(QPainter *p, QSvgExtraStates &states) override; + Type type() const override; private: // color-render ing v v 'auto' | 'optimizeSpeed' | // 'optimizeQuality' | 'inherit' @@ -217,9 +217,9 @@ class Q_SVG_PRIVATE_EXPORT QSvgOpacityStyle : public QSvgStyleProperty { public: QSvgOpacityStyle(qreal opacity); - virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states); - virtual void revert(QPainter *p, QSvgExtraStates &states); - virtual Type type() const; + void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states) override; + void revert(QPainter *p, QSvgExtraStates &states) override; + Type type() const override; private: qreal m_opacity; qreal m_oldOpacity; @@ -229,9 +229,9 @@ class Q_SVG_PRIVATE_EXPORT QSvgFillStyle : public QSvgStyleProperty { public: QSvgFillStyle(); - virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states); - virtual void revert(QPainter *p, QSvgExtraStates &states); - virtual Type type() const; + void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states) override; + void revert(QPainter *p, QSvgExtraStates &states) override; + Type type() const override; void setFillRule(Qt::FillRule f); void setFillOpacity(qreal opacity); @@ -302,9 +302,9 @@ class Q_SVG_PRIVATE_EXPORT QSvgViewportFillStyle : public QSvgStyleProperty { public: QSvgViewportFillStyle(const QBrush &brush); - virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states); - virtual void revert(QPainter *p, QSvgExtraStates &states); - virtual Type type() const; + void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states) override; + void revert(QPainter *p, QSvgExtraStates &states) override; + Type type() const override; const QBrush & qbrush() const { @@ -326,9 +326,9 @@ public: QSvgFontStyle(QSvgFont *font, QSvgTinyDocument *doc); QSvgFontStyle(); - virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states); - virtual void revert(QPainter *p, QSvgExtraStates &states); - virtual Type type() const; + void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states) override; + void revert(QPainter *p, QSvgExtraStates &states) override; + Type type() const override; void setSize(qreal size) { @@ -406,9 +406,9 @@ class Q_SVG_PRIVATE_EXPORT QSvgStrokeStyle : public QSvgStyleProperty { public: QSvgStrokeStyle(); - virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states); - virtual void revert(QPainter *p, QSvgExtraStates &states); - virtual Type type() const; + void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states) override; + void revert(QPainter *p, QSvgExtraStates &states) override; + Type type() const override; void setStroke(QBrush brush) { @@ -546,14 +546,14 @@ class Q_SVG_PRIVATE_EXPORT QSvgSolidColorStyle : public QSvgFillStyleProperty { public: QSvgSolidColorStyle(const QColor &color); - virtual Type type() const; + Type type() const override; const QColor & qcolor() const { return m_solidColor; } - QBrush brush(QPainter *, QSvgExtraStates &) + QBrush brush(QPainter *, QSvgExtraStates &) override { return m_solidColor; } @@ -572,7 +572,7 @@ class Q_SVG_PRIVATE_EXPORT QSvgGradientStyle : public QSvgFillStyleProperty public: QSvgGradientStyle(QGradient *grad); ~QSvgGradientStyle() { delete m_gradient; } - virtual Type type() const; + Type type() const override; void setStopLink(const QString &link, QSvgTinyDocument *doc); QString stopLink() const { return m_link; } @@ -599,7 +599,7 @@ public: m_gradientStopsSet = set; } - QBrush brush(QPainter *, QSvgExtraStates &); + QBrush brush(QPainter *, QSvgExtraStates &) override; private: QGradient *m_gradient; QMatrix m_matrix; @@ -613,9 +613,9 @@ class Q_SVG_PRIVATE_EXPORT QSvgTransformStyle : public QSvgStyleProperty { public: QSvgTransformStyle(const QTransform &transform); - virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states); - virtual void revert(QPainter *p, QSvgExtraStates &states); - virtual Type type() const; + void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states) override; + void revert(QPainter *p, QSvgExtraStates &states) override; + Type type() const override; const QTransform & qtransform() const { @@ -650,9 +650,9 @@ public: void setArgs(TransformType type, Additive additive, const QVector &args); void setFreeze(bool freeze); void setRepeatCount(qreal repeatCount); - virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states); - virtual void revert(QPainter *p, QSvgExtraStates &states); - virtual Type type() const; + void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states) override; + void revert(QPainter *p, QSvgExtraStates &states) override; + Type type() const override; QSvgAnimateTransform::Additive additiveType() const { return m_additive; @@ -708,9 +708,9 @@ public: void setArgs(bool fill, const QList &colors); void setFreeze(bool freeze); void setRepeatCount(qreal repeatCount); - virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states); - virtual void revert(QPainter *p, QSvgExtraStates &states); - virtual Type type() const; + void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states) override; + void revert(QPainter *p, QSvgExtraStates &states) override; + Type type() const override; private: qreal m_from; qreal m_totalRunningTime; @@ -728,9 +728,9 @@ class Q_SVG_PRIVATE_EXPORT QSvgCompOpStyle : public QSvgStyleProperty { public: QSvgCompOpStyle(QPainter::CompositionMode mode); - virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states); - virtual void revert(QPainter *p, QSvgExtraStates &states); - virtual Type type() const; + void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states) override; + void revert(QPainter *p, QSvgExtraStates &states) override; + Type type() const override; const QPainter::CompositionMode & compOp() const { -- cgit v1.2.1