summaryrefslogtreecommitdiff
path: root/src/resources/safeopenglimagehelper.h
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/safeopenglimagehelper.h
parent53530f76275df76406a9ce438a33df78c50d0948 (diff)
downloadmv-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.gz
mv-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.bz2
mv-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.xz
mv-dba0611175c8d4a56dfbc918ccef139351e5c3e0.zip
Revert "Remove override keyword, if it present with final."
This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.
Diffstat (limited to 'src/resources/safeopenglimagehelper.h')
-rw-r--r--src/resources/safeopenglimagehelper.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/resources/safeopenglimagehelper.h b/src/resources/safeopenglimagehelper.h
index ab4dcdb13..9b65f5262 100644
--- a/src/resources/safeopenglimagehelper.h
+++ b/src/resources/safeopenglimagehelper.h
@@ -78,18 +78,18 @@ class SafeOpenGLImageHelper final : public ImageHelper
* otherwise.
*/
Image *load(SDL_RWops *const rw,
- Dye const &dye) final A_WARN_UNUSED;
+ Dye const &dye) override final A_WARN_UNUSED;
/**
* Loads an image from an SDL surface.
*/
Image *load(SDL_Surface *const tmpImage)
- final A_WARN_UNUSED;
+ override final A_WARN_UNUSED;
Image *createTextSurface(SDL_Surface *const tmpImage,
const int width, const int height,
const float alpha)
- final A_WARN_UNUSED;
+ override final A_WARN_UNUSED;
// OpenGL only public functions
@@ -122,13 +122,13 @@ class SafeOpenGLImageHelper final : public ImageHelper
static void bindTexture(const GLuint texture);
SDL_Surface *create32BitSurface(int width,
- int height) const final;
+ int height) const override final;
- void postInit() final;
+ void postInit() override final;
void copySurfaceToImage(const Image *const image,
const int x, const int y,
- SDL_Surface *surface) const final;
+ SDL_Surface *surface) const override final;
protected:
/**