Merge pull request #113493 from dsnopek/requiredparam-sync-headers

akien-mga · akien-mga · commit 04107df01b7a · 2025-12-03T14:58:25.000+01:00
Synchronize the names for `RequiredParam&lt;T&gt;` arguments in header files
diff --git a/core/input/input.h b/core/input/input.h
@@ -321,8 +321,8 @@ class Input : public Object {
 	bool is_action_pressed(const StringName &p_action, bool p_exact = false) const;
 	bool is_action_just_pressed(const StringName &p_action, bool p_exact = false) const;
 	bool is_action_just_released(const StringName &p_action, bool p_exact = false) const;
-	bool is_action_just_pressed_by_event(const StringName &p_action, RequiredParam<InputEvent> p_event, bool p_exact = false) const;
-	bool is_action_just_released_by_event(const StringName &p_action, RequiredParam<InputEvent> p_event, bool p_exact = false) const;
+	bool is_action_just_pressed_by_event(const StringName &p_action, RequiredParam<InputEvent> rp_event, bool p_exact = false) const;
+	bool is_action_just_released_by_event(const StringName &p_action, RequiredParam<InputEvent> rp_event, bool p_exact = false) const;
 	float get_action_strength(const StringName &p_action, bool p_exact = false) const;
 	float get_action_raw_strength(const StringName &p_action, bool p_exact = false) const;
 
@@ -350,7 +350,7 @@ class Input : public Object {
 	void warp_mouse(const Vector2 &p_position);
 	Point2 warp_mouse_motion(const Ref<InputEventMouseMotion> &p_motion, const Rect2 &p_rect);
 
-	void parse_input_event(RequiredParam<InputEvent> p_event);
+	void parse_input_event(RequiredParam<InputEvent> rp_event);
 
 	void set_gravity(const Vector3 &p_gravity);
 	void set_accelerometer(const Vector3 &p_accel);
diff --git a/core/input/input_map.h b/core/input/input_map.h
@@ -87,13 +87,13 @@ class InputMap : public Object {
 
 	float action_get_deadzone(const StringName &p_action);
 	void action_set_deadzone(const StringName &p_action, float p_deadzone);
-	void action_add_event(const StringName &p_action, RequiredParam<InputEvent> p_event);
-	bool action_has_event(const StringName &p_action, RequiredParam<InputEvent> p_event);
-	void action_erase_event(const StringName &p_action, RequiredParam<InputEvent> p_event);
+	void action_add_event(const StringName &p_action, RequiredParam<InputEvent> rp_event);
+	bool action_has_event(const StringName &p_action, RequiredParam<InputEvent> rp_event);
+	void action_erase_event(const StringName &p_action, RequiredParam<InputEvent> rp_event);
 	void action_erase_events(const StringName &p_action);
 
 	const List<Ref<InputEvent>> *action_get_events(const StringName &p_action);
-	bool event_is_action(RequiredParam<InputEvent> p_event, const StringName &p_action, bool p_exact_match = false) const;
+	bool event_is_action(RequiredParam<InputEvent> rp_event, const StringName &p_action, bool p_exact_match = false) const;
 	int event_get_index(const Ref<InputEvent> &p_event, const StringName &p_action, bool p_exact_match = false) const;
 	bool event_get_action_status(const Ref<InputEvent> &p_event, const StringName &p_action, bool p_exact_match = false, bool *r_pressed = nullptr, float *r_strength = nullptr, float *r_raw_strength = nullptr, int *r_event_index = nullptr) const;
 
diff --git a/core/io/resource_saver.h b/core/io/resource_saver.h
@@ -83,7 +83,7 @@ class ResourceSaver {
 		FLAG_REPLACE_SUBRESOURCE_PATHS = 64,
 	};
 
-	static Error save(RequiredParam<Resource> p_resource, const String &p_path = "", uint32_t p_flags = (uint32_t)FLAG_NONE);
+	static Error save(RequiredParam<Resource> rp_resource, const String &p_path = "", uint32_t p_flags = (uint32_t)FLAG_NONE);
 	static void get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions);
 	static void add_resource_format_saver(Ref<ResourceFormatSaver> p_format_saver, bool p_at_front = false);
 	static void remove_resource_format_saver(Ref<ResourceFormatSaver> p_format_saver);
diff --git a/modules/godot_physics_3d/godot_physics_server_3d.h b/modules/godot_physics_3d/godot_physics_server_3d.h
@@ -263,7 +263,7 @@ class GodotPhysicsServer3D : public PhysicsServer3D {
 
 	virtual RID soft_body_create() override;
 
-	virtual void soft_body_update_rendering_server(RID p_body, RequiredParam<PhysicsServer3DRenderingServerHandler> p_rendering_server_handler) override;
+	virtual void soft_body_update_rendering_server(RID p_body, RequiredParam<PhysicsServer3DRenderingServerHandler> rp_rendering_server_handler) override;
 
 	virtual void soft_body_set_space(RID p_body, RID p_space) override;
 	virtual RID soft_body_get_space(RID p_body) const override;
diff --git a/modules/jolt_physics/jolt_physics_server_3d.h b/modules/jolt_physics/jolt_physics_server_3d.h
@@ -300,7 +300,7 @@ class JoltPhysicsServer3D final : public PhysicsServer3D {
 
 	virtual RID soft_body_create() override;
 
-	virtual void soft_body_update_rendering_server(RID p_body, RequiredParam<PhysicsServer3DRenderingServerHandler> p_rendering_server_handler) override;
+	virtual void soft_body_update_rendering_server(RID p_body, RequiredParam<PhysicsServer3DRenderingServerHandler> rp_rendering_server_handler) override;
 
 	virtual void soft_body_set_space(RID p_body, RID p_space) override;
 	virtual RID soft_body_get_space(RID p_body) const override;
diff --git a/scene/2d/physics/area_2d.h b/scene/2d/physics/area_2d.h
@@ -185,8 +185,8 @@ class Area2D : public CollisionObject2D {
 	bool has_overlapping_bodies() const;
 	bool has_overlapping_areas() const;
 
-	bool overlaps_area(RequiredParam<Node> p_area) const;
-	bool overlaps_body(RequiredParam<Node> p_body) const;
+	bool overlaps_area(RequiredParam<Node> rp_area) const;
+	bool overlaps_body(RequiredParam<Node> rp_body) const;
 
 	void set_audio_bus_override(bool p_override);
 	bool is_overriding_audio_bus() const;
diff --git a/scene/2d/physics/collision_object_2d.h b/scene/2d/physics/collision_object_2d.h
@@ -154,7 +154,7 @@ class CollisionObject2D : public Node2D {
 	void shape_owner_set_one_way_collision_margin(uint32_t p_owner, real_t p_margin);
 	real_t get_shape_owner_one_way_collision_margin(uint32_t p_owner) const;
 
-	void shape_owner_add_shape(uint32_t p_owner, RequiredParam<Shape2D> p_shape);
+	void shape_owner_add_shape(uint32_t p_owner, RequiredParam<Shape2D> rp_shape);
 	int shape_owner_get_shape_count(uint32_t p_owner) const;
 	Ref<Shape2D> shape_owner_get_shape(uint32_t p_owner, int p_shape) const;
 	int shape_owner_get_shape_index(uint32_t p_owner, int p_shape) const;
diff --git a/scene/2d/physics/physics_body_2d.h b/scene/2d/physics/physics_body_2d.h
@@ -54,6 +54,6 @@ class PhysicsBody2D : public CollisionObject2D {
 	Vector2 get_gravity() const;
 
 	TypedArray<PhysicsBody2D> get_collision_exceptions();
-	void add_collision_exception_with(RequiredParam<Node> p_node); //must be physicsbody
-	void remove_collision_exception_with(RequiredParam<Node> p_node);
+	void add_collision_exception_with(RequiredParam<Node> rp_node); //must be physicsbody
+	void remove_collision_exception_with(RequiredParam<Node> rp_node);
 };
diff --git a/scene/2d/physics/ray_cast_2d.h b/scene/2d/physics/ray_cast_2d.h
@@ -97,9 +97,9 @@ class RayCast2D : public Node2D {
 	Vector2 get_collision_normal() const;
 
 	void add_exception_rid(const RID &p_rid);
-	void add_exception(RequiredParam<const CollisionObject2D> p_node);
+	void add_exception(RequiredParam<const CollisionObject2D> rp_node);
 	void remove_exception_rid(const RID &p_rid);
-	void remove_exception(RequiredParam<const CollisionObject2D> p_node);
+	void remove_exception(RequiredParam<const CollisionObject2D> rp_node);
 	void clear_exceptions();
 
 	RayCast2D();
diff --git a/scene/2d/physics/shape_cast_2d.h b/scene/2d/physics/shape_cast_2d.h
@@ -112,9 +112,9 @@ class ShapeCast2D : public Node2D {
 	real_t get_closest_collision_unsafe_fraction() const;
 
 	void add_exception_rid(const RID &p_rid);
-	void add_exception(RequiredParam<const CollisionObject2D> p_node);
+	void add_exception(RequiredParam<const CollisionObject2D> rp_node);
 	void remove_exception_rid(const RID &p_rid);
-	void remove_exception(RequiredParam<const CollisionObject2D> p_node);
+	void remove_exception(RequiredParam<const CollisionObject2D> rp_node);
 	void clear_exceptions();
 
 	PackedStringArray get_configuration_warnings() const override;
diff --git a/scene/3d/physics/area_3d.h b/scene/3d/physics/area_3d.h
@@ -204,8 +204,8 @@ class Area3D : public CollisionObject3D {
 	bool has_overlapping_bodies() const;
 	bool has_overlapping_areas() const;
 
-	bool overlaps_area(RequiredParam<Node> p_area) const;
-	bool overlaps_body(RequiredParam<Node> p_body) const;
+	bool overlaps_area(RequiredParam<Node> rp_area) const;
+	bool overlaps_body(RequiredParam<Node> rp_body) const;
 
 	void set_audio_bus_override(bool p_override);
 	bool is_overriding_audio_bus() const;
diff --git a/scene/3d/physics/collision_object_3d.h b/scene/3d/physics/collision_object_3d.h
@@ -157,7 +157,7 @@ class CollisionObject3D : public Node3D {
 	void shape_owner_set_disabled(uint32_t p_owner, bool p_disabled);
 	bool is_shape_owner_disabled(uint32_t p_owner) const;
 
-	void shape_owner_add_shape(uint32_t p_owner, RequiredParam<Shape3D> p_shape);
+	void shape_owner_add_shape(uint32_t p_owner, RequiredParam<Shape3D> rp_shape);
 	int shape_owner_get_shape_count(uint32_t p_owner) const;
 	Ref<Shape3D> shape_owner_get_shape(uint32_t p_owner, int p_shape) const;
 	int shape_owner_get_shape_index(uint32_t p_owner, int p_shape) const;
diff --git a/scene/3d/physics/physics_body_3d.h b/scene/3d/physics/physics_body_3d.h
@@ -65,6 +65,6 @@ class PhysicsBody3D : public CollisionObject3D {
 	virtual real_t get_inverse_mass() const;
 
 	TypedArray<PhysicsBody3D> get_collision_exceptions();
-	void add_collision_exception_with(RequiredParam<Node> p_node); //must be physicsbody
-	void remove_collision_exception_with(RequiredParam<Node> p_node);
+	void add_collision_exception_with(RequiredParam<Node> rp_node); //must be physicsbody
+	void remove_collision_exception_with(RequiredParam<Node> rp_node);
 };
diff --git a/scene/3d/physics/ray_cast_3d.h b/scene/3d/physics/ray_cast_3d.h
@@ -127,9 +127,9 @@ class RayCast3D : public Node3D {
 	int get_collision_face_index() const;
 
 	void add_exception_rid(const RID &p_rid);
-	void add_exception(RequiredParam<const CollisionObject3D> p_node);
+	void add_exception(RequiredParam<const CollisionObject3D> rp_node);
 	void remove_exception_rid(const RID &p_rid);
-	void remove_exception(RequiredParam<const CollisionObject3D> p_node);
+	void remove_exception(RequiredParam<const CollisionObject3D> rp_node);
 	void clear_exceptions();
 
 	RayCast3D();
diff --git a/scene/3d/physics/shape_cast_3d.h b/scene/3d/physics/shape_cast_3d.h
@@ -135,9 +135,9 @@ class ShapeCast3D : public Node3D {
 	bool is_colliding() const;
 
 	void add_exception_rid(const RID &p_rid);
-	void add_exception(RequiredParam<const CollisionObject3D> p_node);
+	void add_exception(RequiredParam<const CollisionObject3D> rp_node);
 	void remove_exception_rid(const RID &p_rid);
-	void remove_exception(RequiredParam<const CollisionObject3D> p_node);
+	void remove_exception(RequiredParam<const CollisionObject3D> rp_node);
 	void clear_exceptions();
 
 	virtual PackedStringArray get_configuration_warnings() const override;
diff --git a/scene/3d/physics/soft_body_3d.h b/scene/3d/physics/soft_body_3d.h
@@ -177,8 +177,8 @@ class SoftBody3D : public MeshInstance3D {
 	real_t get_drag_coefficient();
 
 	TypedArray<PhysicsBody3D> get_collision_exceptions();
-	void add_collision_exception_with(RequiredParam<Node> p_node);
-	void remove_collision_exception_with(RequiredParam<Node> p_node);
+	void add_collision_exception_with(RequiredParam<Node> rp_node);
+	void remove_collision_exception_with(RequiredParam<Node> rp_node);
 
 	Vector3 get_point_transform(int p_point_index);
 
diff --git a/scene/animation/tween.h b/scene/animation/tween.h
@@ -143,11 +143,11 @@ class Tween : public RefCounted {
 	virtual String _to_string() override;
 
 public:
-	RequiredResult<PropertyTweener> tween_property(RequiredParam<const Object> p_target, const NodePath &p_property, Variant p_to, double p_duration);
+	RequiredResult<PropertyTweener> tween_property(RequiredParam<const Object> rp_target, const NodePath &p_property, Variant p_to, double p_duration);
 	RequiredResult<IntervalTweener> tween_interval(double p_time);
 	RequiredResult<CallbackTweener> tween_callback(const Callable &p_callback);
 	RequiredResult<MethodTweener> tween_method(const Callable &p_callback, const Variant p_from, Variant p_to, double p_duration);
-	RequiredResult<SubtweenTweener> tween_subtween(RequiredParam<Tween> p_subtween);
+	RequiredResult<SubtweenTweener> tween_subtween(RequiredParam<Tween> rp_subtween);
 	void append(Ref<Tweener> p_tweener);
 
 	bool custom_step(double p_delta);
@@ -160,7 +160,7 @@ class Tween : public RefCounted {
 	bool is_valid();
 	void clear();
 
-	RequiredResult<Tween> bind_node(RequiredParam<const Node> p_node);
+	RequiredResult<Tween> bind_node(RequiredParam<const Node> rp_node);
 	RequiredResult<Tween> set_process_mode(TweenProcessMode p_mode);
 	TweenProcessMode get_process_mode() const;
 	RequiredResult<Tween> set_pause_mode(TweenPauseMode p_mode);
diff --git a/scene/gui/container.h b/scene/gui/container.h
@@ -65,7 +65,7 @@ class Container : public Control {
 		NOTIFICATION_SORT_CHILDREN = 51,
 	};
 
-	void fit_child_in_rect(RequiredParam<Control> p_child, const Rect2 &p_rect);
+	void fit_child_in_rect(RequiredParam<Control> rp_child, const Rect2 &p_rect);
 
 	virtual Vector<int> get_allowed_size_flags_horizontal() const;
 	virtual Vector<int> get_allowed_size_flags_vertical() const;
diff --git a/scene/gui/control.h b/scene/gui/control.h
@@ -674,9 +674,9 @@ class Control : public CanvasItem {
 	void begin_bulk_theme_override();
 	void end_bulk_theme_override();
 
-	void add_theme_icon_override(const StringName &p_name, RequiredParam<Texture2D> p_icon);
-	void add_theme_style_override(const StringName &p_name, RequiredParam<StyleBox> p_style);
-	void add_theme_font_override(const StringName &p_name, RequiredParam<Font> p_font);
+	void add_theme_icon_override(const StringName &p_name, RequiredParam<Texture2D> rp_icon);
+	void add_theme_style_override(const StringName &p_name, RequiredParam<StyleBox> rp_style);
+	void add_theme_font_override(const StringName &p_name, RequiredParam<Font> rp_font);
 	void add_theme_font_size_override(const StringName &p_name, int p_font_size);
 	void add_theme_color_override(const StringName &p_name, const Color &p_color);
 	void add_theme_constant_override(const StringName &p_name, int p_constant);
diff --git a/scene/main/canvas_item.h b/scene/main/canvas_item.h
diff --git a/scene/main/node.h b/scene/main/node.h
diff --git a/scene/main/scene_tree.h b/scene/main/scene_tree.h
diff --git a/scene/main/viewport.h b/scene/main/viewport.h
diff --git a/scene/resources/2d/shape_2d.h b/scene/resources/2d/shape_2d.h
diff --git a/servers/physics_2d/physics_server_2d.h b/servers/physics_2d/physics_server_2d.h
diff --git a/servers/physics_3d/physics_server_3d.h b/servers/physics_3d/physics_server_3d.h
diff --git a/servers/physics_3d/physics_server_3d_dummy.h b/servers/physics_3d/physics_server_3d_dummy.h
