godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add const lvalue ref to core/* container parameters

This commit is contained in:
Muller-Castro 2024-01-08 22:36:19 -03:00
parent 907db8eebc
commit a8bc9f3e78
92 changed files with 346 additions and 346 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/config/project_settings.cpp
View File

@ -688,7 +688,7 @@ Error ProjectSettings::setup(const String &p_path, const String &p_main_pack, bo
return err; return err;
} }
bool ProjectSettings::has_setting(String p_var) const { bool ProjectSettings::has_setting(const String &p_var) const {
_THREAD_SAFE_METHOD_ _THREAD_SAFE_METHOD_
return props.has(p_var); return props.has(p_var);
@ -971,7 +971,7 @@ Error ProjectSettings::_save_custom_bnd(const String &p_file) { // add other par
} }
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
bool _csproj_exists(String p_root_dir) { bool _csproj_exists(const String &p_root_dir) {
Ref<DirAccess> dir = DirAccess::open(p_root_dir); Ref<DirAccess> dir = DirAccess::open(p_root_dir);
ERR_FAIL_COND_V(dir.is_null(), false); ERR_FAIL_COND_V(dir.is_null(), false);

2
core/config/project_settings.h
View File

@ -161,7 +161,7 @@ public:
void store_global_class_list(const Array &p_classes); void store_global_class_list(const Array &p_classes);
String get_global_class_list_path() const; String get_global_class_list_path() const;
bool has_setting(String p_var) const; bool has_setting(const String &p_var) const;
String localize_path(const String &p_path) const; String localize_path(const String &p_path) const;
String globalize_path(const String &p_path) const; String globalize_path(const String &p_path) const;

4
core/core_bind.cpp
View File

@ -257,7 +257,7 @@ String OS::get_executable_path() const {
return ::OS::get_singleton()->get_executable_path(); return ::OS::get_singleton()->get_executable_path();
} }
Error OS::shell_open(String p_uri) { Error OS::shell_open(const String &p_uri) {
if (p_uri.begins_with("res://")) { if (p_uri.begins_with("res://")) {
WARN_PRINT("Attempting to open an URL with the \"res://\" protocol. Use `ProjectSettings.globalize_path()` to convert a Godot-specific path to a system path before opening it with `OS.shell_open()`."); WARN_PRINT("Attempting to open an URL with the \"res://\" protocol. Use `ProjectSettings.globalize_path()` to convert a Godot-specific path to a system path before opening it with `OS.shell_open()`.");
} else if (p_uri.begins_with("user://")) { } else if (p_uri.begins_with("user://")) {
@ -266,7 +266,7 @@ Error OS::shell_open(String p_uri) {
return ::OS::get_singleton()->shell_open(p_uri); return ::OS::get_singleton()->shell_open(p_uri);
} }
Error OS::shell_show_in_file_manager(String p_path, bool p_open_folder) { Error OS::shell_show_in_file_manager(const String &p_path, bool p_open_folder) {
if (p_path.begins_with("res://")) { if (p_path.begins_with("res://")) {
WARN_PRINT("Attempting to explore file path with the \"res://\" protocol. Use `ProjectSettings.globalize_path()` to convert a Godot-specific path to a system path before opening it with `OS.shell_show_in_file_manager()`."); WARN_PRINT("Attempting to explore file path with the \"res://\" protocol. Use `ProjectSettings.globalize_path()` to convert a Godot-specific path to a system path before opening it with `OS.shell_show_in_file_manager()`.");
} else if (p_path.begins_with("user://")) { } else if (p_path.begins_with("user://")) {

4
core/core_bind.h
View File

@ -157,8 +157,8 @@ public:
int create_process(const String &p_path, const Vector<String> &p_arguments, bool p_open_console = false); int create_process(const String &p_path, const Vector<String> &p_arguments, bool p_open_console = false);
int create_instance(const Vector<String> &p_arguments); int create_instance(const Vector<String> &p_arguments);
Error kill(int p_pid); Error kill(int p_pid);
Error shell_open(String p_uri); Error shell_open(const String &p_uri);
Error shell_show_in_file_manager(String p_path, bool p_open_folder = true); Error shell_show_in_file_manager(const String &p_path, bool p_open_folder = true);
bool is_process_running(int p_pid) const; bool is_process_running(int p_pid) const;
int get_process_id() const; int get_process_id() const;

4
core/crypto/aes_context.cpp
View File

@ -30,7 +30,7 @@
#include "core/crypto/aes_context.h" #include "core/crypto/aes_context.h"
Error AESContext::start(Mode p_mode, PackedByteArray p_key, PackedByteArray p_iv) { Error AESContext::start(Mode p_mode, const PackedByteArray &p_key, const PackedByteArray &p_iv) {
ERR_FAIL_COND_V_MSG(mode != MODE_MAX, ERR_ALREADY_IN_USE, "AESContext already started. Call 'finish' before starting a new one."); ERR_FAIL_COND_V_MSG(mode != MODE_MAX, ERR_ALREADY_IN_USE, "AESContext already started. Call 'finish' before starting a new one.");
ERR_FAIL_COND_V_MSG(p_mode < 0 || p_mode >= MODE_MAX, ERR_INVALID_PARAMETER, "Invalid mode requested."); ERR_FAIL_COND_V_MSG(p_mode < 0 || p_mode >= MODE_MAX, ERR_INVALID_PARAMETER, "Invalid mode requested.");
// Key check. // Key check.
@ -52,7 +52,7 @@ Error AESContext::start(Mode p_mode, PackedByteArray p_key, PackedByteArray p_iv
return OK; return OK;
} }
PackedByteArray AESContext::update(PackedByteArray p_src) { PackedByteArray AESContext::update(const PackedByteArray &p_src) {
ERR_FAIL_COND_V_MSG(mode < 0 || mode >= MODE_MAX, PackedByteArray(), "AESContext not started. Call 'start' before calling 'update'."); ERR_FAIL_COND_V_MSG(mode < 0 || mode >= MODE_MAX, PackedByteArray(), "AESContext not started. Call 'start' before calling 'update'.");
int len = p_src.size(); int len = p_src.size();
ERR_FAIL_COND_V_MSG(len % 16, PackedByteArray(), "The number of bytes to be encrypted must be multiple of 16. Add padding if needed"); ERR_FAIL_COND_V_MSG(len % 16, PackedByteArray(), "The number of bytes to be encrypted must be multiple of 16. Add padding if needed");

4
core/crypto/aes_context.h
View File

@ -55,8 +55,8 @@ protected:
static void _bind_methods(); static void _bind_methods();
public: public:
Error start(Mode p_mode, PackedByteArray p_key, PackedByteArray p_iv = PackedByteArray()); Error start(Mode p_mode, const PackedByteArray &p_key, const PackedByteArray &p_iv = PackedByteArray());
PackedByteArray update(PackedByteArray p_src); PackedByteArray update(const PackedByteArray &p_src);
PackedByteArray get_iv_state(); PackedByteArray get_iv_state();
void finish(); void finish();

8
core/crypto/crypto.cpp
View File

@ -124,7 +124,7 @@ HMACContext *HMACContext::create() {
/// Crypto /// Crypto
void (*Crypto::_load_default_certificates)(String p_path) = nullptr; void (*Crypto::_load_default_certificates)(const String &p_path) = nullptr;
Crypto *(*Crypto::_create)() = nullptr; Crypto *(*Crypto::_create)() = nullptr;
Crypto *Crypto::create() { Crypto *Crypto::create() {
if (_create) { if (_create) {
@ -133,13 +133,13 @@ Crypto *Crypto::create() {
ERR_FAIL_V_MSG(nullptr, "Crypto is not available when the mbedtls module is disabled."); ERR_FAIL_V_MSG(nullptr, "Crypto is not available when the mbedtls module is disabled.");
} }
void Crypto::load_default_certificates(String p_path) { void Crypto::load_default_certificates(const String &p_path) {
if (_load_default_certificates) { if (_load_default_certificates) {
_load_default_certificates(p_path); _load_default_certificates(p_path);
} }
} }
PackedByteArray Crypto::hmac_digest(HashingContext::HashType p_hash_type, PackedByteArray p_key, PackedByteArray p_msg) { PackedByteArray Crypto::hmac_digest(HashingContext::HashType p_hash_type, const PackedByteArray &p_key, const PackedByteArray &p_msg) {
Ref<HMACContext> ctx = Ref<HMACContext>(HMACContext::create()); Ref<HMACContext> ctx = Ref<HMACContext>(HMACContext::create());
ERR_FAIL_COND_V_MSG(ctx.is_null(), PackedByteArray(), "HMAC is not available without mbedtls module."); ERR_FAIL_COND_V_MSG(ctx.is_null(), PackedByteArray(), "HMAC is not available without mbedtls module.");
Error err = ctx->start(p_hash_type, p_key); Error err = ctx->start(p_hash_type, p_key);
@ -151,7 +151,7 @@ PackedByteArray Crypto::hmac_digest(HashingContext::HashType p_hash_type, Packed
// Compares two HMACS for equality without leaking timing information in order to prevent timing attacks. // Compares two HMACS for equality without leaking timing information in order to prevent timing attacks.
// @see: https://paragonie.com/blog/2015/11/preventing-timing-attacks-on-string-comparison-with-double-hmac-strategy // @see: https://paragonie.com/blog/2015/11/preventing-timing-attacks-on-string-comparison-with-double-hmac-strategy
bool Crypto::constant_time_compare(PackedByteArray p_trusted, PackedByteArray p_received) { bool Crypto::constant_time_compare(const PackedByteArray &p_trusted, const PackedByteArray &p_received) {
const uint8_t *t = p_trusted.ptr(); const uint8_t *t = p_trusted.ptr();
const uint8_t *r = p_received.ptr(); const uint8_t *r = p_received.ptr();
int tlen = p_trusted.size(); int tlen = p_trusted.size();

32
core/crypto/crypto.h
View File

@ -46,10 +46,10 @@ protected:
public: public:
static CryptoKey *create(); static CryptoKey *create();
virtual Error load(String p_path, bool p_public_only = false) = 0; virtual Error load(const String &p_path, bool p_public_only = false) = 0;
virtual Error save(String p_path, bool p_public_only = false) = 0; virtual Error save(const String &p_path, bool p_public_only = false) = 0;
virtual String save_to_string(bool p_public_only = false) = 0; virtual String save_to_string(bool p_public_only = false) = 0;
virtual Error load_from_string(String p_string_key, bool p_public_only = false) = 0; virtual Error load_from_string(const String &p_string_key, bool p_public_only = false) = 0;
virtual bool is_public_only() const = 0; virtual bool is_public_only() const = 0;
}; };
@ -62,9 +62,9 @@ protected:
public: public:
static X509Certificate *create(); static X509Certificate *create();
virtual Error load(String p_path) = 0; virtual Error load(const String &p_path) = 0;
virtual Error load_from_memory(const uint8_t *p_buffer, int p_len) = 0; virtual Error load_from_memory(const uint8_t *p_buffer, int p_len) = 0;
virtual Error save(String p_path) = 0; virtual Error save(const String &p_path) = 0;
virtual String save_to_string() = 0; virtual String save_to_string() = 0;
virtual Error load_from_string(const String &string) = 0; virtual Error load_from_string(const String &string) = 0;
}; };
@ -113,8 +113,8 @@ protected:
public: public:
static HMACContext *create(); static HMACContext *create();
virtual Error start(HashingContext::HashType p_hash_type, PackedByteArray p_key) = 0; virtual Error start(HashingContext::HashType p_hash_type, const PackedByteArray &p_key) = 0;
virtual Error update(PackedByteArray p_data) = 0; virtual Error update(const PackedByteArray &p_data) = 0;
virtual PackedByteArray finish() = 0; virtual PackedByteArray finish() = 0;
HMACContext() {} HMACContext() {}
@ -127,26 +127,26 @@ class Crypto : public RefCounted {
protected: protected:
static void _bind_methods(); static void _bind_methods();
static Crypto *(*_create)(); static Crypto *(*_create)();
static void (*_load_default_certificates)(String p_path); static void (*_load_default_certificates)(const String &p_path);
public: public:
static Crypto *create(); static Crypto *create();
static void load_default_certificates(String p_path); static void load_default_certificates(const String &p_path);
virtual PackedByteArray generate_random_bytes(int p_bytes) = 0; virtual PackedByteArray generate_random_bytes(int p_bytes) = 0;
virtual Ref<CryptoKey> generate_rsa(int p_bytes) = 0; virtual Ref<CryptoKey> generate_rsa(int p_bytes) = 0;
virtual Ref<X509Certificate> generate_self_signed_certificate(Ref<CryptoKey> p_key, String p_issuer_name, String p_not_before, String p_not_after) = 0; virtual Ref<X509Certificate> generate_self_signed_certificate(Ref<CryptoKey> p_key, const String &p_issuer_name, const String &p_not_before, const String &p_not_after) = 0;
virtual Vector<uint8_t> sign(HashingContext::HashType p_hash_type, Vector<uint8_t> p_hash, Ref<CryptoKey> p_key) = 0; virtual Vector<uint8_t> sign(HashingContext::HashType p_hash_type, const Vector<uint8_t> &p_hash, Ref<CryptoKey> p_key) = 0;
virtual bool verify(HashingContext::HashType p_hash_type, Vector<uint8_t> p_hash, Vector<uint8_t> p_signature, Ref<CryptoKey> p_key) = 0; virtual bool verify(HashingContext::HashType p_hash_type, const Vector<uint8_t> &p_hash, const Vector<uint8_t> &p_signature, Ref<CryptoKey> p_key) = 0;
virtual Vector<uint8_t> encrypt(Ref<CryptoKey> p_key, Vector<uint8_t> p_plaintext) = 0; virtual Vector<uint8_t> encrypt(Ref<CryptoKey> p_key, const Vector<uint8_t> &p_plaintext) = 0;
virtual Vector<uint8_t> decrypt(Ref<CryptoKey> p_key, Vector<uint8_t> p_ciphertext) = 0; virtual Vector<uint8_t> decrypt(Ref<CryptoKey> p_key, const Vector<uint8_t> &p_ciphertext) = 0;
PackedByteArray hmac_digest(HashingContext::HashType p_hash_type, PackedByteArray p_key, PackedByteArray p_msg); PackedByteArray hmac_digest(HashingContext::HashType p_hash_type, const PackedByteArray &p_key, const PackedByteArray &p_msg);
// Compares two PackedByteArrays for equality without leaking timing information in order to prevent timing attacks. // Compares two PackedByteArrays for equality without leaking timing information in order to prevent timing attacks.
// @see: https://paragonie.com/blog/2015/11/preventing-timing-attacks-on-string-comparison-with-double-hmac-strategy // @see: https://paragonie.com/blog/2015/11/preventing-timing-attacks-on-string-comparison-with-double-hmac-strategy
bool constant_time_compare(PackedByteArray p_trusted, PackedByteArray p_received); bool constant_time_compare(const PackedByteArray &p_trusted, const PackedByteArray &p_received);
Crypto() {} Crypto() {}
}; };

2
core/crypto/hashing_context.cpp
View File

@ -47,7 +47,7 @@ Error HashingContext::start(HashType p_type) {
return ERR_UNAVAILABLE; return ERR_UNAVAILABLE;
} }
Error HashingContext::update(PackedByteArray p_chunk) { Error HashingContext::update(const PackedByteArray &p_chunk) {
ERR_FAIL_NULL_V(ctx, ERR_UNCONFIGURED); ERR_FAIL_NULL_V(ctx, ERR_UNCONFIGURED);
size_t len = p_chunk.size(); size_t len = p_chunk.size();
ERR_FAIL_COND_V(len == 0, FAILED); ERR_FAIL_COND_V(len == 0, FAILED);

2
core/crypto/hashing_context.h
View File

@ -54,7 +54,7 @@ protected:
public: public:
Error start(HashType p_type); Error start(HashType p_type);
Error update(PackedByteArray p_chunk); Error update(const PackedByteArray &p_chunk);
PackedByteArray finish(); PackedByteArray finish();
HashingContext() {} HashingContext() {}

2
core/debugger/engine_debugger.cpp
View File

@ -127,7 +127,7 @@ void EngineDebugger::iteration(uint64_t p_frame_ticks, uint64_t p_process_ticks,
singleton->poll_events(true); singleton->poll_events(true);
} }
void EngineDebugger::initialize(const String &p_uri, bool p_skip_breakpoints, Vector<String> p_breakpoints, void (*p_allow_focus_steal_fn)()) { void EngineDebugger::initialize(const String &p_uri, bool p_skip_breakpoints, const Vector<String> &p_breakpoints, void (*p_allow_focus_steal_fn)()) {
register_uri_handler("tcp://", RemoteDebuggerPeerTCP::create); // TCP is the default protocol. Platforms/modules can add more. register_uri_handler("tcp://", RemoteDebuggerPeerTCP::create); // TCP is the default protocol. Platforms/modules can add more.
if (p_uri.is_empty()) { if (p_uri.is_empty()) {
return; return;

2
core/debugger/engine_debugger.h
View File

@ -108,7 +108,7 @@ public:
_FORCE_INLINE_ static ScriptDebugger *get_script_debugger() { return script_debugger; }; _FORCE_INLINE_ static ScriptDebugger *get_script_debugger() { return script_debugger; };
static void initialize(const String &p_uri, bool p_skip_breakpoints, Vector<String> p_breakpoints, void (*p_allow_focus_steal_fn)()); static void initialize(const String &p_uri, bool p_skip_breakpoints, const Vector<String> &p_breakpoints, void (*p_allow_focus_steal_fn)());
static void deinitialize(); static void deinitialize();
static void register_profiler(const StringName &p_name, const Profiler &p_profiler); static void register_profiler(const StringName &p_name, const Profiler &p_profiler);
static void unregister_profiler(const StringName &p_name); static void unregister_profiler(const StringName &p_name);

2
core/debugger/remote_debugger.cpp
View File

@ -92,7 +92,7 @@ public:
} }
}; };
Error RemoteDebugger::_put_msg(String p_message, Array p_data) { Error RemoteDebugger::_put_msg(const String &p_message, const Array &p_data) {
Array msg; Array msg;
msg.push_back(p_message); msg.push_back(p_message);
msg.push_back(Thread::get_caller_id()); msg.push_back(Thread::get_caller_id());

2
core/debugger/remote_debugger.h
View File

@ -98,7 +98,7 @@ private:
static void _err_handler(void *p_this, const char *p_func, const char *p_file, int p_line, const char *p_err, const char *p_descr, bool p_editor_notify, ErrorHandlerType p_type); static void _err_handler(void *p_this, const char *p_func, const char *p_file, int p_line, const char *p_err, const char *p_descr, bool p_editor_notify, ErrorHandlerType p_type);
ErrorMessage _create_overflow_error(const String &p_what, const String &p_descr); ErrorMessage _create_overflow_error(const String &p_what, const String &p_descr);
Error _put_msg(String p_message, Array p_data); Error _put_msg(const String &p_message, const Array &p_data);
bool is_peer_connected() { return peer->is_peer_connected(); } bool is_peer_connected() { return peer->is_peer_connected(); }
void flush_output(); void flush_output();

2
core/extension/gdextension.cpp
View File

@ -914,7 +914,7 @@ Error GDExtensionResourceLoader::load_gdextension_resource(const String &p_path,
return ERR_INVALID_DATA; return ERR_INVALID_DATA;
} }
String library_path = GDExtension::find_extension_library(p_path, config, [](String p_feature) { return OS::get_singleton()->has_feature(p_feature); }); String library_path = GDExtension::find_extension_library(p_path, config, [](const String &p_feature) { return OS::get_singleton()->has_feature(p_feature); });
if (library_path.is_empty()) { if (library_path.is_empty()) {
const String os_arch = OS::get_singleton()->get_name().to_lower() + "." + Engine::get_singleton()->get_architecture_name(); const String os_arch = OS::get_singleton()->get_name().to_lower() + "." + Engine::get_singleton()->get_architecture_name();

14
core/input/input.cpp
View File

@ -455,7 +455,7 @@ static String _hex_str(uint8_t p_byte) {
return ret; return ret;
} }
void Input::joy_connection_changed(int p_idx, bool p_connected, String p_name, String p_guid, Dictionary p_joypad_info) { void Input::joy_connection_changed(int p_idx, bool p_connected, const String &p_name, const String &p_guid, const Dictionary &p_joypad_info) {
_THREAD_SAFE_METHOD_ _THREAD_SAFE_METHOD_
// Clear the pressed status if a Joypad gets disconnected. // Clear the pressed status if a Joypad gets disconnected.
@ -1414,7 +1414,7 @@ void Input::_get_mapped_hat_events(const JoyDeviceMapping &mapping, HatDir p_hat
} }
} }
JoyButton Input::_get_output_button(String output) { JoyButton Input::_get_output_button(const String &output) {
for (int i = 0; i < (int)JoyButton::SDL_MAX; i++) { for (int i = 0; i < (int)JoyButton::SDL_MAX; i++) {
if (output == _joy_buttons[i]) { if (output == _joy_buttons[i]) {
return JoyButton(i); return JoyButton(i);
@ -1423,7 +1423,7 @@ JoyButton Input::_get_output_button(String output) {
return JoyButton::INVALID; return JoyButton::INVALID;
} }
JoyAxis Input::_get_output_axis(String output) { JoyAxis Input::_get_output_axis(const String &output) {
for (int i = 0; i < (int)JoyAxis::SDL_MAX; i++) { for (int i = 0; i < (int)JoyAxis::SDL_MAX; i++) {
if (output == _joy_axes[i]) { if (output == _joy_axes[i]) {
return JoyAxis(i); return JoyAxis(i);
@ -1432,7 +1432,7 @@ JoyAxis Input::_get_output_axis(String output) {
return JoyAxis::INVALID; return JoyAxis::INVALID;
} }
void Input::parse_mapping(String p_mapping) { void Input::parse_mapping(const String &p_mapping) {
_THREAD_SAFE_METHOD_; _THREAD_SAFE_METHOD_;
JoyDeviceMapping mapping; JoyDeviceMapping mapping;
@ -1535,7 +1535,7 @@ void Input::parse_mapping(String p_mapping) {
map_db.push_back(mapping); map_db.push_back(mapping);
} }
void Input::add_joy_mapping(String p_mapping, bool p_update_existing) { void Input::add_joy_mapping(const String &p_mapping, bool p_update_existing) {
parse_mapping(p_mapping); parse_mapping(p_mapping);
if (p_update_existing) { if (p_update_existing) {
Vector<String> entry = p_mapping.split(","); Vector<String> entry = p_mapping.split(",");
@ -1549,7 +1549,7 @@ void Input::add_joy_mapping(String p_mapping, bool p_update_existing) {
} }
} }
void Input::remove_joy_mapping(String p_guid) { void Input::remove_joy_mapping(const String &p_guid) {
for (int i = map_db.size() - 1; i >= 0; i--) { for (int i = map_db.size() - 1; i >= 0; i--) {
if (p_guid == map_db[i].uid) { if (p_guid == map_db[i].uid) {
map_db.remove_at(i); map_db.remove_at(i);
@ -1563,7 +1563,7 @@ void Input::remove_joy_mapping(String p_guid) {
} }
} }
void Input::set_fallback_mapping(String p_guid) { void Input::set_fallback_mapping(const String &p_guid) {
for (int i = 0; i < map_db.size(); i++) { for (int i = 0; i < map_db.size(); i++) {
if (map_db[i].uid == p_guid) { if (map_db[i].uid == p_guid) {
fallback_mapping = i; fallback_mapping = i;

14
core/input/input.h
View File

@ -239,8 +239,8 @@ private:
JoyEvent _get_mapped_button_event(const JoyDeviceMapping &mapping, JoyButton p_button); JoyEvent _get_mapped_button_event(const JoyDeviceMapping &mapping, JoyButton p_button);
JoyEvent _get_mapped_axis_event(const JoyDeviceMapping &mapping, JoyAxis p_axis, float p_value, JoyAxisRange &r_range); JoyEvent _get_mapped_axis_event(const JoyDeviceMapping &mapping, JoyAxis p_axis, float p_value, JoyAxisRange &r_range);
void _get_mapped_hat_events(const JoyDeviceMapping &mapping, HatDir p_hat, JoyEvent r_events[(size_t)HatDir::MAX]); void _get_mapped_hat_events(const JoyDeviceMapping &mapping, HatDir p_hat, JoyEvent r_events[(size_t)HatDir::MAX]);
JoyButton _get_output_button(String output); JoyButton _get_output_button(const String &output);
JoyAxis _get_output_axis(String output); JoyAxis _get_output_axis(const String &output);
void _button_event(int p_device, JoyButton p_index, bool p_pressed); void _button_event(int p_device, JoyButton p_index, bool p_pressed);
void _axis_event(int p_device, JoyAxis p_axis, float p_value); void _axis_event(int p_device, JoyAxis p_axis, float p_value);
void _update_action_cache(const StringName &p_action_name, ActionState &r_action_state); void _update_action_cache(const StringName &p_action_name, ActionState &r_action_state);
@ -295,7 +295,7 @@ public:
Vector2 get_joy_vibration_strength(int p_device); Vector2 get_joy_vibration_strength(int p_device);
float get_joy_vibration_duration(int p_device); float get_joy_vibration_duration(int p_device);
uint64_t get_joy_vibration_timestamp(int p_device); uint64_t get_joy_vibration_timestamp(int p_device);
void joy_connection_changed(int p_idx, bool p_connected, String p_name, String p_guid = "", Dictionary p_joypad_info = Dictionary()); void joy_connection_changed(int p_idx, bool p_connected, const String &p_name, const String &p_guid = "", const Dictionary &p_joypad_info = Dictionary());
Vector3 get_gravity() const; Vector3 get_gravity() const;
Vector3 get_accelerometer() const; Vector3 get_accelerometer() const;
@ -339,13 +339,13 @@ public:
CursorShape get_current_cursor_shape() const; CursorShape get_current_cursor_shape() const;
void set_custom_mouse_cursor(const Ref<Resource> &p_cursor, CursorShape p_shape = Input::CURSOR_ARROW, const Vector2 &p_hotspot = Vector2()); void set_custom_mouse_cursor(const Ref<Resource> &p_cursor, CursorShape p_shape = Input::CURSOR_ARROW, const Vector2 &p_hotspot = Vector2());
void parse_mapping(String p_mapping); void parse_mapping(const String &p_mapping);
void joy_button(int p_device, JoyButton p_button, bool p_pressed); void joy_button(int p_device, JoyButton p_button, bool p_pressed);
void joy_axis(int p_device, JoyAxis p_axis, float p_value); void joy_axis(int p_device, JoyAxis p_axis, float p_value);
void joy_hat(int p_device, BitField<HatMask> p_val); void joy_hat(int p_device, BitField<HatMask> p_val);
void add_joy_mapping(String p_mapping, bool p_update_existing = false); void add_joy_mapping(const String &p_mapping, bool p_update_existing = false);
void remove_joy_mapping(String p_guid); void remove_joy_mapping(const String &p_guid);
int get_unused_joy_id(); int get_unused_joy_id();
@ -353,7 +353,7 @@ public:
String get_joy_guid(int p_device) const; String get_joy_guid(int p_device) const;
bool should_ignore_device(int p_vendor_id, int p_product_id) const; bool should_ignore_device(int p_vendor_id, int p_product_id) const;
Dictionary get_joy_info(int p_device) const; Dictionary get_joy_info(int p_device) const;
void set_fallback_mapping(String p_guid); void set_fallback_mapping(const String &p_guid);
void flush_buffered_events(); void flush_buffered_events();
bool is_using_input_buffering(); bool is_using_input_buffering();

2
core/io/config_file.cpp
View File

@ -81,7 +81,7 @@ void ConfigFile::set_value(const String &p_section, const String &p_key, const V
} }
} }
Variant ConfigFile::get_value(const String &p_section, const String &p_key, Variant p_default) const { Variant ConfigFile::get_value(const String &p_section, const String &p_key, const Variant &p_default) const {
if (!values.has(p_section) || !values[p_section].has(p_key)) { if (!values.has(p_section) || !values[p_section].has(p_key)) {
ERR_FAIL_COND_V_MSG(p_default.get_type() == Variant::NIL, Variant(), ERR_FAIL_COND_V_MSG(p_default.get_type() == Variant::NIL, Variant(),
vformat("Couldn't find the given section \"%s\" and key \"%s\", and no default was given.", p_section, p_key)); vformat("Couldn't find the given section \"%s\" and key \"%s\", and no default was given.", p_section, p_key));

2
core/io/config_file.h
View File

@ -53,7 +53,7 @@ protected:
public: public:
void set_value(const String &p_section, const String &p_key, const Variant &p_value); void set_value(const String &p_section, const String &p_key, const Variant &p_value);
Variant get_value(const String &p_section, const String &p_key, Variant p_default = Variant()) const; Variant get_value(const String &p_section, const String &p_key, const Variant &p_default = Variant()) const;
bool has_section(const String &p_section) const; bool has_section(const String &p_section) const;
bool has_section_key(const String &p_section, const String &p_key) const; bool has_section_key(const String &p_section, const String &p_key) const;

14
core/io/dir_access.cpp
View File

@ -131,7 +131,7 @@ Error DirAccess::erase_contents_recursive() {
return _erase_recursive(this); return _erase_recursive(this);
} }
Error DirAccess::make_dir_recursive(String p_dir) { Error DirAccess::make_dir_recursive(const String &p_dir) {
if (p_dir.length() < 1) { if (p_dir.length() < 1) {
return OK; return OK;
} }
@ -188,7 +188,7 @@ DirAccess::AccessType DirAccess::get_access_type() const {
return _access_type; return _access_type;
} }
String DirAccess::fix_path(String p_path) const { String DirAccess::fix_path(const String &p_path) const {
switch (_access_type) { switch (_access_type) {
case ACCESS_RESOURCES: { case ACCESS_RESOURCES: {
if (ProjectSettings::get_singleton()) { if (ProjectSettings::get_singleton()) {
@ -338,7 +338,7 @@ String DirAccess::get_full_path(const String &p_path, AccessType p_access) {
return full; return full;
} }
Error DirAccess::copy(String p_from, String p_to, int p_chmod_flags) { Error DirAccess::copy(const String &p_from, const String &p_to, int p_chmod_flags) {
//printf("copy %s -> %s\n",p_from.ascii().get_data(),p_to.ascii().get_data()); //printf("copy %s -> %s\n",p_from.ascii().get_data(),p_to.ascii().get_data());
Error err; Error err;
{ {
@ -396,7 +396,7 @@ class DirChanger {
String original_dir; String original_dir;
public: public:
DirChanger(DirAccess *p_da, String p_dir) : DirChanger(DirAccess *p_da, const String &p_dir) :
da(p_da), da(p_da),
original_dir(p_da->get_current_dir()) { original_dir(p_da->get_current_dir()) {
p_da->change_dir(p_dir); p_da->change_dir(p_dir);
@ -407,7 +407,7 @@ public:
} }
}; };
Error DirAccess::_copy_dir(Ref<DirAccess> &p_target_da, String p_to, int p_chmod_flags, bool p_copy_links) { Error DirAccess::_copy_dir(Ref<DirAccess> &p_target_da, const String &p_to, int p_chmod_flags, bool p_copy_links) {
List<String> dirs; List<String> dirs;
String curdir = get_current_dir(); String curdir = get_current_dir();
@ -460,7 +460,7 @@ Error DirAccess::_copy_dir(Ref<DirAccess> &p_target_da, String p_to, int p_chmod
return OK; return OK;
} }
Error DirAccess::copy_dir(String p_from, String p_to, int p_chmod_flags, bool p_copy_links) { Error DirAccess::copy_dir(const String &p_from, String p_to, int p_chmod_flags, bool p_copy_links) {
ERR_FAIL_COND_V_MSG(!dir_exists(p_from), ERR_FILE_NOT_FOUND, "Source directory doesn't exist."); ERR_FAIL_COND_V_MSG(!dir_exists(p_from), ERR_FILE_NOT_FOUND, "Source directory doesn't exist.");
Ref<DirAccess> target_da = DirAccess::create_for_path(p_to); Ref<DirAccess> target_da = DirAccess::create_for_path(p_to);
@ -481,7 +481,7 @@ Error DirAccess::copy_dir(String p_from, String p_to, int p_chmod_flags, bool p_
return err; return err;
} }
bool DirAccess::exists(String p_dir) { bool DirAccess::exists(const String &p_dir) {
Ref<DirAccess> da = DirAccess::create_for_path(p_dir); Ref<DirAccess> da = DirAccess::create_for_path(p_dir);
return da->change_dir(p_dir) == OK; return da->change_dir(p_dir) == OK;
} }

14
core/io/dir_access.h
View File

@ -54,7 +54,7 @@ private:
static CreateFunc create_func[ACCESS_MAX]; ///< set this to instance a filesystem object static CreateFunc create_func[ACCESS_MAX]; ///< set this to instance a filesystem object
static Ref<DirAccess> _open(const String &p_path); static Ref<DirAccess> _open(const String &p_path);
Error _copy_dir(Ref<DirAccess> &p_target_da, String p_to, int p_chmod_flags, bool p_copy_links); Error _copy_dir(Ref<DirAccess> &p_target_da, const String &p_to, int p_chmod_flags, bool p_copy_links);
PackedStringArray _get_contents(bool p_directories); PackedStringArray _get_contents(bool p_directories);
thread_local static Error last_dir_open_error; thread_local static Error last_dir_open_error;
@ -68,7 +68,7 @@ protected:
virtual String _get_root_string() const; virtual String _get_root_string() const;
AccessType get_access_type() const; AccessType get_access_type() const;
virtual String fix_path(String p_path) const; virtual String fix_path(const String &p_path) const;
template <class T> template <class T>
static Ref<DirAccess> _create_builtin() { static Ref<DirAccess> _create_builtin() {
@ -91,18 +91,18 @@ public:
virtual Error change_dir(String p_dir) = 0; ///< can be relative or absolute, return false on success virtual Error change_dir(String p_dir) = 0; ///< can be relative or absolute, return false on success
virtual String get_current_dir(bool p_include_drive = true) const = 0; ///< return current dir location virtual String get_current_dir(bool p_include_drive = true) const = 0; ///< return current dir location
virtual Error make_dir(String p_dir) = 0; virtual Error make_dir(String p_dir) = 0;
virtual Error make_dir_recursive(String p_dir); virtual Error make_dir_recursive(const String &p_dir);
virtual Error erase_contents_recursive(); //super dangerous, use with care! virtual Error erase_contents_recursive(); //super dangerous, use with care!
virtual bool file_exists(String p_file) = 0; virtual bool file_exists(String p_file) = 0;
virtual bool dir_exists(String p_dir) = 0; virtual bool dir_exists(String p_dir) = 0;
virtual bool is_readable(String p_dir) { return true; }; virtual bool is_readable(String p_dir) { return true; };
virtual bool is_writable(String p_dir) { return true; }; virtual bool is_writable(String p_dir) { return true; };
static bool exists(String p_dir); static bool exists(const String &p_dir);
virtual uint64_t get_space_left() = 0; virtual uint64_t get_space_left() = 0;
Error copy_dir(String p_from, String p_to, int p_chmod_flags = -1, bool p_copy_links = false); Error copy_dir(const String &p_from, String p_to, int p_chmod_flags = -1, bool p_copy_links = false);
virtual Error copy(String p_from, String p_to, int p_chmod_flags = -1); virtual Error copy(const String &p_from, const String &p_to, int p_chmod_flags = -1);
virtual Error rename(String p_from, String p_to) = 0; virtual Error rename(String p_from, String p_to) = 0;
virtual Error remove(String p_name) = 0; virtual Error remove(String p_name) = 0;
@ -112,7 +112,7 @@ public:
// Meant for editor code when we want to quickly remove a file without custom // Meant for editor code when we want to quickly remove a file without custom
// handling (e.g. removing a cache file). // handling (e.g. removing a cache file).
static void remove_file_or_error(String p_path) { static void remove_file_or_error(const String &p_path) {
Ref<DirAccess> da = create(ACCESS_FILESYSTEM); Ref<DirAccess> da = create(ACCESS_FILESYSTEM);
if (da->file_exists(p_path)) { if (da->file_exists(p_path)) {
if (da->remove(p_path) != OK) { if (da->remove(p_path) != OK) {

2
core/io/file_access_memory.cpp
View File

@ -36,7 +36,7 @@
static HashMap<String, Vector<uint8_t>> *files = nullptr; static HashMap<String, Vector<uint8_t>> *files = nullptr;
void FileAccessMemory::register_file(String p_name, Vector<uint8_t> p_data) { void FileAccessMemory::register_file(const String &p_name, const Vector<uint8_t> &p_data) {
if (!files) { if (!files) {
files = memnew((HashMap<String, Vector<uint8_t>>)); files = memnew((HashMap<String, Vector<uint8_t>>));
} }

2
core/io/file_access_memory.h
View File

@ -41,7 +41,7 @@ class FileAccessMemory : public FileAccess {
static Ref<FileAccess> create(); static Ref<FileAccess> create();
public: public:
static void register_file(String p_name, Vector<uint8_t> p_data); static void register_file(const String &p_name, const Vector<uint8_t> &p_data);
static void cleanup(); static void cleanup();
virtual Error open_custom(const uint8_t *p_data, uint64_t p_len); ///< open a file virtual Error open_custom(const uint8_t *p_data, uint64_t p_len); ///< open a file

2
core/io/file_access_pack.cpp
View File

@ -455,7 +455,7 @@ String DirAccessPack::get_drive(int p_drive) {
return ""; return "";
} }
PackedData::PackedDir *DirAccessPack::_find_dir(String p_dir) { PackedData::PackedDir *DirAccessPack::_find_dir(const String &p_dir) {
String nd = p_dir.replace("\\", "/"); String nd = p_dir.replace("\\", "/");
// Special handling since simplify_path() will forbid it // Special handling since simplify_path() will forbid it

2
core/io/file_access_pack.h
View File

@ -222,7 +222,7 @@ class DirAccessPack : public DirAccess {
List<String> list_files; List<String> list_files;
bool cdir = false; bool cdir = false;
PackedData::PackedDir *_find_dir(String p_dir); PackedData::PackedDir *_find_dir(const String &p_dir);
public: public:
virtual Error list_dir_begin() override; virtual Error list_dir_begin() override;

4
core/io/file_access_zip.cpp
View File

@ -115,7 +115,7 @@ void ZipArchive::close_handle(unzFile p_file) const {
unzClose(p_file); unzClose(p_file);
} }
unzFile ZipArchive::get_file_handle(String p_file) const { unzFile ZipArchive::get_file_handle(const String &p_file) const {
ERR_FAIL_COND_V_MSG(!file_exists(p_file), nullptr, "File '" + p_file + " doesn't exist."); ERR_FAIL_COND_V_MSG(!file_exists(p_file), nullptr, "File '" + p_file + " doesn't exist.");
File file = files[p_file]; File file = files[p_file];
@ -206,7 +206,7 @@ bool ZipArchive::try_open_pack(const String &p_path, bool p_replace_files, uint6
return true; return true;
} }
bool ZipArchive::file_exists(String p_name) const { bool ZipArchive::file_exists(const String &p_name) const {
return files.has(p_name); return files.has(p_name);
} }

6
core/io/file_access_zip.h
View File

@ -61,11 +61,11 @@ private:
public: public:
void close_handle(unzFile p_file) const; void close_handle(unzFile p_file) const;
unzFile get_file_handle(String p_file) const; unzFile get_file_handle(const String &p_file) const;
Error add_package(String p_name); Error add_package(const String &p_name);
bool file_exists(String p_name) const; bool file_exists(const String &p_name) const;
virtual bool try_open_pack(const String &p_path, bool p_replace_files, uint64_t p_offset) override; virtual bool try_open_pack(const String &p_path, bool p_replace_files, uint64_t p_offset) override;
Ref<FileAccess> get_file(const String &p_path, PackedData::PackedFile *p_file) override; Ref<FileAccess> get_file(const String &p_path, PackedData::PackedFile *p_file) override;

2
core/io/image_loader.cpp
View File

@ -80,7 +80,7 @@ void ImageFormatLoaderExtension::_bind_methods() {
ClassDB::bind_method(D_METHOD("remove_format_loader"), &ImageFormatLoaderExtension::remove_format_loader); ClassDB::bind_method(D_METHOD("remove_format_loader"), &ImageFormatLoaderExtension::remove_format_loader);
} }
Error ImageLoader::load_image(String p_file, Ref<Image> p_image, Ref<FileAccess> p_custom, BitField<ImageFormatLoader::LoaderFlags> p_flags, float p_scale) { Error ImageLoader::load_image(const String &p_file, Ref<Image> p_image, Ref<FileAccess> p_custom, BitField<ImageFormatLoader::LoaderFlags> p_flags, float p_scale) {
ERR_FAIL_COND_V_MSG(p_image.is_null(), ERR_INVALID_PARAMETER, "Can't load an image: invalid Image object."); ERR_FAIL_COND_V_MSG(p_image.is_null(), ERR_INVALID_PARAMETER, "Can't load an image: invalid Image object.");
Ref<FileAccess> f = p_custom; Ref<FileAccess> f = p_custom;

2
core/io/image_loader.h
View File

@ -91,7 +91,7 @@ class ImageLoader {
protected: protected:
public: public:
static Error load_image(String p_file, Ref<Image> p_image, Ref<FileAccess> p_custom = Ref<FileAccess>(), BitField<ImageFormatLoader::LoaderFlags> p_flags = ImageFormatLoader::FLAG_NONE, float p_scale = 1.0); static Error load_image(const String &p_file, Ref<Image> p_image, Ref<FileAccess> p_custom = Ref<FileAccess>(), BitField<ImageFormatLoader::LoaderFlags> p_flags = ImageFormatLoader::FLAG_NONE, float p_scale = 1.0);
static void get_recognized_extensions(List<String> *p_extensions); static void get_recognized_extensions(List<String> *p_extensions);
static Ref<ImageFormatLoader> recognize(const String &p_extension); static Ref<ImageFormatLoader> recognize(const String &p_extension);

2
core/io/ip.cpp
View File

@ -117,7 +117,7 @@ struct _IP_ResolverPrivate {
HashMap<String, List<IPAddress>> cache; HashMap<String, List<IPAddress>> cache;
static String get_cache_key(String p_hostname, IP::Type p_type) { static String get_cache_key(const String &p_hostname, IP::Type p_type) {
return itos(p_type) + p_hostname; return itos(p_type) + p_hostname;
} }
}; };

2
core/io/logger.cpp
View File

@ -230,7 +230,7 @@ void StdLogger::logv(const char *p_format, va_list p_list, bool p_err) {
} }
} }
CompositeLogger::CompositeLogger(Vector<Logger *> p_loggers) : CompositeLogger::CompositeLogger(const Vector<Logger *> &p_loggers) :
loggers(p_loggers) { loggers(p_loggers) {
} }

2
core/io/logger.h
View File

@ -96,7 +96,7 @@ class CompositeLogger : public Logger {
Vector<Logger *> loggers; Vector<Logger *> loggers;
public: public:
explicit CompositeLogger(Vector<Logger *> p_loggers); explicit CompositeLogger(const Vector<Logger *> &p_loggers);
virtual void logv(const char *p_format, va_list p_list, bool p_err) override _PRINTF_FORMAT_ATTRIBUTE_2_0; virtual void logv(const char *p_format, va_list p_list, bool p_err) override _PRINTF_FORMAT_ATTRIBUTE_2_0;
virtual void log_error(const char *p_function, const char *p_file, int p_line, const char *p_code, const char *p_rationale, bool p_editor_notify, ErrorType p_type = ERR_ERROR) override; virtual void log_error(const char *p_function, const char *p_file, int p_line, const char *p_code, const char *p_rationale, bool p_editor_notify, ErrorType p_type = ERR_ERROR) override;

4
core/io/net_socket.h
View File

@ -74,8 +74,8 @@ public:
virtual void set_ipv6_only_enabled(bool p_enabled) = 0; virtual void set_ipv6_only_enabled(bool p_enabled) = 0;
virtual void set_tcp_no_delay_enabled(bool p_enabled) = 0; virtual void set_tcp_no_delay_enabled(bool p_enabled) = 0;
virtual void set_reuse_address_enabled(bool p_enabled) = 0; virtual void set_reuse_address_enabled(bool p_enabled) = 0;
virtual Error join_multicast_group(const IPAddress &p_multi_address, String p_if_name) = 0; virtual Error join_multicast_group(const IPAddress &p_multi_address, const String &p_if_name) = 0;
virtual Error leave_multicast_group(const IPAddress &p_multi_address, String p_if_name) = 0; virtual Error leave_multicast_group(const IPAddress &p_multi_address, const String &p_if_name) = 0;
}; };
#endif // NET_SOCKET_H #endif // NET_SOCKET_H

4
core/io/packet_peer_udp.cpp
View File

@ -45,7 +45,7 @@ void PacketPeerUDP::set_broadcast_enabled(bool p_enabled) {
} }
} }
Error PacketPeerUDP::join_multicast_group(IPAddress p_multi_address, String p_if_name) { Error PacketPeerUDP::join_multicast_group(IPAddress p_multi_address, const String &p_if_name) {
ERR_FAIL_COND_V(udp_server, ERR_LOCKED); ERR_FAIL_COND_V(udp_server, ERR_LOCKED);
ERR_FAIL_COND_V(!_sock.is_valid(), ERR_UNAVAILABLE); ERR_FAIL_COND_V(!_sock.is_valid(), ERR_UNAVAILABLE);
ERR_FAIL_COND_V(!p_multi_address.is_valid(), ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(!p_multi_address.is_valid(), ERR_INVALID_PARAMETER);
@ -60,7 +60,7 @@ Error PacketPeerUDP::join_multicast_group(IPAddress p_multi_address, String p_if
return _sock->join_multicast_group(p_multi_address, p_if_name); return _sock->join_multicast_group(p_multi_address, p_if_name);
} }
Error PacketPeerUDP::leave_multicast_group(IPAddress p_multi_address, String p_if_name) { Error PacketPeerUDP::leave_multicast_group(IPAddress p_multi_address, const String &p_if_name) {
ERR_FAIL_COND_V(udp_server, ERR_LOCKED); ERR_FAIL_COND_V(udp_server, ERR_LOCKED);
ERR_FAIL_COND_V(!_sock.is_valid(), ERR_UNAVAILABLE); ERR_FAIL_COND_V(!_sock.is_valid(), ERR_UNAVAILABLE);
ERR_FAIL_COND_V(!_sock->is_open(), ERR_UNCONFIGURED); ERR_FAIL_COND_V(!_sock->is_open(), ERR_UNCONFIGURED);

4
core/io/packet_peer_udp.h
View File

@ -91,8 +91,8 @@ public:
int get_available_packet_count() const override; int get_available_packet_count() const override;
int get_max_packet_size() const override; int get_max_packet_size() const override;
void set_broadcast_enabled(bool p_enabled); void set_broadcast_enabled(bool p_enabled);
Error join_multicast_group(IPAddress p_multi_address, String p_if_name); Error join_multicast_group(IPAddress p_multi_address, const String &p_if_name);
Error leave_multicast_group(IPAddress p_multi_address, String p_if_name); Error leave_multicast_group(IPAddress p_multi_address, const String &p_if_name);
PacketPeerUDP(); PacketPeerUDP();
~PacketPeerUDP(); ~PacketPeerUDP();

4
core/io/resource_loader.cpp
View File

@ -1114,7 +1114,7 @@ void ResourceLoader::set_load_callback(ResourceLoadedCallback p_callback) {
ResourceLoadedCallback ResourceLoader::_loaded_callback = nullptr; ResourceLoadedCallback ResourceLoader::_loaded_callback = nullptr;
Ref<ResourceFormatLoader> ResourceLoader::_find_custom_resource_format_loader(String path) { Ref<ResourceFormatLoader> ResourceLoader::_find_custom_resource_format_loader(const String &path) {
for (int i = 0; i < loader_count; ++i) { for (int i = 0; i < loader_count; ++i) {
if (loader[i]->get_script_instance() && loader[i]->get_script_instance()->get_script()->get_path() == path) { if (loader[i]->get_script_instance() && loader[i]->get_script_instance()->get_script()->get_path() == path) {
return loader[i]; return loader[i];
@ -1123,7 +1123,7 @@ Ref<ResourceFormatLoader> ResourceLoader::_find_custom_resource_format_loader(St
return Ref<ResourceFormatLoader>(); return Ref<ResourceFormatLoader>();
} }
bool ResourceLoader::add_custom_resource_format_loader(String script_path) { bool ResourceLoader::add_custom_resource_format_loader(const String &script_path) {
if (_find_custom_resource_format_loader(script_path).is_valid()) { if (_find_custom_resource_format_loader(script_path).is_valid()) {
return false; return false;
} }

4
core/io/resource_loader.h
View File

@ -158,7 +158,7 @@ private:
static ResourceLoadedCallback _loaded_callback; static ResourceLoadedCallback _loaded_callback;
static Ref<ResourceFormatLoader> _find_custom_resource_format_loader(String path); static Ref<ResourceFormatLoader> _find_custom_resource_format_loader(const String &path);
struct ThreadLoadTask { struct ThreadLoadTask {
WorkerThreadPool::TaskID task_id = 0; // Used if run on a worker thread from the pool. WorkerThreadPool::TaskID task_id = 0; // Used if run on a worker thread from the pool.
@ -263,7 +263,7 @@ public:
static void set_load_callback(ResourceLoadedCallback p_callback); static void set_load_callback(ResourceLoadedCallback p_callback);
static ResourceLoaderImport import; static ResourceLoaderImport import;
static bool add_custom_resource_format_loader(String script_path); static bool add_custom_resource_format_loader(const String &script_path);
static void add_custom_loaders(); static void add_custom_loaders();
static void remove_custom_loaders(); static void remove_custom_loaders();

4
core/io/resource_saver.cpp
View File

@ -215,7 +215,7 @@ void ResourceSaver::remove_resource_format_saver(Ref<ResourceFormatSaver> p_form
--saver_count; --saver_count;
} }
Ref<ResourceFormatSaver> ResourceSaver::_find_custom_resource_format_saver(String path) { Ref<ResourceFormatSaver> ResourceSaver::_find_custom_resource_format_saver(const String &path) {
for (int i = 0; i < saver_count; ++i) { for (int i = 0; i < saver_count; ++i) {
if (saver[i]->get_script_instance() && saver[i]->get_script_instance()->get_script()->get_path() == path) { if (saver[i]->get_script_instance() && saver[i]->get_script_instance()->get_script()->get_path() == path) {
return saver[i]; return saver[i];
@ -224,7 +224,7 @@ Ref<ResourceFormatSaver> ResourceSaver::_find_custom_resource_format_saver(Strin
return Ref<ResourceFormatSaver>(); return Ref<ResourceFormatSaver>();
} }
bool ResourceSaver::add_custom_resource_format_saver(String script_path) { bool ResourceSaver::add_custom_resource_format_saver(const String &script_path) {
if (_find_custom_resource_format_saver(script_path).is_valid()) { if (_find_custom_resource_format_saver(script_path).is_valid()) {
return false; return false;
} }

4
core/io/resource_saver.h
View File

@ -70,7 +70,7 @@ class ResourceSaver {
static ResourceSavedCallback save_callback; static ResourceSavedCallback save_callback;
static ResourceSaverGetResourceIDForPath save_get_id_for_path; static ResourceSaverGetResourceIDForPath save_get_id_for_path;
static Ref<ResourceFormatSaver> _find_custom_resource_format_saver(String path); static Ref<ResourceFormatSaver> _find_custom_resource_format_saver(const String &path);
public: public:
enum SaverFlags { enum SaverFlags {
@ -99,7 +99,7 @@ public:
static void set_save_callback(ResourceSavedCallback p_callback); static void set_save_callback(ResourceSavedCallback p_callback);
static void set_get_resource_id_for_path(ResourceSaverGetResourceIDForPath p_callback); static void set_get_resource_id_for_path(ResourceSaverGetResourceIDForPath p_callback);
static bool add_custom_resource_format_saver(String script_path); static bool add_custom_resource_format_saver(const String &script_path);
static void add_custom_savers(); static void add_custom_savers();
static void remove_custom_savers(); static void remove_custom_savers();
}; };

2
core/io/zip_io.cpp
View File

@ -53,7 +53,7 @@ int godot_unzip_get_current_file_info(unzFile p_zip_file, unz_file_info64 &r_fil
return err; return err;
} }
int godot_unzip_locate_file(unzFile p_zip_file, String p_filepath, bool p_case_sensitive) { int godot_unzip_locate_file(unzFile p_zip_file, const String &p_filepath, bool p_case_sensitive) {
int err = unzGoToFirstFile(p_zip_file); int err = unzGoToFirstFile(p_zip_file);
while (err == UNZ_OK) { while (err == UNZ_OK) {
unz_file_info64 current_file_info; unz_file_info64 current_file_info;

2
core/io/zip_io.h
View File

@ -42,7 +42,7 @@
// Get the current file info and safely convert the full filepath to a String. // Get the current file info and safely convert the full filepath to a String.
int godot_unzip_get_current_file_info(unzFile p_zip_file, unz_file_info64 &r_file_info, String &r_filepath); int godot_unzip_get_current_file_info(unzFile p_zip_file, unz_file_info64 &r_file_info, String &r_filepath);
// Try to locate the file in the archive specified by the filepath (works with large paths and Unicode). // Try to locate the file in the archive specified by the filepath (works with large paths and Unicode).
int godot_unzip_locate_file(unzFile p_zip_file, String p_filepath, bool p_case_sensitive = true); int godot_unzip_locate_file(unzFile p_zip_file, const String &p_filepath, bool p_case_sensitive = true);
// //

2
core/math/expression.cpp
View File

@ -1494,7 +1494,7 @@ Error Expression::parse(const String &p_expression, const Vector<String> &p_inpu
return OK; return OK;
} }
Variant Expression::execute(Array p_inputs, Object *p_base, bool p_show_error, bool p_const_calls_only) { Variant Expression::execute(const Array &p_inputs, Object *p_base, bool p_show_error, bool p_const_calls_only) {
ERR_FAIL_COND_V_MSG(error_set, Variant(), "There was previously a parse error: " + error_str + "."); ERR_FAIL_COND_V_MSG(error_set, Variant(), "There was previously a parse error: " + error_str + ".");
execution_error = false; execution_error = false;

2
core/math/expression.h
View File

@ -264,7 +264,7 @@ protected:
public: public:
Error parse(const String &p_expression, const Vector<String> &p_input_names = Vector<String>()); Error parse(const String &p_expression, const Vector<String> &p_input_names = Vector<String>());
Variant execute(Array p_inputs = Array(), Object *p_base = nullptr, bool p_show_error = true, bool p_const_calls_only = false); Variant execute(const Array &p_inputs = Array(), Object *p_base = nullptr, bool p_show_error = true, bool p_const_calls_only = false);
bool has_execute_failed() const; bool has_execute_failed() const;
String get_error_text() const; String get_error_text() const;

2
core/math/geometry_2d.cpp
View File

@ -37,7 +37,7 @@
#define SCALE_FACTOR 100000.0 // Based on CMP_EPSILON. #define SCALE_FACTOR 100000.0 // Based on CMP_EPSILON.
Vector<Vector<Vector2>> Geometry2D::decompose_polygon_in_convex(Vector<Point2> polygon) { Vector<Vector<Vector2>> Geometry2D::decompose_polygon_in_convex(const Vector<Point2> &polygon) {
Vector<Vector<Vector2>> decomp; Vector<Vector<Vector2>> decomp;
List<TPPLPoly> in_poly, out_poly; List<TPPLPoly> in_poly, out_poly;

2
core/math/geometry_2d.h
View File

@ -489,7 +489,7 @@ public:
return points; return points;
} }
static Vector<Vector<Vector2>> decompose_polygon_in_convex(Vector<Point2> polygon); static Vector<Vector<Vector2>> decompose_polygon_in_convex(const Vector<Point2> &polygon);
static void make_atlas(const Vector<Size2i> &p_rects, Vector<Point2i> &r_result, Size2i &r_size); static void make_atlas(const Vector<Size2i> &p_rects, Vector<Point2i> &r_result, Size2i &r_size);
static Vector<Vector3i> partial_pack_rects(const Vector<Vector2i> &p_sizes, const Size2i &p_atlas_size); static Vector<Vector3i> partial_pack_rects(const Vector<Vector2i> &p_sizes, const Size2i &p_atlas_size);

2
core/math/geometry_3d.cpp
View File

@ -449,7 +449,7 @@ static inline void _build_faces(uint8_t ***p_cell_status, int x, int y, int z, i
} }
} }
Vector<Face3> Geometry3D::wrap_geometry(Vector<Face3> p_array, real_t *p_error) { Vector<Face3> Geometry3D::wrap_geometry(const Vector<Face3> &p_array, real_t *p_error) {
int face_count = p_array.size(); int face_count = p_array.size();
const Face3 *faces = p_array.ptr(); const Face3 *faces = p_array.ptr();
constexpr double min_size = 1.0; constexpr double min_size = 1.0;

2
core/math/geometry_3d.h
View File

@ -549,7 +549,7 @@ public:
} }
// Create a "wrap" that encloses the given geometry. // Create a "wrap" that encloses the given geometry.
static Vector<Face3> wrap_geometry(Vector<Face3> p_array, real_t *p_error = nullptr); static Vector<Face3> wrap_geometry(const Vector<Face3> &p_array, real_t *p_error = nullptr);
struct MeshData { struct MeshData {
struct Face { struct Face {

2
core/object/object.h
View File

@ -165,7 +165,7 @@ struct PropertyInfo {
PropertyInfo() {} PropertyInfo() {}
PropertyInfo(const Variant::Type p_type, const String p_name, const PropertyHint p_hint = PROPERTY_HINT_NONE, const String &p_hint_string = "", const uint32_t p_usage = PROPERTY_USAGE_DEFAULT, const StringName &p_class_name = StringName()) : PropertyInfo(const Variant::Type p_type, const String &p_name, const PropertyHint p_hint = PROPERTY_HINT_NONE, const String &p_hint_string = "", const uint32_t p_usage = PROPERTY_USAGE_DEFAULT, const StringName &p_class_name = StringName()) :
type(p_type), type(p_type),
name(p_name), name(p_name),
hint(p_hint), hint(p_hint),

2
core/object/script_language.h
View File

@ -239,7 +239,7 @@ public:
void get_core_type_words(List<String> *p_core_type_words) const; void get_core_type_words(List<String> *p_core_type_words) const;
virtual void get_reserved_words(List<String> *p_words) const = 0; virtual void get_reserved_words(List<String> *p_words) const = 0;
virtual bool is_control_flow_keyword(String p_string) const = 0; virtual bool is_control_flow_keyword(const String &p_string) const = 0;
virtual void get_comment_delimiters(List<String> *p_delimiters) const = 0; virtual void get_comment_delimiters(List<String> *p_delimiters) const = 0;
virtual void get_doc_comment_delimiters(List<String> *p_delimiters) const = 0; virtual void get_doc_comment_delimiters(List<String> *p_delimiters) const = 0;
virtual void get_string_delimiters(List<String> *p_delimiters) const = 0; virtual void get_string_delimiters(List<String> *p_delimiters) const = 0;

2
core/object/script_language_extension.h
View File

@ -229,7 +229,7 @@ public:
p_words->push_back(ret[i]); p_words->push_back(ret[i]);
} }
} }
EXBIND1RC(bool, is_control_flow_keyword, String) EXBIND1RC(bool, is_control_flow_keyword, const String &)
GDVIRTUAL0RC(Vector<String>, _get_comment_delimiters) GDVIRTUAL0RC(Vector<String>, _get_comment_delimiters)

2
core/os/os.cpp
View File

@ -298,7 +298,7 @@ String OS::get_system_dir(SystemDir p_dir, bool p_shared_storage) const {
return "."; return ".";
} }
Error OS::shell_open(String p_uri) { Error OS::shell_open(const String &p_uri) {
return ERR_UNAVAILABLE; return ERR_UNAVAILABLE;
} }

12
core/os/os.h
View File

@ -86,7 +86,7 @@ protected:
void _set_logger(CompositeLogger *p_logger); void _set_logger(CompositeLogger *p_logger);
public: public:
typedef void (*ImeCallback)(void *p_inp, String p_text, Point2 p_selection); typedef void (*ImeCallback)(void *p_inp, const String &p_text, Point2 p_selection);
typedef bool (*HasServerFeatureCallback)(const String &p_feature); typedef bool (*HasServerFeatureCallback)(const String &p_feature);
enum RenderThreadMode { enum RenderThreadMode {
@ -109,8 +109,8 @@ protected:
virtual void initialize() = 0; virtual void initialize() = 0;
virtual void initialize_joypads() = 0; virtual void initialize_joypads() = 0;
void set_current_rendering_driver_name(String p_driver_name) { _current_rendering_driver_name = p_driver_name; } void set_current_rendering_driver_name(const String &p_driver_name) { _current_rendering_driver_name = p_driver_name; }
void set_current_rendering_method(String p_name) { _current_rendering_method = p_name; } void set_current_rendering_method(const String &p_name) { _current_rendering_method = p_name; }
void set_display_driver_id(int p_display_driver_id) { _display_driver_id = p_display_driver_id; } void set_display_driver_id(int p_display_driver_id) { _display_driver_id = p_display_driver_id; }
@ -152,9 +152,9 @@ public:
virtual void alert(const String &p_alert, const String &p_title = "ALERT!"); virtual void alert(const String &p_alert, const String &p_title = "ALERT!");
virtual Error open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path = false, String *r_resolved_path = nullptr) { return ERR_UNAVAILABLE; } virtual Error open_dynamic_library(const String &p_path, void *&p_library_handle, bool p_also_set_library_path = false, String *r_resolved_path = nullptr) { return ERR_UNAVAILABLE; }
virtual Error close_dynamic_library(void *p_library_handle) { return ERR_UNAVAILABLE; } virtual Error close_dynamic_library(void *p_library_handle) { return ERR_UNAVAILABLE; }
virtual Error get_dynamic_library_symbol_handle(void *p_library_handle, const String p_name, void *&p_symbol_handle, bool p_optional = false) { return ERR_UNAVAILABLE; } virtual Error get_dynamic_library_symbol_handle(void *p_library_handle, const String &p_name, void *&p_symbol_handle, bool p_optional = false) { return ERR_UNAVAILABLE; }
virtual void set_low_processor_usage_mode(bool p_enabled); virtual void set_low_processor_usage_mode(bool p_enabled);
virtual bool is_in_low_processor_usage_mode() const; virtual bool is_in_low_processor_usage_mode() const;
@ -176,7 +176,7 @@ public:
virtual bool is_process_running(const ProcessID &p_pid) const = 0; virtual bool is_process_running(const ProcessID &p_pid) const = 0;
virtual void vibrate_handheld(int p_duration_ms = 500) {} virtual void vibrate_handheld(int p_duration_ms = 500) {}
virtual Error shell_open(String p_uri); virtual Error shell_open(const String &p_uri);
virtual Error shell_show_in_file_manager(String p_path, bool p_open_folder = true); virtual Error shell_show_in_file_manager(String p_path, bool p_open_folder = true);
virtual Error set_cwd(const String &p_cwd); virtual Error set_cwd(const String &p_cwd);

8
core/os/time.cpp
View File

@ -255,7 +255,7 @@ String Time::get_time_string_from_unix_time(int64_t p_unix_time_val) const {
return vformat("%02d:%02d:%02d", hour, minute, second); return vformat("%02d:%02d:%02d", hour, minute, second);
} }
Dictionary Time::get_datetime_dict_from_datetime_string(String p_datetime, bool p_weekday) const { Dictionary Time::get_datetime_dict_from_datetime_string(const String &p_datetime, bool p_weekday) const {
PARSE_ISO8601_STRING(Dictionary()) PARSE_ISO8601_STRING(Dictionary())
Dictionary dict; Dictionary dict;
dict[YEAR_KEY] = year; dict[YEAR_KEY] = year;
@ -273,7 +273,7 @@ Dictionary Time::get_datetime_dict_from_datetime_string(String p_datetime, bool
return dict; return dict;
} }
String Time::get_datetime_string_from_datetime_dict(const Dictionary p_datetime, bool p_use_space) const { String Time::get_datetime_string_from_datetime_dict(const Dictionary &p_datetime, bool p_use_space) const {
ERR_FAIL_COND_V_MSG(p_datetime.is_empty(), "", "Invalid datetime Dictionary: Dictionary is empty."); ERR_FAIL_COND_V_MSG(p_datetime.is_empty(), "", "Invalid datetime Dictionary: Dictionary is empty.");
EXTRACT_FROM_DICTIONARY EXTRACT_FROM_DICTIONARY
VALIDATE_YMDHMS("") VALIDATE_YMDHMS("")
@ -287,7 +287,7 @@ String Time::get_datetime_string_from_datetime_dict(const Dictionary p_datetime,
return timestamp; return timestamp;
} }
int64_t Time::get_unix_time_from_datetime_dict(const Dictionary p_datetime) const { int64_t Time::get_unix_time_from_datetime_dict(const Dictionary &p_datetime) const {
ERR_FAIL_COND_V_MSG(p_datetime.is_empty(), 0, "Invalid datetime Dictionary: Dictionary is empty"); ERR_FAIL_COND_V_MSG(p_datetime.is_empty(), 0, "Invalid datetime Dictionary: Dictionary is empty");
EXTRACT_FROM_DICTIONARY EXTRACT_FROM_DICTIONARY
VALIDATE_YMDHMS(0) VALIDATE_YMDHMS(0)
@ -295,7 +295,7 @@ int64_t Time::get_unix_time_from_datetime_dict(const Dictionary p_datetime) cons
return day_number * SECONDS_PER_DAY + hour * 3600 + minute * 60 + second; return day_number * SECONDS_PER_DAY + hour * 3600 + minute * 60 + second;
} }
int64_t Time::get_unix_time_from_datetime_string(String p_datetime) const { int64_t Time::get_unix_time_from_datetime_string(const String &p_datetime) const {
PARSE_ISO8601_STRING(-1) PARSE_ISO8601_STRING(-1)
VALIDATE_YMDHMS(0) VALIDATE_YMDHMS(0)
YMD_TO_DAY_NUMBER YMD_TO_DAY_NUMBER

8
core/os/time.h
View File

@ -59,10 +59,10 @@ public:
String get_datetime_string_from_unix_time(int64_t p_unix_time_val, bool p_use_space = false) const; String get_datetime_string_from_unix_time(int64_t p_unix_time_val, bool p_use_space = false) const;
String get_date_string_from_unix_time(int64_t p_unix_time_val) const; String get_date_string_from_unix_time(int64_t p_unix_time_val) const;
String get_time_string_from_unix_time(int64_t p_unix_time_val) const; String get_time_string_from_unix_time(int64_t p_unix_time_val) const;
Dictionary get_datetime_dict_from_datetime_string(String p_datetime, bool p_weekday = true) const; Dictionary get_datetime_dict_from_datetime_string(const String &p_datetime, bool p_weekday = true) const;
String get_datetime_string_from_datetime_dict(const Dictionary p_datetime, bool p_use_space = false) const; String get_datetime_string_from_datetime_dict(const Dictionary &p_datetime, bool p_use_space = false) const;
int64_t get_unix_time_from_datetime_dict(const Dictionary p_datetime) const; int64_t get_unix_time_from_datetime_dict(const Dictionary &p_datetime) const;
int64_t get_unix_time_from_datetime_string(String p_datetime) const; int64_t get_unix_time_from_datetime_string(const String &p_datetime) const;
String get_offset_string_from_offset_minutes(int64_t p_offset_minutes) const; String get_offset_string_from_offset_minutes(int64_t p_offset_minutes) const;
// Methods that get information from OS. // Methods that get information from OS.

8
core/string/print_string.cpp
View File

@ -68,7 +68,7 @@ void remove_print_handler(const PrintHandlerList *p_handler) {
ERR_FAIL_NULL(l); ERR_FAIL_NULL(l);
} }
void __print_line(String p_string) { void __print_line(const String &p_string) {
if (!CoreGlobals::print_line_enabled) { if (!CoreGlobals::print_line_enabled) {
return; return;
} }
@ -85,7 +85,7 @@ void __print_line(String p_string) {
_global_unlock(); _global_unlock();
} }
void __print_line_rich(String p_string) { void __print_line_rich(const String &p_string) {
if (!CoreGlobals::print_line_enabled) { if (!CoreGlobals::print_line_enabled) {
return; return;
} }
@ -178,7 +178,7 @@ void __print_line_rich(String p_string) {
_global_unlock(); _global_unlock();
} }
void print_error(String p_string) { void print_error(const String &p_string) {
if (!CoreGlobals::print_error_enabled) { if (!CoreGlobals::print_error_enabled) {
return; return;
} }
@ -199,6 +199,6 @@ bool is_print_verbose_enabled() {
return OS::get_singleton()->is_stdout_verbose(); return OS::get_singleton()->is_stdout_verbose();
} }
String stringify_variants(Variant p_var) { String stringify_variants(const Variant &p_var) {
return p_var.operator String(); return p_var.operator String();
} }

18
core/string/print_string.h
View File

@ -46,19 +46,19 @@ struct PrintHandlerList {
PrintHandlerList() {} PrintHandlerList() {}
}; };
String stringify_variants(Variant p_var); String stringify_variants(const Variant &p_var);
template <typename... Args> template <typename... Args>
String stringify_variants(Variant p_var, Args... p_args) { String stringify_variants(const Variant &p_var, Args... p_args) {
return p_var.operator String() + " " + stringify_variants(p_args...); return p_var.operator String() + " " + stringify_variants(p_args...);
} }
void add_print_handler(PrintHandlerList *p_handler); void add_print_handler(PrintHandlerList *p_handler);
void remove_print_handler(const PrintHandlerList *p_handler); void remove_print_handler(const PrintHandlerList *p_handler);
extern void __print_line(String p_string); extern void __print_line(const String &p_string);
extern void __print_line_rich(String p_string); extern void __print_line_rich(const String &p_string);
extern void print_error(String p_string); extern void print_error(const String &p_string);
extern bool is_print_verbose_enabled(); extern bool is_print_verbose_enabled();
// This version avoids processing the text to be printed until it actually has to be printed, saving some CPU usage. // This version avoids processing the text to be printed until it actually has to be printed, saving some CPU usage.
@ -69,21 +69,21 @@ extern bool is_print_verbose_enabled();
} \ } \
} }
inline void print_line(Variant v) { inline void print_line(const Variant &v) {
__print_line(stringify_variants(v)); __print_line(stringify_variants(v));
} }
inline void print_line_rich(Variant v) { inline void print_line_rich(const Variant &v) {
__print_line_rich(stringify_variants(v)); __print_line_rich(stringify_variants(v));
} }
template <typename... Args> template <typename... Args>
void print_line(Variant p_var, Args... p_args) { void print_line(const Variant &p_var, Args... p_args) {
__print_line(stringify_variants(p_var, p_args...)); __print_line(stringify_variants(p_var, p_args...));
} }
template <typename... Args> template <typename... Args>
void print_line_rich(Variant p_var, Args... p_args) { void print_line_rich(const Variant &p_var, Args... p_args) {
__print_line_rich(stringify_variants(p_var, p_args...)); __print_line_rich(stringify_variants(p_var, p_args...));
} }

2
core/string/ustring.cpp
View File

@ -1438,7 +1438,7 @@ Vector<int> String::split_ints_mk(const Vector<String> &p_splitters, bool p_allo
return ret; return ret;
} }
String String::join(Vector<String> parts) const { String String::join(const Vector<String> &parts) const {
String ret; String ret;
for (int i = 0; i < parts.size(); ++i) { for (int i = 0; i < parts.size(); ++i) {
if (i > 0) { if (i > 0) {

2
core/string/ustring.h
View File

@ -361,7 +361,7 @@ public:
Vector<int> split_ints(const String &p_splitter, bool p_allow_empty = true) const; Vector<int> split_ints(const String &p_splitter, bool p_allow_empty = true) const;
Vector<int> split_ints_mk(const Vector<String> &p_splitters, bool p_allow_empty = true) const; Vector<int> split_ints_mk(const Vector<String> &p_splitters, bool p_allow_empty = true) const;
String join(Vector<String> parts) const; String join(const Vector<String> &parts) const;
static char32_t char_uppercase(char32_t p_char); static char32_t char_uppercase(char32_t p_char);
static char32_t char_lowercase(char32_t p_char); static char32_t char_lowercase(char32_t p_char);

4
core/templates/vector.h
View File

@ -100,7 +100,7 @@ public:
Size rfind(const T &p_val, Size p_from = -1) const { return _cowdata.rfind(p_val, p_from); } Size rfind(const T &p_val, Size p_from = -1) const { return _cowdata.rfind(p_val, p_from); }
Size count(const T &p_val) const { return _cowdata.count(p_val); } Size count(const T &p_val) const { return _cowdata.count(p_val); }
void append_array(Vector<T> p_other); void append_array(const Vector<T> &p_other);
_FORCE_INLINE_ bool has(const T &p_val) const { return find(p_val) != -1; } _FORCE_INLINE_ bool has(const T &p_val) const { return find(p_val) != -1; }
@ -300,7 +300,7 @@ void Vector<T>::reverse() {
} }
template <class T> template <class T>
void Vector<T>::append_array(Vector<T> p_other) { void Vector<T>::append_array(const Vector<T> &p_other) {
const Size ds = p_other.size(); const Size ds = p_other.size();
if (ds == 0) { if (ds == 0) {
return; return;

244
core/variant/method_ptrcall.h
View File

@ -216,7 +216,7 @@ struct PtrToArg<ObjectID> {
} \ } \
return ret; \ return ret; \
} \ } \
_FORCE_INLINE_ static void encode(Vector<m_type> p_vec, void *p_ptr) { \ _FORCE_INLINE_ static void encode(const Vector<m_type> &p_vec, void *p_ptr) { \
Vector<m_type> *dv = reinterpret_cast<Vector<m_type> *>(p_ptr); \ Vector<m_type> *dv = reinterpret_cast<Vector<m_type> *>(p_ptr); \
int len = p_vec.size(); \ int len = p_vec.size(); \
dv->resize(len); \ dv->resize(len); \
@ -246,49 +246,49 @@ struct PtrToArg<ObjectID> {
} }
// No EncodeT because direct pointer conversion not possible. // No EncodeT because direct pointer conversion not possible.
#define MAKE_VECARG_ALT(m_type, m_type_alt) \ #define MAKE_VECARG_ALT(m_type, m_type_alt) \
template <> \ template <> \
struct PtrToArg<Vector<m_type_alt>> { \ struct PtrToArg<Vector<m_type_alt>> { \
_FORCE_INLINE_ static Vector<m_type_alt> convert(const void *p_ptr) { \ _FORCE_INLINE_ static Vector<m_type_alt> convert(const void *p_ptr) { \
const Vector<m_type> *dvs = reinterpret_cast<const Vector<m_type> *>(p_ptr); \ const Vector<m_type> *dvs = reinterpret_cast<const Vector<m_type> *>(p_ptr); \
Vector<m_type_alt> ret; \ Vector<m_type_alt> ret; \
int len = dvs->size(); \ int len = dvs->size(); \
ret.resize(len); \ ret.resize(len); \
{ \ { \
const m_type *r = dvs->ptr(); \ const m_type *r = dvs->ptr(); \
for (int i = 0; i < len; i++) { \ for (int i = 0; i < len; i++) { \
ret.write[i] = r[i]; \ ret.write[i] = r[i]; \
} \ } \
} \ } \
return ret; \ return ret; \
} \ } \
_FORCE_INLINE_ static void encode(Vector<m_type_alt> p_vec, void *p_ptr) { \ _FORCE_INLINE_ static void encode(const Vector<m_type_alt> &p_vec, void *p_ptr) { \
Vector<m_type> *dv = reinterpret_cast<Vector<m_type> *>(p_ptr); \ Vector<m_type> *dv = reinterpret_cast<Vector<m_type> *>(p_ptr); \
int len = p_vec.size(); \ int len = p_vec.size(); \
dv->resize(len); \ dv->resize(len); \
{ \ { \
m_type *w = dv->ptrw(); \ m_type *w = dv->ptrw(); \
for (int i = 0; i < len; i++) { \ for (int i = 0; i < len; i++) { \
w[i] = p_vec[i]; \ w[i] = p_vec[i]; \
} \ } \
} \ } \
} \ } \
}; \ }; \
template <> \ template <> \
struct PtrToArg<const Vector<m_type_alt> &> { \ struct PtrToArg<const Vector<m_type_alt> &> { \
_FORCE_INLINE_ static Vector<m_type_alt> convert(const void *p_ptr) { \ _FORCE_INLINE_ static Vector<m_type_alt> convert(const void *p_ptr) { \
const Vector<m_type> *dvs = reinterpret_cast<const Vector<m_type> *>(p_ptr); \ const Vector<m_type> *dvs = reinterpret_cast<const Vector<m_type> *>(p_ptr); \
Vector<m_type_alt> ret; \ Vector<m_type_alt> ret; \
int len = dvs->size(); \ int len = dvs->size(); \
ret.resize(len); \ ret.resize(len); \
{ \ { \
const m_type *r = dvs->ptr(); \ const m_type *r = dvs->ptr(); \
for (int i = 0; i < len; i++) { \ for (int i = 0; i < len; i++) { \
ret.write[i] = r[i]; \ ret.write[i] = r[i]; \
} \ } \
} \ } \
return ret; \ return ret; \
} \ } \
} }
MAKE_VECARG_ALT(String, StringName); MAKE_VECARG_ALT(String, StringName);
@ -296,40 +296,40 @@ MAKE_VECARG_ALT(String, StringName);
// For stuff that gets converted to Array vectors. // For stuff that gets converted to Array vectors.
// No EncodeT because direct pointer conversion not possible. // No EncodeT because direct pointer conversion not possible.
#define MAKE_VECARR(m_type) \ #define MAKE_VECARR(m_type) \
template <> \ template <> \
struct PtrToArg<Vector<m_type>> { \ struct PtrToArg<Vector<m_type>> { \
_FORCE_INLINE_ static Vector<m_type> convert(const void *p_ptr) { \ _FORCE_INLINE_ static Vector<m_type> convert(const void *p_ptr) { \
const Array *arr = reinterpret_cast<const Array *>(p_ptr); \ const Array *arr = reinterpret_cast<const Array *>(p_ptr); \
Vector<m_type> ret; \ Vector<m_type> ret; \
int len = arr->size(); \ int len = arr->size(); \
ret.resize(len); \ ret.resize(len); \
for (int i = 0; i < len; i++) { \ for (int i = 0; i < len; i++) { \
ret.write[i] = (*arr)[i]; \ ret.write[i] = (*arr)[i]; \
} \ } \
return ret; \ return ret; \
} \ } \
_FORCE_INLINE_ static void encode(Vector<m_type> p_vec, void *p_ptr) { \ _FORCE_INLINE_ static void encode(const Vector<m_type> &p_vec, void *p_ptr) { \
Array *arr = reinterpret_cast<Array *>(p_ptr); \ Array *arr = reinterpret_cast<Array *>(p_ptr); \
int len = p_vec.size(); \ int len = p_vec.size(); \
arr->resize(len); \ arr->resize(len); \
for (int i = 0; i < len; i++) { \ for (int i = 0; i < len; i++) { \
(*arr)[i] = p_vec[i]; \ (*arr)[i] = p_vec[i]; \
} \ } \
} \ } \
}; \ }; \
template <> \ template <> \
struct PtrToArg<const Vector<m_type> &> { \ struct PtrToArg<const Vector<m_type> &> { \
_FORCE_INLINE_ static Vector<m_type> convert(const void *p_ptr) { \ _FORCE_INLINE_ static Vector<m_type> convert(const void *p_ptr) { \
const Array *arr = reinterpret_cast<const Array *>(p_ptr); \ const Array *arr = reinterpret_cast<const Array *>(p_ptr); \
Vector<m_type> ret; \ Vector<m_type> ret; \
int len = arr->size(); \ int len = arr->size(); \
ret.resize(len); \ ret.resize(len); \
for (int i = 0; i < len; i++) { \ for (int i = 0; i < len; i++) { \
ret.write[i] = (*arr)[i]; \ ret.write[i] = (*arr)[i]; \
} \ } \
return ret; \ return ret; \
} \ } \
} }
MAKE_VECARR(Variant); MAKE_VECARR(Variant);
@ -337,49 +337,49 @@ MAKE_VECARR(RID);
MAKE_VECARR(Plane); MAKE_VECARR(Plane);
// No EncodeT because direct pointer conversion not possible. // No EncodeT because direct pointer conversion not possible.
#define MAKE_DVECARR(m_type) \ #define MAKE_DVECARR(m_type) \
template <> \ template <> \
struct PtrToArg<Vector<m_type>> { \ struct PtrToArg<Vector<m_type>> { \
_FORCE_INLINE_ static Vector<m_type> convert(const void *p_ptr) { \ _FORCE_INLINE_ static Vector<m_type> convert(const void *p_ptr) { \
const Array *arr = reinterpret_cast<const Array *>(p_ptr); \ const Array *arr = reinterpret_cast<const Array *>(p_ptr); \
Vector<m_type> ret; \ Vector<m_type> ret; \
int len = arr->size(); \ int len = arr->size(); \
ret.resize(len); \ ret.resize(len); \
{ \ { \
m_type *w = ret.ptrw(); \ m_type *w = ret.ptrw(); \
for (int i = 0; i < len; i++) { \ for (int i = 0; i < len; i++) { \
w[i] = (*arr)[i]; \ w[i] = (*arr)[i]; \
} \ } \
} \ } \
return ret; \ return ret; \
} \ } \
_FORCE_INLINE_ static void encode(Vector<m_type> p_vec, void *p_ptr) { \ _FORCE_INLINE_ static void encode(const Vector<m_type> &p_vec, void *p_ptr) { \
Array *arr = reinterpret_cast<Array *>(p_ptr); \ Array *arr = reinterpret_cast<Array *>(p_ptr); \
int len = p_vec.size(); \ int len = p_vec.size(); \
arr->resize(len); \ arr->resize(len); \
{ \ { \
const m_type *r = p_vec.ptr(); \ const m_type *r = p_vec.ptr(); \
for (int i = 0; i < len; i++) { \ for (int i = 0; i < len; i++) { \
(*arr)[i] = r[i]; \ (*arr)[i] = r[i]; \
} \ } \
} \ } \
} \ } \
}; \ }; \
template <> \ template <> \
struct PtrToArg<const Vector<m_type> &> { \ struct PtrToArg<const Vector<m_type> &> { \
_FORCE_INLINE_ static Vector<m_type> convert(const void *p_ptr) { \ _FORCE_INLINE_ static Vector<m_type> convert(const void *p_ptr) { \
const Array *arr = reinterpret_cast<const Array *>(p_ptr); \ const Array *arr = reinterpret_cast<const Array *>(p_ptr); \
Vector<m_type> ret; \ Vector<m_type> ret; \
int len = arr->size(); \ int len = arr->size(); \
ret.resize(len); \ ret.resize(len); \
{ \ { \
m_type *w = ret.ptrw(); \ m_type *w = ret.ptrw(); \
for (int i = 0; i < len; i++) { \ for (int i = 0; i < len; i++) { \
w[i] = (*arr)[i]; \ w[i] = (*arr)[i]; \
} \ } \
} \ } \
return ret; \ return ret; \
} \ } \
} }
// Special case for IPAddress. // Special case for IPAddress.
@ -427,7 +427,7 @@ struct PtrToArg<Vector<Face3>> {
} }
return ret; return ret;
} }
_FORCE_INLINE_ static void encode(Vector<Face3> p_vec, void *p_ptr) { _FORCE_INLINE_ static void encode(const Vector<Face3> &p_vec, void *p_ptr) {
Vector<Vector3> *arr = reinterpret_cast<Vector<Vector3> *>(p_ptr); Vector<Vector3> *arr = reinterpret_cast<Vector<Vector3> *>(p_ptr);
int len = p_vec.size(); int len = p_vec.size();
arr->resize(len * 3); arr->resize(len * 3);

2
core/variant/variant.cpp
View File

@ -1676,7 +1676,7 @@ Variant::operator String() const {
return stringify(0); return stringify(0);
} }
String stringify_variant_clean(const Variant p_variant, int recursion_count) { String stringify_variant_clean(const Variant &p_variant, int recursion_count) {
String s = p_variant.stringify(recursion_count); String s = p_variant.stringify(recursion_count);
// Wrap strings in quotes to avoid ambiguity. // Wrap strings in quotes to avoid ambiguity.

6
core/variant/variant_utility.cpp
View File

@ -109,7 +109,7 @@ int64_t VariantUtilityFunctions::posmod(int64_t b, int64_t r) {
return Math::posmod(b, r); return Math::posmod(b, r);
} }
Variant VariantUtilityFunctions::floor(Variant x, Callable::CallError &r_error) { Variant VariantUtilityFunctions::floor(const Variant &x, Callable::CallError &r_error) {
r_error.error = Callable::CallError::CALL_OK; r_error.error = Callable::CallError::CALL_OK;
switch (x.get_type()) { switch (x.get_type()) {
case Variant::INT: { case Variant::INT: {
@ -153,7 +153,7 @@ int64_t VariantUtilityFunctions::floori(double x) {
return int64_t(Math::floor(x)); return int64_t(Math::floor(x));
} }
Variant VariantUtilityFunctions::ceil(Variant x, Callable::CallError &r_error) { Variant VariantUtilityFunctions::ceil(const Variant &x, Callable::CallError &r_error) {
r_error.error = Callable::CallError::CALL_OK; r_error.error = Callable::CallError::CALL_OK;
switch (x.get_type()) { switch (x.get_type()) {
case Variant::INT: { case Variant::INT: {
@ -197,7 +197,7 @@ int64_t VariantUtilityFunctions::ceili(double x) {
return int64_t(Math::ceil(x)); return int64_t(Math::ceil(x));
} }
Variant VariantUtilityFunctions::round(Variant x, Callable::CallError &r_error) { Variant VariantUtilityFunctions::round(const Variant &x, Callable::CallError &r_error) {
r_error.error = Callable::CallError::CALL_OK; r_error.error = Callable::CallError::CALL_OK;
switch (x.get_type()) { switch (x.get_type()) {
case Variant::INT: { case Variant::INT: {

6
core/variant/variant_utility.h
View File

@ -52,13 +52,13 @@ struct VariantUtilityFunctions {
static double fmod(double b, double r); static double fmod(double b, double r);
static double fposmod(double b, double r); static double fposmod(double b, double r);
static int64_t posmod(int64_t b, int64_t r); static int64_t posmod(int64_t b, int64_t r);
static Variant floor(Variant x, Callable::CallError &r_error); static Variant floor(const Variant &x, Callable::CallError &r_error);
static double floorf(double x); static double floorf(double x);
static int64_t floori(double x); static int64_t floori(double x);
static Variant ceil(Variant x, Callable::CallError &r_error); static Variant ceil(const Variant &x, Callable::CallError &r_error);
static double ceilf(double x); static double ceilf(double x);
static int64_t ceili(double x); static int64_t ceili(double x);
static Variant round(Variant x, Callable::CallError &r_error); static Variant round(const Variant &x, Callable::CallError &r_error);
static double roundf(double x); static double roundf(double x);
static int64_t roundi(double x); static int64_t roundi(double x);
static Variant abs(const Variant &x, Callable::CallError &r_error); static Variant abs(const Variant &x, Callable::CallError &r_error);

4
drivers/unix/net_socket_posix.cpp
View File

@ -787,11 +787,11 @@ Ref<NetSocket> NetSocketPosix::accept(IPAddress &r_ip, uint16_t &r_port) {
return Ref<NetSocket>(ns); return Ref<NetSocket>(ns);
} }
Error NetSocketPosix::join_multicast_group(const IPAddress &p_multi_address, String p_if_name) { Error NetSocketPosix::join_multicast_group(const IPAddress &p_multi_address, const String &p_if_name) {
return _change_multicast_group(p_multi_address, p_if_name, true); return _change_multicast_group(p_multi_address, p_if_name, true);
} }
Error NetSocketPosix::leave_multicast_group(const IPAddress &p_multi_address, String p_if_name) { Error NetSocketPosix::leave_multicast_group(const IPAddress &p_multi_address, const String &p_if_name) {
return _change_multicast_group(p_multi_address, p_if_name, false); return _change_multicast_group(p_multi_address, p_if_name, false);
} }

4
drivers/unix/net_socket_posix.h
View File

@ -98,8 +98,8 @@ public:
virtual void set_tcp_no_delay_enabled(bool p_enabled); virtual void set_tcp_no_delay_enabled(bool p_enabled);
virtual void set_reuse_address_enabled(bool p_enabled); virtual void set_reuse_address_enabled(bool p_enabled);
virtual void set_reuse_port_enabled(bool p_enabled); virtual void set_reuse_port_enabled(bool p_enabled);
virtual Error join_multicast_group(const IPAddress &p_multi_address, String p_if_name); virtual Error join_multicast_group(const IPAddress &p_multi_address, const String &p_if_name);
virtual Error leave_multicast_group(const IPAddress &p_multi_address, String p_if_name); virtual Error leave_multicast_group(const IPAddress &p_multi_address, const String &p_if_name);
NetSocketPosix(); NetSocketPosix();
~NetSocketPosix(); ~NetSocketPosix();

4
drivers/unix/os_unix.cpp
View File

@ -639,7 +639,7 @@ String OS_Unix::get_locale() const {
return locale; return locale;
} }
Error OS_Unix::open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path, String *r_resolved_path) { Error OS_Unix::open_dynamic_library(const String &p_path, void *&p_library_handle, bool p_also_set_library_path, String *r_resolved_path) {
String path = p_path; String path = p_path;
if (FileAccess::exists(path) && path.is_relative_path()) { if (FileAccess::exists(path) && path.is_relative_path()) {
@ -677,7 +677,7 @@ Error OS_Unix::close_dynamic_library(void *p_library_handle) {
return OK; return OK;
} }
Error OS_Unix::get_dynamic_library_symbol_handle(void *p_library_handle, const String p_name, void *&p_symbol_handle, bool p_optional) { Error OS_Unix::get_dynamic_library_symbol_handle(void *p_library_handle, const String &p_name, void *&p_symbol_handle, bool p_optional) {
const char *error; const char *error;
dlerror(); // Clear existing errors dlerror(); // Clear existing errors

4
drivers/unix/os_unix.h
View File

@ -55,9 +55,9 @@ public:
virtual Error get_entropy(uint8_t *r_buffer, int p_bytes) override; virtual Error get_entropy(uint8_t *r_buffer, int p_bytes) override;
virtual Error open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path = false, String *r_resolved_path = nullptr) override; virtual Error open_dynamic_library(const String &p_path, void *&p_library_handle, bool p_also_set_library_path = false, String *r_resolved_path = nullptr) override;
virtual Error close_dynamic_library(void *p_library_handle) override; virtual Error close_dynamic_library(void *p_library_handle) override;
virtual Error get_dynamic_library_symbol_handle(void *p_library_handle, const String p_name, void *&p_symbol_handle, bool p_optional = false) override; virtual Error get_dynamic_library_symbol_handle(void *p_library_handle, const String &p_name, void *&p_symbol_handle, bool p_optional = false) override;
virtual Error set_cwd(const String &p_cwd) override; virtual Error set_cwd(const String &p_cwd) override;

2
drivers/windows/dir_access_windows.cpp
View File

@ -68,7 +68,7 @@ struct DirAccessWindowsPrivate {
WIN32_FIND_DATAW fu; // Unicode version. WIN32_FIND_DATAW fu; // Unicode version.
}; };
String DirAccessWindows::fix_path(String p_path) const { String DirAccessWindows::fix_path(const String &p_path) const {
String r_path = DirAccess::fix_path(p_path); String r_path = DirAccess::fix_path(p_path);
if (r_path.is_absolute_path() && !r_path.is_network_share_path() && r_path.length() > MAX_PATH) { if (r_path.is_absolute_path() && !r_path.is_network_share_path() && r_path.length() > MAX_PATH) {
r_path = "\\\\?\\" + r_path.replace("/", "\\"); r_path = "\\\\?\\" + r_path.replace("/", "\\");

2
drivers/windows/dir_access_windows.h
View File

@ -54,7 +54,7 @@ class DirAccessWindows : public DirAccess {
bool _cishidden = false; bool _cishidden = false;
protected: protected:
virtual String fix_path(String p_path) const override; virtual String fix_path(const String &p_path) const override;
public: public:
virtual Error list_dir_begin() override; ///< This starts dir listing virtual Error list_dir_begin() override; ///< This starts dir listing

2
modules/gdscript/gdscript.cpp
View File

@ -2597,7 +2597,7 @@ void GDScriptLanguage::get_reserved_words(List<String> *p_words) const {
} }
} }
bool GDScriptLanguage::is_control_flow_keyword(String p_keyword) const { bool GDScriptLanguage::is_control_flow_keyword(const String &p_keyword) const {
// Please keep alphabetical order. // Please keep alphabetical order.
return p_keyword == "break" || return p_keyword == "break" ||
p_keyword == "continue" || p_keyword == "continue" ||

2
modules/gdscript/gdscript.h
View File

@ -540,7 +540,7 @@ public:
/* EDITOR FUNCTIONS */ /* EDITOR FUNCTIONS */
virtual void get_reserved_words(List<String> *p_words) const override; virtual void get_reserved_words(List<String> *p_words) const override;
virtual bool is_control_flow_keyword(String p_keywords) const override; virtual bool is_control_flow_keyword(const String &p_keywords) const override;
virtual void get_comment_delimiters(List<String> *p_delimiters) const override; virtual void get_comment_delimiters(List<String> *p_delimiters) const override;
virtual void get_doc_comment_delimiters(List<String> *p_delimiters) const override; virtual void get_doc_comment_delimiters(List<String> *p_delimiters) const override;
virtual void get_string_delimiters(List<String> *p_delimiters) const override; virtual void get_string_delimiters(List<String> *p_delimiters) const override;

26
modules/mbedtls/crypto_mbedtls.cpp
View File

@ -53,7 +53,7 @@ CryptoKey *CryptoKeyMbedTLS::create() {
return memnew(CryptoKeyMbedTLS); return memnew(CryptoKeyMbedTLS);
} }
Error CryptoKeyMbedTLS::load(String p_path, bool p_public_only) { Error CryptoKeyMbedTLS::load(const String &p_path, bool p_public_only) {
ERR_FAIL_COND_V_MSG(locks, ERR_ALREADY_IN_USE, "Key is in use"); ERR_FAIL_COND_V_MSG(locks, ERR_ALREADY_IN_USE, "Key is in use");
PackedByteArray out; PackedByteArray out;
@ -79,7 +79,7 @@ Error CryptoKeyMbedTLS::load(String p_path, bool p_public_only) {
return OK; return OK;
} }
Error CryptoKeyMbedTLS::save(String p_path, bool p_public_only) { Error CryptoKeyMbedTLS::save(const String &p_path, bool p_public_only) {
Ref<FileAccess> f = FileAccess::open(p_path, FileAccess::WRITE); Ref<FileAccess> f = FileAccess::open(p_path, FileAccess::WRITE);
ERR_FAIL_COND_V_MSG(f.is_null(), ERR_INVALID_PARAMETER, "Cannot save CryptoKeyMbedTLS file '" + p_path + "'."); ERR_FAIL_COND_V_MSG(f.is_null(), ERR_INVALID_PARAMETER, "Cannot save CryptoKeyMbedTLS file '" + p_path + "'.");
@ -103,7 +103,7 @@ Error CryptoKeyMbedTLS::save(String p_path, bool p_public_only) {
return OK; return OK;
} }
Error CryptoKeyMbedTLS::load_from_string(String p_string_key, bool p_public_only) { Error CryptoKeyMbedTLS::load_from_string(const String &p_string_key, bool p_public_only) {
int ret = 0; int ret = 0;
if (p_public_only) { if (p_public_only) {
ret = mbedtls_pk_parse_public_key(&pkey, (unsigned char *)p_string_key.utf8().get_data(), p_string_key.utf8().size()); ret = mbedtls_pk_parse_public_key(&pkey, (unsigned char *)p_string_key.utf8().get_data(), p_string_key.utf8().size());
@ -138,7 +138,7 @@ X509Certificate *X509CertificateMbedTLS::create() {
return memnew(X509CertificateMbedTLS); return memnew(X509CertificateMbedTLS);
} }
Error X509CertificateMbedTLS::load(String p_path) { Error X509CertificateMbedTLS::load(const String &p_path) {
ERR_FAIL_COND_V_MSG(locks, ERR_ALREADY_IN_USE, "Certificate is already in use."); ERR_FAIL_COND_V_MSG(locks, ERR_ALREADY_IN_USE, "Certificate is already in use.");
PackedByteArray out; PackedByteArray out;
@ -170,7 +170,7 @@ Error X509CertificateMbedTLS::load_from_memory(const uint8_t *p_buffer, int p_le
return OK; return OK;
} }
Error X509CertificateMbedTLS::save(String p_path) { Error X509CertificateMbedTLS::save(const String &p_path) {
Ref<FileAccess> f = FileAccess::open(p_path, FileAccess::WRITE); Ref<FileAccess> f = FileAccess::open(p_path, FileAccess::WRITE);
ERR_FAIL_COND_V_MSG(f.is_null(), ERR_INVALID_PARAMETER, vformat("Cannot save X509CertificateMbedTLS file '%s'.", p_path)); ERR_FAIL_COND_V_MSG(f.is_null(), ERR_INVALID_PARAMETER, vformat("Cannot save X509CertificateMbedTLS file '%s'.", p_path));
@ -235,7 +235,7 @@ HMACContext *HMACContextMbedTLS::create() {
return memnew(HMACContextMbedTLS); return memnew(HMACContextMbedTLS);
} }
Error HMACContextMbedTLS::start(HashingContext::HashType p_hash_type, PackedByteArray p_key) { Error HMACContextMbedTLS::start(HashingContext::HashType p_hash_type, const PackedByteArray &p_key) {
ERR_FAIL_COND_V_MSG(ctx != nullptr, ERR_FILE_ALREADY_IN_USE, "HMACContext already started."); ERR_FAIL_COND_V_MSG(ctx != nullptr, ERR_FILE_ALREADY_IN_USE, "HMACContext already started.");
// HMAC keys can be any size. // HMAC keys can be any size.
@ -255,7 +255,7 @@ Error HMACContextMbedTLS::start(HashingContext::HashType p_hash_type, PackedByte
return ret ? FAILED : OK; return ret ? FAILED : OK;
} }
Error HMACContextMbedTLS::update(PackedByteArray p_data) { Error HMACContextMbedTLS::update(const PackedByteArray &p_data) {
ERR_FAIL_NULL_V_MSG(ctx, ERR_INVALID_DATA, "Start must be called before update."); ERR_FAIL_NULL_V_MSG(ctx, ERR_INVALID_DATA, "Start must be called before update.");
ERR_FAIL_COND_V_MSG(p_data.is_empty(), ERR_INVALID_PARAMETER, "Src must not be empty."); ERR_FAIL_COND_V_MSG(p_data.is_empty(), ERR_INVALID_PARAMETER, "Src must not be empty.");
@ -338,7 +338,7 @@ X509CertificateMbedTLS *CryptoMbedTLS::get_default_certificates() {
return default_certs; return default_certs;
} }
void CryptoMbedTLS::load_default_certificates(String p_path) { void CryptoMbedTLS::load_default_certificates(const String &p_path) {
ERR_FAIL_COND(default_certs != nullptr); ERR_FAIL_COND(default_certs != nullptr);
default_certs = memnew(X509CertificateMbedTLS); default_certs = memnew(X509CertificateMbedTLS);
@ -380,7 +380,7 @@ Ref<CryptoKey> CryptoMbedTLS::generate_rsa(int p_bytes) {
return out; return out;
} }
Ref<X509Certificate> CryptoMbedTLS::generate_self_signed_certificate(Ref<CryptoKey> p_key, String p_issuer_name, String p_not_before, String p_not_after) { Ref<X509Certificate> CryptoMbedTLS::generate_self_signed_certificate(Ref<CryptoKey> p_key, const String &p_issuer_name, const String &p_not_before, const String &p_not_after) {
Ref<CryptoKeyMbedTLS> key = static_cast<Ref<CryptoKeyMbedTLS>>(p_key); Ref<CryptoKeyMbedTLS> key = static_cast<Ref<CryptoKeyMbedTLS>>(p_key);
ERR_FAIL_COND_V_MSG(key.is_null(), nullptr, "Invalid private key argument."); ERR_FAIL_COND_V_MSG(key.is_null(), nullptr, "Invalid private key argument.");
mbedtls_x509write_cert crt; mbedtls_x509write_cert crt;
@ -452,7 +452,7 @@ mbedtls_md_type_t CryptoMbedTLS::md_type_from_hashtype(HashingContext::HashType
} }
} }
Vector<uint8_t> CryptoMbedTLS::sign(HashingContext::HashType p_hash_type, Vector<uint8_t> p_hash, Ref<CryptoKey> p_key) { Vector<uint8_t> CryptoMbedTLS::sign(HashingContext::HashType p_hash_type, const Vector<uint8_t> &p_hash, Ref<CryptoKey> p_key) {
int size; int size;
mbedtls_md_type_t type = CryptoMbedTLS::md_type_from_hashtype(p_hash_type, size); mbedtls_md_type_t type = CryptoMbedTLS::md_type_from_hashtype(p_hash_type, size);
ERR_FAIL_COND_V_MSG(type == MBEDTLS_MD_NONE, Vector<uint8_t>(), "Invalid hash type."); ERR_FAIL_COND_V_MSG(type == MBEDTLS_MD_NONE, Vector<uint8_t>(), "Invalid hash type.");
@ -470,7 +470,7 @@ Vector<uint8_t> CryptoMbedTLS::sign(HashingContext::HashType p_hash_type, Vector
return out; return out;
} }
bool CryptoMbedTLS::verify(HashingContext::HashType p_hash_type, Vector<uint8_t> p_hash, Vector<uint8_t> p_signature, Ref<CryptoKey> p_key) { bool CryptoMbedTLS::verify(HashingContext::HashType p_hash_type, const Vector<uint8_t> &p_hash, const Vector<uint8_t> &p_signature, Ref<CryptoKey> p_key) {
int size; int size;
mbedtls_md_type_t type = CryptoMbedTLS::md_type_from_hashtype(p_hash_type, size); mbedtls_md_type_t type = CryptoMbedTLS::md_type_from_hashtype(p_hash_type, size);
ERR_FAIL_COND_V_MSG(type == MBEDTLS_MD_NONE, false, "Invalid hash type."); ERR_FAIL_COND_V_MSG(type == MBEDTLS_MD_NONE, false, "Invalid hash type.");
@ -480,7 +480,7 @@ bool CryptoMbedTLS::verify(HashingContext::HashType p_hash_type, Vector<uint8_t>
return mbedtls_pk_verify(&(key->pkey), type, p_hash.ptr(), size, p_signature.ptr(), p_signature.size()) == 0; return mbedtls_pk_verify(&(key->pkey), type, p_hash.ptr(), size, p_signature.ptr(), p_signature.size()) == 0;
} }
Vector<uint8_t> CryptoMbedTLS::encrypt(Ref<CryptoKey> p_key, Vector<uint8_t> p_plaintext) { Vector<uint8_t> CryptoMbedTLS::encrypt(Ref<CryptoKey> p_key, const Vector<uint8_t> &p_plaintext) {
Ref<CryptoKeyMbedTLS> key = static_cast<Ref<CryptoKeyMbedTLS>>(p_key); Ref<CryptoKeyMbedTLS> key = static_cast<Ref<CryptoKeyMbedTLS>>(p_key);
ERR_FAIL_COND_V_MSG(!key.is_valid(), Vector<uint8_t>(), "Invalid key provided."); ERR_FAIL_COND_V_MSG(!key.is_valid(), Vector<uint8_t>(), "Invalid key provided.");
uint8_t buf[1024]; uint8_t buf[1024];
@ -493,7 +493,7 @@ Vector<uint8_t> CryptoMbedTLS::encrypt(Ref<CryptoKey> p_key, Vector<uint8_t> p_p
return out; return out;
} }
Vector<uint8_t> CryptoMbedTLS::decrypt(Ref<CryptoKey> p_key, Vector<uint8_t> p_ciphertext) { Vector<uint8_t> CryptoMbedTLS::decrypt(Ref<CryptoKey> p_key, const Vector<uint8_t> &p_ciphertext) {
Ref<CryptoKeyMbedTLS> key = static_cast<Ref<CryptoKeyMbedTLS>>(p_key); Ref<CryptoKeyMbedTLS> key = static_cast<Ref<CryptoKeyMbedTLS>>(p_key);
ERR_FAIL_COND_V_MSG(!key.is_valid(), Vector<uint8_t>(), "Invalid key provided."); ERR_FAIL_COND_V_MSG(!key.is_valid(), Vector<uint8_t>(), "Invalid key provided.");
ERR_FAIL_COND_V_MSG(key->is_public_only(), Vector<uint8_t>(), "Invalid key provided. Cannot decrypt using a public_only key."); ERR_FAIL_COND_V_MSG(key->is_public_only(), Vector<uint8_t>(), "Invalid key provided. Cannot decrypt using a public_only key.");

26
modules/mbedtls/crypto_mbedtls.h
View File

@ -51,10 +51,10 @@ public:
static void make_default() { CryptoKey::_create = create; } static void make_default() { CryptoKey::_create = create; }
static void finalize() { CryptoKey::_create = nullptr; } static void finalize() { CryptoKey::_create = nullptr; }
virtual Error load(String p_path, bool p_public_only); virtual Error load(const String &p_path, bool p_public_only);
virtual Error save(String p_path, bool p_public_only); virtual Error save(const String &p_path, bool p_public_only);
virtual String save_to_string(bool p_public_only); virtual String save_to_string(bool p_public_only);
virtual Error load_from_string(String p_string_key, bool p_public_only); virtual Error load_from_string(const String &p_string_key, bool p_public_only);
virtual bool is_public_only() const { return public_only; }; virtual bool is_public_only() const { return public_only; };
CryptoKeyMbedTLS() { CryptoKeyMbedTLS() {
@ -82,9 +82,9 @@ public:
static void make_default() { X509Certificate::_create = create; } static void make_default() { X509Certificate::_create = create; }
static void finalize() { X509Certificate::_create = nullptr; } static void finalize() { X509Certificate::_create = nullptr; }
virtual Error load(String p_path); virtual Error load(const String &p_path);
virtual Error load_from_memory(const uint8_t *p_buffer, int p_len); virtual Error load_from_memory(const uint8_t *p_buffer, int p_len);
virtual Error save(String p_path); virtual Error save(const String &p_path);
virtual String save_to_string(); virtual String save_to_string();
virtual Error load_from_string(const String &p_string_key); virtual Error load_from_string(const String &p_string_key);
@ -116,8 +116,8 @@ public:
static bool is_md_type_allowed(mbedtls_md_type_t p_md_type); static bool is_md_type_allowed(mbedtls_md_type_t p_md_type);
virtual Error start(HashingContext::HashType p_hash_type, PackedByteArray p_key); virtual Error start(HashingContext::HashType p_hash_type, const PackedByteArray &p_key);
virtual Error update(PackedByteArray p_data); virtual Error update(const PackedByteArray &p_data);
virtual PackedByteArray finish(); virtual PackedByteArray finish();
HMACContextMbedTLS() {} HMACContextMbedTLS() {}
@ -135,16 +135,16 @@ public:
static void initialize_crypto(); static void initialize_crypto();
static void finalize_crypto(); static void finalize_crypto();
static X509CertificateMbedTLS *get_default_certificates(); static X509CertificateMbedTLS *get_default_certificates();
static void load_default_certificates(String p_path); static void load_default_certificates(const String &p_path);
static mbedtls_md_type_t md_type_from_hashtype(HashingContext::HashType p_hash_type, int &r_size); static mbedtls_md_type_t md_type_from_hashtype(HashingContext::HashType p_hash_type, int &r_size);
virtual PackedByteArray generate_random_bytes(int p_bytes); virtual PackedByteArray generate_random_bytes(int p_bytes);
virtual Ref<CryptoKey> generate_rsa(int p_bytes); virtual Ref<CryptoKey> generate_rsa(int p_bytes);
virtual Ref<X509Certificate> generate_self_signed_certificate(Ref<CryptoKey> p_key, String p_issuer_name, String p_not_before, String p_not_after); virtual Ref<X509Certificate> generate_self_signed_certificate(Ref<CryptoKey> p_key, const String &p_issuer_name, const String &p_not_before, const String &p_not_after);
virtual Vector<uint8_t> sign(HashingContext::HashType p_hash_type, Vector<uint8_t> p_hash, Ref<CryptoKey> p_key); virtual Vector<uint8_t> sign(HashingContext::HashType p_hash_type, const Vector<uint8_t> &p_hash, Ref<CryptoKey> p_key);
virtual bool verify(HashingContext::HashType p_hash_type, Vector<uint8_t> p_hash, Vector<uint8_t> p_signature, Ref<CryptoKey> p_key); virtual bool verify(HashingContext::HashType p_hash_type, const Vector<uint8_t> &p_hash, const Vector<uint8_t> &p_signature, Ref<CryptoKey> p_key);
virtual Vector<uint8_t> encrypt(Ref<CryptoKey> p_key, Vector<uint8_t> p_plaintext); virtual Vector<uint8_t> encrypt(Ref<CryptoKey> p_key, const Vector<uint8_t> &p_plaintext);
virtual Vector<uint8_t> decrypt(Ref<CryptoKey> p_key, Vector<uint8_t> p_ciphertext); virtual Vector<uint8_t> decrypt(Ref<CryptoKey> p_key, const Vector<uint8_t> &p_ciphertext);
CryptoMbedTLS(); CryptoMbedTLS();
~CryptoMbedTLS(); ~CryptoMbedTLS();

2
modules/mono/csharp_script.cpp
View File

@ -307,7 +307,7 @@ void CSharpLanguage::get_reserved_words(List<String> *p_words) const {
} }
} }
bool CSharpLanguage::is_control_flow_keyword(String p_keyword) const { bool CSharpLanguage::is_control_flow_keyword(const String &p_keyword) const {
return p_keyword == "break" || return p_keyword == "break" ||
p_keyword == "case" || p_keyword == "case" ||
p_keyword == "catch" || p_keyword == "catch" ||

2
modules/mono/csharp_script.h
View File

@ -493,7 +493,7 @@ public:
/* EDITOR FUNCTIONS */ /* EDITOR FUNCTIONS */
void get_reserved_words(List<String> *p_words) const override; void get_reserved_words(List<String> *p_words) const override;
bool is_control_flow_keyword(String p_keyword) const override; bool is_control_flow_keyword(const String &p_keyword) const override;
void get_comment_delimiters(List<String> *p_delimiters) const override; void get_comment_delimiters(List<String> *p_delimiters) const override;
void get_doc_comment_delimiters(List<String> *p_delimiters) const override; void get_doc_comment_delimiters(List<String> *p_delimiters) const override;
void get_string_delimiters(List<String> *p_delimiters) const override; void get_string_delimiters(List<String> *p_delimiters) const override;

2
platform/android/dir_access_jandroid.cpp
View File

@ -218,7 +218,7 @@ bool DirAccessJAndroid::dir_exists(String p_dir) {
} }
} }
Error DirAccessJAndroid::make_dir_recursive(String p_dir) { Error DirAccessJAndroid::make_dir_recursive(const String &p_dir) {
// Check if the directory exists already // Check if the directory exists already
if (dir_exists(p_dir)) { if (dir_exists(p_dir)) {
return ERR_ALREADY_EXISTS; return ERR_ALREADY_EXISTS;

2
platform/android/dir_access_jandroid.h
View File

@ -77,7 +77,7 @@ public:
virtual bool dir_exists(String p_dir) override; virtual bool dir_exists(String p_dir) override;
virtual Error make_dir(String p_dir) override; virtual Error make_dir(String p_dir) override;
virtual Error make_dir_recursive(String p_dir) override; virtual Error make_dir_recursive(const String &p_dir) override;
virtual Error rename(String p_from, String p_to) override; virtual Error rename(String p_from, String p_to) override;
virtual Error remove(String p_name) override; virtual Error remove(String p_name) override;

4
platform/android/net_socket_android.cpp
View File

@ -106,7 +106,7 @@ Error NetSocketAndroid::set_broadcasting_enabled(bool p_enabled) {
return OK; return OK;
} }
Error NetSocketAndroid::join_multicast_group(const IPAddress &p_multi_address, String p_if_name) { Error NetSocketAndroid::join_multicast_group(const IPAddress &p_multi_address, const String &p_if_name) {
Error err = NetSocketPosix::join_multicast_group(p_multi_address, p_if_name); Error err = NetSocketPosix::join_multicast_group(p_multi_address, p_if_name);
if (err != OK) { if (err != OK) {
return err; return err;
@ -120,7 +120,7 @@ Error NetSocketAndroid::join_multicast_group(const IPAddress &p_multi_address, S
return OK; return OK;
} }
Error NetSocketAndroid::leave_multicast_group(const IPAddress &p_multi_address, String p_if_name) { Error NetSocketAndroid::leave_multicast_group(const IPAddress &p_multi_address, const String &p_if_name) {
Error err = NetSocketPosix::leave_multicast_group(p_multi_address, p_if_name); Error err = NetSocketPosix::leave_multicast_group(p_multi_address, p_if_name);
if (err != OK) { if (err != OK) {
return err; return err;

4
platform/android/net_socket_android.h
View File

@ -67,8 +67,8 @@ public:
virtual void close(); virtual void close();
virtual Error set_broadcasting_enabled(bool p_enabled); virtual Error set_broadcasting_enabled(bool p_enabled);
virtual Error join_multicast_group(const IPAddress &p_multi_address, String p_if_name); virtual Error join_multicast_group(const IPAddress &p_multi_address, const String &p_if_name);
virtual Error leave_multicast_group(const IPAddress &p_multi_address, String p_if_name); virtual Error leave_multicast_group(const IPAddress &p_multi_address, const String &p_if_name);
NetSocketAndroid() {} NetSocketAndroid() {}
~NetSocketAndroid(); ~NetSocketAndroid();

4
platform/android/os_android.cpp
View File

@ -162,7 +162,7 @@ Vector<String> OS_Android::get_granted_permissions() const {
return godot_java->get_granted_permissions(); return godot_java->get_granted_permissions();
} }
Error OS_Android::open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path, String *r_resolved_path) { Error OS_Android::open_dynamic_library(const String &p_path, void *&p_library_handle, bool p_also_set_library_path, String *r_resolved_path) {
String path = p_path; String path = p_path;
bool so_file_exists = true; bool so_file_exists = true;
if (!FileAccess::exists(path)) { if (!FileAccess::exists(path)) {
@ -338,7 +338,7 @@ void OS_Android::main_loop_focusin() {
audio_driver_android.set_pause(false); audio_driver_android.set_pause(false);
} }
Error OS_Android::shell_open(String p_uri) { Error OS_Android::shell_open(const String &p_uri) {
return godot_io_java->open_uri(p_uri); return godot_io_java->open_uri(p_uri);
} }

4
platform/android/os_android.h
View File

@ -113,7 +113,7 @@ public:
virtual void alert(const String &p_alert, const String &p_title) override; virtual void alert(const String &p_alert, const String &p_title) override;
virtual Error open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path = false, String *r_resolved_path = nullptr) override; virtual Error open_dynamic_library(const String &p_path, void *&p_library_handle, bool p_also_set_library_path = false, String *r_resolved_path = nullptr) override;
virtual String get_name() const override; virtual String get_name() const override;
virtual String get_distribution_name() const override; virtual String get_distribution_name() const override;
@ -134,7 +134,7 @@ public:
void set_native_window(ANativeWindow *p_native_window); void set_native_window(ANativeWindow *p_native_window);
ANativeWindow *get_native_window() const; ANativeWindow *get_native_window() const;
virtual Error shell_open(String p_uri) override; virtual Error shell_open(const String &p_uri) override;
virtual Vector<String> get_system_fonts() const override; virtual Vector<String> get_system_fonts() const override;
virtual String get_system_font_path(const String &p_font_name, int p_weight = 400, int p_stretch = 100, bool p_italic = false) const override; virtual String get_system_font_path(const String &p_font_name, int p_weight = 400, int p_stretch = 100, bool p_italic = false) const override;

6
platform/ios/os_ios.h
View File

@ -103,16 +103,16 @@ public:
virtual Vector<String> get_system_font_path_for_text(const String &p_font_name, const String &p_text, const String &p_locale = String(), const String &p_script = String(), int p_weight = 400, int p_stretch = 100, bool p_italic = false) const override; virtual Vector<String> get_system_font_path_for_text(const String &p_font_name, const String &p_text, const String &p_locale = String(), const String &p_script = String(), int p_weight = 400, int p_stretch = 100, bool p_italic = false) const override;
virtual String get_system_font_path(const String &p_font_name, int p_weight = 400, int p_stretch = 100, bool p_italic = false) const override; virtual String get_system_font_path(const String &p_font_name, int p_weight = 400, int p_stretch = 100, bool p_italic = false) const override;
virtual Error open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path = false, String *r_resolved_path = nullptr) override; virtual Error open_dynamic_library(const String &p_path, void *&p_library_handle, bool p_also_set_library_path = false, String *r_resolved_path = nullptr) override;
virtual Error close_dynamic_library(void *p_library_handle) override; virtual Error close_dynamic_library(void *p_library_handle) override;
virtual Error get_dynamic_library_symbol_handle(void *p_library_handle, const String p_name, void *&p_symbol_handle, bool p_optional = false) override; virtual Error get_dynamic_library_symbol_handle(void *p_library_handle, const String &p_name, void *&p_symbol_handle, bool p_optional = false) override;
virtual String get_name() const override; virtual String get_name() const override;
virtual String get_distribution_name() const override; virtual String get_distribution_name() const override;
virtual String get_version() const override; virtual String get_version() const override;
virtual String get_model_name() const override; virtual String get_model_name() const override;
virtual Error shell_open(String p_uri) override; virtual Error shell_open(const String &p_uri) override;
virtual String get_user_data_dir() const override; virtual String get_user_data_dir() const override;

6
platform/ios/os_ios.mm
View File

@ -219,7 +219,7 @@ _FORCE_INLINE_ String OS_IOS::get_framework_executable(const String &p_path) {
return p_path; return p_path;
} }
Error OS_IOS::open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path, String *r_resolved_path) { Error OS_IOS::open_dynamic_library(const String &p_path, void *&p_library_handle, bool p_also_set_library_path, String *r_resolved_path) {
if (p_path.length() == 0) { if (p_path.length() == 0) {
// Static xcframework. // Static xcframework.
p_library_handle = RTLD_SELF; p_library_handle = RTLD_SELF;
@ -272,7 +272,7 @@ Error OS_IOS::close_dynamic_library(void *p_library_handle) {
return OS_Unix::close_dynamic_library(p_library_handle); return OS_Unix::close_dynamic_library(p_library_handle);
} }
Error OS_IOS::get_dynamic_library_symbol_handle(void *p_library_handle, const String p_name, void *&p_symbol_handle, bool p_optional) { Error OS_IOS::get_dynamic_library_symbol_handle(void *p_library_handle, const String &p_name, void *&p_symbol_handle, bool p_optional) {
if (p_library_handle == RTLD_SELF) { if (p_library_handle == RTLD_SELF) {
void **ptr = OS_IOS::dynamic_symbol_lookup_table.getptr(p_name); void **ptr = OS_IOS::dynamic_symbol_lookup_table.getptr(p_name);
if (ptr) { if (ptr) {
@ -305,7 +305,7 @@ String OS_IOS::get_model_name() const {
return OS_Unix::get_model_name(); return OS_Unix::get_model_name();
} }
Error OS_IOS::shell_open(String p_uri) { Error OS_IOS::shell_open(const String &p_uri) {
NSString *urlPath = [[NSString alloc] initWithUTF8String:p_uri.utf8().get_data()]; NSString *urlPath = [[NSString alloc] initWithUTF8String:p_uri.utf8().get_data()];
NSURL *url = [NSURL URLWithString:urlPath]; NSURL *url = [NSURL URLWithString:urlPath];

2
platform/linuxbsd/os_linuxbsd.cpp
View File

@ -486,7 +486,7 @@ Vector<String> OS_LinuxBSD::lspci_get_device_value(Vector<String> vendor_device_
return values; return values;
} }
Error OS_LinuxBSD::shell_open(String p_uri) { Error OS_LinuxBSD::shell_open(const String &p_uri) {
Error ok; Error ok;
int err_code; int err_code;
List<String> args; List<String> args;

2
platform/linuxbsd/os_linuxbsd.h
View File

@ -118,7 +118,7 @@ public:
virtual String get_system_dir(SystemDir p_dir, bool p_shared_storage = true) const override; virtual String get_system_dir(SystemDir p_dir, bool p_shared_storage = true) const override;
virtual Error shell_open(String p_uri) override; virtual Error shell_open(const String &p_uri) override;
virtual String get_unique_id() const override; virtual String get_unique_id() const override;
virtual String get_processor_name() const override; virtual String get_processor_name() const override;

4
platform/macos/os_macos.h
View File

@ -85,7 +85,7 @@ public:
virtual void alert(const String &p_alert, const String &p_title = "ALERT!") override; virtual void alert(const String &p_alert, const String &p_title = "ALERT!") override;
virtual Error open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path = false, String *r_resolved_path = nullptr) override; virtual Error open_dynamic_library(const String &p_path, void *&p_library_handle, bool p_also_set_library_path = false, String *r_resolved_path = nullptr) override;
virtual MainLoop *get_main_loop() const override; virtual MainLoop *get_main_loop() const override;
@ -98,7 +98,7 @@ public:
virtual String get_system_dir(SystemDir p_dir, bool p_shared_storage = true) const override; virtual String get_system_dir(SystemDir p_dir, bool p_shared_storage = true) const override;
virtual Error shell_open(String p_uri) override; virtual Error shell_open(const String &p_uri) override;
virtual Error shell_show_in_file_manager(String p_path, bool p_open_folder) override; virtual Error shell_show_in_file_manager(String p_path, bool p_open_folder) override;
virtual String get_locale() const override; virtual String get_locale() const override;

4
platform/macos/os_macos.mm
View File

@ -217,7 +217,7 @@ _FORCE_INLINE_ String OS_MacOS::get_framework_executable(const String &p_path) {
return p_path; return p_path;
} }
Error OS_MacOS::open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path, String *r_resolved_path) { Error OS_MacOS::open_dynamic_library(const String &p_path, void *&p_library_handle, bool p_also_set_library_path, String *r_resolved_path) {
String path = get_framework_executable(p_path); String path = get_framework_executable(p_path);
if (!FileAccess::exists(path)) { if (!FileAccess::exists(path)) {
@ -353,7 +353,7 @@ Error OS_MacOS::shell_show_in_file_manager(String p_path, bool p_open_folder) {
return OK; return OK;
} }
Error OS_MacOS::shell_open(String p_uri) { Error OS_MacOS::shell_open(const String &p_uri) {
NSString *string = [NSString stringWithUTF8String:p_uri.utf8().get_data()]; NSString *string = [NSString stringWithUTF8String:p_uri.utf8().get_data()];
NSURL *uri = [[NSURL alloc] initWithString:string]; NSURL *uri = [[NSURL alloc] initWithString:string];
if (!uri || !uri.scheme || [uri.scheme isEqual:@"file"]) { if (!uri || !uri.scheme || [uri.scheme isEqual:@"file"]) {

4
platform/web/os_web.cpp
View File

@ -150,7 +150,7 @@ String OS_Web::get_executable_path() const {
return OS::get_executable_path(); return OS::get_executable_path();
} }
Error OS_Web::shell_open(String p_uri) { Error OS_Web::shell_open(const String &p_uri) {
// Open URI in a new tab, browser will deal with it by protocol. // Open URI in a new tab, browser will deal with it by protocol.
godot_js_os_shell_open(p_uri.utf8().get_data()); godot_js_os_shell_open(p_uri.utf8().get_data());
return OK; return OK;
@ -239,7 +239,7 @@ bool OS_Web::is_userfs_persistent() const {
return idb_available; return idb_available;
} }
Error OS_Web::open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path, String *r_resolved_path) { Error OS_Web::open_dynamic_library(const String &p_path, void *&p_library_handle, bool p_also_set_library_path, String *r_resolved_path) {
String path = p_path.get_file(); String path = p_path.get_file();
p_library_handle = dlopen(path.utf8().get_data(), RTLD_NOW); p_library_handle = dlopen(path.utf8().get_data(), RTLD_NOW);
ERR_FAIL_NULL_V_MSG(p_library_handle, ERR_CANT_OPEN, vformat("Can't open dynamic library: %s. Error: %s.", p_path, dlerror())); ERR_FAIL_NULL_V_MSG(p_library_handle, ERR_CANT_OPEN, vformat("Can't open dynamic library: %s. Error: %s.", p_path, dlerror()));

4
platform/web/os_web.h
View File

@ -89,7 +89,7 @@ public:
int get_default_thread_pool_size() const override { return 1; } int get_default_thread_pool_size() const override { return 1; }
String get_executable_path() const override; String get_executable_path() const override;
Error shell_open(String p_uri) override; Error shell_open(const String &p_uri) override;
String get_name() const override; String get_name() const override;
// Override default OS implementation which would block the main thread with delay_usec. // Override default OS implementation which would block the main thread with delay_usec.
@ -107,7 +107,7 @@ public:
void alert(const String &p_alert, const String &p_title = "ALERT!") override; void alert(const String &p_alert, const String &p_title = "ALERT!") override;
Error open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path = false, String *r_resolved_path = nullptr) override; Error open_dynamic_library(const String &p_path, void *&p_library_handle, bool p_also_set_library_path = false, String *r_resolved_path = nullptr) override;
void resume_audio(); void resume_audio();

6
platform/windows/os_windows.cpp
View File

@ -352,7 +352,7 @@ void debug_dynamic_library_check_dependencies(const String &p_root_path, const S
} }
#endif #endif
Error OS_Windows::open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path, String *r_resolved_path) { Error OS_Windows::open_dynamic_library(const String &p_path, void *&p_library_handle, bool p_also_set_library_path, String *r_resolved_path) {
String path = p_path.replace("/", "\\"); String path = p_path.replace("/", "\\");
if (!FileAccess::exists(path)) { if (!FileAccess::exists(path)) {
@ -418,7 +418,7 @@ Error OS_Windows::close_dynamic_library(void *p_library_handle) {
return OK; return OK;
} }
Error OS_Windows::get_dynamic_library_symbol_handle(void *p_library_handle, const String p_name, void *&p_symbol_handle, bool p_optional) { Error OS_Windows::get_dynamic_library_symbol_handle(void *p_library_handle, const String &p_name, void *&p_symbol_handle, bool p_optional) {
p_symbol_handle = (void *)GetProcAddress((HMODULE)p_library_handle, p_name.utf8().get_data()); p_symbol_handle = (void *)GetProcAddress((HMODULE)p_library_handle, p_name.utf8().get_data());
if (!p_symbol_handle) { if (!p_symbol_handle) {
if (!p_optional) { if (!p_optional) {
@ -1333,7 +1333,7 @@ String OS_Windows::get_stdin_string() {
return String(); return String();
} }
Error OS_Windows::shell_open(String p_uri) { Error OS_Windows::shell_open(const String &p_uri) {
INT_PTR ret = (INT_PTR)ShellExecuteW(nullptr, nullptr, (LPCWSTR)(p_uri.utf16().get_data()), nullptr, nullptr, SW_SHOWNORMAL); INT_PTR ret = (INT_PTR)ShellExecuteW(nullptr, nullptr, (LPCWSTR)(p_uri.utf16().get_data()), nullptr, nullptr, SW_SHOWNORMAL);
if (ret > 32) { if (ret > 32) {
return OK; return OK;

6
platform/windows/os_windows.h
View File

@ -155,9 +155,9 @@ public:
virtual Error get_entropy(uint8_t *r_buffer, int p_bytes) override; virtual Error get_entropy(uint8_t *r_buffer, int p_bytes) override;
virtual Error open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path = false, String *r_resolved_path = nullptr) override; virtual Error open_dynamic_library(const String &p_path, void *&p_library_handle, bool p_also_set_library_path = false, String *r_resolved_path = nullptr) override;
virtual Error close_dynamic_library(void *p_library_handle) override; virtual Error close_dynamic_library(void *p_library_handle) override;
virtual Error get_dynamic_library_symbol_handle(void *p_library_handle, const String p_name, void *&p_symbol_handle, bool p_optional = false) override; virtual Error get_dynamic_library_symbol_handle(void *p_library_handle, const String &p_name, void *&p_symbol_handle, bool p_optional = false) override;
virtual MainLoop *get_main_loop() const override; virtual MainLoop *get_main_loop() const override;
@ -213,7 +213,7 @@ public:
virtual String get_unique_id() const override; virtual String get_unique_id() const override;
virtual Error shell_open(String p_uri) override; virtual Error shell_open(const String &p_uri) override;
virtual Error shell_show_in_file_manager(String p_path, bool p_open_folder) override; virtual Error shell_show_in_file_manager(String p_path, bool p_open_folder) override;
void run(); void run();

12
tests/core/test_crypto.h
View File

@ -39,13 +39,13 @@ namespace TestCrypto {
class _MockCrypto : public Crypto { class _MockCrypto : public Crypto {
virtual PackedByteArray generate_random_bytes(int p_bytes) { return PackedByteArray(); } virtual PackedByteArray generate_random_bytes(int p_bytes) { return PackedByteArray(); }
virtual Ref<CryptoKey> generate_rsa(int p_bytes) { return nullptr; } virtual Ref<CryptoKey> generate_rsa(int p_bytes) { return nullptr; }
virtual Ref<X509Certificate> generate_self_signed_certificate(Ref<CryptoKey> p_key, String p_issuer_name, String p_not_before, String p_not_after) { return nullptr; } virtual Ref<X509Certificate> generate_self_signed_certificate(Ref<CryptoKey> p_key, const String &p_issuer_name, const String &p_not_before, const String &p_not_after) { return nullptr; }
virtual Vector<uint8_t> sign(HashingContext::HashType p_hash_type, Vector<uint8_t> p_hash, Ref<CryptoKey> p_key) { return Vector<uint8_t>(); } virtual Vector<uint8_t> sign(HashingContext::HashType p_hash_type, const Vector<uint8_t> &p_hash, Ref<CryptoKey> p_key) { return Vector<uint8_t>(); }
virtual bool verify(HashingContext::HashType p_hash_type, Vector<uint8_t> p_hash, Vector<uint8_t> p_signature, Ref<CryptoKey> p_key) { return false; } virtual bool verify(HashingContext::HashType p_hash_type, const Vector<uint8_t> &p_hash, const Vector<uint8_t> &p_signature, Ref<CryptoKey> p_key) { return false; }
virtual Vector<uint8_t> encrypt(Ref<CryptoKey> p_key, Vector<uint8_t> p_plaintext) { return Vector<uint8_t>(); } virtual Vector<uint8_t> encrypt(Ref<CryptoKey> p_key, const Vector<uint8_t> &p_plaintext) { return Vector<uint8_t>(); }
virtual Vector<uint8_t> decrypt(Ref<CryptoKey> p_key, Vector<uint8_t> p_ciphertext) { return Vector<uint8_t>(); } virtual Vector<uint8_t> decrypt(Ref<CryptoKey> p_key, const Vector<uint8_t> &p_ciphertext) { return Vector<uint8_t>(); }
virtual PackedByteArray hmac_digest(HashingContext::HashType p_hash_type, PackedByteArray p_key, PackedByteArray p_msg) { return PackedByteArray(); } virtual PackedByteArray hmac_digest(HashingContext::HashType p_hash_type, const PackedByteArray &p_key, const PackedByteArray &p_msg) { return PackedByteArray(); }
}; };
PackedByteArray raw_to_pba(const uint8_t *arr, size_t len) { PackedByteArray raw_to_pba(const uint8_t *arr, size_t len) {