Move shopitem into item directory.

17 files changed, 32 insertions, 27 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 08df3344a..b483657e9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1117,8 +1117,8 @@ SET(SRCS
     sdlshared.h
     settings.cpp
     settings.h
-    shopitem.cpp
-    shopitem.h
+    resources/item/shopitem.cpp
+    resources/item/shopitem.h
     gui/shortcut/shortcutbase.cpp
     gui/shortcut/shortcutbase.h
     resources/animation/simpleanimation.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 02310a8e5..a555b0a06 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -755,8 +755,8 @@ manaplus_SOURCES += main.cpp \
 	      enums/being/pickup.h \
 	      beingequipbackend.cpp \
 	      beingequipbackend.h \
-	      shopitem.cpp \
-	      shopitem.h \
+	      resources/item/shopitem.cpp \
+	      resources/item/shopitem.h \
 	      flooritem.cpp \
 	      flooritem.h \
 	      game.cpp \
diff --git a/src/gui/models/shopitems.cpp b/src/gui/models/shopitems.cpp
index 05c4a5e6c..f121fb8d6 100644
--- a/src/gui/models/shopitems.cpp
+++ b/src/gui/models/shopitems.cpp
@@ -22,7 +22,7 @@
 
 #include "gui/models/shopitems.h"
 
-#include "shopitem.h"
+#include "resources/item/shopitem.h"
 
 #include "utils/dtor.h"
 
diff --git a/src/gui/widgets/selldialog.cpp b/src/gui/widgets/selldialog.cpp
index 8488e4157..2e6e20b86 100644
--- a/src/gui/widgets/selldialog.cpp
+++ b/src/gui/widgets/selldialog.cpp
@@ -22,7 +22,6 @@
 
 #include "gui/widgets/selldialog.h"
 
-#include "shopitem.h"
 #include "units.h"
 
 #include "gui/windows/setupwindow.h"
@@ -43,6 +42,8 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
+#include "resources/item/shopitem.h"
+
 #include "debug.h"
 
 SellDialog::DialogList SellDialog::instances;
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index 6cdf58d2e..e10011f16 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -23,7 +23,6 @@
 #include "gui/widgets/shoplistbox.h"
 
 #include "settings.h"
-#include "shopitem.h"
 
 #include "being/playerinfo.h"
 
@@ -38,6 +37,8 @@
 
 #include "resources/image.h"
 
+#include "resources/item/shopitem.h"
+
 #include "debug.h"
 
 const int ITEM_ICON_SIZE = 32;
diff --git a/src/gui/windows/buyingstoreselldialog.cpp b/src/gui/windows/buyingstoreselldialog.cpp
index a93ee53f6..c4425b6aa 100644
--- a/src/gui/windows/buyingstoreselldialog.cpp
+++ b/src/gui/windows/buyingstoreselldialog.cpp
@@ -24,7 +24,6 @@
 
 #include "actormanager.h"
 #include "inventory.h"
-#include "shopitem.h"
 
 #include "being/playerinfo.h"
 
@@ -34,6 +33,8 @@
 
 #include "net/buyingstorehandler.h"
 
+#include "resources/item/shopitem.h"
+
 #include "debug.h"
 
 BuyingStoreSellDialog::BuyingStoreSellDialog(const BeingId accountId,
diff --git a/src/gui/windows/eggselectiondialog.cpp b/src/gui/windows/eggselectiondialog.cpp
index 81c283b8c..7d5b4b239 100644
--- a/src/gui/windows/eggselectiondialog.cpp
+++ b/src/gui/windows/eggselectiondialog.cpp
@@ -22,8 +22,6 @@
 
 #include "gui/windows/eggselectiondialog.h"
 
-#include "shopitem.h"
-
 #include "gui/models/shopitems.h"
 
 #include "gui/widgets/button.h"
@@ -33,6 +31,8 @@
 
 #include "utils/gettext.h"
 
+#include "resources/item/shopitem.h"
+
 #include "debug.h"
 
 EggSelectionDialog::EggSelectionDialog() :
diff --git a/src/gui/windows/insertcarddialog.cpp b/src/gui/windows/insertcarddialog.cpp
index 1c8800f88..fad378485 100644
--- a/src/gui/windows/insertcarddialog.cpp
+++ b/src/gui/windows/insertcarddialog.cpp
@@ -22,8 +22,6 @@
 
 #include "gui/windows/insertcarddialog.h"
 
-#include "shopitem.h"
-
 #include "gui/models/shopitems.h"
 
 #include "gui/widgets/button.h"
@@ -34,6 +32,8 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
+#include "resources/item/shopitem.h"
+
 #include "debug.h"
 
 InsertCardDialog::InsertCardDialog(const int itemIndex,
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index 19a7e31b8..127f0fbcd 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -62,7 +62,6 @@
 #include "configuration.h"
 #include "inventory.h"
 #include "settings.h"
-#include "shopitem.h"
 
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
@@ -87,6 +86,8 @@
 #include "resources/iteminfo.h"
 #endif
 
+#include "resources/item/shopitem.h"
+
 #include <sys/stat.h>
 
 #include <sstream>
diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h
index 7e7472ce6..48d76d67b 100644
--- a/src/net/buysellhandler.h
+++ b/src/net/buysellhandler.h
@@ -23,7 +23,7 @@
 #ifndef NET_BUYSELLHANDLER_H
 #define NET_BUYSELLHANDLER_H
 
-#include "shopitem.h"
+#include "resources/item/shopitem.h"
 
 namespace Net
 {
diff --git a/src/net/eathena/buyingstorehandler.cpp b/src/net/eathena/buyingstorehandler.cpp
index 8ff7f65bb..163e0bd79 100644
--- a/src/net/eathena/buyingstorehandler.cpp
+++ b/src/net/eathena/buyingstorehandler.cpp
@@ -20,8 +20,6 @@
 
 #include "net/eathena/buyingstorehandler.h"
 
-#include "shopitem.h"
-
 #include "being/being.h"
 #include "being/playerinfo.h"
 
@@ -30,6 +28,8 @@
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocolout.h"
 
+#include "resources/item/shopitem.h"
+
 #include "debug.h"
 
 extern Net::BuyingStoreHandler *buyingStoreHandler;
diff --git a/src/net/eathena/markethandler.cpp b/src/net/eathena/markethandler.cpp
index 47aa05418..2f582c763 100644
--- a/src/net/eathena/markethandler.cpp
+++ b/src/net/eathena/markethandler.cpp
@@ -18,14 +18,14 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "shopitem.h"
-
 #include "net/eathena/markethandler.h"
 
 #include "net/eathena/marketrecv.h"
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocolout.h"
 
+#include "resources/item/shopitem.h"
+
 #include "debug.h"
 
 extern Net::MarketHandler *marketHandler;
diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp
index 5a267c25e..a55e59aa7 100644
--- a/src/net/eathena/npchandler.cpp
+++ b/src/net/eathena/npchandler.cpp
@@ -22,8 +22,6 @@
 
 #include "net/eathena/npchandler.h"
 
-#include "shopitem.h"
-
 #include "being/localplayer.h"
 
 #include "const/net/inventory.h"
@@ -39,6 +37,8 @@
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocolout.h"
 
+#include "resources/item/shopitem.h"
+
 #include "debug.h"
 
 extern Net::NpcHandler *npcHandler;
diff --git a/src/net/eathena/vendinghandler.cpp b/src/net/eathena/vendinghandler.cpp
index 5a0661ae4..c448b627b 100644
--- a/src/net/eathena/vendinghandler.cpp
+++ b/src/net/eathena/vendinghandler.cpp
@@ -20,8 +20,6 @@
 
 #include "net/eathena/vendinghandler.h"
 
-#include "shopitem.h"
-
 #include "being/being.h"
 #include "being/playerinfo.h"
 
@@ -31,6 +29,8 @@
 #include "net/eathena/protocolout.h"
 #include "net/eathena/vendingrecv.h"
 
+#include "resources/item/shopitem.h"
+
 #include "debug.h"
 
 extern Net::VendingHandler *vendingHandler;
diff --git a/src/net/eathena/vendingrecv.cpp b/src/net/eathena/vendingrecv.cpp
index 146f2102e..8ba684e0c 100644
--- a/src/net/eathena/vendingrecv.cpp
+++ b/src/net/eathena/vendingrecv.cpp
@@ -22,7 +22,6 @@
 
 #include "actormanager.h"
 #include "itemcolormanager.h"
-#include "shopitem.h"
 
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
@@ -36,6 +35,8 @@
 
 #include "net/messagein.h"
 
+#include "resources/item/shopitem.h"
+
 #include "debug.h"
 
 extern int packetVersion;
diff --git a/src/shopitem.cpp b/src/resources/item/shopitem.cpp
index e31179772..78a29065d 100644
--- a/src/shopitem.cpp
+++ b/src/resources/item/shopitem.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "shopitem.h"
+#include "resources/item/shopitem.h"
 
 #include "units.h"
 
diff --git a/src/shopitem.h b/src/resources/item/shopitem.h
index cfafbec50..e5f9efe0d 100644
--- a/src/shopitem.h
+++ b/src/resources/item/shopitem.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SHOPITEM_H
-#define SHOPITEM_H
+#ifndef RESOURCES_ITEM_SHOPITEM_H
+#define RESOURCES_ITEM_SHOPITEM_H
 
 #include "resources/item/item.h"
 
@@ -175,4 +175,4 @@ class ShopItem final : public Item
         bool mDisabled;
 };
 
-#endif  // SHOPITEM_H
+#endif  // RESOURCES_ITEM_SHOPITEM_H