Rename settings tab keyboard to input.

4 files changed, 21 insertions, 21 deletions

diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index c7908a6ac..65444a362 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -33,7 +33,7 @@
 #include "gui/setup_joystick.h"
 #include "gui/setup_other.h"
 #include "gui/setup_theme.h"
-#include "gui/setup_keyboard.h"
+#include "gui/setup_input.h"
 #include "gui/setup_perfomance.h"
 #include "gui/setup_players.h"
 #include "gui/setup_relations.h"
@@ -97,7 +97,7 @@ Setup::Setup():
     mTabs.push_back(new Setup_Audio);
     mTabs.push_back(new Setup_Perfomance);
     mTabs.push_back(new Setup_Joystick);
-    mTabs.push_back(new Setup_Keyboard);
+    mTabs.push_back(new Setup_Input);
     mTabs.push_back(new Setup_Colors);
     mTabs.push_back(new Setup_Chat);
     mTabs.push_back(new Setup_Players);
diff --git a/src/gui/setup.h b/src/gui/setup.h
index 3a6f66297..df99855e3 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -42,7 +42,7 @@ class SetupTab;
  * @see Setup_Audio
  * @see Setup_Colors
  * @see Setup_Joystick
- * @see Setup_Keyboard
+ * @see Setup_Input
  * @see Setup_Players
  * @see Setup_Video
  *
diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_input.cpp
index ee06fa4a7..cdcae13c4 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_input.cpp
@@ -21,7 +21,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/setup_keyboard.h"
+#include "gui/setup_input.h"
 
 #include "inputmanager.h"
 #include "keyboardconfig.h"
@@ -743,13 +743,13 @@ class KeyListModel : public gcn::ListModel
         std::string mKeyFunctions[keysSize];
 };
 
-Setup_Keyboard::Setup_Keyboard():
+Setup_Input::Setup_Input():
     mKeyListModel(new KeyListModel),
     mKeyList(new ListBox(mKeyListModel)),
     mKeySetting(false)
 {
-    inputManager.setSetupKeyboard(this);
-    setName(_("Keyboard"));
+    inputManager.setSetupInput(this);
+    setName(_("Input"));
 
     refreshKeys();
 
@@ -781,7 +781,7 @@ Setup_Keyboard::Setup_Keyboard():
     setDimension(gcn::Rectangle(0, 0, 500, 350));
 }
 
-Setup_Keyboard::~Setup_Keyboard()
+Setup_Input::~Setup_Input()
 {
     delete mKeyList;
     mKeyList = nullptr;
@@ -796,7 +796,7 @@ Setup_Keyboard::~Setup_Keyboard()
     mMakeDefaultButton = nullptr;
 }
 
-void Setup_Keyboard::apply()
+void Setup_Input::apply()
 {
     keyUnresolved();
     int key1, key2;
@@ -816,7 +816,7 @@ void Setup_Keyboard::apply()
     inputManager.store();
 }
 
-void Setup_Keyboard::cancel()
+void Setup_Input::cancel()
 {
     keyUnresolved();
 
@@ -826,7 +826,7 @@ void Setup_Keyboard::cancel()
     refreshKeys();
 }
 
-void Setup_Keyboard::action(const gcn::ActionEvent &event)
+void Setup_Input::action(const gcn::ActionEvent &event)
 {
     if (event.getSource() == mKeyList)
     {
@@ -884,7 +884,7 @@ void Setup_Keyboard::action(const gcn::ActionEvent &event)
     }
 }
 
-void Setup_Keyboard::refreshAssignedKey(int index)
+void Setup_Input::refreshAssignedKey(int index)
 {
     const SetupActionData &key = setupActionData[index];
     if (key.actionId == Input::KEY_NO_VALUE)
@@ -902,7 +902,7 @@ void Setup_Keyboard::refreshAssignedKey(int index)
     }
 }
 
-void Setup_Keyboard::newKeyCallback(int index)
+void Setup_Input::newKeyCallback(int index)
 {
     mKeySetting = false;
     int i = keyToSetupData(index);
@@ -911,7 +911,7 @@ void Setup_Keyboard::newKeyCallback(int index)
     mAssignKeyButton->setEnabled(true);
 }
 
-int Setup_Keyboard::keyToSetupData(int index)
+int Setup_Input::keyToSetupData(int index)
 {
     for (int i = 0; i < keysSize; i++)
     {
@@ -922,13 +922,13 @@ int Setup_Keyboard::keyToSetupData(int index)
     return -1;
 }
 
-void Setup_Keyboard::refreshKeys()
+void Setup_Input::refreshKeys()
 {
     for (int i = 0; i < keysSize; i++)
         refreshAssignedKey(i);
 }
 
-void Setup_Keyboard::keyUnresolved()
+void Setup_Input::keyUnresolved()
 {
     if (mKeySetting)
     {
diff --git a/src/gui/setup_keyboard.h b/src/gui/setup_input.h
index 3b5fd5dfa..31bc5bcb1 100644
--- a/src/gui/setup_keyboard.h
+++ b/src/gui/setup_input.h
@@ -21,8 +21,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SETUP_KEYBOARD_H
-#define GUI_SETUP_KEYBOARD_H
+#ifndef GUI_SETUP_INPUT_H
+#define GUI_SETUP_INPUT_H
 
 #include "guichanfwd.h"
 
@@ -32,18 +32,18 @@
 
 #include <string>
 
-class Setup_Keyboard : public SetupTab
+class Setup_Input : public SetupTab
 {
     public:
         /**
          * Constructor
          */
-        Setup_Keyboard();
+        Setup_Input();
 
         /**
          * Destructor
          */
-        ~Setup_Keyboard();
+        ~Setup_Input();
 
         void apply();