Move shopitem into item directory.

7 files changed, 13 insertions, 9 deletions

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>