Code modernization: src/m* (part 3)

* empty function
* default constructor/destructor
* for range-based loops
* use emplace_back instead of push_back
* remove some unused headers in some cpp variable

diff --git a/src/map.cpp b/src/map.cpp
index c6b4769d83fa4a52544ae5921bf32ed41be49890..88c32bbd8fc10045091000d7d74b7da5c28d794c 100644 (file)
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -1925,9 +1925,8 @@ void ServerMap::save(ModifiedState save_level)
        // Don't do anything with sqlite unless something is really saved
        bool save_started = false;
 
-       for(std::map<v2s16, MapSector*>::iterator i = m_sectors.begin();
-               i != m_sectors.end(); ++i) {
-               ServerMapSector *sector = (ServerMapSector*)i->second;
+       for (auto &sector_it : m_sectors) {
+               ServerMapSector *sector = (ServerMapSector*) sector_it.second;
                assert(sector->getId() == MAPSECTOR_SERVER);
 
                if(sector->differs_from_disk || save_level == MOD_STATE_CLEAN) {

diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp
index d8b3193a6da54624721c6df0020b30eaa2a93904..e4ddc164bd4febd041a57592e8aac57cbe63a20a 100644 (file)
--- a/src/mapgen_valleys.cpp
+++ b/src/mapgen_valleys.cpp
@@ -30,7 +30,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapblock.h"
 #include "mapnode.h"
 #include "map.h"
-#include "content_sao.h"
 #include "nodedef.h"
 #include "voxelalgorithms.h"
 #include "settings.h" // For g_settings

diff --git a/src/mapnode.cpp b/src/mapnode.cpp
index b06b42ba8f963ea3f3449d0cb213fe3a4a59a8ed..2f92f0a216dc5884cd7622e100a559fcd8add03a 100644 (file)
--- a/src/mapnode.cpp
+++ b/src/mapnode.cpp
@@ -455,7 +455,7 @@ void transformNodeBox(const MapNode &n, const NodeBox &nodebox,
        }
        else // NODEBOX_REGULAR
        {
-               boxes.push_back(aabb3f(-BS/2,-BS/2,-BS/2,BS/2,BS/2,BS/2));
+               boxes.emplace_back(-BS/2,-BS/2,-BS/2,BS/2,BS/2,BS/2);
        }
 }
 
@@ -764,7 +764,7 @@ void MapNode::deSerializeBulk(std::istream &is, int version,
 /*
        Legacy serialization
 */
-void MapNode::deSerialize_pre22(u8 *source, u8 version)
+void MapNode::deSerialize_pre22(const u8 *source, u8 version)
 {
        if(version <= 1)
        {

diff --git a/src/mapnode.h b/src/mapnode.h
index 4b75fe227eb82771d83e15525fbd0c27ebc90b12..1e7597e4d77f2d3c0ea3ac9661b24792f2f11fbe 100644 (file)
--- a/src/mapnode.h
+++ b/src/mapnode.h
@@ -300,5 +300,5 @@ struct MapNode
 
 private:
        // Deprecated serialization methods
-       void deSerialize_pre22(u8 *source, u8 version);
+       void deSerialize_pre22(const u8 *source, u8 version);
 };

diff --git a/src/mesh_generator_thread.h b/src/mesh_generator_thread.h
index 7df9a4e26a85b102430b0e78ad29323fe349ecbe..9a42852a31aa645053f79b40b49363b5998f7a4f 100644 (file)
--- a/src/mesh_generator_thread.h
+++ b/src/mesh_generator_thread.h
@@ -32,7 +32,7 @@ struct CachedMapBlockData
        int refcount_from_queue = 0;
        std::time_t last_used_timestamp = std::time(0);
 
-       CachedMapBlockData() {}
+       CachedMapBlockData() = default;
        ~CachedMapBlockData();
 };
 
@@ -45,7 +45,7 @@ struct QueuedMeshUpdate
        v3s16 crack_pos;
        MeshMakeData *data = nullptr; // This is generated in MeshUpdateQueue::pop()
 
-       QueuedMeshUpdate(){};
+       QueuedMeshUpdate() = default;
        ~QueuedMeshUpdate();
 };
 
@@ -105,7 +105,7 @@ struct MeshUpdateResult
        MapBlockMesh *mesh = nullptr;
        bool ack_block_to_server = false;
 
-       MeshUpdateResult() {}
+       MeshUpdateResult() = default;
 };
 
 class MeshUpdateThread : public UpdateThread

diff --git a/src/metadata.cpp b/src/metadata.cpp
index 833735464a0c66557f98a9726ed6f2181c9732f5..628e38c156404d4468005fcfae3cdf0e4c3ec270 100644 (file)
--- a/src/metadata.cpp
+++ b/src/metadata.cpp
@@ -18,12 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "metadata.h"
-#include "exceptions.h"
-#include "gamedef.h"
 #include "log.h"
-#include <sstream>
-#include "constants.h" // MAP_BLOCKSIZE
-#include <sstream>
 
 /*
        Metadata
@@ -36,7 +31,7 @@ void Metadata::clear()
 
 bool Metadata::empty() const
 {
-       return m_stringvars.size() == 0;
+       return m_stringvars.empty();
 }
 
 size_t Metadata::size() const
@@ -54,10 +49,9 @@ bool Metadata::operator==(const Metadata &other) const
        if (size() != other.size())
                return false;
 
-       for (StringMap::const_iterator it = m_stringvars.begin();
-                       it != m_stringvars.end(); ++it) {
-               if (!other.contains(it->first) ||
-                               other.getString(it->first) != it->second)
+       for (const auto &sv : m_stringvars) {
+               if (!other.contains(sv.first) ||
+                               other.getString(sv.first) != sv.second)
                        return false;
        }
 
@@ -102,7 +96,7 @@ const std::string &Metadata::resolveString(const std::string &str, u16 recursion
 {
        if (recursion <= 1 && str.substr(0, 2) == "${" && str[str.length() - 1] == '}') {
                return getString(str.substr(2, str.length() - 3), recursion + 1);
-       } else {
-               return str;
        }
+
+       return str;
 }

diff --git a/src/metadata.h b/src/metadata.h
index f923e6ff034312fb4ebb89e0192dd1af8dc0a154..d95a0ed5dc7394caa713fa9347d37e223d27ecd4 100644 (file)
--- a/src/metadata.h
+++ b/src/metadata.h
@@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 class Metadata
 {
 public:
-       virtual ~Metadata() {}
+       virtual ~Metadata() = default;
 
        virtual void clear();
        virtual bool empty() const;

diff --git a/src/mg_ore.h b/src/mg_ore.h
index eaaf2b88323cd31a2f98389cec94b5cd1d05054c..253b115a217b216229745c432e63918f08e79676 100644 (file)
--- a/src/mg_ore.h
+++ b/src/mg_ore.h
@@ -64,7 +64,7 @@ public:
        Noise *noise = nullptr;
        std::unordered_set<u8> biomes;
 
-       Ore() {};
+       Ore() = default;;
        virtual ~Ore();
 
        virtual void resolveNodeNames();
@@ -136,7 +136,7 @@ public:
 class OreManager : public ObjDefManager {
 public:
        OreManager(IGameDef *gamedef);
-       virtual ~OreManager() {}
+       virtual ~OreManager() = default;
 
        const char *getObjectTitle() const
        {

diff --git a/src/mg_schematic.cpp b/src/mg_schematic.cpp
index c50e90b3a54d35f7abdf2cb7f09f0ee518f81eca..8874abd428ac1213b4c4460f7207eff73f45a7e5 100644 (file)
--- a/src/mg_schematic.cpp
+++ b/src/mg_schematic.cpp
@@ -56,7 +56,7 @@ void SchematicManager::clear()
                        DecoSchematic *dschem = dynamic_cast<DecoSchematic *>(deco);
                        if (dschem)
                                dschem->schematic = NULL;
-               } catch (std::bad_cast) {
+               } catch (const std::bad_cast &) {
                }
        }
 
@@ -68,8 +68,7 @@ void SchematicManager::clear()
 
 
 Schematic::Schematic()
-{
-}
+= default;
 
 
 Schematic::~Schematic()

diff --git a/src/minimap.cpp b/src/minimap.cpp
index 5b9b27b8ec9af3211c2e5cd2f1254ad5960bc2aa..59753e24694e4bcf946d614d9d8cb776299ff68f 100644 (file)
--- a/src/minimap.cpp
+++ b/src/minimap.cpp
@@ -115,7 +115,6 @@ void MinimapUpdateThread::doUpdate()
 
 void MinimapUpdateThread::getMap(v3s16 pos, s16 size, s16 height)
 {
-       v3s16 region(size, 0, size);
        v3s16 pos_min(pos.X - size / 2, pos.Y - height / 2, pos.Z - size / 2);
        v3s16 pos_max(pos_min.X + size - 1, pos.Y + height / 2, pos_min.Z + size - 1);
        v3s16 blockpos_min = getNodeBlockPos(pos_min);

diff --git a/src/mods.cpp b/src/mods.cpp
index d28288a89ba7432ecafdd8646778309d4151a347..148ea6c530b610a7bd05dd2cf813328315a6138e 100644 (file)
--- a/src/mods.cpp
+++ b/src/mods.cpp
@@ -19,13 +19,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <cctype>
 #include <fstream>
+#include <json/json.h>
 #include "mods.h"
 #include "filesys.h"
 #include "log.h"
 #include "subgame.h"
 #include "settings.h"
-#include "convert_json.h"
-#include "exceptions.h"
 #include "porting.h"
 
 static bool parseDependsLine(std::istream &is,