Style fixes.

base/timer.cpp

@@ -60,7 +60,8 @@ string FormatCurrentTime()
   return s;
 }
 
-uint32_t GenerateTimestamp(int year, int month, int day) {
+uint32_t GenerateTimestamp(int year, int month, int day)
+{
   return (year - 100) * 10000 + (month + 1) * 100 + day;
 }
 

indexer/data_factory.cpp

@@ -10,8 +10,8 @@
 #include "../coding/file_reader.hpp"
 #include "../coding/file_container.hpp"
 
-namespace {
-
+namespace
+{
 using FHeaderT = feature::DataHeader;
 
 }  // namespace

indexer/index.cpp

@@ -131,15 +131,9 @@ bool Index::DeleteMap(string const & fileName)
   return true;
 }
 
-bool Index::AddObserver(Observer & observer)
-{
-  return m_observers.Add(observer);
-}
+bool Index::AddObserver(Observer & observer) { return m_observers.Add(observer); }
 
-bool Index::RemoveObserver(Observer const & observer)
-{
-  return m_observers.Remove(observer);
-}
+bool Index::RemoveObserver(Observer const & observer) { return m_observers.Remove(observer); }
 
 pair<MwmSet::MwmLock, Index::UpdateStatus> Index::UpdateMap(string const & fileName)
 {
@@ -160,7 +154,8 @@ pair<MwmSet::MwmLock, Index::UpdateStatus> Index::UpdateMap(string const & fileN
     {
       ReplaceFileWithReady(fileName);
       pair<MwmSet::MwmLock, bool> registerResult = RegisterImpl(fileName);
-      if (registerResult.second) {
+      if (registerResult.second)
+      {
         result.first = move(registerResult.first);
         result.second = UPDATE_STATUS_OK;
       }

indexer/index.hpp

@@ -282,25 +282,25 @@ public:
     bool IsWorld() const;
     void GetFeature(uint32_t offset, FeatureType & ft);
 
-   private:
+  private:
     MwmLock m_lock;
     FeaturesVector m_vector;
   };
 
   MwmId GetMwmIdByName(string const & name) const
   {
-      // const_cast<> is used here and in some other methods not only
-      // to lock/unlock mutex, which can be circumvented by marking
-      // the mutex as mutable, but also to call MwmSet::GetIdByName()
-      // method which is non-constant by design, because it updates
-      // MWM info for all registered MWMs.
-      //
-      // TODO (y@): probably a better design is possible, investigate it.
-      Index * p = const_cast<Index *>(this);
-      lock_guard<mutex> lock(p->m_lock);
+    // const_cast<> is used here and in some other methods not only
+    // to lock/unlock mutex, which can be circumvented by marking
+    // the mutex as mutable, but also to call MwmSet::GetIdByName()
+    // method which is non-constant by design, because it updates
+    // MWM info for all registered MWMs.
+    //
+    // TODO (y@): probably a better design is possible, investigate it.
+    Index * p = const_cast<Index *>(this);
+    lock_guard<mutex> lock(p->m_lock);
 
-      ASSERT(p->GetIdByName(name) != INVALID_MWM_ID, ("Can't get mwm identifier"));
-      return p->GetIdByName(name);
+    ASSERT(p->GetIdByName(name) != INVALID_MWM_ID, ("Can't get mwm identifier"));
+    return p->GetIdByName(name);
   }
 
   template <typename F>

indexer/indexer_tests/index_test.cpp

@@ -111,7 +111,7 @@ UNIT_TEST(Index_MwmStatusNotifications)
   // Checks that map can't registered twice and observers aren't
   // triggered.
   {
-    pair<MwmSet::MwmLock, bool> const p  = index.RegisterMap(testMapName);
+    pair<MwmSet::MwmLock, bool> const p = index.RegisterMap(testMapName);
     TEST(p.first.IsLocked(), ());
     TEST(!p.second, ());
     TEST_EQUAL(1, observer.map_registered_calls(), ());

indexer/indexer_tests/mwm_set_test.cpp

@@ -20,10 +20,7 @@ namespace
       return true;
     }
 
-    MwmValue * CreateValue(string const &) const override
-    {
-      return new MwmValue();
-    }
+    MwmValue * CreateValue(string const &) const override { return new MwmValue(); }
 
   public:
     ~TestMwmSet()

indexer/mwm_set.hpp

@@ -33,11 +33,11 @@ public:
 
   MwmInfo();
 
-  m2::RectD m_limitRect;                   ///< Limit rect of mwm.
-  uint8_t m_minScale;                      ///< Min zoom level of mwm.
-  uint8_t m_maxScale;                      ///< Max zoom level of mwm.
-  uint8_t m_lockCount;                     ///< Number of locks.
-  version::MwmVersion m_version;           ///< Mwm file version.
+  m2::RectD m_limitRect;          ///< Limit rect of mwm.
+  uint8_t m_minScale;             ///< Min zoom level of mwm.
+  uint8_t m_maxScale;             ///< Max zoom level of mwm.
+  uint8_t m_lockCount;            ///< Number of locks.
+  version::MwmVersion m_version;  ///< Mwm file version.
 
   inline bool IsRegistered() const
   {

indexer/mwm_version.cpp

@@ -62,10 +62,7 @@ void WriteVersion(Writer & w)
   WriteVarUint(w, generatorStartTime);
 }
 
-void ReadVersion(ReaderSrc & src, MwmVersion & version)
-{
-  ReadVersionT(src, version);
-}
+void ReadVersion(ReaderSrc & src, MwmVersion & version) { ReadVersionT(src, version); }
 
 bool ReadVersion(FilesContainerR const & container, MwmVersion & version)
 {

indexer/mwm_version.hpp

@@ -17,7 +17,8 @@ enum Format
   lastFormat = v3
 };
 
-struct MwmVersion {
+struct MwmVersion
+{
   MwmVersion();
 
   Format format;

map/framework.cpp

@@ -384,7 +384,8 @@ void Framework::UpdateAfterDownload(string const & fileName, TMapOptions opt)
 
     // Add downloaded map.
     pair<MwmSet::MwmLock, Index::UpdateStatus> const p = m_model.UpdateMap(fileName);
-    if (p.second == Index::UPDATE_STATUS_OK) {
+    if (p.second == Index::UPDATE_STATUS_OK)
+    {
       MwmSet::MwmLock const & lock = p.first;
       ASSERT(lock.IsLocked(), ());
       InvalidateRect(lock.GetInfo().m_limitRect, true);