Skip to content

Commit

Permalink
Rename
Browse files Browse the repository at this point in the history
  • Loading branch information
Emdek committed Nov 7, 2019
1 parent 6737e5d commit a3c73ca
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions src/core/AdblockContentFiltersProfile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -420,7 +420,7 @@ ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkUrlSubstri
currentRule += treeChar;
}

currentResult = evaluateRulesInNode(node, currentRule, request);
currentResult = evaluateNodeRules(node, currentRule, request);

if (currentResult.isBlocked)
{
Expand All @@ -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)
{
Expand Down Expand Up @@ -736,7 +736,7 @@ QUrl AdblockContentFiltersProfile::getUpdateUrl() const
return m_updateUrl;
}

ContentFiltersManager::CheckResult AdblockContentFiltersProfile::evaluateRulesInNode(const Node *node, const QString &currentRule, const Request &request) const
ContentFiltersManager::CheckResult AdblockContentFiltersProfile::evaluateNodeRules(const Node *node, const QString &currentRule, const Request &request) const
{
ContentFiltersManager::CheckResult result;

Expand Down
2 changes: 1 addition & 1 deletion src/core/AdblockContentFiltersProfile.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 &currentRule, const Request &request) const;
ContentFiltersManager::CheckResult evaluateRulesInNode(const Node *node, const QString &currentRule, const Request &request) const;
ContentFiltersManager::CheckResult evaluateNodeRules(const Node *node, const QString &currentRule, const Request &request) const;
bool loadRules();
bool resolveDomainExceptions(const QString &url, const QStringList &ruleList) const;

Expand Down

0 comments on commit a3c73ca

Please sign in to comment.