From 547a57777b199f451305a6d4b6ad63fb0b2bd3ed Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Sun, 8 Jan 2017 17:05:51 -0300
Subject: renamed joystick to joypad everywhere around source code!

---
 core/os/input_event.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'core/os/input_event.h')

diff --git a/core/os/input_event.h b/core/os/input_event.h
index 8fe033aa3c..a557de2bd7 100644
--- a/core/os/input_event.h
+++ b/core/os/input_event.h
@@ -225,13 +225,13 @@ struct InputEventMouseMotion : public InputEventMouse {
 	float speed_x,speed_y;
 };
 
-struct InputEventJoystickMotion  {
+struct InputEventJoypadMotion  {
 
-	int axis; ///< Joystick axis
+	int axis; ///< Joypad axis
 	float axis_value; ///< -1 to 1
 };
 
-struct InputEventJoystickButton  {
+struct InputEventJoypadButton  {
 
 	int button_index;
 	bool pressed;
@@ -267,8 +267,8 @@ struct InputEvent {
 		KEY,
 		MOUSE_MOTION,
 		MOUSE_BUTTON,
-		JOYSTICK_MOTION,
-		JOYSTICK_BUTTON,
+		JOYPAD_MOTION,
+		JOYPAD_BUTTON,
 		SCREEN_TOUCH,
 		SCREEN_DRAG,
 		ACTION,
@@ -282,8 +282,8 @@ struct InputEvent {
 	union {
 		InputEventMouseMotion mouse_motion;
 		InputEventMouseButton mouse_button;
-		InputEventJoystickMotion joy_motion;
-		InputEventJoystickButton joy_button;
+		InputEventJoypadMotion joy_motion;
+		InputEventJoypadButton joy_button;
 		InputEventKey key;
 		InputEventScreenTouch screen_touch;
 		InputEventScreenDrag screen_drag;
-- 
cgit v1.2.3