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

Missing override qualifiers

Browse source
This commit is contained in:
Gregory A Lundberg 2016-10-12 22:49:27 -05:00
parent 3b52ae37fc
commit 97b20ad60f
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -262,24 +262,24 @@ public:
/**
* Handle terrain sampling before calling generic handler
*/
editor_action* click_left(editor_display& disp, int x, int y);
editor_action* click_left(editor_display& disp, int x, int y) override;
/**
* Handle terrain sampling before calling generic handler
*/
editor_action* click_right(editor_display& disp, int x, int y);
editor_action* click_right(editor_display& disp, int x, int y) override;
/**
* Create an appropriate editor_action and return it
*/
editor_action* click_perform_left(editor_display& disp, const std::set<map_location>& hexes);
editor_action* click_perform_left(editor_display& disp, const std::set<map_location>& hexes) override;
/**
* Create an appropriate editor_action and return it
*/
editor_action* click_perform_right(editor_display& disp, const std::set<map_location>& hexes);
editor_action* click_perform_right(editor_display& disp, const std::set<map_location>& hexes) override;
void set_mouse_overlay(editor_display& disp);
void set_mouse_overlay(editor_display& disp) override;
virtual bool supports_brushes() const override { return true; }
@ -307,19 +307,19 @@ public:
/**
* Show an outline of where the paste will go
*/
std::set<map_location> affected_hexes(editor_display& disp, const map_location& hex);
std::set<map_location> affected_hexes(editor_display& disp, const map_location& hex) override;
/**
* Return a paste with offset action
*/
editor_action* click_left(editor_display& disp, int x, int y);
editor_action* click_left(editor_display& disp, int x, int y) override;
/**
* Right click does nothing for now
*/
editor_action* click_right(editor_display& disp, int x, int y);
editor_action* click_right(editor_display& disp, int x, int y) override;
virtual void set_mouse_overlay(editor_display& disp);
virtual void set_mouse_overlay(editor_display& disp) override;
protected:
/**

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

@ -36,30 +36,30 @@ public:
/**
* Overridden to allow special behavior based on modifier keys
*/
std::set<map_location> affected_hexes(editor_display& disp, const map_location& hex);
std::set<map_location> affected_hexes(editor_display& disp, const map_location& hex) override;
/**
* Force a fake "move" event to update brush overlay on key event
*/
editor_action* key_event(editor_display& disp, const SDL_Event& e);
editor_action* key_event(editor_display& disp, const SDL_Event& e) override;
/**
* Left click/drag selects
*/
editor_action* click_perform_left(editor_display& disp, const std::set<map_location>& hexes);
editor_action* click_perform_left(editor_display& disp, const std::set<map_location>& hexes) override;
/**
* Right click does nothing for now
*/
editor_action* click_right(editor_display& disp, int x, int y);
editor_action* click_right(editor_display& disp, int x, int y) override;
/**
* Right click/drag
*/
editor_action* click_perform_right(editor_display& disp, const std::set<map_location>& hexes);
editor_action* click_perform_right(editor_display& disp, const std::set<map_location>& hexes) override;
virtual void set_mouse_overlay(editor_display& disp);
virtual void set_mouse_overlay(editor_display& disp) override;
virtual bool has_context_menu() const override { return true; }
virtual bool supports_brushes() const override { return true; }