summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/svg/qgraphicssvgitem.h10
-rw-r--r--src/svg/qsvggenerator.h4
-rw-r--r--src/svg/qsvggraphics_p.h74
-rw-r--r--src/svg/qsvghandler.cpp20
-rw-r--r--src/svg/qsvgstructure_p.h14
-rw-r--r--src/svg/qsvgstyle_p.h72
-rw-r--r--src/svg/qsvgtinydocument_p.h4
-rw-r--r--src/svg/qsvgwidget.h4
8 files changed, 101 insertions, 101 deletions
diff --git a/src/svg/qgraphicssvgitem.h b/src/svg/qgraphicssvgitem.h
index 88603ec..e849f7a 100644
--- a/src/svg/qgraphicssvgitem.h
+++ b/src/svg/qgraphicssvgitem.h
@@ -76,14 +76,14 @@ public:
void setMaximumCacheSize(const QSize &size);
QSize maximumCacheSize() const;
- virtual QRectF boundingRect() const;
+ QRectF boundingRect() const override;
- virtual void paint(QPainter *painter,
- const QStyleOptionGraphicsItem *option,
- QWidget *widget = Q_NULLPTR);
+ void paint(QPainter *painter,
+ const QStyleOptionGraphicsItem *option,
+ QWidget *widget = Q_NULLPTR) override;
enum { Type = 13 };
- virtual int type() const;
+ int type() const override;
private:
Q_DISABLE_COPY(QGraphicsSvgItem)
diff --git a/src/svg/qsvggenerator.h b/src/svg/qsvggenerator.h
index 35294bc..bd215b2 100644
--- a/src/svg/qsvggenerator.h
+++ b/src/svg/qsvggenerator.h
@@ -93,8 +93,8 @@ public:
void setResolution(int dpi);
int resolution() const;
protected:
- QPaintEngine *paintEngine() const;
- int metric(QPaintDevice::PaintDeviceMetric metric) const;
+ QPaintEngine *paintEngine() const override;
+ int metric(QPaintDevice::PaintDeviceMetric metric) const override;
private:
QScopedPointer<QSvgGeneratorPrivate> d_ptr;
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
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index 4e78b98..3b1cbb8 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -460,7 +460,7 @@ public:
return st;
}
- virtual bool nodeNameEquals(NodePtr node, const QString& nodeName) const
+ bool nodeNameEquals(NodePtr node, const QString& nodeName) const override
{
QSvgNode *n = svgNode(node);
if (!n)
@@ -468,7 +468,7 @@ public:
QString name = nodeToName(n);
return QString::compare(name, nodeName, Qt::CaseInsensitive) == 0;
}
- virtual QString attribute(NodePtr node, const QString &name) const
+ QString attribute(NodePtr node, const QString &name) const override
{
QSvgNode *n = svgNode(node);
if ((!n->nodeId().isEmpty() && (name == QLatin1String("id") ||
@@ -478,14 +478,14 @@ public:
return n->xmlClass();
return QString();
}
- virtual bool hasAttributes(NodePtr node) const
+ bool hasAttributes(NodePtr node) const override
{
QSvgNode *n = svgNode(node);
return (n &&
(!n->nodeId().isEmpty() || !n->xmlClass().isEmpty()));
}
- virtual QStringList nodeIds(NodePtr node) const
+ QStringList nodeIds(NodePtr node) const override
{
QSvgNode *n = svgNode(node);
QString nid;
@@ -495,7 +495,7 @@ public:
return lst;
}
- virtual QStringList nodeNames(NodePtr node) const
+ QStringList nodeNames(NodePtr node) const override
{
QSvgNode *n = svgNode(node);
if (n)
@@ -503,12 +503,12 @@ public:
return QStringList();
}
- virtual bool isNullNode(NodePtr node) const
+ bool isNullNode(NodePtr node) const override
{
return !node.ptr;
}
- virtual NodePtr parentNode(NodePtr node) const
+ NodePtr parentNode(NodePtr node) const override
{
QSvgNode *n = svgNode(node);
NodePtr newNode;
@@ -522,7 +522,7 @@ public:
}
return newNode;
}
- virtual NodePtr previousSiblingNode(NodePtr node) const
+ NodePtr previousSiblingNode(NodePtr node) const override
{
NodePtr newNode;
newNode.ptr = 0;
@@ -538,14 +538,14 @@ public:
}
return newNode;
}
- virtual NodePtr duplicateNode(NodePtr node) const
+ NodePtr duplicateNode(NodePtr node) const override
{
NodePtr n;
n.ptr = node.ptr;
n.id = node.id;
return n;
}
- virtual void freeNode(NodePtr node) const
+ void freeNode(NodePtr node) const override
{
Q_UNUSED(node);
}
diff --git a/src/svg/qsvgstructure_p.h b/src/svg/qsvgstructure_p.h
index d09ca79..b055364 100644
--- a/src/svg/qsvgstructure_p.h
+++ b/src/svg/qsvgstructure_p.h
@@ -71,7 +71,7 @@ public:
~QSvgStructureNode();
QSvgNode *scopeNode(const QString &id) const;
void addChild(QSvgNode *child, const QString &id);
- virtual QRectF bounds(QPainter *p, QSvgExtraStates &states) const;
+ QRectF bounds(QPainter *p, QSvgExtraStates &states) const override;
QSvgNode *previousSiblingNode(QSvgNode *n) const;
QList<QSvgNode*> renderers() const { return m_renderers; }
protected:
@@ -84,24 +84,24 @@ class Q_SVG_PRIVATE_EXPORT QSvgG : public QSvgStructureNode
{
public:
QSvgG(QSvgNode *parent);
- virtual void draw(QPainter *p, QSvgExtraStates &states);
- Type type() const;
+ void draw(QPainter *p, QSvgExtraStates &states) override;
+ Type type() const override;
};
class Q_SVG_PRIVATE_EXPORT QSvgDefs : public QSvgStructureNode
{
public:
QSvgDefs(QSvgNode *parent);
- virtual void draw(QPainter *p, QSvgExtraStates &states);
- Type type() const;
+ void draw(QPainter *p, QSvgExtraStates &states) override;
+ Type type() const override;
};
class Q_SVG_PRIVATE_EXPORT QSvgSwitch : public QSvgStructureNode
{
public:
QSvgSwitch(QSvgNode *parent);
- virtual void draw(QPainter *p, QSvgExtraStates &states);
- Type type() const;
+ void draw(QPainter *p, QSvgExtraStates &states) override;
+ Type type() const override;
private:
void init();
private:
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<qreal> &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<QColor> &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
{
diff --git a/src/svg/qsvgtinydocument_p.h b/src/svg/qsvgtinydocument_p.h
index c31a266..c69c5de 100644
--- a/src/svg/qsvgtinydocument_p.h
+++ b/src/svg/qsvgtinydocument_p.h
@@ -77,7 +77,7 @@ public:
public:
QSvgTinyDocument();
~QSvgTinyDocument();
- Type type() const;
+ Type type() const override;
QSize size() const;
void setWidth(int len, bool percent);
@@ -92,7 +92,7 @@ public:
QRectF viewBox() const;
void setViewBox(const QRectF &rect);
- virtual void draw(QPainter *p, QSvgExtraStates &);//from the QSvgNode
+ void draw(QPainter *p, QSvgExtraStates &) override; //from the QSvgNode
void draw(QPainter *p);
void draw(QPainter *p, const QRectF &bounds);
diff --git a/src/svg/qsvgwidget.h b/src/svg/qsvgwidget.h
index d936c6b..107c64d 100644
--- a/src/svg/qsvgwidget.h
+++ b/src/svg/qsvgwidget.h
@@ -65,12 +65,12 @@ public:
QSvgRenderer *renderer() const;
- QSize sizeHint() const;
+ QSize sizeHint() const override;
public Q_SLOTS:
void load(const QString &file);
void load(const QByteArray &contents);
protected:
- void paintEvent(QPaintEvent *event);
+ void paintEvent(QPaintEvent *event) override;
private:
Q_DISABLE_COPY(QSvgWidget)
Q_DECLARE_PRIVATE(QSvgWidget)
View Lorry Controller Status