Rename enum ItemType into ItemDbType.

5 files changed, 47 insertions, 47 deletions

diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index 3ef3c8bd4..a860dc8e5 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -173,7 +173,7 @@ void ItemDB::setStatsList(const std::vector<ItemDB::Stat> &stats)
     extraStats = stats;
 }
 
-static ItemTypeT itemTypeFromString(const std::string &name)
+static ItemDbTypeT itemTypeFromString(const std::string &name)
 {
     const size_t sz = sizeof(itemTypeMap) / sizeof(itemTypeMap[0]);
     for (size_t f = 0; f < sz; f ++)
@@ -183,10 +183,10 @@ static ItemTypeT itemTypeFromString(const std::string &name)
             return type.type;
     }
     logger->log("Unknown item type: " + name);
-    return ItemType::UNUSABLE;
+    return ItemDbType::UNUSABLE;
 }
 
-static std::string useButtonFromItemType(const ItemTypeT &type)
+static std::string useButtonFromItemType(const ItemDbTypeT &type)
 {
     const size_t sz = sizeof(itemTypeMap) / sizeof(itemTypeMap[0]);
     for (size_t f = 0; f < sz; f ++)
@@ -203,7 +203,7 @@ static std::string useButtonFromItemType(const ItemTypeT &type)
     return std::string();
 }
 
-static std::string useButton2FromItemType(const ItemTypeT &type)
+static std::string useButton2FromItemType(const ItemDbTypeT &type)
 {
     const size_t sz = sizeof(itemTypeMap) / sizeof(itemTypeMap[0]);
     for (size_t f = 0; f < sz; f ++)
@@ -464,28 +464,28 @@ void ItemDB::loadXmlFile(const std::string &fileName, int &tagNum)
 
         switch (itemInfo->getType())
         {
-            case ItemType::USABLE:
+            case ItemDbType::USABLE:
                 itemInfo->addTag(mTags["Usable"]);
                 break;
-            case ItemType::CARD:
-            case ItemType::UNUSABLE:
+            case ItemDbType::CARD:
+            case ItemDbType::UNUSABLE:
                 itemInfo->addTag(mTags["Unusable"]);
                 break;
             default:
-            case ItemType::EQUIPMENT_ONE_HAND_WEAPON:
-            case ItemType::EQUIPMENT_TWO_HANDS_WEAPON:
-            case ItemType::EQUIPMENT_TORSO:
-            case ItemType::EQUIPMENT_ARMS:
-            case ItemType::EQUIPMENT_HEAD:
-            case ItemType::EQUIPMENT_LEGS:
-            case ItemType::EQUIPMENT_SHIELD:
-            case ItemType::EQUIPMENT_RING:
-            case ItemType::EQUIPMENT_NECKLACE:
-            case ItemType::EQUIPMENT_FEET:
-            case ItemType::EQUIPMENT_AMMO:
-            case ItemType::EQUIPMENT_CHARM:
-            case ItemType::SPRITE_RACE:
-            case ItemType::SPRITE_HAIR:
+            case ItemDbType::EQUIPMENT_ONE_HAND_WEAPON:
+            case ItemDbType::EQUIPMENT_TWO_HANDS_WEAPON:
+            case ItemDbType::EQUIPMENT_TORSO:
+            case ItemDbType::EQUIPMENT_ARMS:
+            case ItemDbType::EQUIPMENT_HEAD:
+            case ItemDbType::EQUIPMENT_LEGS:
+            case ItemDbType::EQUIPMENT_SHIELD:
+            case ItemDbType::EQUIPMENT_RING:
+            case ItemDbType::EQUIPMENT_NECKLACE:
+            case ItemDbType::EQUIPMENT_FEET:
+            case ItemDbType::EQUIPMENT_AMMO:
+            case ItemDbType::EQUIPMENT_CHARM:
+            case ItemDbType::SPRITE_RACE:
+            case ItemDbType::SPRITE_HAIR:
                 itemInfo->addTag(mTags["Equipment"]);
                 break;
         }
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 79f0e04b5..1de4d9579 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -45,7 +45,7 @@ ItemInfo::ItemInfo() :
     mEffect(),
     mUseButton(),
     mUseButton2(),
-    mType(ItemType::UNUSABLE),
+    mType(ItemDbType::UNUSABLE),
     mWeight(0),
     mView(0),
     mId(0),
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index f9c622d3f..ad9a2d6ab 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -25,7 +25,7 @@
 
 #include "enums/being/gender.h"
 
-#include "enums/resources/itemtype.h"
+#include "enums/resources/itemdbtype.h"
 
 #include "enums/simpletypes/beingtypeid.h"
 #include "enums/simpletypes/itemcolor.h"
@@ -100,7 +100,7 @@ class ItemInfo final
         const std::string &getEffect() const A_WARN_UNUSED
         { return mEffect; }
 
-        void setType(const ItemTypeT type)
+        void setType(const ItemDbTypeT type)
         { mType = type; }
 
         void setUseButton(const std::string &str)
@@ -115,7 +115,7 @@ class ItemInfo final
         const std::string &getUseButton2() const A_WARN_UNUSED
         { return mUseButton2; }
 
-        ItemTypeT getType() const A_WARN_UNUSED
+        ItemDbTypeT getType() const A_WARN_UNUSED
         { return mType; }
 
         void setWeight(const int weight)
@@ -329,7 +329,7 @@ class ItemInfo final
         std::string mEffect;        /**< Description of effects. */
         std::string mUseButton;
         std::string mUseButton2;
-        ItemTypeT mType;            /**< Item type. */
+        ItemDbTypeT mType;          /**< Item type. */
         int mWeight;                /**< Weight in grams. */
         int mView;                  /**< Item ID of how this item looks. */
         int mId;                    /**< Item ID */
diff --git a/src/resources/itemtypemap.h b/src/resources/itemtypemap.h
index 6718c8413..c2866d430 100644
--- a/src/resources/itemtypemap.h
+++ b/src/resources/itemtypemap.h
@@ -21,7 +21,7 @@
 #ifndef RESOURCES_ITEMTYPEMAP_H
 #define RESOURCES_ITEMTYPEMAP_H
 
-#include "enums/resources/itemtype.h"
+#include "enums/resources/itemdbtype.h"
 
 #include <string>
 
@@ -30,7 +30,7 @@
 struct ItemTypeMap final
 {
     std::string name;
-    ItemTypeT type;
+    ItemDbTypeT type;
     std::string useButton;
     std::string useButton2;
 };
diff --git a/src/resources/itemtypemapdata.h b/src/resources/itemtypemapdata.h
index 250bf1835..19f8f658a 100644
--- a/src/resources/itemtypemapdata.h
+++ b/src/resources/itemtypemapdata.h
@@ -29,77 +29,77 @@
 
 ItemTypeMap itemTypeMap[] =
 {
-    {"generic", ItemType::UNUSABLE,
+    {"generic", ItemDbType::UNUSABLE,
         std::string(), std::string()
     },
-    {"other", ItemType::UNUSABLE,
+    {"other", ItemDbType::UNUSABLE,
         // TRANSLATORS: inventory button
         N_("Use"), N_("Use")
     },
-    {"usable", ItemType::USABLE,
+    {"usable", ItemDbType::USABLE,
         // TRANSLATORS: inventory button
         N_("Use"), N_("Use")
     },
-    {"equip-1hand", ItemType::EQUIPMENT_ONE_HAND_WEAPON,
+    {"equip-1hand", ItemDbType::EQUIPMENT_ONE_HAND_WEAPON,
         // TRANSLATORS: inventory button
         N_("Equip"), N_("Unequip")
     },
-    {"equip-2hand", ItemType::EQUIPMENT_TWO_HANDS_WEAPON,
+    {"equip-2hand", ItemDbType::EQUIPMENT_TWO_HANDS_WEAPON,
         // TRANSLATORS: inventory button
         N_("Equip"), N_("Unequip")
     },
-    {"equip-torso", ItemType::EQUIPMENT_TORSO,
+    {"equip-torso", ItemDbType::EQUIPMENT_TORSO,
         // TRANSLATORS: inventory button
         N_("Equip"), N_("Unequip")
     },
-    {"equip-arms", ItemType::EQUIPMENT_ARMS,
+    {"equip-arms", ItemDbType::EQUIPMENT_ARMS,
         // TRANSLATORS: inventory button
         N_("Equip"), N_("Unequip")
     },
-    {"equip-head", ItemType::EQUIPMENT_HEAD,
+    {"equip-head", ItemDbType::EQUIPMENT_HEAD,
         // TRANSLATORS: inventory button
         N_("Equip"), N_("Unequip")
     },
-    {"equip-legs", ItemType::EQUIPMENT_LEGS,
+    {"equip-legs", ItemDbType::EQUIPMENT_LEGS,
         // TRANSLATORS: inventory button
         N_("Equip"), N_("Unequip")
     },
-    {"equip-shield", ItemType::EQUIPMENT_SHIELD,
+    {"equip-shield", ItemDbType::EQUIPMENT_SHIELD,
         // TRANSLATORS: inventory button
         N_("Equip"), N_("Unequip")
     },
-    {"equip-ring", ItemType::EQUIPMENT_RING,
+    {"equip-ring", ItemDbType::EQUIPMENT_RING,
         // TRANSLATORS: inventory button
         N_("Equip"), N_("Unequip")
     },
-    {"equip-charm", ItemType::EQUIPMENT_CHARM,
+    {"equip-charm", ItemDbType::EQUIPMENT_CHARM,
         // TRANSLATORS: inventory button
         N_("Equip"), N_("Unequip")
     },
-    {"equip-necklace", ItemType::EQUIPMENT_NECKLACE,
+    {"equip-necklace", ItemDbType::EQUIPMENT_NECKLACE,
         // TRANSLATORS: inventory button
         N_("Equip"), N_("Unequip")
     },
-    {"equip-neck", ItemType::EQUIPMENT_NECKLACE,
+    {"equip-neck", ItemDbType::EQUIPMENT_NECKLACE,
         // TRANSLATORS: inventory button
         N_("Equip"), N_("Unequip")
     },
-    {"equip-feet", ItemType::EQUIPMENT_FEET,
+    {"equip-feet", ItemDbType::EQUIPMENT_FEET,
         // TRANSLATORS: inventory button
         N_("Equip"), N_("Unequip")
     },
-    {"equip-ammo", ItemType::EQUIPMENT_AMMO,
+    {"equip-ammo", ItemDbType::EQUIPMENT_AMMO,
         // TRANSLATORS: inventory button
         N_("Equip"), N_("Unequip")
     },
-    {"card", ItemType::CARD,
+    {"card", ItemDbType::CARD,
         // TRANSLATORS: inventory button
         N_("Insert"), std::string()
     },
-    {"racesprite", ItemType::SPRITE_RACE,
+    {"racesprite", ItemDbType::SPRITE_RACE,
         std::string(), std::string()
     },
-    {"hairsprite", ItemType::SPRITE_HAIR,
+    {"hairsprite", ItemDbType::SPRITE_HAIR,
         std::string(), std::string()
     }
 };