From 265f242ad32e000907a3426bd1c3b9628acfab5e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 6 Jan 2015 19:37:22 +0300 Subject: Move cookingtype.h into enums directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/being/cookingtype.h | 37 ------------------------------------- src/enums/being/cookingtype.h | 37 +++++++++++++++++++++++++++++++++++++ src/net/npchandler.h | 2 +- 5 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 src/being/cookingtype.h create mode 100644 src/enums/being/cookingtype.h 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/being/cookingtype.h deleted file mode 100644 index 069014ca4..000000000 --- a/src/being/cookingtype.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2011-2015 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef BEING_COOKINGTYPE_H -#define BEING_COOKINGTYPE_H - -namespace CookingType -{ - enum Type - { - Cooking = 1, - Arrow = 2, - Elemental = 3, - MixCooking = 4, - MakeBomb = 5, - Pharmacy = 6 - }; -} // namespace CookingType - -#endif // BEING_COOKINGTYPE_H diff --git a/src/enums/being/cookingtype.h b/src/enums/being/cookingtype.h new file mode 100644 index 000000000..d2c50cd01 --- /dev/null +++ b/src/enums/being/cookingtype.h @@ -0,0 +1,37 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2015 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef ENUMS_BEING_COOKINGTYPE_H +#define ENUMS_BEING_COOKINGTYPE_H + +namespace CookingType +{ + enum Type + { + Cooking = 1, + Arrow = 2, + Elemental = 3, + MixCooking = 4, + MakeBomb = 5, + Pharmacy = 6 + }; +} // namespace CookingType + +#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 -#include "being/cookingtype.h" +#include "enums/being/cookingtype.h" #include "localconsts.h" -- cgit v1.2.3-70-g09d2