From dc5d9dee3f3f726d463f5f23f5902d1d0373df93 Mon Sep 17 00:00:00 2001
From: Joshua Langley <joshlangley[at]optusnet.com.au>
Date: Tue, 24 Jul 2007 06:39:04 +0000
Subject: keyboard configuration - mainly documentation fixes.
 http://mantis.themanaworld.org/view.php?id=16

---
 src/gui/setup_keyboard.cpp | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'src/gui/setup_keyboard.cpp')

diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index 6ca149a5..4cb39494 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.cpp
@@ -29,7 +29,6 @@
 
 #include "../configuration.h"
 #include "../keyboardconfig.h"
-#include "../log.h"
 
 #include "../utils/tostring.h"
 
@@ -104,14 +103,13 @@ void Setup_Keyboard::action(const gcn::ActionEvent &event)
         {
             keyboard.setEnabled(false);
             keyboard.setNewKeyIndex(i);
-            enableButtons(false);
+            enableSetButtons(false);
             mKeyLabel[i].setCaption(keyboard.getKeyCaption(i) + ": ?");
         }
     }
 }
 
-
-void Setup_Keyboard::enableButtons(bool bValue)
+void Setup_Keyboard::enableSetButtons(bool bValue)
 {
     for (int i=0; i < keyboard.KEY_TOTAL; i++)
     {
@@ -121,17 +119,17 @@ void Setup_Keyboard::enableButtons(bool bValue)
 
 void Setup_Keyboard::refreshAssignedKey(const int index)
 {
-     char *temp = SDL_GetKeyName(
-         (SDLKey) keyboard.getKeyValue(index));
-     mKeyLabel[index].setCaption(
-         keyboard.getKeyCaption(index) + ": " + toString(temp));
-     mKeyLabel[index].adjustSize();
+    char *temp = SDL_GetKeyName(
+        (SDLKey) keyboard.getKeyValue(index));
+    mKeyLabel[index].setCaption(
+        keyboard.getKeyCaption(index) + ": " + toString(temp));
+    mKeyLabel[index].adjustSize();
 }
 
 void Setup_Keyboard::newKeyCallback(const int index)
 {
     refreshAssignedKey(index);
-    enableButtons(true);
+    enableSetButtons(true);
 }
 
 void Setup_Keyboard::refreshKeys()
@@ -141,5 +139,3 @@ void Setup_Keyboard::refreshKeys()
         refreshAssignedKey(i);
     }
 }
-
-
-- 
cgit v1.2.3-60-g2f50