Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Virtual method with different parameters warning

Browse source
This commit is contained in:
kervala 2016-12-19 16:37:16 +01:00
parent 4e9788116f
commit c3bce8874e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/gui/group_html.h
View file

@ -321,7 +321,7 @@ namespace NLGUI
// \name internal methods // \name internal methods
// Add a group in the current parent group // Add a group in the current parent group
void addGroup (CInterfaceGroup *group, uint beginSpace); void addHtmlGroup (CInterfaceGroup *group, uint beginSpace);
// Get the current parent group // Get the current parent group
CInterfaceGroup *getCurrentGroup(); CInterfaceGroup *getCurrentGroup();

6
code/nel/src/gui/group_html.cpp
View file

@ -1965,7 +1965,7 @@ namespace NLGUI
// Table must fit the container size // Table must fit the container size
addGroup (table, 0); addHtmlGroup (table, 0);
_Tables.push_back(table); _Tables.push_back(table);
@ -3759,7 +3759,7 @@ namespace NLGUI
newParagraph->setIndent(_Indent); newParagraph->setIndent(_Indent);
// Add to the group // Add to the group
addGroup (newParagraph, beginSpace); addHtmlGroup (newParagraph, beginSpace);
_Paragraph = newParagraph; _Paragraph = newParagraph;
paragraphChange (); paragraphChange ();
@ -4545,7 +4545,7 @@ namespace NLGUI
// *************************************************************************** // ***************************************************************************
void CGroupHTML::addGroup (CInterfaceGroup *group, uint beginSpace) void CGroupHTML::addHtmlGroup (CInterfaceGroup *group, uint beginSpace)
{ {
if (!group) if (!group)
return; return;