summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-08-15 18:01:14 +0300
committerAndrei Karas <akaras@inbox.ru>2016-08-15 18:01:14 +0300
commita520caf57d759e725d8e63d1c47d9b3d5e779324 (patch)
tree63150e9d679cca8ca082d67123ed3e64813f0927 /src
parent54529fe6eb4de762fde160644b2ec365d1bf4db3 (diff)
downloadmv-a520caf57d759e725d8e63d1c47d9b3d5e779324.tar.gz
mv-a520caf57d759e725d8e63d1c47d9b3d5e779324.tar.bz2
mv-a520caf57d759e725d8e63d1c47d9b3d5e779324.tar.xz
mv-a520caf57d759e725d8e63d1c47d9b3d5e779324.zip
Move itemtype.h into item directory.
Diffstat (limited to 'src')
-rw-r--r--src/actormanager.h2
-rw-r--r--src/being/flooritem.h2
-rw-r--r--src/enums/resources/item/itemtype.h (renamed from src/enums/resources/itemtype.h)6
-rw-r--r--src/gui/models/shopitems.h2
-rw-r--r--src/gui/widgets/selldialog.h2
-rw-r--r--src/gui/windows/buydialog.h2
-rw-r--r--src/gui/windows/tradewindow.h2
-rw-r--r--src/net/ea/inventoryitem.h2
-rw-r--r--src/net/markethandler.h2
-rw-r--r--src/resources/inventory/inventory.h2
-rw-r--r--src/resources/item/item.h2
11 files changed, 13 insertions, 13 deletions
diff --git a/src/actormanager.h b/src/actormanager.h
index dea704e48..22a4e3e2a 100644
--- a/src/actormanager.h
+++ b/src/actormanager.h
@@ -25,7 +25,7 @@
#include "enums/being/actortype.h"
-#include "enums/resources/itemtype.h"
+#include "enums/resources/item/itemtype.h"
#include "enums/simpletypes/allowsort.h"
#include "enums/simpletypes/allplayers.h"
diff --git a/src/being/flooritem.h b/src/being/flooritem.h
index dc3c6fd0c..60e5d953d 100644
--- a/src/being/flooritem.h
+++ b/src/being/flooritem.h
@@ -25,7 +25,7 @@
#include "const/resources/item/cards.h"
-#include "enums/resources/itemtype.h"
+#include "enums/resources/item/itemtype.h"
#include "enums/simpletypes/damaged.h"
#include "enums/simpletypes/identified.h"
diff --git a/src/enums/resources/itemtype.h b/src/enums/resources/item/itemtype.h
index c56f03532..73ad26060 100644
--- a/src/enums/resources/itemtype.h
+++ b/src/enums/resources/item/itemtype.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef ENUMS_RESOURCES_ITEMTYPE_H
-#define ENUMS_RESOURCES_ITEMTYPE_H
+#ifndef ENUMS_RESOURCES_ITEM_ITEMTYPE_H
+#define ENUMS_RESOURCES_ITEM_ITEMTYPE_H
#include "enums/simpletypes/enumdefines.h"
@@ -41,4 +41,4 @@ enumStart(ItemType)
}
enumEnd(ItemType);
-#endif // ENUMS_RESOURCES_ITEMTYPE_H
+#endif // ENUMS_RESOURCES_ITEM_ITEMTYPE_H
diff --git a/src/gui/models/shopitems.h b/src/gui/models/shopitems.h
index e9b1a922d..cc72403b0 100644
--- a/src/gui/models/shopitems.h
+++ b/src/gui/models/shopitems.h
@@ -23,7 +23,7 @@
#ifndef GUI_MODELS_SHOPITEMS_H
#define GUI_MODELS_SHOPITEMS_H
-#include "enums/resources/itemtype.h"
+#include "enums/resources/item/itemtype.h"
#include "enums/simpletypes/itemcolor.h"
diff --git a/src/gui/widgets/selldialog.h b/src/gui/widgets/selldialog.h
index 46512225f..c2ad005bd 100644
--- a/src/gui/widgets/selldialog.h
+++ b/src/gui/widgets/selldialog.h
@@ -23,7 +23,7 @@
#ifndef GUI_WIDGETS_SELLDIALOG_H
#define GUI_WIDGETS_SELLDIALOG_H
-#include "enums/resources/itemtype.h"
+#include "enums/resources/item/itemtype.h"
#include "enums/simpletypes/advanced.h"
#include "enums/simpletypes/issell.h"
diff --git a/src/gui/windows/buydialog.h b/src/gui/windows/buydialog.h
index 77d5c357f..24e616152 100644
--- a/src/gui/windows/buydialog.h
+++ b/src/gui/windows/buydialog.h
@@ -23,7 +23,7 @@
#ifndef GUI_WINDOWS_BUYDIALOG_H
#define GUI_WINDOWS_BUYDIALOG_H
-#include "enums/resources/itemtype.h"
+#include "enums/resources/item/itemtype.h"
#include "enums/simpletypes/beingid.h"
#include "enums/simpletypes/itemcolor.h"
diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h
index f8a280a20..4920fe90c 100644
--- a/src/gui/windows/tradewindow.h
+++ b/src/gui/windows/tradewindow.h
@@ -25,7 +25,7 @@
#include "gui/widgets/window.h"
-#include "enums/resources/itemtype.h"
+#include "enums/resources/item/itemtype.h"
#include "enums/simpletypes/damaged.h"
#include "enums/simpletypes/equipm.h"
diff --git a/src/net/ea/inventoryitem.h b/src/net/ea/inventoryitem.h
index 749c51ac2..20158b115 100644
--- a/src/net/ea/inventoryitem.h
+++ b/src/net/ea/inventoryitem.h
@@ -25,7 +25,7 @@
#include "const/resources/item/cards.h"
-#include "enums/resources/itemtype.h"
+#include "enums/resources/item/itemtype.h"
#include "enums/simpletypes/damaged.h"
#include "enums/simpletypes/equipm.h"
diff --git a/src/net/markethandler.h b/src/net/markethandler.h
index 433a586e4..351948b2d 100644
--- a/src/net/markethandler.h
+++ b/src/net/markethandler.h
@@ -21,7 +21,7 @@
#ifndef NET_MARKETHANDLER_H
#define NET_MARKETHANDLER_H
-#include "enums/resources/itemtype.h"
+#include "enums/resources/item/itemtype.h"
#include "enums/simpletypes/itemcolor.h"
diff --git a/src/resources/inventory/inventory.h b/src/resources/inventory/inventory.h
index f687339cb..8d1e0c076 100644
--- a/src/resources/inventory/inventory.h
+++ b/src/resources/inventory/inventory.h
@@ -25,7 +25,7 @@
#include "enums/inventorytype.h"
-#include "enums/resources/itemtype.h"
+#include "enums/resources/item/itemtype.h"
#include "enums/simpletypes/beingtypeid.h"
#include "enums/simpletypes/damaged.h"
diff --git a/src/resources/item/item.h b/src/resources/item/item.h
index d0bb9b9f3..5ae0cbc99 100644
--- a/src/resources/item/item.h
+++ b/src/resources/item/item.h
@@ -25,7 +25,7 @@
#include "const/resources/item/cards.h"
-#include "enums/resources/itemtype.h"
+#include "enums/resources/item/itemtype.h"
#include "enums/simpletypes/damaged.h"
#include "enums/simpletypes/equipm.h"