Move StyledPoint into style namespace.

map/api_mark_point.hpp

@@ -3,7 +3,7 @@
 #include "map/user_mark.hpp"
 #include "map/styled_point.hpp"
 
-class ApiMarkPoint : public StyledPoint
+class ApiMarkPoint : public style::StyledPoint
 {
 public:
   ApiMarkPoint(m2::PointD const & ptOrg, UserMarkContainer * container)

map/bookmark.hpp

@@ -66,7 +66,7 @@ private:
   time_t m_timeStamp;
 };
 
-class Bookmark : public StyledPoint
+class Bookmark : public style::StyledPoint
 {
   BookmarkData m_data;
   double m_animScaleFactor;

map/styled_point.cpp

@@ -7,6 +7,8 @@ char const * kSupportedColors[] = {"placemark-red",    "placemark-blue",  "place
                                    "placemark-green",  "placemark-orange"};
 }
 
+namespace style
+{
 graphics::DisplayList * StyledPoint::GetDisplayList(UserMarkDLCache * cache) const
 {
   UserMarkContainer const * container = GetContainer();
@@ -33,8 +35,6 @@ m2::PointD const & StyledPoint::GetPixelOffset() const
   return GetStyle().empty() ? s_centre : s_offset;
 }
 
-namespace style
-{
 string GetSupportedStyle(string const & s, string const & context, string const & fallback)
 {
   if (s.empty())

map/styled_point.hpp

@@ -19,7 +19,6 @@ namespace style
 string GetSupportedStyle(string const & s, string const & context, string const & fallback);
 // Default icon.
 string GetDefaultStyle();
-}  // namespace style
 
 class StyledPoint : public ICustomDrawable
 {
@@ -37,3 +36,4 @@ public:
   /// @return name of icon, or empty string for plain circle.
   virtual string const & GetStyle() const = 0;
 };
+}  // namespace style