From 812d9efc5f3ef90c81ffa04c3780cd0ada7e3e71 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 24 Oct 2013 12:18:34 +0300 Subject: add final keyword to resources files. --- src/resources/atlasmanager.h | 4 ++-- src/resources/openglimagehelper.h | 10 ++++++---- src/resources/sdl2imagehelper.h | 10 ++++++---- src/resources/sdl2softwareimagehelper.h | 10 ++++++---- src/resources/sdlimagehelper.h | 9 +++++---- src/resources/subimage.h | 2 +- src/resources/surfaceimagehelper.h | 12 +++++++----- 7 files changed, 33 insertions(+), 24 deletions(-) (limited to 'src/resources') diff --git a/src/resources/atlasmanager.h b/src/resources/atlasmanager.h index 8b2baef17..bf95c5d1c 100644 --- a/src/resources/atlasmanager.h +++ b/src/resources/atlasmanager.h @@ -86,9 +86,9 @@ class AtlasResource final : public Resource ~AtlasResource(); - void incRef() override; + void incRef() override final; - void decRef() override; + void decRef() override final; std::vector atlases; }; diff --git a/src/resources/openglimagehelper.h b/src/resources/openglimagehelper.h index 18b25fe2f..8d2348ed9 100644 --- a/src/resources/openglimagehelper.h +++ b/src/resources/openglimagehelper.h @@ -77,17 +77,18 @@ class OpenGLImageHelper final : public ImageHelper * otherwise. */ Image *load(SDL_RWops *const rw, - Dye const &dye) const override A_WARN_UNUSED; + Dye const &dye) const override final A_WARN_UNUSED; /** * Loads an image from an SDL surface. */ - Image *load(SDL_Surface *const tmpImage) const override A_WARN_UNUSED; + Image *load(SDL_Surface *const tmpImage) const + override final A_WARN_UNUSED; Image *createTextSurface(SDL_Surface *const tmpImage, const int width, const int height, const float alpha) - const override A_WARN_UNUSED; + const override final A_WARN_UNUSED; // OpenGL only public functions @@ -115,7 +116,8 @@ class OpenGLImageHelper final : public ImageHelper static void setUseTextureSampler(const bool b) { mUseTextureSampler = b; } - SDL_Surface *create32BitSurface(int width, int height) const override; + SDL_Surface *create32BitSurface(int width, + int height) const override final; protected: /** diff --git a/src/resources/sdl2imagehelper.h b/src/resources/sdl2imagehelper.h index 78800fda0..d951422e5 100644 --- a/src/resources/sdl2imagehelper.h +++ b/src/resources/sdl2imagehelper.h @@ -61,17 +61,18 @@ class SDLImageHelper final : public ImageHelper * otherwise. */ Image *load(SDL_RWops *const rw, - Dye const &dye) const override A_WARN_UNUSED; + Dye const &dye) const override final A_WARN_UNUSED; /** * Loads an image from an SDL surface. */ - Image *load(SDL_Surface *const tmpImage) const override A_WARN_UNUSED; + Image *load(SDL_Surface *const tmpImage) const + override final A_WARN_UNUSED; Image *createTextSurface(SDL_Surface *const tmpImage, const int width, const int height, const float alpha) - const override A_WARN_UNUSED; + const override final A_WARN_UNUSED; static void SDLSetEnableAlphaCache(const bool n) { mEnableAlphaCache = n; } @@ -82,7 +83,8 @@ class SDLImageHelper final : public ImageHelper static SDL_Surface* SDLDuplicateSurface(SDL_Surface *const tmpImage) A_WARN_UNUSED; - SDL_Surface *create32BitSurface(int width, int height) const override; + SDL_Surface *create32BitSurface(int width, int height) const + override final; static int combineSurface(SDL_Surface *const src, SDL_Rect *const srcrect, diff --git a/src/resources/sdl2softwareimagehelper.h b/src/resources/sdl2softwareimagehelper.h index aba8e020c..906e9a9b0 100644 --- a/src/resources/sdl2softwareimagehelper.h +++ b/src/resources/sdl2softwareimagehelper.h @@ -61,17 +61,18 @@ class SDL2SoftwareImageHelper final : public ImageHelper * otherwise. */ Image *load(SDL_RWops *const rw, - Dye const &dye) const override A_WARN_UNUSED; + Dye const &dye) const override final A_WARN_UNUSED; /** * Loads an image from an SDL surface. */ - Image *load(SDL_Surface *const tmpImage) const override A_WARN_UNUSED; + Image *load(SDL_Surface *const tmpImage) const + override final A_WARN_UNUSED; Image *createTextSurface(SDL_Surface *const tmpImage, const int width, const int height, const float alpha) - const override A_WARN_UNUSED; + const override final A_WARN_UNUSED; static void SDLSetEnableAlphaCache(const bool n) { mEnableAlphaCache = n; } @@ -82,7 +83,8 @@ class SDL2SoftwareImageHelper final : public ImageHelper static SDL_Surface* SDLDuplicateSurface(SDL_Surface *const tmpImage) A_WARN_UNUSED; - SDL_Surface *create32BitSurface(int width, int height) const override; + SDL_Surface *create32BitSurface(int width, + int height) const override final; static int combineSurface(SDL_Surface *const src, SDL_Rect *const srcrect, diff --git a/src/resources/sdlimagehelper.h b/src/resources/sdlimagehelper.h index c73287edf..f7bd4b3c2 100644 --- a/src/resources/sdlimagehelper.h +++ b/src/resources/sdlimagehelper.h @@ -62,17 +62,17 @@ class SDLImageHelper final : public ImageHelper * otherwise. */ Image *load(SDL_RWops *const rw, - Dye const &dye) const override A_WARN_UNUSED; + Dye const &dye) const override final A_WARN_UNUSED; /** * Loads an image from an SDL surface. */ - Image *load(SDL_Surface *const tmpImage) const override A_WARN_UNUSED; + Image *load(SDL_Surface *const tmpImage) const override final A_WARN_UNUSED; Image *createTextSurface(SDL_Surface *const tmpImage, const int width, const int height, const float alpha) - const override A_WARN_UNUSED; + const override final A_WARN_UNUSED; static void SDLSetEnableAlphaCache(const bool n) { mEnableAlphaCache = n; } @@ -83,7 +83,8 @@ class SDLImageHelper final : public ImageHelper static SDL_Surface* SDLDuplicateSurface(SDL_Surface *const tmpImage) A_WARN_UNUSED; - SDL_Surface *create32BitSurface(int width, int height) const override; + SDL_Surface *create32BitSurface(int width, + int height) const override final; static int combineSurface(SDL_Surface *const src, SDL_Rect *const srcrect, diff --git a/src/resources/subimage.h b/src/resources/subimage.h index 234015893..43e8eda14 100644 --- a/src/resources/subimage.h +++ b/src/resources/subimage.h @@ -77,7 +77,7 @@ class SubImage final : public Image */ Image *getSubImage(const int x, const int y, const int width, - const int height) override A_WARN_UNUSED; + const int height) override final A_WARN_UNUSED; SDL_Rect mInternalBounds; diff --git a/src/resources/surfaceimagehelper.h b/src/resources/surfaceimagehelper.h index dbc859e9a..75a39c617 100644 --- a/src/resources/surfaceimagehelper.h +++ b/src/resources/surfaceimagehelper.h @@ -63,17 +63,18 @@ class SurfaceImageHelper final : public ImageHelper * otherwise. */ Image *load(SDL_RWops *const rw, - Dye const &dye) const override A_WARN_UNUSED; + Dye const &dye) const override final A_WARN_UNUSED; /** * Loads an image from an SDL surface. */ - Image *load(SDL_Surface *const tmpImage) const override A_WARN_UNUSED; + Image *load(SDL_Surface *const tmpImage) const + override final A_WARN_UNUSED; Image *createTextSurface(SDL_Surface *const tmpImage, const int width, const int height, const float alpha) - const override A_WARN_UNUSED; + const override final A_WARN_UNUSED; static void SDLSetEnableAlphaCache(const bool n) { mEnableAlphaCache = n; } @@ -85,12 +86,13 @@ class SurfaceImageHelper final : public ImageHelper * Tells if the image was loaded using OpenGL or SDL * @return true if OpenGL, false if SDL. */ - RenderType useOpenGL() const override A_WARN_UNUSED; + RenderType useOpenGL() const override final A_WARN_UNUSED; static SDL_Surface* SDLDuplicateSurface(SDL_Surface *const tmpImage) A_WARN_UNUSED; - SDL_Surface *create32BitSurface(int width, int height) const override; + SDL_Surface *create32BitSurface(int width, + int height) const override final; static int combineSurface(SDL_Surface *const src, SDL_Rect *const srcrect, -- cgit v1.2.3-70-g09d2