From 908ad603ad1f5b6c8b048a8d4a788ca80954019e Mon Sep 17 00:00:00 2001
From: Arsentiy Milchakov <a.milchakov@corp.mail.ru>
Date: Thu, 1 Sep 2016 13:27:37 +0300
Subject: [PATCH] review fixes

---
 editor/config_loader.cpp | 43 ++++++++++++++++++++--------------------
 editor/config_loader.hpp |  1 +
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/editor/config_loader.cpp b/editor/config_loader.cpp
index 305910a4ed..6063f93ce3 100644
--- a/editor/config_loader.cpp
+++ b/editor/config_loader.cpp
@@ -6,7 +6,6 @@
 #include "coding/internal/file_data.hpp"
 #include "coding/reader.hpp"
 
-#include "std/atomic.hpp"
 #include "std/fstream.hpp"
 #include "std/iterator.hpp"
 
@@ -69,25 +68,6 @@ ConfigLoader::~ConfigLoader()
 
 void ConfigLoader::LoadFromServer()
 {
-  auto const saveAndReload = [this](pugi::xml_document const & doc)
-  {
-    if (doc.empty())
-      return false;
-
-    auto const filePath = GetConfigFilePath();
-    auto const result =
-      my::WriteToTempAndRenameToFile(filePath, [&doc](string const & fileName)
-      {
-        return doc.save_file(fileName.c_str(), "  ");
-      });
-
-    if (!result)
-      return false;
-
-    ResetConfig(doc);
-    return true;
-  };
-
   auto const hash = LoadHash(GetHashFilePath());
 
   try
@@ -101,7 +81,7 @@ void ConfigLoader::LoadFromServer()
       pugi::xml_document doc;
       GetRemoteConfig(doc);
 
-      if (saveAndReload(doc))
+      if (SaveAndReload(doc))
         SaveHash(remoteHash, GetHashFilePath());
 
     } while (m_waiter.Wait(kSynchroTimeout));
@@ -112,6 +92,25 @@ void ConfigLoader::LoadFromServer()
   }
 }
 
+bool ConfigLoader::SaveAndReload(pugi::xml_document const & doc)
+{
+  if (doc.empty())
+    return false;
+
+  auto const filePath = GetConfigFilePath();
+  auto const result =
+    my::WriteToTempAndRenameToFile(filePath, [&doc](string const & fileName)
+    {
+      return doc.save_file(fileName.c_str(), "  ");
+    });
+
+  if (!result)
+    return false;
+
+  ResetConfig(doc);
+  return true;
+}
+
 void ConfigLoader::ResetConfig(pugi::xml_document const & doc)
 {
   auto config = make_shared<EditorConfig>();
@@ -119,7 +118,7 @@ void ConfigLoader::ResetConfig(pugi::xml_document const & doc)
   m_config.Set(config);
 }
 
-//static
+// static
 void ConfigLoader::LoadFromLocal(pugi::xml_document & doc)
 {
   string content;
diff --git a/editor/config_loader.hpp b/editor/config_loader.hpp
index 8c252125db..c9ede4a15a 100644
--- a/editor/config_loader.hpp
+++ b/editor/config_loader.hpp
@@ -63,6 +63,7 @@ public:
 
 private:
   void LoadFromServer();
+  bool SaveAndReload(pugi::xml_document const & doc);
   void ResetConfig(pugi::xml_document const & doc);
 
   EditorConfigWrapper & m_config;