asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #72528 from aaronfranke/dont-have-slashes

Browse source 
Remove unused `has_slashes` from NodePath
This commit is contained in:
Rémi Verschelde 2023-02-02 09:36:27 +01:00
commit 45b8274dc6
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/string/node_path.cpp
View file

@ -339,7 +339,6 @@ NodePath::NodePath(const Vector<StringName> &p_path, bool p_absolute) {
data->refcount.init(); data->refcount.init();
data->absolute = p_absolute; data->absolute = p_absolute;
data->path = p_path; data->path = p_path;
data->has_slashes = true;
data->hash_cache_valid = false; data->hash_cache_valid = false;
} }
@ -353,7 +352,6 @@ NodePath::NodePath(const Vector<StringName> &p_path, const Vector<StringName> &p
data->absolute = p_absolute; data->absolute = p_absolute;
data->path = p_path; data->path = p_path;
data->subpath = p_subpath; data->subpath = p_subpath;
data->has_slashes = true;
data->hash_cache_valid = false; data->hash_cache_valid = false;
} }
@ -373,7 +371,6 @@ NodePath::NodePath(const String &p_path) {
bool absolute = (path[0] == '/'); bool absolute = (path[0] == '/');
bool last_is_slash = true; bool last_is_slash = true;
bool has_slashes = false;
int slices = 0; int slices = 0;
int subpath_pos = path.find(":"); int subpath_pos = path.find(":");
@ -402,7 +399,6 @@ NodePath::NodePath(const String &p_path) {
for (int i = (int)absolute; i < path.length(); i++) { for (int i = (int)absolute; i < path.length(); i++) {
if (path[i] == '/') { if (path[i] == '/') {
last_is_slash = true; last_is_slash = true;
has_slashes = true;
} else { } else {
if (last_is_slash) { if (last_is_slash) {
slices++; slices++;
@ -419,7 +415,6 @@ NodePath::NodePath(const String &p_path) {
data = memnew(Data); data = memnew(Data);
data->refcount.init(); data->refcount.init();
data->absolute = absolute; data->absolute = absolute;
data->has_slashes = has_slashes;
data->subpath = subpath; data->subpath = subpath;
data->hash_cache_valid = false; data->hash_cache_valid = false;

1
core/string/node_path.h
View file

@ -42,7 +42,6 @@ class NodePath {
StringName concatenated_path; StringName concatenated_path;
StringName concatenated_subpath; StringName concatenated_subpath;
bool absolute; bool absolute;
bool has_slashes;
mutable bool hash_cache_valid; mutable bool hash_cache_valid;
mutable uint32_t hash_cache; mutable uint32_t hash_cache;
}; };