rename drawTile methods into separate names drawTileVertexes, drawTileCollection.

29 files changed, 69 insertions, 52 deletions

diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index 0d222595d..cc9b1a262 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -305,7 +305,7 @@ void AvatarListBox::draw(gcn::Graphics *gcnGraphics)
     }
 
     if (useCaching)
-        graphics->drawTile(&vertexes);
+        graphics->drawTileCollection(&vertexes);
 
     if (parent)
         setWidth(parent->getWidth() - 10);
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index f0534c129..69cc137ba 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -495,7 +495,7 @@ void Button::draw(gcn::Graphics *graphics)
                 }
             }
         }
-        g2->drawTile(mVertexes2);
+        g2->drawTileCollection(mVertexes2);
     }
     else
     {
diff --git a/src/gui/widgets/emotepage.cpp b/src/gui/widgets/emotepage.cpp
index 472e6c1f4..3c7d1a842 100644
--- a/src/gui/widgets/emotepage.cpp
+++ b/src/gui/widgets/emotepage.cpp
@@ -94,7 +94,7 @@ void EmotePage::draw(gcn::Graphics *graphics)
                 }
             }
         }
-        g->drawTile(mVertexes);
+        g->drawTileCollection(mVertexes);
     }
     else
     {
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index 7a43b2c47..def641755 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -112,7 +112,7 @@ void Popup::draw(gcn::Graphics *graphics)
                     mSkin->getBorder());
             }
 
-            g->drawTile(mVertexes);
+            g->drawTileCollection(mVertexes);
         }
         else
         {
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index 71a7c641f..33011f9fc 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -200,7 +200,7 @@ void ProgressBar::render(Graphics *graphics)
                 mDimension.width, mDimension.height, mSkin->getBorder());
         }
 
-        graphics->drawTile(mVertexes);
+        graphics->drawTileCollection(mVertexes);
     }
     else
     {
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index b786ccbb7..ebb91f518 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -286,7 +286,8 @@ void ScrollArea::draw(gcn::Graphics *graphics)
                     calcHMarker(graphics);
                 }
             }
-            static_cast<Graphics *const>(graphics)->drawTile(mVertexes);
+            static_cast<Graphics *const>(graphics)->drawTileCollection(
+                mVertexes);
         }
         else
         {
@@ -378,7 +379,7 @@ void ScrollArea::drawFrame(gcn::Graphics *graphics)
                 static_cast<Graphics*>(graphics)->calcWindow(
                     mVertexes2, 0, 0, w, h, background);
             }
-            static_cast<Graphics*>(graphics)->drawTile(mVertexes2);
+            static_cast<Graphics*>(graphics)->drawTileCollection(mVertexes2);
         }
         else
         {
diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp
index 7cd8a2f38..c4a6fe249 100644
--- a/src/gui/widgets/shortcutcontainer.cpp
+++ b/src/gui/widgets/shortcutcontainer.cpp
@@ -103,7 +103,7 @@ void ShortcutContainer::drawBackground(Graphics *g)
                         (i / mGridWidth) * mBoxHeight);
                 }
             }
-            g->drawTile(mVertexes);
+            g->drawTileCollection(mVertexes);
         }
         else
         {
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 313a08162..039af9743 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -203,7 +203,7 @@ void Slider::draw(gcn::Graphics *graphics)
                 }
             }
         }
-        g->drawTile(mVertexes);
+        g->drawTileCollection(mVertexes);
     }
     else
     {
diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp
index f1e45fa42..3fa27bbe8 100644
--- a/src/gui/widgets/tabs/tab.cpp
+++ b/src/gui/widgets/tabs/tab.cpp
@@ -230,7 +230,7 @@ void Tab::draw(gcn::Graphics *graphics)
             }
         }
 
-        g->drawTile(mVertexes);
+        g->drawTileCollection(mVertexes);
     }
     else
     {
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index ad8e9e7eb..963288a03 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -265,7 +265,7 @@ void Window::draw(gcn::Graphics *graphics)
         {
             mLastRedraw = false;
         }
-        g->drawTile(mVertexes);
+        g->drawTileCollection(mVertexes);
     }
     else
     {
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp
index 83227f757..9fe03d1cc 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -191,7 +191,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
                 }
             }
         }
-        g->drawTile(mVertexes);
+        g->drawTileCollection(mVertexes);
     }
     else
     {
diff --git a/src/maplayer.cpp b/src/maplayer.cpp
index ec7f5ffe6..ac33e8bd5 100644
--- a/src/maplayer.cpp
+++ b/src/maplayer.cpp
@@ -167,7 +167,7 @@ void MapLayer::drawSDL(Graphics *const graphics)
         const MepRowImages::const_iterator iit_end = images->end();
         while (iit != iit_end)
         {
-            graphics->drawTile(*iit);
+            graphics->drawTileVertexes(*iit);
             ++ iit;
         }
         ++ rit;
@@ -332,7 +332,7 @@ void MapLayer::drawOGL(Graphics *const graphics)
         const MepRowImages::const_iterator iit_end = images->end();
         while (iit != iit_end)
         {
-            graphics->drawTile(*iit);
+            graphics->drawTileVertexes(*iit);
             ++ iit;
 //            k ++;
         }
diff --git a/src/render/graphics.h b/src/render/graphics.h
index d55b326aa..79dc008b9 100644
--- a/src/render/graphics.h
+++ b/src/render/graphics.h
@@ -243,9 +243,10 @@ class Graphics : public gcn::Graphics
         {
         }
 
-        virtual void drawTile(const ImageVertexes *const vert) = 0;
+        virtual void drawTileVertexes(const ImageVertexes *const vert) = 0;
 
-        virtual void drawTile(const ImageCollection *const vertCol) = 0;
+        virtual void drawTileCollection(const ImageCollection
+                                        *const vertCol) = 0;
 
         virtual void calcTileCollection(ImageCollection *const vertCol,
                                         const Image *const image,
diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp
index f8a3fd91e..1d0feb085 100644
--- a/src/render/mobileopenglgraphics.cpp
+++ b/src/render/mobileopenglgraphics.cpp
@@ -642,7 +642,8 @@ void MobileOpenGLGraphics::calcTileCollection(ImageCollection *const vertCol,
     }
 }
 
-void MobileOpenGLGraphics::drawTile(const ImageCollection *const vertCol)
+void MobileOpenGLGraphics::drawTileCollection(const ImageCollection
+                                              *const vertCol)
 {
     const ImageVertexesVector &draws = vertCol->draws;
     const ImageCollectionCIter it_end = draws.end();
@@ -768,7 +769,7 @@ void MobileOpenGLGraphics::calcTileVertexes(ImageVertexes *const vert,
     ogl.switchVp(vp);
 }
 
-void MobileOpenGLGraphics::drawTile(const ImageVertexes *const vert)
+void MobileOpenGLGraphics::drawTileVertexes(const ImageVertexes *const vert)
 {
     if (!vert)
         return;
diff --git a/src/render/mobileopenglgraphics.h b/src/render/mobileopenglgraphics.h
index dd285fdee..ca8d70a3a 100644
--- a/src/render/mobileopenglgraphics.h
+++ b/src/render/mobileopenglgraphics.h
@@ -109,13 +109,14 @@ class MobileOpenGLGraphics final : public Graphics
                               const Image *const image,
                               int x, int y) const override final;
 
-        void drawTile(const ImageCollection *const vertCol) override final;
+        void drawTileCollection(const ImageCollection
+                                *const vertCol) 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;
+        void drawTileVertexes(const ImageVertexes *const vert) override final;
 
         bool calcWindow(ImageCollection *const vertCol,
                         const int x, const int y,
diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp
index dd0d75871..76f95cf9c 100644
--- a/src/render/normalopenglgraphics.cpp
+++ b/src/render/normalopenglgraphics.cpp
@@ -816,7 +816,8 @@ void NormalOpenGLGraphics::calcTileCollection(ImageCollection *const vertCol,
     }
 }
 
-void NormalOpenGLGraphics::drawTile(const ImageCollection *const vertCol)
+void NormalOpenGLGraphics::drawTileCollection(const ImageCollection
+                                              *const vertCol)
 {
     const ImageVertexesVector &draws = vertCol->draws;
     const ImageCollectionCIter it_end = draws.end();
@@ -970,7 +971,7 @@ void NormalOpenGLGraphics::calcTileVertexes(ImageVertexes *const vert,
     ogl.switchVp(vp);
 }
 
-void NormalOpenGLGraphics::drawTile(const ImageVertexes *const vert)
+void NormalOpenGLGraphics::drawTileVertexes(const ImageVertexes *const vert)
 {
     if (!vert)
         return;
diff --git a/src/render/normalopenglgraphics.h b/src/render/normalopenglgraphics.h
index 8fc127dbe..7042cf413 100644
--- a/src/render/normalopenglgraphics.h
+++ b/src/render/normalopenglgraphics.h
@@ -113,9 +113,10 @@ class NormalOpenGLGraphics final : public Graphics
                                 const Image *const image,
                                 int x, int y) override final;
 
-        void drawTile(const ImageCollection *const vertCol) override final;
+        void drawTileCollection(const ImageCollection *const vertCol)
+                                override final;
 
-        void drawTile(const ImageVertexes *const vert) override final;
+        void drawTileVertexes(const ImageVertexes *const vert) override final;
 
         bool calcWindow(ImageCollection *const vertCol,
                         const int x, const int y,
diff --git a/src/render/nullopenglgraphics.cpp b/src/render/nullopenglgraphics.cpp
index 2c433d804..0a831513b 100644
--- a/src/render/nullopenglgraphics.cpp
+++ b/src/render/nullopenglgraphics.cpp
@@ -719,7 +719,8 @@ void NullOpenGLGraphics::calcTileCollection(ImageCollection *const vertCol,
     }
 }
 
-void NullOpenGLGraphics::drawTile(const ImageCollection *const vertCol)
+void NullOpenGLGraphics::drawTileCollection(const ImageCollection
+                                            *const vertCol)
 {
     const ImageVertexesVector &draws = vertCol->draws;
     const ImageCollectionCIter it_end = draws.end();
@@ -873,7 +874,7 @@ void NullOpenGLGraphics::calcTileVertexes(ImageVertexes *const vert,
     ogl.switchVp(vp);
 }
 
-void NullOpenGLGraphics::drawTile(const ImageVertexes *const vert)
+void NullOpenGLGraphics::drawTileVertexes(const ImageVertexes *const vert)
 {
     if (!vert)
         return;
diff --git a/src/render/nullopenglgraphics.h b/src/render/nullopenglgraphics.h
index 94cda7bb3..82285f90d 100644
--- a/src/render/nullopenglgraphics.h
+++ b/src/render/nullopenglgraphics.h
@@ -113,9 +113,10 @@ class NullOpenGLGraphics final : public Graphics
                                 const Image *const image,
                                 int x, int y) override final;
 
-        void drawTile(const ImageCollection *const vertCol) override final;
+        void drawTileCollection(const ImageCollection *const vertCol)
+                                override final;
 
-        void drawTile(const ImageVertexes *const vert) override final;
+        void drawTileVertexes(const ImageVertexes *const vert) override final;
 
         bool calcWindow(ImageCollection *const vertCol,
                         const int x, const int y,
diff --git a/src/render/safeopenglgraphics.cpp b/src/render/safeopenglgraphics.cpp
index 7c1ac0fe4..02369fef4 100644
--- a/src/render/safeopenglgraphics.cpp
+++ b/src/render/safeopenglgraphics.cpp
@@ -357,12 +357,13 @@ void SafeOpenGLGraphics::calcImagePattern(ImageCollection *const vert A_UNUSED,
 {
 }
 
-void SafeOpenGLGraphics::drawTile(const ImageVertexes *const vert A_UNUSED)
+void SafeOpenGLGraphics::drawTileVertexes(const ImageVertexes
+                                          *const vert A_UNUSED)
 {
 }
 
-void SafeOpenGLGraphics::drawTile(const ImageCollection *const
-                                  vertCol A_UNUSED)
+void SafeOpenGLGraphics::drawTileCollection(const ImageCollection *const
+                                            vertCol A_UNUSED)
 {
 }
 
diff --git a/src/render/safeopenglgraphics.h b/src/render/safeopenglgraphics.h
index a9f70f0c0..705e580e1 100644
--- a/src/render/safeopenglgraphics.h
+++ b/src/render/safeopenglgraphics.h
@@ -106,9 +106,10 @@ class SafeOpenGLGraphics final : public Graphics
                               const int x, const int y,
                               const int w, const int h) const override final;
 
-        void drawTile(const ImageVertexes *const vert) override final;
+        void drawTileVertexes(const ImageVertexes *const vert) override final;
 
-        void drawTile(const ImageCollection *const vertCol) override final;
+        void drawTileCollection(const ImageCollection *const vertCol)
+                                override final;
 
         void updateScreen() override final;
 
diff --git a/src/render/sdl2graphics.cpp b/src/render/sdl2graphics.cpp
index 7169ee9eb..979de3c31 100644
--- a/src/render/sdl2graphics.cpp
+++ b/src/render/sdl2graphics.cpp
@@ -385,7 +385,8 @@ void SDLGraphics::calcTileCollection(ImageCollection *const vertCol,
     }
 }
 
-void SDLGraphics::drawTile(const ImageCollection *const vertCol)
+void SDLGraphics::drawTileCollection(const ImageCollection
+                                     *const vertCol)
 {
     const ImageVertexesVector &draws = vertCol->draws;
     const ImageCollectionCIter it_end = draws.end();
@@ -405,7 +406,7 @@ void SDLGraphics::drawTile(const ImageCollection *const vertCol)
     }
 }
 
-void SDLGraphics::drawTile(const ImageVertexes *const vert)
+void SDLGraphics::drawTileVertexes(const ImageVertexes *const vert)
 {
     // vert and img must be != 0
     const Image *const img = vert->image;
diff --git a/src/render/sdl2graphics.h b/src/render/sdl2graphics.h
index 2a8fd7047..ed58bc400 100644
--- a/src/render/sdl2graphics.h
+++ b/src/render/sdl2graphics.h
@@ -106,10 +106,11 @@ class SDLGraphics : public Graphics
                                         const Image *const image,
                                         int x, int y) override final;
 
-        virtual void drawTile(const ImageVertexes *const vert) override final;
+        virtual void drawTileVertexes(const ImageVertexes
+                                      *const vert) override final;
 
-        virtual void drawTile(const ImageCollection *const vertCol)
-                              override final;
+        virtual void drawTileCollection(const ImageCollection *const vertCol)
+                                        override final;
 
         virtual void updateScreen() override final;
 
diff --git a/src/render/sdl2softwaregraphics.cpp b/src/render/sdl2softwaregraphics.cpp
index 156f8a412..7556bc5ac 100644
--- a/src/render/sdl2softwaregraphics.cpp
+++ b/src/render/sdl2softwaregraphics.cpp
@@ -511,7 +511,8 @@ void SDL2SoftwareGraphics::calcTileCollection(ImageCollection *const vertCol,
     }
 }
 
-void SDL2SoftwareGraphics::drawTile(const ImageCollection *const vertCol)
+void SDL2SoftwareGraphics::drawTileCollection(const ImageCollection
+                                              *const vertCol)
 {
     const ImageVertexesVector &draws = vertCol->draws;
     const ImageCollectionCIter it_end = draws.end();
@@ -531,7 +532,7 @@ void SDL2SoftwareGraphics::drawTile(const ImageCollection *const vertCol)
     }
 }
 
-void SDL2SoftwareGraphics::drawTile(const ImageVertexes *const vert)
+void SDL2SoftwareGraphics::drawTileVertexes(const ImageVertexes *const vert)
 {
     // vert and img must be != 0
     const Image *const img = vert->image;
diff --git a/src/render/sdl2softwaregraphics.h b/src/render/sdl2softwaregraphics.h
index df88dfe7b..079e1425f 100644
--- a/src/render/sdl2softwaregraphics.h
+++ b/src/render/sdl2softwaregraphics.h
@@ -107,10 +107,11 @@ class SDL2SoftwareGraphics : public Graphics
                                         const Image *const image,
                                         int x, int y) override final;
 
-        virtual void drawTile(const ImageVertexes *const vert) override final;
+        virtual void drawTileVertexes(const ImageVertexes
+                                      *const vert) override final;
 
-        virtual void drawTile(const ImageCollection *const vertCol)
-                              override final;
+        virtual void drawTileCollection(const ImageCollection *const vertCol)
+                                        override final;
 
         virtual void updateScreen() override final;
 
diff --git a/src/render/sdlgraphics.cpp b/src/render/sdlgraphics.cpp
index b3d962d9f..52439f1c3 100644
--- a/src/render/sdlgraphics.cpp
+++ b/src/render/sdlgraphics.cpp
@@ -501,7 +501,8 @@ void SDLGraphics::calcTileCollection(ImageCollection *const vertCol,
     }
 }
 
-void SDLGraphics::drawTile(const ImageCollection *const vertCol)
+void SDLGraphics::drawTileCollection(const ImageCollection
+                                     *const vertCol)
 {
     const ImageVertexesVector &draws = vertCol->draws;
     const ImageCollectionCIter it_end = draws.end();
@@ -521,7 +522,7 @@ void SDLGraphics::drawTile(const ImageCollection *const vertCol)
     }
 }
 
-void SDLGraphics::drawTile(const ImageVertexes *const vert)
+void SDLGraphics::drawTileVertexes(const ImageVertexes *const vert)
 {
     // vert and img must be != 0
     const Image *const img = vert->image;
diff --git a/src/render/sdlgraphics.h b/src/render/sdlgraphics.h
index 1ca37f8e4..5fc19d0b1 100644
--- a/src/render/sdlgraphics.h
+++ b/src/render/sdlgraphics.h
@@ -106,10 +106,11 @@ class SDLGraphics : public Graphics
                                         const Image *const image,
                                         int x, int y) override final;
 
-        virtual void drawTile(const ImageVertexes *const vert) override final;
+        virtual void drawTileVertexes(const ImageVertexes
+                                      *const vert) override final;
 
-        virtual void drawTile(const ImageCollection *const vertCol)
-                              override final;
+        virtual void drawTileCollection(const ImageCollection *const vertCol)
+                                        override final;
 
         virtual void updateScreen() override final;
 
diff --git a/src/render/surfacegraphics.h b/src/render/surfacegraphics.h
index 9af2efb76..7a130dd30 100644
--- a/src/render/surfacegraphics.h
+++ b/src/render/surfacegraphics.h
@@ -128,11 +128,12 @@ class SurfaceGraphics : public Graphics
                                 int x A_UNUSED, int y A_UNUSED) override final
         { }
 
-        void drawTile(const ImageVertexes *const vert A_UNUSED) override final
+        void drawTileVertexes(const ImageVertexes *const
+                              vert A_UNUSED) override final
         { }
 
-        void drawTile(const ImageCollection *const vertCol A_UNUSED)
-                      override final
+        void drawTileCollection(const ImageCollection *const vertCol A_UNUSED)
+                                override final
         { }
 
         void updateScreen()
diff --git a/src/touchmanager.cpp b/src/touchmanager.cpp
index 6ee96b5d0..843a578ce 100644
--- a/src/touchmanager.cpp
+++ b/src/touchmanager.cpp
@@ -210,7 +210,7 @@ void TouchManager::draw()
                 }
             }
         }
-        mainGraphics->drawTile(mVertexes);
+        mainGraphics->drawTileCollection(mVertexes);
     }
     else
     {