From a1f950e2b3b2268b267e647205b14b59c15f8ee1 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Thu, 8 Oct 2020 14:11:44 +0800
Subject: ...

---
 .gitignore                             | 2 ++
 include/cru/common/Base.hpp            | 3 +++
 include/cru/platform/Matrix.hpp        | 4 ++--
 src/ui/UiHost.cpp                      | 2 +-
 src/ui/controls/TextControlService.hpp | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 122fa5e4..3365deda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -591,3 +591,5 @@ flycheck_*.el
 
 compile_flags.txt
 .clangd
+.kdev4
+CruUI.kdev4
diff --git a/include/cru/common/Base.hpp b/include/cru/common/Base.hpp
index 93d6f9a6..a5a9421d 100644
--- a/include/cru/common/Base.hpp
+++ b/include/cru/common/Base.hpp
@@ -7,6 +7,9 @@
 
 #define CRU_UNUSED(entity) static_cast<void>(entity);
 
+#define CRU__CONCAT(a, b) a##b
+#define CRU_MAKE_UNICODE_LITERAL(str) CRU__CONCAT(u, #str)
+
 #define CRU_DEFAULT_COPY(classname)      \
   classname(const classname&) = default; \
   classname& operator=(const classname&) = default;
diff --git a/include/cru/platform/Matrix.hpp b/include/cru/platform/Matrix.hpp
index cea5198b..e702df90 100644
--- a/include/cru/platform/Matrix.hpp
+++ b/include/cru/platform/Matrix.hpp
@@ -56,8 +56,8 @@ struct Matrix {
 
   static Matrix Rotation(float angle) {
     float r = AngleToRadian(angle);
-    float s = std::sinf(r);
-    float c = std::cosf(r);
+    float s = std::sin(r);
+    float c = std::cos(r);
 
     return Matrix{c, s, -s, c, 0.0f, 0.0f};
   }
diff --git a/src/ui/UiHost.cpp b/src/ui/UiHost.cpp
index 5451ebce..d8dcb6da 100644
--- a/src/ui/UiHost.cpp
+++ b/src/ui/UiHost.cpp
@@ -16,7 +16,7 @@ using platform::native::IUiApplication;
 namespace event_names {
 #ifdef CRU_DEBUG
 // clang-format off
-#define CRU_DEFINE_EVENT_NAME(name) constexpr const char16_t* name = u#name;
+#define CRU_DEFINE_EVENT_NAME(name) constexpr const char16_t* name = CRU_MAKE_UNICODE_LITERAL(name);
 // clang-format on
 #else
 #define CRU_DEFINE_EVENT_NAME(name) constexpr const char16_t* name = u"";
diff --git a/src/ui/controls/TextControlService.hpp b/src/ui/controls/TextControlService.hpp
index 5e423d7d..5d8d4645 100644
--- a/src/ui/controls/TextControlService.hpp
+++ b/src/ui/controls/TextControlService.hpp
@@ -199,7 +199,7 @@ class TextControlService : public Object {
   }
 
   template <typename TArgs>
-  void SetupOneHandler(event::RoutedEvent<TArgs>* (TControl::*event)(),
+  void SetupOneHandler(event::RoutedEvent<TArgs>* (Control::*event)(),
                        void (TextControlService::*handler)(
                            typename event::RoutedEvent<TArgs>::EventArgs)) {
     this->event_revoker_guards_.push_back(
-- 
cgit v1.2.3