diff options
author | Alex Zolotarev <alex@maps.me> | 2016-03-13 23:34:07 +0300 |
---|---|---|
committer | Sergey Yershov <yershov@corp.mail.ru> | 2016-03-23 16:53:23 +0300 |
commit | aa380f763b17b4c7fa37b8c1506e8f7d0c9d448f (patch) | |
tree | f869ae3c133a241bdefb343915c95ccbe8952e9d /platform | |
parent | 8b6991837a1fc8a9273a6e2acda9157e78ff99e3 (diff) |
Lowercased settings namespace.
Diffstat (limited to 'platform')
-rw-r--r-- | platform/local_country_file_utils.cpp | 4 | ||||
-rw-r--r-- | platform/measurement_utils.cpp | 8 | ||||
-rw-r--r-- | platform/platform_android.cpp | 8 | ||||
-rw-r--r-- | platform/platform_ios.mm | 8 | ||||
-rw-r--r-- | platform/platform_qt.cpp | 8 | ||||
-rw-r--r-- | platform/platform_tests/local_country_file_tests.cpp | 2 | ||||
-rw-r--r-- | platform/platform_tests/measurement_tests.cpp | 10 | ||||
-rw-r--r-- | platform/platform_tests_support/write_dir_changer.cpp | 4 | ||||
-rw-r--r-- | platform/settings.cpp | 6 | ||||
-rw-r--r-- | platform/settings.hpp | 2 |
10 files changed, 30 insertions, 30 deletions
diff --git a/platform/local_country_file_utils.cpp b/platform/local_country_file_utils.cpp index dd538a5cec..342d13ae28 100644 --- a/platform/local_country_file_utils.cpp +++ b/platform/local_country_file_utils.cpp @@ -34,7 +34,7 @@ uint32_t constexpr kMinRequiredVersion = 160107; bool NeedMigrate() { uint32_t version; - if (!Settings::Get("LastMigration", version)) + if (!settings::Get("LastMigration", version)) return true; if (version >= kMinRequiredVersion) @@ -45,7 +45,7 @@ bool NeedMigrate() void SetMigrationFlag() { - Settings::Set("LastMigration", kMinRequiredVersion); + settings::Set("LastMigration", kMinRequiredVersion); } } // namespace migrate diff --git a/platform/measurement_utils.cpp b/platform/measurement_utils.cpp index 755cd70608..b29d17f03d 100644 --- a/platform/measurement_utils.cpp +++ b/platform/measurement_utils.cpp @@ -10,7 +10,7 @@ #include "std/sstream.hpp" -using namespace Settings; +using namespace settings; using namespace strings; namespace MeasurementUtils @@ -49,7 +49,7 @@ bool FormatDistanceImpl(double m, string & res, bool FormatDistance(double m, string & res) { Units u = Metric; - (void)Get(Settings::kMeasurementUnits, u); + (void)Get(settings::kMeasurementUnits, u); /// @todo Put string units resources. switch (u) @@ -152,7 +152,7 @@ void FormatMercator(m2::PointD const & mercator, string & lat, string & lon, int string FormatAltitude(double altitudeInMeters) { Units u = Metric; - (void)Get(Settings::kMeasurementUnits, u); + (void)Get(settings::kMeasurementUnits, u); ostringstream ss; ss << fixed << setprecision(0); @@ -169,7 +169,7 @@ string FormatAltitude(double altitudeInMeters) string FormatSpeed(double metersPerSecond) { Units u = Metric; - (void)Get(Settings::kMeasurementUnits, u); + (void)Get(settings::kMeasurementUnits, u); double perHour; string res; diff --git a/platform/platform_android.cpp b/platform/platform_android.cpp index 4f0816535e..f65c174037 100644 --- a/platform/platform_android.cpp +++ b/platform/platform_android.cpp @@ -251,12 +251,12 @@ Platform::EError Platform::MkDir(string const & dirName) const void Platform::SetupMeasurementSystem() const { - Settings::Units u; - if (Settings::Get(Settings::kMeasurementUnits, u)) + settings::Units u; + if (settings::Get(settings::kMeasurementUnits, u)) return; // @TODO Add correct implementation - u = Settings::Metric; - Settings::Set(Settings::kMeasurementUnits, u); + u = settings::Metric; + settings::Set(settings::kMeasurementUnits, u); } namespace diff --git a/platform/platform_ios.mm b/platform/platform_ios.mm index b7cafe738b..bbcabd8003 100644 --- a/platform/platform_ios.mm +++ b/platform/platform_ios.mm @@ -262,12 +262,12 @@ Platform::EConnectionType Platform::ConnectionStatus() void Platform::SetupMeasurementSystem() const { - Settings::Units u; - if (Settings::Get(Settings::kMeasurementUnits, u)) + settings::Units u; + if (settings::Get(settings::kMeasurementUnits, u)) return; BOOL const isMetric = [[[NSLocale autoupdatingCurrentLocale] objectForKey:NSLocaleUsesMetricSystem] boolValue]; - u = isMetric ? Settings::Metric : Settings::Foot; - Settings::Set(Settings::kMeasurementUnits, u); + u = isMetric ? settings::Metric : settings::Foot; + settings::Set(settings::kMeasurementUnits, u); } //////////////////////////////////////////////////////////////////////// diff --git a/platform/platform_qt.cpp b/platform/platform_qt.cpp index 42b0a1c588..a79d8de8d9 100644 --- a/platform/platform_qt.cpp +++ b/platform/platform_qt.cpp @@ -74,12 +74,12 @@ Platform::EError Platform::MkDir(string const & dirName) const void Platform::SetupMeasurementSystem() const { - Settings::Units u; - if (Settings::Get(Settings::kMeasurementUnits, u)) + settings::Units u; + if (settings::Get(settings::kMeasurementUnits, u)) return; bool const isMetric = QLocale::system().measurementSystem() == QLocale::MetricSystem; - u = isMetric ? Settings::Metric : Settings::Foot; - Settings::Set(Settings::kMeasurementUnits, u); + u = isMetric ? settings::Metric : settings::Foot; + settings::Set(settings::kMeasurementUnits, u); } #if defined(OMIM_OS_LINUX) diff --git a/platform/platform_tests/local_country_file_tests.cpp b/platform/platform_tests/local_country_file_tests.cpp index 1fb9a25a5c..2d63de0777 100644 --- a/platform/platform_tests/local_country_file_tests.cpp +++ b/platform/platform_tests/local_country_file_tests.cpp @@ -277,7 +277,7 @@ UNIT_TEST(LocalCountryFile_AllLocalFilesLookup) ScopedDir testDir("10101"); - Settings::Delete("LastMigration"); + settings::Delete("LastMigration"); ScopedFile testItalyMapFile(testDir, italyFile, MapOptions::Map, "Italy-map"); diff --git a/platform/platform_tests/measurement_tests.cpp b/platform/platform_tests/measurement_tests.cpp index fd83639d68..ebca1c103a 100644 --- a/platform/platform_tests/measurement_tests.cpp +++ b/platform/platform_tests/measurement_tests.cpp @@ -4,7 +4,7 @@ #include "platform/settings.hpp" using namespace MeasurementUtils; -using namespace Settings; +using namespace settings; struct ScopedSettings { @@ -30,7 +30,7 @@ struct ScopedSettings UNIT_TEST(Measurement_Smoke) { - ScopedSettings guard(Settings::Metric); + ScopedSettings guard(settings::Metric); typedef pair<double, char const *> PairT; @@ -89,15 +89,15 @@ UNIT_TEST(LatLonToDMS_NoRounding) UNIT_TEST(FormatAltitude) { ScopedSettings guard; - Settings::Set(Settings::kMeasurementUnits, Settings::Foot); + settings::Set(settings::kMeasurementUnits, settings::Foot); TEST_EQUAL(FormatAltitude(10000), "32808ft", ()); - Settings::Set(Settings::kMeasurementUnits, Settings::Metric); + settings::Set(settings::kMeasurementUnits, settings::Metric); TEST_EQUAL(FormatAltitude(5), "5m", ()); } UNIT_TEST(FormatSpeed) { - ScopedSettings guard(Settings::Metric); + ScopedSettings guard(settings::Metric); TEST_EQUAL(FormatSpeed(10), "36km/h", ()); TEST_EQUAL(FormatSpeed(1), "3.6km/h", ()); } diff --git a/platform/platform_tests_support/write_dir_changer.cpp b/platform/platform_tests_support/write_dir_changer.cpp index 5d192a295d..dab46e09cb 100644 --- a/platform/platform_tests_support/write_dir_changer.cpp +++ b/platform/platform_tests_support/write_dir_changer.cpp @@ -17,12 +17,12 @@ WritableDirChanger::WritableDirChanger(string const & testDir) TEST(!platform.IsFileExistsByFullPath(m_testDirFullPath), ()); TEST_EQUAL(Platform::ERR_OK, platform.MkDir(m_testDirFullPath), ()); platform.SetWritableDirForTests(m_testDirFullPath); - Settings::Clear(); + settings::Clear(); } WritableDirChanger::~WritableDirChanger() { - Settings::Clear(); + settings::Clear(); Platform & platform = GetPlatform(); string const writableDirForTest = platform.WritableDir(); platform.SetWritableDirForTests(m_writableDirBeforeTest); diff --git a/platform/settings.cpp b/platform/settings.cpp index 902a1d4232..58a0155820 100644 --- a/platform/settings.cpp +++ b/platform/settings.cpp @@ -24,10 +24,10 @@ namespace char const DELIM_CHAR = '='; } -char const * Settings::kLocationStateMode = "LastLocationStateMode"; -char const * Settings::kMeasurementUnits = "Units"; +char const * settings::kLocationStateMode = "LastLocationStateMode"; +char const * settings::kMeasurementUnits = "Units"; -namespace Settings +namespace settings { StringStorage::StringStorage() { diff --git a/platform/settings.hpp b/platform/settings.hpp index 362332a4ea..290cc8b896 100644 --- a/platform/settings.hpp +++ b/platform/settings.hpp @@ -4,7 +4,7 @@ #include "std/map.hpp" #include "std/mutex.hpp" -namespace Settings +namespace settings { /// Current location state mode. @See location::EMyPositionMode. extern char const * kLocationStateMode; |