diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/XML.cpp | 23 | ||||
| -rw-r--r-- | src/core/managed/ManagedContainer.hpp | 14 |
2 files changed, 19 insertions, 18 deletions
diff --git a/src/core/XML.cpp b/src/core/XML.cpp index 475e345..9b621a6 100644 --- a/src/core/XML.cpp +++ b/src/core/XML.cpp @@ -116,18 +116,17 @@ void Text::doSerialize(std::ostream &out, unsigned int tabdepth, bool pretty) } } -static Variant getXmlElementName(const xml::Element *obj) +namespace RttiTypes { - return Variant::fromString(obj->name); -} - -namespace RttiTypes { -const Rtti<xml::Node> XMLNode = RttiBuilder("XMLNode"); -const Rtti<xml::Element> XMLElement = - TypedRttiBuilder<xml::Element>("XMLElement") - .parent(&XMLNode) - .composedOf(&XMLNode) - .property("name", {RttiTypes::String, getXmlElementName}); -const Rtti<xml::Text> XMLText = RttiBuilder("XMLText").parent(&XMLNode); + const Rtti<xml::Node> XMLNode = RttiBuilder("XMLNode"); + const Rtti<xml::Element> XMLElement = + TypedRttiBuilder<xml::Element>("XMLElement") + .parent(&XMLNode) + .composedOf(&XMLNode) + .property("name", {RttiTypes::String, + {[](const xml::Element *obj) { + return Variant::fromString(obj->name); + }}}); + const Rtti<xml::Text> XMLText = RttiBuilder("XMLText").parent(&XMLNode); } } diff --git a/src/core/managed/ManagedContainer.hpp b/src/core/managed/ManagedContainer.hpp index 13038f9..067a789 100644 --- a/src/core/managed/ManagedContainer.hpp +++ b/src/core/managed/ManagedContainer.hpp @@ -100,7 +100,9 @@ public: using reference = typename Collection::reference; using const_reference = typename Collection::const_reference; using iterator = typename Collection::iterator; + using reverse_iterator = typename Collection::reverse_iterator; using const_iterator = typename Collection::const_iterator; + using const_reverse_iterator = typename Collection::const_reverse_iterator; using size_type = typename Collection::size_type; private: @@ -456,8 +458,8 @@ public: iterator begin() { return c.begin(); } iterator end() { return c.end(); } - iterator rbegin() { return c.rbegin(); } - iterator rend() { return c.rend(); } + reverse_iterator rbegin() { return c.rbegin(); } + reverse_iterator rend() { return c.rend(); } const_iterator begin() const { return c.cbegin(); } const_iterator end() const { return c.cend(); } @@ -465,11 +467,11 @@ public: const_iterator cbegin() const { return c.cbegin(); } const_iterator cend() const { return c.cend(); } - const_iterator rbegin() const { return c.crbegin(); } - const_iterator rend() const { return c.crend(); } + const_reverse_iterator rbegin() const { return c.crbegin(); } + const_reverse_iterator rend() const { return c.crend(); } - const_iterator crbegin() const { return c.crbegin(); } - const_iterator crend() const { return c.crend(); } + const_reverse_iterator crbegin() const { return c.crbegin(); } + const_reverse_iterator crend() const { return c.crend(); } /** * Removes all elements from the container. |