ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Documentation improvements (some comment was misplaced and was attributed to the namespace and not the function inside the namespace where it belonged)

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5265 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2010-04-25 17:36:08 +00:00
parent e6b0b5238d
commit 00683fb0a5
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/guiengine/screen.hpp
View File

@ -71,6 +71,9 @@ namespace GUIEngine
/**
* \ingroup guiengine
* \brief Loads a GUI screen from its XML file.
* Builds a hierarchy of Widget objects whose contents are a direct transcription of the XML file,
* with little analysis or layout performed on them.
*/
void parseScreenFileDiv(irr::io::IrrXMLReader* xml, ptr_vector<Widget>& append_to);

21
src/guiengine/screen_loader.cpp
View File

@ -34,15 +34,7 @@ using namespace io;
using namespace gui;
using namespace GUIEngine;
/**
* Loads a GUI screen from its XML file. Builds a hierarchy of Widget objects whose
* contents are a direct transcription of the XML file, with little analysis or layout
* performed on them.
*/
namespace GUIEngine
{
void parseScreenFileDiv(irr::io::IrrXMLReader* xml, ptr_vector<Widget>& append_to)
void GUIEngine::parseScreenFileDiv(irr::io::IrrXMLReader* xml, ptr_vector<Widget>& append_to)
{
// parse XML file
while(xml && xml->read())
@ -171,13 +163,13 @@ if(prop_name != NULL) widget.m_properties[prop_flag] = prop_name; else widget.m_
READ_PROPERTY(y, PROP_Y);
READ_PROPERTY(layout, PROP_LAYOUT);
READ_PROPERTY(align, PROP_ALIGN);
READ_PROPERTY(icon, PROP_ICON);
READ_PROPERTY(text_align, PROP_TEXT_ALIGN);
READ_PROPERTY(min_value, PROP_MIN_VALUE);
READ_PROPERTY(max_value, PROP_MAX_VALUE);
READ_PROPERTY(square_items, PROP_SQUARE);
READ_PROPERTY(max_width, PROP_MAX_WIDTH);
READ_PROPERTY(max_height, PROP_MAX_HEIGHT);
READ_PROPERTY(extend_label, PROP_EXTEND_LABEL);
@ -185,13 +177,13 @@ if(prop_name != NULL) widget.m_properties[prop_flag] = prop_name; else widget.m_
READ_PROPERTY(max_rows, PROP_MAX_ROWS);
READ_PROPERTY(warp_around, PROP_WARP_AROUND);
#undef READ_PROPERTY
const char* text = xml->getAttributeValue( "text" );
if (text != NULL)
{
widget.m_text = _(text);
}
/* a new div starts here, continue parsing with this new div as new parent */
if (widget.getType() == WTYPE_DIV || widget.getType() == WTYPE_RIBBON)
{
@ -222,5 +214,4 @@ if(prop_name != NULL) widget.m_properties[prop_flag] = prop_name; else widget.m_
}//end switch
} // end while
} // end function
} // end namespace