Browse Source

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

Remove unused `has_slashes` from NodePath
Rémi Verschelde 2 years ago
parent
commit
45b8274dc6
2 changed files with 0 additions and 6 deletions
  1. 0 5
      core/string/node_path.cpp
  2. 0 1
      core/string/node_path.h

+ 0 - 5
core/string/node_path.cpp

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

+ 0 - 1
core/string/node_path.h

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