Change StringName -> String conversion from operator String() to string().
This commit is contained in:
@@ -41,7 +41,7 @@ void NodePath::_update_hash_cache() const {
|
||||
}
|
||||
|
||||
void NodePath::prepend_period() {
|
||||
if (data->path.size() && data->path[0].operator String() != ".") {
|
||||
if (data->path.size() && data->path[0].string() != ".") {
|
||||
_copy_on_write();
|
||||
data->path.insert(0, ".");
|
||||
data->concatenated_path = StringName();
|
||||
@@ -236,7 +236,7 @@ StringName NodePath::get_concatenated_names() const {
|
||||
if (i > 0) {
|
||||
concatenated += "/";
|
||||
}
|
||||
concatenated += sn[i].operator String();
|
||||
concatenated += sn[i].string();
|
||||
}
|
||||
data->concatenated_path = concatenated;
|
||||
}
|
||||
@@ -254,7 +254,7 @@ StringName NodePath::get_concatenated_subnames() const {
|
||||
if (i > 0) {
|
||||
concatenated += ":";
|
||||
}
|
||||
concatenated += ssn[i].operator String();
|
||||
concatenated += ssn[i].string();
|
||||
}
|
||||
data->concatenated_subpath = concatenated;
|
||||
}
|
||||
@@ -361,10 +361,10 @@ void NodePath::simplify() {
|
||||
if (data->path.size() == 1) {
|
||||
break;
|
||||
}
|
||||
if (data->path[i].operator String() == ".") {
|
||||
if (data->path[i].string() == ".") {
|
||||
data->path.remove_at(i);
|
||||
i--;
|
||||
} else if (i > 0 && data->path[i].operator String() == ".." && data->path[i - 1].operator String() != "." && data->path[i - 1].operator String() != "..") {
|
||||
} else if (i > 0 && data->path[i].string() == ".." && data->path[i - 1].string() != "." && data->path[i - 1].string() != "..") {
|
||||
//remove both
|
||||
data->path.remove_at(i - 1);
|
||||
data->path.remove_at(i - 1);
|
||||
|
||||
Reference in New Issue
Block a user