Revert "Use kurifilter instead of custom rekonq code."

This reverts commit 5d1a223145be0eb1bb5eed76cda7d4b889d986ed.

Conflicts:
	src/searchengine.cpp
	src/urlresolver.cpp

1 files changed, 11 insertions, 5 deletions

diff --git a/src/urlresolver.cpp b/src/urlresolver.cpp
index 3e764159..5e00c77a 100644
--- a/src/urlresolver.cpp
+++ b/src/urlresolver.cpp
@@ -49,11 +49,17 @@ KUrl UrlResolver::urlFromTextTyped(const QString &typedText)
     QString typedString = typedText.trimmed();
 
     // Url from KService
-    QString urlString = SearchEngine::buildQuery(typedString);
-    kDebug() << "Url from service: " << urlString;
-    KUrl u(urlString);
-    if (u.isValid())
-        return u;
+    KService::Ptr engine = SearchEngine::fromString(typedString);
+    if (engine)
+    {
+        QString query = typedString;
+        query = query.remove(0, typedString.indexOf(SearchEngine::delimiter()) + 1);
+
+        QString url = SearchEngine::buildQuery(engine, query);
+
+        kDebug() << "Url from service: " << url;
+        return KUrl(url);
+    }
 
     // Url from User Input
     QUrl urlFromUserInput = QUrl::fromUserInput(typedString);