From 4ba011f9465ad0067c93c39c19638a80807b5183 Mon Sep 17 00:00:00 2001 From: Andreas Hartmetz Date: Mon, 29 Nov 2010 22:05:39 +0100 Subject: Port SearchEngine from somewhat unsafe "naked" static variables to K_GLOBAL_STATIC(), which is Perfectly Safe ;) Acked-by Jon. --- src/opensearch/searchengine.h | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) (limited to 'src/opensearch/searchengine.h') diff --git a/src/opensearch/searchengine.h b/src/opensearch/searchengine.h index d813666b..45077f03 100644 --- a/src/opensearch/searchengine.h +++ b/src/opensearch/searchengine.h @@ -38,22 +38,15 @@ #include -class SearchEngine +namespace SearchEngine { -public: - static void reload(); - static QString delimiter(); - static KService::Ptr defaultEngine(); - static KService::List favorites(); - static KService::Ptr fromString(const QString &text); - static QString buildQuery(KService::Ptr engine, const QString &text); - static QString extractQuery(const QString &text); - -private: - static bool m_loaded; - static QString m_delimiter; - static KService::List m_favorites; - static KService::Ptr m_defaultEngine; +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 -- cgit v1.2.1