From 6c5558135822c31c9ac4cde7dbfbc7c277e391e1 Mon Sep 17 00:00:00 2001
From: Sergey Yershov <yershov@corp.mail.ru>
Date: Tue, 12 Apr 2016 14:30:29 +0300
Subject: [PATCH] Fix using different types

---
 platform/country_defines.hpp | 5 +++++
 platform/country_file.cpp    | 4 ++--
 platform/country_file.hpp    | 8 ++++----
 storage/storage.hpp          | 2 +-
 storage/storage_defines.hpp  | 4 ----
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/platform/country_defines.hpp b/platform/country_defines.hpp
index d2f46dd409..c59d63759b 100644
--- a/platform/country_defines.hpp
+++ b/platform/country_defines.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "std/string.hpp"
+#include "std/utility.hpp"
 
 enum class MapOptions : uint8_t
 {
@@ -10,6 +11,10 @@ enum class MapOptions : uint8_t
   MapWithCarRouting = 0x3
 };
 
+using TMwmCounter = uint32_t;
+using TMwmSize = uint64_t;
+using TLocalAndRemoteSize = pair<TMwmSize, TMwmSize>;
+
 bool HasOptions(MapOptions mask, MapOptions options);
 
 MapOptions IntersectOptions(MapOptions lhs, MapOptions rhs);
diff --git a/platform/country_file.cpp b/platform/country_file.cpp
index f2de49ba75..f013ba92b8 100644
--- a/platform/country_file.cpp
+++ b/platform/country_file.cpp
@@ -35,13 +35,13 @@ CountryFile::CountryFile(string const & name) : m_name(name), m_mapSize(0), m_ro
 
 string const & CountryFile::GetName() const { return m_name; }
 
-void CountryFile::SetRemoteSizes(uint32_t mapSize, uint32_t routingSize)
+void CountryFile::SetRemoteSizes(TMwmSize mapSize, TMwmSize routingSize)
 {
   m_mapSize = mapSize;
   m_routingSize = routingSize;
 }
 
-uint32_t CountryFile::GetRemoteSize(MapOptions filesMask) const
+TMwmSize CountryFile::GetRemoteSize(MapOptions filesMask) const
 {
   uint32_t size = 0;
   if (HasOptions(filesMask, MapOptions::Map))
diff --git a/platform/country_file.hpp b/platform/country_file.hpp
index eb5c622cff..06a3286155 100644
--- a/platform/country_file.hpp
+++ b/platform/country_file.hpp
@@ -20,8 +20,8 @@ public:
   string const & GetName() const;
 
   /// \note Remote size is size of mwm in bytes. This mwm contains routing and map sections.
-  void SetRemoteSizes(uint32_t mapSize, uint32_t routingSize);
-  uint32_t GetRemoteSize(MapOptions file) const;
+  void SetRemoteSizes(TMwmSize mapSize, TMwmSize routingSize);
+  TMwmSize GetRemoteSize(MapOptions file) const;
 
   inline bool operator<(const CountryFile & rhs) const { return m_name < rhs.m_name; }
   inline bool operator==(const CountryFile & rhs) const { return m_name == rhs.m_name; }
@@ -32,8 +32,8 @@ private:
 
   /// Base name (without any extensions) of the file. Same as id of country/region.
   string m_name;
-  uint32_t m_mapSize;
-  uint32_t m_routingSize;
+  TMwmSize m_mapSize;
+  TMwmSize m_routingSize;
 };
 
 /// \returns This method returns file name with extension. For example Abkhazia.mwm or
diff --git a/storage/storage.hpp b/storage/storage.hpp
index 3f811be1a8..5f8c8bfe37 100644
--- a/storage/storage.hpp
+++ b/storage/storage.hpp
@@ -136,7 +136,7 @@ public:
   using TUpdateCallback = function<void(storage::TCountryId const &, TLocalFilePtr const)>;
   using TDeleteCallback = function<bool(storage::TCountryId const &, TLocalFilePtr const)>;
   using TChangeCountryFunction = function<void(TCountryId const &)>;
-  using TProgressFunction = function<void(TCountryId const &, TLocalAndRemoteSize const &)>;
+  using TProgressFunction = function<void(TCountryId const &, MapFilesDownloader::TProgress const &)>;
   using TQueue = list<QueuedCountry>;
 
 private:
diff --git a/storage/storage_defines.hpp b/storage/storage_defines.hpp
index 619ac120af..ee2c6361d6 100644
--- a/storage/storage_defines.hpp
+++ b/storage/storage_defines.hpp
@@ -63,10 +63,6 @@ namespace storage
   };
   string DebugPrint(StatusAndError statusAndError);
 
-  using TMwmCounter = uint32_t;
-  using TMwmSize = uint64_t;
-  using TLocalAndRemoteSize = pair<TMwmSize, TMwmSize>;
-
   StatusAndError ParseStatus(Status innerStatus);
 }  // namespace storage