diff options
author | Liang Qi <liang.qi@qt.io> | 2016-12-12 09:48:59 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-12-12 09:48:59 +0100 |
commit | 2856c5e52bdd2cb736d8394dd87a0726ea5fb560 (patch) | |
tree | a71e216d3ef7abd75647146284c91199c256bf13 /src | |
parent | 3246c09fa5dd9c9354be8ec7d41fa5d5a57f0d0e (diff) | |
parent | eb74919884f14c0ceebb63d512768ea1c8823b84 (diff) | |
download | qtsvg-2856c5e52bdd2cb736d8394dd87a0726ea5fb560.tar.gz |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: Iaac1c139f074e4e82267654a2fbfdcf0a3f5e71c
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/iconengines/svgiconengine/main.cpp | 16 | ||||
-rw-r--r-- | src/plugins/iconengines/svgiconengine/qsvgiconengine-nocompress.json | 3 | ||||
-rw-r--r-- | src/plugins/iconengines/svgiconengine/qsvgiconengine.h | 18 | ||||
-rw-r--r-- | src/plugins/iconengines/svgiconengine/svgiconengine.pro | 1 | ||||
-rw-r--r-- | src/plugins/imageformats/svg/main.cpp | 18 | ||||
-rw-r--r-- | src/plugins/imageformats/svg/qsvgiohandler.cpp | 13 | ||||
-rw-r--r-- | src/plugins/imageformats/svg/qsvgiohandler.h | 12 | ||||
-rw-r--r-- | src/plugins/imageformats/svg/svg-nocompress.json | 4 | ||||
-rw-r--r-- | src/plugins/imageformats/svg/svg.json | 2 | ||||
-rw-r--r-- | src/plugins/plugins.pro | 4 | ||||
-rw-r--r-- | src/svg/qgraphicssvgitem.h | 10 | ||||
-rw-r--r-- | src/svg/qsvggenerator.cpp | 22 | ||||
-rw-r--r-- | src/svg/qsvggenerator.h | 4 | ||||
-rw-r--r-- | src/svg/qsvggraphics_p.h | 74 | ||||
-rw-r--r-- | src/svg/qsvghandler.cpp | 20 | ||||
-rw-r--r-- | src/svg/qsvgstructure_p.h | 14 | ||||
-rw-r--r-- | src/svg/qsvgstyle_p.h | 72 | ||||
-rw-r--r-- | src/svg/qsvgtinydocument_p.h | 4 | ||||
-rw-r--r-- | src/svg/qsvgwidget.h | 4 |
19 files changed, 164 insertions, 151 deletions
diff --git a/src/plugins/iconengines/svgiconengine/main.cpp b/src/plugins/iconengines/svgiconengine/main.cpp index ebcdc82..cedeb7a 100644 --- a/src/plugins/iconengines/svgiconengine/main.cpp +++ b/src/plugins/iconengines/svgiconengine/main.cpp @@ -51,22 +51,16 @@ QT_BEGIN_NAMESPACE class QSvgIconPlugin : public QIconEnginePlugin { Q_OBJECT +#ifndef QT_NO_COMPRESS Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QIconEngineFactoryInterface" FILE "qsvgiconengine.json") +#else + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QIconEngineFactoryInterface" FILE "qsvgiconengine-nocompress.json") +#endif public: - QStringList keys() const; - QIconEngine *create(const QString &filename = QString()); + QIconEngine *create(const QString &filename = QString()) override; }; -QStringList QSvgIconPlugin::keys() const -{ - QStringList keys(QLatin1String("svg")); -#ifndef QT_NO_COMPRESS - keys << QLatin1String("svgz") << QLatin1String("svg.gz"); -#endif - return keys; -} - QIconEngine *QSvgIconPlugin::create(const QString &file) { QSvgIconEngine *engine = new QSvgIconEngine; diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine-nocompress.json b/src/plugins/iconengines/svgiconengine/qsvgiconengine-nocompress.json new file mode 100644 index 0000000..a3e1ac3 --- /dev/null +++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine-nocompress.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "svg" ] +} diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.h b/src/plugins/iconengines/svgiconengine/qsvgiconengine.h index 495a8b0..cf4f255 100644 --- a/src/plugins/iconengines/svgiconengine/qsvgiconengine.h +++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine.h @@ -54,21 +54,21 @@ public: QSvgIconEngine(const QSvgIconEngine &other); ~QSvgIconEngine(); void paint(QPainter *painter, const QRect &rect, - QIcon::Mode mode, QIcon::State state); + QIcon::Mode mode, QIcon::State state) override; QSize actualSize(const QSize &size, QIcon::Mode mode, - QIcon::State state); + QIcon::State state) override; QPixmap pixmap(const QSize &size, QIcon::Mode mode, - QIcon::State state); + QIcon::State state) override; void addPixmap(const QPixmap &pixmap, QIcon::Mode mode, - QIcon::State state); + QIcon::State state) override; void addFile(const QString &fileName, const QSize &size, - QIcon::Mode mode, QIcon::State state); + QIcon::Mode mode, QIcon::State state) override; - QString key() const; - QIconEngine *clone() const; - bool read(QDataStream &in); - bool write(QDataStream &out) const; + QString key() const override; + QIconEngine *clone() const override; + bool read(QDataStream &in) override; + bool write(QDataStream &out) const override; private: QSharedDataPointer<QSvgIconEnginePrivate> d; diff --git a/src/plugins/iconengines/svgiconengine/svgiconengine.pro b/src/plugins/iconengines/svgiconengine/svgiconengine.pro index eb6847b..bfc739f 100644 --- a/src/plugins/iconengines/svgiconengine/svgiconengine.pro +++ b/src/plugins/iconengines/svgiconengine/svgiconengine.pro @@ -4,6 +4,7 @@ HEADERS += qsvgiconengine.h SOURCES += main.cpp \ qsvgiconengine.cpp OTHER_FILES += qsvgiconengine.json +OTHER_FILES += qsvgiconengine-nocompress.json QT += svg core-private gui-private PLUGIN_TYPE = iconengines diff --git a/src/plugins/imageformats/svg/main.cpp b/src/plugins/imageformats/svg/main.cpp index f18c1b4..f9fcfc3 100644 --- a/src/plugins/imageformats/svg/main.cpp +++ b/src/plugins/imageformats/svg/main.cpp @@ -53,22 +53,24 @@ QT_BEGIN_NAMESPACE class QSvgPlugin : public QImageIOPlugin { Q_OBJECT +#ifndef QT_NO_COMPRESS Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "svg.json") +#else + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "svg-nocompress.json") +#endif public: - QStringList keys() const; - Capabilities capabilities(QIODevice *device, const QByteArray &format) const; - QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const; + Capabilities capabilities(QIODevice *device, const QByteArray &format) const override; + QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override; }; -QStringList QSvgPlugin::keys() const -{ - return QStringList() << QLatin1String("svg") << QLatin1String("svgz"); -} - QImageIOPlugin::Capabilities QSvgPlugin::capabilities(QIODevice *device, const QByteArray &format) const { +#ifndef QT_NO_COMPRESS if (format == "svg" || format == "svgz") +#else + if (format == "svg") +#endif return Capabilities(CanRead); if (!format.isEmpty()) return 0; diff --git a/src/plugins/imageformats/svg/qsvgiohandler.cpp b/src/plugins/imageformats/svg/qsvgiohandler.cpp index bb68fd9..88d37bc 100644 --- a/src/plugins/imageformats/svg/qsvgiohandler.cpp +++ b/src/plugins/imageformats/svg/qsvgiohandler.cpp @@ -88,8 +88,10 @@ bool QSvgIOHandlerPrivate::load(QIODevice *device) const QByteArray &ba = buf->data(); res = r.load(QByteArray::fromRawData(ba.constData() + buf->pos(), ba.size() - buf->pos())); buf->seek(ba.size()); +#ifndef QT_NO_COMPRESS } else if (q->format() == "svgz") { res = r.load(device->readAll()); +#endif } else { xmlReader.setDevice(device); res = r.load(&xmlReader); @@ -125,10 +127,13 @@ bool QSvgIOHandler::canRead() const return true; // Will happen if we have been asked for the size QByteArray buf = device()->peek(8); +#ifndef QT_NO_COMPRESS if (buf.startsWith("\x1f\x8b")) { setFormat("svgz"); return true; - } else if (buf.contains("<?xml") || buf.contains("<svg") || buf.contains("<!--")) { + } else +#endif + if (buf.contains("<?xml") || buf.contains("<svg") || buf.contains("<!--")) { setFormat("svg"); return true; } @@ -257,7 +262,11 @@ bool QSvgIOHandler::supportsOption(ImageOption option) const bool QSvgIOHandler::canRead(QIODevice *device) { QByteArray buf = device->peek(8); - return buf.startsWith("\x1f\x8b") || buf.contains("<?xml") || buf.contains("<svg") || buf.contains("<!--"); + return +#ifndef QT_NO_COMPRESS + buf.startsWith("\x1f\x8b") || +#endif + buf.contains("<?xml") || buf.contains("<svg") || buf.contains("<!--"); } QT_END_NAMESPACE diff --git a/src/plugins/imageformats/svg/qsvgiohandler.h b/src/plugins/imageformats/svg/qsvgiohandler.h index 864031f..fdafa0a 100644 --- a/src/plugins/imageformats/svg/qsvgiohandler.h +++ b/src/plugins/imageformats/svg/qsvgiohandler.h @@ -57,13 +57,13 @@ class QSvgIOHandler : public QImageIOHandler public: QSvgIOHandler(); ~QSvgIOHandler(); - virtual bool canRead() const; - virtual QByteArray name() const; - virtual bool read(QImage *image); + bool canRead() const override; + QByteArray name() const override; + bool read(QImage *image) override; static bool canRead(QIODevice *device); - virtual QVariant option(ImageOption option) const; - virtual void setOption(ImageOption option, const QVariant & value); - virtual bool supportsOption(ImageOption option) const; + QVariant option(ImageOption option) const override; + void setOption(ImageOption option, const QVariant & value) override; + bool supportsOption(ImageOption option) const override; private: QSvgIOHandlerPrivate *d; diff --git a/src/plugins/imageformats/svg/svg-nocompress.json b/src/plugins/imageformats/svg/svg-nocompress.json new file mode 100644 index 0000000..3b5a653 --- /dev/null +++ b/src/plugins/imageformats/svg/svg-nocompress.json @@ -0,0 +1,4 @@ +{ + "Keys": [ "svg" ], + "MimeTypes": [ "image/svg+xml" ] +} diff --git a/src/plugins/imageformats/svg/svg.json b/src/plugins/imageformats/svg/svg.json index c8825d4..970914d 100644 --- a/src/plugins/imageformats/svg/svg.json +++ b/src/plugins/imageformats/svg/svg.json @@ -1,4 +1,4 @@ { "Keys": [ "svg", "svgz" ], - "MimeTypes": [ "image/svg+xml" ] + "MimeTypes": [ "image/svg+xml", "image/svg+xml-compressed" ] } diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 3965957..6be129a 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs -load(qfeatures) -!contains(QT_DISABLED_FEATURES, imageformatplugin): SUBDIRS += imageformats +QT_FOR_CONFIG += gui +qtConfig(imageformatplugin): SUBDIRS += imageformats SUBDIRS += iconengines 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.cpp b/src/svg/qsvggenerator.cpp index 6bca27f..5829a1a 100644 --- a/src/svg/qsvggenerator.cpp +++ b/src/svg/qsvggenerator.cpp @@ -162,22 +162,22 @@ public: { } - bool begin(QPaintDevice *device) Q_DECL_OVERRIDE; - bool end() Q_DECL_OVERRIDE; + bool begin(QPaintDevice *device) override; + bool end() override; - void updateState(const QPaintEngineState &state) Q_DECL_OVERRIDE; + void updateState(const QPaintEngineState &state) override; void popGroup(); - void drawEllipse(const QRectF &r) Q_DECL_OVERRIDE; - void drawPath(const QPainterPath &path) Q_DECL_OVERRIDE; - void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) Q_DECL_OVERRIDE; - void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) Q_DECL_OVERRIDE; - void drawRects(const QRectF *rects, int rectCount) Q_DECL_OVERRIDE; - void drawTextItem(const QPointF &pt, const QTextItem &item) Q_DECL_OVERRIDE; + void drawEllipse(const QRectF &r) override; + void drawPath(const QPainterPath &path) override; + void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override; + void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) override; + void drawRects(const QRectF *rects, int rectCount) override; + void drawTextItem(const QPointF &pt, const QTextItem &item) override; void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr, - Qt::ImageConversionFlags flags = Qt::AutoColor) Q_DECL_OVERRIDE; + Qt::ImageConversionFlags flags = Qt::AutoColor) override; - QPaintEngine::Type type() const Q_DECL_OVERRIDE { return QPaintEngine::SVG; } + QPaintEngine::Type type() const override { return QPaintEngine::SVG; } QSize size() const { return d_func()->size; } void setSize(const QSize &size) { 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) |