summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Poulain <benjamin.poulain@nokia.com>2010-08-18 02:55:42 +0200
committerBenjamin Poulain <benjamin.poulain@nokia.com>2010-08-18 05:04:39 +0200
commit9ea6dca0c9b3fc0cc5197253b590d31a6041bf46 (patch)
tree6ab3061a9a81bf3b1a6c2f26c8547847386c7d5d
parentCleaning of the constructor of AdBlockRule (diff)
downloadrekonq-9ea6dca0c9b3fc0cc5197253b590d31a6041bf46.tar.xz
Remove the method pattern() from AdBlockRule
The method pattern imply the rule is implemented with a regexp, which is what we should try to avoid in the future for performance reasons.
-rw-r--r--src/adblock/adblockmanager.cpp2
-rw-r--r--src/adblock/adblockrule.cpp6
-rw-r--r--src/adblock/adblockrule.h2
3 files changed, 0 insertions, 10 deletions
diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp
index 39432f88..644ecff5 100644
--- a/src/adblock/adblockmanager.cpp
+++ b/src/adblock/adblockmanager.cpp
@@ -168,7 +168,6 @@ QNetworkReply *AdBlockManager::block(const QNetworkRequest &request, WebPage *pa
if (filter.match(urlString))
{
kDebug() << "****ADBLOCK: WHITE RULE (@@) Matched: ***********";
- kDebug() << "Filter exp: " << filter.pattern();
kDebug() << "UrlString: " << urlString;
return 0;
}
@@ -180,7 +179,6 @@ QNetworkReply *AdBlockManager::block(const QNetworkRequest &request, WebPage *pa
if (filter.match(urlString))
{
kDebug() << "****ADBLOCK: BLACK RULE Matched: ***********";
- kDebug() << "Filter exp: " << filter.pattern();
kDebug() << "UrlString: " << urlString;
QWebElement document = page->mainFrame()->documentElement();
diff --git a/src/adblock/adblockrule.cpp b/src/adblock/adblockrule.cpp
index b47f8bb8..420caab3 100644
--- a/src/adblock/adblockrule.cpp
+++ b/src/adblock/adblockrule.cpp
@@ -134,9 +134,3 @@ QString AdBlockRule::convertPatternToRegExp(const QString &wildcardPattern)
// Finally, return...
return pattern;
}
-
-
-QString AdBlockRule::pattern() const
-{
- return m_regExp.pattern();
-}
diff --git a/src/adblock/adblockrule.h b/src/adblock/adblockrule.h
index 28084004..1cd9ea49 100644
--- a/src/adblock/adblockrule.h
+++ b/src/adblock/adblockrule.h
@@ -73,8 +73,6 @@ public:
bool match(const QString &encodedUrl) const;
- QString pattern() const;
-
private:
QString convertPatternToRegExp(const QString &wildcardPattern);