Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add const lvalue ref to modules/* container parameters #88915

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/enet/enet_connection.cpp
Original file line number Diff line number Diff line change
@@ -334,7 +334,7 @@ Array ENetConnection::_service(int p_timeout) {
return out;
}

void ENetConnection::_broadcast(int p_channel, PackedByteArray p_packet, int p_flags) {
void ENetConnection::_broadcast(int p_channel, const PackedByteArray &p_packet, int p_flags) {
ERR_FAIL_NULL_MSG(host, "The ENetConnection instance isn't currently active.");
ERR_FAIL_COND_MSG(p_channel < 0 || p_channel > (int)host->channelLimit, "Invalid channel");
ERR_FAIL_COND_MSG(p_flags & ~ENetPacketPeer::FLAG_ALLOWED, "Invalid flags");
2 changes: 1 addition & 1 deletion modules/enet/enet_connection.h
Original file line number Diff line number Diff line change
@@ -85,7 +85,7 @@ class ENetConnection : public RefCounted {
EventType _parse_event(const ENetEvent &p_event, Event &r_event);
Error _create(ENetAddress *p_address, int p_max_peers, int p_max_channels, int p_in_bandwidth, int p_out_bandwidth);
Array _service(int p_timeout = 0);
void _broadcast(int p_channel, PackedByteArray p_packet, int p_flags);
void _broadcast(int p_channel, const PackedByteArray &p_packet, int p_flags);
TypedArray<ENetPacketPeer> _get_peers();

class Compressor {
2 changes: 1 addition & 1 deletion modules/enet/enet_packet_peer.cpp
Original file line number Diff line number Diff line change
@@ -187,7 +187,7 @@ void ENetPacketPeer::_queue_packet(ENetPacket *p_packet) {
packet_queue.push_back(p_packet);
}

Error ENetPacketPeer::_send(int p_channel, PackedByteArray p_packet, int p_flags) {
Error ENetPacketPeer::_send(int p_channel, const PackedByteArray &p_packet, int p_flags) {
ERR_FAIL_NULL_V_MSG(peer, ERR_UNCONFIGURED, "Peer not connected.");
ERR_FAIL_COND_V_MSG(p_channel < 0 || p_channel > (int)peer->channelCount, ERR_INVALID_PARAMETER, "Invalid channel");
ERR_FAIL_COND_V_MSG(p_flags & ~FLAG_ALLOWED, ERR_INVALID_PARAMETER, "Invalid flags");
2 changes: 1 addition & 1 deletion modules/enet/enet_packet_peer.h
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ class ENetPacketPeer : public PacketPeer {
ENetPacket *last_packet = nullptr;

static void _bind_methods();
Error _send(int p_channel, PackedByteArray p_packet, int p_flags);
Error _send(int p_channel, const PackedByteArray &p_packet, int p_flags);

protected:
friend class ENetConnection;
4 changes: 2 additions & 2 deletions modules/fbx/fbx_document.cpp
Original file line number Diff line number Diff line change
@@ -2140,7 +2140,7 @@ Node *FBXDocument::generate_scene(Ref<GLTFState> p_state, float p_bake_fps, bool
return root;
}

Error FBXDocument::append_from_buffer(PackedByteArray p_bytes, String p_base_path, Ref<GLTFState> p_state, uint32_t p_flags) {
Error FBXDocument::append_from_buffer(const PackedByteArray &p_bytes, const String &p_base_path, Ref<GLTFState> p_state, uint32_t p_flags) {
Ref<FBXState> state = p_state;
ERR_FAIL_COND_V(state.is_null(), ERR_INVALID_PARAMETER);
ERR_FAIL_NULL_V(p_bytes.ptr(), ERR_INVALID_DATA);
@@ -2232,7 +2232,7 @@ Error FBXDocument::_parse_fbx_state(Ref<FBXState> p_state, const String &p_searc
return OK;
}

Error FBXDocument::append_from_file(String p_path, Ref<GLTFState> p_state, uint32_t p_flags, String p_base_path) {
Error FBXDocument::append_from_file(const String &p_path, Ref<GLTFState> p_state, uint32_t p_flags, const String &p_base_path) {
Ref<FBXState> state = p_state;
ERR_FAIL_COND_V(state.is_null(), ERR_INVALID_PARAMETER);
ERR_FAIL_COND_V(p_path.is_empty(), ERR_FILE_NOT_FOUND);
4 changes: 2 additions & 2 deletions modules/fbx/fbx_document.h
Original file line number Diff line number Diff line change
@@ -53,8 +53,8 @@ class FBXDocument : public GLTFDocument {
static String _gen_unique_name(HashSet<String> &unique_names, const String &p_name);

public:
Error append_from_file(String p_path, Ref<GLTFState> p_state, uint32_t p_flags = 0, String p_base_path = String()) override;
Error append_from_buffer(PackedByteArray p_bytes, String p_base_path, Ref<GLTFState> p_state, uint32_t p_flags = 0) override;
Error append_from_file(const String &p_path, Ref<GLTFState> p_state, uint32_t p_flags = 0, const String &p_base_path = String()) override;
Error append_from_buffer(const PackedByteArray &p_bytes, const String &p_base_path, Ref<GLTFState> p_state, uint32_t p_flags = 0) override;
Error append_from_scene(Node *p_node, Ref<GLTFState> p_state, uint32_t p_flags = 0) override;

Node *generate_scene(Ref<GLTFState> p_state, float p_bake_fps = 30.0f, bool p_trimming = false, bool p_remove_immutable_tracks = true) override;
4 changes: 2 additions & 2 deletions modules/gdscript/gdscript_analyzer.cpp
Original file line number Diff line number Diff line change
@@ -2973,7 +2973,7 @@ void GDScriptAnalyzer::reduce_binary_op(GDScriptParser::BinaryOpNode *p_binary_o
}

#ifdef SUGGEST_GODOT4_RENAMES
const char *get_rename_from_map(const char *map[][2], String key) {
const char *get_rename_from_map(const char *map[][2], const String &key) {
for (int index = 0; map[index][0]; index++) {
if (map[index][0] == key) {
return map[index][1];
@@ -2984,7 +2984,7 @@ const char *get_rename_from_map(const char *map[][2], String key) {

// Checks if an identifier/function name has been renamed in Godot 4, uses ProjectConverter3To4 for rename map.
// Returns the new name if found, nullptr otherwise.
const char *check_for_renamed_identifier(String identifier, GDScriptParser::Node::Type type) {
const char *check_for_renamed_identifier(const String &identifier, GDScriptParser::Node::Type type) {
switch (type) {
case GDScriptParser::Node::IDENTIFIER: {
// Check properties
2 changes: 1 addition & 1 deletion modules/gdscript/gdscript_byte_codegen.cpp
Original file line number Diff line number Diff line change
@@ -159,7 +159,7 @@ void GDScriptByteCodeGenerator::end_parameters() {
function->default_arguments.reverse();
}

void GDScriptByteCodeGenerator::write_start(GDScript *p_script, const StringName &p_function_name, bool p_static, Variant p_rpc_config, const GDScriptDataType &p_return_type) {
void GDScriptByteCodeGenerator::write_start(GDScript *p_script, const StringName &p_function_name, bool p_static, const Variant &p_rpc_config, const GDScriptDataType &p_return_type) {
function = memnew(GDScriptFunction);
debug_stack = EngineDebugger::is_active();

2 changes: 1 addition & 1 deletion modules/gdscript/gdscript_byte_codegen.h
Original file line number Diff line number Diff line change
@@ -469,7 +469,7 @@ class GDScriptByteCodeGenerator : public GDScriptCodeGenerator {
virtual void start_block() override;
virtual void end_block() override;

virtual void write_start(GDScript *p_script, const StringName &p_function_name, bool p_static, Variant p_rpc_config, const GDScriptDataType &p_return_type) override;
virtual void write_start(GDScript *p_script, const StringName &p_function_name, bool p_static, const Variant &p_rpc_config, const GDScriptDataType &p_return_type) override;
virtual GDScriptFunction *write_end() override;

#ifdef DEBUG_ENABLED
2 changes: 1 addition & 1 deletion modules/gdscript/gdscript_codegen.h
Original file line number Diff line number Diff line change
@@ -83,7 +83,7 @@ class GDScriptCodeGenerator {
virtual void start_block() = 0;
virtual void end_block() = 0;

virtual void write_start(GDScript *p_script, const StringName &p_function_name, bool p_static, Variant p_rpc_config, const GDScriptDataType &p_return_type) = 0;
virtual void write_start(GDScript *p_script, const StringName &p_function_name, bool p_static, const Variant &p_rpc_config, const GDScriptDataType &p_return_type) = 0;
virtual GDScriptFunction *write_end() = 0;

#ifdef DEBUG_ENABLED
2 changes: 1 addition & 1 deletion modules/gdscript/gdscript_editor.cpp
Original file line number Diff line number Diff line change
@@ -860,7 +860,7 @@ static void _get_directory_contents(EditorFileSystemDirectory *p_dir, HashMap<St
}
}

static void _find_annotation_arguments(const GDScriptParser::AnnotationNode *p_annotation, int p_argument, const String p_quote_style, HashMap<String, ScriptLanguage::CodeCompletionOption> &r_result) {
static void _find_annotation_arguments(const GDScriptParser::AnnotationNode *p_annotation, int p_argument, const String &p_quote_style, HashMap<String, ScriptLanguage::CodeCompletionOption> &r_result) {
if (p_annotation->name == SNAME("@export_range")) {
if (p_argument == 3 || p_argument == 4 || p_argument == 5) {
// Slider hint.
6 changes: 3 additions & 3 deletions modules/gdscript/language_server/gdscript_workspace.cpp
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ void GDScriptWorkspace::_bind_methods() {
ClassDB::bind_method(D_METHOD("generate_script_api", "path"), &GDScriptWorkspace::generate_script_api);
}

void GDScriptWorkspace::apply_new_signal(Object *obj, String function, PackedStringArray args) {
void GDScriptWorkspace::apply_new_signal(Object *obj, const String &function, const PackedStringArray &args) {
Ref<Script> scr = obj->get_script();

if (scr->get_language()->get_name() != "GDScript") {
@@ -587,7 +587,7 @@ void GDScriptWorkspace::publish_diagnostics(const String &p_path) {
GDScriptLanguageProtocol::get_singleton()->notify_client("textDocument/publishDiagnostics", params);
}

void GDScriptWorkspace::_get_owners(EditorFileSystemDirectory *efsd, String p_path, List<String> &owners) {
void GDScriptWorkspace::_get_owners(EditorFileSystemDirectory *efsd, const String &p_path, List<String> &owners) {
if (!efsd) {
return;
}
@@ -613,7 +613,7 @@ void GDScriptWorkspace::_get_owners(EditorFileSystemDirectory *efsd, String p_pa
}
}

Node *GDScriptWorkspace::_get_owner_scene_node(String p_path) {
Node *GDScriptWorkspace::_get_owner_scene_node(const String &p_path) {
Node *owner_scene_node = nullptr;
List<String> owners;

6 changes: 3 additions & 3 deletions modules/gdscript/language_server/gdscript_workspace.h
Original file line number Diff line number Diff line change
@@ -42,8 +42,8 @@ class GDScriptWorkspace : public RefCounted {
GDCLASS(GDScriptWorkspace, RefCounted);

private:
void _get_owners(EditorFileSystemDirectory *efsd, String p_path, List<String> &owners);
Node *_get_owner_scene_node(String p_path);
void _get_owners(EditorFileSystemDirectory *efsd, const String &p_path, List<String> &owners);
Node *_get_owner_scene_node(const String &p_path);

protected:
static void _bind_methods();
@@ -63,7 +63,7 @@ class GDScriptWorkspace : public RefCounted {

void list_script_files(const String &p_root_dir, List<String> &r_files);

void apply_new_signal(Object *obj, String function, PackedStringArray args);
void apply_new_signal(Object *obj, const String &function, const PackedStringArray &args);

public:
String root;
2 changes: 1 addition & 1 deletion modules/gdscript/tests/gdscript_test_runner.cpp
Original file line number Diff line number Diff line change
@@ -175,7 +175,7 @@ static String strip_warnings(const String &p_expected) {
// On release builds we don't have warnings. Here we remove them from the output before comparison
// so it doesn't fail just because of difference in warnings.
String expected_no_warnings;
for (String line : p_expected.split("\n")) {
for (const String &line : p_expected.split("\n")) {
if (line.begins_with(">> ")) {
continue;
}
2 changes: 1 addition & 1 deletion modules/gltf/extensions/gltf_document_extension.cpp
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ void GLTFDocumentExtension::_bind_methods() {
}

// Import process.
Error GLTFDocumentExtension::import_preflight(Ref<GLTFState> p_state, Vector<String> p_extensions) {
Error GLTFDocumentExtension::import_preflight(Ref<GLTFState> p_state, const Vector<String> &p_extensions) {
ERR_FAIL_NULL_V(p_state, ERR_INVALID_PARAMETER);
Error err = OK;
GDVIRTUAL_CALL(_import_preflight, p_state, p_extensions, err);
2 changes: 1 addition & 1 deletion modules/gltf/extensions/gltf_document_extension.h
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ class GLTFDocumentExtension : public Resource {

public:
// Import process.
virtual Error import_preflight(Ref<GLTFState> p_state, Vector<String> p_extensions);
virtual Error import_preflight(Ref<GLTFState> p_state, const Vector<String> &p_extensions);
virtual Vector<String> get_supported_extensions();
virtual Error parse_node_extensions(Ref<GLTFState> p_state, Ref<GLTFNode> p_gltf_node, Dictionary &p_extensions);
virtual Error parse_image_data(Ref<GLTFState> p_state, const PackedByteArray &p_image_data, const String &p_mime_type, Ref<Image> r_image);
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@
#include "gltf_document_extension_texture_ktx.h"

// Import process.
Error GLTFDocumentExtensionTextureKTX::import_preflight(Ref<GLTFState> p_state, Vector<String> p_extensions) {
Error GLTFDocumentExtensionTextureKTX::import_preflight(Ref<GLTFState> p_state, const Vector<String> &p_extensions) {
if (!p_extensions.has("KHR_texture_basisu")) {
return ERR_SKIP;
}
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ class GLTFDocumentExtensionTextureKTX : public GLTFDocumentExtension {

public:
// Import process.
Error import_preflight(Ref<GLTFState> p_state, Vector<String> p_extensions) override;
Error import_preflight(Ref<GLTFState> p_state, const Vector<String> &p_extensions) override;
Vector<String> get_supported_extensions() override;
Error parse_image_data(Ref<GLTFState> p_state, const PackedByteArray &p_image_data, const String &p_mime_type, Ref<Image> r_image) override;
Error parse_texture_json(Ref<GLTFState> p_state, const Dictionary &p_texture_json, Ref<GLTFTexture> r_gltf_texture) override;
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@
#include "gltf_document_extension_texture_webp.h"

// Import process.
Error GLTFDocumentExtensionTextureWebP::import_preflight(Ref<GLTFState> p_state, Vector<String> p_extensions) {
Error GLTFDocumentExtensionTextureWebP::import_preflight(Ref<GLTFState> p_state, const Vector<String> &p_extensions) {
if (!p_extensions.has("EXT_texture_webp")) {
return ERR_SKIP;
}
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ class GLTFDocumentExtensionTextureWebP : public GLTFDocumentExtension {

public:
// Import process.
Error import_preflight(Ref<GLTFState> p_state, Vector<String> p_extensions) override;
Error import_preflight(Ref<GLTFState> p_state, const Vector<String> &p_extensions) override;
Vector<String> get_supported_extensions() override;
Error parse_image_data(Ref<GLTFState> p_state, const PackedByteArray &p_image_data, const String &p_mime_type, Ref<Image> r_image) override;
String get_image_file_extension() override;
4 changes: 2 additions & 2 deletions modules/gltf/extensions/gltf_light.cpp
Original file line number Diff line number Diff line change
@@ -82,7 +82,7 @@ String GLTFLight::get_light_type() {
return light_type;
}

void GLTFLight::set_light_type(String p_light_type) {
void GLTFLight::set_light_type(const String &p_light_type) {
light_type = p_light_type;
}

@@ -169,7 +169,7 @@ Light3D *GLTFLight::to_node() const {
return memnew(Light3D);
}

Ref<GLTFLight> GLTFLight::from_dictionary(const Dictionary p_dictionary) {
Ref<GLTFLight> GLTFLight::from_dictionary(const Dictionary &p_dictionary) {
ERR_FAIL_COND_V_MSG(!p_dictionary.has("type"), Ref<GLTFLight>(), "Failed to parse glTF light, missing required field 'type'.");
Ref<GLTFLight> light;
light.instantiate();
4 changes: 2 additions & 2 deletions modules/gltf/extensions/gltf_light.h
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ class GLTFLight : public Resource {
void set_intensity(float p_intensity);

String get_light_type();
void set_light_type(String p_light_type);
void set_light_type(const String &p_light_type);

float get_range();
void set_range(float p_range);
@@ -75,7 +75,7 @@ class GLTFLight : public Resource {
static Ref<GLTFLight> from_node(const Light3D *p_light);
Light3D *to_node() const;

static Ref<GLTFLight> from_dictionary(const Dictionary p_dictionary);
static Ref<GLTFLight> from_dictionary(const Dictionary &p_dictionary);
Dictionary to_dictionary() const;

Variant get_additional_data(const StringName &p_extension_name);
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@
#include "scene/3d/physics/static_body_3d.h"

// Import process.
Error GLTFDocumentExtensionPhysics::import_preflight(Ref<GLTFState> p_state, Vector<String> p_extensions) {
Error GLTFDocumentExtensionPhysics::import_preflight(Ref<GLTFState> p_state, const Vector<String> &p_extensions) {
if (!p_extensions.has("OMI_collider") && !p_extensions.has("OMI_physics_body") && !p_extensions.has("OMI_physics_shape")) {
return ERR_SKIP;
}
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ class GLTFDocumentExtensionPhysics : public GLTFDocumentExtension {

public:
// Import process.
Error import_preflight(Ref<GLTFState> p_state, Vector<String> p_extensions) override;
Error import_preflight(Ref<GLTFState> p_state, const Vector<String> &p_extensions) override;
Vector<String> get_supported_extensions() override;
Error parse_node_extensions(Ref<GLTFState> p_state, Ref<GLTFNode> p_gltf_node, Dictionary &p_extensions) override;
Node3D *generate_scene_node(Ref<GLTFState> p_state, Ref<GLTFNode> p_gltf_node, Node *p_scene_parent) override;
4 changes: 2 additions & 2 deletions modules/gltf/extensions/physics/gltf_physics_body.cpp
Original file line number Diff line number Diff line change
@@ -94,7 +94,7 @@ String GLTFPhysicsBody::get_body_type() const {
return "rigid";
}

void GLTFPhysicsBody::set_body_type(String p_body_type) {
void GLTFPhysicsBody::set_body_type(const String &p_body_type) {
if (p_body_type == "static") {
body_type = PhysicsBodyType::STATIC;
} else if (p_body_type == "animatable") {
@@ -253,7 +253,7 @@ CollisionObject3D *GLTFPhysicsBody::to_node() const {
return nullptr;
}

Ref<GLTFPhysicsBody> GLTFPhysicsBody::from_dictionary(const Dictionary p_dictionary) {
Ref<GLTFPhysicsBody> GLTFPhysicsBody::from_dictionary(const Dictionary &p_dictionary) {
Ref<GLTFPhysicsBody> physics_body;
physics_body.instantiate();
Dictionary motion;
4 changes: 2 additions & 2 deletions modules/gltf/extensions/physics/gltf_physics_body.h
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ class GLTFPhysicsBody : public Resource {

public:
String get_body_type() const;
void set_body_type(String p_body_type);
void set_body_type(const String &p_body_type);

PhysicsBodyType get_physics_body_type() const;
void set_physics_body_type(PhysicsBodyType p_body_type);
@@ -100,7 +100,7 @@ class GLTFPhysicsBody : public Resource {
static Ref<GLTFPhysicsBody> from_node(const CollisionObject3D *p_body_node);
CollisionObject3D *to_node() const;

static Ref<GLTFPhysicsBody> from_dictionary(const Dictionary p_dictionary);
static Ref<GLTFPhysicsBody> from_dictionary(const Dictionary &p_dictionary);
Dictionary to_dictionary() const;
};

4 changes: 2 additions & 2 deletions modules/gltf/extensions/physics/gltf_physics_shape.cpp
Original file line number Diff line number Diff line change
@@ -80,7 +80,7 @@ String GLTFPhysicsShape::get_shape_type() const {
return shape_type;
}

void GLTFPhysicsShape::set_shape_type(String p_shape_type) {
void GLTFPhysicsShape::set_shape_type(const String &p_shape_type) {
shape_type = p_shape_type;
}

@@ -267,7 +267,7 @@ Ref<Shape3D> GLTFPhysicsShape::to_resource(bool p_cache_shapes) {
return _shape_cache;
}

Ref<GLTFPhysicsShape> GLTFPhysicsShape::from_dictionary(const Dictionary p_dictionary) {
Ref<GLTFPhysicsShape> GLTFPhysicsShape::from_dictionary(const Dictionary &p_dictionary) {
ERR_FAIL_COND_V_MSG(!p_dictionary.has("type"), Ref<GLTFPhysicsShape>(), "Failed to parse GLTFPhysicsShape, missing required field 'type'.");
Ref<GLTFPhysicsShape> gltf_shape;
gltf_shape.instantiate();
4 changes: 2 additions & 2 deletions modules/gltf/extensions/physics/gltf_physics_shape.h
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@ class GLTFPhysicsShape : public Resource {

public:
String get_shape_type() const;
void set_shape_type(String p_shape_type);
void set_shape_type(const String &p_shape_type);

Vector3 get_size() const;
void set_size(Vector3 p_size);
@@ -86,7 +86,7 @@ class GLTFPhysicsShape : public Resource {
static Ref<GLTFPhysicsShape> from_resource(const Ref<Shape3D> &p_shape_resource);
Ref<Shape3D> to_resource(bool p_cache_shapes = false);

static Ref<GLTFPhysicsShape> from_dictionary(const Dictionary p_dictionary);
static Ref<GLTFPhysicsShape> from_dictionary(const Dictionary &p_dictionary);
Dictionary to_dictionary() const;
};

Loading