15 files changed, 32 insertions, 15 deletions
diff --git a/include/cru/ui/ThemeResourceDictionary.h b/include/cru/ui/ThemeResourceDictionary.h
index 3995fe25..122111b0 100644
--- a/include/cru/ui/ThemeResourceDictionary.h
+++ b/include/cru/ui/ThemeResourceDictionary.h
@@ -24,7 +24,8 @@ class CRU_UI_API BadThemeResourceException : public Exception {
 };
 
 class CRU_UI_API ThemeResourceDictionary : public Object {
-  CRU_DEFINE_CLASS_LOG_TAG("ThemeResources");
+ private:
+  constexpr static auto kLogTag = "ThemeResources";
 
  public:
   static std::unique_ptr<ThemeResourceDictionary> FromFile(
diff --git a/include/cru/ui/controls/Control.h b/include/cru/ui/controls/Control.h
index c82956b5..8cd7a375 100644
--- a/include/cru/ui/controls/Control.h
+++ b/include/cru/ui/controls/Control.h
@@ -23,7 +23,8 @@ class CRU_UI_API Control : public Object,
                            public SelfResolvable<Control> {
   friend class ControlHost;
 
-  CRU_DEFINE_CLASS_LOG_TAG("cru::ui::controls::Control")
+ private:
+  constexpr static auto kLogTag = "cru::ui::controls::Control";
 
  protected:
   explicit Control(std::string name);
diff --git a/include/cru/ui/controls/ControlHost.h b/include/cru/ui/controls/ControlHost.h
index fffbbb34..5e8d678b 100644
--- a/include/cru/ui/controls/ControlHost.h
+++ b/include/cru/ui/controls/ControlHost.h
@@ -10,7 +10,8 @@
 
 namespace cru::ui::controls {
 class CRU_UI_API ControlHost : public Object {
-  CRU_DEFINE_CLASS_LOG_TAG("cru::ui::controls::ControlHost")
+ private:
+  constexpr static auto kLogTag = "cru::ui::controls::ControlHost";
   friend Control;
 
  public:
diff --git a/include/cru/ui/controls/TextHostControlService.h b/include/cru/ui/controls/TextHostControlService.h
index 1430a215..14910b57 100644
--- a/include/cru/ui/controls/TextHostControlService.h
+++ b/include/cru/ui/controls/TextHostControlService.h
@@ -70,7 +70,8 @@ class TextControlMovePattern {
 };
 
 class CRU_UI_API TextHostControlService : public Object {
-  CRU_DEFINE_CLASS_LOG_TAG("cru::ui::controls::TextControlService")
+ private:
+  constexpr static auto kLogTag = "cru::ui::controls::TextControlService";
 
  public:
   TextHostControlService(Control* control);
diff --git a/include/cru/ui/controls/Window.h b/include/cru/ui/controls/Window.h
index 2c650c41..131d68a8 100644
--- a/include/cru/ui/controls/Window.h
+++ b/include/cru/ui/controls/Window.h
@@ -15,7 +15,8 @@
 namespace cru::ui::controls {
 class CRU_UI_API Window
     : public LayoutControl<render::StackLayoutRenderObject> {
-  CRU_DEFINE_CLASS_LOG_TAG("cru::ui::controls::Window")
+ private:
+  constexpr static auto kLogTag = "cru::ui::controls::Window";
   friend Control;
 
  public:
diff --git a/include/cru/ui/helper/ClickDetector.h b/include/cru/ui/helper/ClickDetector.h
index 2eb453d9..08728e18 100644
--- a/include/cru/ui/helper/ClickDetector.h
+++ b/include/cru/ui/helper/ClickDetector.h
@@ -36,7 +36,8 @@ enum class ClickState {
 };
 
 class ClickDetector : public Object {
-  CRU_DEFINE_CLASS_LOG_TAG("ClickDetector")
+ private:
+  constexpr static auto kLogTag = "ClickDetector";
 
  public:
   explicit ClickDetector(controls::Control* control);
diff --git a/include/cru/ui/helper/ShortcutHub.h b/include/cru/ui/helper/ShortcutHub.h
index 1b600c48..4d46f654 100644
--- a/include/cru/ui/helper/ShortcutHub.h
+++ b/include/cru/ui/helper/ShortcutHub.h
@@ -94,7 +94,9 @@ struct ShortcutInfo {
 };
 
 class CRU_UI_API ShortcutHub : public Object {
-  CRU_DEFINE_CLASS_LOG_TAG("ShortcutHub")
+ private:
+  constexpr static auto kLogTag = "ShortcutHub";
+
  public:
   ShortcutHub() = default;
   ~ShortcutHub() override = default;
diff --git a/include/cru/ui/mapper/style/StyleRuleMapper.h b/include/cru/ui/mapper/style/StyleRuleMapper.h
index 5622d0f4..37790058 100644
--- a/include/cru/ui/mapper/style/StyleRuleMapper.h
+++ b/include/cru/ui/mapper/style/StyleRuleMapper.h
@@ -7,7 +7,9 @@
 
 namespace cru::ui::mapper::style {
 class CRU_UI_API StyleRuleMapper : public BasicClonePtrMapper<ui::style::StyleRule> {
-  CRU_DEFINE_CLASS_LOG_TAG("StyleRuleMapper")
+ private:
+  constexpr static auto kLogTag = "StyleRuleMapper";
+
  public:
   CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(StyleRuleMapper)
 
diff --git a/include/cru/ui/render/BorderRenderObject.h b/include/cru/ui/render/BorderRenderObject.h
index 8b8f3816..73fc85c1 100644
--- a/include/cru/ui/render/BorderRenderObject.h
+++ b/include/cru/ui/render/BorderRenderObject.h
@@ -6,7 +6,8 @@
 
 namespace cru::ui::render {
 class CRU_UI_API BorderRenderObject : public SingleChildRenderObject {
-  CRU_DEFINE_CLASS_LOG_TAG("cru::ui::render::BorderRenderObject")
+ private:
+  constexpr static auto kLogTag = "cru::ui::render::BorderRenderObject";
 
  public:
   static constexpr auto kRenderObjectName = "BorderRenderObject";
diff --git a/include/cru/ui/render/FlexLayoutRenderObject.h b/include/cru/ui/render/FlexLayoutRenderObject.h
index 9fdecd28..b0d80961 100644
--- a/include/cru/ui/render/FlexLayoutRenderObject.h
+++ b/include/cru/ui/render/FlexLayoutRenderObject.h
@@ -93,7 +93,8 @@ struct FlexChildLayoutData {
 //
 class CRU_UI_API FlexLayoutRenderObject
     : public LayoutRenderObject<FlexChildLayoutData> {
-  CRU_DEFINE_CLASS_LOG_TAG("cru::ui::render::FlexLayoutRenderObject")
+ private:
+  constexpr static auto kLogTag = "cru::ui::render::FlexLayoutRenderObject";
 
  public:
   static constexpr auto kRenderObjectName = "FlexLayoutRenderObject";
diff --git a/include/cru/ui/render/RenderObject.h b/include/cru/ui/render/RenderObject.h
index bb772401..e696aefe 100644
--- a/include/cru/ui/render/RenderObject.h
+++ b/include/cru/ui/render/RenderObject.h
@@ -44,7 +44,8 @@ struct BoxConstraint {
  *  void OnLayoutContent(const Rect& content_rect) override;
  */
 class CRU_UI_API RenderObject : public Object {
-  CRU_DEFINE_CLASS_LOG_TAG("cru::ui::render::RenderObject")
+ private:
+  constexpr static auto kLogTag = "cru::ui::render::RenderObject";
 
  public:
   RenderObject(std::string name);
diff --git a/include/cru/ui/render/SingleChildRenderObject.h b/include/cru/ui/render/SingleChildRenderObject.h
index 4c1891c5..7ecc4807 100644
--- a/include/cru/ui/render/SingleChildRenderObject.h
+++ b/include/cru/ui/render/SingleChildRenderObject.h
@@ -3,7 +3,8 @@
 
 namespace cru::ui::render {
 class CRU_UI_API SingleChildRenderObject : public RenderObject {
-  CRU_DEFINE_CLASS_LOG_TAG("cru::ui::render::SingleChildRenderObject")
+ private:
+  constexpr static auto kLogTag = "cru::ui::render::SingleChildRenderObject";
 
  public:
   SingleChildRenderObject(std::string name);
diff --git a/include/cru/ui/render/StackLayoutRenderObject.h b/include/cru/ui/render/StackLayoutRenderObject.h
index caddf5c5..a6ed47ba 100644
--- a/include/cru/ui/render/StackLayoutRenderObject.h
+++ b/include/cru/ui/render/StackLayoutRenderObject.h
@@ -28,7 +28,8 @@ struct StackChildLayoutData {
 // to min size.
 class CRU_UI_API StackLayoutRenderObject
     : public LayoutRenderObject<StackChildLayoutData> {
-  CRU_DEFINE_CLASS_LOG_TAG("cru::ui::render::StackLayoutRenderObject")
+ private:
+  constexpr static auto kLogTag = "cru::ui::render::StackLayoutRenderObject";
 
  public:
   static constexpr auto kRenderObjectName = "StackLayoutRenderObject";
diff --git a/include/cru/ui/render/TextRenderObject.h b/include/cru/ui/render/TextRenderObject.h
index e976f86d..0d17853b 100644
--- a/include/cru/ui/render/TextRenderObject.h
+++ b/include/cru/ui/render/TextRenderObject.h
@@ -19,7 +19,8 @@ namespace cru::ui::render {
 // If the result layout box is bigger than actual text box, then text is center
 // aligned.
 class CRU_UI_API TextRenderObject : public RenderObject {
-  CRU_DEFINE_CLASS_LOG_TAG("cru::ui::render::TextRenderObject")
+ private:
+  constexpr static auto kLogTag = "cru::ui::render::TextRenderObject";
 
  public:
   static constexpr auto kRenderObjectName = "TextRenderObject";
diff --git a/include/cru/ui/render/TreeRenderObject.h b/include/cru/ui/render/TreeRenderObject.h
index 090fe545..599e0f65 100644
--- a/include/cru/ui/render/TreeRenderObject.h
+++ b/include/cru/ui/render/TreeRenderObject.h
@@ -46,7 +46,8 @@ class CRU_UI_API TreeRenderObjectItem : public Object {
 };
 
 class CRU_UI_API TreeRenderObject : public RenderObject {
-  CRU_DEFINE_CLASS_LOG_TAG("cru::ui::render::TreeRenderObject")
+ private:
+  constexpr static auto kLogTag = "cru::ui::render::TreeRenderObject";
 
  public:
   static constexpr auto kRenderObjectName = "TreeRenderObject";