From 9b072c42f4508de8fb15d1fc8b59931777d5b5a7 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 29 Dec 2015 01:48:21 +0300 Subject: Move item into item directory. --- src/gui/windows/inventorywindow.cpp | 3 ++- src/gui/windows/itemamountwindow.cpp | 4 ++-- src/gui/windows/maileditwindow.cpp | 7 ++++--- src/gui/windows/npcdialog.cpp | 3 ++- src/gui/windows/statuswindow.cpp | 3 ++- src/gui/windows/tradewindow.cpp | 3 ++- 6 files changed, 14 insertions(+), 9 deletions(-) (limited to 'src/gui/windows') diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index 4770ef69a..71c09d723 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -23,7 +23,6 @@ #include "gui/windows/inventorywindow.h" #include "configuration.h" -#include "item.h" #include "units.h" #include "being/playerinfo.h" @@ -62,6 +61,8 @@ #include "resources/iteminfo.h" +#include "resources/item/item.h" + #include "utils/delete2.h" #include "debug.h" diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp index fba671675..08227e19e 100644 --- a/src/gui/windows/itemamountwindow.cpp +++ b/src/gui/windows/itemamountwindow.cpp @@ -22,8 +22,6 @@ #include "gui/windows/itemamountwindow.h" -#include "item.h" - #include "being/playerinfo.h" #include "input/keyboardconfig.h" @@ -48,6 +46,8 @@ #include "gui/widgets/label.h" #include "gui/widgets/slider.h" +#include "resources/item/item.h" + #include "utils/gettext.h" #include diff --git a/src/gui/windows/maileditwindow.cpp b/src/gui/windows/maileditwindow.cpp index da7210a43..1030e41ae 100644 --- a/src/gui/windows/maileditwindow.cpp +++ b/src/gui/windows/maileditwindow.cpp @@ -20,10 +20,7 @@ #include "gui/windows/maileditwindow.h" -#include "item.h" - #include "being/playerinfo.h" -#include "net/mailhandler.h" #include "gui/windows/inventorywindow.h" #include "gui/windows/itemamountwindow.h" @@ -35,6 +32,10 @@ #include "gui/widgets/label.h" #include "gui/widgets/scrollarea.h" +#include "resources/item/item.h" + +#include "net/mailhandler.h" + #include "utils/delete2.h" #include "utils/gettext.h" diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index 9cdf6a3b0..28ede67e6 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -24,7 +24,6 @@ #include "actormanager.h" #include "configuration.h" -#include "item.h" #include "settings.h" #include "soundmanager.h" @@ -62,6 +61,8 @@ #include "resources/db/npcdb.h" #include "resources/db/npcdialogdb.h" +#include "resources/item/item.h" + #include "net/npchandler.h" #include "net/packetlimiter.h" diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index 6ac5b34dc..11a0a2f41 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -24,7 +24,6 @@ #include "configuration.h" #include "gamemodifiers.h" -#include "item.h" #include "settings.h" #include "units.h" @@ -49,6 +48,8 @@ #include "net/inventoryhandler.h" #include "net/playerhandler.h" +#include "resources/item/item.h" + #include "utils/delete2.h" #include "utils/gettext.h" diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp index 69cf87848..68c779148 100644 --- a/src/gui/windows/tradewindow.cpp +++ b/src/gui/windows/tradewindow.cpp @@ -24,7 +24,6 @@ #include "configuration.h" #include "game.h" -#include "item.h" #include "units.h" #include "being/localplayer.h" @@ -50,6 +49,8 @@ #include "gui/widgets/tabs/chat/chattab.h" +#include "resources/item/item.h" + #include "net/tradehandler.h" #include "utils/delete2.h" -- cgit v1.2.3-70-g09d2