diff --git a/src/graphics/ui/gui_xml.cpp b/src/graphics/ui/gui_xml.cpp index d52431535..ee0b74897 100644 --- a/src/graphics/ui/gui_xml.cpp +++ b/src/graphics/ui/gui_xml.cpp @@ -82,8 +82,8 @@ static onaction create_action( return [callback](GUI*) {callback();}; } -/* Read basic UINode properties */ -static void _readUINode( +/// @brief Read basic UINode properties +static void read_uinode( const UiXmlReader& reader, const xml::xmlelement& element, UINode& node ) { if (element.has("id")) { @@ -177,8 +177,8 @@ static void _readUINode( } } -static void _readContainer(UiXmlReader& reader, const xml::xmlelement& element, Container& container) { - _readUINode(reader, element, container); +static void read_container_impl(UiXmlReader& reader, const xml::xmlelement& element, Container& container) { + read_uinode(reader, element, container); if (element.has("scrollable")) { container.setScrollable(element.attr("scrollable").asBool()); @@ -197,17 +197,22 @@ static void _readContainer(UiXmlReader& reader, const xml::xmlelement& element, } void UiXmlReader::readUINode(UiXmlReader& reader, const xml::xmlelement& element, Container& container) { - _readContainer(reader, element, container); + read_container_impl(reader, element, container); } void UiXmlReader::readUINode( const UiXmlReader& reader, const xml::xmlelement& element, UINode& node ) { - _readUINode(reader, element, node); + read_uinode(reader, element, node); } -static void _readPanel(UiXmlReader& reader, const xml::xmlelement& element, Panel& panel, bool subnodes=true) { - _readUINode(reader, element, panel); +static void read_panel_impl( + UiXmlReader& reader, + const xml::xmlelement& element, + Panel& panel, + bool subnodes = true +) { + read_uinode(reader, element, panel); if (element.has("padding")) { glm::vec4 padding = element.attr("padding").asVec4(); @@ -245,7 +250,9 @@ static void _readPanel(UiXmlReader& reader, const xml::xmlelement& element, Pane } } -static std::wstring readAndProcessInnerText(const xml::xmlelement& element, const std::string& context) { +static std::wstring parse_inner_text( + const xml::xmlelement& element, const std::string& context +) { std::wstring text = L""; if (element.size() == 1) { std::string source = element.sub(0).attr("#").getText(); @@ -265,9 +272,9 @@ static std::wstring readAndProcessInnerText(const xml::xmlelement& element, cons static std::shared_ptr readLabel( const UiXmlReader& reader, const xml::xmlelement& element ) { - std::wstring text = readAndProcessInnerText(element, reader.getContext()); + std::wstring text = parse_inner_text(element, reader.getContext()); auto label = std::make_shared