From 45c769b20e3b59446b58e182988547e6fe8507e0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 7 Jan 2016 14:48:13 +0300 Subject: Move invetory into inventory directory. --- src/gui/shortcut/dropshortcut.cpp | 3 ++- src/gui/shortcut/itemshortcut.cpp | 3 ++- src/gui/windows/buyingstoreselldialog.cpp | 3 ++- src/gui/windows/inventorywindow.h | 2 +- src/gui/windows/ministatuswindow.cpp | 3 ++- src/gui/windows/outfitwindow.cpp | 3 ++- src/gui/windows/shopwindow.cpp | 3 ++- 7 files changed, 13 insertions(+), 7 deletions(-) (limited to 'src/gui') diff --git a/src/gui/shortcut/dropshortcut.cpp b/src/gui/shortcut/dropshortcut.cpp index d0d85a253..380ff6a35 100644 --- a/src/gui/shortcut/dropshortcut.cpp +++ b/src/gui/shortcut/dropshortcut.cpp @@ -22,12 +22,13 @@ #include "gui/shortcut/dropshortcut.h" -#include "inventory.h" #include "settings.h" #include "being/localplayer.h" #include "being/playerinfo.h" +#include "resources/inventory/inventory.h" + #include "resources/item/item.h" #include "net/packetlimiter.h" diff --git a/src/gui/shortcut/itemshortcut.cpp b/src/gui/shortcut/itemshortcut.cpp index d4c7874cf..7166fddf5 100644 --- a/src/gui/shortcut/itemshortcut.cpp +++ b/src/gui/shortcut/itemshortcut.cpp @@ -23,7 +23,6 @@ #include "gui/shortcut/itemshortcut.h" #include "configuration.h" -#include "inventory.h" #include "spellmanager.h" #include "being/playerinfo.h" @@ -34,6 +33,8 @@ #include "gui/windows/skilldialog.h" +#include "resources/inventory/inventory.h" + #include "resources/item/item.h" #include "debug.h" diff --git a/src/gui/windows/buyingstoreselldialog.cpp b/src/gui/windows/buyingstoreselldialog.cpp index b9aad7e54..205734248 100644 --- a/src/gui/windows/buyingstoreselldialog.cpp +++ b/src/gui/windows/buyingstoreselldialog.cpp @@ -23,7 +23,6 @@ #include "gui/windows/buyingstoreselldialog.h" #include "actormanager.h" -#include "inventory.h" #include "being/playerinfo.h" @@ -33,6 +32,8 @@ #include "net/buyingstorehandler.h" +#include "resources/inventory/inventory.h" + #include "resources/item/shopitem.h" #include "debug.h" diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h index 64e8cceb4..6c02e4304 100644 --- a/src/gui/windows/inventorywindow.h +++ b/src/gui/windows/inventorywindow.h @@ -23,7 +23,7 @@ #ifndef GUI_WINDOWS_INVENTORYWINDOW_H #define GUI_WINDOWS_INVENTORYWINDOW_H -#include "inventory.h" +#include "resources/inventory/inventory.h" #include "gui/widgets/window.h" diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index 98a45effc..3ca9b8e35 100644 --- a/src/gui/windows/ministatuswindow.cpp +++ b/src/gui/windows/ministatuswindow.cpp @@ -23,7 +23,6 @@ #include "gui/windows/ministatuswindow.h" #include "configuration.h" -#include "inventory.h" #include "being/localplayer.h" #include "being/playerinfo.h" @@ -42,6 +41,8 @@ #include "net/playerhandler.h" +#include "resources/inventory/inventory.h" + #include "resources/sprite/animatedsprite.h" #include "utils/delete2.h" diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp index 8034ef032..73cc5101d 100644 --- a/src/gui/windows/outfitwindow.cpp +++ b/src/gui/windows/outfitwindow.cpp @@ -25,7 +25,6 @@ #include "configuration.h" #include "dragdrop.h" #include "game.h" -#include "inventory.h" #include "being/playerinfo.h" @@ -48,6 +47,8 @@ #include "utils/gettext.h" +#include "resources/inventory/inventory.h" + #include #include "debug.h" diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp index c6388c50e..7c75c4f92 100644 --- a/src/gui/windows/shopwindow.cpp +++ b/src/gui/windows/shopwindow.cpp @@ -60,7 +60,6 @@ #include "soundmanager.h" #endif #include "configuration.h" -#include "inventory.h" #include "settings.h" #include "being/localplayer.h" @@ -86,6 +85,8 @@ #include "resources/iteminfo.h" #endif +#include "resources/inventory/inventory.h" + #include "resources/item/shopitem.h" #include -- cgit v1.2.3-60-g2f50