From 14664e54b1a2dbe9c06f474a0918a262dba04e20 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 25 Jul 2011 19:48:41 +0200
Subject: clean up

- QL1S
- one stupid kDebug less
- codingstyle
---
 src/opensearch/opensearchmanager.cpp | 44 ++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'src/opensearch/opensearchmanager.cpp')

diff --git a/src/opensearch/opensearchmanager.cpp b/src/opensearch/opensearchmanager.cpp
index ea2ace32..05c2e116 100644
--- a/src/opensearch/opensearchmanager.cpp
+++ b/src/opensearch/opensearchmanager.cpp
@@ -76,17 +76,17 @@ void OpenSearchManager::setSearchProvider(const QString &searchProvider)
 {
     m_activeEngine = 0;
 
-    if(!m_engineCache.contains(searchProvider))
+    if (!m_engineCache.contains(searchProvider))
     {
         const QString fileName = KGlobal::dirs()->findResource("data", "rekonq/opensearch/" + trimmedEngineName(searchProvider) + ".xml");
         kDebug() << searchProvider << " trimmed name: "  << trimmedEngineName(searchProvider) << " file name path: " << fileName;
-        if(fileName.isEmpty())
+        if (fileName.isEmpty())
         {
             return;
         }
         QFile file(fileName);
 
-        if(!file.open(QIODevice::ReadOnly | QIODevice::Text))
+        if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
         {
             return;
         }
@@ -94,7 +94,7 @@ void OpenSearchManager::setSearchProvider(const QString &searchProvider)
         OpenSearchReader reader;
         OpenSearchEngine *engine = reader.read(&file);
 
-        if(engine)
+        if (engine)
         {
             m_engineCache.insert(searchProvider, engine);
         }
@@ -120,7 +120,7 @@ void OpenSearchManager::addOpenSearchEngine(const KUrl &url, const QString &titl
 
     m_shortcut = shortcut;
 
-    if(m_state != IDLE)
+    if (m_state != IDLE)
     {
         idleJob();
     }
@@ -134,10 +134,10 @@ void OpenSearchManager::addOpenSearchEngine(const KUrl &url, const QString &titl
 
 void OpenSearchManager::requestSuggestion(const QString &searchText)
 {
-    if(!m_activeEngine)
+    if (!m_activeEngine)
         return;
 
-    if(m_state != IDLE)
+    if (m_state != IDLE)
     {
         // NOTE:
         // changing OpenSearchManager behavior
@@ -146,7 +146,7 @@ void OpenSearchManager::requestSuggestion(const QString &searchText)
         idleJob();
     }
 
-    if(m_activeEngine->hasCachedSuggestionsFor(searchText))
+    if (m_activeEngine->hasCachedSuggestionsFor(searchText))
     {
         emit suggestionsReceived(searchText, m_activeEngine->cachedSuggestionsFor(searchText));
     }
@@ -172,14 +172,14 @@ void OpenSearchManager::dataReceived(KIO::Job *job, const QByteArray &data)
 void OpenSearchManager::jobFinished(KJob *job)
 {
     // Do NOT parse if job had same errors or the typed string is empty
-    if(job->error() || _typedText.isEmpty())
+    if (job->error() || _typedText.isEmpty())
     {
         emit suggestionsReceived(_typedText, ResponseList());
         m_state = IDLE;
         return; // just silently return
     }
 
-    if(m_state == REQ_SUGGESTION)
+    if (m_state == REQ_SUGGESTION)
     {
         const ResponseList suggestionsList = m_activeEngine->parseSuggestion(_typedText, m_jobData);
         Q_FOREACH(const Response & r, suggestionsList)
@@ -191,18 +191,18 @@ void OpenSearchManager::jobFinished(KJob *job)
         return;
     }
 
-    if(m_state == REQ_DESCRIPTION)
+    if (m_state == REQ_DESCRIPTION)
     {
         OpenSearchReader reader;
         OpenSearchEngine *engine = reader.read(m_jobData);
-        if(engine)
+        if (engine)
         {
             m_engineCache.insert(engine->name(), engine);
             m_engines.insert(m_jobUrl, trimmedEngineName(engine->name()));
             saveEngines();
 
             QString path;
-            if(engine->providesSuggestions())  //save opensearch description only if it provides suggestions
+            if (engine->providesSuggestions()) //save opensearch description only if it provides suggestions
             {
                 OpenSearchWriter writer;
                 path = KGlobal::dirs()->findResource("data", "rekonq/opensearch/");
@@ -246,14 +246,14 @@ void OpenSearchManager::jobFinished(KJob *job)
 void OpenSearchManager::loadEngines()
 {
     QFile file(KStandardDirs::locate("appdata", "opensearch/db_opensearch.json"));
-    if(!file.open(QIODevice::ReadOnly | QIODevice::Text))
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
     {
         return;
     }
 
     QString fileContent = QString::fromUtf8(file.readAll());
     QScriptEngine reader;
-    if(!reader.canEvaluate(fileContent))
+    if (!reader.canEvaluate(fileContent))
     {
         return;
     }
@@ -274,7 +274,7 @@ void OpenSearchManager::loadEngines()
 void OpenSearchManager::saveEngines()
 {
     QFile file(KStandardDirs::locateLocal("appdata", "opensearch/db_opensearch.json"));
-    if(!file.open(QIODevice::WriteOnly))
+    if (!file.open(QIODevice::WriteOnly))
     {
         return;
     }
@@ -286,7 +286,7 @@ void OpenSearchManager::saveEngines()
     {
         out << "[\"" << url.url() << "\",\"" << m_engines.value(url) << "\"]";
         i++;
-        if(i != urls.size())
+        if (i != urls.size())
         {
             out << ",\n";
         }
@@ -302,7 +302,7 @@ void  OpenSearchManager::removeDeletedEngines()
     Q_FOREACH(const KUrl & url, m_engines.keys())
     {
         service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(m_engines.value(url)));
-        if(!service)
+        if (!service)
         {
             QString path = KStandardDirs::locateLocal("appdata", "opensearch/" + trimmedEngineName(m_engines.value(url)) + ".xml");
             QFile::remove(path + trimmedEngineName(m_engines.value(url)) + ".xml");
@@ -323,15 +323,15 @@ QString OpenSearchManager::trimmedEngineName(const QString &engineName) const
 {
     QString trimmed;
     QString::ConstIterator constIter = engineName.constBegin();
-    while(constIter != engineName.constEnd())
+    while (constIter != engineName.constEnd())
     {
-        if(constIter->isSpace())
+        if (constIter->isSpace())
         {
             trimmed.append('_');
         }
         else
         {
-            if(*constIter != '.')
+            if (*constIter != '.')
             {
                 trimmed.append(constIter->toLower());
             }
@@ -345,7 +345,7 @@ QString OpenSearchManager::trimmedEngineName(const QString &engineName) const
 
 void OpenSearchManager::idleJob()
 {
-    if(m_currentJob)
+    if (m_currentJob)
     {
         disconnect(m_currentJob);
         m_currentJob->kill();
-- 
cgit v1.2.1