From 82167d2422a4b6e3071dca68cf65a66e1da41ab4 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 17 Jul 2011 16:46:24 +0200
Subject: A round of the "new" astyle 2.01...

---
 src/opensearch/opensearchengine.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

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

diff --git a/src/opensearch/opensearchengine.cpp b/src/opensearch/opensearchengine.cpp
index 80eb308f..f48118ca 100644
--- a/src/opensearch/opensearchengine.cpp
+++ b/src/opensearch/opensearchengine.cpp
@@ -43,15 +43,15 @@
 
 
 OpenSearchEngine::OpenSearchEngine(QObject *parent)
-        : QObject(parent)
-        , m_parser(0)
+    : QObject(parent)
+    , m_parser(0)
 {
 }
 
 
 OpenSearchEngine::~OpenSearchEngine()
 {
-    if (m_parser)
+    if(m_parser)
     {
         delete m_parser;
     }
@@ -66,7 +66,7 @@ QString OpenSearchEngine::parseTemplate(const QString &searchTerm, const QString
     QString country = language;
     country = (country.remove(0, country.indexOf(QL1C('-')) + 1)).toLower();
     const int firstDashPosition = country.indexOf(QL1C('-'));
-    if (firstDashPosition >= 0)
+    if(firstDashPosition >= 0)
         country = country.mid(firstDashPosition + 1);
 
     QString result = searchTemplate;
@@ -121,7 +121,7 @@ void OpenSearchEngine::setSearchUrlTemplate(const QString &searchUrlTemplate)
 
 KUrl OpenSearchEngine::searchUrl(const QString &searchTerm) const
 {
-    if (m_searchUrlTemplate.isEmpty())
+    if(m_searchUrlTemplate.isEmpty())
     {
         return KUrl();
     }
@@ -129,7 +129,7 @@ KUrl OpenSearchEngine::searchUrl(const QString &searchTerm) const
     KUrl retVal = KUrl::fromEncoded(parseTemplate(searchTerm, m_searchUrlTemplate).toUtf8());
 
     QList<Parameter>::const_iterator i;
-    for (i = m_searchParameters.constBegin(); i != m_searchParameters.constEnd(); ++i)
+    for(i = m_searchParameters.constBegin(); i != m_searchParameters.constEnd(); ++i)
     {
         retVal.addQueryItem(i->first, parseTemplate(searchTerm, i->second));
     }
@@ -158,7 +158,7 @@ void OpenSearchEngine::setSuggestionsUrlTemplate(const QString &suggestionsUrlTe
 
 KUrl OpenSearchEngine::suggestionsUrl(const QString &searchTerm) const
 {
-    if (m_suggestionsUrlTemplate.isEmpty())
+    if(m_suggestionsUrlTemplate.isEmpty())
     {
         return KUrl();
     }
@@ -166,7 +166,7 @@ KUrl OpenSearchEngine::suggestionsUrl(const QString &searchTerm) const
     KUrl retVal = KUrl::fromEncoded(parseTemplate(searchTerm, m_suggestionsUrlTemplate).toUtf8());
 
     QList<Parameter>::const_iterator i;
-    for (i = m_suggestionsParameters.constBegin(); i != m_suggestionsParameters.constEnd(); ++i)
+    for(i = m_suggestionsParameters.constBegin(); i != m_suggestionsParameters.constEnd(); ++i)
     {
         retVal.addQueryItem(i->first, parseTemplate(searchTerm, i->second));
     }
@@ -255,7 +255,7 @@ bool OpenSearchEngine::operator<(const OpenSearchEngine &other) const
 ResponseList OpenSearchEngine::parseSuggestion(const QString &searchTerm, const QByteArray &resp)
 {
     QFile file(suggestionPathFor(searchTerm));
-    if (file.open(QIODevice::WriteOnly | QIODevice::Text))
+    if(file.open(QIODevice::WriteOnly | QIODevice::Text))
     {
         file.write(resp, resp.size());
         file.close();
@@ -267,12 +267,12 @@ ResponseList OpenSearchEngine::parseSuggestion(const QString &searchTerm, const
 
 ResponseList OpenSearchEngine::parseSuggestion(const QByteArray &resp)
 {
-    if (!m_parser)
+    if(!m_parser)
         return ResponseList();
 
     if(resp.isEmpty())
         return ResponseList();
-    
+
     return m_parser->parse(resp);
 }
 
@@ -299,11 +299,11 @@ bool OpenSearchEngine::hasCachedSuggestionsFor(const QString &searchTerm)
 ResponseList OpenSearchEngine::cachedSuggestionsFor(const QString &searchTerm)
 {
     QFile file(suggestionPathFor(searchTerm));
-    if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+    if(!file.open(QIODevice::ReadOnly | QIODevice::Text))
         return ResponseList();
 
     QByteArray resp;
-    while (!file.atEnd())
+    while(!file.atEnd())
     {
         resp += file.readLine();
     }
-- 
cgit v1.2.1