godotengine/godot-cpp
1
0
Fork 0
mirror of https://github.com/godotengine/godot-cpp.git synced 2026-01-05 02:10:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename interface to gdn_interface because it's a defined keyword under windows

Browse Source
This commit is contained in:
Bastiaan Olij
2021-10-28 19:20:56 +11:00
parent 5148aad3d4
commit ef528d3a86
19 changed files with 246 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/variant/char_string.cpp
View File

@@ -75,25 +75,25 @@ CharWideString::~CharWideString() {
// It's easier to have them written in C++ directly than in a Python script that generates them.
String::String(const char *from) {
internal::interface->string_new_with_utf8_chars(ptr(), from);
internal::gdn_interface->string_new_with_utf8_chars(ptr(), from);
}
String::String(const wchar_t *from) {
internal::interface->string_new_with_wide_chars(ptr(), from);
internal::gdn_interface->string_new_with_wide_chars(ptr(), from);
}
String::String(const char16_t *from) {
internal::interface->string_new_with_utf16_chars(ptr(), from);
internal::gdn_interface->string_new_with_utf16_chars(ptr(), from);
}
String::String(const char32_t *from) {
internal::interface->string_new_with_utf32_chars(ptr(), from);
internal::gdn_interface->string_new_with_utf32_chars(ptr(), from);
}
CharString String::utf8() const {
int size = internal::interface->string_to_utf8_chars(ptr(), nullptr, 0);
int size = internal::gdn_interface->string_to_utf8_chars(ptr(), nullptr, 0);
char *cstr = memnew_arr(char, size + 1);
internal::interface->string_to_utf8_chars(ptr(), cstr, size + 1);
internal::gdn_interface->string_to_utf8_chars(ptr(), cstr, size + 1);
cstr[size] = '\0';
@@ -101,9 +101,9 @@ CharString String::utf8() const {
}
CharString String::ascii() const {
int size = internal::interface->string_to_latin1_chars(ptr(), nullptr, 0);
int size = internal::gdn_interface->string_to_latin1_chars(ptr(), nullptr, 0);
char *cstr = memnew_arr(char, size + 1);
internal::interface->string_to_latin1_chars(ptr(), cstr, size + 1);
internal::gdn_interface->string_to_latin1_chars(ptr(), cstr, size + 1);
cstr[size] = '\0';
@@ -111,9 +111,9 @@ CharString String::ascii() const {
}
Char16String String::utf16() const {
int size = internal::interface->string_to_utf16_chars(ptr(), nullptr, 0);
int size = internal::gdn_interface->string_to_utf16_chars(ptr(), nullptr, 0);
char16_t *cstr = memnew_arr(char16_t, size + 1);
internal::interface->string_to_utf16_chars(ptr(), cstr, size + 1);
internal::gdn_interface->string_to_utf16_chars(ptr(), cstr, size + 1);
cstr[size] = '\0';
@@ -121,9 +121,9 @@ Char16String String::utf16() const {
}
Char32String String::utf32() const {
int size = internal::interface->string_to_utf32_chars(ptr(), nullptr, 0);
int size = internal::gdn_interface->string_to_utf32_chars(ptr(), nullptr, 0);
char32_t *cstr = memnew_arr(char32_t, size + 1);
internal::interface->string_to_utf32_chars(ptr(), cstr, size + 1);
internal::gdn_interface->string_to_utf32_chars(ptr(), cstr, size + 1);
cstr[size] = '\0';
@@ -131,9 +131,9 @@ Char32String String::utf32() const {
}
CharWideString String::wide_string() const {
int size = internal::interface->string_to_wide_chars(ptr(), nullptr, 0);
int size = internal::gdn_interface->string_to_wide_chars(ptr(), nullptr, 0);
wchar_t *cstr = memnew_arr(wchar_t, size + 1);
internal::interface->string_to_wide_chars(ptr(), cstr, size + 1);
internal::gdn_interface->string_to_wide_chars(ptr(), cstr, size + 1);
cstr[size] = '\0';
@@ -193,11 +193,11 @@ bool String::operator!=(const char32_t *p_str) const {
}
const char32_t &String::operator[](int p_index) const {
return *internal::interface->string_operator_index_const((GDNativeStringPtr)this, p_index);
return *internal::gdn_interface->string_operator_index_const((GDNativeStringPtr)this, p_index);
}
char32_t &String::operator[](int p_index) {
return *internal::interface->string_operator_index((GDNativeStringPtr)this, p_index);
return *internal::gdn_interface->string_operator_index((GDNativeStringPtr)this, p_index);
}
bool operator==(const char *p_chr, const String &p_str) {