From a3c73ca564ea8af34a62f9501121916775f4bc2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dutkiewicz?= Date: Thu, 7 Nov 2019 20:12:31 +0100 Subject: [PATCH] Rename --- src/core/AdblockContentFiltersProfile.cpp | 8 ++++---- src/core/AdblockContentFiltersProfile.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/AdblockContentFiltersProfile.cpp b/src/core/AdblockContentFiltersProfile.cpp index 24dd02fa10..ffa60a7efb 100644 --- a/src/core/AdblockContentFiltersProfile.cpp +++ b/src/core/AdblockContentFiltersProfile.cpp @@ -354,7 +354,7 @@ ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkUrlSubstri const QChar treeChar(subString.at(i)); bool childrenExists(false); - currentResult = evaluateRulesInNode(node, currentRule, request); + currentResult = evaluateNodeRules(node, currentRule, request); if (currentResult.isBlocked) { @@ -420,7 +420,7 @@ ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkUrlSubstri currentRule += treeChar; } - currentResult = evaluateRulesInNode(node, currentRule, request); + currentResult = evaluateNodeRules(node, currentRule, request); if (currentResult.isBlocked) { @@ -435,7 +435,7 @@ ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkUrlSubstri { if (node->children.at(i)->value == QLatin1Char('^')) { - currentResult = evaluateRulesInNode(node, currentRule, request); + currentResult = evaluateNodeRules(node, currentRule, request); if (currentResult.isBlocked) { @@ -736,7 +736,7 @@ QUrl AdblockContentFiltersProfile::getUpdateUrl() const return m_updateUrl; } -ContentFiltersManager::CheckResult AdblockContentFiltersProfile::evaluateRulesInNode(const Node *node, const QString ¤tRule, const Request &request) const +ContentFiltersManager::CheckResult AdblockContentFiltersProfile::evaluateNodeRules(const Node *node, const QString ¤tRule, const Request &request) const { ContentFiltersManager::CheckResult result; diff --git a/src/core/AdblockContentFiltersProfile.h b/src/core/AdblockContentFiltersProfile.h index 3a38c9044a..12c64867ce 100644 --- a/src/core/AdblockContentFiltersProfile.h +++ b/src/core/AdblockContentFiltersProfile.h @@ -141,7 +141,7 @@ class AdblockContentFiltersProfile final : public ContentFiltersProfile void deleteNode(Node *node) const; ContentFiltersManager::CheckResult checkUrlSubstring(const Node *node, const QString &subString, QString currentRule, const Request &request) const; ContentFiltersManager::CheckResult checkRuleMatch(const ContentBlockingRule *rule, const QString ¤tRule, const Request &request) const; - ContentFiltersManager::CheckResult evaluateRulesInNode(const Node *node, const QString ¤tRule, const Request &request) const; + ContentFiltersManager::CheckResult evaluateNodeRules(const Node *node, const QString ¤tRule, const Request &request) const; bool loadRules(); bool resolveDomainExceptions(const QString &url, const QStringList &ruleList) const;