Move shopitems into gui/models.

8 files changed, 15 insertions, 12 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 297713e72..e5ddcd8f8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -204,8 +204,8 @@ SET(SRCS
     gui/widgets/tabs/setuptabscroll.h
     gui/widgets/setuptouchitem.cpp
     gui/widgets/setuptouchitem.h
-    gui/widgets/shopitems.cpp
-    gui/widgets/shopitems.h
+    gui/models/shopitems.cpp
+    gui/models/shopitems.h
     gui/widgets/shoplistbox.cpp
     gui/widgets/shoplistbox.h
     gui/widgets/shortcutcontainer.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index ebfb1c59f..4a788fa77 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -302,8 +302,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/widgets/tabs/setuptabscroll.h \
 	      gui/widgets/setuptouchitem.cpp \
 	      gui/widgets/setuptouchitem.h \
-	      gui/widgets/shopitems.cpp \
-	      gui/widgets/shopitems.h \
+	      gui/models/shopitems.cpp \
+	      gui/models/shopitems.h \
 	      gui/widgets/shoplistbox.cpp \
 	      gui/widgets/shoplistbox.h \
 	      gui/widgets/shortcutcontainer.cpp \
diff --git a/src/gui/widgets/shopitems.cpp b/src/gui/models/shopitems.cpp
index 2ac65253d..492409e76 100644
--- a/src/gui/widgets/shopitems.cpp
+++ b/src/gui/models/shopitems.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/widgets/shopitems.h"
+#include "gui/models/shopitems.h"
 
 #include "shopitem.h"
 
diff --git a/src/gui/widgets/shopitems.h b/src/gui/models/shopitems.h
index d1fa1ca98..925354960 100644
--- a/src/gui/widgets/shopitems.h
+++ b/src/gui/models/shopitems.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WIDGETS_SHOPITEMS_H
-#define GUI_WIDGETS_SHOPITEMS_H
+#ifndef GUI_MODELS_SHOPITEMS_H
+#define GUI_MODELS_SHOPITEMS_H
 
 #include "gui/models/listmodel.h"
 
@@ -138,4 +138,4 @@ class ShopItems final : public ListModel
         bool mMergeDuplicates;
 };
 
-#endif  // GUI_WIDGETS_SHOPITEMS_H
+#endif  // GUI_MODELS_SHOPITEMS_H
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index ff45e5297..36104241d 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -32,7 +32,7 @@
 
 #include "gui/popups/itempopup.h"
 
-#include "gui/widgets/shopitems.h"
+#include "gui/models/shopitems.h"
 
 #include "resources/image.h"
 
diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp
index ac8187fc3..e64a7489b 100644
--- a/src/gui/windows/buydialog.cpp
+++ b/src/gui/windows/buydialog.cpp
@@ -28,13 +28,14 @@
 
 #include "gui/windows/tradewindow.h"
 
+#include "gui/models/shopitems.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/dropdown.h"
 #include "gui/widgets/inttextfield.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/scrollarea.h"
-#include "gui/widgets/shopitems.h"
 #include "gui/widgets/shoplistbox.h"
 #include "gui/widgets/slider.h"
 
diff --git a/src/gui/windows/selldialog.cpp b/src/gui/windows/selldialog.cpp
index a89f7655a..525e3f133 100644
--- a/src/gui/windows/selldialog.cpp
+++ b/src/gui/windows/selldialog.cpp
@@ -30,11 +30,12 @@
 #include "gui/windows/confirmdialog.h"
 #include "gui/windows/tradewindow.h"
 
+#include "gui/models/shopitems.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/scrollarea.h"
-#include "gui/widgets/shopitems.h"
 #include "gui/widgets/shoplistbox.h"
 #include "gui/widgets/slider.h"
 
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index 706438f61..32e249d35 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -27,12 +27,13 @@
 #include "gui/windows/selldialog.h"
 #include "gui/windows/tradewindow.h"
 
+#include "gui/models/shopitems.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/checkbox.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/scrollarea.h"
-#include "gui/widgets/shopitems.h"
 #include "gui/widgets/shoplistbox.h"
 
 #include "gui/widgets/tabs/chattab.h"