Removed T-letter from TMapOptions.

4 files changed, 8 insertions, 8 deletions

diff --git a/android/jni/com/mapswithme/country/ActiveCountryTree.cpp b/android/jni/com/mapswithme/country/ActiveCountryTree.cpp
index b30bd93ad3..3434a6585f 100644
--- a/android/jni/com/mapswithme/country/ActiveCountryTree.cpp
+++ b/android/jni/com/mapswithme/country/ActiveCountryTree.cpp
@@ -49,7 +49,7 @@ extern "C"
     ActiveMapsLayout::TGroup coreGroup = ToGroup(group);
     int pos = static_cast<int>(position);
     bool const local = isLocal == JNI_TRUE;
-    TMapOptions opt = ToOptions(options);
+    MapOptions opt = ToOptions(options);
 
     if (options == -1 || local)
     {
@@ -61,9 +61,9 @@ extern "C"
     LocalAndRemoteSizeT sizes = layout.GetRemoteCountrySizes(coreGroup, pos);
     switch (opt)
     {
-      case TMapOptions::Map:
+      case MapOptions::Map:
         return sizes.first;
-      case TMapOptions::CarRouting:
+      case MapOptions::CarRouting:
         return sizes.second;
       default:
         return sizes.first + sizes.second;
diff --git a/android/jni/com/mapswithme/country/CountryTree.cpp b/android/jni/com/mapswithme/country/CountryTree.cpp
index 240c994430..e78cad39b1 100644
--- a/android/jni/com/mapswithme/country/CountryTree.cpp
+++ b/android/jni/com/mapswithme/country/CountryTree.cpp
@@ -102,7 +102,7 @@ extern "C"
     CountryTree & tree = GetTree();
     int pos = static_cast<int>(position);
     bool const local = (isLocal == JNI_TRUE) ? true : false;
-    TMapOptions opt = ToOptions(options);
+    MapOptions opt = ToOptions(options);
 
     if (options == -1 || local)
     {
@@ -113,9 +113,9 @@ extern "C"
     LocalAndRemoteSizeT sizes = tree.GetRemoteLeafSizes(pos);
     switch (opt)
     {
-      case TMapOptions::Map:
+      case MapOptions::Map:
         return sizes.first;
-      case TMapOptions::CarRouting:
+      case MapOptions::CarRouting:
         return sizes.second;
       default:
         return sizes.first + sizes.second;
diff --git a/android/jni/com/mapswithme/country/country_helper.cpp b/android/jni/com/mapswithme/country/country_helper.cpp
index 248fc86244..1988d29789 100644
--- a/android/jni/com/mapswithme/country/country_helper.cpp
+++ b/android/jni/com/mapswithme/country/country_helper.cpp
@@ -8,7 +8,7 @@ namespace storage_utils
   storage::CountryTree & GetTree() { return frm()->GetCountryTree(); }
 
   storage::ActiveMapsLayout::TGroup ToGroup(int group) { return static_cast<storage::ActiveMapsLayout::TGroup>(group); }
-  TMapOptions ToOptions(int options) { return static_cast<TMapOptions>(options); }
+  MapOptions ToOptions(int options) { return static_cast<MapOptions>(options); }
   jlongArray ToArray(JNIEnv * env, storage::LocalAndRemoteSizeT const & size)
   {
     jlongArray result = env->NewLongArray(2);
diff --git a/android/jni/com/mapswithme/country/country_helper.hpp b/android/jni/com/mapswithme/country/country_helper.hpp
index 6820c9c545..85c5c09b27 100644
--- a/android/jni/com/mapswithme/country/country_helper.hpp
+++ b/android/jni/com/mapswithme/country/country_helper.hpp
@@ -14,6 +14,6 @@ namespace storage_utils
   storage::CountryTree & GetTree();
 
   storage::ActiveMapsLayout::TGroup ToGroup(int group);
-  TMapOptions ToOptions(int options);
+  MapOptions ToOptions(int options);
   jlongArray ToArray(JNIEnv * env, storage::LocalAndRemoteSizeT const & sizes);
 }