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/webtab/webview.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/webtab') diff --git a/src/webtab/webview.cpp b/src/webtab/webview.cpp index df91451f..ac46e9c4 100644 --- a/src/webtab/webview.cpp +++ b/src/webtab/webview.cpp @@ -515,7 +515,7 @@ void WebView::contextMenuEvent(QContextMenuEvent *event) { a = new KAction(i18nc("Search selected text with the default search engine", "Search with %1", defaultEngine->name()), &menu); - a->setIcon(IconManager::self()->iconForUrl(defaultEngine->property("Query").toUrl())); + a->setIcon(IconManager::self()->iconForUrl(SearchEngine::buildQuery(defaultEngine, ""))); a->setData(defaultEngine->entryPath()); connect(a, SIGNAL(triggered(bool)), this, SLOT(search())); menu.addAction(a); @@ -527,7 +527,7 @@ void WebView::contextMenuEvent(QContextMenuEvent *event) Q_FOREACH(const KService::Ptr & engine, SearchEngine::favorites()) { a = new KAction(i18nc("@item:inmenu Search, %1 = search engine", "With %1", engine->name()), &menu); - a->setIcon(IconManager::self()->iconForUrl(engine->property("Query").toUrl())); + a->setIcon(IconManager::self()->iconForUrl(SearchEngine::buildQuery(engine, ""))); a->setData(engine->entryPath()); connect(a, SIGNAL(triggered(bool)), this, SLOT(search())); searchMenu->addAction(a); @@ -640,7 +640,7 @@ void WebView::mousePressEvent(QMouseEvent *event) { KService::Ptr defaultEngine = SearchEngine::defaultEngine(); if (defaultEngine) // check if a default engine is set - load(KUrl(SearchEngine::buildQuery(clipboardContent))); + load(KUrl(SearchEngine::buildQuery(defaultEngine, clipboardContent))); } } break; -- cgit v1.2.1