Bläddra i källkod

Match the coding style for concatenating String

Silc Lizard (Tokage) Renew 1 år sedan
förälder
incheckning
12571a1e95
2 ändrade filer med 12 tillägg och 3 borttagningar
  1. 8 2
      core/string/node_path.cpp
  2. 4 1
      scene/resources/skeleton_profile.cpp

+ 8 - 2
core/string/node_path.cpp

@@ -215,7 +215,10 @@ StringName NodePath::get_concatenated_names() const {
 		String concatenated;
 		const StringName *sn = data->path.ptr();
 		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;
 	}
@@ -230,7 +233,10 @@ StringName NodePath::get_concatenated_subnames() const {
 		String concatenated;
 		const StringName *ssn = data->subpath.ptr();
 		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;
 	}

+ 4 - 1
scene/resources/skeleton_profile.cpp

@@ -132,7 +132,10 @@ void SkeletonProfile::_validate_property(PropertyInfo &p_property) const {
 	if (p_property.name == ("root_bone") || p_property.name == ("scale_base_bone")) {
 		String hint = "";
 		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;
 	}