diff options
author | Yuri Gorshenin <y@maps.me> | 2015-07-27 13:25:24 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:57:40 +0300 |
commit | 04142e39cffd676d234f2a3b39de774500c6a66e (patch) | |
tree | 4cc8006430e0a9f2b31a472d6f338ad2dcb43174 /android | |
parent | acb80ad11be5e7431cf31fac57bbe104886e3ef6 (diff) |
Removed T-letter from TMapOptions.
Diffstat (limited to 'android')
7 files changed, 17 insertions, 17 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); } diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index 75b2b92f72..dec827e736 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -580,7 +580,7 @@ namespace android } try { - FilesContainerR cont(platform::GetCountryReader(localFile, TMapOptions::Map)); + FilesContainerR cont(platform::GetCountryReader(localFile, MapOptions::Map)); if (!cont.IsExist(SEARCH_INDEX_FILE_TAG)) out.push_back(countryFile.GetNameWithoutExt()); } @@ -778,7 +778,7 @@ namespace android } void Framework::CountryOptionsChanged(ActiveMapsLayout::TGroup const & group, int position, - TMapOptions const & oldOpt, TMapOptions const & newOpt) + MapOptions const & oldOpt, MapOptions const & newOpt) { JNIEnv * env = jni::GetEnv(); for (TListenerMap::const_iterator it = m_javaActiveMapListeners.begin(); it != m_javaActiveMapListeners.end(); ++it) @@ -1446,7 +1446,7 @@ extern "C" JNIEXPORT void JNICALL Java_com_mapswithme_maps_Framework_downloadCountry(JNIEnv * env, jobject thiz, jobject idx) { - storage_utils::GetMapLayout().DownloadMap(storage::ToNative(idx), TMapOptions::Map); + storage_utils::GetMapLayout().DownloadMap(storage::ToNative(idx), MapOptions::Map); } JNIEXPORT void JNICALL diff --git a/android/jni/com/mapswithme/maps/Framework.hpp b/android/jni/com/mapswithme/maps/Framework.hpp index 64f345fd1a..f17622c424 100644 --- a/android/jni/com/mapswithme/maps/Framework.hpp +++ b/android/jni/com/mapswithme/maps/Framework.hpp @@ -180,8 +180,8 @@ namespace android virtual void CountryStatusChanged(storage::ActiveMapsLayout::TGroup const & group, int position, storage::TStatus const & oldStatus, storage::TStatus const & newStatus); virtual void CountryOptionsChanged(storage::ActiveMapsLayout::TGroup const & group, - int position, TMapOptions const & oldOpt, - TMapOptions const & newOpt); + int position, MapOptions const & oldOpt, + MapOptions const & newOpt); virtual void DownloadingProgressUpdate(storage::ActiveMapsLayout::TGroup const & group, int position, storage::LocalAndRemoteSizeT const & progress); }; diff --git a/android/jni/com/mapswithme/maps/MapStorage.cpp b/android/jni/com/mapswithme/maps/MapStorage.cpp index 85b5737aeb..97afe451f2 100644 --- a/android/jni/com/mapswithme/maps/MapStorage.cpp +++ b/android/jni/com/mapswithme/maps/MapStorage.cpp @@ -79,13 +79,13 @@ extern "C" LocalAndRemoteSizeT const sizes = layout.GetRemoteCountrySizes(ToNative(idx)); switch (storage_utils::ToOptions(options)) { - case TMapOptions::Map: + case MapOptions::Map: return sizes.first; - case TMapOptions::CarRouting: + case MapOptions::CarRouting: return sizes.second; - case TMapOptions::MapWithCarRouting: + case MapOptions::MapWithCarRouting: return sizes.first + sizes.second; - case TMapOptions::Nothing: + case MapOptions::Nothing: return 0; } } |