[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim-addons] plugins/webengineurlinterceptor/adblock/lib: Minor
From:       Montel Laurent <null () kde ! org>
Date:       2017-12-18 7:21:21
Message-ID: E1eQpjl-0007WT-H7 () code ! kde ! org
[Download RAW message or body]

Git commit 54637866284fb81db283bed790907dd18dcdbd28 by Montel Laurent.
Committed on 18/12/2017 at 07:21.
Pushed by mlaurent into branch 'master'.

Minor

M  +0    -1    plugins/webengineurlinterceptor/adblock/lib/adblockmatcher.cpp
M  +1    -1    plugins/webengineurlinterceptor/adblock/lib/adblockmatcher.h
M  +1    -1    plugins/webengineurlinterceptor/adblock/lib/adblockrule.cpp
M  +1    -0    plugins/webengineurlinterceptor/adblock/lib/adblocksearchtree.cpp

https://commits.kde.org/kdepim-addons/54637866284fb81db283bed790907dd18dcdbd28

diff --git a/plugins/webengineurlinterceptor/adblock/lib/adblockmatcher.cpp \
b/plugins/webengineurlinterceptor/adblock/lib/adblockmatcher.cpp index \
                d4e39890..f601f00d 100644
--- a/plugins/webengineurlinterceptor/adblock/lib/adblockmatcher.cpp
+++ b/plugins/webengineurlinterceptor/adblock/lib/adblockmatcher.cpp
@@ -42,7 +42,6 @@ using namespace AdBlock;
 AdBlockMatcher::AdBlockMatcher(AdblockManager *manager)
     : QObject(manager)
     , m_manager(manager)
-    , m_enabled(false)
 {
     connect(manager, &AdblockManager::enabledChanged, this, \
&AdBlockMatcher::enabledChanged);  }
diff --git a/plugins/webengineurlinterceptor/adblock/lib/adblockmatcher.h \
b/plugins/webengineurlinterceptor/adblock/lib/adblockmatcher.h index \
                2fac46cd..17db8ac1 100644
--- a/plugins/webengineurlinterceptor/adblock/lib/adblockmatcher.h
+++ b/plugins/webengineurlinterceptor/adblock/lib/adblockmatcher.h
@@ -82,7 +82,7 @@ private:
     QString m_elementHidingRules;
     AdBlockSearchTree m_networkBlockTree;
     AdBlockSearchTree m_networkExceptionTree;
-    bool m_enabled;
+    bool m_enabled = false;
 };
 }
 
diff --git a/plugins/webengineurlinterceptor/adblock/lib/adblockrule.cpp \
b/plugins/webengineurlinterceptor/adblock/lib/adblockrule.cpp index \
                c01945ba..47b4a896 100644
--- a/plugins/webengineurlinterceptor/adblock/lib/adblockrule.cpp
+++ b/plugins/webengineurlinterceptor/adblock/lib/adblockrule.cpp
@@ -588,7 +588,7 @@ bool AdBlockRule::filterIsOnlyDomain(const QString &filter) const
 
 bool AdBlockRule::filterIsOnlyEndsMatch(const QString &filter) const
 {
-    for (int i = 0; i < filter.size(); ++i) {
+    for (int i = 0, total = filter.size(); i < total; ++i) {
         switch (filter.at(i).toLatin1()) {
         case '^':
         case '*':
diff --git a/plugins/webengineurlinterceptor/adblock/lib/adblocksearchtree.cpp \
b/plugins/webengineurlinterceptor/adblock/lib/adblocksearchtree.cpp index \
                5e6f2f69..7bb159e6 100644
--- a/plugins/webengineurlinterceptor/adblock/lib/adblocksearchtree.cpp
+++ b/plugins/webengineurlinterceptor/adblock/lib/adblocksearchtree.cpp
@@ -44,6 +44,7 @@ AdBlockSearchTree::AdBlockSearchTree()
 AdBlockSearchTree::~AdBlockSearchTree()
 {
     deleteNode(m_root);
+    m_root = nullptr;
 }
 
 void AdBlockSearchTree::clear()


[prev in list] [next in list] [prev in thread] [next in thread]