summaryrefslogtreecommitdiff
path: root/core/io
diff options
context:
space:
mode:
authorKarroffel <therzog@mail.de>2017-11-04 14:08:21 +0100
committerKarroffel <therzog@mail.de>2017-11-04 14:08:21 +0100
commit1386647cdf1c4278c4437523cc2b8be48c77351e (patch)
tree55befe2b8f5ad1924bfba63a4f4308d26b0946de /core/io
parent9aebdd2ae8b32ab8e73371637d330b8d0e64ec54 (diff)
make ConfigFile sections ordered
Diffstat (limited to 'core/io')
-rw-r--r--core/io/config_file.cpp10
-rw-r--r--core/io/config_file.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/core/io/config_file.cpp b/core/io/config_file.cpp
index b5d41bacbb..2b60150832 100644
--- a/core/io/config_file.cpp
+++ b/core/io/config_file.cpp
@@ -106,8 +106,8 @@ bool ConfigFile::has_section_key(const String &p_section, const String &p_key) c
void ConfigFile::get_sections(List<String> *r_sections) const {
- for (const Map<String, OrderedHashMap<String, Variant> >::Element *E = values.front(); E; E = E->next()) {
- r_sections->push_back(E->key());
+ for (OrderedHashMap<String, OrderedHashMap<String, Variant> >::ConstElement E = values.front(); E; E = E.next()) {
+ r_sections->push_back(E.key());
}
}
void ConfigFile::get_section_keys(const String &p_section, List<String> *r_keys) const {
@@ -135,13 +135,13 @@ Error ConfigFile::save(const String &p_path) {
return err;
}
- for (Map<String, OrderedHashMap<String, Variant> >::Element *E = values.front(); E; E = E->next()) {
+ for (OrderedHashMap<String, OrderedHashMap<String, Variant> >::Element E = values.front(); E; E = E.next()) {
if (E != values.front())
file->store_string("\n");
- file->store_string("[" + E->key() + "]\n\n");
+ file->store_string("[" + E.key() + "]\n\n");
- for (OrderedHashMap<String, Variant>::Element F = E->get().front(); F; F = F.next()) {
+ for (OrderedHashMap<String, Variant>::Element F = E.get().front(); F; F = F.next()) {
String vstr;
VariantWriter::write_to_string(F.get(), vstr);
diff --git a/core/io/config_file.h b/core/io/config_file.h
index 2be196faa2..29bd369a24 100644
--- a/core/io/config_file.h
+++ b/core/io/config_file.h
@@ -37,7 +37,7 @@ class ConfigFile : public Reference {
GDCLASS(ConfigFile, Reference);
- Map<String, OrderedHashMap<String, Variant> > values;
+ OrderedHashMap<String, OrderedHashMap<String, Variant> > values;
PoolStringArray _get_sections() const;
PoolStringArray _get_section_keys(const String &p_section) const;