From c178730b801abd83e5d7142a6dcdb7b69d7734b8 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 19 Dec 2016 16:37:16 +0100 Subject: [PATCH] Fixed: Virtual method with different parameters warning --HG-- branch : develop --- code/nel/include/nel/gui/group_html.h | 2 +- code/nel/src/gui/group_html.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/nel/include/nel/gui/group_html.h b/code/nel/include/nel/gui/group_html.h index a794f349b..479fc7384 100644 --- a/code/nel/include/nel/gui/group_html.h +++ b/code/nel/include/nel/gui/group_html.h @@ -321,7 +321,7 @@ namespace NLGUI // \name internal methods // 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 CInterfaceGroup *getCurrentGroup(); diff --git a/code/nel/src/gui/group_html.cpp b/code/nel/src/gui/group_html.cpp index b7484ce45..9bf7b23e0 100644 --- a/code/nel/src/gui/group_html.cpp +++ b/code/nel/src/gui/group_html.cpp @@ -1965,7 +1965,7 @@ namespace NLGUI // Table must fit the container size - addGroup (table, 0); + addHtmlGroup (table, 0); _Tables.push_back(table); @@ -3759,7 +3759,7 @@ namespace NLGUI newParagraph->setIndent(_Indent); // Add to the group - addGroup (newParagraph, beginSpace); + addHtmlGroup (newParagraph, beginSpace); _Paragraph = newParagraph; paragraphChange (); @@ -4545,7 +4545,7 @@ namespace NLGUI // *************************************************************************** - void CGroupHTML::addGroup (CInterfaceGroup *group, uint beginSpace) + void CGroupHTML::addHtmlGroup (CInterfaceGroup *group, uint beginSpace) { if (!group) return;