summaryrefslogtreecommitdiff
path: root/src/urlresolver.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2013-04-07 17:42:38 +0200
committerAndrea Diamantini <adjam7@gmail.com>2013-04-07 17:42:38 +0200
commitde678704a0b62e2d6ddf6968f78c145b8e00b749 (patch)
tree56553dc088800f13c086e230737f11a70a74cab7 /src/urlresolver.cpp
parentAdd bool info in WebTab about being a web app (diff)
downloadrekonq-de678704a0b62e2d6ddf6968f78c145b8e00b749.tar.xz
Clean up url loading
Diffstat (limited to 'src/urlresolver.cpp')
-rw-r--r--src/urlresolver.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/urlresolver.cpp b/src/urlresolver.cpp
index 6b245c0c..3e764159 100644
--- a/src/urlresolver.cpp
+++ b/src/urlresolver.cpp
@@ -49,14 +49,11 @@ KUrl UrlResolver::urlFromTextTyped(const QString &typedText)
QString typedString = typedText.trimmed();
// Url from KService
- KService::Ptr engine = SearchEngine::fromString(typedString);
- if (engine)
- {
- QString url = SearchEngine::buildQuery(typedString);
-
- kDebug() << "Url from service: " << url;
- return KUrl(url);
- }
+ QString urlString = SearchEngine::buildQuery(typedString);
+ kDebug() << "Url from service: " << urlString;
+ KUrl u(urlString);
+ if (u.isValid())
+ return u;
// Url from User Input
QUrl urlFromUserInput = QUrl::fromUserInput(typedString);