diff options
| author | Thomas Herzog <thomas.herzog@mail.com> | 2017-08-31 23:27:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-31 23:27:28 +0200 |
| commit | 909c1fd120b58155e4f7b78d60b19a9f13528e07 (patch) | |
| tree | 28059a6c24e2d11818911a6ad12847205607bdb1 | |
| parent | e8eb88c643946dc62c763d8da2af3083a1496742 (diff) | |
| parent | 6151adfe8c9e00d112ce1b6e2be63f75c740e3ea (diff) | |
Merge pull request #10837 from touilleMan/fix-godot_string_find_last-name
Correct GDnative's godot_string_find_last method name
| -rw-r--r-- | modules/gdnative/godot/string.cpp | 2 | ||||
| -rw-r--r-- | modules/gdnative/godot/string.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/gdnative/godot/string.cpp b/modules/gdnative/godot/string.cpp index 3790b6ea95..1282cf95e5 100644 --- a/modules/gdnative/godot/string.cpp +++ b/modules/gdnative/godot/string.cpp @@ -232,7 +232,7 @@ godot_int GDAPI godot_string_findn_from(const godot_string *p_self, godot_string return self->findn(*what, p_from); } -godot_int GDAPI find_last(const godot_string *p_self, godot_string p_what) { +godot_int GDAPI godot_string_find_last(const godot_string *p_self, godot_string p_what) { const String *self = (const String *)p_self; String *what = (String *)&p_what; diff --git a/modules/gdnative/godot/string.h b/modules/gdnative/godot/string.h index d691744453..128448e64e 100644 --- a/modules/gdnative/godot/string.h +++ b/modules/gdnative/godot/string.h @@ -82,7 +82,7 @@ godot_int GDAPI godot_string_findmk_from(const godot_string *p_self, const godot godot_int GDAPI godot_string_findmk_from_in_place(const godot_string *p_self, const godot_array *p_keys, godot_int p_from, godot_int *r_key); 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_int GDAPI godot_string_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 *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); |