6 files changed, 15 insertions, 17 deletions
diff --git a/include/cru/platform/graphics/quartz/Brush.h b/include/cru/platform/graphics/quartz/Brush.h
index 9b29ef59..73aa2f6d 100644
--- a/include/cru/platform/graphics/quartz/Brush.h
+++ b/include/cru/platform/graphics/quartz/Brush.h
@@ -36,7 +36,7 @@ class QuartzSolidColorBrush : public QuartzBrush,
 
   void Select(CGContextRef context) override;
 
-  String GetDebugString() override;
+  std::string GetDebugString() override;
 
  private:
   Color color_;
diff --git a/include/cru/platform/graphics/quartz/Convert.h b/include/cru/platform/graphics/quartz/Convert.h
index c5a1a6cc..fd6159a6 100644
--- a/include/cru/platform/graphics/quartz/Convert.h
+++ b/include/cru/platform/graphics/quartz/Convert.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "cru/base/Range.h"
-#include "cru/base/String.h"
 #include "cru/base/io/Stream.h"
 #include "cru/platform/Matrix.h"
 
diff --git a/include/cru/platform/graphics/quartz/Factory.h b/include/cru/platform/graphics/quartz/Factory.h
index 042e35ca..61d8dbdb 100644
--- a/include/cru/platform/graphics/quartz/Factory.h
+++ b/include/cru/platform/graphics/quartz/Factory.h
@@ -21,11 +21,11 @@ class QuartzGraphicsFactory : public OsxQuartzResource,
 
   std::unique_ptr<IGeometryBuilder> CreateGeometryBuilder() override;
 
-  std::unique_ptr<IFont> CreateFont(String font_family,
+  std::unique_ptr<IFont> CreateFont(std::string font_family,
                                     float font_size) override;
 
   std::unique_ptr<ITextLayout> CreateTextLayout(std::shared_ptr<IFont> font,
-                                                String text) override;
+                                                std::string text) override;
 
   IImageFactory* GetImageFactory() override;
 
diff --git a/include/cru/platform/graphics/quartz/Font.h b/include/cru/platform/graphics/quartz/Font.h
index 975607b9..d110b59b 100644
--- a/include/cru/platform/graphics/quartz/Font.h
+++ b/include/cru/platform/graphics/quartz/Font.h
@@ -8,7 +8,7 @@
 namespace cru::platform::graphics::quartz {
 class OsxCTFont : public OsxQuartzResource, public virtual IFont {
  public:
-  OsxCTFont(IGraphicsFactory* graphics_factory, const String& name, float size);
+  OsxCTFont(IGraphicsFactory* graphics_factory, const std::string& name, float size);
 
   CRU_DELETE_COPY(OsxCTFont)
   CRU_DELETE_MOVE(OsxCTFont)
@@ -17,11 +17,11 @@ class OsxCTFont : public OsxQuartzResource, public virtual IFont {
 
   CTFontRef GetCTFont() const { return ct_font_; }
 
-  String GetFontName() override;
+  std::string GetFontName() override;
   float GetFontSize() override;
 
  private:
-  String name_;
+  std::string name_;
   CTFontRef ct_font_;
 };
 }  // namespace cru::platform::graphics::quartz
diff --git a/include/cru/platform/graphics/quartz/Resource.h b/include/cru/platform/graphics/quartz/Resource.h
index d28e4055..23fe6fa9 100644
--- a/include/cru/platform/graphics/quartz/Resource.h
+++ b/include/cru/platform/graphics/quartz/Resource.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "cru/platform/osx/Resource.h"
 #include "cru/platform/graphics/Base.h"
 #include "cru/platform/graphics/Resource.h"
+#include "cru/platform/osx/Resource.h"
 
 namespace cru::platform::graphics::quartz {
 class OsxQuartzResource : public platform::osx::OsxResource,
@@ -15,7 +15,7 @@ class OsxQuartzResource : public platform::osx::OsxResource,
   ~OsxQuartzResource() override = default;
 
  public:
-  String GetPlatformId() const override { return u"OSX Quartz"; }
+  std::string GetPlatformId() const override { return "OSX Quartz"; }
 
   IGraphicsFactory* GetGraphicsFactory() override { return graphics_factory_; }
 
diff --git a/include/cru/platform/graphics/quartz/TextLayout.h b/include/cru/platform/graphics/quartz/TextLayout.h
index bbb417f6..e53ee464 100644
--- a/include/cru/platform/graphics/quartz/TextLayout.h
+++ b/include/cru/platform/graphics/quartz/TextLayout.h
@@ -11,7 +11,7 @@ namespace cru::platform::graphics::quartz {
 class OsxCTTextLayout : public OsxQuartzResource, public virtual ITextLayout {
  public:
   OsxCTTextLayout(IGraphicsFactory* graphics_factory,
-                  std::shared_ptr<OsxCTFont> font, const String& str);
+                  std::shared_ptr<OsxCTFont> font, const std::string& str);
 
   CRU_DELETE_COPY(OsxCTTextLayout)
   CRU_DELETE_MOVE(OsxCTTextLayout)
@@ -19,8 +19,8 @@ class OsxCTTextLayout : public OsxQuartzResource, public virtual ITextLayout {
   ~OsxCTTextLayout() override;
 
  public:
-  String GetText() override { return text_; }
-  void SetText(String new_text) override;
+  std::string GetText() override { return text_; }
+  void SetText(std::string new_text) override;
 
   std::shared_ptr<IFont> GetFont() override { return font_; }
   void SetFont(std::shared_ptr<IFont> font) override;
@@ -46,10 +46,10 @@ class OsxCTTextLayout : public OsxQuartzResource, public virtual ITextLayout {
 
   Matrix GetTransform() { return transform_; }
 
-  String GetDebugString() override;
+  std::string GetDebugString() override;
 
  private:
-  void DoSetText(String text);
+  void DoSetText(std::string text);
 
   void ReleaseResource();
   void RecreateFrame();
@@ -68,8 +68,8 @@ class OsxCTTextLayout : public OsxQuartzResource, public virtual ITextLayout {
 
   std::shared_ptr<OsxCTFont> font_;
 
-  String text_;
-  String actual_text_;
+  std::string text_;
+  std::string actual_text_;
   CFMutableAttributedStringRef cf_attributed_text_;
 
   CTFramesetterRef ct_framesetter_ = nullptr;