Skip to content

Commit

Permalink
Rename unit_recall_default_compare to default_compare
Browse files Browse the repository at this point in the history
  • Loading branch information
jostephd authored and Vultraz committed Jun 22, 2018
1 parent 5316a83 commit 46fb1b6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions src/gui/dialogs/unit_list.cpp
Expand Up @@ -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"
Expand Down Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions src/gui/dialogs/unit_recall.cpp
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/gui/dialogs/unit_recall.hpp
Expand Up @@ -45,7 +45,7 @@ class unit_recall : public modal_dialog
}

/** 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_;
Expand Down

0 comments on commit 46fb1b6

Please sign in to comment.