From 428f03cf06d3841b2a593f46aa42912ef5c82f3c Mon Sep 17 00:00:00 2001 From: "Wilson E. Alvarez" Date: Sat, 12 Aug 2017 12:52:50 -0400 Subject: Updated function argument names --- modules/gdnative/gdnative.h | 2 +- modules/gdnative/godot/string.cpp | 12 ++++++------ modules/gdnative/godot/string.h | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'modules/gdnative') diff --git a/modules/gdnative/gdnative.h b/modules/gdnative/gdnative.h index b03866f432..003ec46a25 100644 --- a/modules/gdnative/gdnative.h +++ b/modules/gdnative/gdnative.h @@ -137,7 +137,7 @@ public: bool initialize(); bool terminate(); - Variant call_native(StringName p_call_type, StringName p_procedure_name, Array p_arguments = Array()); + Variant call_native(StringName p_native_call_type, StringName p_procedure_name, Array p_arguments = Array()); void call_native_raw(StringName p_raw_call_type, StringName p_procedure_name, void *data, int num_args, void **args, void *r_return); }; diff --git a/modules/gdnative/godot/string.cpp b/modules/gdnative/godot/string.cpp index 76cf1fba12..2235c12a2d 100644 --- a/modules/gdnative/godot/string.cpp +++ b/modules/gdnative/godot/string.cpp @@ -63,13 +63,13 @@ void GDAPI godot_string_new_unicode_data(godot_string *r_dest, const wchar_t *p_ memnew_placement(dest, String(p_contents, p_size)); } -void GDAPI godot_string_get_data(const godot_string *p_self, char *r_dest, int *p_size) { +void GDAPI godot_string_get_data(const godot_string *p_self, char *p_dest, int *p_size) { String *self = (String *)p_self; if (p_size != NULL) { *p_size = self->utf8().length(); } - if (r_dest != NULL) { - memcpy(r_dest, self->utf8().get_data(), *p_size); + if (p_dest != NULL) { + memcpy(p_dest, self->utf8().get_data(), *p_size); } } @@ -277,11 +277,11 @@ godot_int GDAPI godot_string_hex_to_int_without_prefix(const godot_string *p_sel return self->hex_to_int(true); } -godot_string GDAPI godot_string_insert(const godot_string *p_self, godot_int at_pos, godot_string p_content) { +godot_string GDAPI godot_string_insert(const godot_string *p_self, godot_int p_at_pos, godot_string p_string) { const String *self = (const String *)p_self; - String *content = (String *)&p_content; + String *content = (String *)&p_string; godot_string result; - memnew_placement(&result, String(self->insert(at_pos, *content))); + memnew_placement(&result, String(self->insert(p_at_pos, *content))); return result; } diff --git a/modules/gdnative/godot/string.h b/modules/gdnative/godot/string.h index bfe66aa5ec..c901ce36e6 100644 --- a/modules/gdnative/godot/string.h +++ b/modules/gdnative/godot/string.h @@ -83,8 +83,8 @@ godot_int GDAPI godot_string_findmk_from_in_place(const godot_string *p_self, co godot_int GDAPI godot_string_findn(const godot_string *p_self, godot_string p_what); godot_int GDAPI godot_string_findn_from(const godot_string *p_self, godot_string p_what, godot_int p_from); godot_int GDAPI find_last(const godot_string *p_self, godot_string p_what); -godot_string GDAPI godot_string_format(const godot_string *p_self, const godot_variant *values); -godot_string GDAPI godot_string_format_with_custom_placeholder(const godot_string *p_self, const godot_variant *values, const char *placeholder); +godot_string GDAPI godot_string_format(const godot_string *p_self, const godot_variant *p_values); +godot_string GDAPI godot_string_format_with_custom_placeholder(const godot_string *p_self, const godot_variant *p_values, const char *p_placeholder); godot_string GDAPI godot_string_hex_encode_buffer(const uint8_t *p_buffer, godot_int p_len); godot_int GDAPI godot_string_hex_to_int(const godot_string *p_self); godot_int GDAPI godot_string_hex_to_int_without_prefix(const godot_string *p_self); -- cgit v1.2.3