upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-27 18:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed C++11 include guards

Browse Source 
This also expands the OVERRIDE compatibility macro (FINAL was not used).
This commit is contained in:
Charles Dang 2016-03-31 12:05:47 +11:00
parent 7f1dd72c93
commit cf6fa69d27
53 changed files with 345 additions and 428 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.cpp
View File

@ -464,7 +464,6 @@ config& config::operator=(const config& cfg)
return *this;
}
#ifdef HAVE_CXX11
config::config(config &&cfg):
values(std::move(cfg.values)),
children(std::move(cfg.children)),
@ -478,7 +477,6 @@ config &config::operator=(config &&cfg)
swap(cfg);
return *this;
}
#endif
bool config::valid_id(const std::string& id)
{

17
src/config.hpp
View File

@ -75,16 +75,6 @@ class config
*/
void check_valid(const config &cfg) const;
#ifndef HAVE_CXX11
struct safe_bool_impl { void nonnull() {} };
/**
* Used as the return type of the conversion operator for boolean contexts.
* Needed, since the compiler would otherwise consider the following
* conversion (C legacy): cfg["abc"] -> "abc"[bool(cfg)] -> 'b'
*/
typedef void (safe_bool_impl::*safe_bool)();
#endif
public:
// Create an empty node.
config();
@ -92,10 +82,8 @@ public:
config(const config &);
config &operator=(const config &);
#ifdef HAVE_CXX11
config(config &&);
config &operator=(config &&);
#endif
/**
* Creates a config object with an empty child of name @a child.
@ -107,13 +95,8 @@ public:
// Verifies that the string can be used as an attribute or tag name
static bool valid_id(const std::string& id);
#ifdef HAVE_CXX11
explicit operator bool() const
{ return this != &invalid; }
#else
operator safe_bool() const
{ return this != &invalid ? &safe_bool_impl::nonnull : NULL; }
#endif
typedef std::vector<config*> child_list;
typedef std::map<std::string,child_list> child_map;

16
src/fake_unit_ptr.hpp
View File

@ -67,24 +67,10 @@ private :
internal_ptr unit_; //!< Internal unit pointer.
fake_unit_manager * my_manager_; //!< Raw pointer to the manager.
#ifndef HAVE_CXX11
struct safe_bool_impl { void nonnull() {} };
/**
* Used as t he return type of the conversion operator for boolean contexts.
* Needed, since the compiler would otherwise consider the following
* conversion (C legacy): cfg["abc"] -> "abc"[bool(cfg)] -> 'b'
*/
typedef void (safe_bool_impl::*safe_bool)();
#endif
public:
#ifdef HAVE_CXX11
explicit operator bool() const
{ return unit_.get(); }
#else
operator safe_bool() const
{ return unit_ ? &safe_bool_impl::nonnull : NULL; }
#endif
};
#endif

24
src/global.hpp
View File

@ -43,30 +43,6 @@
#endif //_MSC_VER
/**
* Enable C++11 support in some parts of the code.
*
* These parts \em must also work without C++11, since Wesnoth still uses C++98
* as the official C++ version.
*
* @note Older versions of GCC don't define the proper version for
* @c __cplusplus, but have their own test macro. That test is omitted since
* the amount of support for these compilers depends a lot on the exact
* compiler version. If you want to enable it for these compilers simply define
* the macro manually.
*/
#if (__cplusplus >= 201103L)
#define HAVE_CXX11
#endif
#ifdef HAVE_CXX11
#define FINAL final
#define OVERRIDE override
#else
#define FINAL
#define OVERRIDE
#endif
#ifdef NDEBUG
/*
* Wesnoth uses asserts to avoid undefined behaviour. For example, to make sure

13
src/gui/auxiliary/filter.hpp
View File

@ -38,7 +38,6 @@ inline bool sort(const tpane::titem& lhs,
const std::string& tag,
const bool ascending)
{
#ifdef HAVE_CXX11
if(ascending) {
return lexical_cast<T>(lhs.tags.at(tag))
< lexical_cast<T>(rhs.tags.at(tag));
@ -46,18 +45,6 @@ inline bool sort(const tpane::titem& lhs,
return lexical_cast<T>(lhs.tags.at(tag))
> lexical_cast<T>(rhs.tags.at(tag));
}
#else
typedef std::map<std::string,std::string>::const_iterator iterator;
iterator lhs_it = lhs.tags.find(tag), rhs_it = rhs.tags.find(tag);
if(lhs_it == lhs.tags.end() || rhs_it == rhs.tags.end()) {
throw std::out_of_range("Key »" + tag + "« doesn't exist.");
}
if(ascending) {
return lexical_cast<T>(*lhs_it) < lexical_cast<T>(*rhs_it);
} else {
return lexical_cast<T>(*lhs_it) > lexical_cast<T>(*rhs_it);
}
#endif
}
/**

8
src/gui/widgets/button.hpp
View File

@ -37,13 +37,13 @@ public:
/***** ***** ***** ***** Inherited ***** ***** ***** *****/
/** See @ref tcontrol::set_active. */
virtual void set_active(const bool active) OVERRIDE;
virtual void set_active(const bool active) override;
/** See @ref tcontrol::get_active. */
virtual bool get_active() const OVERRIDE;
virtual bool get_active() const override;
/** See @ref tcontrol::get_state. */
virtual unsigned get_state() const OVERRIDE;
virtual unsigned get_state() const override;
/** Inherited from tclickable. */
void connect_click_handler(const event::tsignal_function& signal)
@ -96,7 +96,7 @@ private:
int retval_;
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
/***** ***** ***** signal handlers ***** ****** *****/

14
src/gui/widgets/combobox.hpp
View File

@ -36,13 +36,13 @@ public:
/***** ***** ***** ***** Inherited ***** ***** ***** *****/
/** See @ref tcontrol::set_active. */
virtual void set_active(const bool active) OVERRIDE;
virtual void set_active(const bool active) override;
/** See @ref tcontrol::get_active. */
virtual bool get_active() const OVERRIDE;
virtual bool get_active() const override;
/** See @ref tcontrol::get_state. */
virtual unsigned get_state() const OVERRIDE;
virtual unsigned get_state() const override;
/** Inherited from tclickable. */
void connect_click_handler(const event::tsignal_function& signal)
@ -69,13 +69,13 @@ public:
boost::function<void(twidget&)> callback_state_change_;
/** Inherited from tselectable_ */
virtual unsigned get_value() const OVERRIDE { return selected_; }
virtual unsigned get_value() const override { return selected_; }
/** Inherited from tselectable_ */
virtual void set_value(const unsigned value ) OVERRIDE { set_selected(value); }
virtual void set_value(const unsigned value ) override { set_selected(value); }
/** Inherited from tselectable_ */
virtual unsigned num_states() const OVERRIDE { return values_.size(); }
virtual unsigned num_states() const override { return values_.size(); }
/** Inherited from tselectable_ */
virtual void set_callback_state_change(boost::function<void(twidget&)> callback)
@ -126,7 +126,7 @@ private:
boost::function<void(twidget&)> selected_callback_;
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
/***** ***** ***** signal handlers ***** ****** *****/

42
src/gui/widgets/container.hpp
View File

@ -53,7 +53,7 @@ public:
/***** ***** ***** ***** layout functions ***** ***** ***** *****/
/** See @ref twidget::layout_initialise. */
virtual void layout_initialise(const bool full_initialisation) OVERRIDE;
virtual void layout_initialise(const bool full_initialisation) override;
/**
* Tries to reduce the width of a container.
@ -65,10 +65,10 @@ public:
void reduce_width(const unsigned maximum_width);
/** See @ref twidget::request_reduce_width. */
virtual void request_reduce_width(const unsigned maximum_width) OVERRIDE;
virtual void request_reduce_width(const unsigned maximum_width) override;
/** See @ref twidget::demand_reduce_width. */
virtual void demand_reduce_width(const unsigned maximum_width) OVERRIDE;
virtual void demand_reduce_width(const unsigned maximum_width) override;
/**
* Tries to reduce the height of a container.
@ -80,75 +80,75 @@ public:
void reduce_height(const unsigned maximum_height);
/** See @ref twidget::request_reduce_height. */
virtual void request_reduce_height(const unsigned maximum_height) OVERRIDE;
virtual void request_reduce_height(const unsigned maximum_height) override;
/** See @ref twidget::demand_reduce_height. */
virtual void demand_reduce_height(const unsigned maximum_height) OVERRIDE;
virtual void demand_reduce_height(const unsigned maximum_height) override;
private:
/** See @ref twidget::calculate_best_size. */
virtual tpoint calculate_best_size() const OVERRIDE;
virtual tpoint calculate_best_size() const override;
public:
/** See @ref twidget::can_wrap. */
virtual bool can_wrap() const OVERRIDE;
virtual bool can_wrap() const override;
/** See @ref twidget::place. */
virtual void place(const tpoint& origin, const tpoint& size) OVERRIDE;
virtual void place(const tpoint& origin, const tpoint& size) override;
/***** ***** ***** ***** Inherited ***** ***** ***** *****/
/** See @ref twidget::has_widget. */
virtual bool has_widget(const twidget& widget) const OVERRIDE;
virtual bool has_widget(const twidget& widget) const override;
/** See @ref twidget::set_origin. */
virtual void set_origin(const tpoint& origin) OVERRIDE;
virtual void set_origin(const tpoint& origin) override;
/** See @ref twidget::set_visible_rectangle. */
virtual void set_visible_rectangle(const SDL_Rect& rectangle) OVERRIDE;
virtual void set_visible_rectangle(const SDL_Rect& rectangle) override;
/** See @ref twidget::impl_draw_children. */
virtual void impl_draw_children(surface& frame_buffer,
int x_offset,
int y_offset) OVERRIDE;
int y_offset) override;
protected:
/** See @ref twidget::layout_children. */
virtual void layout_children() OVERRIDE;
virtual void layout_children() override;
/** See @ref twidget::child_populate_dirty_list. */
virtual void
child_populate_dirty_list(twindow& caller,
const std::vector<twidget*>& call_stack) OVERRIDE;
const std::vector<twidget*>& call_stack) override;
public:
/** See @ref twidget::find_at. */
virtual twidget* find_at(const tpoint& coordinate,
const bool must_be_active) OVERRIDE;
const bool must_be_active) override;
/** See @ref twidget::find_at. */
virtual const twidget* find_at(const tpoint& coordinate,
const bool must_be_active) const OVERRIDE;
const bool must_be_active) const override;
/** See @ref twidget::find. */
twidget* find(const std::string& id, const bool must_be_active) OVERRIDE;
twidget* find(const std::string& id, const bool must_be_active) override;
/** See @ref twidget::find. */
const twidget* find(const std::string& id,
const bool must_be_active) const OVERRIDE;
const bool must_be_active) const override;
/** See @ref tcontrol::set_active. */
virtual void set_active(const bool active) OVERRIDE;
virtual void set_active(const bool active) override;
/** See @ref twidget::disable_click_dismiss. */
bool disable_click_dismiss() const OVERRIDE;
bool disable_click_dismiss() const override;
/**
* See @ref twidget::create_walker.
*
* @todo Implement properly.
*/
virtual iterator::twalker_* create_walker() OVERRIDE
virtual iterator::twalker_* create_walker() override
{
return NULL;
}

26
src/gui/widgets/control.hpp
View File

@ -97,10 +97,10 @@ public:
* The default behavior is that a widget blocks easy close, if not it
* should override this function.
*/
bool disable_click_dismiss() const OVERRIDE;
bool disable_click_dismiss() const override;
/** See @ref twidget::create_walker. */
virtual iterator::twalker_* create_walker() OVERRIDE;
virtual iterator::twalker_* create_walker() override;
/***** ***** ***** ***** layout functions ***** ***** ***** *****/
@ -171,18 +171,18 @@ public:
* @todo Also handle the tooltip state.
* Handle if shrunken_ && use_tooltip_on_label_overflow_.
*/
virtual void layout_initialise(const bool full_initialisation) OVERRIDE;
virtual void layout_initialise(const bool full_initialisation) override;
/** See @ref twidget::request_reduce_width. */
virtual void request_reduce_width(const unsigned maximum_width) OVERRIDE;
virtual void request_reduce_width(const unsigned maximum_width) override;
protected:
/** See @ref twidget::calculate_best_size. */
virtual tpoint calculate_best_size() const OVERRIDE;
virtual tpoint calculate_best_size() const override;
public:
/** See @ref twidget::place. */
virtual void place(const tpoint& origin, const tpoint& size) OVERRIDE;
virtual void place(const tpoint& origin, const tpoint& size) override;
/***** ***** ***** ***** Inherited ***** ***** ***** *****/
@ -211,18 +211,18 @@ private:
public:
/** See @ref twidget::find_at. */
virtual twidget* find_at(const tpoint& coordinate,
const bool must_be_active) OVERRIDE;
const bool must_be_active) override;
/** See @ref twidget::find_at. */
virtual const twidget* find_at(const tpoint& coordinate,
const bool must_be_active) const OVERRIDE;
const bool must_be_active) const override;
/** See @ref twidget::find. */
twidget* find(const std::string& id, const bool must_be_active) OVERRIDE;
twidget* find(const std::string& id, const bool must_be_active) override;
/** See @ref twidget::find. */
const twidget* find(const std::string& id,
const bool must_be_active) const OVERRIDE;
const bool must_be_active) const override;
/**
* Sets the definition.
@ -432,12 +432,12 @@ protected:
/** See @ref twidget::impl_draw_background. */
virtual void impl_draw_background(surface& frame_buffer,
int x_offset,
int y_offset) OVERRIDE;
int y_offset) override;
/** See @ref twidget::impl_draw_foreground. */
virtual void impl_draw_foreground(surface& frame_buffer,
int x_offset,
int y_offset) OVERRIDE;
int y_offset) override;
/** Exposes font::ttext::get_token, for the text label of this control */
std::string get_label_token(const gui2::tpoint & position, const char * delimiters = " \n\r\t") const;
@ -521,7 +521,7 @@ public:
using tbuilder_widget::build;
virtual twidget* build(const treplacements& replacements) const OVERRIDE;
virtual twidget* build(const treplacements& replacements) const override;
/** @deprecated The control can initialize itself. */
void init_control(tcontrol* control) const;

12
src/gui/widgets/drawing.hpp
View File

@ -42,22 +42,22 @@ public:
private:
/** See @ref twidget::calculate_best_size. */
virtual tpoint calculate_best_size() const OVERRIDE;
virtual tpoint calculate_best_size() const override;
public:
/***** ***** ***** ***** Inherited ***** ***** ***** *****/
/** See @ref tcontrol::set_active. */
virtual void set_active(const bool active) OVERRIDE;
virtual void set_active(const bool active) override;
/** See @ref tcontrol::get_active. */
virtual bool get_active() const OVERRIDE;
virtual bool get_active() const override;
/** See @ref tcontrol::get_state. */
virtual unsigned get_state() const OVERRIDE;
virtual unsigned get_state() const override;
/** See @ref twidget::disable_click_dismiss. */
bool disable_click_dismiss() const OVERRIDE;
bool disable_click_dismiss() const override;
/***** ***** ***** setters / getters for members ***** ****** *****/
@ -82,7 +82,7 @@ private:
tpoint best_size_;
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
};
// }---------- DEFINITION ---------{

22
src/gui/widgets/generator.hpp
View File

@ -247,48 +247,48 @@ public:
*/
/** See @ref twidget::layout_initialise. */
virtual void layout_initialise(const bool full_initialisation) OVERRIDE = 0;
virtual void layout_initialise(const bool full_initialisation) override = 0;
/** See @ref twidget::request_reduce_width. */
virtual void request_reduce_width(const unsigned maximum_width) OVERRIDE
virtual void request_reduce_width(const unsigned maximum_width) override
= 0;
/** See @ref twidget::request_reduce_height. */
virtual void request_reduce_height(const unsigned maximum_height) OVERRIDE
virtual void request_reduce_height(const unsigned maximum_height) override
= 0;
/** See @ref twidget::calculate_best_size. */
virtual tpoint calculate_best_size() const OVERRIDE = 0;
virtual tpoint calculate_best_size() const override = 0;
/** See @ref twidget::place. */
virtual void place(const tpoint& origin, const tpoint& size) OVERRIDE = 0;
virtual void place(const tpoint& origin, const tpoint& size) override = 0;
/** See @ref twidget::set_origin. */
virtual void set_origin(const tpoint& origin) OVERRIDE = 0;
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;
virtual void set_visible_rectangle(const SDL_Rect& rectangle) override = 0;
/** See @ref twidget::impl_draw_children. */
virtual void impl_draw_children(surface& frame_buffer,
int x_offset,
int y_offset) OVERRIDE = 0;
int y_offset) override = 0;
protected:
/** See @ref twidget::child_populate_dirty_list. */
virtual void
child_populate_dirty_list(twindow& caller,
const std::vector<twidget*>& call_stack) OVERRIDE
const std::vector<twidget*>& call_stack) override
= 0;
public:
/** See @ref twidget::find_at. */
virtual twidget* find_at(const tpoint& coordinate,
const bool must_be_active) OVERRIDE = 0;
const bool must_be_active) override = 0;
/** See @ref twidget::find_at. */
virtual const twidget* find_at(const tpoint& coordinate,
const bool must_be_active) const OVERRIDE
const bool must_be_active) const override
= 0;
/***** ***** ***** ***** keyboard functions ***** ***** ***** *****/

90
src/gui/widgets/generator_private.hpp
View File

@ -144,7 +144,7 @@ struct tone : public virtual tgenerator_
*
* @param index The item to select.
*/
void select_item(const unsigned index, const bool select) OVERRIDE
void select_item(const unsigned index, const bool select) override
{
assert(select);
@ -161,7 +161,7 @@ struct tone : public virtual tgenerator_
struct tinfinite : public virtual tgenerator_
{
/** See tone::select_item(). */
void select_item(const unsigned index, const bool select) OVERRIDE
void select_item(const unsigned index, const bool select) override
{
assert(select);
@ -195,26 +195,26 @@ struct thorizontal_list : public virtual tgenerator_
using tgenerator_::create_item;
/** See @ref twidget::request_reduce_width. */
virtual void request_reduce_width(const unsigned /*maximum_width*/) OVERRIDE
virtual void request_reduce_width(const unsigned /*maximum_width*/) override
{
/* DO NOTHING */
}
/** See @ref twidget::request_reduce_height. */
virtual void request_reduce_height(const unsigned /*maximum_height*/)
OVERRIDE
override
{
/* DO NOTHING */
}
/** See @ref twidget::calculate_best_size. */
virtual tpoint calculate_best_size() const OVERRIDE;
virtual tpoint calculate_best_size() const override;
/** See @ref twidget::place. */
virtual void place(const tpoint& origin, const tpoint& size) OVERRIDE;
virtual void place(const tpoint& origin, const tpoint& size) override;
/** See @ref twidget::set_origin. */
virtual void set_origin(const tpoint& origin) OVERRIDE;
virtual void set_origin(const tpoint& origin) override;
/**
* Sets the visible rectangle of the generator.
@ -225,11 +225,11 @@ struct thorizontal_list : public virtual tgenerator_
/** See @ref twidget::find_at. */
virtual twidget* find_at(const tpoint& coordinate,
const bool must_be_active) OVERRIDE;
const bool must_be_active) override;
/** See @ref twidget::find_at. */
virtual const twidget* find_at(const tpoint& coordinate,
const bool must_be_active) const OVERRIDE;
const bool must_be_active) const override;
/***** ***** ***** ***** keyboard functions ***** ***** ***** *****/
@ -274,37 +274,37 @@ struct tvertical_list : public virtual tgenerator_
using tgenerator_::create_item;
/** See @ref twidget::request_reduce_width. */
virtual void request_reduce_width(const unsigned /*maximum_width*/) OVERRIDE
virtual void request_reduce_width(const unsigned /*maximum_width*/) override
{
/* DO NOTHING */
}
/** See @ref twidget::request_reduce_height. */
virtual void request_reduce_height(const unsigned /*maximum_height*/)
OVERRIDE
override
{
/* DO NOTHING */
}
/** See @ref twidget::calculate_best_size. */
virtual tpoint calculate_best_size() const OVERRIDE;
virtual tpoint calculate_best_size() const override;
/** See @ref twidget::place. */
virtual void place(const tpoint& origin, const tpoint& size) OVERRIDE;
virtual void place(const tpoint& origin, const tpoint& size) override;
/** See @ref twidget::set_origin. */
virtual void set_origin(const tpoint& origin) OVERRIDE;
virtual void set_origin(const tpoint& origin) override;
/** See @ref thorizontal_list::set_visible_rectangle(). */
void set_visible_rectangle(const SDL_Rect& rectangle);
/** See @ref twidget::find_at. */
virtual twidget* find_at(const tpoint& coordinate,
const bool must_be_active) OVERRIDE;
const bool must_be_active) override;
/** See @ref twidget::find_at. */
virtual const twidget* find_at(const tpoint& coordinate,
const bool must_be_active) const OVERRIDE;
const bool must_be_active) const override;
/***** ***** ***** ***** keyboard functions ***** ***** ***** *****/
@ -360,20 +360,20 @@ struct tmatrix : public virtual tgenerator_
using tgenerator_::create_item;
/** See @ref twidget::request_reduce_width. */
virtual void request_reduce_width(const unsigned /*maximum_width*/) OVERRIDE
virtual void request_reduce_width(const unsigned /*maximum_width*/) override
{
/* DO NOTHING */
}
/** See @ref twidget::request_reduce_height. */
virtual void request_reduce_height(const unsigned /*maximum_height*/)
OVERRIDE
override
{
/* DO NOTHING */
}
/** See @ref twidget::calculate_best_size. */
virtual tpoint calculate_best_size() const OVERRIDE
virtual tpoint calculate_best_size() const override
{
ERROR_LOG(false);
}
@ -381,13 +381,13 @@ struct tmatrix : public virtual tgenerator_
/** See @ref twidget::place. */
virtual void place(const tpoint& /*origin*/
,
const tpoint& /*size*/) OVERRIDE
const tpoint& /*size*/) override
{
ERROR_LOG(false);
}
/** See @ref twidget::set_origin. */
virtual void set_origin(const tpoint& /*origin*/) OVERRIDE
virtual void set_origin(const tpoint& /*origin*/) override
{
ERROR_LOG(false);
}
@ -401,7 +401,7 @@ struct tmatrix : public virtual tgenerator_
/** See @ref twidget::find_at. */
virtual twidget* find_at(const tpoint& /*coordinate*/
,
const bool /*must_be_active*/) OVERRIDE
const bool /*must_be_active*/) override
{
ERROR_LOG(false);
}
@ -409,7 +409,7 @@ struct tmatrix : public virtual tgenerator_
/** See @ref twidget::find_at. */
virtual const twidget* find_at(const tpoint& /*coordinate*/
,
const bool /*must_be_active*/) const OVERRIDE
const bool /*must_be_active*/) const override
{
ERROR_LOG(false);
}
@ -460,37 +460,37 @@ struct tindependent : public virtual tgenerator_
using tgenerator_::create_item;
/** See @ref twidget::request_reduce_width. */
virtual void request_reduce_width(const unsigned maximum_width) OVERRIDE;
virtual void request_reduce_width(const unsigned maximum_width) override;
/** See thorizontal_list::request_reduce_height. */
virtual void request_reduce_height(const unsigned maximum_height);
/** See @ref twidget::calculate_best_size. */
virtual tpoint calculate_best_size() const OVERRIDE;
virtual tpoint calculate_best_size() const override;
/** See @ref twidget::place. */
virtual void place(const tpoint& origin, const tpoint& size) OVERRIDE;
virtual void place(const tpoint& origin, const tpoint& size) override;
/** See @ref twidget::set_origin. */
virtual void set_origin(const tpoint& origin) OVERRIDE;
virtual void set_origin(const tpoint& origin) override;
/** See @ref thorizontal_list::set_visible_rectangle(). */
void set_visible_rectangle(const SDL_Rect& rectangle);
/** See @ref twidget::find_at. */
virtual twidget* find_at(const tpoint& coordinate,
const bool must_be_active) OVERRIDE;
const bool must_be_active) override;
/** See @ref twidget::find_at. */
virtual const twidget* find_at(const tpoint& coordinate,
const bool must_be_active) const OVERRIDE;
const bool must_be_active) const override;
/** See @ref twidget::find. */
twidget* find(const std::string& id, const bool must_be_active) OVERRIDE;
twidget* find(const std::string& id, const bool must_be_active) override;
/** See @ref twidget::find. */
const twidget* find(const std::string& id,
const bool must_be_active) const OVERRIDE;
const bool must_be_active) const override;
/***** ***** ***** ***** keyboard functions ***** ***** ***** *****/
@ -818,7 +818,7 @@ public:
}
/** See @ref twidget::layout_initialise. */
virtual void layout_initialise(const bool full_initialisation) OVERRIDE
virtual void layout_initialise(const bool full_initialisation) override
{
FOREACH(AUTO item, items_)
{
@ -831,25 +831,25 @@ public:
}
/** See @ref twidget::request_reduce_width. */
virtual void request_reduce_width(const unsigned maximum_width) OVERRIDE
virtual void request_reduce_width(const unsigned maximum_width) override
{
placement::request_reduce_width(maximum_width);
}
/** See @ref twidget::request_reduce_height. */
virtual void request_reduce_height(const unsigned maximum_height) OVERRIDE
virtual void request_reduce_height(const unsigned maximum_height) override
{
placement::request_reduce_height(maximum_height);
}
/** See @ref twidget::calculate_best_size. */
virtual tpoint calculate_best_size() const OVERRIDE
virtual tpoint calculate_best_size() const override
{
return placement::calculate_best_size();
}
/** See @ref twidget::place. */
virtual void place(const tpoint& origin, const tpoint& size) OVERRIDE
virtual void place(const tpoint& origin, const tpoint& size) override
{
// Inherited, so we get useful debug info.
twidget::place(origin, size);
@ -858,7 +858,7 @@ public:
}
/** See @ref twidget::set_origin. */
virtual void set_origin(const tpoint& origin) OVERRIDE
virtual void set_origin(const tpoint& origin) override
{
// Inherited.
twidget::set_origin(origin);
@ -867,7 +867,7 @@ public:
}
/** See @ref twidget::set_visible_rectangle. */
virtual void set_visible_rectangle(const SDL_Rect& rectangle) OVERRIDE
virtual void set_visible_rectangle(const SDL_Rect& rectangle) override
{
placement::set_visible_rectangle(rectangle);
}
@ -875,7 +875,7 @@ public:
/** See @ref twidget::impl_draw_children. */
virtual void impl_draw_children(surface& frame_buffer,
int x_offset,
int y_offset) OVERRIDE
int y_offset) override
{
assert(this->get_visible() == twidget::tvisible::visible);
calculate_order();
@ -893,7 +893,7 @@ public:
/** See @ref twidget::child_populate_dirty_list. */
virtual void
child_populate_dirty_list(twindow& caller,
const std::vector<twidget*>& call_stack) OVERRIDE
const std::vector<twidget*>& call_stack) override
{
FOREACH(AUTO item, items_)
{
@ -904,20 +904,20 @@ public:
/** See @ref twidget::find_at. */
virtual twidget* find_at(const tpoint& coordinate,
const bool must_be_active) OVERRIDE
const bool must_be_active) override
{
return placement::find_at(coordinate, must_be_active);
}
/** See @ref twidget::find_at. */
virtual const twidget* find_at(const tpoint& coordinate,
const bool must_be_active) const OVERRIDE
const bool must_be_active) const override
{
return placement::find_at(coordinate, must_be_active);
}
/** See @ref twidget::disable_click_dismiss. */
bool disable_click_dismiss() const OVERRIDE
bool disable_click_dismiss() const override
{
FOREACH(AUTO item, items_)
{
@ -933,7 +933,7 @@ public:
*
* @todo Implement properly.
*/
virtual iterator::twalker_* create_walker() OVERRIDE
virtual iterator::twalker_* create_walker() override
{
return NULL;
}
@ -1031,7 +1031,7 @@ private:
torder_func order_func_;
virtual void set_order(const torder_func& order) OVERRIDE
virtual void set_order(const torder_func& order) override
{
order_func_ = order;
order_dirty_ = true;

42
src/gui/widgets/grid.hpp
View File

@ -184,11 +184,11 @@ public:
return child(row, col).widget();
}
virtual bool can_mouse_focus() const OVERRIDE { return false; }
virtual bool can_mouse_focus() const override { return false; }
/***** ***** ***** ***** layout functions ***** ***** ***** *****/
/** See @ref twidget::layout_initialise. */
virtual void layout_initialise(const bool full_initialisation) OVERRIDE;
virtual void layout_initialise(const bool full_initialisation) override;
/**
* Tries to reduce the width of a container.
@ -200,10 +200,10 @@ public:
void reduce_width(const unsigned maximum_width);
/** See @ref twidget::request_reduce_width. */
virtual void request_reduce_width(const unsigned maximum_width) OVERRIDE;
virtual void request_reduce_width(const unsigned maximum_width) override;
/** See @ref twidget::demand_reduce_width. */
virtual void demand_reduce_width(const unsigned maximum_width) OVERRIDE;
virtual void demand_reduce_width(const unsigned maximum_width) override;
/**
* Tries to reduce the height of a container.
@ -215,10 +215,10 @@ public:
void reduce_height(const unsigned maximum_height);
/** See @ref twidget::request_reduce_height. */
virtual void request_reduce_height(const unsigned maximum_height) OVERRIDE;
virtual void request_reduce_height(const unsigned maximum_height) override;
/** See @ref twidget::demand_reduce_height. */
virtual void demand_reduce_height(const unsigned maximum_height) OVERRIDE;
virtual void demand_reduce_height(const unsigned maximum_height) override;
/**
* Recalculates the best size.
@ -232,55 +232,55 @@ public:
private:
/** See @ref twidget::calculate_best_size. */
virtual tpoint calculate_best_size() const OVERRIDE;
virtual tpoint calculate_best_size() const override;
public:
/** See @ref twidget::can_wrap. */
virtual bool can_wrap() const OVERRIDE;
virtual bool can_wrap() const override;
public:
/** See @ref twidget::place. */
virtual void place(const tpoint& origin, const tpoint& size) OVERRIDE;
virtual void place(const tpoint& origin, const tpoint& size) override;
/***** ***** ***** ***** Inherited ***** ***** ***** *****/
/** See @ref twidget::set_origin. */
virtual void set_origin(const tpoint& origin) OVERRIDE;
virtual void set_origin(const tpoint& origin) override;
/** See @ref twidget::set_visible_rectangle. */
virtual void set_visible_rectangle(const SDL_Rect& rectangle) OVERRIDE;
virtual void set_visible_rectangle(const SDL_Rect& rectangle) override;
/** See @ref twidget::layout_children. */
virtual void layout_children() OVERRIDE;
virtual void layout_children() override;
/** See @ref twidget::child_populate_dirty_list. */
virtual void
child_populate_dirty_list(twindow& caller,
const std::vector<twidget*>& call_stack) OVERRIDE;
const std::vector<twidget*>& call_stack) override;
/** See @ref twidget::find_at. */
virtual twidget* find_at(const tpoint& coordinate,
const bool must_be_active) OVERRIDE;
const bool must_be_active) override;
/** See @ref twidget::find_at. */
virtual const twidget* find_at(const tpoint& coordinate,
const bool must_be_active) const OVERRIDE;
const bool must_be_active) const override;
/** See @ref twidget::find. */
twidget* find(const std::string& id, const bool must_be_active) OVERRIDE;
twidget* find(const std::string& id, const bool must_be_active) override;
/** See @ref twidget::find. */
const twidget* find(const std::string& id,
const bool must_be_active) const OVERRIDE;
const bool must_be_active) const override;
/** See @ref twidget::has_widget. */
virtual bool has_widget(const twidget& widget) const OVERRIDE;
virtual bool has_widget(const twidget& widget) const override;
/** See @ref twidget::disable_click_dismiss. */
bool disable_click_dismiss() const OVERRIDE;
bool disable_click_dismiss() const override;
/** See @ref twidget::create_walker. */
virtual iterator::twalker_* create_walker() OVERRIDE;
virtual iterator::twalker_* create_walker() override;
/***** ***** ***** setters / getters for members ***** ****** *****/
@ -489,7 +489,7 @@ private:
/** See @ref twidget::impl_draw_children. */
virtual void impl_draw_children(surface& frame_buffer,
int x_offset,
int y_offset) OVERRIDE;
int y_offset) override;
};
/**

8
src/gui/widgets/group.hpp
View File

@ -53,16 +53,8 @@ public:
*/
void remove_member(tselectable_* widget)
{
#ifdef HAVE_CXX11
members_.erase(std::find_if(members_.begin(), members_.end(),
[&widget](const group_type& member){ return member.first == widget; }));
#else
for(group_iterator iter = members_.end() - 1; iter >= members_.begin(); iter--) {
if(iter->first == widget) {
iter = members_.erase(iter);
}
}
#endif
}
/**

2
src/gui/widgets/horizontal_scrollbar.hpp
View File

@ -69,7 +69,7 @@ private:
}
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
};
// }---------- DEFINITION ---------{

14
src/gui/widgets/image.hpp
View File

@ -59,28 +59,28 @@ public:
return label();
}
virtual bool can_mouse_focus() const OVERRIDE { return false; }
virtual bool can_mouse_focus() const override { return false; }
/***** ***** ***** ***** layout functions ***** ***** ***** *****/
private:
/** See @ref twidget::calculate_best_size. */
virtual tpoint calculate_best_size() const OVERRIDE;
virtual tpoint calculate_best_size() const override;
public:
/***** ***** ***** ***** Inherited ***** ***** ***** *****/
/** See @ref tcontrol::set_active. */
virtual void set_active(const bool active) OVERRIDE;
virtual void set_active(const bool active) override;
/** See @ref tcontrol::get_active. */
virtual bool get_active() const OVERRIDE;
virtual bool get_active() const override;
/** See @ref tcontrol::get_state. */
virtual unsigned get_state() const OVERRIDE;
virtual unsigned get_state() const override;
/** See @ref twidget::disable_click_dismiss. */
bool disable_click_dismiss() const OVERRIDE;
bool disable_click_dismiss() const override;
private:
/**
@ -94,7 +94,7 @@ private:
};
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
};
// }---------- DEFINITION ---------{

20
src/gui/widgets/label.hpp
View File

@ -32,28 +32,28 @@ public:
tlabel();
/** See @ref twidget::can_wrap. */
virtual bool can_wrap() const OVERRIDE;
virtual bool can_wrap() const override;
/** See @ref tcontrol::get_characters_per_line. */
virtual unsigned get_characters_per_line() const OVERRIDE;
virtual unsigned get_characters_per_line() const override;
/** See @ref tcontrol::get_link_aware. */
virtual bool get_link_aware() const OVERRIDE;
virtual bool get_link_aware() const override;
/** See @ref tcontrol::get_link_aware. */
virtual std::string get_link_color() const OVERRIDE;
virtual std::string get_link_color() const override;
/** See @ref tcontrol::set_active. */
virtual void set_active(const bool active) OVERRIDE;
virtual void set_active(const bool active) override;
/** See @ref tcontrol::get_active. */
virtual bool get_active() const OVERRIDE;
virtual bool get_active() const override;
/** See @ref tcontrol::get_state. */
virtual unsigned get_state() const OVERRIDE;
virtual unsigned get_state() const override;
/** See @ref twidget::disable_click_dismiss. */
bool disable_click_dismiss() const OVERRIDE;
bool disable_click_dismiss() const override;
/***** ***** ***** setters / getters for members ***** ****** *****/
@ -68,7 +68,7 @@ public:
void set_link_color(const std::string & color);
virtual bool can_mouse_focus() const OVERRIDE { return false; }
virtual bool can_mouse_focus() const override { return false; }
private:
/**
* Possible states of the widget.
@ -113,7 +113,7 @@ private:
std::string link_color_;
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
/** Inherited from tcontrol. */
void load_config_extra();

10
src/gui/widgets/list.hpp
View File

@ -201,13 +201,13 @@ public:
void init();
/** See @ref tcontrol::get_active. */
virtual bool get_active() const OVERRIDE;
virtual bool get_active() const override;
/** See @ref tcontrol::get_state. */
virtual unsigned get_state() const OVERRIDE;
virtual unsigned get_state() const override;
/** See @ref twidget::place. */
virtual void place(const tpoint& origin, const tpoint& size) OVERRIDE;
virtual void place(const tpoint& origin, const tpoint& size) override;
private:
/**
@ -269,10 +269,10 @@ private:
virtual void set_content_size(const tpoint& origin, const tpoint& size);
#endif
/** See @ref tcontainer_::set_self_active. */
virtual void set_self_active(const bool active) OVERRIDE;
virtual void set_self_active(const bool active) override;
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
/***** ***** ***** signal handlers ***** ****** *****/

10
src/gui/widgets/listbox.hpp
View File

@ -183,7 +183,7 @@ public:
void list_item_clicked(twidget& caller);
/** See @ref tcontainer_::set_self_active. */
virtual void set_self_active(const bool active) OVERRIDE;
virtual void set_self_active(const bool active) override;
/**
* Request to update the size of the content after changing the content.
@ -204,15 +204,15 @@ public:
/***** ***** ***** ***** inherited ***** ***** ****** *****/
/** See @ref twidget::place. */
virtual void place(const tpoint& origin, const tpoint& size) OVERRIDE;
virtual void place(const tpoint& origin, const tpoint& size) override;
/** See @ref twidget::layout_children. */
virtual void layout_children() OVERRIDE;
virtual void layout_children() override;
/** See @ref twidget::child_populate_dirty_list. */
virtual void
child_populate_dirty_list(twindow& caller,
const std::vector<twidget*>& call_stack) OVERRIDE;
const std::vector<twidget*>& call_stack) override;
/***** ***** ***** setters / getters for members ***** ****** *****/
void
@ -346,7 +346,7 @@ private:
virtual void set_content_size(const tpoint& origin, const tpoint& size);
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
void order_by_column(unsigned column, twidget& widget);
};

34
src/gui/widgets/matrix.hpp
View File

@ -77,19 +77,19 @@ public:
}
/** See @ref tcontrol::set_active. */
virtual void set_active(const bool active) OVERRIDE
virtual void set_active(const bool active) override
{
STATE::set_active(active);
}
/** See @ref tcontrol::get_active. */
virtual bool get_active() const OVERRIDE
virtual bool get_active() const override
{
return STATE::get_active();
}
/** See @ref tcontrol::get_state. */
virtual unsigned get_state() const OVERRIDE
virtual unsigned get_state() const override
{
return STATE::get_state();
}
@ -117,41 +117,41 @@ public:
/***** ***** ***** ***** Inherited operations. ***** ***** ****** *****/
/** See @ref twidget::place. */
virtual void place(const tpoint& origin, const tpoint& size) OVERRIDE;
virtual void place(const tpoint& origin, const tpoint& size) override;
/** See @ref twidget::layout_initialise. */
virtual void layout_initialise(const bool full_initialisation) OVERRIDE;
virtual void layout_initialise(const bool full_initialisation) override;
/** See @ref twidget::impl_draw_children. */
virtual void impl_draw_children(surface& frame_buffer,
int x_offset,
int y_offset) OVERRIDE;
int y_offset) override;
/** See @ref twidget::layout_children. */
virtual void layout_children() OVERRIDE;
virtual void layout_children() override;
/** See @ref twidget::child_populate_dirty_list. */
virtual void
child_populate_dirty_list(twindow& caller,
const std::vector<twidget*>& call_stack) OVERRIDE;
const std::vector<twidget*>& call_stack) override;
/** See @ref twidget::request_reduce_width. */
virtual void request_reduce_width(const unsigned maximum_width) OVERRIDE;
virtual void request_reduce_width(const unsigned maximum_width) override;
/** See @ref twidget::find_at. */
virtual twidget* find_at(const tpoint& coordinate,
const bool must_be_active) OVERRIDE;
const bool must_be_active) override;
/** See @ref twidget::find_at. */
virtual const twidget* find_at(const tpoint& coordinate,
const bool must_be_active) const OVERRIDE;
const bool must_be_active) const override;
/** See @ref twidget::find. */
twidget* find(const std::string& id, const bool must_be_active) OVERRIDE;
twidget* find(const std::string& id, const bool must_be_active) override;
/** See @ref twidget::find. */
const twidget* find(const std::string& id,
const bool must_be_active) const OVERRIDE;
const bool must_be_active) const override;
/***** ***** ***** ***** Forwarded to pane_. ***** ***** ****** *****/
/**
@ -182,14 +182,14 @@ public:
private:
/** See @ref twidget::calculate_best_size. */
virtual tpoint calculate_best_size() const OVERRIDE;
virtual tpoint calculate_best_size() const override;
public:
/** See @ref twidget::disable_click_dismiss. */
bool disable_click_dismiss() const OVERRIDE;
bool disable_click_dismiss() const override;
/** See @ref twidget::create_walker. */
virtual iterator::twalker_* create_walker() OVERRIDE;
virtual iterator::twalker_* create_walker() override;
/**
* Returns a grid in the pane.
@ -227,7 +227,7 @@ private:
tpane* pane_;
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
};
// }---------- DEFINITION ---------{

12
src/gui/widgets/minimap.hpp
View File

@ -43,16 +43,16 @@ public:
/***** ***** ***** ***** Inherited ***** ***** ***** *****/
/** See @ref tcontrol::set_active. */
virtual void set_active(const bool active) OVERRIDE;
virtual void set_active(const bool active) override;
/** See @ref tcontrol::get_active. */
virtual bool get_active() const OVERRIDE;
virtual bool get_active() const override;
/** See @ref tcontrol::get_state. */
virtual unsigned get_state() const OVERRIDE;
virtual unsigned get_state() const override;
/** See @ref twidget::disable_click_dismiss. */
bool disable_click_dismiss() const OVERRIDE;
bool disable_click_dismiss() const override;
/***** ***** ***** setters / getters for members ***** ****** *****/
@ -103,10 +103,10 @@ private:
/** See @ref twidget::impl_draw_background. */
virtual void impl_draw_background(surface& frame_buffer,
int x_offset,
int y_offset) OVERRIDE;
int y_offset) override;
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
};
// }---------- DEFINITION ---------{

10
src/gui/widgets/multi_page.hpp
View File

@ -127,10 +127,10 @@ public:
/***** ***** ***** inherited ***** ****** *****/
/** See @ref tcontrol::get_active. */
virtual bool get_active() const OVERRIDE;
virtual bool get_active() const override;
/** See @ref tcontrol::get_state. */
virtual unsigned get_state() const OVERRIDE;
virtual unsigned get_state() const override;
/***** ***** ***** setters / getters for members ***** ****** *****/
@ -162,13 +162,13 @@ private:
/** See @ref twidget::impl_draw_background. */
virtual void impl_draw_background(surface& frame_buffer,
int x_offset,
int y_offset) OVERRIDE;
int y_offset) override;
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
/** See @ref tcontainer_::set_self_active. */
virtual void set_self_active(const bool active) OVERRIDE;
virtual void set_self_active(const bool active) override;
};
// }---------- DEFINITION ---------{

20
src/gui/widgets/pane.hpp
View File

@ -71,31 +71,31 @@ public:
const std::map<std::string, std::string>& tags);
/** See @ref twidget::place. */
virtual void place(const tpoint& origin, const tpoint& size) OVERRIDE;
virtual void place(const tpoint& origin, const tpoint& size) override;
/** See @ref twidget::layout_initialise. */
virtual void layout_initialise(const bool full_initialisation) OVERRIDE;
virtual void layout_initialise(const bool full_initialisation) override;
/** See @ref twidget::impl_draw_children. */
virtual void impl_draw_children(surface& frame_buffer,
int x_offset,
int y_offset) OVERRIDE;
int y_offset) override;
/** See @ref twidget::child_populate_dirty_list. */
virtual void
child_populate_dirty_list(twindow& caller,
const std::vector<twidget*>& call_stack) OVERRIDE;
const std::vector<twidget*>& call_stack) override;
/** See @ref twidget::request_reduce_width. */
virtual void request_reduce_width(const unsigned maximum_width) OVERRIDE;
virtual void request_reduce_width(const unsigned maximum_width) override;
/** See @ref twidget::find_at. */
virtual twidget* find_at(const tpoint& coordinate,
const bool must_be_active) OVERRIDE;
const bool must_be_active) override;
/** See @ref twidget::find_at. */
virtual const twidget* find_at(const tpoint& coordinate,
const bool must_be_active) const OVERRIDE;
const bool must_be_active) const override;
/**
* Sorts the contents of the pane.
@ -117,14 +117,14 @@ public:
private:
/** See @ref twidget::calculate_best_size. */
virtual tpoint calculate_best_size() const OVERRIDE;
virtual tpoint calculate_best_size() const override;
public:
/** See @ref twidget::disable_click_dismiss. */
bool disable_click_dismiss() const OVERRIDE;
bool disable_click_dismiss() const override;
/** See @ref twidget::create_walker. */
virtual iterator::twalker_* create_walker() OVERRIDE;
virtual iterator::twalker_* create_walker() override;
/**
* Returns a grid in the pane.

16
src/gui/widgets/panel.hpp
View File

@ -45,33 +45,33 @@ public:
}
/** See @ref tcontainer_::get_client_rect. */
virtual SDL_Rect get_client_rect() const OVERRIDE;
virtual SDL_Rect get_client_rect() const override;
/** See @ref tcontrol::get_active. */
virtual bool get_active() const OVERRIDE;
virtual bool get_active() const override;
/** See @ref tcontrol::get_state. */
virtual unsigned get_state() const OVERRIDE;
virtual unsigned get_state() const override;
private:
/** See @ref twidget::impl_draw_background. */
virtual void impl_draw_background(surface& frame_buffer,
int x_offset,
int y_offset) OVERRIDE;
int y_offset) override;
/** See @ref twidget::impl_draw_foreground. */
virtual void impl_draw_foreground(surface& frame_buffer,
int x_offset,
int y_offset) OVERRIDE;
int y_offset) override;
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
/** See @ref tcontainer_::border_space. */
virtual tpoint border_space() const OVERRIDE;
virtual tpoint border_space() const override;
/** See @ref tcontainer_::set_self_active. */
virtual void set_self_active(const bool active) OVERRIDE;
virtual void set_self_active(const bool active) override;
};
// }---------- DEFINITION ---------{

2
src/gui/widgets/password_box.hpp
View File

@ -85,7 +85,7 @@ private:
std::string real_value_;
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
};
// }---------- BUILDER -----------{

10
src/gui/widgets/progress_bar.hpp
View File

@ -37,16 +37,16 @@ public:
/***** ***** ***** ***** Inherited ***** ***** ***** *****/
/** See @ref tcontrol::set_active. */
virtual void set_active(const bool active) OVERRIDE;
virtual void set_active(const bool active) override;
/** See @ref tcontrol::get_active. */
virtual bool get_active() const OVERRIDE;
virtual bool get_active() const override;
/** See @ref tcontrol::get_state. */
virtual unsigned get_state() const OVERRIDE;
virtual unsigned get_state() const override;
/** See @ref twidget::disable_click_dismiss. */
bool disable_click_dismiss() const OVERRIDE;
bool disable_click_dismiss() const override;
/***** ***** ***** setters / getters for members ***** ****** *****/
@ -72,7 +72,7 @@ private:
unsigned percentage_;
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
};
// }---------- DEFINITION ---------{

8
src/gui/widgets/repeating_button.hpp
View File

@ -54,13 +54,13 @@ public:
/***** ***** ***** ***** Inherited ***** ***** ***** *****/
/** See @ref tcontrol::set_active. */
virtual void set_active(const bool active) OVERRIDE;
virtual void set_active(const bool active) override;
/** See @ref tcontrol::get_active. */
virtual bool get_active() const OVERRIDE;
virtual bool get_active() const override;
/** See @ref tcontrol::get_state. */
virtual unsigned get_state() const OVERRIDE;
virtual unsigned get_state() const override;
/** Inherited from tclickable. */
void connect_click_handler(const event::tsignal_function& signal)
@ -101,7 +101,7 @@ private:
size_t repeat_timer_;
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
/***** ***** ***** signal handlers ***** ****** *****/

12
src/gui/widgets/scroll_label.hpp
View File

@ -48,21 +48,21 @@ public:
tscroll_label(bool wrap);
/** See @ref tcontrol::set_label. */
virtual void set_label(const t_string& label) OVERRIDE;
virtual void set_label(const t_string& label) override;
/** See @ref tcontrol::set_use_markup. */
virtual void set_use_markup(bool use_markup) OVERRIDE;
virtual void set_use_markup(bool use_markup) override;
/** See @ref tcontainer_::set_self_active. */
virtual void set_self_active(const bool active) OVERRIDE;
virtual void set_self_active(const bool active) override;
/***** ***** ***** setters / getters for members ***** ****** *****/
/** See @ref tcontrol::get_active. */
virtual bool get_active() const OVERRIDE;
virtual bool get_active() const override;
/** See @ref tcontrol::get_state. */
virtual unsigned get_state() const OVERRIDE;
virtual unsigned get_state() const override;
bool can_wrap() const;
void set_can_wrap(bool can_wrap);
@ -96,7 +96,7 @@ private:
/***** ***** ***** inherited ****** *****/
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
/***** ***** ***** signal handlers ***** ****** *****/

10
src/gui/widgets/scrollbar.hpp
View File

@ -98,18 +98,18 @@ public:
/***** ***** ***** ***** layout functions ***** ***** ***** *****/
/** See @ref twidget::place. */
virtual void place(const tpoint& origin, const tpoint& size) OVERRIDE;
virtual void place(const tpoint& origin, const tpoint& size) override;
/***** ***** ***** ***** Inherited ***** ***** ***** *****/
/** See @ref tcontrol::set_active. */
virtual void set_active(const bool active) OVERRIDE;
virtual void set_active(const bool active) override;
/** See @ref tcontrol::get_active. */
virtual bool get_active() const OVERRIDE;
virtual bool get_active() const override;
/** See @ref tcontrol::get_state. */
virtual unsigned get_state() const OVERRIDE;
virtual unsigned get_state() const override;
/***** ***** ***** setters / getters for members ***** ****** *****/
@ -169,7 +169,7 @@ protected:
*
* After a recalculation the canvasses also need to be updated.
*/
virtual void update_canvas() OVERRIDE;
virtual void update_canvas() override;
/**
* Callback for subclasses to get notified about positioner movement.

38
src/gui/widgets/scrollbar_container.hpp
View File

@ -88,60 +88,60 @@ public:
/***** ***** ***** ***** layout functions ***** ***** ***** *****/
/** See @ref twidget::layout_initialise. */
virtual void layout_initialise(const bool full_initialisation) OVERRIDE;
virtual void layout_initialise(const bool full_initialisation) override;
/** See @ref twidget::request_reduce_height. */
virtual void request_reduce_height(const unsigned maximum_height) OVERRIDE;
virtual void request_reduce_height(const unsigned maximum_height) override;
/** See @ref twidget::request_reduce_width. */
virtual void request_reduce_width(const unsigned maximum_width) OVERRIDE;
virtual void request_reduce_width(const unsigned maximum_width) override;
/**
* See @ref twidget::can_wrap.
*
* @note This function is called before the object is finalised.
*/
virtual bool can_wrap() const OVERRIDE;
virtual bool can_wrap() const override;
private:
/** See @ref twidget::calculate_best_size. */
virtual tpoint calculate_best_size() const OVERRIDE;
virtual tpoint calculate_best_size() const override;
public:
/** See @ref twidget::place. */
virtual void place(const tpoint& origin, const tpoint& size) OVERRIDE;
virtual void place(const tpoint& origin, const tpoint& size) override;
/** See @ref twidget::set_origin. */
virtual void set_origin(const tpoint& origin) OVERRIDE;
virtual void set_origin(const tpoint& origin) override;
/** See @ref twidget::set_visible_rectangle. */
virtual void set_visible_rectangle(const SDL_Rect& rectangle) OVERRIDE;
virtual void set_visible_rectangle(const SDL_Rect& rectangle) override;
/***** ***** ***** inherited ****** *****/
/** See @ref tcontrol::get_active. */
virtual bool get_active() const OVERRIDE;
virtual bool get_active() const override;
/** See @ref tcontrol::get_state. */
virtual unsigned get_state() const OVERRIDE;
virtual unsigned get_state() const override;
/** See @ref twidget::find_at. */
virtual twidget* find_at(const tpoint& coordinate,
const bool must_be_active) OVERRIDE;
const bool must_be_active) override;
/** See @ref twidget::find_at. */
virtual const twidget* find_at(const tpoint& coordinate,
const bool must_be_active) const OVERRIDE;
const bool must_be_active) const override;
/** See @ref twidget::find. */
twidget* find(const std::string& id, const bool must_be_active) OVERRIDE;
twidget* find(const std::string& id, const bool must_be_active) override;
/** See @ref twidget::find. */
const twidget* find(const std::string& id,
const bool must_be_active) const OVERRIDE;
const bool must_be_active) const override;
/** See @ref twidget::disable_click_dismiss. */
bool disable_click_dismiss() const OVERRIDE;
bool disable_click_dismiss() const override;
/***** ***** ***** setters / getters for members ***** ****** *****/
@ -493,17 +493,17 @@ private:
}
/** See @ref twidget::layout_children. */
virtual void layout_children() OVERRIDE;
virtual void layout_children() override;
/** See @ref twidget::impl_draw_children. */
virtual void impl_draw_children(surface& frame_buffer,
int x_offset,
int y_offset) OVERRIDE;
int y_offset) override;
/** See @ref twidget::child_populate_dirty_list. */
virtual void
child_populate_dirty_list(twindow& caller,
const std::vector<twidget*>& call_stack) OVERRIDE;
const std::vector<twidget*>& call_stack) override;
/**
* Sets the size of the content grid.
@ -520,7 +520,7 @@ private:
void scrollbar_moved();
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
/***** ***** ***** signal handlers ***** ****** *****/

8
src/gui/widgets/scrollbar_panel.hpp
View File

@ -52,17 +52,17 @@ public:
}
/** See @ref tcontrol::get_active. */
virtual bool get_active() const OVERRIDE;
virtual bool get_active() const override;
/** See @ref tcontrol::get_state. */
virtual unsigned get_state() const OVERRIDE;
virtual unsigned get_state() const override;
private:
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
/** See @ref tcontainer_::set_self_active. */
virtual void set_self_active(const bool active) OVERRIDE;
virtual void set_self_active(const bool active) override;
};
// }---------- DEFINITION ---------{

6
src/gui/widgets/slider.hpp
View File

@ -36,7 +36,7 @@ public:
private:
/** See @ref twidget::calculate_best_size. */
virtual tpoint calculate_best_size() const OVERRIDE;
virtual tpoint calculate_best_size() const override;
public:
/***** ***** ***** ***** Inherited ***** ***** ***** *****/
@ -154,7 +154,7 @@ private:
}
/** See @ref tcontrol::update_canvas. */
virtual void update_canvas() OVERRIDE;
virtual void update_canvas() override;
/**
* When the slider shows the minimum value can show a special text.
@ -177,7 +177,7 @@ private:
tlabel_creator value_labels_;
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
/**
* Handlers for keyboard input

14
src/gui/widgets/spacer.hpp
View File

@ -46,22 +46,22 @@ public:
private:
/** See @ref twidget::calculate_best_size. */
virtual tpoint calculate_best_size() const OVERRIDE;
virtual tpoint calculate_best_size() const override;
public:
/***** ***** ***** ***** Inherited ***** ***** ***** *****/
/** See @ref tcontrol::set_active. */
virtual void set_active(const bool active) OVERRIDE;
virtual void set_active(const bool active) override;
/** See @ref tcontrol::get_active. */
virtual bool get_active() const OVERRIDE;
virtual bool get_active() const override;
/** See @ref tcontrol::get_state. */
virtual unsigned get_state() const OVERRIDE;
virtual unsigned get_state() const override;
/** See @ref twidget::disable_click_dismiss. */
bool disable_click_dismiss() const OVERRIDE;
bool disable_click_dismiss() const override;
/***** ***** ***** setters / getters for members ***** ****** *****/
@ -77,10 +77,10 @@ private:
/** See @ref twidget::impl_draw_background. */
virtual void impl_draw_background(surface& frame_buffer,
int x_offset,
int y_offset) OVERRIDE;
int y_offset) override;
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
};
// }---------- DEFINITION ---------{

10
src/gui/widgets/stacked_widget.hpp
View File

@ -43,13 +43,13 @@ public:
/***** ***** ***** inherited ***** ****** *****/
/** See @ref tcontrol::get_active. */
virtual bool get_active() const OVERRIDE;
virtual bool get_active() const override;
/** See @ref tcontrol::get_state. */
virtual unsigned get_state() const OVERRIDE;
virtual unsigned get_state() const override;
/** See @ref twidget::layout_children. */
virtual void layout_children() OVERRIDE;
virtual void layout_children() override;
/**
* Gets the current visible layer number.
@ -104,10 +104,10 @@ private:
void select_layer_internal(const unsigned int layer, const bool select) const;
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
/** See @ref tcontainer_::set_self_active. */
virtual void set_self_active(const bool active) OVERRIDE;
virtual void set_self_active(const bool active) override;
};
// }---------- DEFINITION ---------{

6
src/gui/widgets/text.hpp
View File

@ -47,13 +47,13 @@ public:
ttext_();
/** See @ref tcontrol::set_active. */
virtual void set_active(const bool active) OVERRIDE;
virtual void set_active(const bool active) override;
/** See @ref tcontrol::get_active. */
virtual bool get_active() const OVERRIDE;
virtual bool get_active() const override;
/** See @ref tcontrol::get_state. */
virtual unsigned get_state() const OVERRIDE;
virtual unsigned get_state() const override;
/***** ***** ***** ***** expose some functions ***** ***** ***** *****/

6
src/gui/widgets/text_box.hpp
View File

@ -147,12 +147,12 @@ protected:
/***** ***** ***** ***** layout functions ***** ***** ***** *****/
/** See @ref twidget::place. */
virtual void place(const tpoint& origin, const tpoint& size) OVERRIDE;
virtual void place(const tpoint& origin, const tpoint& size) override;
/***** ***** ***** ***** Inherited ***** ***** ***** *****/
/** See @ref tcontrol::update_canvas. */
virtual void update_canvas() OVERRIDE;
virtual void update_canvas() override;
/** Inherited from ttext_. */
void goto_end_of_line(const bool select = false)
@ -257,7 +257,7 @@ private:
void handle_key_clear_line(SDLMod modifier, bool& handled);
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
/** Inherited from tcontrol. */
void load_config_extra();

12
src/gui/widgets/toggle_button.hpp
View File

@ -40,24 +40,24 @@ public:
void set_members(const string_map& data);
/** See @ref tcontrol::set_active. */
virtual void set_active(const bool active) OVERRIDE;
virtual void set_active(const bool active) override;
/** See @ref tcontrol::get_active. */
virtual bool get_active() const OVERRIDE;
virtual bool get_active() const override;
/** See @ref tcontrol::get_state. */
virtual unsigned get_state() const OVERRIDE;
virtual unsigned get_state() const override;
/** Inherited from tcontrol. */
void update_canvas();
/** Inherited from tselectable_ */
unsigned get_value() const OVERRIDE
unsigned get_value() const override
{
return state_num_;
}
/** Inherited from tselectable_ */
unsigned num_states() const OVERRIDE;
unsigned num_states() const override;
/** Inherited from tselectable_ */
void set_value(const unsigned selected);
@ -128,7 +128,7 @@ private:
std::string icon_name_;
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
/***** ***** ***** signal handlers ***** ****** *****/

24
src/gui/widgets/toggle_panel.hpp
View File

@ -52,20 +52,20 @@ public:
/** See @ref twidget::find_at. */
virtual twidget* find_at(const tpoint& coordinate,
const bool must_be_active) OVERRIDE;
const bool must_be_active) override;
/** See @ref twidget::find_at. */
virtual const twidget* find_at(const tpoint& coordinate,
const bool must_be_active) const OVERRIDE;
const bool must_be_active) const override;
/** See @ref tcontrol::set_active. */
virtual void set_active(const bool active) OVERRIDE;
virtual void set_active(const bool active) override;
/** See @ref tcontrol::get_active. */
virtual bool get_active() const OVERRIDE;
virtual bool get_active() const override;
/** See @ref tcontrol::get_state. */
virtual unsigned get_state() const OVERRIDE;
virtual unsigned get_state() const override;
/**
* See @ref tcontainer_::get_client_rect.
@ -74,7 +74,7 @@ public:
* tpanel_definition we need to override this function and do about the
* same, look at a way to 'fix' that.
*/
virtual SDL_Rect get_client_rect() const OVERRIDE;
virtual SDL_Rect get_client_rect() const override;
/**
* See @ref tcontainer_::border_space.
@ -83,10 +83,10 @@ public:
* tpanel_definition we need to override this function and do about the
* same, look at a way to 'fix' that.
*/
virtual tpoint border_space() const OVERRIDE;
virtual tpoint border_space() const override;
/** Inherited from tselectable_ */
unsigned get_value() const OVERRIDE
unsigned get_value() const override
{
return state_num_;;
}
@ -95,7 +95,7 @@ public:
void set_value(const unsigned selected);
/** Inherited from tselectable_ */
unsigned num_states() const OVERRIDE;
unsigned num_states() const override;
/***** ***** ***** setters / getters for members ***** ****** *****/
@ -161,15 +161,15 @@ private:
/** See @ref twidget::impl_draw_background. */
virtual void impl_draw_background(surface& frame_buffer,
int x_offset,
int y_offset) OVERRIDE;
int y_offset) override;
/** See @ref twidget::impl_draw_foreground. */
virtual void impl_draw_foreground(surface& frame_buffer,
int x_offset,
int y_offset) OVERRIDE;
int y_offset) override;
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
/***** ***** ***** signal handlers ***** ****** *****/

8
src/gui/widgets/tree_view.hpp
View File

@ -62,15 +62,15 @@ public:
/** See @ref twidget::child_populate_dirty_list. */
virtual void
child_populate_dirty_list(twindow& caller,
const std::vector<twidget*>& call_stack) OVERRIDE;
const std::vector<twidget*>& call_stack) override;
/** See @ref tcontainer_::set_self_active. */
virtual void set_self_active(const bool active) OVERRIDE;
virtual void set_self_active(const bool active) override;
bool empty() const;
/** See @ref twidget::layout_children. */
virtual void layout_children() OVERRIDE;
virtual void layout_children() override;
/***** ***** ***** setters / getters for members ***** ****** *****/
@ -153,7 +153,7 @@ private:
virtual void finalize_setup();
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
/***** ***** ***** signal handlers ***** ****** *****/

24
src/gui/widgets/tree_view_node.hpp
View File

@ -135,25 +135,25 @@ public:
*
* @todo Implement properly.
*/
virtual iterator::twalker_* create_walker() OVERRIDE
virtual iterator::twalker_* create_walker() override
{
return NULL;
}
/** See @ref twidget::find_at. */
virtual twidget* find_at(const tpoint& coordinate,
const bool must_be_active) OVERRIDE;
const bool must_be_active) override;
/** See @ref twidget::find_at. */
virtual const twidget* find_at(const tpoint& coordinate,
const bool must_be_active) const OVERRIDE;
const bool must_be_active) const override;
/** See @ref twidget::find. */
twidget* find(const std::string& id, const bool must_be_active) OVERRIDE;
twidget* find(const std::string& id, const bool must_be_active) override;
/** See @ref twidget::find. */
const twidget* find(const std::string& id,
const bool must_be_active) const OVERRIDE;
const bool must_be_active) const override;
/**
* The "size" of the widget.
@ -226,7 +226,7 @@ private:
int calculate_ypos();
/** See @ref twidget::request_reduce_width. */
virtual void request_reduce_width(const unsigned maximum_width) OVERRIDE;
virtual void request_reduce_width(const unsigned maximum_width) override;
/**
* Our parent node.
@ -277,10 +277,10 @@ private:
const std::vector<twidget*>& call_stack);
/** See @ref twidget::calculate_best_size. */
virtual tpoint calculate_best_size() const OVERRIDE;
virtual tpoint calculate_best_size() const override;
/** See @ref twidget::disable_click_dismiss. */
bool disable_click_dismiss() const OVERRIDE;
bool disable_click_dismiss() const override;
tpoint calculate_best_size(const int indention_level,
const unsigned indention_step_size) const;
@ -290,21 +290,21 @@ private:
tpoint get_unfolded_size() const;
/** See @ref twidget::set_origin. */
virtual void set_origin(const tpoint& origin) OVERRIDE;
virtual void set_origin(const tpoint& origin) override;
/** See @ref twidget::place. */
virtual void place(const tpoint& origin, const tpoint& size) OVERRIDE;
virtual void place(const tpoint& origin, const tpoint& size) override;
unsigned
place(const unsigned indention_step_size, tpoint origin, unsigned width);
/** See @ref twidget::set_visible_rectangle. */
virtual void set_visible_rectangle(const SDL_Rect& rectangle) OVERRIDE;
virtual void set_visible_rectangle(const SDL_Rect& rectangle) override;
/** See @ref twidget::impl_draw_children. */
virtual void impl_draw_children(surface& frame_buffer,
int x_offset,
int y_offset) OVERRIDE;
int y_offset) override;
/** See tselectable_::set_callback_state_change. */
boost::function<void(twidget&)> callback_state_change_;

10
src/gui/widgets/unit_preview_pane.hpp
View File

@ -66,13 +66,13 @@ public:
void profile_button_callback();
/** See @ref tcontrol::set_active. */
virtual void set_active(const bool active) OVERRIDE;
virtual void set_active(const bool active) override;
/** See @ref tcontrol::get_active. */
virtual bool get_active() const OVERRIDE;
virtual bool get_active() const override;
/** See @ref tcontrol::get_state. */
virtual unsigned get_state() const OVERRIDE;
virtual unsigned get_state() const override;
private:
std::string current_type_;
@ -92,10 +92,10 @@ private:
};
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
/** See @ref tcontainer_::set_self_active. */
virtual void set_self_active(const bool active) OVERRIDE;
virtual void set_self_active(const bool active) override;
};

2
src/gui/widgets/vertical_scrollbar.hpp
View File

@ -66,7 +66,7 @@ private:
}
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
};
// }---------- DEFINITION ---------{

24
src/gui/widgets/viewport.hpp
View File

@ -49,49 +49,49 @@ public:
~tviewport();
/** See @ref twidget::place. */
virtual void place(const tpoint& origin, const tpoint& size) OVERRIDE;
virtual void place(const tpoint& origin, const tpoint& size) override;
/** See @ref twidget::layout_initialise. */
virtual void layout_initialise(const bool full_initialisation) OVERRIDE;
virtual void layout_initialise(const bool full_initialisation) override;
/** See @ref twidget::impl_draw_children. */
virtual void impl_draw_children(surface& frame_buffer,
int x_offset,
int y_offset) OVERRIDE;
int y_offset) override;
/** See @ref twidget::child_populate_dirty_list. */
virtual void
child_populate_dirty_list(twindow& caller,
const std::vector<twidget*>& call_stack) OVERRIDE;
const std::vector<twidget*>& call_stack) override;
/** See @ref twidget::request_reduce_width. */
virtual void request_reduce_width(const unsigned maximum_width) OVERRIDE;
virtual void request_reduce_width(const unsigned maximum_width) override;
/** See @ref twidget::find_at. */
virtual twidget* find_at(const tpoint& coordinate,
const bool must_be_active) OVERRIDE;
const bool must_be_active) override;
/** See @ref twidget::find_at. */
virtual const twidget* find_at(const tpoint& coordinate,
const bool must_be_active) const OVERRIDE;
const bool must_be_active) const override;
/** See @ref twidget::find. */
twidget* find(const std::string& id, const bool must_be_active) OVERRIDE;
twidget* find(const std::string& id, const bool must_be_active) override;
/** See @ref twidget::find. */
const twidget* find(const std::string& id,
const bool must_be_active) const OVERRIDE;
const bool must_be_active) const override;
private:
/** See @ref twidget::calculate_best_size. */
virtual tpoint calculate_best_size() const OVERRIDE;
virtual tpoint calculate_best_size() const override;
public:
/** See @ref twidget::disable_click_dismiss. */
bool disable_click_dismiss() const OVERRIDE;
bool disable_click_dismiss() const override;
/** See @ref twidget::create_walker. */
virtual iterator::twalker_* create_walker() OVERRIDE;
virtual iterator::twalker_* create_walker() override;
private:
twidget& widget_;

4
src/gui/widgets/widget.hpp
View File

@ -158,7 +158,7 @@ public:
*/
explicit twidget(const tbuilder_widget& builder);
virtual ~twidget() OVERRIDE;
virtual ~twidget() override;
/***** ***** ***** ***** ID functions. ***** ***** ***** *****/
@ -801,7 +801,7 @@ public:
private:
/** See @ref event::tdispatcher::is_at. */
virtual bool is_at(const tpoint& coordinate) const OVERRIDE;
virtual bool is_at(const tpoint& coordinate) const override;
/**
* Is the coordinate inside our area.

10
src/gui/widgets/window.hpp
View File

@ -281,11 +281,11 @@ public:
/** See @ref twidget::find_at. */
virtual twidget* find_at(const tpoint& coordinate,
const bool must_be_active) OVERRIDE;
const bool must_be_active) override;
/** See @ref twidget::find_at. */
virtual const twidget* find_at(const tpoint& coordinate,
const bool must_be_active) const OVERRIDE;
const bool must_be_active) const override;
/** Inherited from twidget. */
tdialog* dialog()
@ -294,11 +294,11 @@ public:
}
/** See @ref twidget::find. */
twidget* find(const std::string& id, const bool must_be_active) OVERRIDE;
twidget* find(const std::string& id, const bool must_be_active) override;
/** See @ref twidget::find. */
const twidget* find(const std::string& id,
const bool must_be_active) const OVERRIDE;
const bool must_be_active) const override;
#if 0
/** @todo Implement these functions. */
@ -669,7 +669,7 @@ private:
Uint8 mouse_button_state_;
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
virtual const std::string& get_control_type() const override;
/**
* Inherited from tpanel.

2
src/help/help_button.hpp
View File

@ -31,7 +31,7 @@ public:
std::string topic() const { return topic_; }
void join();
void leave();
CVideo& get_video() OVERRIDE { return video_; }
CVideo& get_video() override { return video_; }
private:
void show_help();
bool can_execute_command(const hotkey::hotkey_command& command, int/*index*/ =-1) const;

2
src/hotkey/hotkey_handler.hpp
View File

@ -117,7 +117,7 @@ public:
virtual void toggle_grid();
virtual void search();
virtual void toggle_accelerated_speed();
virtual void replay_skip_animation() OVERRIDE
virtual void replay_skip_animation() override
{ return play_controller_.toggle_skipping_replay(); }
virtual std::string get_action_image(hotkey::HOTKEY_COMMAND, int index) const;

20
src/hotkey/hotkey_handler_sp.hpp
View File

@ -77,25 +77,25 @@ public:
assert(playsingle_controller_.get_replay_controller());
return *playsingle_controller_.get_replay_controller();
}
virtual void stop_replay() OVERRIDE
virtual void stop_replay() override
{ return get_replay_controller().stop_replay(); }
virtual void play_replay() OVERRIDE
virtual void play_replay() override
{ return get_replay_controller().play_replay(); }
virtual void replay_next_turn() OVERRIDE
virtual void replay_next_turn() override
{ return get_replay_controller().replay_next_turn(); }
virtual void replay_next_side() OVERRIDE
virtual void replay_next_side() override
{ return get_replay_controller().replay_next_side(); }
virtual void replay_next_move() OVERRIDE
virtual void replay_next_move() override
{ return get_replay_controller().replay_next_move(); }
virtual void replay_show_everything() OVERRIDE
virtual void replay_show_everything() override
{ return get_replay_controller().replay_show_everything(); }
virtual void replay_show_each() OVERRIDE
virtual void replay_show_each() override
{ return get_replay_controller().replay_show_each(); }
virtual void replay_show_team1() OVERRIDE
virtual void replay_show_team1() override
{ return get_replay_controller().replay_show_team1(); }
virtual void reset_replay() OVERRIDE
virtual void reset_replay() override
{ return playsingle_controller_.reset_replay(); }
virtual void replay_exit() OVERRIDE;
virtual void replay_exit() override;
virtual void load_autosave(const std::string& filename);
virtual hotkey::ACTION_STATE get_action_state(hotkey::HOTKEY_COMMAND command, int index) const;
};

2
src/play_controller.hpp
View File

@ -214,7 +214,7 @@ public:
actions::undo_list& get_undo_stack() { return undo_stack(); }
bool is_browsing() const OVERRIDE;
bool is_browsing() const override;
bool is_lingering() const { return linger_; }
class hotkey_handler;

2
src/replay_controller.hpp
View File

@ -62,7 +62,7 @@ private:
void init();
void update_gui();
void rebuild_replay_theme();
void handle_generic_event(const std::string& name) OVERRIDE;
void handle_generic_event(const std::string& name) override;
void reset_replay_ui();
void update_replay_ui();

2
src/scripting/game_lua_kernel.cpp
View File

@ -2974,7 +2974,7 @@ namespace
return cfg;
}
virtual std::string description() const OVERRIDE
virtual std::string description() const override
{
return desc;
}

6
src/synced_checkup.cpp
View File

@ -91,15 +91,15 @@ namespace
virtual ~checkup_choice()
{
}
virtual config random_choice(int /*side*/) const OVERRIDE
virtual config random_choice(int /*side*/) const override
{
throw "not implemented";
}
virtual bool is_visible() const OVERRIDE
virtual bool is_visible() const override
{
return false;
}
virtual config query_user(int /*side*/) const OVERRIDE
virtual config query_user(int /*side*/) const override
{
return cfg_;
}

5
src/variable.hpp
View File

@ -66,13 +66,8 @@ public:
static vconfig empty_vconfig(); // Valid to dereference. Contains nothing
static vconfig unconstructed_vconfig(); // Must not be dereferenced
#ifdef HAVE_CXX11
/// A vconfig evaluates to true iff it can be dereferenced.
explicit operator bool() const { return !null(); }
#else
/// A vconfig evaluates to true iff it can be dereferenced.
operator safe_bool() const { return !null() ? &safe_bool_impl::nonnull : NULL; }
#endif
bool null() const { assert(cfg_); return cfg_ == &default_empty_config; }
void make_safe() const; //!< instruct the vconfig to make a private copy of its underlying data.