From 6e6b6e9c933af74bd54fbf095e2281e9da7f8cdc Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Mon, 26 Aug 2013 20:35:29 +0300
Subject: [PATCH] Minor code style fixes.

---
 platform/preferred_languages.cpp | 11 +++++------
 platform/settings.cpp            | 12 ++++++------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/platform/preferred_languages.cpp b/platform/preferred_languages.cpp
index 6733896272..f94f9a6fcb 100644
--- a/platform/preferred_languages.cpp
+++ b/platform/preferred_languages.cpp
@@ -43,10 +43,9 @@ static const MSLocale gLocales[] = {{0x1,"ar"},{0x2,"bg"},{0x3,"ca"},{0x4,"zh-Ha
 namespace languages
 {
 
-class ChineseSimplifiedFilter
+struct ChineseSimplifiedFilter
 {
-public:
-  bool operator()(string const & t)
+  bool operator() (string const & t) const
   {
     return ("zh-Hans" == t) || ("zh-rCN" == t);
   }
@@ -80,12 +79,13 @@ public:
 
 void FilterLanguages(vector<string> & langs)
 {
-  //we do not support simplified chinese by the momenty, so remove it from collection
+  // we do not support simplified chinese by the momenty, so remove it from collection
   langs.erase(remove_if(langs.begin(), langs.end(), ChineseSimplifiedFilter()), langs.end());
 
   // normalize languages: en-US -> en, ru_RU -> ru etc.
   for_each(langs.begin(), langs.end(), NormalizeFilter());
-  { // tmp storage
+  {
+    // tmp storage
     set<string> known;
     // remove duplicate languages
     langs.erase(remove_if(langs.begin(), langs.end(), LangFilter(known)), langs.end());
@@ -180,7 +180,6 @@ void SystemPreferredLanguages(vector<string> & languages)
 string PreferredLanguages()
 {
   vector<string> arr;
-
   SystemPreferredLanguages(arr);
 
   // generate output string
diff --git a/platform/settings.cpp b/platform/settings.cpp
index b49d922a40..dbe52ff14f 100644
--- a/platform/settings.cpp
+++ b/platform/settings.cpp
@@ -17,7 +17,7 @@
 #include "../std/iostream.hpp"
 
 
-#define DELIM_CHAR  '='
+static char const DELIM_CHAR = '=';
 
 namespace Settings
 {
@@ -45,15 +45,15 @@ namespace Settings
           m_values[key] = value;
       }
     }
-    catch (RootException const & e)
+    catch (RootException const & ex)
     {
-      LOG(LWARNING, ("Can't load", SETTINGS_FILE_NAME));
+      LOG(LWARNING, (ex.Msg()));
     }
   }
 
   void StringStorage::Save() const
   {
-    // @TODO add mutex
+    /// @todo Add mutex.
     try
     {
       FileWriter file(GetPlatform().SettingsPathForFile(SETTINGS_FILE_NAME));
@@ -66,10 +66,10 @@ namespace Settings
         file.Write(line.data(), line.size());
       }
     }
-    catch (RootException const &)
+    catch (RootException const & ex)
     {
       // Ignore all settings saving exceptions
-      LOG(LWARNING, ("Can't save", SETTINGS_FILE_NAME));
+      LOG(LWARNING, (ex.Msg()));
     }
   }