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

Add some const, virtual, and override qualifiers

Browse source 
Also a new non-const version of a wrapper.
This commit is contained in:
JaMiT 2016-09-04 23:55:21 -05:00
parent 4212a3c660
commit 44741dc36d
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/editor/action/mouse/mouse_action.hpp
View file

@ -121,7 +121,7 @@ public:
common_palette& get_palette() { return palette_; }
/** Whether we need the brush bar, is used to grey it out.*/
virtual bool supports_brushes() { return false; }
virtual bool supports_brushes() const { return false; }
/**
* Set the mouse overlay for this action. Defaults to an empty overlay.
@ -281,7 +281,7 @@ public:
void set_mouse_overlay(editor_display& disp);
bool supports_brushes() { return true; }
virtual bool supports_brushes() const override { return true; }
protected:
@ -302,7 +302,7 @@ public:
{
}
bool has_context_menu() const;
virtual bool has_context_menu() const override;
/**
* Show an outline of where the paste will go

4
src/editor/action/mouse/mouse_action_select.hpp
View file

@ -61,8 +61,8 @@ public:
virtual void set_mouse_overlay(editor_display& disp);
bool has_context_menu() const { return true; }
bool supports_brushes() { return true; }
virtual bool has_context_menu() const override { return true; }
virtual bool supports_brushes() const override { return true; }
};

4
src/editor/controller/editor_controller.hpp
View file

@ -173,7 +173,9 @@ class editor_controller : public controller_base,
editor_display& get_display() override { return *gui_; }
/** Get the current mouse action */
mouse_action& get_mouse_action() const { return toolkit_->get_mouse_action(); }
const mouse_action& get_mouse_action() const { return toolkit_->get_mouse_action(); }
/** Get the current mouse action */
mouse_action& get_mouse_action() { return toolkit_->get_mouse_action(); }
/**
* Perform an action, then delete the action object.