diff options
| -rw-r--r-- | src/quickvectorimage/generator/qsvgvisitorimpl.cpp | 8 | ||||
| -rw-r--r-- | src/quickvectorimage/generator/qsvgvisitorimpl_p.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/quickvectorimage/generator/qsvgvisitorimpl.cpp b/src/quickvectorimage/generator/qsvgvisitorimpl.cpp index 3193bf05d4..dceff04da9 100644 --- a/src/quickvectorimage/generator/qsvgvisitorimpl.cpp +++ b/src/quickvectorimage/generator/qsvgvisitorimpl.cpp @@ -296,7 +296,7 @@ bool QSvgVisitorImpl::traverse() if (m_assumeTrustedSource) options.setFlag(QtSvg::AssumeTrustedSource); - auto *doc = QSvgTinyDocument::load(m_svgFileName, options); + auto *doc = QSvgDocument::load(m_svgFileName, options); if (!doc) { qCDebug(lcQuickVectorImage) << "Not a valid Svg File : " << m_svgFileName; return false; @@ -1457,7 +1457,7 @@ QString QSvgVisitorImpl::nextNodeId() const return QStringLiteral("_qt_node%1").arg(m_nodeIdCounter++); } -bool QSvgVisitorImpl::visitDocumentNodeStart(const QSvgTinyDocument *node) +bool QSvgVisitorImpl::visitDocumentNodeStart(const QSvgDocument *node) { Q_ASSERT(m_defsLevel == 0); handleBaseNodeSetup(node); @@ -1466,7 +1466,7 @@ bool QSvgVisitorImpl::visitDocumentNodeStart(const QSvgTinyDocument *node) fillCommonNodeInfo(node, info); fillAnimationInfo(node, info); - const QSvgTinyDocument *doc = static_cast<const QSvgTinyDocument *>(node); + const QSvgDocument *doc = static_cast<const QSvgDocument *>(node); info.size = doc->size(); info.viewBox = doc->viewBox(); info.isPathContainer = isPathContainer(node); @@ -1476,7 +1476,7 @@ bool QSvgVisitorImpl::visitDocumentNodeStart(const QSvgTinyDocument *node) return m_generator->generateRootNode(info); } -void QSvgVisitorImpl::visitDocumentNodeEnd(const QSvgTinyDocument *node) +void QSvgVisitorImpl::visitDocumentNodeEnd(const QSvgDocument *node) { handleBaseNodeEnd(node); qCDebug(lcQuickVectorImage) << "REVERT" << node->nodeId() << node->type() << (styleResolver->painter().pen().style() != Qt::NoPen) diff --git a/src/quickvectorimage/generator/qsvgvisitorimpl_p.h b/src/quickvectorimage/generator/qsvgvisitorimpl_p.h index 9e907ac04c..a537bed03f 100644 --- a/src/quickvectorimage/generator/qsvgvisitorimpl_p.h +++ b/src/quickvectorimage/generator/qsvgvisitorimpl_p.h @@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE class QTextStream; -class QSvgTinyDocument; +class QSvgDocument; class QSvgFeFilterPrimitive; class QString; class QQuickItem; @@ -55,8 +55,8 @@ protected: bool visitMaskNodeStart(const QSvgMask *node) override; void visitMaskNodeEnd(const QSvgMask *node) override; - bool visitDocumentNodeStart(const QSvgTinyDocument *node) override; - void visitDocumentNodeEnd(const QSvgTinyDocument *node) override; + bool visitDocumentNodeStart(const QSvgDocument *node) override; + void visitDocumentNodeEnd(const QSvgDocument *node) override; bool visitSwitchNodeStart(const QSvgSwitch *node) override; void visitSwitchNodeEnd(const QSvgSwitch *node) override; |
