1 files changed, 7 insertions, 15 deletions
diff --git a/include/cru/ui/mapper/CursorMapper.h b/include/cru/ui/mapper/CursorMapper.h
index 4d55f849..2b7a899d 100644
--- a/include/cru/ui/mapper/CursorMapper.h
+++ b/include/cru/ui/mapper/CursorMapper.h
@@ -1,21 +1,13 @@
 #pragma once
 #include "Mapper.h"
-#include "cru/platform/gui/Cursor.h"
-#include "cru/base/xml/XmlNode.h"
 
-namespace cru::ui::mapper {
-class CRU_UI_API CursorMapper : public BasicSharedPtrMapper<platform::gui::ICursor> {
- public:
-  CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(CursorMapper);
-
- public:
-  bool SupportMapFromString() override { return true; }
-  bool SupportMapFromXml() override { return true; }
-  bool XmlElementIsOfThisType(xml::XmlElementNode* node) override;
+#include <cru/platform/gui/Cursor.h>
 
- protected:
-  std::shared_ptr<platform::gui::ICursor> DoMapFromString(std::string str) override;
-  std::shared_ptr<platform::gui::ICursor> DoMapFromXml(
-      xml::XmlElementNode* node) override;
+namespace cru::ui::mapper {
+class CRU_UI_API CursorMapper
+    : public BasicSharedPtrMapper<platform::gui::ICursor> {
+  CRU_UI_DECLARE_CAN_MAP_FROM_STRING(std::shared_ptr<platform::gui::ICursor>)
+  CRU_UI_DECLARE_CAN_MAP_FROM_XML_ELEMENT_TAG(
+      Cursor, std::shared_ptr<platform::gui::ICursor>)
 };
 }  // namespace cru::ui::mapper