pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Minor code prettify.

Browse source 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
This commit is contained in:
Viktor Govako 2022-01-19 18:24:00 +03:00
parent bdab3c9ad6
commit cfceb4c14b
5 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
coding/transliteration.cpp
View file

@ -118,10 +118,7 @@ bool Transliteration::Transliterate(std::string const & transID, icu::UnicodeStr
it->second->m_transliterator->transliterate(ustr);
if (ustr.isEmpty())
return false;
return true;
return !ustr.isEmpty();
}
bool Transliteration::TransliterateForce(std::string const & str, std::string const & transliteratorId,

1
generator/generator_tool/generator_tool.cpp
View file

@ -54,7 +54,6 @@
#include "platform/platform.hpp"
#include "coding/endianness.hpp"
#include "coding/transliteration.hpp"
#include "base/file_name_utils.hpp"
#include "base/timer.hpp"

2
indexer/search_string_utils.cpp
View file

@ -5,8 +5,6 @@
#include "coding/transliteration.hpp"
#include "coding/transliteration.hpp"
#include "base/assert.hpp"
#include "base/dfa_helpers.hpp"
#include "base/macros.hpp"

15
indexer/transliteration_loader.cpp
View file

@ -12,23 +12,24 @@
void InitTransliterationInstanceWithDefaultDirs()
{
Platform const & pl = GetPlatform();
#if defined(OMIM_OS_ANDROID)
char const kICUDataFile[] = "icudt70l.dat";
if (!GetPlatform().IsFileExistsByFullPath(GetPlatform().WritableDir() + kICUDataFile))
if (!pl.IsFileExistsByFullPath(pl.WritableDir() + kICUDataFile))
{
try
{
ZipFileReader::UnzipFile(GetPlatform().ResourcesDir(), std::string("assets/") + kICUDataFile,
GetPlatform().WritableDir() + kICUDataFile);
ZipFileReader::UnzipFile(pl.ResourcesDir(), std::string("assets/") + kICUDataFile,
pl.WritableDir() + kICUDataFile);
}
catch (RootException const & e)
{
LOG(LWARNING,
("Can't get transliteration data file \"", kICUDataFile, "\", reason:", e.Msg()));
LOG(LWARNING, ("Can't get transliteration data file \"", kICUDataFile, "\", reason:", e.Msg()));
}
}
Transliteration::Instance().Init(GetPlatform().WritableDir());
Transliteration::Instance().Init(pl.WritableDir());
#else
Transliteration::Instance().Init(GetPlatform().ResourcesDir());
Transliteration::Instance().Init(pl.ResourcesDir());
#endif
}

2
map/framework.cpp
View file

@ -412,7 +412,7 @@ Framework::Framework(FrameworkParams const & params)
m_featuresFetcher.GetDataSource().AddObserver(editor);
LOG(LINFO, ("Editor initialized"));
LOG(LDEBUG, ("Editor initialized"));
m_trafficManager.SetCurrentDataVersion(m_storage.GetCurrentDataVersion());
m_trafficManager.SetSimplifiedColorScheme(LoadTrafficSimplifiedColors());