summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/adblock/adblockmanager.cpp13
-rw-r--r--src/iconmanager.cpp2
-rw-r--r--src/opensearch/opensearchmanager.cpp5
-rw-r--r--src/opensearch/opensearchmanager.h2
-rw-r--r--src/urlbar/listitem.cpp4
-rw-r--r--src/webpage.cpp3
6 files changed, 8 insertions, 21 deletions
diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp
index 7c0b94f2..b18547ad 100644
--- a/src/adblock/adblockmanager.cpp
+++ b/src/adblock/adblockmanager.cpp
@@ -183,8 +183,7 @@ QNetworkReply *AdBlockManager::block(const QNetworkRequest &request, WebPage *pa
// check white rules before :)
if (_hostWhiteList.match(host))
{
- kDebug() << "****ADBLOCK: WHITE RULE (@@) Matched by host matcher: ***********";
- kDebug() << "UrlString: " << urlString;
+ kDebug() << "ADBLOCK: WHITE RULE (@@) Matched by string: " << urlString;
return 0;
}
@@ -192,8 +191,7 @@ QNetworkReply *AdBlockManager::block(const QNetworkRequest &request, WebPage *pa
{
if (filter.match(request, urlString, urlStringLowerCase))
{
- kDebug() << "****ADBLOCK: WHITE RULE (@@) Matched: ***********";
- kDebug() << "UrlString: " << urlString;
+ kDebug() << "ADBLOCK: WHITE RULE (@@) Matched by string: " << urlString;
return 0;
}
}
@@ -201,8 +199,7 @@ QNetworkReply *AdBlockManager::block(const QNetworkRequest &request, WebPage *pa
// then check the black ones :(
if (_hostBlackList.match(host))
{
- kDebug() << "****ADBLOCK: BLACK RULE Matched by host matcher: ***********";
- kDebug() << "UrlString: " << urlString;
+ kDebug() << "ADBLOCK: BLACK RULE Matched by string: " << urlString;
AdBlockNetworkReply *reply = new AdBlockNetworkReply(request, urlString, this);
return reply;
}
@@ -215,8 +212,7 @@ QNetworkReply *AdBlockManager::block(const QNetworkRequest &request, WebPage *pa
{
if (filter.match(request, urlString, urlStringLowerCase))
{
- kDebug() << "****ADBLOCK: BLACK RULE Matched: ***********";
- kDebug() << "UrlString: " << urlString;
+ kDebug() << "ADBLOCK: BLACK RULE Matched by string: " << urlString;
QWebElement document = page->mainFrame()->documentElement();
QWebElementCollection elements = document.findAll("*");
@@ -225,7 +221,6 @@ QNetworkReply *AdBlockManager::block(const QNetworkRequest &request, WebPage *pa
const QString srcAttribute = el.attribute("src");
if (filter.match(request, srcAttribute, srcAttribute.toLower()))
{
- kDebug() << "MATCHES ATTRIBUTE!!!!!";
el.setStyleProperty(QL1S("visibility"), QL1S("hidden"));
el.setStyleProperty(QL1S("width"), QL1S("0"));
el.setStyleProperty(QL1S("height"), QL1S("0"));
diff --git a/src/iconmanager.cpp b/src/iconmanager.cpp
index 3ca74b2c..9ee024e2 100644
--- a/src/iconmanager.cpp
+++ b/src/iconmanager.cpp
@@ -89,7 +89,7 @@ KIcon IconManager::iconForUrl(const KUrl &url)
return KIcon(faviconDir + i);
}
- kDebug() << "Icon NOT Found for url: " << url;
+ // Not found icon. Return default one.
return KIcon("text-html");
}
diff --git a/src/opensearch/opensearchmanager.cpp b/src/opensearch/opensearchmanager.cpp
index 05c2e116..3b960da7 100644
--- a/src/opensearch/opensearchmanager.cpp
+++ b/src/opensearch/opensearchmanager.cpp
@@ -37,7 +37,6 @@
#include "application.h"
// KDE Includes
-#include <KDebug>
#include <KGlobal>
#include <KStandardDirs>
#include <KUrl>
@@ -182,10 +181,6 @@ void OpenSearchManager::jobFinished(KJob *job)
if (m_state == REQ_SUGGESTION)
{
const ResponseList suggestionsList = m_activeEngine->parseSuggestion(_typedText, m_jobData);
- Q_FOREACH(const Response & r, suggestionsList)
- {
- kDebug() << r.title;
- }
emit suggestionsReceived(_typedText, suggestionsList);
idleJob();
return;
diff --git a/src/opensearch/opensearchmanager.h b/src/opensearch/opensearchmanager.h
index a75c765b..6f4f4190 100644
--- a/src/opensearch/opensearchmanager.h
+++ b/src/opensearch/opensearchmanager.h
@@ -32,6 +32,8 @@
// Rekonq Includes
#include "rekonq_defines.h"
+
+// Local Includes
#include "suggestionparser.h"
// KDE Includes
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index 50562022..7860d535 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -607,10 +607,6 @@ QString VisualSuggestionListItem::text()
BrowseListItem::BrowseListItem(const UrlSearchItem &item, const QString &text, QWidget *parent)
: ListItem(item, parent)
{
- QString url = text;
-
- kDebug() << text;
-
QHBoxLayout *hLayout = new QHBoxLayout;
hLayout->setSpacing(4);
diff --git a/src/webpage.cpp b/src/webpage.cpp
index a7523c19..5fe03113 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -578,11 +578,10 @@ void WebPage::manageNetworkErrors(QNetworkReply *reply)
return;
case QNetworkReply::ContentAccessDenied: // access to remote content denied (similar to HTTP error 401)
- kDebug() << "We (hopefully) are managing this through the adblock :)";
break;
case QNetworkReply::UnknownNetworkError: // unknown network-related error detected
- kDebug() << "------------------ DO WE REALLY NEED THIS??? --------------------";
+ // FIXME: DO WE REALLY NEED THIS???
_protHandler.postHandling(reply->request(), frame);
return;