summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-03-03 18:09:05 +0300
committerAndrei Karas <akaras@inbox.ru>2014-03-03 18:09:05 +0300
commit2740b416b99855e0b411b06dce2fc1eb4fa93f2c (patch)
treee3a65f8db4148afae86e05eeeb88e00f705dc69f /src
parentf555fdf0d99622ac0d52881ebf126377287f1d3e (diff)
downloadmanaverse-2740b416b99855e0b411b06dce2fc1eb4fa93f2c.tar.gz
manaverse-2740b416b99855e0b411b06dce2fc1eb4fa93f2c.tar.bz2
manaverse-2740b416b99855e0b411b06dce2fc1eb4fa93f2c.tar.xz
manaverse-2740b416b99855e0b411b06dce2fc1eb4fa93f2c.zip
Remove 2 from methods name in gui.
Diffstat (limited to 'src')
-rw-r--r--src/gui/gui.cpp8
-rw-r--r--src/gui/gui.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index e3b6d2cac..b897655e2 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -411,17 +411,17 @@ void Gui::clearFonts()
bool Gui::handleInput()
{
if (mInput)
- return handleKeyInput2();
+ return handleKeyInput();
else
return false;
}
-bool Gui::handleKeyInput2()
+bool Gui::handleKeyInput()
{
if (!guiInput)
return false;
- BLOCK_START("Gui::handleKeyInput2")
+ BLOCK_START("Gui::handleKeyInput")
bool consumed(false);
while (!mInput->isKeyQueueEmpty())
@@ -495,7 +495,7 @@ bool Gui::handleKeyInput2()
}
}
} // end while
- BLOCK_END("Gui::handleKeyInput2")
+ BLOCK_END("Gui::handleKeyInput")
return consumed;
}
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 82678601d..85388b8c4 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -191,7 +191,7 @@ class Gui final
bool handleInput();
- bool handleKeyInput2();
+ bool handleKeyInput();
void resetClickCount();