From 19d72dc2010bca77bfbca966f2c58c589e782edd Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 28 Apr 2013 12:03:34 +0200 Subject: Revert "Use kurifilter instead of custom rekonq code." This reverts commit 5d1a223145be0eb1bb5eed76cda7d4b889d986ed. Conflicts: src/searchengine.cpp src/urlresolver.cpp --- src/searchengine.cpp | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'src/searchengine.cpp') diff --git a/src/searchengine.cpp b/src/searchengine.cpp index b4a96cd9..cfe84a69 100644 --- a/src/searchengine.cpp +++ b/src/searchengine.cpp @@ -31,7 +31,6 @@ //KDE includes #include #include -#include #include @@ -150,20 +149,11 @@ KService::Ptr SearchEngine::fromString(const QString &text) } -QString SearchEngine::buildQuery(const QString &text) -{ - QString query = text; - KUriFilter::self()->filterUri(query, QStringList()); - - return query; -} - - QString SearchEngine::buildQuery(KService::Ptr engine, const QString &text) { if (!engine) return QString(); - - QString query = engine->property("Keys").toStringList().at(0) + SearchEngine::delimiter() + text; - return buildQuery(query); + QString query = engine->property("Query").toString(); + query = query.replace("\\{@}", KUrl::toPercentEncoding(text)); + return query; } -- cgit v1.2.1