diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp index 4d269c6a0fba..bb283cd5b9a4 100644 --- a/core/config/project_settings.cpp +++ b/core/config/project_settings.cpp @@ -1514,9 +1514,9 @@ void ProjectSettings::_bind_methods() { void ProjectSettings::_add_builtin_input_map() { if (InputMap::get_singleton()) { - HashMap>> builtins = InputMap::get_singleton()->get_builtins(); + const HashMap>> builtins = HashMap>>(InputMap::get_singleton()->get_builtins()); - for (KeyValue>> &E : builtins) { + for (const KeyValue>> &E : builtins) { Array events; // Convert list of input events into array diff --git a/core/config/project_settings.h b/core/config/project_settings.h index 880a7ed4d1ee..83f326121328 100644 --- a/core/config/project_settings.h +++ b/core/config/project_settings.h @@ -200,7 +200,7 @@ class ProjectSettings : public Object { const HashMap &get_custom_property_info() const; uint64_t get_last_saved_time() { return last_save_time; } - List get_input_presets() const { return input_presets; } + List get_input_presets() const { return List(input_presets); } Variant get_setting_with_override(const StringName &p_name) const; Variant get_setting_with_override_and_custom_features(const StringName &p_name, const Vector &p_features) const; diff --git a/core/extension/gdextension.cpp b/core/extension/gdextension.cpp index d5222f7f315f..a00587e917a1 100644 --- a/core/extension/gdextension.cpp +++ b/core/extension/gdextension.cpp @@ -952,7 +952,7 @@ void GDExtension::prepare_reload() { state.push_back(Pair(P.name, value)); } E.value.instance_state[obj_id] = { - state, // List> properties; + List>(state), // List> properties; obj->is_extension_placeholder(), // bool is_placeholder; }; } diff --git a/core/input/input_map.cpp b/core/input/input_map.cpp index 8603e999b320..fee86945559a 100644 --- a/core/input/input_map.cpp +++ b/core/input/input_map.cpp @@ -874,7 +874,7 @@ const HashMap>> &InputMap::get_builtins_with_featur } void InputMap::load_default() { - HashMap>> builtins = get_builtins_with_feature_overrides_applied(); + const HashMap>> builtins = HashMap>>(get_builtins_with_feature_overrides_applied()); for (const KeyValue>> &E : builtins) { String name = E.key; diff --git a/core/io/file_access_pack.cpp b/core/io/file_access_pack.cpp index 244469e9d90c..ef74f6be0316 100644 --- a/core/io/file_access_pack.cpp +++ b/core/io/file_access_pack.cpp @@ -140,7 +140,7 @@ uint8_t *PackedData::get_file_hash(const String &p_path) { HashSet PackedData::get_file_paths() const { HashSet file_paths; _get_file_paths(root, root->name, file_paths); - return file_paths; + return HashSet(file_paths); } void PackedData::_get_file_paths(PackedDir *p_dir, const String &p_parent_dir, HashSet &r_paths) const { diff --git a/core/io/ip.cpp b/core/io/ip.cpp index 94256a7b5726..26c90629dae5 100644 --- a/core/io/ip.cpp +++ b/core/io/ip.cpp @@ -205,7 +205,7 @@ IPAddress IP::get_resolve_item_address(ResolverID p_id) const { return IPAddress(); } - List res = resolver->queue[p_id].response; + const List res = List(resolver->queue[p_id].response); for (const IPAddress &E : res) { if (E.is_valid()) { @@ -224,7 +224,7 @@ Array IP::get_resolve_item_addresses(ResolverID p_id) const { return Array(); } - List res = resolver->queue[p_id].response; + const List res = List(resolver->queue[p_id].response); Array result; for (const IPAddress &E : res) { diff --git a/core/math/a_star_grid_2d.cpp b/core/math/a_star_grid_2d.cpp index 2548957f8333..01f708af63df 100644 --- a/core/math/a_star_grid_2d.cpp +++ b/core/math/a_star_grid_2d.cpp @@ -158,7 +158,7 @@ void AStarGrid2D::update() { solid_mask.push_back(false); } solid_mask.push_back(true); - points.push_back(line); + points.push_back(LocalVector(line)); } for (int32_t x = region.position.x; x < end_x + 2; x++) { diff --git a/core/math/geometry_3d.h b/core/math/geometry_3d.h index 6af902b28b82..824970ba6017 100644 --- a/core/math/geometry_3d.h +++ b/core/math/geometry_3d.h @@ -491,7 +491,7 @@ class Geometry3D { }; if (polygon.is_empty()) { - return polygon; + return Vector(polygon); } int *location_cache = (int *)alloca(sizeof(int) * polygon.size()); @@ -514,7 +514,7 @@ class Geometry3D { } if (outside_count == 0) { - return polygon; // No changes. + return Vector(polygon); // No changes. } else if (inside_count == 0) { return Vector(); // Empty. } diff --git a/core/object/class_db.cpp b/core/object/class_db.cpp index 5b4a4f6bd9df..9897b87aa13d 100644 --- a/core/object/class_db.cpp +++ b/core/object/class_db.cpp @@ -1004,7 +1004,7 @@ void ClassDB::get_method_list_with_compatibility(const StringName &p_class, List #endif // DEBUG_ENABLED for (const KeyValue> &E : type->method_map_compatibility) { - LocalVector compat = E.value; + const LocalVector compat = LocalVector(E.value); for (MethodBind *method : compat) { MethodInfo minfo = info_from_bind(method); diff --git a/core/os/os.cpp b/core/os/os.cpp index ef4669a5eabf..4d3ac31f49c6 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -640,7 +640,7 @@ bool OS::is_restart_on_exit_set() const { } List OS::get_restart_on_exit_arguments() const { - return restart_commandline; + return List(restart_commandline); } PackedStringArray OS::get_connected_midi_inputs() { diff --git a/core/os/os.h b/core/os/os.h index 2c9607d9e816..f5ae2f724923 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -215,8 +215,8 @@ class OS { virtual String get_distribution_name() const = 0; virtual String get_version() const = 0; virtual String get_version_alias() const { return get_version(); } - virtual List get_cmdline_args() const { return _cmdline; } - virtual List get_cmdline_user_args() const { return _user_args; } + virtual List get_cmdline_args() const { return List(_cmdline); } + virtual List get_cmdline_user_args() const { return List(_user_args); } virtual List get_cmdline_platform_args() const { return List(); } virtual String get_model_name() const; diff --git a/core/string/translation_domain.cpp b/core/string/translation_domain.cpp index e4927e606df2..fd3a5b6002c3 100644 --- a/core/string/translation_domain.cpp +++ b/core/string/translation_domain.cpp @@ -266,7 +266,7 @@ HashSet> TranslationDomain::get_potential_translations(const St res.insert(E); } } - return res; + return HashSet>(res); } Ref TranslationDomain::get_translation_object(const String &p_locale) const { diff --git a/core/templates/cowdata.h b/core/templates/cowdata.h index 75d0d346f46f..fd5d3297d5c0 100644 --- a/core/templates/cowdata.h +++ b/core/templates/cowdata.h @@ -215,7 +215,7 @@ class CowData { _FORCE_INLINE_ CowData() {} _FORCE_INLINE_ ~CowData() { _unref(); } _FORCE_INLINE_ CowData(std::initializer_list p_init); - _FORCE_INLINE_ CowData(const CowData &p_from) { _ref(p_from); } + _FORCE_INLINE_ explicit CowData(const CowData &p_from) { _ref(p_from); } _FORCE_INLINE_ CowData(CowData &&p_from) { _ptr = p_from._ptr; p_from._ptr = nullptr; diff --git a/core/templates/fixed_vector.h b/core/templates/fixed_vector.h index a7907caaec48..8dc086599c5a 100644 --- a/core/templates/fixed_vector.h +++ b/core/templates/fixed_vector.h @@ -61,7 +61,7 @@ class FixedVector { } template - constexpr FixedVector(const FixedVector &p_from) { + constexpr explicit FixedVector(const FixedVector &p_from) { ERR_FAIL_COND(p_from.size() > CAPACITY); if constexpr (std::is_trivially_copyable_v) { // Copy size and all provided elements at once. diff --git a/core/templates/hash_map.h b/core/templates/hash_map.h index 63a9c0488ad8..53890f4eef07 100644 --- a/core/templates/hash_map.h +++ b/core/templates/hash_map.h @@ -578,7 +578,7 @@ class HashMap : private Allocator { /* Constructors */ - HashMap(const HashMap &p_other) { + explicit HashMap(const HashMap &p_other) { reserve(hash_table_size_primes[p_other._capacity_idx]); if (p_other._size == 0) { diff --git a/core/templates/hash_set.h b/core/templates/hash_set.h index 048ebc7b3621..d0202d4737e2 100644 --- a/core/templates/hash_set.h +++ b/core/templates/hash_set.h @@ -417,7 +417,7 @@ class HashSet { /* Constructors */ - HashSet(const HashSet &p_other) { + explicit HashSet(const HashSet &p_other) { _init_from(p_other); } diff --git a/core/templates/list.h b/core/templates/list.h index 79a67c7e52ed..f21a400b97db 100644 --- a/core/templates/list.h +++ b/core/templates/list.h @@ -415,6 +415,19 @@ class List { /** * find an element in the list, */ + template + const Element *find(const T_v &p_val) const { + const Element *it = front(); + while (it) { + if (it->value == p_val) { + return it; + } + it = it->next(); + } + + return nullptr; + } + template Element *find(const T_v &p_val) { Element *it = front(); @@ -677,7 +690,7 @@ class List { /** * copy constructor for the list */ - List(const List &p_list) { + explicit List(const List &p_list) { const Element *it = p_list.front(); while (it) { push_back(it->get()); diff --git a/core/templates/local_vector.h b/core/templates/local_vector.h index 80d67676dc39..604efb2fa434 100644 --- a/core/templates/local_vector.h +++ b/core/templates/local_vector.h @@ -349,7 +349,7 @@ class LocalVector { push_back(element); } } - _FORCE_INLINE_ LocalVector(const LocalVector &p_from) { + _FORCE_INLINE_ explicit LocalVector(const LocalVector &p_from) { resize(p_from.size()); for (U i = 0; i < p_from.count; i++) { data[i] = p_from.data[i]; diff --git a/core/templates/rb_map.h b/core/templates/rb_map.h index 7c207928af38..6151088208b4 100644 --- a/core/templates/rb_map.h +++ b/core/templates/rb_map.h @@ -760,7 +760,7 @@ class RBMap { _copy_from(p_map); } - RBMap(const RBMap &p_map) { + explicit RBMap(const RBMap &p_map) { _copy_from(p_map); } diff --git a/core/templates/rb_set.h b/core/templates/rb_set.h index 798353957c56..ca7fea59102f 100644 --- a/core/templates/rb_set.h +++ b/core/templates/rb_set.h @@ -698,7 +698,7 @@ class RBSet { _copy_from(p_set); } - RBSet(const RBSet &p_set) { + explicit RBSet(const RBSet &p_set) { _copy_from(p_set); } diff --git a/core/templates/vector.h b/core/templates/vector.h index 1c0bc67a9364..758dc12afd95 100644 --- a/core/templates/vector.h +++ b/core/templates/vector.h @@ -72,7 +72,7 @@ class Vector { public: // Must take a copy instead of a reference (see GH-31736). _FORCE_INLINE_ bool push_back(T p_elem) { return _cowdata.push_back(p_elem); } - _FORCE_INLINE_ bool append(const T &p_elem) { return push_back(p_elem); } //alias + _FORCE_INLINE_ bool append(const T &p_elem) { return push_back(T(p_elem)); } //alias void fill(T p_elem); void remove_at(Size p_index) { _cowdata.remove_at(p_index); } diff --git a/drivers/gles3/shader_gles3.cpp b/drivers/gles3/shader_gles3.cpp index 02443b00027c..24cd9c748d70 100644 --- a/drivers/gles3/shader_gles3.cpp +++ b/drivers/gles3/shader_gles3.cpp @@ -619,7 +619,7 @@ bool ShaderGLES3::_load_from_cache(Version *p_version) { variant.insert(specialization_key, specialization); } - variants.push_back(variant); + variants.push_back(AHashMap(variant)); } p_version->variants = variants; @@ -706,7 +706,7 @@ void ShaderGLES3::_initialize_version(Version *p_version) { p_version->variants.reserve(variant_count); for (int i = 0; i < variant_count; i++) { AHashMap variant; - p_version->variants.push_back(variant); + p_version->variants.push_back(AHashMap(variant)); Version::Specialization spec; _compile_specialization(spec, i, p_version, specialization_default_mask); p_version->variants[i].insert(specialization_default_mask, spec); diff --git a/drivers/gles3/storage/texture_storage.cpp b/drivers/gles3/storage/texture_storage.cpp index 56bb98278e8d..1835d497e664 100644 --- a/drivers/gles3/storage/texture_storage.cpp +++ b/drivers/gles3/storage/texture_storage.cpp @@ -1223,7 +1223,7 @@ void TextureStorage::texture_remap_proxies(RID p_from_texture, RID p_to_texture) } // Make a local copy, we're about to change the content of the original. - thread_local LocalVector proxies = from_tex->proxies; + thread_local LocalVector proxies = LocalVector(from_tex->proxies); // Now change them to our new texture. for (RID &proxy : proxies) { diff --git a/drivers/metal/metal_objects.mm b/drivers/metal/metal_objects.mm index 96ade55c1b9a..3a1795f7ae11 100644 --- a/drivers/metal/metal_objects.mm +++ b/drivers/metal/metal_objects.mm @@ -1692,7 +1692,7 @@ } } - BoundUniformSet bs = { .buffer = enc_buffer, .usage_to_resources = usage_to_resources }; + BoundUniformSet bs = { .buffer = enc_buffer, .usage_to_resources = ResourceUsageMap(usage_to_resources) }; bound_uniforms.insert(p_shader, bs); bs.merge_into(p_resource_usage); return bound_uniforms.get(p_shader); diff --git a/editor/animation/animation_bezier_editor.cpp b/editor/animation/animation_bezier_editor.cpp index 8e7f8300f64e..48e22db7feae 100644 --- a/editor/animation/animation_bezier_editor.cpp +++ b/editor/animation/animation_bezier_editor.cpp @@ -1321,7 +1321,7 @@ void AnimationBezierTrackEdit::gui_input(const Ref &p_event) { for (const KeyValue> &E : subtrack_icons) { int track = E.key; - RBMap track_icons = E.value; + const RBMap track_icons = RBMap(E.value); for (const KeyValue &I : track_icons) { if (I.value.has_point(mb->get_position())) { if (I.key == REMOVE_ICON) { diff --git a/editor/docks/filesystem_dock.cpp b/editor/docks/filesystem_dock.cpp index d85e72fa090f..26b14207ee9a 100644 --- a/editor/docks/filesystem_dock.cpp +++ b/editor/docks/filesystem_dock.cpp @@ -1231,7 +1231,7 @@ HashSet FileSystemDock::_get_valid_conversions_for_file_paths(const Vect } } - return all_valid_conversion_to_targets; + return HashSet(all_valid_conversion_to_targets); } void FileSystemDock::_select_file(const String &p_path, bool p_select_in_favorites, bool p_navigate) { @@ -1627,7 +1627,7 @@ void FileSystemDock::_update_dependencies_after_move(const HashMap &p_renames, const HashMap &p_folders_renames) { // Find all project settings of type FILE and replace them if needed. - const HashMap prop_info = ProjectSettings::get_singleton()->get_custom_property_info(); + const HashMap prop_info = HashMap(ProjectSettings::get_singleton()->get_custom_property_info()); for (const KeyValue &E : prop_info) { if (E.value.hint == PROPERTY_HINT_FILE || E.value.hint == PROPERTY_HINT_FILE_PATH) { String old_path = GLOBAL_GET(E.key); diff --git a/editor/docks/scene_tree_dock.cpp b/editor/docks/scene_tree_dock.cpp index 66fc27704e29..01999d98e5a9 100644 --- a/editor/docks/scene_tree_dock.cpp +++ b/editor/docks/scene_tree_dock.cpp @@ -663,7 +663,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { break; } - List selection = editor_selection->get_top_selected_node_list(); + List selection = List(editor_selection->get_top_selected_node_list()); if (selection.is_empty()) { break; } @@ -821,7 +821,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { bool MOVING_UP = !MOVING_DOWN; Node *common_parent = scene_tree->get_selected()->get_parent(); - List selection = editor_selection->get_top_selected_node_list(); + List selection = List(editor_selection->get_top_selected_node_list()); selection.sort_custom(); // sort by index if (MOVING_DOWN) { selection.reverse(); @@ -894,7 +894,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { break; } - List selection = editor_selection->get_top_selected_node_list(); + List selection = List(editor_selection->get_top_selected_node_list()); if (selection.is_empty()) { break; } @@ -989,7 +989,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { break; } - List nodes = editor_selection->get_top_selected_node_list(); + const List nodes = List(editor_selection->get_top_selected_node_list()); HashSet nodeset; for (Node *E : nodes) { nodeset.insert(E); @@ -1002,7 +1002,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { break; } - List nodes = editor_selection->get_top_selected_node_list(); + const List nodes = List(editor_selection->get_top_selected_node_list()); ERR_FAIL_COND(nodes.size() != 1); Node *node = nodes.front()->get(); @@ -1085,7 +1085,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { break; } - List remove_list = editor_selection->get_top_selected_node_list(); + const List remove_list = List(editor_selection->get_top_selected_node_list()); if (remove_list.is_empty()) { return; @@ -1096,7 +1096,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { } bool allow_ask_delete_tracks = EDITOR_GET("docks/scene_tree/ask_before_deleting_related_animation_tracks").operator bool(); - bool has_tracks_to_delete = allow_ask_delete_tracks && _has_tracks_to_delete(edited_scene, remove_list); + bool has_tracks_to_delete = allow_ask_delete_tracks && _has_tracks_to_delete(edited_scene, List(remove_list)); if (p_confirm_override && !has_tracks_to_delete) { _delete_confirm(); } else { @@ -1914,7 +1914,7 @@ void SceneTreeDock::_fill_path_renames(Vector base_path, Vector &p_to_delete) const { +bool SceneTreeDock::_has_tracks_to_delete(Node *p_node, const List &p_to_delete) const { // Skip if this node will be deleted. for (const Node *F : p_to_delete) { if (F == p_node || F->is_ancestor_of(p_node)) { @@ -2770,7 +2770,7 @@ void SceneTreeDock::_toggle_editable_children(Node *p_node) { } void SceneTreeDock::_delete_confirm(bool p_cut) { - List remove_list = editor_selection->get_top_selected_node_list(); + List remove_list = List(editor_selection->get_top_selected_node_list()); if (remove_list.is_empty()) { return; @@ -4375,7 +4375,7 @@ List SceneTreeDock::paste_nodes(bool p_paste_as_sibling) { } List SceneTreeDock::get_node_clipboard() const { - return node_clipboard; + return List(node_clipboard); } void SceneTreeDock::add_remote_tree_editor(Control *p_remote) { diff --git a/editor/docks/scene_tree_dock.h b/editor/docks/scene_tree_dock.h index a73dd39ae12f..19c2a2c78c64 100644 --- a/editor/docks/scene_tree_dock.h +++ b/editor/docks/scene_tree_dock.h @@ -258,7 +258,7 @@ class SceneTreeDock : public EditorDock { void _queue_update_script_button(); void _fill_path_renames(Vector base_path, Vector new_base_path, Node *p_node, HashMap *p_renames); - bool _has_tracks_to_delete(Node *p_node, List &p_to_delete) const; + bool _has_tracks_to_delete(Node *p_node, const List &p_to_delete) const; void _normalize_drop(Node *&to_node, int &to_pos, int p_type); Array _get_selection_array(); diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 1c280b9f2449..04eafefcf90b 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -250,7 +250,7 @@ void EditorNode::disambiguate_filenames(const Vector p_full_paths, Vecto // For each index set with a size > 1, we need to disambiguate. for (int i = 0; i < index_sets.size(); i++) { - RBSet iset = index_sets[i]; + RBSet iset = RBSet(index_sets[i]); while (iset.size() > 1) { // Append the parent folder to each scene name. for (const int &E : iset) { @@ -4591,7 +4591,7 @@ HashMap EditorNode::get_modified_properties_for_node(Node * } } - return modified_property_map; + return HashMap(modified_property_map); } HashMap EditorNode::get_modified_properties_reference_to_nodes(Node *p_node, List &p_nodes_referenced_by) { @@ -4612,7 +4612,7 @@ HashMap EditorNode::get_modified_properties_reference_to_no } } - return modified_property_map; + return HashMap(modified_property_map); } void EditorNode::update_node_from_node_modification_entry(Node *p_node, ModificationNodeEntry &p_node_modification) { @@ -7574,7 +7574,7 @@ void EditorNode::notify_settings_overrides_changed() { HashMap EditorNode::get_initial_settings() { HashMap settings; settings["physics/3d/physics_engine"] = "Jolt Physics"; - return settings; + return HashMap(settings); } EditorNode::EditorNode() { diff --git a/editor/export/editor_export.cpp b/editor/export/editor_export.cpp index 9b8adba7f162..58eb03160878 100644 --- a/editor/export/editor_export.cpp +++ b/editor/export/editor_export.cpp @@ -396,7 +396,7 @@ void EditorExport::update_export_presets() { export_presets_updated = true; bool update_value_overrides = false; - List options = platform_options[preset->get_platform()->get_name()]; + const List options = List(platform_options[preset->get_platform()->get_name()]); // Clear the preset properties prior to reloading, keep the values to preserve options from plugins that may be currently disabled. preset->properties.clear(); diff --git a/editor/export/editor_export_platform.cpp b/editor/export/editor_export_platform.cpp index 541af4131831..6f4d62b58d39 100644 --- a/editor/export/editor_export_platform.cpp +++ b/editor/export/editor_export_platform.cpp @@ -621,7 +621,7 @@ HashSet EditorExportPlatform::get_features(const Ref } } - return result; + return HashSet(result); } EditorExportPlatform::ExportNotifier::ExportNotifier(EditorExportPlatform &p_platform, const Ref &p_preset, bool p_debug, const String &p_path, BitField p_flags) { diff --git a/editor/file_system/editor_file_system.cpp b/editor/file_system/editor_file_system.cpp index 6d7ef2690146..7a2468d43055 100644 --- a/editor/file_system/editor_file_system.cpp +++ b/editor/file_system/editor_file_system.cpp @@ -2539,7 +2539,7 @@ void EditorFileSystem::_notify_filesystem_changed() { } HashSet EditorFileSystem::get_valid_extensions() const { - return valid_extensions; + return HashSet(valid_extensions); } void EditorFileSystem::_register_global_class_script(const String &p_search_path, const String &p_target_path, const ScriptClassInfoUpdate &p_script_update) { @@ -2785,7 +2785,7 @@ Error EditorFileSystem::_reimport_file(const String &p_file, const HashMap params = p_custom_options; + HashMap params = HashMap(p_custom_options); String importer_name; //empty by default though if (!p_custom_importer.is_empty()) { diff --git a/editor/import/3d/scene_import_settings.cpp b/editor/import/3d/scene_import_settings.cpp index 6d30a9bf9046..2ca864c5e827 100644 --- a/editor/import/3d/scene_import_settings.cpp +++ b/editor/import/3d/scene_import_settings.cpp @@ -1033,7 +1033,7 @@ void SceneImportSettingsDialog::_inspector_property_edited(const String &p_name) if (!animation_map.has(selected_id)) { return; } - HashMap settings = animation_map[selected_id].settings; + const HashMap settings = HashMap(animation_map[selected_id].settings); if (settings.has(p_name)) { animation_loop_mode = static_cast((int)settings[p_name]); } else { @@ -1117,7 +1117,7 @@ void SceneImportSettingsDialog::_reset_animation(const String &p_animation_name) animation_pingpong = false; if (animation_map.has(p_animation_name)) { - HashMap settings = animation_map[p_animation_name].settings; + HashMap settings = HashMap(animation_map[p_animation_name].settings); if (settings.has("settings/loop_mode")) { animation_loop_mode = static_cast((int)settings["settings/loop_mode"]); } diff --git a/editor/inspector/editor_properties.cpp b/editor/inspector/editor_properties.cpp index ade5de4ff540..cc436cd07604 100644 --- a/editor/inspector/editor_properties.cpp +++ b/editor/inspector/editor_properties.cpp @@ -3721,7 +3721,7 @@ static EditorProperty *get_input_action_editor(const String &p_hint_text, bool i ProjectSettings::get_singleton()->get_property_list(&pinfo); Vector hints = p_hint_text.remove_char(' ').split(",", false); - HashMap>> builtins = InputMap::get_singleton()->get_builtins(); + const HashMap>> builtins = HashMap>>(InputMap::get_singleton()->get_builtins()); bool show_builtin = hints.has("show_builtin"); for (const PropertyInfo &pi : pinfo) { diff --git a/editor/inspector/editor_resource_picker.cpp b/editor/inspector/editor_resource_picker.cpp index 88a641b5cf92..18d233c01bee 100644 --- a/editor/inspector/editor_resource_picker.cpp +++ b/editor/inspector/editor_resource_picker.cpp @@ -538,7 +538,7 @@ void EditorResourcePicker::set_create_options(Object *p_menu_node) { int idx = 0; _ensure_allowed_types(); - HashSet allowed_types = allowed_types_without_convert; + HashSet allowed_types = HashSet(allowed_types_without_convert); if (!allowed_types.is_empty()) { edit_menu->add_separator(TTRC("New")); } @@ -754,7 +754,7 @@ bool EditorResourcePicker::_is_drop_valid(const Dictionary &p_drag_data) const { } _ensure_allowed_types(); - HashSet allowed_types = allowed_types_with_convert; + HashSet allowed_types = HashSet(allowed_types_with_convert); if (res.is_valid()) { String res_type = _get_resource_type(res); @@ -843,7 +843,7 @@ void EditorResourcePicker::drop_data_fw(const Point2 &p_point, const Variant &p_ if (dropped_resource.is_valid()) { _ensure_allowed_types(); - HashSet allowed_types = allowed_types_without_convert; + HashSet allowed_types = HashSet(allowed_types_without_convert); String res_type = _get_resource_type(dropped_resource); @@ -970,7 +970,7 @@ void EditorResourcePicker::set_base_type(const String &p_base_type) { // Keep the value, but warn the user that there is a potential mistake. if (!base_type.is_empty() && edited_resource.is_valid()) { _ensure_allowed_types(); - HashSet allowed_types = allowed_types_with_convert; + HashSet allowed_types = HashSet(allowed_types_with_convert); StringName custom_class; bool is_custom = false; @@ -992,7 +992,7 @@ String EditorResourcePicker::get_base_type() const { Vector EditorResourcePicker::get_allowed_types() const { _ensure_allowed_types(); - HashSet allowed_types = allowed_types_without_convert; + HashSet allowed_types = HashSet(allowed_types_without_convert); Vector types; types.resize(allowed_types.size()); @@ -1016,7 +1016,7 @@ void EditorResourcePicker::set_edited_resource(Ref p_resource) { if (!base_type.is_empty()) { _ensure_allowed_types(); - HashSet allowed_types = allowed_types_with_convert; + HashSet allowed_types = HashSet(allowed_types_with_convert); StringName custom_class; bool is_custom = false; diff --git a/editor/scene/2d/tiles/tile_map_layer_editor.cpp b/editor/scene/2d/tiles/tile_map_layer_editor.cpp index 085c61028d2a..a681cabdaadc 100644 --- a/editor/scene/2d/tiles/tile_map_layer_editor.cpp +++ b/editor/scene/2d/tiles/tile_map_layer_editor.cpp @@ -1093,7 +1093,7 @@ HashMap TileMapLayerEditorTilesPlugin::_draw_line(Vector2 } } } - return output; + return HashMap(output); } HashMap TileMapLayerEditorTilesPlugin::_draw_rect(Vector2i p_start_cell, Vector2i p_end_cell, bool p_erase) { @@ -1148,7 +1148,7 @@ HashMap TileMapLayerEditorTilesPlugin::_draw_rect(Vector2 } } - return output; + return HashMap(output); } HashMap TileMapLayerEditorTilesPlugin::_draw_bucket_fill(Vector2i p_coords, bool p_contiguous, bool p_erase) { @@ -1253,7 +1253,7 @@ HashMap TileMapLayerEditorTilesPlugin::_draw_bucket_fill( } } } - return output; + return HashMap(output); } void TileMapLayerEditorTilesPlugin::_stop_dragging() { @@ -2549,7 +2549,7 @@ HashMap TileMapLayerEditorTerrainsPlugin::_draw_terrain_p } } } - return output; + return HashMap(output); } HashMap TileMapLayerEditorTerrainsPlugin::_draw_terrain_pattern(const Vector &p_to_paint, int p_terrain_set, TileSet::TerrainsPattern p_terrains_pattern) const { @@ -2596,7 +2596,7 @@ HashMap TileMapLayerEditorTerrainsPlugin::_draw_terrain_p } } } - return output; + return HashMap(output); } HashMap TileMapLayerEditorTerrainsPlugin::_draw_line(Vector2i p_start_cell, Vector2i p_end_cell, bool p_erase) { @@ -2765,7 +2765,7 @@ RBSet TileMapLayerEditorTerrainsPlugin::_get_cells_for_bucket_fill(Vec } } } - return output; + return RBSet(output); } HashMap TileMapLayerEditorTerrainsPlugin::_draw_bucket_fill(Vector2i p_coords, bool p_contiguous, bool p_erase) { diff --git a/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp b/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp index 4cb9be3134df..b9bb34f13ac2 100644 --- a/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp +++ b/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp @@ -1599,7 +1599,7 @@ HashMap> TileSetAtlasSourceEditor::_group_p } } } - return per_tile; + return HashMap>(per_tile); } void TileSetAtlasSourceEditor::_menu_option(int p_option) { diff --git a/editor/scene/2d/tiles/tile_set_atlas_source_editor.h b/editor/scene/2d/tiles/tile_set_atlas_source_editor.h index 2407e287b43c..d6fa75068f02 100644 --- a/editor/scene/2d/tiles/tile_set_atlas_source_editor.h +++ b/editor/scene/2d/tiles/tile_set_atlas_source_editor.h @@ -101,7 +101,7 @@ class TileSetAtlasSourceEditor : public HSplitContainer { public: Ref get_edited_tile_set_atlas_source() const { return tile_set_atlas_source; } - RBSet get_edited_tiles() const { return tiles; } + RBSet get_edited_tiles() const { return RBSet(tiles); } // Update the proxied object. void edit(Ref p_tile_set_atlas_source, const RBSet &p_tiles = RBSet()); diff --git a/editor/scene/3d/mesh_instance_3d_editor_plugin.cpp b/editor/scene/3d/mesh_instance_3d_editor_plugin.cpp index 8b7512fbe461..4d37f6e28bac 100644 --- a/editor/scene/3d/mesh_instance_3d_editor_plugin.cpp +++ b/editor/scene/3d/mesh_instance_3d_editor_plugin.cpp @@ -275,7 +275,7 @@ Vector> MeshInstance3DEditor::create_shape_from_mesh(Ref p_me void MeshInstance3DEditor::_shape_dialog_about_to_popup() { EditorSelection *editor_selection = EditorNode::get_singleton()->get_editor_selection(); - List selection = editor_selection->get_top_selected_node_list(); + List selection = List(editor_selection->get_top_selected_node_list()); if (selection.is_empty()) { selection.push_back(node); } @@ -355,7 +355,7 @@ void MeshInstance3DEditor::_create_collision_shape() { break; } - List selection = editor_selection->get_top_selected_node_list(); + List selection = List(editor_selection->get_top_selected_node_list()); bool verbose = false; if (selection.is_empty()) { diff --git a/editor/scene/3d/node_3d_editor_plugin.cpp b/editor/scene/3d/node_3d_editor_plugin.cpp index 959add1db260..815f64640896 100644 --- a/editor/scene/3d/node_3d_editor_plugin.cpp +++ b/editor/scene/3d/node_3d_editor_plugin.cpp @@ -8392,7 +8392,7 @@ HashSet _get_child_nodes(Node *parent_node) { } } - return nodes; + return HashSet(nodes); } HashSet _get_physics_bodies_rid(Node *node) { @@ -8406,7 +8406,7 @@ HashSet _get_physics_bodies_rid(Node *node) { rids.insert(I->get_rid()); } - return rids; + return HashSet(rids); } void Node3DEditor::snap_selected_nodes_to_floor() { diff --git a/editor/scene/canvas_item_editor_plugin.cpp b/editor/scene/canvas_item_editor_plugin.cpp index ce7a25edf21c..f785bde50a01 100644 --- a/editor/scene/canvas_item_editor_plugin.cpp +++ b/editor/scene/canvas_item_editor_plugin.cpp @@ -328,13 +328,13 @@ void CanvasItemEditor::_snap_other_nodes( const Point2 p_value, const Transform2D p_transform_to_snap, Point2 &r_current_snap, SnapTarget (&r_current_snap_target)[2], - const SnapTarget p_snap_target, List p_exceptions, + const SnapTarget p_snap_target, const List p_exceptions, const Node *p_current) { const CanvasItem *ci = Object::cast_to(p_current); // Check if the element is in the exception bool exception = false; - for (const CanvasItem *&E : p_exceptions) { + for (const CanvasItem *const &E : p_exceptions) { if (E == p_current) { exception = true; break; @@ -357,7 +357,7 @@ void CanvasItemEditor::_snap_other_nodes( } } for (int i = 0; i < p_current->get_child_count(); i++) { - _snap_other_nodes(p_value, p_transform_to_snap, r_current_snap, r_current_snap_target, p_snap_target, p_exceptions, p_current->get_child(i)); + _snap_other_nodes(p_value, p_transform_to_snap, r_current_snap, r_current_snap_target, p_snap_target, List(p_exceptions), p_current->get_child(i)); } } @@ -444,7 +444,7 @@ Point2 CanvasItemEditor::snap_point(Point2 p_target, unsigned int p_modes, unsig p_target, to_snap_transform, output, snap_target, SNAP_TARGET_OTHER_NODE, - exceptions, + List(exceptions), get_tree()->get_edited_scene_root()); } @@ -4643,7 +4643,7 @@ void CanvasItemEditor::_popup_callback(int p_op) { snap_dialog->popup_centered(Size2(320, 160) * EDSCALE); } break; case SKELETON_SHOW_BONES: { - List selection = editor_selection->get_top_selected_node_list(); + List selection = List(editor_selection->get_top_selected_node_list()); for (Node *E : selection) { // Add children nodes so they are processed for (int child = 0; child < E->get_child_count(); child++) { diff --git a/editor/scene/canvas_item_editor_plugin.h b/editor/scene/canvas_item_editor_plugin.h index 460acbec1274..e8e071d388d7 100644 --- a/editor/scene/canvas_item_editor_plugin.h +++ b/editor/scene/canvas_item_editor_plugin.h @@ -508,7 +508,7 @@ class CanvasItemEditor : public VBoxContainer { const Point2 p_value, const Transform2D p_transform_to_snap, Point2 &r_current_snap, SnapTarget (&r_current_snap_target)[2], - const SnapTarget p_snap_target, List p_exceptions, + const SnapTarget p_snap_target, const List p_exceptions, const Node *p_current); VBoxContainer *controls_vb = nullptr; diff --git a/editor/scene/group_settings_editor.cpp b/editor/scene/group_settings_editor.cpp index 7e024aef1202..062293facff5 100644 --- a/editor/scene/group_settings_editor.cpp +++ b/editor/scene/group_settings_editor.cpp @@ -189,7 +189,7 @@ void GroupSettingsEditor::_group_name_text_changed(const String &p_name) { void GroupSettingsEditor::_modify_references(const StringName &p_name, const StringName &p_new_name, bool p_is_rename) { HashSet scenes; - HashMap> scene_groups_cache = ProjectSettings::get_singleton()->get_scene_groups_cache(); + const HashMap> scene_groups_cache = HashMap>(ProjectSettings::get_singleton()->get_scene_groups_cache()); for (const KeyValue> &E : scene_groups_cache) { if (E.value.has(p_name)) { scenes.insert(E.key); diff --git a/editor/scene/gui/theme_editor_plugin.cpp b/editor/scene/gui/theme_editor_plugin.cpp index d0a2d4a489cb..0e691a039d8a 100644 --- a/editor/scene/gui/theme_editor_plugin.cpp +++ b/editor/scene/gui/theme_editor_plugin.cpp @@ -2510,7 +2510,7 @@ HashMap ThemeTypeEditor::_get_type_items(String p_type_name, T ordered_items[E] = items[E]; } - return ordered_items; + return HashMap(ordered_items); } HBoxContainer *ThemeTypeEditor::_create_property_control(Theme::DataType p_data_type, String p_item_name, bool p_editable) { diff --git a/editor/scene/scene_tree_editor.cpp b/editor/scene/scene_tree_editor.cpp index 8d7cb7cf88ea..58aecf5d08f2 100644 --- a/editor/scene/scene_tree_editor.cpp +++ b/editor/scene/scene_tree_editor.cpp @@ -118,7 +118,7 @@ void SceneTreeEditor::_cell_button_pressed(Object *p_item, int p_column, int p_i } else if (p_id == BUTTON_VISIBILITY) { undo_redo->create_action(TTR("Toggle Visible")); _toggle_visible(n); - List selection = editor_selection->get_top_selected_node_list(); + const List selection = List(editor_selection->get_top_selected_node_list()); if (selection.size() > 1 && selection.find(n) != nullptr) { for (Node *nv : selection) { ERR_FAIL_NULL(nv); diff --git a/editor/script/find_in_files.cpp b/editor/script/find_in_files.cpp index 26ced16cf5b6..7704eff42281 100644 --- a/editor/script/find_in_files.cpp +++ b/editor/script/find_in_files.cpp @@ -537,7 +537,7 @@ HashSet FindInFilesDialog::get_filter() const { filters.insert(cb->get_text()); } } - return filters; + return HashSet(filters); } HashSet FindInFilesDialog::get_includes() const { @@ -545,14 +545,14 @@ HashSet FindInFilesDialog::get_includes() const { String text = _includes_line_edit->get_text(); if (text.is_empty()) { - return includes; + return HashSet(includes); } PackedStringArray wildcards = text.split(",", false); for (const String &wildcard : wildcards) { includes.insert(validate_filter_wildcard(wildcard)); } - return includes; + return HashSet(includes); } HashSet FindInFilesDialog::get_excludes() const { @@ -560,14 +560,14 @@ HashSet FindInFilesDialog::get_excludes() const { String text = _excludes_line_edit->get_text(); if (text.is_empty()) { - return excludes; + return HashSet(excludes); } PackedStringArray wildcards = text.split(",", false); for (const String &wildcard : wildcards) { excludes.insert(validate_filter_wildcard(wildcard)); } - return excludes; + return HashSet(excludes); } void FindInFilesDialog::_notification(int p_what) { diff --git a/editor/script/script_editor_plugin.cpp b/editor/script/script_editor_plugin.cpp index fc68eab34fc0..15212c30c870 100644 --- a/editor/script/script_editor_plugin.cpp +++ b/editor/script/script_editor_plugin.cpp @@ -140,7 +140,7 @@ void EditorStandardSyntaxHighlighter::_update_cache() { } /* Autoloads. */ - HashMap autoloads = ProjectSettings::get_singleton()->get_autoload_list(); + const HashMap autoloads = HashMap(ProjectSettings::get_singleton()->get_autoload_list()); for (const KeyValue &E : autoloads) { const ProjectSettings::AutoloadInfo &info = E.value; if (info.is_singleton) { diff --git a/editor/settings/editor_build_profile.cpp b/editor/settings/editor_build_profile.cpp index 625328a8e4f0..8f365ad5a1bf 100644 --- a/editor/settings/editor_build_profile.cpp +++ b/editor/settings/editor_build_profile.cpp @@ -458,17 +458,26 @@ EditorBuildProfile::BuildOptionCategory EditorBuildProfile::get_build_option_cat LocalVector EditorBuildProfile::get_build_option_dependencies(BuildOption p_build_option) { ERR_FAIL_INDEX_V(p_build_option, BUILD_OPTION_MAX, LocalVector()); - return build_option_dependencies.has(p_build_option) ? build_option_dependencies[p_build_option] : LocalVector(); + if (build_option_dependencies.has(p_build_option)) { + return LocalVector(build_option_dependencies[p_build_option]); + } + return LocalVector(); } HashMap> EditorBuildProfile::get_build_option_settings(BuildOption p_build_option) { ERR_FAIL_INDEX_V(p_build_option, BUILD_OPTION_MAX, (HashMap>())); - return build_option_settings.has(p_build_option) ? build_option_settings[p_build_option] : HashMap>(); + if (build_option_settings.has(p_build_option)) { + return HashMap>(build_option_settings[p_build_option]); + } + return HashMap>(); } LocalVector EditorBuildProfile::get_build_option_classes(BuildOption p_build_option) { ERR_FAIL_INDEX_V(p_build_option, BUILD_OPTION_MAX, LocalVector()); - return build_option_classes.has(p_build_option) ? build_option_classes[p_build_option] : LocalVector(); + if (build_option_classes.has(p_build_option)) { + return LocalVector(build_option_classes[p_build_option]); + } + return LocalVector(); } String EditorBuildProfile::get_build_option_category_name(BuildOptionCategory p_build_option_category) { diff --git a/editor/settings/editor_settings.cpp b/editor/settings/editor_settings.cpp index 22db86c60eb9..08a15d65969c 100644 --- a/editor/settings/editor_settings.cpp +++ b/editor/settings/editor_settings.cpp @@ -201,7 +201,7 @@ bool EditorSettings::_get(const StringName &p_name, Variant &r_ret) const { continue; } - List> events = action_override.value; + const List> events = List>(action_override.value); Dictionary action_dict; action_dict["name"] = action_override.key; @@ -1610,7 +1610,7 @@ Vector EditorSettings::get_favorites() const { } HashMap EditorSettings::get_favorite_properties() const { - return favorite_properties; + return HashMap(favorite_properties); } void EditorSettings::set_recent_dirs(const Vector &p_recent_dirs) { @@ -1741,7 +1741,7 @@ HashMap EditorSettings::get_godot2_text_editor_theme() { colors["text_editor/theme/highlighting/comment_markers/critical_color"] = Color(0.77, 0.35, 0.35); colors["text_editor/theme/highlighting/comment_markers/warning_color"] = Color(0.72, 0.61, 0.48); colors["text_editor/theme/highlighting/comment_markers/notice_color"] = Color(0.56, 0.67, 0.51); - return colors; + return HashMap(colors); } bool EditorSettings::is_default_text_editor_theme(const String &p_theme_name) { @@ -2082,7 +2082,7 @@ const Array EditorSettings::get_builtin_action_overrides(const String &p_name) c if (AO) { Array event_array; - List> events_list = AO->value; + const List> events_list = List>(AO->value); for (const Ref &E : events_list) { event_array.push_back(E); } diff --git a/editor/settings/editor_settings_dialog.cpp b/editor/settings/editor_settings_dialog.cpp index 5f500ae19aff..ac489073089c 100644 --- a/editor/settings/editor_settings_dialog.cpp +++ b/editor/settings/editor_settings_dialog.cpp @@ -332,7 +332,7 @@ void EditorSettingsDialog::_event_config_confirmed() { void EditorSettingsDialog::_update_builtin_action(const String &p_name, const Array &p_events) { Array old_input_array = EditorSettings::get_singleton()->get_builtin_action_overrides(p_name); if (old_input_array.is_empty()) { - List> defaults = InputMap::get_singleton()->get_builtins_with_feature_overrides_applied()[current_edited_identifier]; + const List> defaults = List>(InputMap::get_singleton()->get_builtins_with_feature_overrides_applied()[current_edited_identifier]); old_input_array = _event_list_to_array_helper(defaults); } @@ -681,7 +681,7 @@ void EditorSettingsDialog::_shortcut_button_pressed(Object *p_item, int p_column case EditorSettingsDialog::SHORTCUT_REVERT: { // Only for "shortcut" types if (is_editing_action) { - List> defaults = InputMap::get_singleton()->get_builtins_with_feature_overrides_applied()[current_edited_identifier]; + const List> defaults = List>(InputMap::get_singleton()->get_builtins_with_feature_overrides_applied()[current_edited_identifier]); Array events = _event_list_to_array_helper(defaults); _update_builtin_action(current_edited_identifier, events); diff --git a/editor/shader/shader_create_dialog.cpp b/editor/shader/shader_create_dialog.cpp index 452855829c4b..fb7b3713fe2e 100644 --- a/editor/shader/shader_create_dialog.cpp +++ b/editor/shader/shader_create_dialog.cpp @@ -347,7 +347,7 @@ void ShaderCreateDialog::_browse_path() { file_browse->set_disable_overwrite_warning(true); file_browse->clear_filters(); - List extensions = type_data.get(type_menu->get_selected()).extensions; + const List extensions = List(type_data.get(type_menu->get_selected()).extensions); for (const String &E : extensions) { file_browse->add_filter("*." + E); diff --git a/editor/themes/editor_icons.cpp b/editor/themes/editor_icons.cpp index 5aa1ca5232ec..73171d1ab180 100644 --- a/editor/themes/editor_icons.cpp +++ b/editor/themes/editor_icons.cpp @@ -117,7 +117,7 @@ void editor_register_icons(const Ref &p_theme, bool p_dark_theme, float p native_menu_icons.insert("History"); // The names of the icons to exclude from the standard color conversion. - HashSet conversion_exceptions = EditorColorMap::get_color_conversion_exceptions(); + const HashSet conversion_exceptions = HashSet(EditorColorMap::get_color_conversion_exceptions()); // The names of the icons to exclude when adjusting for saturation. HashSet saturation_exceptions; diff --git a/main/main.cpp b/main/main.cpp index 9f26970c0df3..6a060823e6e8 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -4209,7 +4209,7 @@ int Main::start() { if (!game_path.is_empty() || !script.is_empty()) { //autoload OS::get_singleton()->benchmark_begin_measure("Startup", "Load Autoloads"); - HashMap autoloads = ProjectSettings::get_singleton()->get_autoload_list(); + const HashMap autoloads = HashMap(ProjectSettings::get_singleton()->get_autoload_list()); //first pass, add the constants so they exist before any script is loaded for (const KeyValue &E : autoloads) { diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp index b85fd8e74767..6231732df864 100644 --- a/modules/gdscript/gdscript.cpp +++ b/modules/gdscript/gdscript.cpp @@ -649,7 +649,7 @@ void GDScript::_update_exports_down(bool p_base_exports_changed) { return; } - HashSet copy = inheriters_cache; //might get modified + HashSet copy = HashSet(inheriters_cache); //might get modified for (const ObjectID &E : copy) { Object *id = ObjectDB::get_instance(E); @@ -1259,7 +1259,7 @@ RBSet GDScript::get_dependencies() { _collect_dependencies(dependencies, this); dependencies.erase(this); - return dependencies; + return RBSet(dependencies); } HashMap> GDScript::get_all_dependencies() { @@ -1283,7 +1283,7 @@ HashMap> GDScript::get_all_dependencies() { all_dependencies.insert(scr, scr->get_dependencies()); } - return all_dependencies; + return HashMap>(all_dependencies); } RBSet GDScript::get_must_clear_dependencies() { @@ -1313,7 +1313,7 @@ RBSet GDScript::get_must_clear_dependencies() { cant_clear.clear(); dependencies.clear(); all_dependencies.clear(); - return must_clear_dependencies; + return RBSet(must_clear_dependencies); } bool GDScript::has_script_signal(const StringName &p_signal) const { diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp index 916283a2ddb7..ee6c4c39fc7e 100644 --- a/modules/gdscript/gdscript_analyzer.cpp +++ b/modules/gdscript/gdscript_analyzer.cpp @@ -6377,7 +6377,7 @@ void GDScriptAnalyzer::resolve_pending_lambda_bodies() { GDScriptParser::LambdaNode *previous_lambda = current_lambda; bool previous_static_context = static_context; - List lambdas = pending_body_resolution_lambdas; + List lambdas = List(pending_body_resolution_lambdas); pending_body_resolution_lambdas.clear(); for (GDScriptParser::LambdaNode *lambda : lambdas) { diff --git a/modules/gdscript/gdscript_cache.cpp b/modules/gdscript/gdscript_cache.cpp index 3e11c0060ee0..a209f36a3611 100644 --- a/modules/gdscript/gdscript_cache.cpp +++ b/modules/gdscript/gdscript_cache.cpp @@ -255,7 +255,7 @@ void GDScriptCache::remove_parser(const String &p_path) { singleton->parser_map.erase(p_path); // Have to copy while iterating, because parser_inverse_dependencies is modified. - HashSet ideps = singleton->parser_inverse_dependencies[p_path]; + HashSet ideps = HashSet(singleton->parser_inverse_dependencies[p_path]); singleton->parser_inverse_dependencies.erase(p_path); for (String idep_path : ideps) { remove_parser(idep_path); @@ -416,10 +416,10 @@ Error GDScriptCache::finish_compiling(const String &p_owner) { singleton->full_gdscript_cache[p_owner] = script; singleton->shallow_gdscript_cache.erase(p_owner); - HashSet depends = singleton->dependencies[p_owner]; + HashSet depends_copy = HashSet(singleton->dependencies[p_owner]); Error err = OK; - for (const String &E : depends) { + for (const String &E : depends_copy) { Error this_err = OK; // No need to save the script. We assume it's already referenced in the owner. get_full_script(E, this_err); diff --git a/modules/gdscript/gdscript_compiler.cpp b/modules/gdscript/gdscript_compiler.cpp index 694d425432e6..e77cf9e2400f 100644 --- a/modules/gdscript/gdscript_compiler.cpp +++ b/modules/gdscript/gdscript_compiler.cpp @@ -418,7 +418,7 @@ GDScriptCodeGenerator::Address GDScriptCompiler::_parse_expression(CodeGen &code if (GDScriptLanguage::get_singleton()->get_global_map().has(identifier)) { // If it's an autoload singleton, we postpone to load it at runtime. // This is so one autoload doesn't try to load another before it's compiled. - HashMap autoloads = ProjectSettings::get_singleton()->get_autoload_list(); + const HashMap autoloads = HashMap(ProjectSettings::get_singleton()->get_autoload_list()); if (autoloads.has(identifier) && autoloads[identifier].is_singleton) { GDScriptCodeGenerator::Address global = codegen.add_temporary(_gdtype_from_datatype(in->get_datatype(), codegen.script)); int idx = GDScriptLanguage::get_singleton()->get_global_map()[identifier]; diff --git a/modules/gdscript/gdscript_compiler.h b/modules/gdscript/gdscript_compiler.h index fcd23425d4e7..37cef13324f5 100644 --- a/modules/gdscript/gdscript_compiler.h +++ b/modules/gdscript/gdscript_compiler.h @@ -129,8 +129,7 @@ class GDScriptCompiler { } void start_block() { - HashMap old_locals = locals; - locals_stack.push_back(old_locals); + locals_stack.push_back(HashMap(locals)); generator->start_block(); } diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp index e73c42d290db..3e34a04e1451 100644 --- a/modules/gdscript/gdscript_editor.cpp +++ b/modules/gdscript/gdscript_editor.cpp @@ -1119,7 +1119,7 @@ static void _list_available_types(bool p_inherit_only, GDScriptParser::Completio } // Autoload singletons - HashMap autoloads = ProjectSettings::get_singleton()->get_autoload_list(); + const HashMap autoloads = HashMap(ProjectSettings::get_singleton()->get_autoload_list()); for (const KeyValue &E : autoloads) { const ProjectSettings::AutoloadInfo &info = E.value; @@ -1869,7 +1869,7 @@ static HashMap make_structure_samples() { res["Time::get_time_zone_from_system"] = d; } - return res; + return HashMap(res); } static const HashMap structure_examples = make_structure_samples(); diff --git a/modules/gdscript/tests/gdscript_test_runner.cpp b/modules/gdscript/tests/gdscript_test_runner.cpp index f46f7b4dfbc7..3a9c8d2b77b3 100644 --- a/modules/gdscript/tests/gdscript_test_runner.cpp +++ b/modules/gdscript/tests/gdscript_test_runner.cpp @@ -49,7 +49,7 @@ namespace GDScriptTests { void init_autoloads() { - HashMap autoloads = ProjectSettings::get_singleton()->get_autoload_list(); + const HashMap autoloads = HashMap(ProjectSettings::get_singleton()->get_autoload_list()); // First pass, add the constants so they exist before any script is loaded. for (const KeyValue &E : ProjectSettings::get_singleton()->get_autoload_list()) { diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp index f4047094b667..23267aae42c9 100644 --- a/modules/gltf/gltf_document.cpp +++ b/modules/gltf/gltf_document.cpp @@ -8608,7 +8608,7 @@ HashSet GLTFDocument::get_supported_gltf_extensions_hashset() { supported_extensions.insert(ext_supported_extensions[i]); } } - return supported_extensions; + return HashSet(supported_extensions); } PackedByteArray GLTFDocument::_serialize_glb_buffer(Ref p_state, Error *r_err) { diff --git a/modules/gridmap/grid_map.cpp b/modules/gridmap/grid_map.cpp index 9e71ac8ec767..cec59fcb39a2 100644 --- a/modules/gridmap/grid_map.cpp +++ b/modules/gridmap/grid_map.cpp @@ -1114,7 +1114,7 @@ void GridMap::_queue_octants_dirty() { void GridMap::_recreate_octant_data() { recreating_octants = true; - HashMap cell_copy = cell_map; + HashMap cell_copy = HashMap(cell_map); _clear_internal(); for (const KeyValue &E : cell_copy) { set_cell_item(Vector3i(E.key), E.value.item, E.value.rot); diff --git a/modules/jolt_physics/shapes/jolt_shape_3d.cpp b/modules/jolt_physics/shapes/jolt_shape_3d.cpp index 8bd1977baca4..3b468935a13a 100644 --- a/modules/jolt_physics/shapes/jolt_shape_3d.cpp +++ b/modules/jolt_physics/shapes/jolt_shape_3d.cpp @@ -75,7 +75,7 @@ void JoltShape3D::remove_owner(JoltShapedObject3D *p_owner) { void JoltShape3D::remove_self() { // `remove_owner` will be called when we `remove_shape`, so we need to copy the map since the // iterator would be invalidated from underneath us. - const HashMap ref_counts_by_owner_copy = ref_counts_by_owner; + const HashMap ref_counts_by_owner_copy = HashMap(ref_counts_by_owner); for (const KeyValue &E : ref_counts_by_owner_copy) { E.key->remove_shape(this); diff --git a/modules/mono/editor/code_completion.cpp b/modules/mono/editor/code_completion.cpp index b9936b8c2f35..133c839aeff7 100644 --- a/modules/mono/editor/code_completion.cpp +++ b/modules/mono/editor/code_completion.cpp @@ -123,7 +123,7 @@ PackedStringArray get_code_completion(CompletionKind p_kind, const String &p_scr case CompletionKind::NODE_PATHS: { { // Autoloads. - HashMap autoloads = ProjectSettings::get_singleton()->get_autoload_list(); + HashMap autoloads = HashMap(ProjectSettings::get_singleton()->get_autoload_list()); for (const KeyValue &E : autoloads) { const ProjectSettings::AutoloadInfo &info = E.value; diff --git a/modules/mono/utils/naming_utils.cpp b/modules/mono/utils/naming_utils.cpp index 62fbf815f8d4..e467e431df77 100644 --- a/modules/mono/utils/naming_utils.cpp +++ b/modules/mono/utils/naming_utils.cpp @@ -38,7 +38,7 @@ HashMap _create_hashmap_from_vector(Vector> for (const Pair &pair : vector) { hashmap.insert(pair.first, pair.second); } - return hashmap; + return HashMap(hashmap); } // Hardcoded collection of PascalCase name conversions. diff --git a/modules/multiplayer/multiplayer_synchronizer.cpp b/modules/multiplayer/multiplayer_synchronizer.cpp index ced4719a7367..bad1fc820ada 100644 --- a/modules/multiplayer/multiplayer_synchronizer.cpp +++ b/modules/multiplayer/multiplayer_synchronizer.cpp @@ -372,7 +372,7 @@ void MultiplayerSynchronizer::set_multiplayer_authority(int p_peer_id, bool p_re Error MultiplayerSynchronizer::_watch_changes(uint64_t p_usec) { ERR_FAIL_COND_V(replication_config.is_null(), FAILED); - const List props = replication_config->get_watch_properties(); + const List props = List(replication_config->get_watch_properties()); if (props.size() != watchers.size()) { watchers.resize(props.size()); } @@ -436,7 +436,7 @@ List MultiplayerSynchronizer::get_delta_state(uint64_t p_cur_usec, uint List MultiplayerSynchronizer::get_delta_properties(uint64_t p_indexes) { List out; ERR_FAIL_COND_V(replication_config.is_null(), out); - const List watch_props = replication_config->get_watch_properties(); + const List watch_props = List(replication_config->get_watch_properties()); int idx = 0; for (const NodePath &prop : watch_props) { if ((p_indexes & (1ULL << idx++)) == 0) { diff --git a/modules/multiplayer/scene_multiplayer.h b/modules/multiplayer/scene_multiplayer.h index 23a216786b5d..d95c89c48c9f 100644 --- a/modules/multiplayer/scene_multiplayer.h +++ b/modules/multiplayer/scene_multiplayer.h @@ -182,7 +182,7 @@ class SceneMultiplayer : public MultiplayerAPI { Error send_bytes(Vector p_data, int p_to = MultiplayerPeer::TARGET_PEER_BROADCAST, MultiplayerPeer::TransferMode p_mode = MultiplayerPeer::TRANSFER_MODE_RELIABLE, int p_channel = 0); String get_rpc_md5(const Object *p_obj); - const HashSet get_connected_peers() const { return connected_peers; } + const HashSet get_connected_peers() const { return HashSet(connected_peers); } void set_remote_sender_override(int p_id) { remote_sender_override = p_id; } void set_refuse_new_connections(bool p_refuse); diff --git a/modules/multiplayer/scene_replication_interface.cpp b/modules/multiplayer/scene_replication_interface.cpp index 2e84349a6dfd..61d411cc66f8 100644 --- a/modules/multiplayer/scene_replication_interface.cpp +++ b/modules/multiplayer/scene_replication_interface.cpp @@ -141,7 +141,7 @@ void SceneReplicationInterface::on_network_process() { // Process syncs. uint64_t usec = OS::get_singleton()->get_ticks_usec(); for (KeyValue &E : peers_info) { - const HashSet to_sync = E.value.sync_nodes; + const HashSet to_sync = HashSet(E.value.sync_nodes); if (to_sync.is_empty()) { continue; // Nothing to sync } @@ -248,7 +248,7 @@ Error SceneReplicationInterface::on_replication_start(Object *p_obj, Variant p_c if (pending_buffer_size > 0) { ERR_FAIL_COND_V(!node || !sync->get_replication_config_ptr(), ERR_UNCONFIGURED); int consumed = 0; - const List props = sync->get_replication_config_ptr()->get_spawn_properties(); + const List props = List(sync->get_replication_config_ptr()->get_spawn_properties()); Vector vars; vars.resize(props.size()); Error err = MultiplayerAPI::decode_and_decompress_variants(vars, pending_buffer, pending_buffer_size, consumed); @@ -385,7 +385,7 @@ Error SceneReplicationInterface::_update_spawn_visibility(int p_peer, const Obje ERR_FAIL_NULL_V(spawner, ERR_BUG); ERR_FAIL_COND_V(!_has_authority(spawner), ERR_BUG); ERR_FAIL_COND_V(!tracked_nodes.has(p_oid), ERR_BUG); - const HashSet synchronizers = tracked_nodes[p_oid].synchronizers; + const HashSet synchronizers = HashSet(tracked_nodes[p_oid].synchronizers); bool is_visible = true; for (const ObjectID &sid : synchronizers) { MultiplayerSynchronizer *sync = get_id_as(sid); @@ -489,7 +489,7 @@ Error SceneReplicationInterface::_make_spawn_packet(Node *p_node, MultiplayerSpa // Prepare spawn state. List state_props; List sync_ids; - const HashSet synchronizers = tnode->synchronizers; + const HashSet synchronizers = HashSet(tnode->synchronizers); for (const ObjectID &sid : synchronizers) { MultiplayerSynchronizer *sync = get_id_as(sid); if (!_has_authority(sync)) { @@ -822,7 +822,7 @@ void SceneReplicationInterface::_send_sync(int p_peer, const HashSet & int size; Vector vars; Vector varp; - const List props = sync->get_replication_config_ptr()->get_sync_properties(); + const List props = List(sync->get_replication_config_ptr()->get_sync_properties()); Error err = MultiplayerSynchronizer::get_state(props, node, vars, varp); ERR_CONTINUE_MSG(err != OK, "Unable to retrieve sync state."); err = MultiplayerAPI::encode_and_compress_variants(varp.ptrw(), varp.size(), nullptr, size); @@ -881,7 +881,7 @@ Error SceneReplicationInterface::on_sync_receive(int p_from, const uint8_t *p_bu ofs += size; continue; } - const List props = sync->get_replication_config_ptr()->get_sync_properties(); + const List props = List(sync->get_replication_config_ptr()->get_sync_properties()); Vector vars; vars.resize(props.size()); int consumed; diff --git a/modules/navigation_2d/2d/godot_navigation_server_2d.cpp b/modules/navigation_2d/2d/godot_navigation_server_2d.cpp index 2ddf92ec6147..cc2dd9038ae5 100644 --- a/modules/navigation_2d/2d/godot_navigation_server_2d.cpp +++ b/modules/navigation_2d/2d/godot_navigation_server_2d.cpp @@ -82,7 +82,7 @@ void GodotNavigationServer2D::init() { navmesh_generator_2d = memnew(NavMeshGenerator2D); ERR_FAIL_NULL_MSG(navmesh_generator_2d, "Failed to init NavMeshGenerator2D."); RWLockRead read_lock(geometry_parser_rwlock); - navmesh_generator_2d->set_generator_parsers(generator_parsers); + navmesh_generator_2d->set_generator_parsers(LocalVector(generator_parsers)); #endif // CLIPPER2_ENABLED // TODO } @@ -251,7 +251,7 @@ TypedArray GodotNavigationServer2D::map_get_obstacles(RID p_map) const { TypedArray obstacles_rids; const NavMap2D *map = map_owner.get_or_null(p_map); ERR_FAIL_NULL_V(map, obstacles_rids); - const LocalVector obstacles = map->get_obstacles(); + const LocalVector obstacles = LocalVector(map->get_obstacles()); obstacles_rids.resize(obstacles.size()); for (uint32_t i = 0; i < obstacles.size(); i++) { obstacles_rids[i] = obstacles[i]->get_self(); @@ -1198,7 +1198,7 @@ COMMAND_1(free_rid, RID, p_object) { generator_parsers.erase(parser); #ifdef CLIPPER2_ENABLED - NavMeshGenerator2D::get_singleton()->set_generator_parsers(generator_parsers); + NavMeshGenerator2D::get_singleton()->set_generator_parsers(LocalVector(generator_parsers)); #endif geometry_parser_owner.free(parser->self); return; @@ -1384,7 +1384,7 @@ RID GodotNavigationServer2D::source_geometry_parser_create() { generator_parsers.push_back(parser); #ifdef CLIPPER2_ENABLED - NavMeshGenerator2D::get_singleton()->set_generator_parsers(generator_parsers); + NavMeshGenerator2D::get_singleton()->set_generator_parsers(LocalVector(generator_parsers)); #endif return rid; } diff --git a/modules/navigation_3d/3d/godot_navigation_server_3d.cpp b/modules/navigation_3d/3d/godot_navigation_server_3d.cpp index 35b076c874c0..3a8aa500a353 100644 --- a/modules/navigation_3d/3d/godot_navigation_server_3d.cpp +++ b/modules/navigation_3d/3d/godot_navigation_server_3d.cpp @@ -333,7 +333,7 @@ TypedArray GodotNavigationServer3D::map_get_obstacles(RID p_map) const { TypedArray obstacles_rids; const NavMap3D *map = map_owner.get_or_null(p_map); ERR_FAIL_NULL_V(map, obstacles_rids); - const LocalVector obstacles = map->get_obstacles(); + const LocalVector obstacles = LocalVector(map->get_obstacles()); obstacles_rids.resize(obstacles.size()); for (uint32_t i = 0; i < obstacles.size(); i++) { obstacles_rids[i] = obstacles[i]->get_self(); @@ -1296,7 +1296,7 @@ COMMAND_1(free_rid, RID, p_object) { ERR_FAIL_NULL(parser); generator_parsers.erase(parser); - NavMeshGenerator3D::get_singleton()->set_generator_parsers(generator_parsers); + NavMeshGenerator3D::get_singleton()->set_generator_parsers(LocalVector(generator_parsers)); geometry_parser_owner.free(parser->self); } else { @@ -1435,7 +1435,7 @@ void GodotNavigationServer3D::physics_process(double p_delta_time) { void GodotNavigationServer3D::init() { navmesh_generator_3d = memnew(NavMeshGenerator3D); RWLockRead read_lock(geometry_parser_rwlock); - navmesh_generator_3d->set_generator_parsers(generator_parsers); + navmesh_generator_3d->set_generator_parsers(LocalVector(generator_parsers)); } void GodotNavigationServer3D::finish() { @@ -1466,7 +1466,7 @@ RID GodotNavigationServer3D::source_geometry_parser_create() { parser->self = rid; generator_parsers.push_back(parser); - NavMeshGenerator3D::get_singleton()->set_generator_parsers(generator_parsers); + NavMeshGenerator3D::get_singleton()->set_generator_parsers(LocalVector(generator_parsers)); return rid; } diff --git a/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp b/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp index 27f134146d95..7e49c62147d3 100644 --- a/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp +++ b/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp @@ -265,7 +265,7 @@ void NavigationRegion3DEditorPlugin::edit(Object *p_object) { NavigationRegion3D *region = Object::cast_to(p_object); if (region) { regions.push_back(region); - navigation_region_editor->edit(regions); + navigation_region_editor->edit(LocalVector(regions)); return; } } @@ -281,7 +281,7 @@ void NavigationRegion3DEditorPlugin::edit(Object *p_object) { } } - navigation_region_editor->edit(regions); + navigation_region_editor->edit(LocalVector(regions)); } bool NavigationRegion3DEditorPlugin::handles(Object *p_object) const { diff --git a/modules/objectdb_profiler/editor/snapshot_data.cpp b/modules/objectdb_profiler/editor/snapshot_data.cpp index 6e73e995a86b..1da2644c7d4e 100644 --- a/modules/objectdb_profiler/editor/snapshot_data.cpp +++ b/modules/objectdb_profiler/editor/snapshot_data.cpp @@ -198,15 +198,15 @@ HashSet SnapshotDataObject::_unique_references(const HashMap(obj_set); } HashSet SnapshotDataObject::get_unique_outbound_refernces() { - return _unique_references(outbound_references); + return HashSet(_unique_references(outbound_references)); } HashSet SnapshotDataObject::get_unique_inbound_references() { - return _unique_references(inbound_references); + return HashSet(_unique_references(inbound_references)); } void GameStateSnapshot::_get_outbound_references(Variant &p_var, HashMap &r_ret_val, const String &p_current_path) { @@ -271,11 +271,11 @@ void GameStateSnapshot::_get_rc_cycles( SnapshotDataObject *next = objects[next_child.value]; if (next != nullptr && next->is_class(RefCounted::get_class_static()) && !next->is_class(WeakRef::get_class_static()) && !p_traversed_objs.has(next)) { - HashSet traversed_copy = p_traversed_objs; + HashSet traversed_copy = HashSet(p_traversed_objs); if (p_obj != p_source_obj) { traversed_copy.insert(p_obj); } - _get_rc_cycles(next, p_source_obj, traversed_copy, r_ret_val, child_path); + _get_rc_cycles(next, p_source_obj, HashSet(traversed_copy), r_ret_val, child_path); } } } @@ -309,7 +309,7 @@ void GameStateSnapshot::recompute_references() { HashSet traversed_objs; LocalVector cycles; - _get_rc_cycles(obj.value, obj.value, traversed_objs, cycles, ""); + _get_rc_cycles(obj.value, obj.value, HashSet(traversed_objs), cycles, ""); Array cycles_array; for (const String &cycle : cycles) { cycles_array.push_back(cycle); diff --git a/modules/openxr/extensions/openxr_composition_layer_depth_extension.cpp b/modules/openxr/extensions/openxr_composition_layer_depth_extension.cpp index b3c94d44f079..d12d750d04f0 100644 --- a/modules/openxr/extensions/openxr_composition_layer_depth_extension.cpp +++ b/modules/openxr/extensions/openxr_composition_layer_depth_extension.cpp @@ -49,7 +49,7 @@ HashMap OpenXRCompositionLayerDepthExtension::get_requested_exte request_extensions[XR_KHR_COMPOSITION_LAYER_DEPTH_EXTENSION_NAME] = &available; - return request_extensions; + return HashMap(request_extensions); } bool OpenXRCompositionLayerDepthExtension::is_available() { diff --git a/modules/openxr/extensions/openxr_composition_layer_extension.cpp b/modules/openxr/extensions/openxr_composition_layer_extension.cpp index ded3c6175ea6..9be1a94fb9ad 100644 --- a/modules/openxr/extensions/openxr_composition_layer_extension.cpp +++ b/modules/openxr/extensions/openxr_composition_layer_extension.cpp @@ -66,7 +66,7 @@ HashMap OpenXRCompositionLayerExtension::get_requested_extension request_extensions[XR_KHR_ANDROID_SURFACE_SWAPCHAIN_EXTENSION_NAME] = &android_surface_ext_available; #endif - return request_extensions; + return HashMap(request_extensions); } void OpenXRCompositionLayerExtension::on_instance_created(const XrInstance p_instance) { diff --git a/modules/openxr/extensions/openxr_debug_utils_extension.cpp b/modules/openxr/extensions/openxr_debug_utils_extension.cpp index cb7f72d02d28..981eb8c07989 100644 --- a/modules/openxr/extensions/openxr_debug_utils_extension.cpp +++ b/modules/openxr/extensions/openxr_debug_utils_extension.cpp @@ -55,7 +55,7 @@ HashMap OpenXRDebugUtilsExtension::get_requested_extensions() { request_extensions[XR_EXT_DEBUG_UTILS_EXTENSION_NAME] = &debug_utils_ext; - return request_extensions; + return HashMap(request_extensions); } void OpenXRDebugUtilsExtension::on_instance_created(const XrInstance p_instance) { diff --git a/modules/openxr/extensions/openxr_dpad_binding_extension.cpp b/modules/openxr/extensions/openxr_dpad_binding_extension.cpp index 05da048ff1f7..55aebe16a246 100644 --- a/modules/openxr/extensions/openxr_dpad_binding_extension.cpp +++ b/modules/openxr/extensions/openxr_dpad_binding_extension.cpp @@ -59,7 +59,7 @@ HashMap OpenXRDPadBindingExtension::get_requested_extensions() { request_extensions[XR_KHR_BINDING_MODIFICATION_EXTENSION_NAME] = &binding_modifier_ext; request_extensions[XR_EXT_DPAD_BINDING_EXTENSION_NAME] = &dpad_binding_ext; - return request_extensions; + return HashMap(request_extensions); } bool OpenXRDPadBindingExtension::is_available() { diff --git a/modules/openxr/extensions/openxr_extension_wrapper.cpp b/modules/openxr/extensions/openxr_extension_wrapper.cpp index f1e0b388aa16..73d96af7c53b 100644 --- a/modules/openxr/extensions/openxr_extension_wrapper.cpp +++ b/modules/openxr/extensions/openxr_extension_wrapper.cpp @@ -89,7 +89,7 @@ HashMap OpenXRExtensionWrapper::get_requested_extensions() { GDExtensionPtr value = VariantCaster>::cast(kv.value); result.insert(kv.key, value); } - return result; + return HashMap(result); } return HashMap(); diff --git a/modules/openxr/extensions/openxr_eye_gaze_interaction.cpp b/modules/openxr/extensions/openxr_eye_gaze_interaction.cpp index 0131a801331a..200947a42c0a 100644 --- a/modules/openxr/extensions/openxr_eye_gaze_interaction.cpp +++ b/modules/openxr/extensions/openxr_eye_gaze_interaction.cpp @@ -60,7 +60,7 @@ HashMap OpenXREyeGazeInteractionExtension::get_requested_extensi request_extensions[XR_EXT_EYE_GAZE_INTERACTION_EXTENSION_NAME] = &available; } - return request_extensions; + return HashMap(request_extensions); } void *OpenXREyeGazeInteractionExtension::set_system_properties_and_get_next_pointer(void *p_next_pointer) { diff --git a/modules/openxr/extensions/openxr_fb_display_refresh_rate_extension.cpp b/modules/openxr/extensions/openxr_fb_display_refresh_rate_extension.cpp index 402389144abc..24d3fa5c8231 100644 --- a/modules/openxr/extensions/openxr_fb_display_refresh_rate_extension.cpp +++ b/modules/openxr/extensions/openxr_fb_display_refresh_rate_extension.cpp @@ -50,7 +50,7 @@ HashMap OpenXRDisplayRefreshRateExtension::get_requested_extensi request_extensions[XR_FB_DISPLAY_REFRESH_RATE_EXTENSION_NAME] = &display_refresh_rate_ext; - return request_extensions; + return HashMap(request_extensions); } void OpenXRDisplayRefreshRateExtension::on_instance_created(const XrInstance p_instance) { diff --git a/modules/openxr/extensions/openxr_fb_foveation_extension.cpp b/modules/openxr/extensions/openxr_fb_foveation_extension.cpp index 26a1ec385785..86fb2dd80dfe 100644 --- a/modules/openxr/extensions/openxr_fb_foveation_extension.cpp +++ b/modules/openxr/extensions/openxr_fb_foveation_extension.cpp @@ -78,7 +78,7 @@ HashMap OpenXRFBFoveationExtension::get_requested_extensions() { } #endif // XR_USE_GRAPHICS_API_VULKAN - return request_extensions; + return HashMap(request_extensions); } void OpenXRFBFoveationExtension::on_instance_created(const XrInstance p_instance) { diff --git a/modules/openxr/extensions/openxr_fb_update_swapchain_extension.cpp b/modules/openxr/extensions/openxr_fb_update_swapchain_extension.cpp index a3b31003fbd7..1e5e7a5f63d6 100644 --- a/modules/openxr/extensions/openxr_fb_update_swapchain_extension.cpp +++ b/modules/openxr/extensions/openxr_fb_update_swapchain_extension.cpp @@ -80,7 +80,7 @@ HashMap OpenXRFBUpdateSwapchainExtension::get_requested_extensio request_extensions[XR_FB_SWAPCHAIN_UPDATE_STATE_ANDROID_SURFACE_EXTENSION_NAME] = &fb_swapchain_update_state_android_ext; #endif - return request_extensions; + return HashMap(request_extensions); } void OpenXRFBUpdateSwapchainExtension::on_instance_created(const XrInstance p_instance) { diff --git a/modules/openxr/extensions/openxr_future_extension.cpp b/modules/openxr/extensions/openxr_future_extension.cpp index 9d7e7afdc57e..4e0c1e1b0428 100644 --- a/modules/openxr/extensions/openxr_future_extension.cpp +++ b/modules/openxr/extensions/openxr_future_extension.cpp @@ -134,7 +134,7 @@ HashMap OpenXRFutureExtension::get_requested_extensions() { request_extensions[XR_EXT_FUTURE_EXTENSION_NAME] = &future_ext; - return request_extensions; + return HashMap(request_extensions); } void OpenXRFutureExtension::on_instance_created(const XrInstance p_instance) { diff --git a/modules/openxr/extensions/openxr_hand_interaction_extension.cpp b/modules/openxr/extensions/openxr_hand_interaction_extension.cpp index 4d91eeca1fc4..23cfe92a8a19 100644 --- a/modules/openxr/extensions/openxr_hand_interaction_extension.cpp +++ b/modules/openxr/extensions/openxr_hand_interaction_extension.cpp @@ -59,7 +59,7 @@ HashMap OpenXRHandInteractionExtension::get_requested_extensions request_extensions[XR_META_HAND_TRACKING_MICROGESTURES_EXTENSION_NAME] = &available; } - return request_extensions; + return HashMap(request_extensions); } bool OpenXRHandInteractionExtension::is_available() { diff --git a/modules/openxr/extensions/openxr_hand_tracking_extension.cpp b/modules/openxr/extensions/openxr_hand_tracking_extension.cpp index 6f4e3ede5921..914f0b078892 100644 --- a/modules/openxr/extensions/openxr_hand_tracking_extension.cpp +++ b/modules/openxr/extensions/openxr_hand_tracking_extension.cpp @@ -67,7 +67,7 @@ HashMap OpenXRHandTrackingExtension::get_requested_extensions() request_extensions[XR_EXT_HAND_TRACKING_DATA_SOURCE_EXTENSION_NAME] = &hand_tracking_source_ext; } - return request_extensions; + return HashMap(request_extensions); } void OpenXRHandTrackingExtension::on_instance_created(const XrInstance p_instance) { diff --git a/modules/openxr/extensions/openxr_htc_controller_extension.cpp b/modules/openxr/extensions/openxr_htc_controller_extension.cpp index 122754a28ea8..1f6ae8d78a84 100644 --- a/modules/openxr/extensions/openxr_htc_controller_extension.cpp +++ b/modules/openxr/extensions/openxr_htc_controller_extension.cpp @@ -39,7 +39,7 @@ HashMap OpenXRHTCControllerExtension::get_requested_extensions() request_extensions[XR_HTC_VIVE_FOCUS3_CONTROLLER_INTERACTION_EXTENSION_NAME] = &available[HTC_VIVE_FOCUS3]; request_extensions[XR_HTC_HAND_INTERACTION_EXTENSION_NAME] = &available[HTC_HAND_INTERACTION]; - return request_extensions; + return HashMap(request_extensions); } PackedStringArray OpenXRHTCControllerExtension::get_suggested_tracker_names() { diff --git a/modules/openxr/extensions/openxr_htc_vive_tracker_extension.cpp b/modules/openxr/extensions/openxr_htc_vive_tracker_extension.cpp index dd3a32e47485..c0a3c32a9214 100644 --- a/modules/openxr/extensions/openxr_htc_vive_tracker_extension.cpp +++ b/modules/openxr/extensions/openxr_htc_vive_tracker_extension.cpp @@ -39,7 +39,7 @@ HashMap OpenXRHTCViveTrackerExtension::get_requested_extensions( request_extensions[XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME] = &available; - return request_extensions; + return HashMap(request_extensions); } PackedStringArray OpenXRHTCViveTrackerExtension::get_suggested_tracker_names() { diff --git a/modules/openxr/extensions/openxr_huawei_controller_extension.cpp b/modules/openxr/extensions/openxr_huawei_controller_extension.cpp index a89fb40f1010..da01e72f5134 100644 --- a/modules/openxr/extensions/openxr_huawei_controller_extension.cpp +++ b/modules/openxr/extensions/openxr_huawei_controller_extension.cpp @@ -37,7 +37,7 @@ HashMap OpenXRHuaweiControllerExtension::get_requested_extension request_extensions[XR_HUAWEI_CONTROLLER_INTERACTION_EXTENSION_NAME] = &available; - return request_extensions; + return HashMap(request_extensions); } bool OpenXRHuaweiControllerExtension::is_available() { diff --git a/modules/openxr/extensions/openxr_local_floor_extension.cpp b/modules/openxr/extensions/openxr_local_floor_extension.cpp index 5e17ba715b77..9ebbf8006bbe 100644 --- a/modules/openxr/extensions/openxr_local_floor_extension.cpp +++ b/modules/openxr/extensions/openxr_local_floor_extension.cpp @@ -49,7 +49,7 @@ HashMap OpenXRLocalFloorExtension::get_requested_extensions() { request_extensions[XR_EXT_LOCAL_FLOOR_EXTENSION_NAME] = &available; - return request_extensions; + return HashMap(request_extensions); } bool OpenXRLocalFloorExtension::is_available() { diff --git a/modules/openxr/extensions/openxr_meta_controller_extension.cpp b/modules/openxr/extensions/openxr_meta_controller_extension.cpp index add959e76aa2..3524cf98437c 100644 --- a/modules/openxr/extensions/openxr_meta_controller_extension.cpp +++ b/modules/openxr/extensions/openxr_meta_controller_extension.cpp @@ -39,7 +39,7 @@ HashMap OpenXRMetaControllerExtension::get_requested_extensions( request_extensions[XR_FB_TOUCH_CONTROLLER_PRO_EXTENSION_NAME] = &available[META_TOUCH_PRO]; request_extensions[XR_META_TOUCH_CONTROLLER_PLUS_EXTENSION_NAME] = &available[META_TOUCH_PLUS]; - return request_extensions; + return HashMap(request_extensions); } bool OpenXRMetaControllerExtension::is_available(MetaControllers p_type) { diff --git a/modules/openxr/extensions/openxr_ml2_controller_extension.cpp b/modules/openxr/extensions/openxr_ml2_controller_extension.cpp index cdf17deec9fa..3f485781dcce 100644 --- a/modules/openxr/extensions/openxr_ml2_controller_extension.cpp +++ b/modules/openxr/extensions/openxr_ml2_controller_extension.cpp @@ -37,7 +37,7 @@ HashMap OpenXRML2ControllerExtension::get_requested_extensions() request_extensions[XR_ML_ML2_CONTROLLER_INTERACTION_EXTENSION_NAME] = &available; - return request_extensions; + return HashMap(request_extensions); } bool OpenXRML2ControllerExtension::is_available() { diff --git a/modules/openxr/extensions/openxr_mxink_extension.cpp b/modules/openxr/extensions/openxr_mxink_extension.cpp index e0585060a0ad..8a25657d9a56 100644 --- a/modules/openxr/extensions/openxr_mxink_extension.cpp +++ b/modules/openxr/extensions/openxr_mxink_extension.cpp @@ -40,7 +40,7 @@ HashMap OpenXRMxInkExtension::get_requested_extensions() { request_extensions[XR_LOGITECH_MX_INK_STYLUS_INTERACTION_EXTENSION_NAME] = &available; - return request_extensions; + return HashMap(request_extensions); } bool OpenXRMxInkExtension::is_available() { diff --git a/modules/openxr/extensions/openxr_palm_pose_extension.cpp b/modules/openxr/extensions/openxr_palm_pose_extension.cpp index 7f8e771fcd03..696c21059b5d 100644 --- a/modules/openxr/extensions/openxr_palm_pose_extension.cpp +++ b/modules/openxr/extensions/openxr_palm_pose_extension.cpp @@ -49,7 +49,7 @@ HashMap OpenXRPalmPoseExtension::get_requested_extensions() { request_extensions[XR_EXT_PALM_POSE_EXTENSION_NAME] = &available; - return request_extensions; + return HashMap(request_extensions); } bool OpenXRPalmPoseExtension::is_available() { diff --git a/modules/openxr/extensions/openxr_performance_settings_extension.cpp b/modules/openxr/extensions/openxr_performance_settings_extension.cpp index deb9a2851091..7d0a7b4efeca 100644 --- a/modules/openxr/extensions/openxr_performance_settings_extension.cpp +++ b/modules/openxr/extensions/openxr_performance_settings_extension.cpp @@ -51,7 +51,7 @@ HashMap OpenXRPerformanceSettingsExtension::get_requested_extens request_extensions[XR_EXT_PERFORMANCE_SETTINGS_EXTENSION_NAME] = &available; - return request_extensions; + return HashMap(request_extensions); } void OpenXRPerformanceSettingsExtension::on_instance_created(const XrInstance p_instance) { diff --git a/modules/openxr/extensions/openxr_pico_controller_extension.cpp b/modules/openxr/extensions/openxr_pico_controller_extension.cpp index 41f061903221..0b6900fd2af5 100644 --- a/modules/openxr/extensions/openxr_pico_controller_extension.cpp +++ b/modules/openxr/extensions/openxr_pico_controller_extension.cpp @@ -41,7 +41,7 @@ HashMap OpenXRPicoControllerExtension::get_requested_extensions( request_extensions[XR_BD_CONTROLLER_INTERACTION_EXTENSION_NAME] = &available; - return request_extensions; + return HashMap(request_extensions); } bool OpenXRPicoControllerExtension::is_available() { diff --git a/modules/openxr/extensions/openxr_render_model_extension.cpp b/modules/openxr/extensions/openxr_render_model_extension.cpp index 9029a4c2417d..d11c6e44ddc6 100644 --- a/modules/openxr/extensions/openxr_render_model_extension.cpp +++ b/modules/openxr/extensions/openxr_render_model_extension.cpp @@ -80,7 +80,7 @@ HashMap OpenXRRenderModelExtension::get_requested_extensions() { request_extensions[XR_EXT_INTERACTION_RENDER_MODEL_EXTENSION_NAME] = &interaction_render_model_ext; } - return request_extensions; + return HashMap(request_extensions); } void OpenXRRenderModelExtension::on_instance_created(const XrInstance p_instance) { diff --git a/modules/openxr/extensions/openxr_valve_analog_threshold_extension.cpp b/modules/openxr/extensions/openxr_valve_analog_threshold_extension.cpp index 58f9df35e5d4..ddf7ae3c5045 100644 --- a/modules/openxr/extensions/openxr_valve_analog_threshold_extension.cpp +++ b/modules/openxr/extensions/openxr_valve_analog_threshold_extension.cpp @@ -60,7 +60,7 @@ HashMap OpenXRValveAnalogThresholdExtension::get_requested_exten request_extensions[XR_KHR_BINDING_MODIFICATION_EXTENSION_NAME] = &binding_modifier_ext; request_extensions[XR_VALVE_ANALOG_THRESHOLD_EXTENSION_NAME] = &threshold_ext; - return request_extensions; + return HashMap(request_extensions); } bool OpenXRValveAnalogThresholdExtension::is_available() { diff --git a/modules/openxr/extensions/openxr_visibility_mask_extension.cpp b/modules/openxr/extensions/openxr_visibility_mask_extension.cpp index 145d03cbe561..cfb5874161ec 100644 --- a/modules/openxr/extensions/openxr_visibility_mask_extension.cpp +++ b/modules/openxr/extensions/openxr_visibility_mask_extension.cpp @@ -74,7 +74,7 @@ HashMap OpenXRVisibilityMaskExtension::get_requested_extensions( request_extensions[XR_KHR_VISIBILITY_MASK_EXTENSION_NAME] = &available; - return request_extensions; + return HashMap(request_extensions); } void OpenXRVisibilityMaskExtension::on_instance_created(const XrInstance p_instance) { diff --git a/modules/openxr/extensions/openxr_wmr_controller_extension.cpp b/modules/openxr/extensions/openxr_wmr_controller_extension.cpp index bac215bb1170..44377b36fc01 100644 --- a/modules/openxr/extensions/openxr_wmr_controller_extension.cpp +++ b/modules/openxr/extensions/openxr_wmr_controller_extension.cpp @@ -40,7 +40,7 @@ HashMap OpenXRWMRControllerExtension::get_requested_extensions() request_extensions[XR_EXT_SAMSUNG_ODYSSEY_CONTROLLER_EXTENSION_NAME] = &available[WMR_SAMSUNG_ODESSY]; request_extensions[XR_MSFT_HAND_INTERACTION_EXTENSION_NAME] = &available[WMR_HAND_INTERACTION]; - return request_extensions; + return HashMap(request_extensions); } bool OpenXRWMRControllerExtension::is_available(WMRControllers p_type) { diff --git a/modules/openxr/extensions/platform/openxr_android_extension.cpp b/modules/openxr/extensions/platform/openxr_android_extension.cpp index dfefe6551089..1bd9f34539f6 100644 --- a/modules/openxr/extensions/platform/openxr_android_extension.cpp +++ b/modules/openxr/extensions/platform/openxr_android_extension.cpp @@ -63,7 +63,7 @@ HashMap OpenXRAndroidExtension::get_requested_extensions() { request_extensions[XR_KHR_LOADER_INIT_ANDROID_EXTENSION_NAME] = &loader_init_android_extension_available; request_extensions[XR_KHR_ANDROID_CREATE_INSTANCE_EXTENSION_NAME] = &create_instance_extension_available; - return request_extensions; + return HashMap(request_extensions); } void OpenXRAndroidExtension::on_before_instance_created() { diff --git a/modules/openxr/extensions/platform/openxr_d3d12_extension.cpp b/modules/openxr/extensions/platform/openxr_d3d12_extension.cpp index 7e5e45d0cb67..bbc3f0e2d6d7 100644 --- a/modules/openxr/extensions/platform/openxr_d3d12_extension.cpp +++ b/modules/openxr/extensions/platform/openxr_d3d12_extension.cpp @@ -42,7 +42,7 @@ HashMap OpenXRD3D12Extension::get_requested_extensions() { request_extensions[XR_KHR_D3D12_ENABLE_EXTENSION_NAME] = nullptr; - return request_extensions; + return HashMap(request_extensions); } void OpenXRD3D12Extension::on_instance_created(const XrInstance p_instance) { diff --git a/modules/openxr/extensions/platform/openxr_metal_extension.mm b/modules/openxr/extensions/platform/openxr_metal_extension.mm index 0d12824cbf80..5b042285179c 100644 --- a/modules/openxr/extensions/platform/openxr_metal_extension.mm +++ b/modules/openxr/extensions/platform/openxr_metal_extension.mm @@ -40,7 +40,7 @@ request_extensions[XR_KHR_METAL_ENABLE_EXTENSION_NAME] = nullptr; - return request_extensions; + return HashMap(request_extensions); } void OpenXRMetalExtension::on_instance_created(const XrInstance p_instance) { diff --git a/modules/openxr/extensions/platform/openxr_opengl_extension.cpp b/modules/openxr/extensions/platform/openxr_opengl_extension.cpp index d20817c407df..acfa8b0d1a3a 100644 --- a/modules/openxr/extensions/platform/openxr_opengl_extension.cpp +++ b/modules/openxr/extensions/platform/openxr_opengl_extension.cpp @@ -68,7 +68,7 @@ HashMap OpenXROpenGLExtension::get_requested_extensions() { request_extensions[XR_MNDX_EGL_ENABLE_EXTENSION_NAME] = &egl_extension_enabled; #endif - return request_extensions; + return HashMap(request_extensions); } void OpenXROpenGLExtension::on_instance_created(const XrInstance p_instance) { diff --git a/modules/openxr/extensions/platform/openxr_vulkan_extension.cpp b/modules/openxr/extensions/platform/openxr_vulkan_extension.cpp index 1255ea35feab..306715c6e667 100644 --- a/modules/openxr/extensions/platform/openxr_vulkan_extension.cpp +++ b/modules/openxr/extensions/platform/openxr_vulkan_extension.cpp @@ -44,7 +44,7 @@ HashMap OpenXRVulkanExtension::get_requested_extensions() { request_extensions[XR_KHR_VULKAN_ENABLE2_EXTENSION_NAME] = nullptr; // must be available - return request_extensions; + return HashMap(request_extensions); } void OpenXRVulkanExtension::on_instance_created(const XrInstance p_instance) { diff --git a/modules/openxr/extensions/spatial_entities/openxr_spatial_anchor.cpp b/modules/openxr/extensions/spatial_entities/openxr_spatial_anchor.cpp index 2348ebbf1549..df9def3ba038 100644 --- a/modules/openxr/extensions/spatial_entities/openxr_spatial_anchor.cpp +++ b/modules/openxr/extensions/spatial_entities/openxr_spatial_anchor.cpp @@ -343,7 +343,7 @@ HashMap OpenXRSpatialAnchorCapability::get_requested_extensions( } } - return request_extensions; + return HashMap(request_extensions); } void OpenXRSpatialAnchorCapability::on_instance_created(const XrInstance p_instance) { diff --git a/modules/openxr/extensions/spatial_entities/openxr_spatial_entity_extension.cpp b/modules/openxr/extensions/spatial_entities/openxr_spatial_entity_extension.cpp index 6cc60042332b..ca45f25f7598 100644 --- a/modules/openxr/extensions/spatial_entities/openxr_spatial_entity_extension.cpp +++ b/modules/openxr/extensions/spatial_entities/openxr_spatial_entity_extension.cpp @@ -113,7 +113,7 @@ HashMap OpenXRSpatialEntityExtension::get_requested_extensions() request_extensions[XR_EXT_SPATIAL_ENTITY_EXTENSION_NAME] = &spatial_entity_ext; } - return request_extensions; + return HashMap(request_extensions); } void OpenXRSpatialEntityExtension::on_instance_created(const XrInstance p_instance) { diff --git a/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.cpp b/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.cpp index 1d9e832c4dc2..6a0219fc1ce2 100644 --- a/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.cpp +++ b/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.cpp @@ -451,7 +451,7 @@ HashMap OpenXRSpatialMarkerTrackingCapability::get_requested_ext request_extensions[XR_EXT_SPATIAL_MARKER_TRACKING_EXTENSION_NAME] = &spatial_marker_tracking_ext; } - return request_extensions; + return HashMap(request_extensions); } void OpenXRSpatialMarkerTrackingCapability::on_session_created(const XrSession p_session) { diff --git a/modules/openxr/extensions/spatial_entities/openxr_spatial_plane_tracking.cpp b/modules/openxr/extensions/spatial_entities/openxr_spatial_plane_tracking.cpp index 504905e69eeb..ba2a225b98f5 100644 --- a/modules/openxr/extensions/spatial_entities/openxr_spatial_plane_tracking.cpp +++ b/modules/openxr/extensions/spatial_entities/openxr_spatial_plane_tracking.cpp @@ -590,7 +590,7 @@ HashMap OpenXRSpatialPlaneTrackingCapability::get_requested_exte request_extensions[XR_EXT_SPATIAL_PLANE_TRACKING_EXTENSION_NAME] = &spatial_plane_tracking_ext; } - return request_extensions; + return HashMap(request_extensions); } void OpenXRSpatialPlaneTrackingCapability::on_session_created(const XrSession p_session) { diff --git a/platform/ios/export/export_plugin.cpp b/platform/ios/export/export_plugin.cpp index 56e4ae10b3e9..4611bcb8b63a 100644 --- a/platform/ios/export/export_plugin.cpp +++ b/platform/ios/export/export_plugin.cpp @@ -104,7 +104,7 @@ HashMap EditorExportPlatformIOS::get_custom_project_settings(co } } settings["ios/launch_screen_image_mode"] = value; - return settings; + return HashMap(settings); } Error EditorExportPlatformIOS::_export_loading_screen_file(const Ref &p_preset, const String &p_dest_dir) { diff --git a/platform/macos/os_macos.mm b/platform/macos/os_macos.mm index 512489734cc6..0da76acd6ccf 100644 --- a/platform/macos/os_macos.mm +++ b/platform/macos/os_macos.mm @@ -272,7 +272,7 @@ } List OS_MacOS::get_cmdline_platform_args() const { - return launch_service_args; + return List(launch_service_args); } void OS_MacOS::load_shell_environment() const { @@ -860,7 +860,7 @@ // Project started from the editor, inject "path" argument to set instance working directory. char cwd[PATH_MAX]; if (::getcwd(cwd, sizeof(cwd)) != nullptr) { - List arguments = p_arguments; + List arguments = List(p_arguments); arguments.push_back("--path"); arguments.push_back(String::utf8(cwd)); return create_process(path, arguments, r_child_id, false); diff --git a/platform/windows/export/template_modifier.cpp b/platform/windows/export/template_modifier.cpp index c55d42e9ab63..40a28239ef93 100644 --- a/platform/windows/export/template_modifier.cpp +++ b/platform/windows/export/template_modifier.cpp @@ -613,7 +613,7 @@ HashMap TemplateModifier::_get_strings(const Ref(strings); } Error TemplateModifier::_modify_template(const Ref &p_preset, const String &p_template_path, const String &p_icon_path) const { diff --git a/scene/2d/audio_stream_player_2d.cpp b/scene/2d/audio_stream_player_2d.cpp index e1fa6d5547f7..873af12bd635 100644 --- a/scene/2d/audio_stream_player_2d.cpp +++ b/scene/2d/audio_stream_player_2d.cpp @@ -125,7 +125,7 @@ void AudioStreamPlayer2D::_update_panning() { Vector2 global_pos = get_global_position(); - HashSet viewports = world_2d->get_viewports(); + const HashSet viewports = HashSet(world_2d->get_viewports()); volume_vector.resize(4); volume_vector.write[0] = AudioFrame(0, 0); diff --git a/scene/2d/physics/area_2d.cpp b/scene/2d/physics/area_2d.cpp index 3779078b9fa9..0a2dcfa455e0 100644 --- a/scene/2d/physics/area_2d.cpp +++ b/scene/2d/physics/area_2d.cpp @@ -357,7 +357,7 @@ void Area2D::_clear_monitoring() { ERR_FAIL_COND_MSG(locked, "This function can't be used during the in/out signal."); { - HashMap bmcopy = body_map; + HashMap bmcopy = HashMap(body_map); body_map.clear(); //disconnect all monitored stuff @@ -385,7 +385,7 @@ void Area2D::_clear_monitoring() { } { - HashMap bmcopy = area_map; + HashMap bmcopy = HashMap(area_map); area_map.clear(); //disconnect all monitored stuff diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index f7b3eb1f138b..3f05187d436b 100644 --- a/scene/2d/tile_map.cpp +++ b/scene/2d/tile_map.cpp @@ -147,7 +147,7 @@ Vector TileMap::_get_tile_map_data_using_compatibility_format(int p_layer) ERR_FAIL_INDEX_V(p_layer, (int)layers.size(), Vector()); // Export tile data to raw format. - const HashMap tile_map_layer_data = layers[p_layer]->get_tile_map_layer_data(); + const HashMap tile_map_layer_data = HashMap(layers[p_layer]->get_tile_map_layer_data()); Vector tile_data; tile_data.resize(tile_map_layer_data.size() * 3); int *w = tile_data.ptrw(); diff --git a/scene/2d/tile_map_layer.cpp b/scene/2d/tile_map_layer.cpp index 8d06e05a11e7..74079cce2d88 100644 --- a/scene/2d/tile_map_layer.cpp +++ b/scene/2d/tile_map_layer.cpp @@ -1902,7 +1902,7 @@ RBSet TileMapLayer::_get_terrain_constraints_from_added_patte } } - return output; + return RBSet(output); } RBSet TileMapLayer::_get_terrain_constraints_from_painted_cells_list(const RBSet &p_painted, int p_terrain_set, bool p_ignore_empty_terrains) const { @@ -1989,7 +1989,7 @@ RBSet TileMapLayer::_get_terrain_constraints_from_painted_cel } } - return constraints; + return RBSet(constraints); } void TileMapLayer::_tile_set_changed() { @@ -2364,7 +2364,7 @@ HashMap TileMapLayer::terrain_fill_constrain } // Copy the constraints set. - RBSet constraints = p_constraints; + RBSet constraints = RBSet(p_constraints); // Output map. HashMap output; @@ -2402,7 +2402,7 @@ HashMap TileMapLayer::terrain_fill_constrain output[coords] = pattern; } - return output; + return HashMap(output); } HashMap TileMapLayer::terrain_fill_connect(const Vector &p_coords_array, int p_terrain_set, int p_terrain, bool p_ignore_empty_terrains) const { @@ -2528,7 +2528,7 @@ HashMap TileMapLayer::terrain_fill_path(cons } } } - ERR_FAIL_COND_V_MSG(found_bit == TileSet::CELL_NEIGHBOR_MAX, output, vformat("Invalid terrain path, %s is not a neighboring tile of %s", p_coords_array[i + 1], p_coords_array[i])); + ERR_FAIL_COND_V_MSG(found_bit == TileSet::CELL_NEIGHBOR_MAX, (HashMap(output)), vformat("Invalid terrain path, %s is not a neighboring tile of %s", p_coords_array[i + 1], p_coords_array[i])); neighbor_list.push_back(found_bit); } @@ -3631,7 +3631,7 @@ HashMap TerrainConstraint::get_overlapping_coor output[tile_set->get_neighbor_cell(base_cell_coords, TileSet::CELL_NEIGHBOR_BOTTOM_SIDE)] = TileSet::CELL_NEIGHBOR_TOP_SIDE; break; default: - ERR_FAIL_V(output); + ERR_FAIL_V((HashMap(output))); } } else if (shape == TileSet::TILE_SHAPE_ISOMETRIC) { switch (bit) { @@ -3650,7 +3650,7 @@ HashMap TerrainConstraint::get_overlapping_coor output[tile_set->get_neighbor_cell(base_cell_coords, TileSet::CELL_NEIGHBOR_BOTTOM_LEFT_SIDE)] = TileSet::CELL_NEIGHBOR_TOP_RIGHT_SIDE; break; default: - ERR_FAIL_V(output); + ERR_FAIL_V((HashMap(output))); } } else { // Half offset shapes. @@ -3680,7 +3680,7 @@ HashMap TerrainConstraint::get_overlapping_coor output[tile_set->get_neighbor_cell(base_cell_coords, TileSet::CELL_NEIGHBOR_BOTTOM_LEFT_SIDE)] = TileSet::CELL_NEIGHBOR_TOP_RIGHT_SIDE; break; default: - ERR_FAIL_V(output); + ERR_FAIL_V((HashMap(output))); } } else { switch (bit) { @@ -3707,11 +3707,11 @@ HashMap TerrainConstraint::get_overlapping_coor output[tile_set->get_neighbor_cell(base_cell_coords, TileSet::CELL_NEIGHBOR_BOTTOM_LEFT_SIDE)] = TileSet::CELL_NEIGHBOR_TOP_RIGHT_SIDE; break; default: - ERR_FAIL_V(output); + ERR_FAIL_V((HashMap(output))); } } } - return output; + return HashMap(output); } TerrainConstraint::TerrainConstraint(Ref p_tile_set, const Vector2i &p_position, int p_terrain) { diff --git a/scene/3d/audio_stream_player_3d.cpp b/scene/3d/audio_stream_player_3d.cpp index ea05c6bbbd80..521ab4a27587 100644 --- a/scene/3d/audio_stream_player_3d.cpp +++ b/scene/3d/audio_stream_player_3d.cpp @@ -378,7 +378,7 @@ Vector AudioStreamPlayer3D::_update_panning() { Ref world_3d = get_world_3d(); ERR_FAIL_COND_V(world_3d.is_null(), output_volume_vector); - HashSet cameras = world_3d->get_cameras(); + HashSet cameras = HashSet(world_3d->get_cameras()); cameras.insert(get_viewport()->get_camera_3d()); #ifndef PHYSICS_3D_DISABLED diff --git a/scene/3d/physics/area_3d.cpp b/scene/3d/physics/area_3d.cpp index eee27d396f7d..1a71fa664e5e 100644 --- a/scene/3d/physics/area_3d.cpp +++ b/scene/3d/physics/area_3d.cpp @@ -303,7 +303,7 @@ void Area3D::_clear_monitoring() { ERR_FAIL_COND_MSG(locked, "This function can't be used during the in/out signal."); { - HashMap bmcopy = body_map; + HashMap bmcopy = HashMap(body_map); body_map.clear(); //disconnect all monitored stuff @@ -332,7 +332,7 @@ void Area3D::_clear_monitoring() { } { - HashMap bmcopy = area_map; + HashMap bmcopy = HashMap(area_map); area_map.clear(); //disconnect all monitored stuff diff --git a/scene/3d/spring_bone_simulator_3d.cpp b/scene/3d/spring_bone_simulator_3d.cpp index 6443c4ed6f94..ffc7a9b49d31 100644 --- a/scene/3d/spring_bone_simulator_3d.cpp +++ b/scene/3d/spring_bone_simulator_3d.cpp @@ -1199,7 +1199,7 @@ LocalVector SpringBoneSimulator3D::get_valid_collision_instance_ids(in if (collisions_dirty) { _find_collisions(); } - return settings[p_index]->cached_collisions; + return LocalVector(settings[p_index]->cached_collisions); } void SpringBoneSimulator3D::set_external_force(const Vector3 &p_force) { diff --git a/scene/animation/animation_mixer.cpp b/scene/animation/animation_mixer.cpp index 27fb0f4ccea0..dde6f4fca331 100644 --- a/scene/animation/animation_mixer.cpp +++ b/scene/animation/animation_mixer.cpp @@ -2218,7 +2218,7 @@ Ref AnimationMixer::make_backup() { make_animation_instance(SceneStringName(RESET), pi); _build_backup_track_cache(); - backup->set_data(track_cache); + backup->set_data(AHashMap(track_cache)); clear_animation_instances(); return backup; @@ -2515,7 +2515,7 @@ AHashMap Animated ret.insert(E.key, track); } - return ret; + return AHashMap(ret); } void AnimatedValuesBackup::clear_data() { diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp index 66a517f88704..35a5c089bad2 100644 --- a/scene/gui/graph_edit.cpp +++ b/scene/gui/graph_edit.cpp @@ -2597,7 +2597,7 @@ TypedArray GraphEdit::_get_connections_intersecting_with_rect(const TypedArray GraphEdit::_get_connection_list_from_node(const StringName &p_node) const { ERR_FAIL_COND_V(!connection_map.has(p_node), TypedArray()); - List> connections_from_node = connection_map.get(p_node); + const List> connections_from_node = List>(connection_map.get(p_node)); TypedArray connections_from_node_dict; for (const Ref &conn : connections_from_node) { diff --git a/scene/gui/graph_edit_arranger.cpp b/scene/gui/graph_edit_arranger.cpp index d50af7865a83..cd36c4a10e84 100644 --- a/scene/gui/graph_edit_arranger.cpp +++ b/scene/gui/graph_edit_arranger.cpp @@ -242,14 +242,14 @@ int GraphEditArranger::_set_operations(SET_OPERATIONS p_operation, HashSet> GraphEditArranger::_layering(const HashSet &r_selected_nodes, const HashMap> &r_upper_neighbours) { HashMap> l; - HashSet p = r_selected_nodes, q = r_selected_nodes, u, z; + HashSet p = HashSet(r_selected_nodes), q = HashSet(r_selected_nodes), u, z; int current_layer = 0; bool selected = false; while (!_set_operations(GraphEditArranger::IS_EQUAL, q, u)) { _set_operations(GraphEditArranger::DIFFERENCE, p, u); for (const StringName &E : p) { - HashSet n = r_upper_neighbours[E]; + HashSet n = HashSet(r_upper_neighbours[E]); if (_set_operations(GraphEditArranger::IS_SUBSET, n, z)) { Vector t; t.push_back(E); @@ -282,7 +282,7 @@ HashMap> GraphEditArranger::_layering(const HashSet>(l); } Vector GraphEditArranger::_split(const Vector &r_layer, const HashMap &r_crossings) { diff --git a/scene/main/node.cpp b/scene/main/node.cpp index 3b514daad296..1eb28e32bd12 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -3197,7 +3197,7 @@ void Node::replace_by(Node *p_node, bool p_keep_groups) { ERR_FAIL_NULL(p_node); ERR_FAIL_COND(p_node->data.parent); - List owned = data.owned; + const List owned = List(data.owned); List owned_by_owner; Node *owner = (data.owner == this) ? p_node : data.owner; @@ -3485,7 +3485,7 @@ void Node::get_argument_options(const StringName &p_function, int p_idx, List global_groups = ProjectSettings::get_singleton()->get_global_groups_list(); + const HashMap global_groups = HashMap(ProjectSettings::get_singleton()->get_global_groups_list()); for (const KeyValue &E : global_groups) { r_options->push_back(E.key.operator String().quote()); } diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp index 5f4044cf6b6f..fbfbaf43ce60 100644 --- a/scene/main/scene_tree.cpp +++ b/scene/main/scene_tree.cpp @@ -2000,7 +2000,7 @@ void SceneTree::get_argument_options(const StringName &p_function, int p_idx, Li add_options = names.has(p_function); } if (add_options) { - HashMap global_groups = ProjectSettings::get_singleton()->get_global_groups_list(); + const HashMap global_groups = HashMap(ProjectSettings::get_singleton()->get_global_groups_list()); for (const KeyValue &E : global_groups) { r_options->push_back(E.key.operator String().quote()); } diff --git a/scene/main/window.h b/scene/main/window.h index 25ce600e140e..2db30776f070 100644 --- a/scene/main/window.h +++ b/scene/main/window.h @@ -399,7 +399,7 @@ class Window : public Viewport { void child_controls_changed(); Window *get_exclusive_child() const { return exclusive_child; } - HashSet get_transient_children() const { return transient_children; } + HashSet get_transient_children() const { return HashSet(transient_children); } Window *get_parent_visible_window() const; Window *get_non_popup_window() const; Viewport *get_parent_viewport() const; diff --git a/scene/resources/2d/tile_set.cpp b/scene/resources/2d/tile_set.cpp index 58d5d8d7bb81..9b8a3735ea51 100644 --- a/scene/resources/2d/tile_set.cpp +++ b/scene/resources/2d/tile_set.cpp @@ -1392,13 +1392,13 @@ RBSet TileSet::get_terrains_pattern_set(int p_terrain_ for (KeyValue> kv : per_terrain_pattern_tiles[p_terrain_set]) { output.insert(kv.key); } - return output; + return RBSet(output); } RBSet TileSet::get_tiles_for_terrains_pattern(int p_terrain_set, TerrainsPattern p_terrain_tile_pattern) { ERR_FAIL_INDEX_V(p_terrain_set, terrain_sets.size(), RBSet()); _update_terrains_cache(); - return per_terrain_pattern_tiles[p_terrain_set][p_terrain_tile_pattern]; + return RBSet(per_terrain_pattern_tiles[p_terrain_set][p_terrain_tile_pattern]); } TileMapCell TileSet::get_random_tile_from_terrains_pattern(int p_terrain_set, TileSet::TerrainsPattern p_terrain_tile_pattern) { @@ -1407,7 +1407,7 @@ TileMapCell TileSet::get_random_tile_from_terrains_pattern(int p_terrain_set, Ti // Count the sum of probabilities. double sum = 0.0; - RBSet set = per_terrain_pattern_tiles[p_terrain_set][p_terrain_tile_pattern]; + const RBSet set = RBSet(per_terrain_pattern_tiles[p_terrain_set][p_terrain_tile_pattern]); for (const TileMapCell &E : set) { if (E.source_id >= 0) { Ref source = sources[E.source_id]; diff --git a/scene/resources/3d/importer_mesh.cpp b/scene/resources/3d/importer_mesh.cpp index cb70f09eaf60..fbae4ace9f1d 100644 --- a/scene/resources/3d/importer_mesh.cpp +++ b/scene/resources/3d/importer_mesh.cpp @@ -478,7 +478,7 @@ void ImporterMesh::generate_lods(float p_normal_merge_angle, Array p_bone_transf const float max_mesh_error = 1.0f; // We only need LODs that can be selected by error threshold. const unsigned min_target_indices = 12; - LocalVector current_indices = merged_indices; + LocalVector current_indices = LocalVector(merged_indices); float current_error = 0.0f; bool allow_prune = true; diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index 685a029ee6eb..98916391f5ed 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -2378,7 +2378,7 @@ HashSet SceneState::get_all_groups() { ret.insert(names[group]); } } - return ret; + return HashSet(ret); } Vector SceneState::_get_node_groups(int p_idx) const { @@ -2552,7 +2552,7 @@ HashSet PackedScene::get_scene_groups(const String &p_path) { i = k + 1; } } - return ret; + return HashSet(ret); } else { Ref packed_scene = ResourceLoader::load(p_path); ERR_FAIL_COND_V(packed_scene.is_null(), HashSet()); diff --git a/scene/resources/surface_tool.cpp b/scene/resources/surface_tool.cpp index 4b545692f0f9..11ad72c1cd0e 100644 --- a/scene/resources/surface_tool.cpp +++ b/scene/resources/surface_tool.cpp @@ -776,7 +776,7 @@ void SurfaceTool::deindex() { return; //nothing to deindex } - LocalVector old_vertex_array = vertex_array; + LocalVector old_vertex_array = LocalVector(vertex_array); vertex_array.clear(); for (const int &index : index_array) { ERR_FAIL_COND(uint32_t(index) >= old_vertex_array.size()); @@ -1289,7 +1289,7 @@ void SurfaceTool::optimize_indices_for_cache() { ERR_FAIL_COND(primitive != Mesh::PRIMITIVE_TRIANGLES); ERR_FAIL_COND(index_array.size() % 3 != 0); - LocalVector old_index_array = index_array; + LocalVector old_index_array = LocalVector(index_array); memset(index_array.ptr(), 0, index_array.size() * sizeof(int)); optimize_vertex_cache_func((unsigned int *)index_array.ptr(), (unsigned int *)old_index_array.ptr(), old_index_array.size(), vertex_array.size()); } diff --git a/scene/resources/visual_shader_nodes.cpp b/scene/resources/visual_shader_nodes.cpp index 2002b4068875..f41d73f3e10e 100644 --- a/scene/resources/visual_shader_nodes.cpp +++ b/scene/resources/visual_shader_nodes.cpp @@ -6638,7 +6638,7 @@ HashMap VisualShaderNodeTextureParameter::get_editable_prope names.insert("texture_filter", RTR("Filter")); names.insert("texture_repeat", RTR("Repeat")); names.insert("texture_source", RTR("Source")); - return names; + return HashMap(names); } void VisualShaderNodeTextureParameter::_bind_methods() { diff --git a/scene/resources/visual_shader_particle_nodes.cpp b/scene/resources/visual_shader_particle_nodes.cpp index 64c87885ef0a..38636bbc80d7 100644 --- a/scene/resources/visual_shader_particle_nodes.cpp +++ b/scene/resources/visual_shader_particle_nodes.cpp @@ -77,7 +77,7 @@ Vector VisualShaderNodeParticleEmitter::get_editable_properties() co HashMap VisualShaderNodeParticleEmitter::get_editable_properties_names() const { HashMap names; names.insert("mode_2d", RTR("2D Mode")); - return names; + return HashMap(names); } bool VisualShaderNodeParticleEmitter::is_show_prop_names() const { @@ -707,7 +707,7 @@ HashMap VisualShaderNodeParticleMeshEmitter::get_editable_pr names.insert("surface_index", RTR("Surface Index")); } - return names; + return HashMap(names); } void VisualShaderNodeParticleMeshEmitter::_bind_methods() { diff --git a/servers/rendering/renderer_rd/effects/fsr2.cpp b/servers/rendering/renderer_rd/effects/fsr2.cpp index a0a8d8a5b369..eac3eab04633 100644 --- a/servers/rendering/renderer_rd/effects/fsr2.cpp +++ b/servers/rendering/renderer_rd/effects/fsr2.cpp @@ -267,7 +267,7 @@ static FfxErrorCode register_resource_rd(FfxFsr2Interface *p_backend_interface, static FfxErrorCode unregister_resources_rd(FfxFsr2Interface *p_backend_interface) { FSR2Context::Scratch &scratch = *reinterpret_cast(p_backend_interface->scratchBuffer); - LocalVector dynamic_list_copy = scratch.resources.dynamic_list; + LocalVector dynamic_list_copy = LocalVector(scratch.resources.dynamic_list); for (uint32_t i : dynamic_list_copy) { scratch.resources.remove(i); } diff --git a/servers/rendering/shader_language.cpp b/servers/rendering/shader_language.cpp index 7bef87a04434..b6055a2f4b36 100644 --- a/servers/rendering/shader_language.cpp +++ b/servers/rendering/shader_language.cpp @@ -11586,7 +11586,7 @@ Error ShaderLanguage::complete(const String &p_code, const ShaderCompileInfo &p_ if (comp_ident) { if (is_shader_inc) { for (int i = 0; i < RenderingServer::SHADER_MAX; i++) { - const HashMap info = ShaderTypes::get_singleton()->get_functions(RenderingServer::ShaderMode(i)); + const HashMap info = HashMap(ShaderTypes::get_singleton()->get_functions(RenderingServer::ShaderMode(i))); if (info.has("global")) { for (const KeyValue &E : info["global"].built_ins) { diff --git a/tests/core/templates/test_a_hash_map.h b/tests/core/templates/test_a_hash_map.h index ae51bdad1c5f..1b31b48dee83 100644 --- a/tests/core/templates/test_a_hash_map.h +++ b/tests/core/templates/test_a_hash_map.h @@ -137,7 +137,7 @@ TEST_CASE("[AHashMap] Const iteration") { map.insert(123485, 1238888); map.insert(123, 111111); - const AHashMap const_map = map; + const AHashMap const_map = AHashMap(map); Vector> expected; expected.push_back(Pair(42, 84)); diff --git a/tests/core/templates/test_hash_map.h b/tests/core/templates/test_hash_map.h index fa022b303e20..153aea4206b9 100644 --- a/tests/core/templates/test_hash_map.h +++ b/tests/core/templates/test_hash_map.h @@ -130,7 +130,7 @@ TEST_CASE("[HashMap] Const iteration") { map.insert(123485, 1238888); map.insert(123, 111111); - const HashMap const_map = map; + const HashMap const_map = HashMap(map); Vector> expected; expected.push_back(Pair(42, 84)); diff --git a/tests/core/templates/test_hash_set.h b/tests/core/templates/test_hash_set.h index d4b5e4987ac8..8dd8ab55efdf 100644 --- a/tests/core/templates/test_hash_set.h +++ b/tests/core/templates/test_hash_set.h @@ -221,7 +221,7 @@ TEST_CASE("[HashSet] Copy") { expected.push_back(0); expected.push_back(123485); - HashSet copy_assign = set; + HashSet copy_assign = HashSet(set); int idx = 0; for (const int &E : copy_assign) {