Remove String on Linux.

8 files changed, 15 insertions, 24 deletions

diff --git a/include/cru/ui/render/BorderRenderObject.h b/include/cru/ui/render/BorderRenderObject.h
index 7bfa4290..001494a6 100644
--- a/include/cru/ui/render/BorderRenderObject.h
+++ b/include/cru/ui/render/BorderRenderObject.h
@@ -50,7 +50,7 @@ class CRU_UI_API BorderRenderObject : public SingleChildRenderObject {
   Rect GetPaddingRect() const override;
   Rect GetContentRect() const override;
 
-  String GetName() const override;
+  std::string GetName() const override;
 
  protected:
   Size OnMeasureContent(const MeasureRequirement& requirement,
diff --git a/include/cru/ui/render/FlexLayoutRenderObject.h b/include/cru/ui/render/FlexLayoutRenderObject.h
index 6c65ace3..bf68720a 100644
--- a/include/cru/ui/render/FlexLayoutRenderObject.h
+++ b/include/cru/ui/render/FlexLayoutRenderObject.h
@@ -104,7 +104,7 @@ class CRU_UI_API FlexLayoutRenderObject
   FlexLayoutRenderObject& operator=(FlexLayoutRenderObject&& other) = delete;
   ~FlexLayoutRenderObject() override = default;
 
-  String GetName() const override;
+  std::string GetName() const override;
 
   FlexDirection GetFlexDirection() const { return direction_; }
   void SetFlexDirection(FlexDirection direction) {
diff --git a/include/cru/ui/render/MeasureRequirement.h b/include/cru/ui/render/MeasureRequirement.h
index 544e0788..43bd3326 100644
--- a/include/cru/ui/render/MeasureRequirement.h
+++ b/include/cru/ui/render/MeasureRequirement.h
@@ -1,8 +1,6 @@
 #pragma once
 #include "../Base.h"
 
-#include "cru/base/String.h"
-
 #include <algorithm>
 #include <format>
 #include <limits>
@@ -113,13 +111,11 @@ class MeasureLength final {
     }
   }
 
-  std::string ToDebugStringUtf8() const {
+  std::string ToDebugString() const {
     return IsSpecified() ? std::to_string(GetLengthOrUndefined())
                          : "UNSPECIFIED";
   }
 
-  String ToDebugString() const { return String::FromUtf8(ToDebugStringUtf8()); }
-
  private:
   // -1 for not specify
   float length_;
@@ -168,13 +164,11 @@ struct MeasureSize {
     };
   }
 
-  std::string ToDebugStringUtf8() const {
-    return std::format("({}, {})", width.ToDebugStringUtf8(),
-                       height.ToDebugStringUtf8());
+  std::string ToDebugString() const {
+    return std::format("({}, {})", width.ToDebugString(),
+                       height.ToDebugString());
   }
 
-  String ToDebugString() const { return String::FromUtf8(ToDebugStringUtf8()); }
-
   constexpr static MeasureSize NotSpecified() {
     return MeasureSize{MeasureLength::NotSpecified(),
                        MeasureLength::NotSpecified()};
@@ -241,13 +235,11 @@ struct MeasureRequirement {
     return result;
   }
 
-  std::string ToDebugStringUtf8() const {
-    return std::format("{{min: {}, max: {}}}", min.ToDebugStringUtf8(),
-                       max.ToDebugStringUtf8());
+  std::string ToDebugString() const {
+    return std::format("{{min: {}, max: {}}}", min.ToDebugString(),
+                       max.ToDebugString());
   }
 
-  String ToDebugString() const { return String::FromUtf8(ToDebugStringUtf8()); }
-
   constexpr static MeasureRequirement Merge(const MeasureRequirement& left,
                                             const MeasureRequirement& right) {
     return MeasureRequirement{MeasureSize::Min(left.max, right.max),
diff --git a/include/cru/ui/render/RenderObject.h b/include/cru/ui/render/RenderObject.h
index eba3b6c4..266045e3 100644
--- a/include/cru/ui/render/RenderObject.h
+++ b/include/cru/ui/render/RenderObject.h
@@ -2,7 +2,6 @@
 #include "../Base.h"
 
 #include "MeasureRequirement.h"
-#include "cru/base/String.h"
 
 #include <cru/platform/graphics/Painter.h>
 
@@ -145,8 +144,8 @@ class CRU_UI_API RenderObject : public Object {
   void InvalidatePaint();
 
  public:
-  virtual String GetName() const;
-  String GetDebugPathInTree() const;
+  virtual std::string GetName() const;
+  std::string GetDebugPathInTree() const;
 
  protected:
   // Size measure including margin and padding. Please reduce margin and padding
diff --git a/include/cru/ui/render/ScrollRenderObject.h b/include/cru/ui/render/ScrollRenderObject.h
index 180e927a..63a49aa3 100644
--- a/include/cru/ui/render/ScrollRenderObject.h
+++ b/include/cru/ui/render/ScrollRenderObject.h
@@ -60,7 +60,7 @@ class CRU_UI_API ScrollRenderObject : public SingleChildRenderObject {
   // Param margin is just for convenience and it will just add to the rect.
   void ScrollToContain(const Rect& rect, const Thickness& margin = Thickness{});
 
-  String GetName() const override { return u"ScrollRenderObject"; }
+  std::string GetName() const override { return "ScrollRenderObject"; }
 
   bool IsMouseWheelScrollEnabled() const { return is_mouse_wheel_enabled_; }
   void SetMouseWheelScrollEnabled(bool enable);
diff --git a/include/cru/ui/render/StackLayoutRenderObject.h b/include/cru/ui/render/StackLayoutRenderObject.h
index 515e8f43..0d75d032 100644
--- a/include/cru/ui/render/StackLayoutRenderObject.h
+++ b/include/cru/ui/render/StackLayoutRenderObject.h
@@ -36,7 +36,7 @@ class CRU_UI_API StackLayoutRenderObject
   CRU_DELETE_MOVE(StackLayoutRenderObject)
   ~StackLayoutRenderObject() = default;
 
-  String GetName() const override { return u"StackLayoutRenderObject"; }
+  std::string GetName() const override { return "StackLayoutRenderObject"; }
 
   Alignment GetDefaultHorizontalAlignment() const {
     return default_vertical_alignment_;
diff --git a/include/cru/ui/render/TextRenderObject.h b/include/cru/ui/render/TextRenderObject.h
index b8d1882d..5b99ae98 100644
--- a/include/cru/ui/render/TextRenderObject.h
+++ b/include/cru/ui/render/TextRenderObject.h
@@ -93,7 +93,7 @@ class CRU_UI_API TextRenderObject : public RenderObject {
 
   RenderObject* HitTest(const Point& point) override;
 
-  String GetName() const override { return u"TextRenderObject"; }
+  std::string GetName() const override { return "TextRenderObject"; }
 
   void Draw(platform::graphics::IPainter* painter) override;
 
diff --git a/include/cru/ui/render/TreeRenderObject.h b/include/cru/ui/render/TreeRenderObject.h
index ef40f4d0..9cb8581e 100644
--- a/include/cru/ui/render/TreeRenderObject.h
+++ b/include/cru/ui/render/TreeRenderObject.h
@@ -57,7 +57,7 @@ class CRU_UI_API TreeRenderObject : public RenderObject {
   CRU_DELETE_MOVE(TreeRenderObject)
   ~TreeRenderObject() override;
 
-  String GetName() const override { return u"TreeRenderObject"; }
+  std::string GetName() const override { return "TreeRenderObject"; }
 
   TreeRenderObjectItem* GetRootItem() { return root_item_; }