games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Add "override" to virtual overriden methods

Browse Source
This commit is contained in:
Vadim Markovtsev
2015-10-12 16:47:10 +03:00
parent abe02247b5
commit e4b1ef1405
55 changed files with 433 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/gui/CIntObject.h
View File

@@ -157,15 +157,15 @@ public:
// activate or deactivate object. Inactive object won't receive any input events (keyboard\mouse)
// usually used automatically by parent
void activate();
void deactivate();
void activate() override;
void deactivate() override;
//called each frame to update screen
void show(SDL_Surface * to);
void show(SDL_Surface * to) override;
//called on complete redraw only
void showAll(SDL_Surface * to);
void showAll(SDL_Surface * to) override;
//request complete redraw of this object
void redraw();
void redraw() override;
enum EAlignment {TOPLEFT, CENTER, BOTTOMRIGHT};
@@ -212,5 +212,5 @@ public:
CKeyShortcut();
CKeyShortcut(int key);
CKeyShortcut(std::set<int> Keys);
virtual void keyPressed(const SDL_KeyboardEvent & key); //call-in
virtual void keyPressed(const SDL_KeyboardEvent & key) override; //call-in
};