diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-08-19 11:30:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-19 11:30:46 +0200 |
| commit | 1992db1395d9c068327a7c08bac7a24ef7112274 (patch) | |
| tree | 3fb4982e4662a9519e08b57cab228c6b26d4a57f /src/nodemetadata.cpp | |
| parent | 4a1265ceb5919c53efaa8c50bbb0fe7955aa47aa (diff) | |
| download | minetest-1992db1395d9c068327a7c08bac7a24ef7112274.tar.gz minetest-1992db1395d9c068327a7c08bac7a24ef7112274.tar.bz2 minetest-1992db1395d9c068327a7c08bac7a24ef7112274.zip | |
Code modernization: src/n*, src/o* (#6280)
* Code modernization: src/n*, src/o*
* empty function
* default constructor/destructor
* for range-based loops
* use emplace_back instead of push_back
* remove unused IWritableNodeDefManager::clone()
* C++ STL header style
* Pointer constness in some functions
Diffstat (limited to 'src/nodemetadata.cpp')
| -rw-r--r-- | src/nodemetadata.cpp | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/src/nodemetadata.cpp b/src/nodemetadata.cpp index 0e8195c34..708a08099 100644 --- a/src/nodemetadata.cpp +++ b/src/nodemetadata.cpp @@ -44,15 +44,13 @@ void NodeMetadata::serialize(std::ostream &os, u8 version, bool disk) const { int num_vars = disk ? m_stringvars.size() : countNonPrivate(); writeU32(os, num_vars); - for (StringMap::const_iterator - it = m_stringvars.begin(); - it != m_stringvars.end(); ++it) { - bool priv = isPrivate(it->first); + for (const auto &sv : m_stringvars) { + bool priv = isPrivate(sv.first); if (!disk && priv) continue; - os << serializeString(it->first); - os << serializeLongString(it->second); + os << serializeString(sv.first); + os << serializeLongString(sv.second); if (version >= 2) writeU8(os, (priv) ? 1 : 0); } @@ -86,7 +84,7 @@ void NodeMetadata::clear() bool NodeMetadata::empty() const { - return Metadata::empty() && m_inventory->getLists().size() == 0; + return Metadata::empty() && m_inventory->getLists().empty(); } @@ -103,10 +101,8 @@ int NodeMetadata::countNonPrivate() const // m_privatevars can contain names not actually present // DON'T: return m_stringvars.size() - m_privatevars.size(); int n = 0; - for (StringMap::const_iterator - it = m_stringvars.begin(); - it != m_stringvars.end(); ++it) { - if (isPrivate(it->first) == false) + for (const auto &sv : m_stringvars) { + if (!isPrivate(sv.first)) n++; } return n; @@ -132,12 +128,9 @@ void NodeMetadataList::serialize(std::ostream &os, u8 blockver, bool disk) const writeU8(os, version); writeU16(os, count); - for(std::map<v3s16, NodeMetadata*>::const_iterator - i = m_data.begin(); - i != m_data.end(); ++i) - { - v3s16 p = i->first; - NodeMetadata *data = i->second; + for (const auto &it : m_data) { + v3s16 p = it.first; + NodeMetadata *data = it.second; if (data->empty()) continue; |