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
minetest · Aug 19, 2017 · 1992db1 · 1992db1
1 parent 4a1265c
commit 1992db1
Show file tree

Hide file tree

Showing 12 changed files with 207 additions and 287 deletions.
diff --git a/src/metadata.cpp b/src/metadata.cpp
@@ -50,8 +50,7 @@ bool Metadata::operator==(const Metadata &other) const
 		return false;
 
 	for (const auto &sv : m_stringvars) {
-		if (!other.contains(sv.first) ||
-				other.getString(sv.first) != sv.second)
+		if (!other.contains(sv.first) || other.getString(sv.first) != sv.second)
 			return false;
 	}
 

diff --git a/src/nameidmapping.cpp b/src/nameidmapping.cpp
@@ -25,10 +25,9 @@ void NameIdMapping::serialize(std::ostream &os) const
 {
 	writeU8(os, 0); // version
 	writeU16(os, m_id_to_name.size());
-	for (IdToNameMap::const_iterator i = m_id_to_name.begin();
-			i != m_id_to_name.end(); ++i) {
-		writeU16(os, i->first);
-		os << serializeString(i->second);
+	for (const auto &i : m_id_to_name) {
+		writeU16(os, i.first);
+		os << serializeString(i.second);
 	}
 }