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:
authorIlya Grechuhin <i.grechuhin@gmail.com>2016-07-06 13:49:16 +0300
committerIlya Grechuhin <i.grechuhin@gmail.com>2016-07-07 14:23:14 +0300
commitf7aafa00e27d85f4d0f2b4c504d9063d392b41f8 (patch)
tree42a642688dfef0e8dea4d9fc8ebacd185dc75993 /drape_frontend
parentaae90b0081d9b38fe2d0d58ee63445a8e58f6462 (diff)
[omim] Refactored measurement_utils.
Diffstat (limited to 'drape_frontend')
-rw-r--r--drape_frontend/gui/ruler_helper.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/drape_frontend/gui/ruler_helper.cpp b/drape_frontend/gui/ruler_helper.cpp
index 5fb830f14a..e3bdbe0b54 100644
--- a/drape_frontend/gui/ruler_helper.cpp
+++ b/drape_frontend/gui/ruler_helper.cpp
@@ -229,14 +229,14 @@ double RulerHelper::CalcMetresDiff(double value)
typedef double (*ConversionFn)(double);
ConversionFn conversionFn = &identity;
- settings::Units units = settings::Metric;
- settings::Get(settings::kMeasurementUnits, units);
+ auto units = measurement_utils::Units::Metric;
+ UNUSED_VALUE(settings::Get(settings::kMeasurementUnits, units));
- if (units == settings::Foot)
+ if (units == measurement_utils::Units::Imperial)
{
arrU = g_arrFeets;
count = ARRAY_SIZE(g_arrFeets);
- conversionFn = &MeasurementUtils::MetersToFeet;
+ conversionFn = &measurement_utils::MetersToFeet;
}
int prevUnitRange = m_rangeIndex;