diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-12-29 02:21:53 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-12-29 02:21:53 +0300 |
| commit | 75802940ea0f10c4ecce5ab55140c38a164ba574 (patch) | |
| tree | 506873f03fd72b2bb3fc84085d0202c61f79a89c /src/gui/windows | |
| parent | 9b072c42f4508de8fb15d1fc8b59931777d5b5a7 (diff) | |
| download | manaplus-75802940ea0f10c4ecce5ab55140c38a164ba574.tar.gz manaplus-75802940ea0f10c4ecce5ab55140c38a164ba574.tar.bz2 manaplus-75802940ea0f10c4ecce5ab55140c38a164ba574.tar.xz manaplus-75802940ea0f10c4ecce5ab55140c38a164ba574.zip | |
Move shopitem into item directory.
Diffstat (limited to 'src/gui/windows')
| -rw-r--r-- | src/gui/windows/buyingstoreselldialog.cpp | 3 | ||||
| -rw-r--r-- | src/gui/windows/eggselectiondialog.cpp | 4 | ||||
| -rw-r--r-- | src/gui/windows/insertcarddialog.cpp | 4 | ||||
| -rw-r--r-- | src/gui/windows/shopwindow.cpp | 3 |
4 files changed, 8 insertions, 6 deletions
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> |