summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-06 19:37:22 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-06 19:37:22 +0300
commit265f242ad32e000907a3426bd1c3b9628acfab5e (patch)
treeff6275a6532bfdda54f241bfd95124e111f53e1f
parentb36411da4cab07c642e0ecea4d8c626253ae2523 (diff)
downloadmv-265f242ad32e000907a3426bd1c3b9628acfab5e.tar.gz
mv-265f242ad32e000907a3426bd1c3b9628acfab5e.tar.bz2
mv-265f242ad32e000907a3426bd1c3b9628acfab5e.tar.xz
mv-265f242ad32e000907a3426bd1c3b9628acfab5e.zip
Move cookingtype.h into enums directory.
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/enums/being/cookingtype.h (renamed from src/being/cookingtype.h)6
-rw-r--r--src/net/npchandler.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a467b433a..45241fac7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -850,7 +850,7 @@ SET(SRCS
being/compounditem.h
being/compoundsprite.cpp
being/compoundsprite.h
- being/cookingtype.h
+ enums/being/cookingtype.h
enums/being/gender.h
being/homunculusinfo.h
listeners/configlistener.h
diff --git a/src/Makefile.am b/src/Makefile.am
index b3a5c56e0..5d6906b4f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -972,7 +972,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
being/compounditem.h \
being/compoundsprite.cpp \
being/compoundsprite.h \
- being/cookingtype.h \
+ enums/being/cookingtype.h \
enums/being/gender.h \
being/homunculusinfo.h \
listeners/configlistener.h \
diff --git a/src/being/cookingtype.h b/src/enums/being/cookingtype.h
index 069014ca4..d2c50cd01 100644
--- a/src/being/cookingtype.h
+++ b/src/enums/being/cookingtype.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef BEING_COOKINGTYPE_H
-#define BEING_COOKINGTYPE_H
+#ifndef ENUMS_BEING_COOKINGTYPE_H
+#define ENUMS_BEING_COOKINGTYPE_H
namespace CookingType
{
@@ -34,4 +34,4 @@ namespace CookingType
};
} // namespace CookingType
-#endif // BEING_COOKINGTYPE_H
+#endif // ENUMS_BEING_COOKINGTYPE_H
diff --git a/src/net/npchandler.h b/src/net/npchandler.h
index 12c2b3a61..626e742dd 100644
--- a/src/net/npchandler.h
+++ b/src/net/npchandler.h
@@ -25,7 +25,7 @@
#include <iosfwd>
-#include "being/cookingtype.h"
+#include "enums/being/cookingtype.h"
#include "localconsts.h"