games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Merge pull request #283 from janisozaur/override

Browse Source 
Add `override` keyword where applicable
This commit is contained in:
DjWarmonger 2017-02-19 21:42:26 +01:00 committed by GitHub
commit 1f08878620
5 changed files with 107 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AI/BattleAI/BattleAI.h
View File

@ -78,7 +78,7 @@ public:
void print(const std::string &text) const;
BattleAction useCatapult(const CStack *stack);
void battleStart(const CCreatureSet * army1, const CCreatureSet * army2, int3 tile, const CGHeroInstance * hero1, const CGHeroInstance * hero2, bool Side);
void battleStart(const CCreatureSet * army1, const CCreatureSet * army2, int3 tile, const CGHeroInstance * hero1, const CGHeroInstance * hero2, bool Side) override;
//void actionFinished(const BattleAction &action) override;//occurs AFTER every action taken by any stack or by the hero
//void actionStarted(const BattleAction &action) override;//occurs BEFORE every action taken by any stack or by the hero
//void battleAttack(const BattleAttack *ba) override; //called when stack is performing attack

2
launcher/modManager/cmodlistmodel_moc.h
View File

@ -78,7 +78,7 @@ class CModFilterModel : public QSortFilterProxyModel
bool filterMatchesThis(const QModelIndex & source) const;
bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
public:
void setTypeFilter(int filteredType, int filterMask);

4
launcher/modManager/cmodlistview_moc.h
View File

@ -27,9 +27,9 @@ class CModListView : public QWidget
SettingsListener settingsListener;
bool repositoriesChanged;
void showEvent(QShowEvent * event);
void showEvent(QShowEvent * event) override;
void keyPressEvent(QKeyEvent * event);
void keyPressEvent(QKeyEvent * event) override;
void setupModModel();
void setupFilterModel();

4
launcher/modManager/imageviewer_moc.h
View File

@ -19,8 +19,8 @@ public:
static void showPixmap(QPixmap & pixmap, QWidget *parent = 0);
protected:
void mousePressEvent(QMouseEvent * event);
void keyPressEvent(QKeyEvent * event);
void mousePressEvent(QMouseEvent * event) override;
void keyPressEvent(QKeyEvent * event) override;
QSize calculateWindowSize();

4
server/CGameHandler.cpp
View File

@ -93,7 +93,7 @@ public:
template <typename T> class CApplyOnGH : public CBaseForGHApply
{
public:
bool applyOnGH(CGameHandler *gh, CConnection *c, void *pack, PlayerColor player) const
bool applyOnGH(CGameHandler *gh, CConnection *c, void *pack, PlayerColor player) const override
{
T *ptr = static_cast<T*>(pack);
ptr->c = c;
@ -106,7 +106,7 @@ template <>
class CApplyOnGH<CPack> : public CBaseForGHApply
{
public:
bool applyOnGH(CGameHandler *gh, CConnection *c, void *pack, PlayerColor player) const
bool applyOnGH(CGameHandler *gh, CConnection *c, void *pack, PlayerColor player) const override
{
logGlobal->error("Cannot apply on GH plain CPack!");
assert(0);