From 2f306b8f783675327d454478803e9d4ad5ee1b54 Mon Sep 17 00:00:00 2001 From: Keith Wansbrough Date: Wed, 11 Nov 2015 22:31:02 +0000 Subject: [PATCH] Simple formatting/style markups. --- map/api_mark_container.cpp | 2 +- map/styled_point.cpp | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/map/api_mark_container.cpp b/map/api_mark_container.cpp index f9c6d2530a..a1de15a524 100644 --- a/map/api_mark_container.cpp +++ b/map/api_mark_container.cpp @@ -1,6 +1,6 @@ #include "map/api_mark_container.hpp" -#include "map/api_mark_point.hpp" +#include "map/api_mark_point.hpp" #include "map/framework.hpp" ApiUserMarkContainer::ApiUserMarkContainer(double layerDepth, Framework & framework) diff --git a/map/styled_point.cpp b/map/styled_point.cpp index 6b32e43cd6..971512c335 100644 --- a/map/styled_point.cpp +++ b/map/styled_point.cpp @@ -1,5 +1,12 @@ #include "map/styled_point.hpp" +namespace +{ +char const * kSupportedColors[] = {"placemark-red", "placemark-blue", "placemark-purple", + "placemark-yellow", "placemark-pink", "placemark-brown", + "placemark-green", "placemark-orange"}; +} + graphics::DisplayList * StyledPoint::GetDisplayList(UserMarkDLCache * cache) const { UserMarkContainer const * container = GetContainer(); @@ -26,13 +33,6 @@ m2::PointD const & StyledPoint::GetPixelOffset() const return GetStyle().empty() ? s_centre : s_offset; } -namespace -{ -char const * kSupportedColors[] = {"placemark-red", "placemark-blue", "placemark-purple", - "placemark-yellow", "placemark-pink", "placemark-brown", - "placemark-green", "placemark-orange"}; -} - namespace style { string GetSupportedStyle(string const & s, string const & context, string const & fallback) @@ -52,5 +52,4 @@ string GetSupportedStyle(string const & s, string const & context, string const } string GetDefaultStyle() { return kSupportedColors[0]; } - } // namespace style