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

Optimize the template functions.

Browse source 
The function can now determine some extra helper types, which reduces
the template parameters. Now so simple the wrapper functions can be
removed.
This commit is contained in:
Mark de Wever 2009-04-19 12:15:00 +00:00
parent 436d87058f
commit e99b5cc8bb
2 changed files with 30 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -796,14 +796,14 @@ void tgrid::child_populate_dirty_list(twindow& caller,
twidget* tgrid::find_widget(const tpoint& coordinate,
const bool must_be_active)
{
return tgrid_implementation::find_widget(
return tgrid_implementation::find_widget<twidget>(
*this, coordinate, must_be_active);
}
const twidget* tgrid::find_widget(const tpoint& coordinate,
const bool must_be_active) const
{
return tgrid_implementation::find_widget(
return tgrid_implementation::find_widget<const twidget>(
*this, coordinate, must_be_active);
}

62
src/gui/widgets/grid_private.hpp
View file

@ -36,6 +36,27 @@
namespace gui2 {
/**
* Helper struct to get the same constness for T and U.
*
* @param T A type to determine the constness.
* @param U Non const type to set the constness off.
*/
template<class T, class U>
struct tconst_duplicator
{
/** The type to use, if T not const U is also not const. */
typedef U type;
};
/** Specialialized version of tconst_duplicator when T is a const type. */
template<class T, class U>
struct tconst_duplicator<const T, U>
{
/** The type to use, const U. */
typedef const U type;
};
/**
* Helper to implement private functions without modifing the header.
*
@ -44,47 +65,20 @@ namespace gui2 {
*/
struct tgrid_implementation
{
/**
* Wrapper function for
* twidget* tgrid::find_widget(const tpoint&, const bool).
*/
static twidget* find_widget(
tgrid& grid, const tpoint& coordinate, const bool must_be_active)
{
return find_widget_implementation<twidget*, tgrid, tgrid::tchild>
(grid, coordinate, must_be_active);
}
/**
* Wrapper function for
* const twidget* tgrid::find_widget(const tpoint&, const bool) const.
*/
static const twidget* find_widget(const tgrid& grid,
const tpoint& coordinate, const bool must_be_active)
{
return find_widget_implementation<const twidget*,
const tgrid, const tgrid::tchild>
(grid, coordinate, must_be_active);
}
private:
/**
* Implementation for the wrappers for
* [const] twidget* tgrid::find_widget(const tpoint&, const bool) [const].
*
* @param W twidget* or const twidget*.
* @param G if W == twidget* -> tgrid else const tgrid
* @param C if W == twidget* -> tgrid::tchild
* else const tgrid::tchild.
* @param W twidget or const twidget.
*/
template<class W, class G, class C>
static W find_widget_implementation(G& grid, const tpoint& coordinate,
const bool must_be_active)
template<class W>
static W* find_widget(typename tconst_duplicator<W, tgrid>::type& grid,
const tpoint& coordinate, const bool must_be_active)
{
foreach(C& child, grid.children_) {
typedef typename tconst_duplicator<W, tgrid::tchild>::type hack;
foreach(hack& child, grid.children_) {
W widget = child.widget();
W* widget = child.widget();
if(!widget) {
continue;
}