summaryrefslogtreecommitdiff
path: root/src/opensearch
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2012-03-12 05:51:58 +0100
committerAndrea Diamantini <adjam7@gmail.com>2012-03-25 09:27:25 +0200
commitaa154a00c29dc5ab9cf07f933cae5cee32614bed (patch)
treed8a185e7c2688ad0377c7da107c229fa4dc60042 /src/opensearch
parentSafe one bool check :D (diff)
downloadrekonq-aa154a00c29dc5ab9cf07f933cae5cee32614bed.tar.xz
Check if user has a default search engine set and eventually
show a messagewidget to inform and let him set it. REVIEW:104290
Diffstat (limited to 'src/opensearch')
-rw-r--r--src/opensearch/opensearchmanager.cpp1
-rw-r--r--src/opensearch/opensearchmanager.h1
-rw-r--r--src/opensearch/searchengine.cpp3
-rw-r--r--src/opensearch/searchengine.h23
4 files changed, 20 insertions, 8 deletions
diff --git a/src/opensearch/opensearchmanager.cpp b/src/opensearch/opensearchmanager.cpp
index 12b93ec2..ad2f7092 100644
--- a/src/opensearch/opensearchmanager.cpp
+++ b/src/opensearch/opensearchmanager.cpp
@@ -131,6 +131,7 @@ void OpenSearchManager::addOpenSearchEngine(const KUrl &url, const QString &titl
connect(m_currentJob, SIGNAL(result(KJob*)), this, SLOT(jobFinished(KJob*)));
}
+
void OpenSearchManager::requestSuggestion(const QString &searchText)
{
if (!m_activeEngine)
diff --git a/src/opensearch/opensearchmanager.h b/src/opensearch/opensearchmanager.h
index 84272f26..b2f772fb 100644
--- a/src/opensearch/opensearchmanager.h
+++ b/src/opensearch/opensearchmanager.h
@@ -46,6 +46,7 @@
// Forward Declarations
class OpenSearchEngine;
+
/**
* This class acts as a proxy between the SearchBar plugin
* and the individual suggestion engine.
diff --git a/src/opensearch/searchengine.cpp b/src/opensearch/searchengine.cpp
index b54d9434..aef06a7b 100644
--- a/src/opensearch/searchengine.cpp
+++ b/src/opensearch/searchengine.cpp
@@ -37,6 +37,7 @@
#include <KConfigGroup>
#include <KServiceTypeTrader>
+
struct SearchEnginePrivate
{
SearchEnginePrivate() : isLoaded(false) {}
@@ -46,8 +47,10 @@ struct SearchEnginePrivate
KService::Ptr defaultEngine;
};
+
K_GLOBAL_STATIC(SearchEnginePrivate, d)
+
void SearchEngine::reload()
{
KConfig config("kuriikwsfilterrc"); //Shared with konqueror
diff --git a/src/opensearch/searchengine.h b/src/opensearch/searchengine.h
index 7825d661..7cd37a67 100644
--- a/src/opensearch/searchengine.h
+++ b/src/opensearch/searchengine.h
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2008-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2012 by Andrea Diamantini <adjam7 at gmail dot com>
* Copyright (C) 2009-2011 by Lionel Chauvin <megabigbug@yahoo.fr>
*
*
@@ -24,6 +24,7 @@
*
* ============================================================ */
+
#ifndef SEARCHENGINE_H
#define SEARCHENGINE_H
@@ -40,13 +41,19 @@
namespace SearchEngine
{
-void reload();
-QString delimiter();
-KService::Ptr defaultEngine();
-KService::List favorites();
-KService::Ptr fromString(const QString &text);
-QString buildQuery(KService::Ptr engine, const QString &text);
-QString extractQuery(const QString &text);
+ void reload();
+
+ QString delimiter();
+
+ KService::Ptr defaultEngine();
+
+ KService::List favorites();
+
+ KService::Ptr fromString(const QString &text);
+
+ QString buildQuery(KService::Ptr engine, const QString &text);
+
+ QString extractQuery(const QString &text);
}
#endif