diff --git a/src/gui/dialogs/addon/list.cpp b/src/gui/dialogs/addon/list.cpp index 47aa5c224b8..506dcca5d27 100644 --- a/src/gui/dialogs/addon/list.cpp +++ b/src/gui/dialogs/addon/list.cpp @@ -314,8 +314,8 @@ static std::string describe_status_verbose(const addon_tracking_info& state) return colorify_addon_state_string(s, state); } -template -void taddon_list::init_sorting_option(generator_sort_array& order_funcs, Fnc filter_on) +template +void taddon_list::init_sorting_option(generator_sort_array& order_funcs, Fcn filter_on) { order_funcs[0] = [this, filter_on](unsigned i1, unsigned i2) { return filter_on(addon_at(ids_[i1], addons_)) < filter_on(addon_at(ids_[i2], addons_)); diff --git a/src/gui/dialogs/game_load.cpp b/src/gui/dialogs/game_load.cpp index e557a503f80..eb37e954fb8 100644 --- a/src/gui/dialogs/game_load.cpp +++ b/src/gui/dialogs/game_load.cpp @@ -161,16 +161,16 @@ void tgame_load::pre_show(twindow& window) display_savegame(window); } -template -void tgame_load::init_sorting_option(generator_sort_array& order_funcs, Fnc filter_on) +template +void tgame_load::init_sorting_option(generator_sort_array& order_funcs, Fcn filter_on) { - order_funcs[0] = [this, filter_on](unsigned i1, unsigned i2) { - return filter_on(games_[i1]) < filter_on(games_[i2]); - }; + order_funcs[0] = [this, filter_on](unsigned i1, unsigned i2) { + return filter_on(games_[i1]) < filter_on(games_[i2]); + }; - order_funcs[1] = [this, filter_on](unsigned i1, unsigned i2) { - return filter_on(games_[i1]) > filter_on(games_[i2]); - }; + order_funcs[1] = [this, filter_on](unsigned i1, unsigned i2) { + return filter_on(games_[i1]) > filter_on(games_[i2]); + }; } void tgame_load::display_savegame(twindow& window) diff --git a/src/gui/dialogs/game_load.hpp b/src/gui/dialogs/game_load.hpp index f9d71c7c455..b100a55ff44 100644 --- a/src/gui/dialogs/game_load.hpp +++ b/src/gui/dialogs/game_load.hpp @@ -70,8 +70,8 @@ private: void evaluate_summary_string(std::stringstream& str, const config& cfg_summary); - template - void init_sorting_option(generator_sort_array& order_funcs, Fnc filter_on); + template + void init_sorting_option(generator_sort_array& order_funcs, Fcn filter_on); tfield_text* txtFilter_; tfield_bool* chk_change_difficulty_; diff --git a/src/gui/dialogs/unit_create.cpp b/src/gui/dialogs/unit_create.cpp index 35a36f1cb44..98ec5c1977d 100644 --- a/src/gui/dialogs/unit_create.cpp +++ b/src/gui/dialogs/unit_create.cpp @@ -87,16 +87,16 @@ tunit_create::tunit_create() { } -template -void tunit_create::init_sorting_option(generator_sort_array& order_funcs, Fnc filter_on) +template +void tunit_create::init_sorting_option(generator_sort_array& order_funcs, Fcn filter_on) { - order_funcs[0] = [this, filter_on](unsigned i1, unsigned i2) { - return filter_on((*units_[i1])) < filter_on((*units_[i2])); - }; + order_funcs[0] = [this, filter_on](unsigned i1, unsigned i2) { + return filter_on((*units_[i1])) < filter_on((*units_[i2])); + }; - order_funcs[1] = [this, filter_on](unsigned i1, unsigned i2) { - return filter_on((*units_[i1])) > filter_on((*units_[i2])); - }; + order_funcs[1] = [this, filter_on](unsigned i1, unsigned i2) { + return filter_on((*units_[i1])) > filter_on((*units_[i2])); + }; } void tunit_create::pre_show(twindow& window) diff --git a/src/gui/dialogs/unit_create.hpp b/src/gui/dialogs/unit_create.hpp index 8dc950264fc..ff592037091 100644 --- a/src/gui/dialogs/unit_create.hpp +++ b/src/gui/dialogs/unit_create.hpp @@ -69,8 +69,8 @@ private: /** Inherited from tdialog. */ void pre_show(twindow& window); - template - void init_sorting_option(generator_sort_array& order_funcs, Fnc filter_on); + template + void init_sorting_option(generator_sort_array& order_funcs, Fcn filter_on); /** Inherited from tdialog. */ void post_show(twindow& window); diff --git a/src/gui/dialogs/unit_recall.cpp b/src/gui/dialogs/unit_recall.cpp index 298416f423f..497a1cf2b60 100644 --- a/src/gui/dialogs/unit_recall.cpp +++ b/src/gui/dialogs/unit_recall.cpp @@ -111,8 +111,8 @@ static std::string format_cost_string(int unit_recall_cost, const int team_recal return str.str(); } -template -void tunit_recall::init_sorting_option(generator_sort_array& order_funcs, Fnc filter_on) +template +void tunit_recall::init_sorting_option(generator_sort_array& order_funcs, Fcn filter_on) { order_funcs[0] = [this, filter_on](unsigned i1, unsigned i2) { return filter_on((*recall_list_)[i1]) < filter_on((*recall_list_)[i2]); diff --git a/src/gui/dialogs/unit_recall.hpp b/src/gui/dialogs/unit_recall.hpp index b793a267e0a..6c48a010dde 100644 --- a/src/gui/dialogs/unit_recall.hpp +++ b/src/gui/dialogs/unit_recall.hpp @@ -54,8 +54,8 @@ private: std::vector filter_options_; std::vector last_words_; - template - void init_sorting_option(generator_sort_array& order_funcs, T filter_on); + template + void init_sorting_option(generator_sort_array& order_funcs, Fcn filter_on); /** Callbacks */ void list_item_clicked(twindow& window);