summaryrefslogtreecommitdiff
path: root/src/resources/sprite
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-17 23:06:06 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-17 23:06:56 +0300
commitdba0611175c8d4a56dfbc918ccef139351e5c3e0 (patch)
treeb3c7a5684604facc0f0f5656fe373958c53dc5ad /src/resources/sprite
parent53530f76275df76406a9ce438a33df78c50d0948 (diff)
downloadmanaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.gz
manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.bz2
manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.xz
manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.zip
Revert "Remove override keyword, if it present with final."
This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.
Diffstat (limited to 'src/resources/sprite')
-rw-r--r--src/resources/sprite/animatedsprite.h26
-rw-r--r--src/resources/sprite/imagesprite.h22
2 files changed, 24 insertions, 24 deletions
diff --git a/src/resources/sprite/animatedsprite.h b/src/resources/sprite/animatedsprite.h
index cdf5680eb..dcf8045fb 100644
--- a/src/resources/sprite/animatedsprite.h
+++ b/src/resources/sprite/animatedsprite.h
@@ -63,47 +63,47 @@ class AnimatedSprite final : public Sprite
~AnimatedSprite();
- bool reset() restrict2 final;
+ bool reset() restrict2 override final;
- bool play(const std::string &restrict action) restrict2 final;
+ bool play(const std::string &restrict action) restrict2 override final;
- bool update(const int time) restrict2 final;
+ bool update(const int time) restrict2 override final;
void draw(Graphics *restrict const graphics,
const int posX,
- const int posY) const restrict2 final A_NONNULL(2);
+ const int posY) const restrict2 override final A_NONNULL(2);
void drawRaw(Graphics *restrict const graphics,
const int posX,
const int posY) const restrict2 A_NONNULL(2);
- int getWidth() const restrict2 final A_WARN_UNUSED;
+ int getWidth() const restrict2 override final A_WARN_UNUSED;
- int getHeight() const restrict2 final A_WARN_UNUSED;
+ int getHeight() const restrict2 override final A_WARN_UNUSED;
- const Image* getImage() const restrict2 noexcept final
+ const Image* getImage() const restrict2 noexcept override final
A_WARN_UNUSED;
bool setSpriteDirection(const SpriteDirection::Type direction)
- restrict2 final;
+ restrict2 override final;
int getNumberOfLayers() const restrict2 noexcept A_WARN_UNUSED
{ return 1; }
std::string getIdPath() const restrict2 A_WARN_UNUSED;
- unsigned int getCurrentFrame() const restrict2 noexcept final
+ unsigned int getCurrentFrame() const restrict2 noexcept override final
A_WARN_UNUSED
{ return mFrameIndex; }
unsigned int getFrameCount() const
- restrict2 final A_WARN_UNUSED;
+ restrict2 override final A_WARN_UNUSED;
- void setAlpha(float alpha) restrict2 final;
+ void setAlpha(float alpha) restrict2 override final;
- const void *getHash() const restrict2 final A_WARN_UNUSED;
+ const void *getHash() const restrict2 override final A_WARN_UNUSED;
- bool updateNumber(const unsigned num) restrict2 final;
+ bool updateNumber(const unsigned num) restrict2 override final;
void clearDelayLoad() restrict2 noexcept
{ mDelayLoad = nullptr; }
diff --git a/src/resources/sprite/imagesprite.h b/src/resources/sprite/imagesprite.h
index 21ff03d90..c3fa39fae 100644
--- a/src/resources/sprite/imagesprite.h
+++ b/src/resources/sprite/imagesprite.h
@@ -37,42 +37,42 @@ class ImageSprite final : public Sprite
~ImageSprite();
- bool reset() final
+ bool reset() override final
{ return false; }
- bool play(const std::string &action A_UNUSED) final
+ bool play(const std::string &action A_UNUSED) override final
{ return false; }
- bool update(const int time A_UNUSED) final
+ bool update(const int time A_UNUSED) override final
{ return false; }
void draw(Graphics *const graphics,
const int posX, const int posY)
- const final A_NONNULL(2);
+ const override final A_NONNULL(2);
- int getWidth() const final A_WARN_UNUSED
+ int getWidth() const override final A_WARN_UNUSED
{ return mImage ? mImage->getWidth() : 0; }
- int getHeight() const final A_WARN_UNUSED
+ int getHeight() const override final A_WARN_UNUSED
{ return mImage ? mImage->getHeight() : 0; }
- const Image* getImage() const final A_WARN_UNUSED
+ const Image* getImage() const override final A_WARN_UNUSED
{ return mImage; }
bool setSpriteDirection(const SpriteDirection::Type
- direction A_UNUSED) final
+ direction A_UNUSED) override final
{ return false; }
int getNumberOfLayers() const A_WARN_UNUSED
{ return 1; }
- unsigned int getCurrentFrame() const final A_WARN_UNUSED
+ unsigned int getCurrentFrame() const override final A_WARN_UNUSED
{ return 0; }
- unsigned int getFrameCount() const final A_WARN_UNUSED
+ unsigned int getFrameCount() const override final A_WARN_UNUSED
{ return 1; }
- bool updateNumber(const unsigned num A_UNUSED) final
+ bool updateNumber(const unsigned num A_UNUSED) override final
{ return false; }
private: