Merge pull request #3658 from Hinsbart/doc_joyevent

doc: use correct identifiers for InputEventJoystick{Motion, Button}

core/os/input_event.cpp

@@ -107,13 +107,13 @@ InputEvent::operator String() const {
 		
 		} break;
 		case JOYSTICK_MOTION: {
-			str+= "Event: JoyMotion ";
+			str+= "Event: JoystickMotion ";
 			str=str+"Axis: "+itos(joy_motion.axis)+" Value: " +rtos(joy_motion.axis_value);
 			return str;
 
 		} break;
 		case JOYSTICK_BUTTON: {
-			str+= "Event: JoyButton ";
+			str+= "Event: JoystickButton ";
 			str=str+"Pressed: "+itos(joy_button.pressed)+" Index: " +itos(joy_button.button_index)+" pressure "+rtos(joy_button.pressure);
 			return str;
 

modules/gdscript/gd_editor.cpp

@@ -2324,8 +2324,8 @@ Error GDScriptLanguage::complete_code(const String& p_code, const String& p_base
 								"# Key",
 								"# MouseMotion",
 								"# MouseButton",
-								"# JoyMotion",
-								"# JoyButton",
+								"# JoystickMotion",
+								"# JoystickButton",
 								"# ScreenTouch",
 								"# ScreenDrag",
 								"# Action"

tools/doc/doc_data.cpp

@@ -433,7 +433,7 @@ void DocData::generate(bool p_basic_types) {
 
 			if (i==Variant::INPUT_EVENT) {
 				static const char* ie_type[InputEvent::TYPE_MAX]={
-					"","Key","MouseMotion","MouseButton","JoyMotion","JoyButton","ScreenTouch","ScreenDrag","Action"
+					"","Key","MouseMotion","MouseButton","JoystickMotion","JoystickButton","ScreenTouch","ScreenDrag","Action"
 				};
 				cname+=ie_type[j];
 			}