From 0ecbc71d82bbdfb41953229981f4dd9cd9654d24 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 13 Apr 2020 16:29:50 +0000 Subject: [PATCH] remove unused StyleSelector::freeNode() Signed-off-by: Ivailo Monev --- src/gui/styles/qstylesheetstyle.cpp | 2 -- src/gui/text/qcssparser.cpp | 9 ++------- src/gui/text/qcssparser_p.h | 1 - src/gui/text/qtexthtmlparser.cpp | 5 ----- src/svg/qsvghandler.cpp | 4 ---- 5 files changed, 2 insertions(+), 19 deletions(-) diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp index 0e4c48437..c8c1924f0 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -1480,8 +1480,6 @@ public: { NodePtr n; n.ptr = 0; return n; } NodePtr duplicateNode(NodePtr node) const { return node; } - void freeNode(NodePtr) const - { } private: mutable QHash > m_attributeCache; diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp index a335d35f4..30047f2c6 100644 --- a/src/gui/text/qcssparser.cpp +++ b/src/gui/text/qcssparser.cpp @@ -1819,13 +1819,9 @@ bool StyleSelector::selectorMatches(const Selector &selector, NodePtr node) if (sel.relationToNext == BasicSelector::MatchNextSelectorIfAncestor || sel.relationToNext == BasicSelector::MatchNextSelectorIfParent) { - NodePtr nextParent = parentNode(node); - freeNode(node); - node = nextParent; + node = parentNode(node); } else if (sel.relationToNext == BasicSelector::MatchNextSelectorIfPreceeds) { - NodePtr previousSibling = previousSiblingNode(node); - freeNode(node); - node = previousSibling; + node = previousSiblingNode(node); } if (isNullNode(node)) { match = false; @@ -1833,7 +1829,6 @@ bool StyleSelector::selectorMatches(const Selector &selector, NodePtr node) } } while (i >= 0 && (match || sel.relationToNext == BasicSelector::MatchNextSelectorIfAncestor)); - freeNode(node); return match; } diff --git a/src/gui/text/qcssparser_p.h b/src/gui/text/qcssparser_p.h index 81b903fdf..828545991 100644 --- a/src/gui/text/qcssparser_p.h +++ b/src/gui/text/qcssparser_p.h @@ -649,7 +649,6 @@ public: virtual NodePtr parentNode(NodePtr node) const = 0; virtual NodePtr previousSiblingNode(NodePtr node) const = 0; virtual NodePtr duplicateNode(NodePtr node) const = 0; - virtual void freeNode(NodePtr node) const = 0; QVector styleSheets; QString medium; diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp index c235b0840..c2f68e594 100644 --- a/src/gui/text/qtexthtmlparser.cpp +++ b/src/gui/text/qtexthtmlparser.cpp @@ -1729,7 +1729,6 @@ public: virtual NodePtr parentNode(NodePtr node) const; virtual NodePtr previousSiblingNode(NodePtr node) const; virtual NodePtr duplicateNode(NodePtr node) const; - virtual void freeNode(NodePtr node) const; private: const QTextHtmlParser *parser; @@ -1804,10 +1803,6 @@ QCss::StyleSelector::NodePtr QTextHtmlStyleSelector::previousSiblingNode(NodePtr return sibling; } -void QTextHtmlStyleSelector::freeNode(NodePtr) const -{ -} - void QTextHtmlParser::resolveStyleSheetImports(const QCss::StyleSheet &sheet) { for (int i = 0; i < sheet.importRules.count(); ++i) { diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index 5f2aa2886..f701b20c5 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -463,10 +463,6 @@ public: n.id = node.id; return n; } - virtual void freeNode(NodePtr node) const - { - Q_UNUSED(node); - } }; // '0' is 0x30 and '9' is 0x39 -- 2.11.0