diff options
author | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2016-05-24 14:46:51 +0300 |
---|---|---|
committer | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2016-05-24 15:32:50 +0300 |
commit | c596381cfb9f851b7bcbd7a286e18196d23cd3f9 (patch) | |
tree | acaffc034748f003fce067f3730bd125dd08c907 /drape_frontend | |
parent | 4ee5118880cd0c32f9bfef4b940064ee1b98abb6 (diff) |
Deleted old unsupported Yota-stuff
Diffstat (limited to 'drape_frontend')
-rw-r--r-- | drape_frontend/visual_params.cpp | 18 | ||||
-rw-r--r-- | drape_frontend/visual_params.hpp | 7 |
2 files changed, 5 insertions, 20 deletions
diff --git a/drape_frontend/visual_params.cpp b/drape_frontend/visual_params.cpp index 2ff8f0425b..cf0de06c78 100644 --- a/drape_frontend/visual_params.cpp +++ b/drape_frontend/visual_params.cpp @@ -12,8 +12,6 @@ namespace df { -uint32_t const YotaDevice = 0x1; - namespace { @@ -33,12 +31,10 @@ static bool g_isInited = false; #endif -void VisualParams::Init(double vs, uint32_t tileSize, vector<uint32_t> const & additionalOptions) +void VisualParams::Init(double vs, uint32_t tileSize) { g_VizParams.m_tileSize = tileSize; g_VizParams.m_visualScale = vs; - if (find(additionalOptions.begin(), additionalOptions.end(), YotaDevice) != additionalOptions.end()) - g_VizParams.m_isYotaDevice = true; // Here we set up glyphs rendering parameters separately for high-res and low-res screens. if (vs <= 1.0) @@ -65,7 +61,7 @@ VisualParams & VisualParams::Instance() return g_VizParams; } -string const & VisualParams::GetResourcePostfix(double visualScale, bool isYotaDevice) +string const & VisualParams::GetResourcePostfix(double visualScale) { static visual_scale_t postfixes[] = { @@ -77,14 +73,6 @@ string const & VisualParams::GetResourcePostfix(double visualScale, bool isYotaD make_pair("6plus", 2.4), }; - static string specifixPostfixes[] = - { - "yota" - }; - - if (isYotaDevice) - return specifixPostfixes[0]; - // Looking for the nearest available scale. int postfixIndex = -1; double minValue = numeric_limits<double>::max(); @@ -104,7 +92,7 @@ string const & VisualParams::GetResourcePostfix(double visualScale, bool isYotaD string const & VisualParams::GetResourcePostfix() const { - return VisualParams::GetResourcePostfix(m_visualScale, m_isYotaDevice); + return VisualParams::GetResourcePostfix(m_visualScale); } double VisualParams::GetVisualScale() const diff --git a/drape_frontend/visual_params.hpp b/drape_frontend/visual_params.hpp index 5204edc6fc..5e912843d4 100644 --- a/drape_frontend/visual_params.hpp +++ b/drape_frontend/visual_params.hpp @@ -10,17 +10,15 @@ namespace df { -extern uint32_t const YotaDevice; - class VisualParams : private noncopyable { public: - static void Init(double vs, uint32_t tileSize, vector<uint32_t> const & additionalOptions = vector<uint32_t>()); + static void Init(double vs, uint32_t tileSize); static VisualParams & Instance(); VisualParams(); - static string const & GetResourcePostfix(double visualScale, bool isYotaDevice = false); + static string const & GetResourcePostfix(double visualScale); string const & GetResourcePostfix() const; double GetVisualScale() const; @@ -49,7 +47,6 @@ public: private: int m_tileSize; double m_visualScale; - bool m_isYotaDevice; GlyphVisualParams m_glyphVisualParams; }; |