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

Renamed two t-prefix typedefs

Browse source 
[ci skip]
This commit is contained in:
Charles Dang 2018-04-06 12:20:35 +11:00
parent 2afb40e3e9
commit e7a8af0c40
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gui/widgets/matrix.hpp
View file

@ -150,7 +150,7 @@ public:
*
* @param compare_functor The functor to use to sort the items.
*/
void sort(const pane::tcompare_functor& compare_functor)
void sort(const pane::compare_functor_t& compare_functor)
{
/********************** OUTLINE *******************/
pane_->sort(compare_functor);
@ -165,7 +165,7 @@ public:
* @param filter_functor The functor to determine whether an item
* should be shown or hidden.
*/
void filter(const pane::tfilter_functor& filter_functor)
void filter(const pane::filter_functor_t& filter_functor)
{
/********************** OUTLINE *******************/
pane_->filter(filter_functor);

4
src/gui/widgets/pane.cpp
View file

@ -198,14 +198,14 @@ pane::impl_draw_children(int x_offset, int y_offset)
}
}
void pane::sort(const tcompare_functor& compare_functor)
void pane::sort(const compare_functor_t& compare_functor)
{
items_.sort(compare_functor);
set_origin_children();
}
void pane::filter(const tfilter_functor& filter_functor)
void pane::filter(const filter_functor_t& filter_functor)
{
for(auto & item : items_)
{

8
src/gui/widgets/pane.hpp
View file

@ -48,9 +48,9 @@ public:
grid* item_grid;
};
typedef std::function<bool(const item&, const item&)> tcompare_functor;
typedef std::function<bool(const item&, const item&)> compare_functor_t;
typedef std::function<bool(const item&)> tfilter_functor;
typedef std::function<bool(const item&)> filter_functor_t;
/** @deprecated Use the second overload. */
explicit pane(const builder_grid_ptr item_builder);
@ -92,7 +92,7 @@ public:
*
* @param compare_functor The functor to use to sort the items.
*/
void sort(const tcompare_functor& compare_functor);
void sort(const compare_functor_t& compare_functor);
/**
* Filters the contents of the pane.
@ -103,7 +103,7 @@ public:
* @param filter_functor The functor to determine whether an item
* should be shown or hidden.
*/
void filter(const tfilter_functor& filter_functor);
void filter(const filter_functor_t& filter_functor);
private:
/** See @ref widget::calculate_best_size. */