From c5bb98d1e4ab085c770db94b5f3cff93699cc4e9 Mon Sep 17 00:00:00 2001
From: curaga <curaga@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Thu, 30 May 2013 19:28:48 +0000
Subject: [PATCH] Remove couple unused variables, mark some per-file vars
 static

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12816 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/guiengine/event_handler.cpp       | 2 +-
 src/items/item_manager.cpp            | 2 --
 src/states_screens/kart_selection.cpp | 6 ++----
 src/states_screens/state_manager.cpp  | 2 +-
 src/utils/translation.cpp             | 2 +-
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/guiengine/event_handler.cpp b/src/guiengine/event_handler.cpp
index fdb953c53..1b432ade1 100644
--- a/src/guiengine/event_handler.cpp
+++ b/src/guiengine/event_handler.cpp
@@ -318,7 +318,7 @@ void EventHandler::processGUIAction(const PlayerAction action,
 
 // -----------------------------------------------------------------------------
 
-EventHandler* event_handler_singleton = NULL;
+static EventHandler* event_handler_singleton = NULL;
 
 EventHandler* EventHandler::get()
 {
diff --git a/src/items/item_manager.cpp b/src/items/item_manager.cpp
index 71818070b..9432b9f01 100644
--- a/src/items/item_manager.cpp
+++ b/src/items/item_manager.cpp
@@ -38,8 +38,6 @@
 #include <IMesh.h>
 #include <IAnimatedMesh.h>
 
-ItemManager* item_manager;
-
 std::vector<scene::IMesh *> ItemManager::m_item_mesh;
 std::vector<scene::IMesh *> ItemManager::m_item_lowres_mesh;
 ItemManager *               ItemManager::m_item_manager = NULL;
diff --git a/src/states_screens/kart_selection.cpp b/src/states_screens/kart_selection.cpp
index 55a528490..334fd4046 100644
--- a/src/states_screens/kart_selection.cpp
+++ b/src/states_screens/kart_selection.cpp
@@ -50,8 +50,6 @@
 #include <IGUIImage.h>
 #include <IGUIButton.h>
 
-InputDevice* player_1_device = NULL;
-
 using namespace GUIEngine;
 using irr::core::stringw;
 
@@ -71,7 +69,7 @@ class PlayerKartWidget;
     turn moves the selection to the appropriate spinner. "tabbing roots" are
     used to make navigation back down possible. (FIXME: maybe find a cleaner
     way?) */
-int g_root_id;
+static int g_root_id;
 
 class FocusDispatcher : public Widget
 {
@@ -134,7 +132,7 @@ public:
     virtual EventPropagation focused(const int playerID);
 };   // FocusDispatcher
 
-FocusDispatcher* g_dispatcher = NULL;
+static FocusDispatcher* g_dispatcher = NULL;
 
 // ============================================================================
 
diff --git a/src/states_screens/state_manager.cpp b/src/states_screens/state_manager.cpp
index f9dfb221e..74a1a9c72 100644
--- a/src/states_screens/state_manager.cpp
+++ b/src/states_screens/state_manager.cpp
@@ -34,7 +34,7 @@
 
 using namespace GUIEngine;
 
-StateManager* state_manager_singleton = NULL;
+static StateManager* state_manager_singleton = NULL;
 
 StateManager* StateManager::get()
 {
diff --git a/src/utils/translation.cpp b/src/utils/translation.cpp
index 3f63e1bf6..02b92aef6 100644
--- a/src/utils/translation.cpp
+++ b/src/utils/translation.cpp
@@ -59,7 +59,7 @@ const bool REMOVE_BOM = false;
 /** The list of available languages; this is global so that it is cached (and remains
     even if the translations object is deleted and re-created) */
 typedef std::vector<std::string> LanguageList;
-LanguageList g_language_list;
+static LanguageList g_language_list;
 
 // Note : this method is not static because 'g_language_list' is initialized
 //        the first time Translations is constructed (despite being a global)