From e27d9f9295df3e5508737493425273e6d2191138 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 6 Jan 2015 19:05:59 +0300 Subject: Move gender.h into enums directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/avatar.h | 2 +- src/being/being.h | 2 +- src/being/gender.h | 37 ------------------------------------- src/enums/being/gender.h | 37 +++++++++++++++++++++++++++++++++++++ src/gui/windows/charcreatedialog.h | 2 +- src/inventory.h | 2 +- src/net/ea/token.h | 2 +- src/net/logindata.h | 2 +- src/resources/iteminfo.h | 2 +- 11 files changed, 46 insertions(+), 46 deletions(-) delete mode 100644 src/being/gender.h create mode 100644 src/enums/being/gender.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 859fbcc28..fdc3f45fa 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -851,7 +851,7 @@ SET(SRCS being/compoundsprite.cpp being/compoundsprite.h being/cookingtype.h - being/gender.h + enums/being/gender.h being/homunculusinfo.h listeners/configlistener.h configuration.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 6aff611d9..21862ee6e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -973,7 +973,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ being/compoundsprite.cpp \ being/compoundsprite.h \ being/cookingtype.h \ - being/gender.h \ + enums/being/gender.h \ being/homunculusinfo.h \ listeners/configlistener.h \ configuration.cpp \ diff --git a/src/avatar.h b/src/avatar.h index 46a43863c..a8e690b29 100644 --- a/src/avatar.h +++ b/src/avatar.h @@ -23,7 +23,7 @@ #ifndef AVATAR_H #define AVATAR_H -#include "being/gender.h" +#include "enums/being/gender.h" #include diff --git a/src/being/being.h b/src/being/being.h index c99f5824d..548381ae4 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -29,9 +29,9 @@ #include "being/actorsprite.h" #include "being/beingdirection.h" -#include "being/gender.h" #include "enums/being/beingaction.h" +#include "enums/being/gender.h" #include "listeners/configlistener.h" diff --git a/src/being/gender.h b/src/being/gender.h deleted file mode 100644 index 14961059f..000000000 --- a/src/being/gender.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2004-2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * 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_GENDER_H -#define BEING_GENDER_H - -namespace Gender -{ - enum Type - { - MALE = 0, - FEMALE = 1, - UNSPECIFIED = 2, - OTHER = 3 - }; -} // nemespace Gender - -#endif // BEING_GENDER_H diff --git a/src/enums/being/gender.h b/src/enums/being/gender.h new file mode 100644 index 000000000..59fd7e304 --- /dev/null +++ b/src/enums/being/gender.h @@ -0,0 +1,37 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * 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_GENDER_H +#define ENUMS_BEING_GENDER_H + +namespace Gender +{ + enum Type + { + MALE = 0, + FEMALE = 1, + UNSPECIFIED = 2, + OTHER = 3 + }; +} // nemespace Gender + +#endif // ENUMS_BEING_GENDER_H diff --git a/src/gui/windows/charcreatedialog.h b/src/gui/windows/charcreatedialog.h index 606233276..45555f869 100644 --- a/src/gui/windows/charcreatedialog.h +++ b/src/gui/windows/charcreatedialog.h @@ -23,7 +23,7 @@ #ifndef GUI_WINDOWS_CHARCREATEDIALOG_H #define GUI_WINDOWS_CHARCREATEDIALOG_H -#include "being/gender.h" +#include "enums/being/gender.h" #include "gui/widgets/window.h" diff --git a/src/inventory.h b/src/inventory.h index 12f4b2f2a..42ec86882 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -23,7 +23,7 @@ #ifndef INVENTORY_H #define INVENTORY_H -#include "being/gender.h" +#include "enums/being/gender.h" #include #include diff --git a/src/net/ea/token.h b/src/net/ea/token.h index 10a0fbcb0..65368b6e2 100644 --- a/src/net/ea/token.h +++ b/src/net/ea/token.h @@ -20,7 +20,7 @@ * along with this program. If not, see . */ -#include "being/gender.h" +#include "enums/being/gender.h" #ifndef NET_EA_TOKEN_H #define NET_EA_TOKEN_H diff --git a/src/net/logindata.h b/src/net/logindata.h index 9806d69d0..514b8fd6e 100644 --- a/src/net/logindata.h +++ b/src/net/logindata.h @@ -23,7 +23,7 @@ #ifndef NET_LOGINDATA_H #define NET_LOGINDATA_H -#include "being/gender.h" +#include "enums/being/gender.h" #include "enums/net/updatetype.h" diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index 39c4e3da0..78ecf13d3 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -23,7 +23,7 @@ #ifndef RESOURCES_ITEMINFO_H #define RESOURCES_ITEMINFO_H -#include "being/gender.h" +#include "enums/being/gender.h" #include "resources/cursor.h" #include "resources/itemtype.h" -- cgit v1.2.3-60-g2f50