diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-05-21 01:06:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-21 01:06:21 +0200 |
| commit | 8adf04804550957f43c810b13fcce66dd76e5fd8 (patch) | |
| tree | 2ee58365f1092587277770ceaedfc1e35454acfd /editor/editor_node.cpp | |
| parent | f4126cc902b0cbb100bcf1b37ee15df5a8430d21 (diff) | |
| parent | 45af29da8095af16729955117a165d23e77cd740 (diff) | |
| download | redot-engine-8adf04804550957f43c810b13fcce66dd76e5fd8.tar.gz | |
Merge pull request #61194 from reduz/new-hash-set
Add a new HashSet template
Diffstat (limited to 'editor/editor_node.cpp')
| -rw-r--r-- | editor/editor_node.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index f2baaf8b5c..4998cc82e8 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -800,7 +800,7 @@ void EditorNode::_notification(int p_what) { main_editor_buttons.write[i]->add_theme_font_size_override("font_size", gui_base->get_theme_font_size(SNAME("main_button_font_size"), SNAME("EditorFonts"))); } - RBSet<String> updated_textfile_extensions; + HashSet<String> updated_textfile_extensions; bool extensions_match = true; const Vector<String> textfile_ext = ((String)(EditorSettings::get_singleton()->get("docks/filesystem/textfile_extensions"))).split(",", false); for (const String &E : textfile_ext) { @@ -1622,7 +1622,7 @@ bool EditorNode::_validate_scene_recursive(const String &p_filename, Node *p_nod return false; } -static bool _find_edited_resources(const Ref<Resource> &p_resource, RBSet<Ref<Resource>> &edited_resources) { +static bool _find_edited_resources(const Ref<Resource> &p_resource, HashSet<Ref<Resource>> &edited_resources) { if (p_resource->is_edited()) { edited_resources.insert(p_resource); return true; @@ -1659,7 +1659,7 @@ int EditorNode::_save_external_resources() { } flg |= ResourceSaver::FLAG_REPLACE_SUBRESOURCE_PATHS; - RBSet<Ref<Resource>> edited_subresources; + HashSet<Ref<Resource>> edited_subresources; int saved = 0; List<Ref<Resource>> cached; ResourceCache::get_cached_resources(&cached); @@ -3678,7 +3678,7 @@ Error EditorNode::load_scene(const String &p_scene, bool p_ignore_broken_deps, b dependency_errors.erase(lpath); // At least not self path. - for (KeyValue<String, RBSet<String>> &E : dependency_errors) { + for (KeyValue<String, HashSet<String>> &E : dependency_errors) { String txt = vformat(TTR("Scene '%s' has broken dependencies:"), E.key) + "\n"; for (const String &F : E.value) { txt += "\t" + F + "\n"; |