godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge c81774ea8a into 15ff450680

This commit is contained in:
Lukas Tenbrink 2025-02-28 01:35:55 +01:00 committed by GitHub
parent 15ff450680 c81774ea8a
commit 645c581c26
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
core/string/ustring.cpp
View File

@ -1026,45 +1026,6 @@ String String::get_with_code_lines() const {
return ret;
}
int String::get_slice_count(const String &p_splitter) const {
if (is_empty()) {
return 0;
}
if (p_splitter.is_empty()) {
return 0;
}
int pos = 0;
int slices = 1;
while ((pos = find(p_splitter, pos)) >= 0) {
slices++;
pos += p_splitter.length();
}
return slices;
}
int String::get_slice_count(const char *p_splitter) const {
if (is_empty()) {
return 0;
}
if (p_splitter == nullptr || *p_splitter == '\0') {
return 0;
}
int pos = 0;
int slices = 1;
int splitter_length = strlen(p_splitter);
while ((pos = find(p_splitter, pos)) >= 0) {
slices++;
pos += splitter_length;
}
return slices;
}
String String::get_slice(const String &p_splitter, int p_slice) const {
if (is_empty() || p_splitter.is_empty()) {
return "";

4
core/string/ustring.h
View File

@ -479,8 +479,8 @@ public:
String to_snake_case() const;
String get_with_code_lines() const;
int get_slice_count(const String &p_splitter) const;
int get_slice_count(const char *p_splitter) const;
int get_slice_count(const String &p_splitter) const { return count(p_splitter) + 1; }
int get_slice_count(const char *p_splitter) const { return count(p_splitter) + 1; }
String get_slice(const String &p_splitter, int p_slice) const;
String get_slice(const char *p_splitter, int p_slice) const;
String get_slicec(char32_t p_splitter, int p_slice) const;