Rename drawImage2 methods into drawImage.

14 files changed, 28 insertions, 28 deletions

diff --git a/src/render/graphics.h b/src/render/graphics.h
index 35e2a3ba3..14784a408 100644
--- a/src/render/graphics.h
+++ b/src/render/graphics.h
@@ -377,8 +377,8 @@ class Graphics
          * @return <code>true</code> if the image was blitted properly
          *         <code>false</code> otherwise.
          */
-        virtual bool drawImage2(const Image *const image,
-                                int dstX, int dstY) = 0;
+        virtual bool drawImage(const Image *const image,
+                               int dstX, int dstY) = 0;
 
         virtual void drawImageCached(const Image *const image,
                                      int srcX, int srcY) = 0;
diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp
index a2f7909ff..b306cf021 100644
--- a/src/render/mobileopenglgraphics.cpp
+++ b/src/render/mobileopenglgraphics.cpp
@@ -219,7 +219,7 @@ static inline void drawRescaledQuad(const Image *const image,
     }
 }
 
-bool MobileOpenGLGraphics::drawImage2(const Image *const image,
+bool MobileOpenGLGraphics::drawImage(const Image *const image,
                                       int dstX, int dstY)
 {
     return drawImageInline(image, dstX, dstY);
@@ -228,7 +228,7 @@ bool MobileOpenGLGraphics::drawImage2(const Image *const image,
 bool MobileOpenGLGraphics::drawImageInline(const Image *const image,
                                            int dstX, int dstY)
 {
-    FUNC_BLOCK("Graphics::drawImage2", 1)
+    FUNC_BLOCK("Graphics::drawImage", 1)
     if (!image)
         return false;
 
diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp
index 67a18bde5..0a57c8341 100644
--- a/src/render/normalopenglgraphics.cpp
+++ b/src/render/normalopenglgraphics.cpp
@@ -286,7 +286,7 @@ static inline void drawRescaledQuad(const Image *const image,
     }
 }
 
-bool NormalOpenGLGraphics::drawImage2(const Image *const image,
+bool NormalOpenGLGraphics::drawImage(const Image *const image,
                                       int dstX, int dstY)
 {
     return drawImageInline(image, dstX, dstY);
@@ -295,7 +295,7 @@ bool NormalOpenGLGraphics::drawImage2(const Image *const image,
 bool NormalOpenGLGraphics::drawImageInline(const Image *const image,
                                            int dstX, int dstY)
 {
-    FUNC_BLOCK("Graphics::drawImage2", 1)
+    FUNC_BLOCK("Graphics::drawImage", 1)
     if (!image)
         return false;
 
diff --git a/src/render/nullopenglgraphics.cpp b/src/render/nullopenglgraphics.cpp
index 6018247f9..8dd4ca91f 100644
--- a/src/render/nullopenglgraphics.cpp
+++ b/src/render/nullopenglgraphics.cpp
@@ -139,7 +139,7 @@ static inline void drawRescaledQuad(const Image *const image A_UNUSED,
     }
 }
 
-bool NullOpenGLGraphics::drawImage2(const Image *const image,
+bool NullOpenGLGraphics::drawImage(const Image *const image,
                                     int dstX, int dstY)
 {
     return drawImageInline(image, dstX, dstY);
@@ -148,7 +148,7 @@ bool NullOpenGLGraphics::drawImage2(const Image *const image,
 bool NullOpenGLGraphics::drawImageInline(const Image *const image,
                                          int dstX, int dstY)
 {
-    FUNC_BLOCK("Graphics::drawImage2", 1)
+    FUNC_BLOCK("Graphics::drawImage", 1)
     if (!image)
         return false;
 
diff --git a/src/render/openglgraphicsdef.hpp b/src/render/openglgraphicsdef.hpp
index a582d9043..d3fcebf81 100644
--- a/src/render/openglgraphicsdef.hpp
+++ b/src/render/openglgraphicsdef.hpp
@@ -130,8 +130,8 @@
 
         void updateTextureFormat();
 
-        bool drawImage2(const Image *const image,
-                        int dstX, int dstY) override final;
+        bool drawImage(const Image *const image,
+                       int dstX, int dstY) override final;
 
         void drawImageCached(const Image *const image,
                              int x, int y) override final;
diff --git a/src/render/safeopenglgraphics.cpp b/src/render/safeopenglgraphics.cpp
index c1c266464..342495a47 100644
--- a/src/render/safeopenglgraphics.cpp
+++ b/src/render/safeopenglgraphics.cpp
@@ -142,7 +142,7 @@ static inline void drawRescaledQuad(const Image *const image,
     }
 }
 
-bool SafeOpenGLGraphics::drawImage2(const Image *const image,
+bool SafeOpenGLGraphics::drawImage(const Image *const image,
                                     int dstX, int dstY)
 {
     return drawImageInline(image, dstX, dstY);
@@ -151,7 +151,7 @@ bool SafeOpenGLGraphics::drawImage2(const Image *const image,
 bool SafeOpenGLGraphics::drawImageInline(const Image *const image,
                                          int dstX, int dstY)
 {
-    FUNC_BLOCK("Graphics::drawImage2", 1)
+    FUNC_BLOCK("Graphics::drawImage", 1)
     if (!image)
         return false;
 
diff --git a/src/render/sdl2graphics.cpp b/src/render/sdl2graphics.cpp
index 053049cef..ac7d8debc 100644
--- a/src/render/sdl2graphics.cpp
+++ b/src/render/sdl2graphics.cpp
@@ -157,7 +157,7 @@ bool SDLGraphics::drawRescaledImage(const Image *const image,
         &srcRect, &dstRect) < 0);
 }
 
-bool SDLGraphics::drawImage2(const Image *const image,
+bool SDLGraphics::drawImage(const Image *const image,
                              int dstX, int dstY)
 {
     return drawImageInline(image, dstX, dstY);
@@ -166,7 +166,7 @@ bool SDLGraphics::drawImage2(const Image *const image,
 bool SDLGraphics::drawImageInline(const Image *const image,
                                   int dstX, int dstY)
 {
-    FUNC_BLOCK("Graphics::drawImage2", 1)
+    FUNC_BLOCK("Graphics::drawImage", 1)
     // Check that preconditions for blitting are met.
     if (!mWindow || !image || !image->mTexture)
         return false;
diff --git a/src/render/sdl2graphics.h b/src/render/sdl2graphics.h
index cce15e270..6631e53f4 100644
--- a/src/render/sdl2graphics.h
+++ b/src/render/sdl2graphics.h
@@ -182,8 +182,8 @@ class SDLGraphics final : public Graphics
         void setRendererFlags(const uint32_t flags)
         { mRendererFlags = flags; }
 
-        bool drawImage2(const Image *const image,
-                        int dstX, int dstY) override final;
+        bool drawImage(const Image *const image,
+                       int dstX, int dstY) override final;
 
         void drawImageCached(const Image *const image,
                              int x, int y) override final;
diff --git a/src/render/sdl2softwaregraphics.cpp b/src/render/sdl2softwaregraphics.cpp
index 05b1fa2ef..016a9557e 100644
--- a/src/render/sdl2softwaregraphics.cpp
+++ b/src/render/sdl2softwaregraphics.cpp
@@ -109,7 +109,7 @@ bool SDL2SoftwareGraphics::drawRescaledImage(const Image *const image,
     return returnValue;
 }
 
-bool SDL2SoftwareGraphics::drawImage2(const Image *const image,
+bool SDL2SoftwareGraphics::drawImage(const Image *const image,
                                       int dstX, int dstY)
 {
     return drawImageInline(image, dstX, dstY);
@@ -118,7 +118,7 @@ bool SDL2SoftwareGraphics::drawImage2(const Image *const image,
 bool SDL2SoftwareGraphics::drawImageInline(const Image *const image,
                                            int dstX, int dstY)
 {
-    FUNC_BLOCK("Graphics::drawImage2", 1)
+    FUNC_BLOCK("Graphics::drawImage", 1)
     // Check that preconditions for blitting are met.
     if (!mSurface || !image || !image->mSDLSurface)
         return false;
diff --git a/src/render/sdl2softwaregraphics.h b/src/render/sdl2softwaregraphics.h
index 270536e11..1211de5eb 100644
--- a/src/render/sdl2softwaregraphics.h
+++ b/src/render/sdl2softwaregraphics.h
@@ -141,8 +141,8 @@ class SDL2SoftwareGraphics final : public Graphics
 
         bool resizeScreen(const int width, const int height) override final;
 
-        bool drawImage2(const Image *const image,
-                        int dstX, int dstY) override final;
+        bool drawImage(const Image *const image,
+                       int dstX, int dstY) override final;
 
         void drawImageCached(const Image *const image,
                              int x, int y) override final;
diff --git a/src/render/sdlgraphics.cpp b/src/render/sdlgraphics.cpp
index 9694eb0fb..05c57a952 100644
--- a/src/render/sdlgraphics.cpp
+++ b/src/render/sdlgraphics.cpp
@@ -103,7 +103,7 @@ bool SDLGraphics::drawRescaledImage(const Image *const image,
     return returnValue;
 }
 
-bool SDLGraphics::drawImage2(const Image *const image,
+bool SDLGraphics::drawImage(const Image *const image,
                              int dstX, int dstY)
 {
     return drawImageInline(image, dstX, dstY);
@@ -112,7 +112,7 @@ bool SDLGraphics::drawImage2(const Image *const image,
 bool SDLGraphics::drawImageInline(const Image *const image,
                                   int dstX, int dstY)
 {
-    FUNC_BLOCK("Graphics::drawImage2", 1)
+    FUNC_BLOCK("Graphics::drawImage", 1)
     // Check that preconditions for blitting are met.
     if (!mWindow || !image || !image->mSDLSurface)
         return false;
diff --git a/src/render/sdlgraphics.h b/src/render/sdlgraphics.h
index f5ca099de..c8565f4be 100644
--- a/src/render/sdlgraphics.h
+++ b/src/render/sdlgraphics.h
@@ -136,8 +136,8 @@ class SDLGraphics final : public Graphics
                           const bool resize,
                           const bool noFrame) override final;
 
-        bool drawImage2(const Image *const image,
-                        int dstX, int dstY) override final;
+        bool drawImage(const Image *const image,
+                       int dstX, int dstY) override final;
 
         void drawImageCached(const Image *const image,
                              int x, int y) override final;
diff --git a/src/render/surfacegraphics.cpp b/src/render/surfacegraphics.cpp
index 8834bb171..d9cb03136 100644
--- a/src/render/surfacegraphics.cpp
+++ b/src/render/surfacegraphics.cpp
@@ -42,10 +42,10 @@ SurfaceGraphics::~SurfaceGraphics()
 {
 }
 
-bool SurfaceGraphics::drawImage2(const Image *const image,
+bool SurfaceGraphics::drawImage(const Image *const image,
                                  int dstX, int dstY)
 {
-    FUNC_BLOCK("Graphics::drawImage2", 1)
+    FUNC_BLOCK("Graphics::drawImage", 1)
     // Check that preconditions for blitting are met.
     if (!mTarget || !image || !image->mSDLSurface)
         return false;
diff --git a/src/render/surfacegraphics.h b/src/render/surfacegraphics.h
index cadd19876..89de995ee 100644
--- a/src/render/surfacegraphics.h
+++ b/src/render/surfacegraphics.h
@@ -179,8 +179,8 @@ class SurfaceGraphics final : public Graphics
                           const bool noFrame A_UNUSED) override final
         { return false; }
 
-        bool drawImage2(const Image *const image,
-                        int dstX, int dstY) override final;
+        bool drawImage(const Image *const image,
+                       int dstX, int dstY) override final;
 
         void drawImageCached(const Image *const image,
                              int x, int y) override final;