diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-06-29 14:30:34 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-06-29 14:30:34 +0300 |
| commit | b0666acdae84d8b4e1f76cdf84191173c667bff4 (patch) | |
| tree | df88b81b8e7303bd32261105bb946cff17460a0e | |
| parent | f5660b872aaf0f3c817e74079ec8d506d4eca05c (diff) | |
| download | manaverse-b0666acdae84d8b4e1f76cdf84191173c667bff4.tar.gz manaverse-b0666acdae84d8b4e1f76cdf84191173c667bff4.tar.bz2 manaverse-b0666acdae84d8b4e1f76cdf84191173c667bff4.tar.xz manaverse-b0666acdae84d8b4e1f76cdf84191173c667bff4.zip | |
Move itemsoundevent.h into enums directory.
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/enums/resources/itemsoundevent.h (renamed from src/resources/itemsoundevent.h) | 6 | ||||
| -rw-r--r-- | src/itemsoundmanager.h | 2 | ||||
| -rw-r--r-- | src/resources/soundinfo.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b14c381de..c95768b4b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -641,7 +641,7 @@ SET(SRCS resources/iteminfo.h resources/iteminfo.cpp resources/itemslot.h - resources/itemsoundevent.h + enums/resources/itemsoundevent.h resources/itemtype.h resources/itemtypemap.h resources/itemtypemapdata.h diff --git a/src/Makefile.am b/src/Makefile.am index 8c587b3d5..19f777fd4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -785,7 +785,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ resources/iteminfo.h \ resources/iteminfo.cpp \ resources/itemslot.h \ - resources/itemsoundevent.h \ + enums/resources/itemsoundevent.h \ resources/itemtype.h \ resources/itemtypemap.h \ resources/itemtypemapdata.h \ diff --git a/src/resources/itemsoundevent.h b/src/enums/resources/itemsoundevent.h index 0f3b36b94..5b9a4157b 100644 --- a/src/resources/itemsoundevent.h +++ b/src/enums/resources/itemsoundevent.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef RESOURCES_ITEMSOUNDEVENT_H -#define RESOURCES_ITEMSOUNDEVENT_H +#ifndef ENUMS_RESOURCES_ITEMSOUNDEVENT_H +#define ENUMS_RESOURCES_ITEMSOUNDEVENT_H namespace ItemSoundEvent { @@ -43,4 +43,4 @@ namespace ItemSoundEvent }; } // namespace ItemSoundEvent -#endif // RESOURCES_ITEMSOUNDEVENT_H +#endif // ENUMS_RESOURCES_ITEMSOUNDEVENT_H diff --git a/src/itemsoundmanager.h b/src/itemsoundmanager.h index a7bb8a01d..9317d6680 100644 --- a/src/itemsoundmanager.h +++ b/src/itemsoundmanager.h @@ -21,7 +21,7 @@ #ifndef ITEMSOUNDMANAGER_H #define ITEMSOUNDMANAGER_H -#include "resources/itemsoundevent.h" +#include "enums/resources/itemsoundevent.h" #include "localconsts.h" diff --git a/src/resources/soundinfo.h b/src/resources/soundinfo.h index 15a9dd030..80aef407c 100644 --- a/src/resources/soundinfo.h +++ b/src/resources/soundinfo.h @@ -21,7 +21,7 @@ #ifndef RESOURCES_SOUNDINFO_H #define RESOURCES_SOUNDINFO_H -#include "resources/itemsoundevent.h" +#include "enums/resources/itemsoundevent.h" #include <map> #include <string> |