1 files changed, 19 insertions, 18 deletions

diff --git a/src/platform/graphics/SvgGeometryBuilderMixin.cpp b/src/platform/graphics/SvgGeometryBuilderMixin.cpp
index 73290da5..0863e5eb 100644
--- a/src/platform/graphics/SvgGeometryBuilderMixin.cpp
+++ b/src/platform/graphics/SvgGeometryBuilderMixin.cpp
@@ -1,7 +1,7 @@
 #include "cru/platform/graphics/SvgGeometryBuilderMixin.h"
 #include "cru/platform/Exception.h"
 
-#include "cru/base/Format.h"
+#include <string>
 
 namespace cru::platform::graphics {
 SvgGeometryBuilderMixin::SvgGeometryBuilderMixin() {}
@@ -10,34 +10,34 @@ SvgGeometryBuilderMixin::~SvgGeometryBuilderMixin() {}
 
 Point SvgGeometryBuilderMixin::GetCurrentPosition() {
   throw PlatformUnsupportedException(
-      GetPlatformIdUtf8(), "GetCurrentPosition",
+      GetPlatformId(), "GetCurrentPosition",
       "Svg-based geometry does not support get current position.");
 }
 
 void SvgGeometryBuilderMixin::MoveTo(const Point& point) {
-  AppendCommand(u"M");
+  AppendCommand("M");
   Append(point);
 }
 
 void SvgGeometryBuilderMixin::RelativeMoveTo(const Point& offset) {
-  AppendCommand(u"m");
+  AppendCommand("m");
   Append(offset);
 }
 
 void SvgGeometryBuilderMixin::LineTo(const Point& point) {
-  AppendCommand(u"L");
+  AppendCommand("L");
   Append(point);
 }
 
 void SvgGeometryBuilderMixin::RelativeLineTo(const Point& offset) {
-  AppendCommand(u"l");
+  AppendCommand("l");
   Append(offset);
 }
 
 void SvgGeometryBuilderMixin::CubicBezierTo(const Point& start_control_point,
                                             const Point& end_control_point,
                                             const Point& end_point) {
-  AppendCommand(u"C");
+  AppendCommand("C");
   Append(start_control_point);
   Append(end_control_point);
   Append(end_point);
@@ -46,7 +46,7 @@ void SvgGeometryBuilderMixin::CubicBezierTo(const Point& start_control_point,
 void SvgGeometryBuilderMixin::RelativeCubicBezierTo(
     const Point& start_control_offset, const Point& end_control_offset,
     const Point& end_offset) {
-  AppendCommand(u"c");
+  AppendCommand("c");
   Append(start_control_offset);
   Append(end_control_offset);
   Append(end_offset);
@@ -54,14 +54,14 @@ void SvgGeometryBuilderMixin::RelativeCubicBezierTo(
 
 void SvgGeometryBuilderMixin::QuadraticBezierTo(const Point& control_point,
                                                 const Point& end_point) {
-  AppendCommand(u"Q");
+  AppendCommand("Q");
   Append(control_point);
   Append(end_point);
 }
 
 void SvgGeometryBuilderMixin::RelativeQuadraticBezierTo(
     const Point& control_offset, const Point& end_offset) {
-  AppendCommand(u"q");
+  AppendCommand("q");
   Append(control_offset);
   Append(end_offset);
 }
@@ -69,7 +69,7 @@ void SvgGeometryBuilderMixin::RelativeQuadraticBezierTo(
 void SvgGeometryBuilderMixin::ArcTo(const Point& radius, float angle,
                                     bool is_large_arc, bool is_clockwise,
                                     const Point& end_point) {
-  AppendCommand(u"A");
+  AppendCommand("A");
   Append(radius.x);
   Append(radius.y);
   Append(angle);
@@ -82,7 +82,7 @@ void SvgGeometryBuilderMixin::RelativeArcTo(const Point& radius, float angle,
                                             bool is_large_arc,
                                             bool is_clockwise,
                                             const Point& end_offset) {
-  AppendCommand(u"a");
+  AppendCommand("a");
   Append(radius.x);
   Append(radius.y);
   Append(angle);
@@ -92,14 +92,15 @@ void SvgGeometryBuilderMixin::RelativeArcTo(const Point& radius, float angle,
 }
 
 void SvgGeometryBuilderMixin::CloseFigure(bool close) {
-  if (close) AppendCommand(u"z");
+  if (close) AppendCommand("z");
 }
 
-void SvgGeometryBuilderMixin::ParseAndApplySvgPathData(StringView path_d) {
+void SvgGeometryBuilderMixin::ParseAndApplySvgPathData(
+    std::string_view path_d) {
   AppendCommand(path_d);
 }
 
-void SvgGeometryBuilderMixin::AppendCommand(StringView command) {
+void SvgGeometryBuilderMixin::AppendCommand(std::string_view command) {
   current_ += command;
   current_ += u' ';
 }
@@ -110,14 +111,14 @@ void SvgGeometryBuilderMixin::Append(bool flag) {
 }
 
 void SvgGeometryBuilderMixin::Append(float number) {
-  current_ += cru::ToString(number);
+  current_ += std::to_string(number);
   current_ += u' ';
 }
 
 void SvgGeometryBuilderMixin::Append(const Point& point) {
-  current_ += cru::ToString(point.x);
+  current_ += std::to_string(point.x);
   current_ += u',';
-  current_ += cru::ToString(point.y);
+  current_ += std::to_string(point.y);
   current_ += u' ';
 }
 }  // namespace cru::platform::graphics