Remove String stage 1.

5 files changed, 22 insertions, 20 deletions

diff --git a/demos/InputMethod/main.cpp b/demos/InputMethod/main.cpp
index 4ea5ab72..3598626d 100644
--- a/demos/InputMethod/main.cpp
+++ b/demos/InputMethod/main.cpp
@@ -11,6 +11,8 @@
 #include "cru/platform/gui/UiApplication.h"
 #include "cru/platform/gui/Window.h"
 
+#include <string>
+
 using namespace cru;
 using namespace cru::platform;
 using namespace cru::platform::graphics;
@@ -33,7 +35,7 @@ class DemoWindow {
   std::unique_ptr<INativeWindow> window_;
   std::unique_ptr<ITextLayout> prompt_text_layout_;
   std::unique_ptr<ITextLayout> committed_text_layout_;
-  String committed_text_;
+  std::string committed_text_;
   CompositionText composition_text_;
 };
 
@@ -47,11 +49,11 @@ DemoWindow::DemoWindow(IUiApplication* application, DemoBrushes* brushes,
 
   prompt_text_layout_ =
       graphics_factory->CreateTextLayout(font,
-                                         u"Ctrl+1: Enable IME\n"
-                                         u"Ctrl+2: Disable IME\n"
-                                         u"Ctrl+3: Complete composition.\n"
-                                         u"Ctrl+4: Cancel composition.");
-  committed_text_layout_ = graphics_factory->CreateTextLayout(font, u"");
+                                         "Ctrl+1: Enable IME\n"
+                                         "Ctrl+2: Disable IME\n"
+                                         "Ctrl+3: Complete composition.\n"
+                                         "Ctrl+4: Cancel composition.");
+  committed_text_layout_ = graphics_factory->CreateTextLayout(font, "");
 
   auto update_text_layout_width = [this](const Size& size) {
     prompt_text_layout_->SetMaxWidth(size.width);
@@ -102,7 +104,7 @@ DemoWindow::DemoWindow(IUiApplication* application, DemoBrushes* brushes,
 
   window_->KeyDownEvent()->AddHandler([this](const NativeKeyEventArgs& args) {
     auto input_method_context = window_->GetInputMethodContext();
-    if (args.modifier & KeyModifiers::ctrl) {
+    if (args.modifier & KeyModifiers::Ctrl) {
       switch (args.key) {
         case KeyCode::N1:
           input_method_context->EnableIME();
@@ -136,7 +138,7 @@ DemoWindow::DemoWindow(IUiApplication* application, DemoBrushes* brushes,
   };
 
   input_method_context->TextEvent()->AddHandler(
-      [this, update_state](const StringView& c) {
+      [this, update_state](const std::string& c) {
         committed_text_ += c;
         update_state();
       });
@@ -168,7 +170,7 @@ int main() {
                       graphics_factory->CreateSolidColorBrush(colors::green),
                       graphics_factory->CreateSolidColorBrush(colors::blue)};
 
-  std::shared_ptr<IFont> font = graphics_factory->CreateFont(String{}, 30);
+  std::shared_ptr<IFont> font = graphics_factory->CreateFont({}, 30);
 
   DemoWindow window1(application, &brushes, font);
   DemoWindow window2(application, &brushes, font);
diff --git a/demos/ScrollView/main.cpp b/demos/ScrollView/main.cpp
index c7b4d0d6..f8e2adda 100644
--- a/demos/ScrollView/main.cpp
+++ b/demos/ScrollView/main.cpp
@@ -19,7 +19,7 @@ int main() {
   window.AddChild(&scroll_view);
 
   auto text_block = TextBlock::Create(
-      uR"([Verse 1]
+      R"([Verse 1]
 The snow glows white on the mountain tonight
 Not a footprint to be seen
 A kingdom of isolation
diff --git a/demos/main/main.cpp b/demos/main/main.cpp
index d574670d..91c9e85f 100644
--- a/demos/main/main.cpp
+++ b/demos/main/main.cpp
@@ -29,9 +29,9 @@ int main() {
                   ->GetItemAt(0)
                   ->GetSubmenu()
                   ->CreateItemAt(0);
-    mi->SetTitle(u"Quit");
+    mi->SetTitle("Quit");
     mi->SetKeyboardShortcut(cru::platform::gui::KeyCode::Q,
-                            cru::platform::gui::KeyModifiers::command);
+                            cru::platform::gui::KeyModifiers::Command);
     mi->SetEnabled(true);
     mi->SetOnClickHandler([&]() { application->RequestQuit(0); });
   }
@@ -45,10 +45,10 @@ int main() {
 
   window.AddChild(&flex_layout);
 
-  auto text_block = TextBlock::Create(u"Hello World from CruUI!", true);
+  auto text_block = TextBlock::Create("Hello World from CruUI!", true);
   flex_layout.AddChild(text_block.get());
 
-  auto button_text_block = TextBlock::Create(u"OK");
+  auto button_text_block = TextBlock::Create("OK");
   Button button;
   button.SetChild(button_text_block.get());
   flex_layout.AddChild(&button);
@@ -58,12 +58,12 @@ int main() {
   flex_layout.AddChild(&text_box);
 
   PopupMenuTextButton popup_menu_text_button;
-  popup_menu_text_button.SetButtonText(u"Popup Menu Button");
-  popup_menu_text_button.SetMenuItems({u"Item 1", u"Item 2", u"Item 3"});
+  popup_menu_text_button.SetButtonText("Popup Menu Button");
+  popup_menu_text_button.SetMenuItems({"Item 1", "Item 2", "Item 3"});
   flex_layout.AddChild(popup_menu_text_button.GetRootControl());
 
   Select select;
-  select.SetItems({u"Item 1", u"Item 2", u"Item 3"});
+  select.SetItems({"Item 1", "Item 2", "Item 3"});
   flex_layout.AddChild(select.GetRootControl());
 
   window.GetWindowHost()->GetNativeWindow()->SetVisibility(
diff --git a/demos/platform/graphics/DrawText.cpp b/demos/platform/graphics/DrawText.cpp
index dfea18cd..275e141a 100644
--- a/demos/platform/graphics/DrawText.cpp
+++ b/demos/platform/graphics/DrawText.cpp
@@ -14,8 +14,8 @@ int main() {
       demo.GetFactory()->CreateSolidColorBrush(cru::platform::colors::skyblue);
 
   std::shared_ptr<cru::platform::graphics::IFont> font(
-      demo.GetFactory()->CreateFont(u"", 24));
-  auto text_layout = demo.GetFactory()->CreateTextLayout(font, u"Hello world!");
+      demo.GetFactory()->CreateFont("", 24));
+  auto text_layout = demo.GetFactory()->CreateTextLayout(font, "Hello world!");
   demo.GetPainter()->DrawText({0, 0}, text_layout.get(), brush.get());
 
   auto bounds = text_layout->GetTextBounds();
diff --git a/demos/platform/graphics/SvgPath.cpp b/demos/platform/graphics/SvgPath.cpp
index d0827878..d944cc5f 100644
--- a/demos/platform/graphics/SvgPath.cpp
+++ b/demos/platform/graphics/SvgPath.cpp
@@ -15,7 +15,7 @@ int main() {
 
   auto geometry_builder = demo.GetFactory()->CreateGeometryBuilder();
   geometry_builder->ParseAndApplySvgPathData(
-      uR"(
+      R"(
 M8.5 5.5a.5.5 0 0 0-1 0v3.362l-1.429 2.38a.5.5 0 1 0 .858.515l1.5-2.5A.5.5 0 0 0 8.5 9V5.5z
 M6.5 0a.5.5 0 0 0 0 1H7v1.07a7.001 7.001 0 0 0-3.273 12.474l-.602.602a.5.5 0 0 0 .707.708l.746-.746A6.97 6.97 0 0 0 8 16a6.97 6.97 0 0 0 3.422-.892l.746.746a.5.5 0 0 0 .707-.708l-.601-.602A7.001 7.001 0 0 0 9 2.07V1h.5a.5.5 0 0 0 0-1h-3zm1.038 3.018a6.093 6.093 0 0 1 .924 0 6 6 0 1 1-.924 0zM0 3.5c0 .753.333 1.429.86 1.887A8.035 8.035 0 0 1 4.387 1.86 2.5 2.5 0 0 0 0 3.5zM13.5 1c-.753 0-1.429.333-1.887.86a8.035 8.035 0 0 1 3.527 3.527A2.5 2.5 0 0 0 13.5 1z
   )");