...

5 files changed, 8 insertions, 7 deletions

diff --git a/include/cru/platform/GraphBase.hpp b/include/cru/platform/GraphicsBase.hpp
index e7201ec0..e7201ec0 100644
--- a/include/cru/platform/GraphBase.hpp
+++ b/include/cru/platform/GraphicsBase.hpp
diff --git a/include/cru/platform/Matrix.hpp b/include/cru/platform/Matrix.hpp
index 8ec5faaa..7985af0e 100644
--- a/include/cru/platform/Matrix.hpp
+++ b/include/cru/platform/Matrix.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "GraphBase.hpp"
+#include "GraphicsBase.hpp"
 
 #include <cmath>
 
diff --git a/include/cru/platform/graphics/Base.hpp b/include/cru/platform/graphics/Base.hpp
index 25881772..60af40ab 100644
--- a/include/cru/platform/graphics/Base.hpp
+++ b/include/cru/platform/graphics/Base.hpp
@@ -1,5 +1,6 @@
 #pragma once
-#include "../GraphBase.hpp"
+#include "../Color.hpp"
+#include "../GraphicsBase.hpp"
 #include "../Matrix.hpp"
 #include "../Resource.hpp"
 
diff --git a/include/cru/platform/gui/InputMethod.hpp b/include/cru/platform/gui/InputMethod.hpp
index c259e63c..923a2088 100644
--- a/include/cru/platform/gui/InputMethod.hpp
+++ b/include/cru/platform/gui/InputMethod.hpp
@@ -16,7 +16,7 @@ struct CompositionClause {
 using CompositionClauses = std::vector<CompositionClause>;
 
 struct CompositionText {
-  std::u16string text;
+  String text;
   CompositionClauses clauses;
   TextRange selection;
 };
@@ -49,7 +49,7 @@ struct IInputMethodContext : virtual IPlatformResource {
   // Triggered every time composition text changes.
   virtual IEvent<std::nullptr_t>* CompositionEvent() = 0;
 
-  virtual IEvent<std::u16string_view>* TextEvent() = 0;
+  virtual IEvent<StringView>* TextEvent() = 0;
 };
 }  // namespace cru::platform::gui
 
diff --git a/include/cru/platform/gui/Keyboard.hpp b/include/cru/platform/gui/Keyboard.hpp
index b93b44fa..b025d86e 100644
--- a/include/cru/platform/gui/Keyboard.hpp
+++ b/include/cru/platform/gui/Keyboard.hpp
@@ -123,7 +123,7 @@ struct KeyModifiers {
   static constexpr KeyModifier alt{0b100};
 };
 
-CRU_PLATFORM_GUI_API std::u16string_view ToString(KeyCode key_code);
-CRU_PLATFORM_GUI_API std::u16string ToString(
-    KeyModifier key_modifier, std::u16string_view separator = u"+");
+CRU_PLATFORM_GUI_API String ToString(KeyCode key_code);
+CRU_PLATFORM_GUI_API String ToString(KeyModifier key_modifier,
+                                     StringView separator = u"+");
 }  // namespace cru::platform::gui