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

Merge pull request #92933 from TokageItLab/match-concatenating 

Match the coding style for concatenating String
This commit is contained in:
Rémi Verschelde 2024-08-26 22:44:59 +02:00
parent a5e157dd37 12571a1e95
commit 8dad1ba482
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/string/node_path.cpp
View File

@ -215,7 +215,10 @@ StringName NodePath::get_concatenated_names() const {
String concatenated; String concatenated;
const StringName *sn = data->path.ptr(); const StringName *sn = data->path.ptr();
for (int i = 0; i < pc; i++) { for (int i = 0; i < pc; i++) {
concatenated += i == 0 ? sn[i].operator String() : "/" + sn[i]; if (i > 0) {
concatenated += "/";
}
concatenated += sn[i].operator String();
} }
data->concatenated_path = concatenated; data->concatenated_path = concatenated;
} }
@ -230,7 +233,10 @@ StringName NodePath::get_concatenated_subnames() const {
String concatenated; String concatenated;
const StringName *ssn = data->subpath.ptr(); const StringName *ssn = data->subpath.ptr();
for (int i = 0; i < spc; i++) { for (int i = 0; i < spc; i++) {
concatenated += i == 0 ? ssn[i].operator String() : ":" + ssn[i]; if (i > 0) {
concatenated += ":";
}
concatenated += ssn[i].operator String();
} }
data->concatenated_subpath = concatenated; data->concatenated_subpath = concatenated;
} }

5
scene/resources/skeleton_profile.cpp
View File

@ -132,7 +132,10 @@ void SkeletonProfile::_validate_property(PropertyInfo &p_property) const {
if (p_property.name == ("root_bone") || p_property.name == ("scale_base_bone")) { if (p_property.name == ("root_bone") || p_property.name == ("scale_base_bone")) {
String hint = ""; String hint = "";
for (int i = 0; i < bones.size(); i++) { for (int i = 0; i < bones.size(); i++) {
hint += i == 0 ? String(bones[i].bone_name) : "," + String(bones[i].bone_name); if (i > 0) {
hint += ",";
}
hint += String(bones[i].bone_name);
} }
p_property.hint_string = hint; p_property.hint_string = hint;
} }