diff --git a/src/editor/palette/common_palette.hpp b/src/editor/palette/common_palette.hpp index 6eb6c41dbbf3..6e7d6ba747a4 100644 --- a/src/editor/palette/common_palette.hpp +++ b/src/editor/palette/common_palette.hpp @@ -76,7 +76,6 @@ class common_palette : public gui::widget { /** Menu expanding for palette group list */ virtual void expand_palette_groups_menu(std::vector& items, int i) = 0; - virtual void expand_palette_groups_menu(std::vector< std::pair< std::string, std::string> >& items, int i) = 0; //item virtual int num_items() = 0; diff --git a/src/editor/palette/editor_palettes.cpp b/src/editor/palette/editor_palettes.cpp index 76b296289372..518cc6a14f23 100644 --- a/src/editor/palette/editor_palettes.cpp +++ b/src/editor/palette/editor_palettes.cpp @@ -98,24 +98,6 @@ template bool editor_palette::scroll_up(); template bool editor_palette::scroll_up(); template bool editor_palette::scroll_up(); -template -void editor_palette::expand_palette_groups_menu(std::vector< std::pair< std::string, std::string> >& items, int i) -{ - const std::vector& item_groups = get_groups(); - - for (size_t mci = 0; mci < item_groups.size(); ++mci) { - std::string groupname = item_groups[mci].name; - if (groupname.empty()) { - groupname = _("(Unknown Group)"); - } - const std::string& img = item_groups[mci].icon; - items.push_back(std::pair( img, groupname)); - } -} -template void editor_palette::expand_palette_groups_menu(std::vector< std::pair< std::string, std::string> >& items, int /*i*/); -template void editor_palette::expand_palette_groups_menu(std::vector< std::pair< std::string, std::string> >& items, int /*i*/); -template void editor_palette::expand_palette_groups_menu(std::vector< std::pair< std::string, std::string> >& items, int /*i*/); - template bool editor_palette::can_scroll_up() { diff --git a/src/editor/palette/editor_palettes.hpp b/src/editor/palette/editor_palettes.hpp index bcb910202c8e..af05df62ae25 100644 --- a/src/editor/palette/editor_palettes.hpp +++ b/src/editor/palette/editor_palettes.hpp @@ -63,7 +63,6 @@ class editor_palette : public tristate_palette { size_t start_num(void) override { return items_start_; } /** Menu expanding for palette group list */ - void expand_palette_groups_menu(std::vector< std::pair >& items, int i) override; void expand_palette_groups_menu(std::vector& items, int i) override; void set_group(size_t index) override; diff --git a/src/editor/palette/empty_palette.hpp b/src/editor/palette/empty_palette.hpp index 8a06df4d1d18..f06c7b00b9e4 100644 --- a/src/editor/palette/empty_palette.hpp +++ b/src/editor/palette/empty_palette.hpp @@ -72,7 +72,6 @@ class empty_palette : public common_palette { virtual const std::vector& get_groups() const override { return empty_; } /** Menu expanding for palette group list */ - virtual void expand_palette_groups_menu(std::vector< std::pair< std::string, std::string> >& /*items*/,int) override {} virtual void expand_palette_groups_menu(std::vector< config> & /*items*/,int) override {} //item diff --git a/src/editor/palette/location_palette.hpp b/src/editor/palette/location_palette.hpp index 46ed77b31d3a..8e4766c850d6 100644 --- a/src/editor/palette/location_palette.hpp +++ b/src/editor/palette/location_palette.hpp @@ -42,7 +42,6 @@ class location_palette : public common_palette { size_t start_num(void) override { return items_start_; } /** Menu expanding for palette group list */ - void expand_palette_groups_menu(std::vector>&,int) override {} void expand_palette_groups_menu(std::vector&,int) override {} virtual void set_group(size_t /*index*/) override {}