diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-08-15 17:45:58 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-08-15 17:45:58 +0300 |
| commit | 8983972051cb5bc18c3e3dc40837b00f2e2caced (patch) | |
| tree | 1d1ada4551b5aa7ad0f05c2868ca8b0933832335 | |
| parent | 9c4835ccba3afbbd9cf4a3fe31f22c924f5b6a81 (diff) | |
| download | mv-8983972051cb5bc18c3e3dc40837b00f2e2caced.tar.gz mv-8983972051cb5bc18c3e3dc40837b00f2e2caced.tar.bz2 mv-8983972051cb5bc18c3e3dc40837b00f2e2caced.tar.xz mv-8983972051cb5bc18c3e3dc40837b00f2e2caced.zip | |
Move itemdbtype.h into item directory.
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/enums/resources/item/itemdbtype.h (renamed from src/enums/resources/itemdbtype.h) | 6 | ||||
| -rw-r--r-- | src/gui/popups/itempopup.h | 2 | ||||
| -rw-r--r-- | src/resources/iteminfo.h | 2 | ||||
| -rw-r--r-- | src/resources/itemtypemap.h | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 34e564376..20ffa9add 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -675,7 +675,7 @@ SET(SRCS resources/itemslot.h enums/resources/imageposition.h enums/resources/imagetype.h - enums/resources/itemdbtype.h + enums/resources/item/itemdbtype.h enums/resources/itemsoundevent.h enums/resources/itemtype.h resources/itemtypemap.h diff --git a/src/Makefile.am b/src/Makefile.am index d9c02699c..44c1141b2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1285,7 +1285,7 @@ manaplus_SOURCES += main.cpp \ resources/itemslot.h \ enums/resources/imageposition.h \ enums/resources/imagetype.h \ - enums/resources/itemdbtype.h \ + enums/resources/item/itemdbtype.h \ enums/resources/itemsoundevent.h \ enums/resources/itemtype.h \ resources/itemtypemap.h \ diff --git a/src/enums/resources/itemdbtype.h b/src/enums/resources/item/itemdbtype.h index 31b53c1ad..2adba550b 100644 --- a/src/enums/resources/itemdbtype.h +++ b/src/enums/resources/item/itemdbtype.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef ENUMS_RESOURCES_ITEMDBTYPE_H -#define ENUMS_RESOURCES_ITEMDBTYPE_H +#ifndef ENUMS_RESOURCES_ITEM_ITEMDBTYPE_H +#define ENUMS_RESOURCES_ITEM_ITEMDBTYPE_H #include "enums/simpletypes/enumdefines.h" @@ -47,4 +47,4 @@ enumStart(ItemDbType) } enumEnd(ItemDbType); -#endif // ENUMS_RESOURCES_ITEMDBTYPE_H +#endif // ENUMS_RESOURCES_ITEM_ITEMDBTYPE_H diff --git a/src/gui/popups/itempopup.h b/src/gui/popups/itempopup.h index b9439fe1d..cc70d41bc 100644 --- a/src/gui/popups/itempopup.h +++ b/src/gui/popups/itempopup.h @@ -24,7 +24,7 @@ #ifndef GUI_POPUPS_ITEMPOPUP_H #define GUI_POPUPS_ITEMPOPUP_H -#include "enums/resources/itemdbtype.h" +#include "enums/resources/item/itemdbtype.h" #include "enums/simpletypes/itemcolor.h" diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index 3eb19dc80..fd75a9f30 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -25,7 +25,7 @@ #include "enums/being/gender.h" -#include "enums/resources/itemdbtype.h" +#include "enums/resources/item/itemdbtype.h" #include "enums/simpletypes/beingtypeid.h" #include "enums/simpletypes/itemcolor.h" diff --git a/src/resources/itemtypemap.h b/src/resources/itemtypemap.h index c2866d430..87b5b6ff0 100644 --- a/src/resources/itemtypemap.h +++ b/src/resources/itemtypemap.h @@ -21,7 +21,7 @@ #ifndef RESOURCES_ITEMTYPEMAP_H #define RESOURCES_ITEMTYPEMAP_H -#include "enums/resources/itemdbtype.h" +#include "enums/resources/item/itemdbtype.h" #include <string> |