summaryrefslogtreecommitdiff
path: root/src/render/imagegraphics.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/render/imagegraphics.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/render/imagegraphics.h')
-rw-r--r--src/render/imagegraphics.h56
1 files changed, 28 insertions, 28 deletions
diff --git a/src/render/imagegraphics.h b/src/render/imagegraphics.h
index bc0eafa04..8d4a72368 100644
--- a/src/render/imagegraphics.h
+++ b/src/render/imagegraphics.h
@@ -51,31 +51,31 @@ class ImegeGraphics final : public Graphics
Image *getTarget() const restrict2 noexcept
{ return mTarget; }
- void beginDraw() restrict2 final
+ void beginDraw() restrict2 override final
{ }
- void endDraw() restrict2 final
+ void endDraw() restrict2 override final
{ }
void pushClipArea(const Rect &restrict rect A_UNUSED)
- restrict2 final
+ restrict2 override final
{ }
- void popClipArea() restrict2 final
+ void popClipArea() restrict2 override final
{ }
void drawRescaledImage(const Image *restrict const image A_UNUSED,
int dstX A_UNUSED, int dstY A_UNUSED,
const int desiredWidth A_UNUSED,
const int desiredHeight A_UNUSED)
- restrict2 final
+ restrict2 override final
{ }
void drawPattern(const Image *restrict const image A_UNUSED,
const int x A_UNUSED,
const int y A_UNUSED,
const int w A_UNUSED,
- const int h A_UNUSED) restrict2 final
+ const int h A_UNUSED) restrict2 override final
{ }
void drawRescaledPattern(const Image *const image A_UNUSED,
@@ -85,7 +85,7 @@ class ImegeGraphics final : public Graphics
const int h A_UNUSED,
const int scaledWidth A_UNUSED,
const int scaledHeight A_UNUSED)
- final
+ override final
{ }
void calcPattern(ImageVertexes *restrict const vert A_UNUSED,
@@ -93,7 +93,7 @@ class ImegeGraphics final : public Graphics
const int x A_UNUSED,
const int y A_UNUSED,
const int w A_UNUSED,
- const int h A_UNUSED) const restrict2 final
+ const int h A_UNUSED) const restrict2 override final
{ }
void calcPattern(ImageCollection *restrict const vert A_UNUSED,
@@ -101,37 +101,37 @@ class ImegeGraphics final : public Graphics
const int x A_UNUSED,
const int y A_UNUSED,
const int w A_UNUSED,
- const int h A_UNUSED) const restrict2 final
+ const int h A_UNUSED) const restrict2 override final
{ }
void calcTileVertexes(ImageVertexes *restrict const vert A_UNUSED,
const Image *restrict const image A_UNUSED,
int x A_UNUSED,
- int y A_UNUSED) const restrict2 final
+ int y A_UNUSED) const restrict2 override final
A_NONNULL(2, 3)
{ }
void calcTileSDL(ImageVertexes *restrict const vert A_UNUSED,
int x A_UNUSED,
- int y A_UNUSED) const restrict2 final
+ int y A_UNUSED) const restrict2 override final
{ }
void calcTileCollection(ImageCollection *restrict const
vertCol A_UNUSED,
const Image *restrict const image A_UNUSED,
int x A_UNUSED,
- int y A_UNUSED) restrict2 final
+ int y A_UNUSED) restrict2 override final
{ }
void drawTileVertexes(const ImageVertexes *const
- vert A_UNUSED) final
+ vert A_UNUSED) override final
{ }
void drawTileCollection(const ImageCollection *const vertCol A_UNUSED)
- final A_NONNULL(2)
+ override final A_NONNULL(2)
{ }
- void updateScreen() final
+ void updateScreen() override final
{ }
void drawNet(const int x1 A_UNUSED,
@@ -139,28 +139,28 @@ class ImegeGraphics final : public Graphics
const int x2 A_UNUSED,
const int y2 A_UNUSED,
const int width A_UNUSED,
- const int height A_UNUSED) final
+ const int height A_UNUSED) override final
{ }
void calcWindow(ImageCollection *restrict const vertCol A_UNUSED,
const int x A_UNUSED, const int y A_UNUSED,
const int w A_UNUSED, const int h A_UNUSED,
const ImageRect &restrict imgRect A_UNUSED)
- restrict2 final A_NONNULL(2)
+ restrict2 override final A_NONNULL(2)
{ }
- void fillRectangle(const Rect &rect A_UNUSED) final
+ void fillRectangle(const Rect &rect A_UNUSED) override final
{ }
- void drawRectangle(const Rect &rect A_UNUSED) restrict2 final
+ void drawRectangle(const Rect &rect A_UNUSED) restrict2 override final
{ }
- void drawPoint(int x A_UNUSED, int y A_UNUSED) final
+ void drawPoint(int x A_UNUSED, int y A_UNUSED) override final
{ }
void drawLine(int x1 A_UNUSED, int y1 A_UNUSED,
int x2 A_UNUSED, int y2 A_UNUSED)
- restrict2 final
+ restrict2 override final
{ }
bool setVideoMode(const int w A_UNUSED, const int h A_UNUSED,
@@ -168,26 +168,26 @@ class ImegeGraphics final : public Graphics
const int bpp A_UNUSED,
const bool fs A_UNUSED, const bool hwaccel A_UNUSED,
const bool resize A_UNUSED,
- const bool noFrame A_UNUSED) restrict2 final
+ const bool noFrame A_UNUSED) restrict2 override final
{ return false; }
void drawImage(const Image *const image,
- int dstX, int dstY) final;
+ int dstX, int dstY) override final;
void copyImage(const Image *const image,
- int dstX, int dstY) restrict2 final;
+ int dstX, int dstY) restrict2 override final;
void drawImageCached(const Image *const image,
- int x, int y) final;
+ int x, int y) override final;
void drawPatternCached(const Image *restrict const image A_UNUSED,
const int x A_UNUSED,
const int y A_UNUSED,
const int w A_UNUSED,
- const int h A_UNUSED) restrict2 final
+ const int h A_UNUSED) restrict2 override final
{ }
- void completeCache() restrict2 final;
+ void completeCache() restrict2 override final;
/**
* Draws a rectangle using images. 4 corner images, 4 side images and 1
@@ -195,7 +195,7 @@ class ImegeGraphics final : public Graphics
*/
void drawImageRect(const int x A_UNUSED, const int y A_UNUSED,
const int w A_UNUSED, const int h A_UNUSED,
- const ImageRect &imgRect A_UNUSED) final
+ const ImageRect &imgRect A_UNUSED) override final
{ }
protected: