0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename unit_recall_default_compare to default_compare

Browse source
This commit is contained in:
josteph 2018-06-21 22:13:07 +00:00 • committed by Charles Dang
parent 5316a83349
commit 46fb1b6d48
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gui/dialogs/unit_list.cpp
View file

@ -14,7 +14,7 @@
#define GETTEXT_DOMAIN "wesnoth-lib"
#include "gui/dialogs/unit_list.hpp"
#include "gui/dialogs/unit_recall.hpp" /* for unit_recall_default_compare */
#include "gui/dialogs/unit_recall.hpp" /* for default_compare */
#include "gui/auxiliary/find_widget.hpp"
#include "gui/core/log.hpp"
@ -164,8 +164,8 @@ void unit_list::pre_show(window& window)
list.register_sorting_option(2, [this](const int i) { return unit_list_[i]->movement_left(); });
list.register_sorting_option(3, [this](const int i) { return unit_list_[i]->hitpoints(); });
list.set_column_order(4, {{
[this](int lhs, int rhs) { return unit_recall::unit_recall_default_compare(unit_list_[rhs], unit_list_[lhs]); },
[this](int lhs, int rhs) { return unit_recall::unit_recall_default_compare(unit_list_[lhs], unit_list_[rhs]); }
[this](int lhs, int rhs) { return unit_recall::default_compare(unit_list_[rhs], unit_list_[lhs]); },
[this](int lhs, int rhs) { return unit_recall::default_compare(unit_list_[lhs], unit_list_[rhs]); }
}});
list.register_sorting_option(5, [this](const int i) { return unit_list_[i]->experience(); });
list.register_translatable_sorting_option(6, [this](const int i) {

6
src/gui/dialogs/unit_recall.cpp
View file

@ -142,7 +142,7 @@ static std::string get_title_suffix(int side_num)
return msg.str();
}
bool unit_recall::unit_recall_default_compare(const unit_const_ptr first, const unit_const_ptr second)
bool unit_recall::default_compare(const unit_const_ptr first, const unit_const_ptr second)
{
if (first->level() > second->level()) return true;
if (first->level() < second->level()) return false;
@ -237,8 +237,8 @@ void unit_recall::pre_show(window& window)
list.register_sorting_option(0, [this](const int i) { return recall_list_[i]->type_name().str(); });
list.register_sorting_option(1, [this](const int i) { return recall_list_[i]->name().str(); });
list.set_column_order(2, {{
[this](int lhs, int rhs) { return unit_recall_default_compare(recall_list_[rhs], recall_list_[lhs]); },
[this](int lhs, int rhs) { return unit_recall_default_compare(recall_list_[lhs], recall_list_[rhs]); }
[this](int lhs, int rhs) { return default_compare(recall_list_[rhs], recall_list_[lhs]); },
[this](int lhs, int rhs) { return default_compare(recall_list_[lhs], recall_list_[rhs]); }
}});
list.register_sorting_option(3, [this](const int i) { return recall_list_[i]->experience(); });
list.register_sorting_option(4, [this](const int i) {

2
src/gui/dialogs/unit_recall.hpp
View file

@ -45,7 +45,7 @@ public:
}
/** Function to sort recall_list_ by default. */
static bool unit_recall_default_compare(const unit_const_ptr first, const unit_const_ptr second);
static bool default_compare(const unit_const_ptr first, const unit_const_ptr second);
private:
recalls_ptr_vector& recall_list_;