Replace all uses of core::list with std::list (#12313)

[dragonfireclient.git] / src / gui / guiKeyChangeMenu.cpp

diff --git a/src/gui/guiKeyChangeMenu.cpp b/src/gui/guiKeyChangeMenu.cpp
index ada6280f689eece655f5e6cc38ddb665b18ab049..021f5f0a9cf5b5422f0357bf5b8ae336a774d40a 100644 (file)
--- a/src/gui/guiKeyChangeMenu.cpp
+++ b/src/gui/guiKeyChangeMenu.cpp
@@ -93,7 +93,8 @@ GUIKeyChangeMenu::GUIKeyChangeMenu(gui::IGUIEnvironment* env,
 
 GUIKeyChangeMenu::~GUIKeyChangeMenu()
 {
-       removeChildren();
+       removeAllChildren();
+       key_used_text = nullptr;
 
        for (key_setting *ks : key_settings) {
                delete[] ks->button_name;
@@ -102,23 +103,10 @@ GUIKeyChangeMenu::~GUIKeyChangeMenu()
        key_settings.clear();
 }
 
-void GUIKeyChangeMenu::removeChildren()
-{
-       const core::list<gui::IGUIElement*> &children = getChildren();
-       core::list<gui::IGUIElement*> children_copy;
-       for (gui::IGUIElement*i : children) {
-               children_copy.push_back(i);
-       }
-
-       for (gui::IGUIElement *i : children_copy) {
-               i->remove();
-       }
-       key_used_text = nullptr;
-}
-
 void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 {
-       removeChildren();
+       removeAllChildren();
+       key_used_text = nullptr;
 
        const float s = m_gui_scale;
        DesiredRect = core::rect<s32>(