From 37241d3f8552e1bdbd4b966fb95d7e9df1546994 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 3 Mar 2014 18:21:45 +0300
Subject: Remove 2 from methods name in sdlinput.

---
 src/gui/gui.cpp      |  4 ++--
 src/gui/sdlinput.cpp | 15 +--------------
 src/gui/sdlinput.h   |  7 +------
 3 files changed, 4 insertions(+), 22 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index b897655e2..0b0290be4 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -426,7 +426,7 @@ bool Gui::handleKeyInput()
 
     while (!mInput->isKeyQueueEmpty())
     {
-        const KeyInput keyInput = guiInput->dequeueKeyInput2();
+        const KeyInput keyInput = guiInput->dequeueKeyInput();
 
         // Save modifiers state
         mShiftPressed = keyInput.isShiftPressed();
@@ -988,7 +988,7 @@ void Gui::handleMouseInput()
     BLOCK_START("Gui::handleMouseInput")
     while (!mInput->isMouseQueueEmpty())
     {
-        const MouseInput mouseInput = guiInput->dequeueMouseInput2();
+        const MouseInput mouseInput = guiInput->dequeueMouseInput();
 
         if (touchManager.processEvent(mouseInput))
         {
diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp
index ffb90a883..b0ac7d613 100644
--- a/src/gui/sdlinput.cpp
+++ b/src/gui/sdlinput.cpp
@@ -103,7 +103,7 @@ bool SDLInput::isKeyQueueEmpty() const
     return mKeyInputQueue.empty();
 }
 
-KeyInput SDLInput::dequeueKeyInput2()
+KeyInput SDLInput::dequeueKeyInput()
 {
     if (mKeyInputQueue.empty())
         return KeyInput();
@@ -132,19 +132,6 @@ MouseInput SDLInput::dequeueMouseInput()
     return mouseInput;
 }
 
-MouseInput SDLInput::dequeueMouseInput2()
-{
-    MouseInput mouseInput;
-
-    if (mMouseInputQueue.empty())
-        return MouseInput();
-
-    mouseInput = mMouseInputQueue.front();
-    mMouseInputQueue.pop();
-
-    return mouseInput;
-}
-
 void SDLInput::pushInput(const SDL_Event &event)
 {
     KeyInput keyInput;
diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h
index 8197aa110..6102de743 100644
--- a/src/gui/sdlinput.h
+++ b/src/gui/sdlinput.h
@@ -107,10 +107,7 @@ public:
      */
     void pushInput(const SDL_Event &event);
 
-    KeyInput dequeueKeyInput2() A_WARN_UNUSED;
-
-    KeyInput dequeueKeyInput() A_WARN_UNUSED
-    { return KeyInput(); }
+    KeyInput dequeueKeyInput() A_WARN_UNUSED;
 
     // Inherited from SDLInput
 
@@ -120,8 +117,6 @@ public:
 
     MouseInput dequeueMouseInput() A_WARN_UNUSED;
 
-    MouseInput dequeueMouseInput2() A_WARN_UNUSED;
-
     void simulateMouseClick(const int x, const int y,
                             const unsigned int button);
 
-- 
cgit v1.2.3-60-g2f50