Fix shadowing

Author: mrkubax10

src/gui/menu_string_array.cpp

@@ -20,7 +20,7 @@
 #include "util/gettext.hpp"
 
 StringArrayMenu::StringArrayMenu(std::vector<std::string>* items) :
-  m_items(items),
+  m_array_items(items),
   m_text()
 {
   reload();
@@ -32,12 +32,12 @@ StringArrayMenu::menu_action(MenuItem& item)
   int id = item.get_id();
   if (id >= 0)
   {
-    m_items->erase(m_items->begin() + id);
+    m_array_items->erase(m_array_items->begin() + id);
     reload();
   }
   else if (id == -2 && m_text.length() > 0)
   {
-    m_items->push_back(m_text);
+    m_array_items->push_back(m_text);
     m_text = "";
     reload();
   }
@@ -49,9 +49,9 @@ StringArrayMenu::reload()
   clear();
   add_label(_("Edit string array"));
   add_hl();
-  for (unsigned int i = 0; i < m_items->size(); i++)
+  for (unsigned int i = 0; i < m_array_items->size(); i++)
   {
-    add_entry(i, m_items->at(i));
+    add_entry(i, m_array_items->at(i));
   }
   add_hl();
   add_textfield(_("Text"), &m_text);

src/gui/menu_string_array.hpp

@@ -28,7 +28,7 @@ class StringArrayMenu final : public Menu
 
   virtual void menu_action(MenuItem& item) override;
 private:
-  std::vector<std::string>* m_items;
+  std::vector<std::string>* m_array_items;
   std::string m_text;
 
   void reload();