Used custom widgets where appropriate and some cleanup

Replaced many gcn::Label with Label, gcn::Slider with Slider in
character creation dialog. Also cleaned up includes.

1 files changed, 13 insertions, 13 deletions

diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index aba8cf35..17d98dc1 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.cpp
@@ -20,23 +20,23 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <SDL_keyboard.h>
+#include "gui/setup_keyboard.h"
 
-#include <guichan/widgets/label.hpp>
-#include <guichan/listmodel.hpp>
+#include "gui/button.h"
+#include "gui/listbox.h"
+#include "gui/ok_dialog.h"
+#include "gui/scrollarea.h"
 
-#include "button.h"
-#include "listbox.h"
-#include "ok_dialog.h"
-#include "scrollarea.h"
-#include "setup_keyboard.h"
+#include "gui/widgets/layouthelper.h"
 
-#include "widgets/layouthelper.h"
+#include "keyboardconfig.h"
 
-#include "../keyboardconfig.h"
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
 
-#include "../utils/gettext.h"
-#include "../utils/stringutils.h"
+#include <SDL_keyboard.h>
+
+#include <guichan/listmodel.hpp>
 
 /**
  * The list model for key function list.
@@ -59,7 +59,7 @@ class KeyListModel : public gcn::ListModel
         /**
          * Sets element from container.
          */
-        void setElementAt(int i, std::string caption)
+        void setElementAt(int i, const std::string &caption)
         {
             mKeyFunctions[i] = caption;
         }