diff options
Diffstat (limited to 'core/node_path.cpp')
-rw-r--r-- | core/node_path.cpp | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/core/node_path.cpp b/core/node_path.cpp index f8001a354a..0e4f2eeaf0 100644 --- a/core/node_path.cpp +++ b/core/node_path.cpp @@ -33,7 +33,6 @@ #include "core/print_string.h" void NodePath::_update_hash_cache() const { - uint32_t h = data->absolute ? 1 : 0; int pc = data->path.size(); const StringName *sn = data->path.ptr(); @@ -51,7 +50,6 @@ void NodePath::_update_hash_cache() const { } void NodePath::prepend_period() { - if (data->path.size() && data->path[0].operator String() != ".") { data->path.insert(0, "."); data->hash_cache_valid = false; @@ -59,51 +57,43 @@ void NodePath::prepend_period() { } bool NodePath::is_absolute() const { - if (!data) return false; return data->absolute; } int NodePath::get_name_count() const { - if (!data) return 0; return data->path.size(); } StringName NodePath::get_name(int p_idx) const { - ERR_FAIL_COND_V(!data, StringName()); ERR_FAIL_INDEX_V(p_idx, data->path.size(), StringName()); return data->path[p_idx]; } int NodePath::get_subname_count() const { - if (!data) return 0; return data->subpath.size(); } StringName NodePath::get_subname(int p_idx) const { - ERR_FAIL_COND_V(!data, StringName()); ERR_FAIL_INDEX_V(p_idx, data->subpath.size(), StringName()); return data->subpath[p_idx]; } void NodePath::unref() { - if (data && data->refcount.unref()) { - memdelete(data); } data = nullptr; } bool NodePath::operator==(const NodePath &p_path) const { - if (data == p_path.data) return true; @@ -129,7 +119,6 @@ bool NodePath::operator==(const NodePath &p_path) const { const StringName *r_path_ptr = p_path.data->path.ptr(); for (int i = 0; i < path_size; i++) { - if (l_path_ptr[i] != r_path_ptr[i]) return false; } @@ -138,7 +127,6 @@ bool NodePath::operator==(const NodePath &p_path) const { const StringName *r_subpath_ptr = p_path.data->subpath.ptr(); for (int i = 0; i < subpath_size; i++) { - if (l_subpath_ptr[i] != r_subpath_ptr[i]) return false; } @@ -146,25 +134,21 @@ bool NodePath::operator==(const NodePath &p_path) const { return true; } bool NodePath::operator!=(const NodePath &p_path) const { - return (!(*this == p_path)); } void NodePath::operator=(const NodePath &p_path) { - if (this == &p_path) return; unref(); if (p_path.data && p_path.data->refcount.ref()) { - data = p_path.data; } } NodePath::operator String() const { - if (!data) return String(); @@ -173,14 +157,12 @@ NodePath::operator String() const { ret = "/"; for (int i = 0; i < data->path.size(); i++) { - if (i > 0) ret += "/"; ret += data->path[i].operator String(); } for (int i = 0; i < data->subpath.size(); i++) { - ret += ":" + data->subpath[i].operator String(); } @@ -188,14 +170,12 @@ NodePath::operator String() const { } Vector<StringName> NodePath::get_names() const { - if (data) return data->path; return Vector<StringName>(); } Vector<StringName> NodePath::get_subnames() const { - if (data) return data->subpath; return Vector<StringName>(); @@ -217,7 +197,6 @@ StringName NodePath::get_concatenated_subnames() const { } NodePath NodePath::rel_path_to(const NodePath &p_np) const { - ERR_FAIL_COND_V(!is_absolute(), NodePath()); ERR_FAIL_COND_V(!p_np.is_absolute(), NodePath()); @@ -242,12 +221,10 @@ NodePath NodePath::rel_path_to(const NodePath &p_np) const { Vector<StringName> relpath; for (int i = src_dirs.size() - 1; i > common_parent; i--) { - relpath.push_back(".."); } for (int i = common_parent + 1; i < dst_dirs.size(); i++) { - relpath.push_back(dst_dirs[i]); } @@ -258,7 +235,6 @@ NodePath NodePath::rel_path_to(const NodePath &p_np) const { } NodePath NodePath::get_as_property_path() const { - if (!data || !data->path.size()) { return *this; } else { @@ -280,7 +256,6 @@ bool NodePath::is_empty() const { } void NodePath::simplify() { - if (!data) return; for (int i = 0; i < data->path.size(); i++) { @@ -304,7 +279,6 @@ void NodePath::simplify() { } NodePath NodePath::simplified() const { - NodePath np = *this; np.simplify(); return np; @@ -355,13 +329,10 @@ NodePath::NodePath(const String &p_path) { int subpath_pos = path.find(":"); if (subpath_pos != -1) { - int from = subpath_pos + 1; for (int i = from; i <= path.length(); i++) { - if (path[i] == ':' || path[i] == 0) { - String str = path.substr(from, i - from); if (str == "") { if (path[i] == 0) @@ -379,13 +350,10 @@ 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++; @@ -411,11 +379,8 @@ NodePath::NodePath(const String &p_path) { int slice = 0; for (int i = (int)absolute; i < path.length() + 1; i++) { - if (path[i] == '/' || path[i] == 0) { - if (!last_is_slash) { - String name = path.substr(from, i - from); ERR_FAIL_INDEX(slice, data->path.size()); data->path.write[slice++] = name; |