Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArsentiy Milchakov <a.milchakov@corp.mail.ru>2016-08-30 11:48:46 +0300
committerArsentiy Milchakov <a.milchakov@corp.mail.ru>2016-08-30 11:48:46 +0300
commitf1d3a34101014fcf1f1294d588944cc3fe7ccb36 (patch)
treee5f523d3515a5bbf42f025bc48726b9fdee6c93d /drape_frontend
parent39103b30cf1fcb94801d6725f60897c85df45304 (diff)
names optimization and fix
Diffstat (limited to 'drape_frontend')
-rw-r--r--drape_frontend/stylist.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/drape_frontend/stylist.cpp b/drape_frontend/stylist.cpp
index 56e7edec63..54df0b0f8a 100644
--- a/drape_frontend/stylist.cpp
+++ b/drape_frontend/stylist.cpp
@@ -214,14 +214,14 @@ void CaptionDescription::FormatCaptions(FeatureType const & f,
{
if (!auxCaptionExists && !m_auxText.empty() && type != feature::GEOM_LINE)
{
- f.GetReadableName(m_mainText);
- if (m_mainText == m_auxText)
- m_auxText.clear();
+ m_mainText.swap(m_auxText);
+ m_auxText.clear();
}
if (mainTextType == drule::text_type_housenumber)
{
- m_mainText = move(m_houseNumber);
+ m_mainText.swap(m_houseNumber);
+ m_houseNumber.clear();
}
else if (mainTextType == drule::text_type_name)
{