diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2012-07-06 22:46:16 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2012-07-06 22:46:16 +0200 |
| commit | 67ed4f88998e30b90cfcb93cd8e6bd7e4d0ae7bd (patch) | |
| tree | 2cf2c3b2034265ee4111cce99c03466c6314c745 /kwebapp | |
| parent | Fixed a line that was calling QString::startsWith() without args. Fixed build. (diff) | |
| download | rekonq-67ed4f88998e30b90cfcb93cd8e6bd7e4d0ae7bd.tar.xz | |
Fix adblock hide behavior
NOTE: You'll find also some style & copyrights fixes here.
Just reenable the git hooks scripts...
BUG: 302050
Diffstat (limited to 'kwebapp')
| -rw-r--r-- | kwebapp/kwebmain.cpp | 4 | ||||
| -rw-r--r-- | kwebapp/urlresolver.h | 4 | ||||
| -rw-r--r-- | kwebapp/webpage.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/kwebapp/kwebmain.cpp b/kwebapp/kwebmain.cpp index 08dfbaa5..815c4dc9 100644 --- a/kwebapp/kwebmain.cpp +++ b/kwebapp/kwebmain.cpp @@ -60,7 +60,7 @@ int main(int argc, char **argv) KApplication app; QWebSettings::setIconDatabasePath(KStandardDirs::locateLocal("cache", "kwebapp.favicons/")); - + KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); if (args->count() != 1) { @@ -69,7 +69,7 @@ int main(int argc, char **argv) } RekonqView *widg = new RekonqView(); - widg->loadUrl( UrlResolver::urlFromTextTyped(args->arg(0)) ); + widg->loadUrl(UrlResolver::urlFromTextTyped(args->arg(0))); widg->show(); args->clear(); diff --git a/kwebapp/urlresolver.h b/kwebapp/urlresolver.h index 1c5ad354..47105f01 100644 --- a/kwebapp/urlresolver.h +++ b/kwebapp/urlresolver.h @@ -37,9 +37,9 @@ namespace UrlResolver { - KUrl urlFromTextTyped(const QString &); +KUrl urlFromTextTyped(const QString &); - bool isKDEUrl(const QString &); +bool isKDEUrl(const QString &); } diff --git a/kwebapp/webpage.cpp b/kwebapp/webpage.cpp index afe23035..827bbce1 100644 --- a/kwebapp/webpage.cpp +++ b/kwebapp/webpage.cpp @@ -63,7 +63,7 @@ bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &r { QUrl reqUrl = request.url(); QString protocol = reqUrl.scheme(); - + // javascript handling if (protocol == QL1S("javascript")) { @@ -117,7 +117,7 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply) kDebug() << "Error: " << protocol; return; } - + // "mailto" handling. if (protocol == QL1S("mailto")) { |