From 81b6d699aefae9e092e9ddc73b90d33340fb66f6 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 18 Jun 2021 00:22:57 +0300 Subject: [PATCH] mark QSvgStyleSelector reimplementations as final Signed-off-by: Ivailo Monev --- src/svg/qsvghandler.cpp | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index 86dacbb39..0f5bbd74d 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -359,7 +359,7 @@ public: return st; } - virtual bool nodeNameEquals(NodePtr node, const QString& nodeName) const + bool nodeNameEquals(NodePtr node, const QString& nodeName) const final { QSvgNode *n = svgNode(node); if (!n) @@ -367,7 +367,8 @@ 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 final { QSvgNode *n = svgNode(node); if ((!n->nodeId().isEmpty() && (name == QLatin1String("id") || @@ -377,14 +378,15 @@ public: return n->xmlClass(); return QString(); } - virtual bool hasAttributes(NodePtr node) const + + bool hasAttributes(NodePtr node) const final { QSvgNode *n = svgNode(node); return (n && (!n->nodeId().isEmpty() || !n->xmlClass().isEmpty())); } - virtual QString nodeId(NodePtr node) const + QString nodeId(NodePtr node) const final { QSvgNode *n = svgNode(node); if (n) @@ -392,7 +394,7 @@ public: return QString(); } - virtual QStringList nodeNames(NodePtr node) const + QStringList nodeNames(NodePtr node) const final { QSvgNode *n = svgNode(node); if (n) @@ -400,12 +402,12 @@ public: return QStringList(); } - virtual bool isNullNode(NodePtr node) const + bool isNullNode(NodePtr node) const final { return !node.ptr; } - virtual NodePtr parentNode(NodePtr node) const + NodePtr parentNode(NodePtr node) const final { QSvgNode *n = svgNode(node); NodePtr newNode; @@ -419,7 +421,8 @@ public: } return newNode; } - virtual NodePtr previousSiblingNode(NodePtr node) const + + NodePtr previousSiblingNode(NodePtr node) const final { NodePtr newNode; newNode.ptr = 0; @@ -435,14 +438,16 @@ public: } return newNode; } - virtual NodePtr duplicateNode(NodePtr node) const + + NodePtr duplicateNode(NodePtr node) const final { NodePtr n; n.ptr = node.ptr; n.id = node.id; return n; } - virtual void freeNode(NodePtr node) const + + void freeNode(NodePtr node) const final { Q_UNUSED(node); }