diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-07-24 14:21:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-24 14:21:06 +0200 |
| commit | 96d7bc62af25b85b8b9cc091eeea1e7a784ba624 (patch) | |
| tree | 83d8a70c911fe7f8d20080a1395d195eb8370d05 /core/io/packed_data_container.cpp | |
| parent | 9ac27b58c53b50b5c7085a8fdee653e9eff159d1 (diff) | |
| parent | 4e6efd1b07f1c6d53d226977ddc729333b74306a (diff) | |
| download | redot-engine-96d7bc62af25b85b8b9cc091eeea1e7a784ba624.tar.gz | |
Merge pull request #50511 from aaronfranke/iterators
Use C++ range iterators for Lists in many situations
Diffstat (limited to 'core/io/packed_data_container.cpp')
| -rw-r--r-- | core/io/packed_data_container.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/io/packed_data_container.cpp b/core/io/packed_data_container.cpp index cf6a0b6027..ec43ea9311 100644 --- a/core/io/packed_data_container.cpp +++ b/core/io/packed_data_container.cpp @@ -268,21 +268,21 @@ uint32_t PackedDataContainer::_pack(const Variant &p_data, Vector<uint8_t> &tmpd d.get_key_list(&keys); List<DictKey> sortk; - for (List<Variant>::Element *E = keys.front(); E; E = E->next()) { + for (Variant &key : keys) { DictKey dk; - dk.hash = E->get().hash(); - dk.key = E->get(); + dk.hash = key.hash(); + dk.key = key; sortk.push_back(dk); } sortk.sort(); int idx = 0; - for (List<DictKey>::Element *E = sortk.front(); E; E = E->next()) { - encode_uint32(E->get().hash, &tmpdata.write[pos + 8 + idx * 12 + 0]); - uint32_t ofs = _pack(E->get().key, tmpdata, string_cache); + for (DictKey &E : sortk) { + encode_uint32(E.hash, &tmpdata.write[pos + 8 + idx * 12 + 0]); + uint32_t ofs = _pack(E.key, tmpdata, string_cache); encode_uint32(ofs, &tmpdata.write[pos + 8 + idx * 12 + 4]); - ofs = _pack(d[E->get().key], tmpdata, string_cache); + ofs = _pack(d[E.key], tmpdata, string_cache); encode_uint32(ofs, &tmpdata.write[pos + 8 + idx * 12 + 8]); idx++; } |