From c52c2375c04e93d751f5f479aace0810bfa36532 Mon Sep 17 00:00:00 2001
From: adrian17 <adrian.wielgosik@gmail.com>
Date: Sun, 19 Jan 2014 13:50:30 +0100
Subject: [PATCH] Removed dead code from UI

---
 UI/DevScreens.cpp               |  1 -
 UI/EmuScreen.cpp                | 24 ------------------------
 UI/TouchControlLayoutScreen.cpp |  1 -
 3 files changed, 26 deletions(-)

diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp
index 8526dd4b62..efd4d5b897 100644
--- a/UI/DevScreens.cpp
+++ b/UI/DevScreens.cpp
@@ -339,7 +339,6 @@ void AddressPromptScreen::UpdatePreviewDigits() {
 }
 
 void AddressPromptScreen::key(const KeyInput &key) {
-	int nextDigit = -1;
 	if (key.flags & KEY_DOWN) {
 		if (key.keyCode >= NKCODE_0 && key.keyCode <= NKCODE_9) {
 			AddDigit(key.keyCode - NKCODE_0);
diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp
index 4ec5bf6a1f..40c421ed69 100644
--- a/UI/EmuScreen.cpp
+++ b/UI/EmuScreen.cpp
@@ -435,23 +435,6 @@ void EmuScreen::processAxis(const AxisInput &axis, int direction) {
 	}
 }
 
-
-// TODO: Get rid of this.
-static const struct { int from, to; } legacy_touch_mapping[12] = {
-	{PAD_BUTTON_A, CTRL_CROSS},
-	{PAD_BUTTON_B, CTRL_CIRCLE},
-	{PAD_BUTTON_X, CTRL_SQUARE},
-	{PAD_BUTTON_Y, CTRL_TRIANGLE},
-	{PAD_BUTTON_START, CTRL_START},
-	{PAD_BUTTON_SELECT, CTRL_SELECT},
-	{PAD_BUTTON_LBUMPER, CTRL_LTRIGGER},
-	{PAD_BUTTON_RBUMPER, CTRL_RTRIGGER},
-	{PAD_BUTTON_UP, CTRL_UP},
-	{PAD_BUTTON_RIGHT, CTRL_RIGHT},
-	{PAD_BUTTON_DOWN, CTRL_DOWN},
-	{PAD_BUTTON_LEFT, CTRL_LEFT},
-};
-
 void EmuScreen::CreateViews() {
 	InitPadLayout();
 	root_ = CreatePadLayout(&pauseTrigger_);
@@ -501,11 +484,6 @@ void EmuScreen::update(InputState &input) {
 	if (invalid_)
 		return;
 
-	float leftstick_x = 0.0f;
-	float leftstick_y = 0.0f;
-	float rightstick_x = 0.0f;
-	float rightstick_y = 0.0f;
-
 	// Virtual keys.
 	__CtrlSetRapidFire(virtKeys[VIRTKEY_RAPID_FIRE - VIRTKEY_FIRST]);
 
@@ -612,8 +590,6 @@ void EmuScreen::render() {
 
 	ui_draw2d.Begin(UIShader_Get(), DBMODE_NORMAL);
 
-	float touchOpacity = g_Config.iTouchButtonOpacity / 100.0f;
-
 	if (root_) {
 		UI::LayoutViewHierarchy(*screenManager()->getUIContext(), root_);
 		root_->Draw(*screenManager()->getUIContext());
diff --git a/UI/TouchControlLayoutScreen.cpp b/UI/TouchControlLayoutScreen.cpp
index e08f3267ca..2c7e55c8d0 100644
--- a/UI/TouchControlLayoutScreen.cpp
+++ b/UI/TouchControlLayoutScreen.cpp
@@ -281,7 +281,6 @@ UI::EventReturn TouchControlLayoutScreen::OnVisibility(UI::EventParams &e) {
 
 UI::EventReturn TouchControlLayoutScreen::OnReset(UI::EventParams &e) {
 	ILOG("Resetting touch control layout");
-	float defaultScale = 1.15;
 	g_Config.ResetControlLayout();
 	InitPadLayout();
 	RecreateViews();