From dba0611175c8d4a56dfbc918ccef139351e5c3e0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 17 Apr 2016 23:06:06 +0300 Subject: Revert "Remove override keyword, if it present with final." This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d. --- src/resources/sprite/imagesprite.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/resources/sprite/imagesprite.h') 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: -- cgit v1.2.3-60-g2f50