mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-25 03:40:40 +00:00
Code Issues Projects Releases Wiki Activity

Mark some methods as overrides to avoid warnings

Browse Source
This commit is contained in:
Andrei Kortunov 2020-07-04 10:36:02 +04:00
parent ce597ff908
commit 9ec61c14d2
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/openmw/mwgui/hud.hpp
View File

@ -47,7 +47,7 @@ namespace MWGui
void setCrosshairVisible(bool visible); void setCrosshairVisible(bool visible);
void setCrosshairOwned(bool owned); void setCrosshairOwned(bool owned);
void onFrame(float dt); void onFrame(float dt) override;
void setCellName(const std::string& cellName); void setCellName(const std::string& cellName);
@ -58,7 +58,7 @@ namespace MWGui
void setEnemy(const MWWorld::Ptr& enemy); void setEnemy(const MWWorld::Ptr& enemy);
void resetEnemy(); void resetEnemy();
void clear(); void clear() override;
private: private:
MyGUI::ProgressBar *mHealth, *mMagicka, *mStamina, *mEnemyHealth, *mDrowning; MyGUI::ProgressBar *mHealth, *mMagicka, *mStamina, *mEnemyHealth, *mDrowning;
@ -112,8 +112,8 @@ namespace MWGui
void onMapClicked(MyGUI::Widget* _sender); void onMapClicked(MyGUI::Widget* _sender);
// LocalMapBase // LocalMapBase
virtual void customMarkerCreated(MyGUI::Widget* marker); virtual void customMarkerCreated(MyGUI::Widget* marker) override;
virtual void doorMarkerCreated(MyGUI::Widget* marker); virtual void doorMarkerCreated(MyGUI::Widget* marker) override;
void updateEnemyHealthBar(); void updateEnemyHealthBar();

8
apps/openmw/mwgui/statswindow.hpp
View File

@ -18,7 +18,7 @@ namespace MWGui
StatsWindow(DragAndDrop* drag); StatsWindow(DragAndDrop* drag);
/// automatically updates all the data in the stats window, but only if it has changed. /// automatically updates all the data in the stats window, but only if it has changed.
void onFrame(float dt); void onFrame(float dt) override;
void setBar(const std::string& name, const std::string& tname, int val, int max); void setBar(const std::string& name, const std::string& tname, int val, int max);
void setPlayerName(const std::string& playerName); void setPlayerName(const std::string& playerName);
@ -35,7 +35,7 @@ namespace MWGui
void setBounty (int bounty) { if (bounty != mBounty) mChanged = true; this->mBounty = bounty; } void setBounty (int bounty) { if (bounty != mBounty) mChanged = true; this->mBounty = bounty; }
void updateSkillArea(); void updateSkillArea();
virtual void onOpen() { onWindowResize(mMainWidget->castType<MyGUI::Window>()); } virtual void onOpen() override { onWindowResize(mMainWidget->castType<MyGUI::Window>()); }
private: private:
void addSkills(const SkillList &skills, const std::string &titleId, const std::string &titleDefault, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2); void addSkills(const SkillList &skills, const std::string &titleId, const std::string &titleDefault, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
@ -70,8 +70,8 @@ namespace MWGui
const int mMinFullWidth; const int mMinFullWidth;
protected: protected:
virtual void onPinToggled(); virtual void onPinToggled() override;
virtual void onTitleDoubleClicked(); virtual void onTitleDoubleClicked() override;
}; };
} }
#endif #endif