asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

make ConfigFile sections ordered

Browse source
This commit is contained in:
Karroffel 2017-11-04 14:08:21 +01:00
parent 9aebdd2ae8
commit 1386647cdf
3 changed files with 18 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/io/config_file.cpp
View file

@ -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 { void ConfigFile::get_sections(List<String> *r_sections) const {
for (const Map<String, OrderedHashMap<String, Variant> >::Element *E = values.front(); E; E = E->next()) { for (OrderedHashMap<String, OrderedHashMap<String, Variant> >::ConstElement E = values.front(); E; E = E.next()) {
r_sections->push_back(E->key()); r_sections->push_back(E.key());
} }
} }
void ConfigFile::get_section_keys(const String &p_section, List<String> *r_keys) const { 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; 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()) if (E != values.front())
file->store_string("\n"); 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; String vstr;
VariantWriter::write_to_string(F.get(), vstr); VariantWriter::write_to_string(F.get(), vstr);

2
core/io/config_file.h
View file

@ -37,7 +37,7 @@ class ConfigFile : public Reference {
GDCLASS(ConfigFile, Reference); GDCLASS(ConfigFile, Reference);
Map<String, OrderedHashMap<String, Variant> > values; OrderedHashMap<String, OrderedHashMap<String, Variant> > values;
PoolStringArray _get_sections() const; PoolStringArray _get_sections() const;
PoolStringArray _get_section_keys(const String &p_section) const; PoolStringArray _get_section_keys(const String &p_section) const;

40
core/ordered_hash_map.h
View file

@ -93,8 +93,12 @@ public:
return *this; return *this;
} }
friend bool operator==(const Element &, const Element &); _FORCE_INLINE_ bool operator==(const Element &p_other) const {
friend bool operator!=(const Element &, const Element &); return this->list_element == p_other.list_element;
}
_FORCE_INLINE_ bool operator!=(const Element &p_other) const {
return this->list_element != p_other.list_element;
}
operator bool() const { operator bool() const {
return (list_element != NULL); return (list_element != NULL);
@ -157,8 +161,12 @@ public:
return ConstElement(list_element ? list_element->prev() : NULL); return ConstElement(list_element ? list_element->prev() : NULL);
} }
friend bool operator==(const ConstElement &, const ConstElement &); _FORCE_INLINE_ bool operator==(const ConstElement &p_other) const {
friend bool operator!=(const ConstElement &, const ConstElement &); return this->list_element == p_other.list_element;
}
_FORCE_INLINE_ bool operator!=(const ConstElement &p_other) const {
return this->list_element != p_other.list_element;
}
operator bool() const { operator bool() const {
return (list_element != NULL); return (list_element != NULL);
@ -288,28 +296,4 @@ public:
} }
}; };
template <class K, class V, class Hasher, class Comparator, uint8_t MIN_HASH_TABLE_POWER, uint8_t RELATIONSHIP>
bool operator==(const typename OrderedHashMap<K, V, Hasher, Comparator, MIN_HASH_TABLE_POWER, RELATIONSHIP>::Element &first,
const typename OrderedHashMap<K, V, Hasher, Comparator, MIN_HASH_TABLE_POWER, RELATIONSHIP>::Element &second) {
return (first.list_element == second.list_element);
}
template <class K, class V, class Hasher, class Comparator, uint8_t MIN_HASH_TABLE_POWER, uint8_t RELATIONSHIP>
bool operator!=(const typename OrderedHashMap<K, V, Hasher, Comparator, MIN_HASH_TABLE_POWER, RELATIONSHIP>::Element &first,
const typename OrderedHashMap<K, V, Hasher, Comparator, MIN_HASH_TABLE_POWER, RELATIONSHIP>::Element &second) {
return (first.list_element != second.list_element);
}
template <class K, class V, class Hasher, class Comparator, uint8_t MIN_HASH_TABLE_POWER, uint8_t RELATIONSHIP>
bool operator==(const typename OrderedHashMap<K, V, Hasher, Comparator, MIN_HASH_TABLE_POWER, RELATIONSHIP>::ConstElement &first,
const typename OrderedHashMap<K, V, Hasher, Comparator, MIN_HASH_TABLE_POWER, RELATIONSHIP>::ConstElement &second) {
return (first.list_element == second.list_element);
}
template <class K, class V, class Hasher, class Comparator, uint8_t MIN_HASH_TABLE_POWER, uint8_t RELATIONSHIP>
bool operator!=(const typename OrderedHashMap<K, V, Hasher, Comparator, MIN_HASH_TABLE_POWER, RELATIONSHIP>::ConstElement &first,
const typename OrderedHashMap<K, V, Hasher, Comparator, MIN_HASH_TABLE_POWER, RELATIONSHIP>::ConstElement &second) {
return (first.list_element != second.list_element);
}
#endif // ORDERED_HASH_MAP_H #endif // ORDERED_HASH_MAP_H