rename calcTile methods into separate names calcTileVertexes, calTileCollection.

28 files changed, 143 insertions, 119 deletions

diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index 6726475d2..0d222595d 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -132,7 +132,7 @@ void AvatarListBox::draw(gcn::Graphics *gcnGraphics)
             {
                 if (useCaching)
                 {
-                    graphics->calcTile(&vertexes, icon,
+                    graphics->calcTileCollection(&vertexes, icon,
                         mImagePadding, y + mPadding);
                 }
                 else
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 91c531f6b..f0534c129 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -485,12 +485,13 @@ void Button::draw(gcn::Graphics *graphics)
             {
                 if (isPressed())
                 {
-                    g2->calcTile(mVertexes2, mImages[mode],
+                    g2->calcTileCollection(mVertexes2, mImages[mode],
                         imageX + 1, imageY + 1);
                 }
                 else
                 {
-                    g2->calcTile(mVertexes2, mImages[mode], imageX, imageY);
+                    g2->calcTileCollection(mVertexes2,
+                        mImages[mode], imageX, imageY);
                 }
             }
         }
diff --git a/src/gui/widgets/emotepage.cpp b/src/gui/widgets/emotepage.cpp
index a68836a96..472e6c1f4 100644
--- a/src/gui/widgets/emotepage.cpp
+++ b/src/gui/widgets/emotepage.cpp
@@ -84,7 +84,7 @@ void EmotePage::draw(gcn::Graphics *graphics)
                 const Image *const image = *it;
                 if (image)
                 {
-                    g->calcTile(mVertexes, image, x, y);
+                    g->calcTileCollection(mVertexes, image, x, y);
                     x += emoteWidth;
                     if (x + emoteWidth > width)
                     {
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index a2e1ca4aa..b786ccbb7 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -466,7 +466,7 @@ void ScrollArea::calcButton(gcn::Graphics *const graphics,
 
     if (buttons[dir][state])
     {
-        static_cast<Graphics*>(graphics)->calcTile(
+        static_cast<Graphics*>(graphics)->calcTileCollection(
             mVertexes, buttons[dir][state], dim.x, dim.y);
     }
 }
diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp
index a68bc8b07..7cd8a2f38 100644
--- a/src/gui/widgets/shortcutcontainer.cpp
+++ b/src/gui/widgets/shortcutcontainer.cpp
@@ -98,7 +98,7 @@ void ShortcutContainer::drawBackground(Graphics *g)
                 mVertexes->clear();
                 for (unsigned i = 0; i < mMaxItems; i ++)
                 {
-                    g->calcTile(mVertexes, mBackgroundImg,
+                    g->calcTileCollection(mVertexes, mBackgroundImg,
                         (i % mGridWidth) * mBoxWidth,
                         (i / mGridWidth) * mBoxHeight);
                 }
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 47d4e2215..313a08162 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -146,7 +146,8 @@ void Slider::draw(gcn::Graphics *graphics)
             mVertexes->clear();
             if (!mHasMouse)
             {
-                g->calcTile(mVertexes, buttons[0].grid[HSTART], x, y);
+                g->calcTileCollection(mVertexes,
+                    buttons[0].grid[HSTART], x, y);
 
                 const int width = buttons[0].grid[HSTART]->getWidth();
                 w -= width + buttons[0].grid[HEND]->getWidth();
@@ -160,18 +161,19 @@ void Slider::draw(gcn::Graphics *graphics)
                 }
 
                 x += w;
-                g->calcTile(mVertexes, buttons[0].grid[HEND], x, y);
+                g->calcTileCollection(mVertexes, buttons[0].grid[HEND], x, y);
 
                 const Image *const img = buttons[0].grid[HGRIP];
                 if (img)
                 {
-                    g->calcTile(mVertexes, img, getMarkerPosition(),
+                    g->calcTileCollection(mVertexes, img, getMarkerPosition(),
                         (mDimension.height - img->getHeight()) / 2);
                 }
             }
             else
             {
-                g->calcTile(mVertexes, buttons[1].grid[HSTART], x, y);
+                g->calcTileCollection(mVertexes,
+                    buttons[1].grid[HSTART], x, y);
 
                 const int width = buttons[1].grid[HSTART]->getWidth();
                 w -= width;
@@ -188,12 +190,15 @@ void Slider::draw(gcn::Graphics *graphics)
 
                 x += w;
                 if (buttons[1].grid[HEND])
-                    g->calcTile(mVertexes, buttons[1].grid[HEND], x, y);
+                {
+                    g->calcTileCollection(mVertexes,
+                        buttons[1].grid[HEND], x, y);
+                }
 
                 const Image *const img = buttons[1].grid[HGRIP];
                 if (img)
                 {
-                    g->calcTile(mVertexes, img, getMarkerPosition(),
+                    g->calcTileCollection(mVertexes, img, getMarkerPosition(),
                         (mDimension.height - img->getHeight()) / 2);
                 }
             }
diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp
index fd5d8ffc5..f1e45fa42 100644
--- a/src/gui/widgets/tabs/tab.cpp
+++ b/src/gui/widgets/tabs/tab.cpp
@@ -224,7 +224,8 @@ void Tab::draw(gcn::Graphics *graphics)
                 if (skin1)
                 {
                     const int padding = skin1->getPadding();
-                    g->calcTile(mVertexes, mImage, padding, padding);
+                    g->calcTileCollection(mVertexes, mImage,
+                        padding, padding);
                 }
             }
         }
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index a95bc0877..ad8e9e7eb 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -239,7 +239,10 @@ void Window::draw(gcn::Graphics *graphics)
                 const Image *const button = mSkin->getCloseImage(
                     mResizeHandles == CLOSE);
                 if (button)
-                    g->calcTile(mVertexes, button, mCloseRect.x, mCloseRect.y);
+                {
+                    g->calcTileCollection(mVertexes, button,
+                        mCloseRect.x, mCloseRect.y);
+                }
             }
             // Draw Sticky Button
             if (mStickyButton)
@@ -247,13 +250,16 @@ void Window::draw(gcn::Graphics *graphics)
                 const Image *const button = mSkin->getStickyImage(mSticky);
                 if (button)
                 {
-                    g->calcTile(mVertexes, button,
+                    g->calcTileCollection(mVertexes, button,
                         mStickyRect.x, mStickyRect.y);
                 }
             }
 
             if (mGrip)
-                g->calcTile(mVertexes, mGrip, mGripRect.x, mGripRect.y);
+            {
+                g->calcTileCollection(mVertexes, mGrip,
+                    mGripRect.x, mGripRect.y);
+            }
         }
         else
         {
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp
index c5df1b528..83227f757 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -181,12 +181,13 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
                     continue;
                 if (i == mSelected)
                 {
-                    g->calcTile(mVertexes, mSlotHighlightedBackground,
-                        box->x, box->y);
+                    g->calcTileCollection(mVertexes,
+                        mSlotHighlightedBackground, box->x, box->y);
                 }
                 else
                 {
-                    g->calcTile(mVertexes, mSlotBackground, box->x, box->y);
+                    g->calcTileCollection(mVertexes, mSlotBackground,
+                        box->x, box->y);
                 }
             }
         }
diff --git a/src/maplayer.cpp b/src/maplayer.cpp
index 2ea850eb6..ec7f5ffe6 100644
--- a/src/maplayer.cpp
+++ b/src/maplayer.cpp
@@ -311,7 +311,7 @@ void MapLayer::updateOGL(Graphics *const graphics, int startX, int startY,
                     lastImage = img;
 //                    if (imgVert->image->mGLImage != lastImage->mGLImage)
 //                        logger->log("wrong image draw");
-                    graphics->calcTile(imgVert, lastImage, px, py);
+                    graphics->calcTileVertexes(imgVert, lastImage, px, py);
                 }
             }
         }
diff --git a/src/render/graphics.cpp b/src/render/graphics.cpp
index 561ce3a90..8508b9eec 100644
--- a/src/render/graphics.cpp
+++ b/src/render/graphics.cpp
@@ -569,14 +569,14 @@ bool Graphics::calcImageRect(ImageVertexes *const vert,
         calcImagePattern(vert, right, x + w - rw, y + th, rw, h - th - bh);
     }
 
-    calcTile(vert, topLeft, x, y);
+    calcTileVertexes(vert, topLeft, x, y);
     if (topRight)
-        calcTile(vert, topRight, x + w - topRight->getWidth(), y);
+        calcTileVertexes(vert, topRight, x + w - topRight->getWidth(), y);
     if (bottomLeft)
-        calcTile(vert, bottomLeft, x, y + h - bottomLeft->getHeight());
+        calcTileVertexes(vert, bottomLeft, x, y + h - bottomLeft->getHeight());
     if (bottomRight)
     {
-        calcTile(vert, bottomRight, x + w - bottomRight->getWidth(),
+        calcTileVertexes(vert, bottomRight, x + w - bottomRight->getWidth(),
             y + h - bottomRight->getHeight());
     }
 
diff --git a/src/render/graphics.h b/src/render/graphics.h
index cb009291b..d55b326aa 100644
--- a/src/render/graphics.h
+++ b/src/render/graphics.h
@@ -234,9 +234,9 @@ class Graphics : public gcn::Graphics
                                       const int x, const int y,
                                       const int w, const int h) const = 0;
 
-        virtual void calcTile(ImageVertexes *const vert,
-                              const Image *const image,
-                              int x, int y) const = 0;
+        virtual void calcTileVertexes(ImageVertexes *const vert,
+                                      const Image *const image,
+                                      int x, int y) const = 0;
 
         virtual void calcTileSDL(ImageVertexes *const vert A_UNUSED,
                                  int x A_UNUSED, int y A_UNUSED) const
@@ -247,9 +247,9 @@ class Graphics : public gcn::Graphics
 
         virtual void drawTile(const ImageCollection *const vertCol) = 0;
 
-        virtual void calcTile(ImageCollection *const vertCol,
-                              const Image *const image,
-                              int x, int y) = 0;
+        virtual void calcTileCollection(ImageCollection *const vertCol,
+                                        const Image *const image,
+                                        int x, int y) = 0;
 
         virtual bool calcWindow(ImageCollection *const vertCol,
                                 const int x, const int y,
diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp
index eee4b9b0c..f8a3fd91e 100644
--- a/src/render/mobileopenglgraphics.cpp
+++ b/src/render/mobileopenglgraphics.cpp
@@ -623,9 +623,9 @@ void MobileOpenGLGraphics::calcImagePattern(ImageVertexes *const vert,
     ogl.switchVp(vp);
 }
 
-void MobileOpenGLGraphics::calcTile(ImageCollection *const vertCol,
-                                    const Image *const image,
-                                    int x, int y)
+void MobileOpenGLGraphics::calcTileCollection(ImageCollection *const vertCol,
+                                              const Image *const image,
+                                              int x, int y)
 {
     if (vertCol->currentGLImage != image->mGLImage)
     {
@@ -634,11 +634,11 @@ void MobileOpenGLGraphics::calcTile(ImageCollection *const vertCol,
         vertCol->currentVert = vert;
         vert->image = image;
         vertCol->draws.push_back(vert);
-        calcTile(vert, image, x, y);
+        calcTileVertexes(vert, image, x, y);
     }
     else
     {
-        calcTile(vertCol->currentVert, image, x, y);
+        calcTileVertexes(vertCol->currentVert, image, x, y);
     }
 }
 
@@ -683,9 +683,9 @@ void MobileOpenGLGraphics::calcImagePattern(ImageCollection* const vertCol,
     calcImagePattern(vert, image, x, y, w, h);
 }
 
-void MobileOpenGLGraphics::calcTile(ImageVertexes *const vert,
-                                    const Image *const image,
-                                    int dstX, int dstY) const
+void MobileOpenGLGraphics::calcTileVertexes(ImageVertexes *const vert,
+                                            const Image *const image,
+                                            int dstX, int dstY) const
 {
     if (!vert || !image)
         return;
diff --git a/src/render/mobileopenglgraphics.h b/src/render/mobileopenglgraphics.h
index 55283010e..dd285fdee 100644
--- a/src/render/mobileopenglgraphics.h
+++ b/src/render/mobileopenglgraphics.h
@@ -105,13 +105,15 @@ class MobileOpenGLGraphics final : public Graphics
                               const int x, const int y,
                               const int w, const int h) const override final;
 
-        void calcTile(ImageVertexes *const vert, const Image *const image,
-                      int x, int y) const override final;
+        void calcTileVertexes(ImageVertexes *const vert,
+                              const Image *const image,
+                              int x, int y) const override final;
 
         void drawTile(const ImageCollection *const vertCol) override final;
 
-        void calcTile(ImageCollection *const vertCol,
-                      const Image *const image, int x, int y) override final;
+        void calcTileCollection(ImageCollection *const vertCol,
+                                const Image *const image,
+                                int x, int y) override final;
 
         void drawTile(const ImageVertexes *const vert) override final;
 
diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp
index f837d1928..dd0d75871 100644
--- a/src/render/normalopenglgraphics.cpp
+++ b/src/render/normalopenglgraphics.cpp
@@ -797,9 +797,9 @@ void NormalOpenGLGraphics::calcImagePattern(ImageVertexes* const vert,
     ogl.switchVp(vp);
 }
 
-void NormalOpenGLGraphics::calcTile(ImageCollection *const vertCol,
-                                    const Image *const image,
-                                    int x, int y)
+void NormalOpenGLGraphics::calcTileCollection(ImageCollection *const vertCol,
+                                              const Image *const image,
+                                              int x, int y)
 {
     if (vertCol->currentGLImage != image->mGLImage)
     {
@@ -808,11 +808,11 @@ void NormalOpenGLGraphics::calcTile(ImageCollection *const vertCol,
         vertCol->currentVert = vert;
         vert->image = image;
         vertCol->draws.push_back(vert);
-        calcTile(vert, image, x, y);
+        calcTileVertexes(vert, image, x, y);
     }
     else
     {
-        calcTile(vertCol->currentVert, image, x, y);
+        calcTileVertexes(vertCol->currentVert, image, x, y);
     }
 }
 
@@ -857,9 +857,9 @@ void NormalOpenGLGraphics::calcImagePattern(ImageCollection* const vertCol,
     calcImagePattern(vert, image, x, y, w, h);
 }
 
-void NormalOpenGLGraphics::calcTile(ImageVertexes *const vert,
-                                    const Image *const image,
-                                    int dstX, int dstY) const
+void NormalOpenGLGraphics::calcTileVertexes(ImageVertexes *const vert,
+                                            const Image *const image,
+                                            int dstX, int dstY) const
 {
     if (!vert || !image)
         return;
diff --git a/src/render/normalopenglgraphics.h b/src/render/normalopenglgraphics.h
index 3af6ad00a..8fc127dbe 100644
--- a/src/render/normalopenglgraphics.h
+++ b/src/render/normalopenglgraphics.h
@@ -105,11 +105,13 @@ class NormalOpenGLGraphics final : public Graphics
                               const int x, const int y,
                               const int w, const int h) const override final;
 
-        void calcTile(ImageVertexes *const vert, const Image *const image,
-                      int x, int y) const override final;
+        void calcTileVertexes(ImageVertexes *const vert,
+                              const Image *const image,
+                              int x, int y) const override final;
 
-        void calcTile(ImageCollection *const vertCol,
-                      const Image *const image, int x, int y) override final;
+        void calcTileCollection(ImageCollection *const vertCol,
+                                const Image *const image,
+                                int x, int y) override final;
 
         void drawTile(const ImageCollection *const vertCol) override final;
 
diff --git a/src/render/nullopenglgraphics.cpp b/src/render/nullopenglgraphics.cpp
index d1d157503..2c433d804 100644
--- a/src/render/nullopenglgraphics.cpp
+++ b/src/render/nullopenglgraphics.cpp
@@ -700,9 +700,9 @@ void NullOpenGLGraphics::calcImagePattern(ImageVertexes* const vert,
     ogl.switchVp(vp);
 }
 
-void NullOpenGLGraphics::calcTile(ImageCollection *const vertCol,
-                                  const Image *const image,
-                                  int x, int y)
+void NullOpenGLGraphics::calcTileCollection(ImageCollection *const vertCol,
+                                            const Image *const image,
+                                            int x, int y)
 {
     if (vertCol->currentGLImage != image->mGLImage)
     {
@@ -711,11 +711,11 @@ void NullOpenGLGraphics::calcTile(ImageCollection *const vertCol,
         vertCol->currentVert = vert;
         vert->image = image;
         vertCol->draws.push_back(vert);
-        calcTile(vert, image, x, y);
+        calcTileVertexes(vert, image, x, y);
     }
     else
     {
-        calcTile(vertCol->currentVert, image, x, y);
+        calcTileVertexes(vertCol->currentVert, image, x, y);
     }
 }
 
@@ -760,9 +760,9 @@ void NullOpenGLGraphics::calcImagePattern(ImageCollection* const vertCol,
     calcImagePattern(vert, image, x, y, w, h);
 }
 
-void NullOpenGLGraphics::calcTile(ImageVertexes *const vert,
-                                  const Image *const image,
-                                  int dstX, int dstY) const
+void NullOpenGLGraphics::calcTileVertexes(ImageVertexes *const vert,
+                                          const Image *const image,
+                                          int dstX, int dstY) const
 {
     if (!vert || !image)
         return;
diff --git a/src/render/nullopenglgraphics.h b/src/render/nullopenglgraphics.h
index 620baa59d..94cda7bb3 100644
--- a/src/render/nullopenglgraphics.h
+++ b/src/render/nullopenglgraphics.h
@@ -105,11 +105,13 @@ class NullOpenGLGraphics final : public Graphics
                               const int x, const int y,
                               const int w, const int h) const override final;
 
-        void calcTile(ImageVertexes *const vert, const Image *const image,
-                      int x, int y) const override final;
+        void calcTileVertexes(ImageVertexes *const vert,
+                              const Image *const image,
+                              int x, int y) const override final;
 
-        void calcTile(ImageCollection *const vertCol,
-                      const Image *const image, int x, int y) override final;
+        void calcTileCollection(ImageCollection *const vertCol,
+                                const Image *const image,
+                                int x, int y) override final;
 
         void drawTile(const ImageCollection *const vertCol) override final;
 
diff --git a/src/render/safeopenglgraphics.cpp b/src/render/safeopenglgraphics.cpp
index cc56e4b89..7c1ac0fe4 100644
--- a/src/render/safeopenglgraphics.cpp
+++ b/src/render/safeopenglgraphics.cpp
@@ -326,15 +326,16 @@ void SafeOpenGLGraphics::drawRescaledImagePattern(const Image *const image,
     glEnd();
 }
 
-void SafeOpenGLGraphics::calcTile(ImageCollection *const vertCol A_UNUSED,
-                                  const Image *const image A_UNUSED,
-                                  int x A_UNUSED, int y A_UNUSED)
+void SafeOpenGLGraphics::calcTileCollection(ImageCollection *const
+                                            vertCol A_UNUSED,
+                                            const Image *const image A_UNUSED,
+                                            int x A_UNUSED, int y A_UNUSED)
 {
 }
 
-void SafeOpenGLGraphics::calcTile(ImageVertexes *const vert A_UNUSED,
-                                  const Image *const image A_UNUSED,
-                                  int x A_UNUSED, int y A_UNUSED) const
+void SafeOpenGLGraphics::calcTileVertexes(ImageVertexes *const vert A_UNUSED,
+                                          const Image *const image A_UNUSED,
+                                          int x A_UNUSED, int y A_UNUSED) const
 {
 }
 
diff --git a/src/render/safeopenglgraphics.h b/src/render/safeopenglgraphics.h
index 6ece1bc88..a9f70f0c0 100644
--- a/src/render/safeopenglgraphics.h
+++ b/src/render/safeopenglgraphics.h
@@ -88,11 +88,13 @@ class SafeOpenGLGraphics final : public Graphics
                                       const int scaledWidth,
                                       const int scaledHeight) override final;
 
-        void calcTile(ImageVertexes *const vert, const Image *const image,
-                      int x, int y) const override final;
+        void calcTileVertexes(ImageVertexes *const vert,
+                              const Image *const image,
+                              int x, int y) const override final;
 
-        void calcTile(ImageCollection *const vertCol,
-                      const Image *const image, int x, int y) override final;
+        void calcTileCollection(ImageCollection *const vertCol,
+                                const Image *const image,
+                                int x, int y) override final;
 
         void calcImagePattern(ImageVertexes *const vert,
                               const Image *const image,
diff --git a/src/render/sdl2graphics.cpp b/src/render/sdl2graphics.cpp
index ff8da65c9..7169ee9eb 100644
--- a/src/render/sdl2graphics.cpp
+++ b/src/render/sdl2graphics.cpp
@@ -326,9 +326,9 @@ void SDLGraphics::calcImagePattern(ImageCollection* const vertCol,
     calcImagePattern(vert, image, x, y, w, h);
 }
 
-void SDLGraphics::calcTile(ImageVertexes *const vert,
-                           const Image *const image,
-                           int x, int y) const
+void SDLGraphics::calcTileVertexes(ImageVertexes *const vert,
+                                   const Image *const image,
+                                   int x, int y) const
 {
     vert->image = image;
     calcTileSDL(vert, x, y);
@@ -366,9 +366,9 @@ void SDLGraphics::calcTileSDL(ImageVertexes *const vert, int x, int y) const
     vert->sdl.push_back(rect);
 }
 
-void SDLGraphics::calcTile(ImageCollection *const vertCol,
-                           const Image *const image,
-                           int x, int y)
+void SDLGraphics::calcTileCollection(ImageCollection *const vertCol,
+                                     const Image *const image,
+                                     int x, int y)
 {
     if (vertCol->currentImage != image)
     {
diff --git a/src/render/sdl2graphics.h b/src/render/sdl2graphics.h
index 57e60135f..2a8fd7047 100644
--- a/src/render/sdl2graphics.h
+++ b/src/render/sdl2graphics.h
@@ -95,16 +95,16 @@ class SDLGraphics : public Graphics
                                       const int w,
                                       const int h) const override final;
 
-        virtual void calcTile(ImageVertexes *const vert,
-                              const Image *const image,
-                              int x, int y) const override final;
+        virtual void calcTileVertexes(ImageVertexes *const vert,
+                                      const Image *const image,
+                                      int x, int y) const override final;
 
         virtual void calcTileSDL(ImageVertexes *const vert,
                                  int x, int y) const override final;
 
-        virtual void calcTile(ImageCollection *const vertCol,
-                              const Image *const image,
-                              int x, int y) override final;
+        virtual void calcTileCollection(ImageCollection *const vertCol,
+                                        const Image *const image,
+                                        int x, int y) override final;
 
         virtual void drawTile(const ImageVertexes *const vert) override final;
 
diff --git a/src/render/sdl2softwaregraphics.cpp b/src/render/sdl2softwaregraphics.cpp
index 5ba4ab693..156f8a412 100644
--- a/src/render/sdl2softwaregraphics.cpp
+++ b/src/render/sdl2softwaregraphics.cpp
@@ -455,9 +455,9 @@ void SDL2SoftwareGraphics::calcImagePattern(ImageCollection* const vertCol,
     calcImagePattern(vert, image, x, y, w, h);
 }
 
-void SDL2SoftwareGraphics::calcTile(ImageVertexes *const vert,
-                                    const Image *const image,
-                                    int x, int y) const
+void SDL2SoftwareGraphics::calcTileVertexes(ImageVertexes *const vert,
+                                            const Image *const image,
+                                            int x, int y) const
 {
     vert->image = image;
     calcTileSDL(vert, x, y);
@@ -492,9 +492,9 @@ void SDL2SoftwareGraphics::calcTileSDL(ImageVertexes *const vert,
     }
 }
 
-void SDL2SoftwareGraphics::calcTile(ImageCollection *const vertCol,
-                                    const Image *const image,
-                                    int x, int y)
+void SDL2SoftwareGraphics::calcTileCollection(ImageCollection *const vertCol,
+                                              const Image *const image,
+                                              int x, int y)
 {
     if (vertCol->currentImage != image)
     {
diff --git a/src/render/sdl2softwaregraphics.h b/src/render/sdl2softwaregraphics.h
index 9c2b00ad9..df88dfe7b 100644
--- a/src/render/sdl2softwaregraphics.h
+++ b/src/render/sdl2softwaregraphics.h
@@ -96,16 +96,16 @@ class SDL2SoftwareGraphics : public Graphics
                                       const int w,
                                       const int h) const override final;
 
-        virtual void calcTile(ImageVertexes *const vert,
-                              const Image *const image,
-                              int x, int y) const override final;
+        virtual void calcTileVertexes(ImageVertexes *const vert,
+                                      const Image *const image,
+                                      int x, int y) const override final;
 
         virtual void calcTileSDL(ImageVertexes *const vert,
                                  int x, int y) const override final;
 
-        virtual void calcTile(ImageCollection *const vertCol,
-                              const Image *const image,
-                              int x, int y) override final;
+        virtual void calcTileCollection(ImageCollection *const vertCol,
+                                        const Image *const image,
+                                        int x, int y) override final;
 
         virtual void drawTile(const ImageVertexes *const vert) override final;
 
diff --git a/src/render/sdlgraphics.cpp b/src/render/sdlgraphics.cpp
index 3cba46abe..b3d962d9f 100644
--- a/src/render/sdlgraphics.cpp
+++ b/src/render/sdlgraphics.cpp
@@ -446,9 +446,9 @@ void SDLGraphics::calcImagePattern(ImageCollection* const vertCol,
     calcImagePattern(vert, image, x, y, w, h);
 }
 
-void SDLGraphics::calcTile(ImageVertexes *const vert,
-                           const Image *const image,
-                           int x, int y) const
+void SDLGraphics::calcTileVertexes(ImageVertexes *const vert,
+                                   const Image *const image,
+                                   int x, int y) const
 {
     vert->image = image;
     calcTileSDL(vert, x, y);
@@ -482,9 +482,9 @@ void SDLGraphics::calcTileSDL(ImageVertexes *const vert, int x, int y) const
     }
 }
 
-void SDLGraphics::calcTile(ImageCollection *const vertCol,
-                           const Image *const image,
-                           int x, int y)
+void SDLGraphics::calcTileCollection(ImageCollection *const vertCol,
+                                     const Image *const image,
+                                     int x, int y)
 {
     if (vertCol->currentImage != image)
     {
diff --git a/src/render/sdlgraphics.h b/src/render/sdlgraphics.h
index dd33fcc0c..1ca37f8e4 100644
--- a/src/render/sdlgraphics.h
+++ b/src/render/sdlgraphics.h
@@ -95,16 +95,16 @@ class SDLGraphics : public Graphics
                                       const int w,
                                       const int h) const override final;
 
-        virtual void calcTile(ImageVertexes *const vert,
-                              const Image *const image,
-                              int x, int y) const override final;
+        virtual void calcTileVertexes(ImageVertexes *const vert,
+                                      const Image *const image,
+                                      int x, int y) const override final;
 
         virtual void calcTileSDL(ImageVertexes *const vert,
                                  int x, int y) const override final;
 
-        virtual void calcTile(ImageCollection *const vertCol,
-                              const Image *const image,
-                              int x, int y) override final;
+        virtual void calcTileCollection(ImageCollection *const vertCol,
+                                        const Image *const image,
+                                        int x, int y) override final;
 
         virtual void drawTile(const ImageVertexes *const vert) override final;
 
diff --git a/src/render/surfacegraphics.h b/src/render/surfacegraphics.h
index d10ea938a..9af2efb76 100644
--- a/src/render/surfacegraphics.h
+++ b/src/render/surfacegraphics.h
@@ -113,18 +113,19 @@ class SurfaceGraphics : public Graphics
                               const int h A_UNUSED) const override final
         { }
 
-        void calcTile(ImageVertexes *const vert A_UNUSED,
-                      const Image *const image A_UNUSED,
-                      int x A_UNUSED, int y A_UNUSED) const override final
+        void calcTileVertexes(ImageVertexes *const vert A_UNUSED,
+                              const Image *const image A_UNUSED,
+                              int x A_UNUSED,
+                              int y A_UNUSED) const override final
         { }
 
         void calcTileSDL(ImageVertexes *const vert A_UNUSED,
                          int x A_UNUSED, int y A_UNUSED) const override final
         { }
 
-        void calcTile(ImageCollection *const vertCol A_UNUSED,
-                      const Image *const image A_UNUSED,
-                      int x A_UNUSED, int y A_UNUSED) override final
+        void calcTileCollection(ImageCollection *const vertCol A_UNUSED,
+                                const Image *const image A_UNUSED,
+                                int x A_UNUSED, int y A_UNUSED) override final
         { }
 
         void drawTile(const ImageVertexes *const vert A_UNUSED) override final
diff --git a/src/touchmanager.cpp b/src/touchmanager.cpp
index dbee76e49..6ee96b5d0 100644
--- a/src/touchmanager.cpp
+++ b/src/touchmanager.cpp
@@ -203,7 +203,7 @@ void TouchManager::draw()
                     const Image *const icon = item->icon;
                     if (icon)
                     {
-                        mainGraphics->calcTile(mVertexes, icon,
+                        mainGraphics->calcTileCollection(mVertexes, icon,
                             item->x + (item->width - icon->mBounds.w) / 2,
                             item->y + (item->height - icon->mBounds.h) / 2);
                     }