diff options
Diffstat (limited to 'src/ui/document')
-rw-r--r-- | src/ui/document/DocumentElementType.cpp | 8 | ||||
-rw-r--r-- | src/ui/document/TextDocumentElement.cpp | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/ui/document/DocumentElementType.cpp b/src/ui/document/DocumentElementType.cpp index d548b494..ed076169 100644 --- a/src/ui/document/DocumentElementType.cpp +++ b/src/ui/document/DocumentElementType.cpp @@ -5,17 +5,17 @@ namespace cru::ui::document { DocumentElementType::DocumentElementType( - String name, std::vector<DocumentElementType*> parents) + std::string name, std::vector<DocumentElementType*> parents) : name_(std::move(name)), parents_(std::move(parents)) {} DocumentElementType::~DocumentElementType() {} DocumentElementType* const DocumentElementTypes::kBaseElementType = - new DocumentElementType(u"Base", {}); + new DocumentElementType("Base", {}); DocumentElementType* const DocumentElementTypes::kRootElementType = - new DocumentElementType(u"Root", {kBaseElementType}); + new DocumentElementType("Root", {kBaseElementType}); DocumentElementType* const DocumentElementTypes::kTextElementType = - new DocumentElementType(u"Text", {kBaseElementType}); + new DocumentElementType("Text", {kBaseElementType}); } // namespace cru::ui::document diff --git a/src/ui/document/TextDocumentElement.cpp b/src/ui/document/TextDocumentElement.cpp index 1ba39849..52cfac5a 100644 --- a/src/ui/document/TextDocumentElement.cpp +++ b/src/ui/document/TextDocumentElement.cpp @@ -1,10 +1,9 @@ #include "cru/ui/document/TextDocumentElement.h" -#include "cru/base/String.h" #include "cru/ui/document/DocumentElement.h" #include "cru/ui/document/DocumentElementType.h" namespace cru::ui::document { -TextDocumentElement::TextDocumentElement(String text, TextStyle style, +TextDocumentElement::TextDocumentElement(std::string text, TextStyle style, IDocumentLink* link) : DocumentElement(DocumentElementTypes::kTextElementType), text_(std::move(text)), @@ -13,5 +12,5 @@ TextDocumentElement::TextDocumentElement(String text, TextStyle style, TextDocumentElement::~TextDocumentElement() {} -void TextDocumentElement::SetText(String text) { text_ = std::move(text); } +void TextDocumentElement::SetText(std::string text) { text_ = std::move(text); } } // namespace cru::ui::document |