From f4fa74fe28bc57205461c1937fb6f7ad15886a84 Mon Sep 17 00:00:00 2001
From: hondres <liu.gam3@gmail.com>
Date: Mon, 1 Feb 2016 14:28:53 +0100
Subject: [PATCH] remove pc_joystick_map.h

---
 core/os/pc_joystick_map.h       | 86 ---------------------------------
 platform/windows/os_windows.cpp |  1 -
 platform/winrt/os_winrt.cpp     |  1 -
 platform/x11/os_x11.cpp         |  1 -
 4 files changed, 89 deletions(-)
 delete mode 100644 core/os/pc_joystick_map.h

diff --git a/core/os/pc_joystick_map.h b/core/os/pc_joystick_map.h
deleted file mode 100644
index df123c5c1b5..00000000000
--- a/core/os/pc_joystick_map.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*************************************************************************/
-/*  pc_joystick_map.h                                                    */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                    http://www.godotengine.org                         */
-/*************************************************************************/
-/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
-/*                                                                       */
-/* Permission is hereby granted, free of charge, to any person obtaining */
-/* a copy of this software and associated documentation files (the       */
-/* "Software"), to deal in the Software without restriction, including   */
-/* without limitation the rights to use, copy, modify, merge, publish,   */
-/* distribute, sublicense, and/or sell copies of the Software, and to    */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions:                                             */
-/*                                                                       */
-/* The above copyright notice and this permission notice shall be        */
-/* included in all copies or substantial portions of the Software.       */
-/*                                                                       */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
-/*************************************************************************/
-#ifndef PC_JOYSTICK_MAP_H
-#define PC_JOYSTICK_MAP_H
-
-#include "input_event.h"
-
-static const int _pc_joystick_button_remap[JOY_BUTTON_MAX]={
-
-	JOY_SELECT,
-	JOY_L3,
-	JOY_R3,
-	JOY_START,
-
-	JOY_DPAD_UP,
-	JOY_DPAD_RIGHT,
-	JOY_DPAD_DOWN,
-	JOY_DPAD_LEFT,
-
-	JOY_L2,
-	JOY_R2,
-	JOY_L,
-	JOY_R,
-
-	JOY_SNES_X,
-	JOY_SNES_A,
-	JOY_SNES_B,
-	JOY_SNES_Y,
-
-	// JOY_HOME = 16
-};
-
-
-static int _pc_joystick_get_native_button(int p_pc_button) {
-
-	if (p_pc_button<0 || p_pc_button>=JOY_BUTTON_MAX)
-		return p_pc_button;
-	return _pc_joystick_button_remap[p_pc_button];
-}
-
-static const int _pc_joystick_axis_remap[JOY_AXIS_MAX]={
-	JOY_ANALOG_0_X,
-	JOY_ANALOG_0_Y,
-	JOY_ANALOG_1_X,
-	JOY_ANALOG_1_Y,
-	JOY_ANALOG_2_X,
-	JOY_ANALOG_2_Y,
-	JOY_AXIS_6,
-	JOY_AXIS_7
-};
-
-
-static int _pc_joystick_get_native_axis(int p_pc_axis) {
-
-	if (p_pc_axis<0 || p_pc_axis>=JOY_BUTTON_MAX)
-		return p_pc_axis;
-	return _pc_joystick_axis_remap[p_pc_axis];
-}
-
-#endif // PC_JOYSTICK_MAP_H
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 886c43d116d..20f417ccc63 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -47,7 +47,6 @@
 #include "tcp_server_winsock.h"
 #include "packet_peer_udp_winsock.h"
 #include "stream_peer_winsock.h"
-#include "os/pc_joystick_map.h"
 #include "lang_table.h"
 #include "os/memory_pool_dynamic_prealloc.h"
 #include "globals.h"
diff --git a/platform/winrt/os_winrt.cpp b/platform/winrt/os_winrt.cpp
index f507c1aae77..b6ce7f950d6 100644
--- a/platform/winrt/os_winrt.cpp
+++ b/platform/winrt/os_winrt.cpp
@@ -43,7 +43,6 @@
 #include "servers/audio/audio_server_sw.h"
 #include "servers/visual/visual_server_wrap_mt.h"
 
-#include "os/pc_joystick_map.h"
 #include "os/memory_pool_dynamic_prealloc.h"
 #include "globals.h"
 #include "io/marshalls.h"
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp
index f42e93b93f5..7c4c625dbcd 100644
--- a/platform/x11/os_x11.cpp
+++ b/platform/x11/os_x11.cpp
@@ -65,7 +65,6 @@
 
 
 #include <X11/Xatom.h>
-//#include "os/pc_joystick_map.h"
 
 #undef CursorShape