Skip to content

Commit

Permalink
Change return type of get_configuration_warnings to `PackedStringAr…
Browse files Browse the repository at this point in the history
…ray`
  • Loading branch information
Zylann committed Sep 19, 2022
1 parent 9087953 commit aed3822
Show file tree
Hide file tree
Showing 126 changed files with 201 additions and 203 deletions.
4 changes: 2 additions & 2 deletions modules/multiplayer/multiplayer_spawner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ void MultiplayerSpawner::_get_property_list(List<PropertyInfo> *p_list) const {
}
#endif

TypedArray<String> MultiplayerSpawner::get_configuration_warnings() const {
TypedArray<String> warnings = Node::get_configuration_warnings();
PackedStringArray MultiplayerSpawner::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();

if (spawn_path.is_empty() || !has_node(spawn_path)) {
warnings.push_back(RTR("A valid NodePath must be set in the \"Spawn Path\" property in order for MultiplayerSpawner to be able to spawn Nodes."));
Expand Down
2 changes: 1 addition & 1 deletion modules/multiplayer/multiplayer_spawner.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class MultiplayerSpawner : public Node {
void _get_property_list(List<PropertyInfo> *p_list) const;
#endif
public:
TypedArray<String> get_configuration_warnings() const override;
PackedStringArray get_configuration_warnings() const override;

Node *get_spawn_node() const {
return spawn_node.is_valid() ? Object::cast_to<Node>(ObjectDB::get_instance(spawn_node)) : nullptr;
Expand Down
4 changes: 2 additions & 2 deletions modules/multiplayer/multiplayer_synchronizer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ void MultiplayerSynchronizer::_update_process() {
}
}

TypedArray<String> MultiplayerSynchronizer::get_configuration_warnings() const {
TypedArray<String> warnings = Node::get_configuration_warnings();
PackedStringArray MultiplayerSynchronizer::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();

if (root_path.is_empty() || !has_node(root_path)) {
warnings.push_back(RTR("A valid NodePath must be set in the \"Root Path\" property in order for MultiplayerSynchronizer to be able to synchronize properties."));
Expand Down
2 changes: 1 addition & 1 deletion modules/multiplayer/multiplayer_synchronizer.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class MultiplayerSynchronizer : public Node {
static Error get_state(const List<NodePath> &p_properties, Object *p_obj, Vector<Variant> &r_variant, Vector<const Variant *> &r_variant_ptrs);
static Error set_state(const List<NodePath> &p_properties, Object *p_obj, const Vector<Variant> &p_state);

TypedArray<String> get_configuration_warnings() const override;
PackedStringArray get_configuration_warnings() const override;

void set_replication_interval(double p_interval);
double get_replication_interval() const;
Expand Down
4 changes: 2 additions & 2 deletions scene/2d/animated_sprite_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -454,8 +454,8 @@ StringName AnimatedSprite2D::get_animation() const {
return animation;
}

TypedArray<String> AnimatedSprite2D::get_configuration_warnings() const {
TypedArray<String> warnings = Node::get_configuration_warnings();
PackedStringArray AnimatedSprite2D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();

if (frames.is_null()) {
warnings.push_back(RTR("A SpriteFrames resource must be created or set in the \"Frames\" property in order for AnimatedSprite2D to display frames."));
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/animated_sprite_2d.h
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ class AnimatedSprite2D : public Node2D {
void set_flip_v(bool p_flip);
bool is_flipped_v() const;

TypedArray<String> get_configuration_warnings() const override;
PackedStringArray get_configuration_warnings() const override;
virtual void get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const override;

AnimatedSprite2D();
Expand Down
4 changes: 2 additions & 2 deletions scene/2d/canvas_modulate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ Color CanvasModulate::get_color() const {
return color;
}

TypedArray<String> CanvasModulate::get_configuration_warnings() const {
TypedArray<String> warnings = Node::get_configuration_warnings();
PackedStringArray CanvasModulate::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();

if (is_visible_in_tree() && is_inside_tree()) {
List<Node *> nodes;
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/canvas_modulate.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class CanvasModulate : public Node2D {
void set_color(const Color &p_color);
Color get_color() const;

TypedArray<String> get_configuration_warnings() const override;
PackedStringArray get_configuration_warnings() const override;

CanvasModulate();
~CanvasModulate();
Expand Down
4 changes: 2 additions & 2 deletions scene/2d/collision_object_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -565,8 +565,8 @@ void CollisionObject2D::_update_pickable() {
}
}

TypedArray<String> CollisionObject2D::get_configuration_warnings() const {
TypedArray<String> warnings = Node::get_configuration_warnings();
PackedStringArray CollisionObject2D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();

if (shapes.is_empty()) {
warnings.push_back(RTR("This node has no shape, so it can't collide or interact with other objects.\nConsider adding a CollisionShape2D or CollisionPolygon2D as a child to define its shape."));
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/collision_object_2d.h
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ class CollisionObject2D : public Node2D {
void set_pickable(bool p_enabled);
bool is_pickable() const;

TypedArray<String> get_configuration_warnings() const override;
PackedStringArray get_configuration_warnings() const override;

_FORCE_INLINE_ RID get_rid() const { return rid; }

Expand Down
4 changes: 2 additions & 2 deletions scene/2d/collision_polygon_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,8 @@ bool CollisionPolygon2D::_edit_is_selected_on_click(const Point2 &p_point, doubl
}
#endif

TypedArray<String> CollisionPolygon2D::get_configuration_warnings() const {
TypedArray<String> warnings = Node::get_configuration_warnings();
PackedStringArray CollisionPolygon2D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();

if (!Object::cast_to<CollisionObject2D>(get_parent())) {
warnings.push_back(RTR("CollisionPolygon2D only serves to provide a collision shape to a CollisionObject2D derived node. Please only use it as a child of Area2D, StaticBody2D, RigidBody2D, CharacterBody2D, etc. to give them a shape."));
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/collision_polygon_2d.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class CollisionPolygon2D : public Node2D {
void set_polygon(const Vector<Point2> &p_polygon);
Vector<Point2> get_polygon() const;

TypedArray<String> get_configuration_warnings() const override;
PackedStringArray get_configuration_warnings() const override;

void set_disabled(bool p_disabled);
bool is_disabled() const;
Expand Down
4 changes: 2 additions & 2 deletions scene/2d/collision_shape_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ bool CollisionShape2D::_edit_is_selected_on_click(const Point2 &p_point, double
return shape->_edit_is_selected_on_click(p_point, p_tolerance);
}

TypedArray<String> CollisionShape2D::get_configuration_warnings() const {
TypedArray<String> warnings = Node::get_configuration_warnings();
PackedStringArray CollisionShape2D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();

if (!Object::cast_to<CollisionObject2D>(get_parent())) {
warnings.push_back(RTR("CollisionShape2D only serves to provide a collision shape to a CollisionObject2D derived node. Please only use it as a child of Area2D, StaticBody2D, RigidBody2D, CharacterBody2D, etc. to give them a shape."));
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/collision_shape_2d.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class CollisionShape2D : public Node2D {
void set_one_way_collision_margin(real_t p_margin);
real_t get_one_way_collision_margin() const;

TypedArray<String> get_configuration_warnings() const override;
PackedStringArray get_configuration_warnings() const override;

CollisionShape2D();
};
Expand Down
4 changes: 2 additions & 2 deletions scene/2d/cpu_particles_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,8 @@ bool CPUParticles2D::get_fractional_delta() const {
return fractional_delta;
}

TypedArray<String> CPUParticles2D::get_configuration_warnings() const {
TypedArray<String> warnings = Node2D::get_configuration_warnings();
PackedStringArray CPUParticles2D::get_configuration_warnings() const {
PackedStringArray warnings = Node2D::get_configuration_warnings();

CanvasItemMaterial *mat = Object::cast_to<CanvasItemMaterial>(get_material().ptr());

Expand Down
2 changes: 1 addition & 1 deletion scene/2d/cpu_particles_2d.h
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ class CPUParticles2D : public Node2D {
void set_gravity(const Vector2 &p_gravity);
Vector2 get_gravity() const;

TypedArray<String> get_configuration_warnings() const override;
PackedStringArray get_configuration_warnings() const override;

void restart();

Expand Down
4 changes: 2 additions & 2 deletions scene/2d/gpu_particles_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -296,8 +296,8 @@ bool GPUParticles2D::get_interpolate() const {
return interpolate;
}

TypedArray<String> GPUParticles2D::get_configuration_warnings() const {
TypedArray<String> warnings = Node2D::get_configuration_warnings();
PackedStringArray GPUParticles2D::get_configuration_warnings() const {
PackedStringArray warnings = Node2D::get_configuration_warnings();

if (RenderingServer::get_singleton()->is_low_end()) {
warnings.push_back(RTR("GPU-based particles are not supported by the OpenGL video driver.\nUse the CPUParticles2D node instead. You can use the \"Convert to CPUParticles2D\" option for this purpose."));
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/gpu_particles_2d.h
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ class GPUParticles2D : public Node2D {
void set_texture(const Ref<Texture2D> &p_texture);
Ref<Texture2D> get_texture() const;

TypedArray<String> get_configuration_warnings() const override;
PackedStringArray get_configuration_warnings() const override;

void set_sub_emitter(const NodePath &p_path);
NodePath get_sub_emitter() const;
Expand Down
4 changes: 2 additions & 2 deletions scene/2d/joint_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,8 @@ bool Joint2D::get_exclude_nodes_from_collision() const {
return exclude_from_collision;
}

TypedArray<String> Joint2D::get_configuration_warnings() const {
TypedArray<String> warnings = Node2D::get_configuration_warnings();
PackedStringArray Joint2D::get_configuration_warnings() const {
PackedStringArray warnings = Node2D::get_configuration_warnings();

if (!warning.is_empty()) {
warnings.push_back(warning);
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/joint_2d.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class Joint2D : public Node2D {
_FORCE_INLINE_ bool is_configured() const { return configured; }

public:
virtual TypedArray<String> get_configuration_warnings() const override;
virtual PackedStringArray get_configuration_warnings() const override;

void set_node_a(const NodePath &p_node_a);
NodePath get_node_a() const;
Expand Down
4 changes: 2 additions & 2 deletions scene/2d/light_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,8 @@ Vector2 PointLight2D::get_texture_offset() const {
return texture_offset;
}

TypedArray<String> PointLight2D::get_configuration_warnings() const {
TypedArray<String> warnings = Node::get_configuration_warnings();
PackedStringArray PointLight2D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();

if (!texture.is_valid()) {
warnings.push_back(RTR("A texture with the shape of the light must be supplied to the \"Texture\" property."));
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/light_2d.h
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ class PointLight2D : public Light2D {
void set_texture_scale(real_t p_scale);
real_t get_texture_scale() const;

TypedArray<String> get_configuration_warnings() const override;
PackedStringArray get_configuration_warnings() const override;

PointLight2D();
};
Expand Down
4 changes: 2 additions & 2 deletions scene/2d/light_occluder_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,8 @@ int LightOccluder2D::get_occluder_light_mask() const {
return mask;
}

TypedArray<String> LightOccluder2D::get_configuration_warnings() const {
TypedArray<String> warnings = Node::get_configuration_warnings();
PackedStringArray LightOccluder2D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();

if (!occluder_polygon.is_valid()) {
warnings.push_back(RTR("An occluder polygon must be set (or drawn) for this occluder to take effect."));
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/light_occluder_2d.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class LightOccluder2D : public Node2D {
void set_as_sdf_collision(bool p_enable);
bool is_set_as_sdf_collision() const;

TypedArray<String> get_configuration_warnings() const override;
PackedStringArray get_configuration_warnings() const override;

LightOccluder2D();
~LightOccluder2D();
Expand Down
4 changes: 2 additions & 2 deletions scene/2d/navigation_agent_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,8 @@ void NavigationAgent2D::_avoidance_done(Vector3 p_new_velocity) {
emit_signal(SNAME("velocity_computed"), velocity);
}

TypedArray<String> NavigationAgent2D::get_configuration_warnings() const {
TypedArray<String> warnings = Node::get_configuration_warnings();
PackedStringArray NavigationAgent2D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();

if (!Object::cast_to<Node2D>(get_parent())) {
warnings.push_back(RTR("The NavigationAgent2D can be used only under a Node2D inheriting parent node."));
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/navigation_agent_2d.h
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ class NavigationAgent2D : public Node {
void set_velocity(Vector2 p_velocity);
void _avoidance_done(Vector3 p_new_velocity);

TypedArray<String> get_configuration_warnings() const override;
PackedStringArray get_configuration_warnings() const override;

private:
void update_navigation();
Expand Down
4 changes: 2 additions & 2 deletions scene/2d/navigation_link_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,8 @@ void NavigationLink2D::set_travel_cost(real_t p_travel_cost) {
NavigationServer2D::get_singleton()->link_set_travel_cost(link, travel_cost);
}

TypedArray<String> NavigationLink2D::get_configuration_warnings() const {
TypedArray<String> warnings = Node::get_configuration_warnings();
PackedStringArray NavigationLink2D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();

if (start_location.is_equal_approx(end_location)) {
warnings.push_back(RTR("NavigationLink2D start location should be different than the end location to be useful."));
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/navigation_link_2d.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class NavigationLink2D : public Node2D {
void set_travel_cost(real_t p_travel_cost);
real_t get_travel_cost() const { return travel_cost; }

TypedArray<String> get_configuration_warnings() const override;
PackedStringArray get_configuration_warnings() const override;

NavigationLink2D();
~NavigationLink2D();
Expand Down
4 changes: 2 additions & 2 deletions scene/2d/navigation_obstacle_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ NavigationObstacle2D::~NavigationObstacle2D() {
agent = RID(); // Pointless
}

TypedArray<String> NavigationObstacle2D::get_configuration_warnings() const {
TypedArray<String> warnings = Node::get_configuration_warnings();
PackedStringArray NavigationObstacle2D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();

if (!Object::cast_to<Node2D>(get_parent())) {
warnings.push_back(RTR("The NavigationObstacle2D only serves to provide collision avoidance to a Node2D object."));
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/navigation_obstacle_2d.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class NavigationObstacle2D : public Node {
return radius;
}

TypedArray<String> get_configuration_warnings() const override;
PackedStringArray get_configuration_warnings() const override;

private:
void initialize_agent();
Expand Down
4 changes: 2 additions & 2 deletions scene/2d/navigation_region_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -566,8 +566,8 @@ void NavigationRegion2D::_map_changed(RID p_map) {
#endif // DEBUG_ENABLED
}

TypedArray<String> NavigationRegion2D::get_configuration_warnings() const {
TypedArray<String> warnings = Node2D::get_configuration_warnings();
PackedStringArray NavigationRegion2D::get_configuration_warnings() const {
PackedStringArray warnings = Node2D::get_configuration_warnings();

if (is_visible_in_tree() && is_inside_tree()) {
if (!navpoly.is_valid()) {
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/navigation_region_2d.h
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class NavigationRegion2D : public Node2D {
void set_navigation_polygon(const Ref<NavigationPolygon> &p_navpoly);
Ref<NavigationPolygon> get_navigation_polygon() const;

TypedArray<String> get_configuration_warnings() const override;
PackedStringArray get_configuration_warnings() const override;

NavigationRegion2D();
~NavigationRegion2D();
Expand Down
4 changes: 2 additions & 2 deletions scene/2d/parallax_layer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ void ParallaxLayer::set_base_offset_and_scale(const Point2 &p_offset, real_t p_s
_update_mirroring();
}

TypedArray<String> ParallaxLayer::get_configuration_warnings() const {
TypedArray<String> warnings = Node::get_configuration_warnings();
PackedStringArray ParallaxLayer::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();

if (!Object::cast_to<ParallaxBackground>(get_parent())) {
warnings.push_back(RTR("ParallaxLayer node only works when set as child of a ParallaxBackground node."));
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/parallax_layer.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class ParallaxLayer : public Node2D {

void set_base_offset_and_scale(const Point2 &p_offset, real_t p_scale);

TypedArray<String> get_configuration_warnings() const override;
PackedStringArray get_configuration_warnings() const override;
ParallaxLayer();
};

Expand Down
4 changes: 2 additions & 2 deletions scene/2d/path_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,8 @@ void PathFollow2D::_validate_property(PropertyInfo &p_property) const {
}
}

TypedArray<String> PathFollow2D::get_configuration_warnings() const {
TypedArray<String> warnings = Node::get_configuration_warnings();
PackedStringArray PathFollow2D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();

if (is_visible_in_tree() && is_inside_tree()) {
if (!Object::cast_to<Path2D>(get_parent())) {
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/path_2d.h
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ class PathFollow2D : public Node2D {
void set_cubic_interpolation(bool p_enable);
bool get_cubic_interpolation() const;

TypedArray<String> get_configuration_warnings() const override;
PackedStringArray get_configuration_warnings() const override;

PathFollow2D() {}
};
Expand Down
4 changes: 2 additions & 2 deletions scene/2d/physical_bone_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ void PhysicalBone2D::_find_joint_child() {
}
}

TypedArray<String> PhysicalBone2D::get_configuration_warnings() const {
TypedArray<String> warnings = Node::get_configuration_warnings();
PackedStringArray PhysicalBone2D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();

if (!parent_skeleton) {
warnings.push_back(RTR("A PhysicalBone2D only works with a Skeleton2D or another PhysicalBone2D as a parent node!"));
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/physical_bone_2d.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class PhysicalBone2D : public RigidBody2D {
void set_follow_bone_when_simulating(bool p_follow);
bool get_follow_bone_when_simulating() const;

TypedArray<String> get_configuration_warnings() const override;
PackedStringArray get_configuration_warnings() const override;

PhysicalBone2D();
~PhysicalBone2D();
Expand Down
4 changes: 2 additions & 2 deletions scene/2d/physics_body_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -921,10 +921,10 @@ void RigidBody2D::_notification(int p_what) {
#endif
}

TypedArray<String> RigidBody2D::get_configuration_warnings() const {
PackedStringArray RigidBody2D::get_configuration_warnings() const {
Transform2D t = get_transform();

TypedArray<String> warnings = CollisionObject2D::get_configuration_warnings();
PackedStringArray warnings = CollisionObject2D::get_configuration_warnings();

if (ABS(t.columns[0].length() - 1.0) > 0.05 || ABS(t.columns[1].length() - 1.0) > 0.05) {
warnings.push_back(RTR("Size changes to RigidBody2D will be overridden by the physics engine when running.\nChange the size in children collision shapes instead."));
Expand Down
Loading

0 comments on commit aed3822

Please sign in to comment.