Skip to content

Commit ae2bf33

Browse files
committed
Make most container template copy constructors explicit
1 parent ec7d25d commit ae2bf33

File tree

134 files changed

+247
-226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+247
-226
lines changed

core/config/project_settings.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1514,9 +1514,9 @@ void ProjectSettings::_bind_methods() {
15141514

15151515
void ProjectSettings::_add_builtin_input_map() {
15161516
if (InputMap::get_singleton()) {
1517-
HashMap<String, List<Ref<InputEvent>>> builtins = InputMap::get_singleton()->get_builtins();
1517+
const HashMap<String, List<Ref<InputEvent>>> builtins = HashMap<String, List<Ref<InputEvent>>>(InputMap::get_singleton()->get_builtins());
15181518

1519-
for (KeyValue<String, List<Ref<InputEvent>>> &E : builtins) {
1519+
for (const KeyValue<String, List<Ref<InputEvent>>> &E : builtins) {
15201520
Array events;
15211521

15221522
// Convert list of input events into array

core/config/project_settings.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ class ProjectSettings : public Object {
200200
const HashMap<StringName, PropertyInfo> &get_custom_property_info() const;
201201
uint64_t get_last_saved_time() { return last_save_time; }
202202

203-
List<String> get_input_presets() const { return input_presets; }
203+
List<String> get_input_presets() const { return List<String>(input_presets); }
204204

205205
Variant get_setting_with_override(const StringName &p_name) const;
206206
Variant get_setting_with_override_and_custom_features(const StringName &p_name, const Vector<String> &p_features) const;

core/extension/gdextension.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@ void GDExtension::prepare_reload() {
952952
state.push_back(Pair<String, Variant>(P.name, value));
953953
}
954954
E.value.instance_state[obj_id] = {
955-
state, // List<Pair<String, Variant>> properties;
955+
List<Pair<String, Variant>>(state), // List<Pair<String, Variant>> properties;
956956
obj->is_extension_placeholder(), // bool is_placeholder;
957957
};
958958
}

core/input/input_map.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,7 @@ const HashMap<String, List<Ref<InputEvent>>> &InputMap::get_builtins_with_featur
874874
}
875875

876876
void InputMap::load_default() {
877-
HashMap<String, List<Ref<InputEvent>>> builtins = get_builtins_with_feature_overrides_applied();
877+
const HashMap<String, List<Ref<InputEvent>>> builtins = HashMap<String, List<Ref<InputEvent>>>(get_builtins_with_feature_overrides_applied());
878878

879879
for (const KeyValue<String, List<Ref<InputEvent>>> &E : builtins) {
880880
String name = E.key;

core/io/file_access_pack.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ uint8_t *PackedData::get_file_hash(const String &p_path) {
140140
HashSet<String> PackedData::get_file_paths() const {
141141
HashSet<String> file_paths;
142142
_get_file_paths(root, root->name, file_paths);
143-
return file_paths;
143+
return HashSet<String>(file_paths);
144144
}
145145

146146
void PackedData::_get_file_paths(PackedDir *p_dir, const String &p_parent_dir, HashSet<String> &r_paths) const {

core/io/ip.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ IPAddress IP::get_resolve_item_address(ResolverID p_id) const {
205205
return IPAddress();
206206
}
207207

208-
List<IPAddress> res = resolver->queue[p_id].response;
208+
const List<IPAddress> res = List<IPAddress>(resolver->queue[p_id].response);
209209

210210
for (const IPAddress &E : res) {
211211
if (E.is_valid()) {
@@ -224,7 +224,7 @@ Array IP::get_resolve_item_addresses(ResolverID p_id) const {
224224
return Array();
225225
}
226226

227-
List<IPAddress> res = resolver->queue[p_id].response;
227+
const List<IPAddress> res = List<IPAddress>(resolver->queue[p_id].response);
228228

229229
Array result;
230230
for (const IPAddress &E : res) {

core/math/a_star_grid_2d.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ void AStarGrid2D::update() {
158158
solid_mask.push_back(false);
159159
}
160160
solid_mask.push_back(true);
161-
points.push_back(line);
161+
points.push_back(LocalVector<Point>(line));
162162
}
163163

164164
for (int32_t x = region.position.x; x < end_x + 2; x++) {

core/math/geometry_3d.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ class Geometry3D {
491491
};
492492

493493
if (polygon.is_empty()) {
494-
return polygon;
494+
return Vector<Vector3>(polygon);
495495
}
496496

497497
int *location_cache = (int *)alloca(sizeof(int) * polygon.size());
@@ -514,7 +514,7 @@ class Geometry3D {
514514
}
515515

516516
if (outside_count == 0) {
517-
return polygon; // No changes.
517+
return Vector<Vector3>(polygon); // No changes.
518518
} else if (inside_count == 0) {
519519
return Vector<Vector3>(); // Empty.
520520
}

core/object/class_db.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1004,7 +1004,7 @@ void ClassDB::get_method_list_with_compatibility(const StringName &p_class, List
10041004
#endif // DEBUG_ENABLED
10051005

10061006
for (const KeyValue<StringName, LocalVector<MethodBind *, unsigned int, false, false>> &E : type->method_map_compatibility) {
1007-
LocalVector<MethodBind *> compat = E.value;
1007+
const LocalVector<MethodBind *> compat = LocalVector<MethodBind *>(E.value);
10081008
for (MethodBind *method : compat) {
10091009
MethodInfo minfo = info_from_bind(method);
10101010

core/os/os.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ bool OS::is_restart_on_exit_set() const {
640640
}
641641

642642
List<String> OS::get_restart_on_exit_arguments() const {
643-
return restart_commandline;
643+
return List<String>(restart_commandline);
644644
}
645645

646646
PackedStringArray OS::get_connected_midi_inputs() {

0 commit comments

Comments
 (0)