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

Add C++11 override markers.

Browse source 
Adds the markers for gui2::twidget::set_origin.
This commit is contained in:
Mark de Wever 2013-04-02 22:33:02 +02:00
parent ff8a3916cf
commit fa963dab94
6 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -98,8 +98,8 @@ public:
bool has_widget(const twidget* widget) const
{ return twidget::has_widget(widget) || grid_.has_widget(widget); }
/** Inherited from twidget. */
void set_origin(const tpoint& origin);
/** See @ref twidget::set_origin. */
virtual void set_origin(const tpoint& origin) OVERRIDE;
/** See @ref twidget::set_visible_rectangle. */
virtual void set_visible_rectangle(const SDL_Rect& rectangle) OVERRIDE;

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

@ -254,8 +254,8 @@ public:
/** See @ref twidget::place. */
virtual void place(const tpoint& origin, const tpoint& size) OVERRIDE = 0;
/** Inherited from twidget. */
virtual void set_origin(const tpoint& origin) = 0;
/** See @ref twidget::set_origin. */
virtual void set_origin(const tpoint& origin) OVERRIDE = 0;
/** See @ref twidget::set_visible_rectangle. */
virtual void set_visible_rectangle(const SDL_Rect& rectangle) OVERRIDE = 0;

28
src/gui/widgets/generator_private.hpp
View file

@ -193,12 +193,8 @@ struct thorizontal_list
/** See @ref twidget::place. */
virtual void place(const tpoint& origin, const tpoint& size) OVERRIDE;
/**
* Sets the origin of the generator.
*
* @param origin The origin of the generator.
*/
void set_origin(const tpoint& origin);
/** See @ref twidget::set_origin. */
virtual void set_origin(const tpoint& origin) OVERRIDE;
/**
* Sets the visible rectangle of the generator.
@ -276,8 +272,8 @@ struct tvertical_list
/** See @ref twidget::place. */
virtual void place(const tpoint& origin, const tpoint& size) OVERRIDE;
/** See thorizontal_list::set_origin(). */
void set_origin(const tpoint& origin);
/** See @ref twidget::set_origin. */
virtual void set_origin(const tpoint& origin) OVERRIDE;
/** See @ref thorizontal_list::set_visible_rectangle(). */
void set_visible_rectangle(const SDL_Rect& rectangle);
@ -365,9 +361,11 @@ struct tmatrix
ERROR_LOG(false);
}
/** See thorizontal_list::set_origin(). */
void set_origin(const tpoint& /*origin*/)
{ ERROR_LOG(false); }
/** See @ref twidget::set_origin. */
virtual void set_origin(const tpoint& /*origin*/) OVERRIDE
{
ERROR_LOG(false);
}
/** See @ref thorizontal_list::set_visible_rectangle(). */
void set_visible_rectangle(const SDL_Rect& /*rectangle*/ )
@ -436,8 +434,8 @@ struct tindependent
/** See @ref twidget::place. */
virtual void place(const tpoint& origin, const tpoint& size) OVERRIDE;
/** See thorizontal_list::set_origin(). */
void set_origin(const tpoint& origin);
/** See @ref twidget::set_origin. */
virtual void set_origin(const tpoint& origin) OVERRIDE;
/** See @ref thorizontal_list::set_visible_rectangle(). */
void set_visible_rectangle(const SDL_Rect& rectangle);
@ -809,8 +807,8 @@ public:
placement::place(origin, size);
}
/** Inherited from tgenerator_. */
void set_origin(const tpoint& origin)
/** See @ref twidget::set_origin. */
virtual void set_origin(const tpoint& origin) OVERRIDE
{
// Inherited.
twidget::set_origin(origin);

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

@ -236,8 +236,8 @@ public:
/***** ***** ***** ***** Inherited ***** ***** ***** *****/
/** Inherited from twidget. */
void set_origin(const tpoint& origin);
/** See @ref twidget::set_origin. */
virtual void set_origin(const tpoint& origin) OVERRIDE;
/** See @ref twidget::set_visible_rectangle. */
virtual void set_visible_rectangle(const SDL_Rect& rectangle) OVERRIDE;

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

@ -108,8 +108,8 @@ public:
/** See @ref twidget::place. */
virtual void place(const tpoint& origin, const tpoint& size) OVERRIDE;
/** Inherited from tcontainer_. */
void set_origin(const tpoint& origin);
/** See @ref twidget::set_origin. */
virtual void set_origin(const tpoint& origin) OVERRIDE;
/** See @ref twidget::set_visible_rectangle. */
virtual void set_visible_rectangle(const SDL_Rect& rectangle) OVERRIDE;

3
src/gui/widgets/tree_view_node.hpp
View file

@ -235,7 +235,8 @@ private:
tpoint get_folded_size() const;
tpoint get_unfolded_size() const;
void set_origin(const tpoint& origin);
/** See @ref twidget::set_origin. */
virtual void set_origin(const tpoint& origin) OVERRIDE;
/** See @ref twidget::place. */
virtual void place(const tpoint& origin, const tpoint& size) OVERRIDE;