diff --git a/src/graphics/ui/elements/Menu.hpp b/src/graphics/ui/elements/Menu.hpp index cbfd84d0..5a201c01 100644 --- a/src/graphics/ui/elements/Menu.hpp +++ b/src/graphics/ui/elements/Menu.hpp @@ -7,7 +7,7 @@ namespace gui { struct Page { std::string name; - std::shared_ptr panel = nullptr; + std::shared_ptr panel; }; using page_loader_func = std::function(const std::string& name)>; diff --git a/src/graphics/ui/gui_xml.cpp b/src/graphics/ui/gui_xml.cpp index 93fc6b29..c24d89dd 100644 --- a/src/graphics/ui/gui_xml.cpp +++ b/src/graphics/ui/gui_xml.cpp @@ -189,7 +189,9 @@ void UiXmlReader::readUINode(UiXmlReader& reader, const xml::xmlelement& element _readContainer(reader, element, container); } -void UiXmlReader::readUINode(UiXmlReader& reader, const xml::xmlelement& element, UINode& node) { +void UiXmlReader::readUINode( + const UiXmlReader& reader, const xml::xmlelement& element, UINode& node +) { _readUINode(reader, element, node); } @@ -246,7 +248,9 @@ static std::wstring readAndProcessInnerText(const xml::xmlelement& element, cons return text; } -static std::shared_ptr readLabel(UiXmlReader& reader, const xml::xmlelement& element) { +static std::shared_ptr readLabel( + const UiXmlReader& reader, const xml::xmlelement& element +) { std::wstring text = readAndProcessInnerText(element, reader.getContext()); auto label = std::make_shared