the final rename

src/items/Inventories.cpp

@@ -1,9 +1,9 @@
-#include "Inventories.h"
+#include "Inventories.hpp"
 
 #include <algorithm>
 
-#include "../world/Level.h"
-#include "../world/World.h"
+#include "../world/Level.hpp"
+#include "../world/World.hpp"
 
 Inventories::Inventories(Level& level) : level(level) {
 }

src/items/Inventories.hpp

@@ -1,12 +1,12 @@
-#ifndef ITEMS_INVENTORIES_H_
-#define ITEMS_INVENTORIES_H_
+#ifndef ITEMS_INVENTORIES_HPP_
+#define ITEMS_INVENTORIES_HPP_
 
 #include <string>
 #include <memory>
 #include <unordered_map>
 
-#include "Inventory.h"
-#include "../maths/util.h"
+#include "Inventory.hpp"
+#include "../maths/util.hpp"
 
 class Level;
 
@@ -41,4 +41,4 @@ public:
     const inventories_map& getMap() const;
 };
 
-#endif // ITEMS_INVENTORIES_H_
+#endif // ITEMS_INVENTORIES_HPP_

src/items/Inventory.cpp

@@ -1,5 +1,6 @@
-#include "Inventory.h"
+#include "Inventory.hpp"
 
+#include "../data/dynamic.hpp"
 #include "../content/ContentLUT.hpp"
 
 Inventory::Inventory(int64_t id, size_t size) : id(id), slots(size) {

src/items/Inventory.hpp

@@ -1,14 +1,17 @@
-#ifndef ITEMS_INVENTORY_H_
-#define ITEMS_INVENTORY_H_
+#ifndef ITEMS_INVENTORY_HPP_
+#define ITEMS_INVENTORY_HPP_
+
+#include "ItemStack.hpp"
+
+#include "../typedefs.hpp"
+#include "../interfaces/Serializable.hpp"
 
 #include <vector>
 #include <memory>
 
-#include "ItemStack.h"
-
-#include "../typedefs.h"
-#include "../data/dynamic.h"
-#include "../interfaces/Serializable.h"
+namespace dynamic {
+    class Map;
+}
 
 class ContentLUT;
 class ContentIndices;
@@ -57,4 +60,4 @@ public:
     static const size_t npos;
 };
 
-#endif // ITEMS_INVENTORY_H_
+#endif // ITEMS_INVENTORY_HPP_

src/items/ItemDef.cpp

@@ -1,4 +1,4 @@
-#include "ItemDef.h"
+#include "ItemDef.hpp"
 #include "../util/stringutil.hpp"
 
 ItemDef::ItemDef(std::string name) : name(name) {

src/items/ItemDef.hpp

@@ -1,10 +1,10 @@
-#ifndef CONTENT_ITEMS_ITEM_DEF_H_
-#define CONTENT_ITEMS_ITEM_DEF_H_
+#ifndef CONTENT_ITEMS_ITEM_DEF_HPP_
+#define CONTENT_ITEMS_ITEM_DEF_HPP_
 
 #include <string>
 #include <glm/glm.hpp>
 
-#include "../typedefs.h"
+#include "../typedefs.hpp"
 
 struct item_funcs_set {
     bool init: 1;
@@ -48,4 +48,4 @@ public:
     ItemDef(const ItemDef&) = delete;
 };
 
-#endif //CONTENT_ITEMS_ITEM_DEF_H_
+#endif //CONTENT_ITEMS_ITEM_DEF_HPP_

src/items/ItemStack.cpp

@@ -1,7 +1,7 @@
-#include "ItemStack.h"
+#include "ItemStack.hpp"
 
-#include "ItemDef.h"
-#include "../content/Content.h"
+#include "ItemDef.hpp"
+#include "../content/Content.hpp"
 
 ItemStack::ItemStack() : item(ITEM_EMPTY), count(0) {
 }

src/items/ItemStack.hpp

@@ -1,8 +1,8 @@
-#ifndef ITEMS_ITEM_STACK_H_
-#define ITEMS_ITEM_STACK_H_
+#ifndef ITEMS_ITEM_STACK_HPP_
+#define ITEMS_ITEM_STACK_HPP_
 
-#include "../typedefs.h"
-#include "../constants.h"
+#include "../typedefs.hpp"
+#include "../constants.hpp"
 
 class ContentIndices;
 
@@ -37,4 +37,4 @@ public:
     }
 };
 
-#endif // ITEMS_ITEM_STACK_H_
+#endif // ITEMS_ITEM_STACK_HPP_