From b796051dc7ec88e1982ffbb2e488e908d839c1ef Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 6 Jan 2015 19:39:38 +0300 Subject: Move rank.h into enums directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/being/rank.h | 35 ----------------------------------- src/enums/being/rank.h | 35 +++++++++++++++++++++++++++++++++++ src/net/beinghandler.h | 3 ++- 5 files changed, 39 insertions(+), 38 deletions(-) delete mode 100644 src/being/rank.h create mode 100644 src/enums/being/rank.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 45241fac7..89bdd6b38 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1020,7 +1020,7 @@ SET(SRCS being/playerrelation.h being/playerrelations.cpp being/playerrelations.h - being/rank.h + enums/being/rank.h enums/being/targetcursorsize.h enums/being/targetcursortype.h listeners/playerrelationslistener.h diff --git a/src/Makefile.am b/src/Makefile.am index 5d6906b4f..0658cf8c2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1140,7 +1140,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ being/playerrelation.h \ being/playerrelations.cpp \ being/playerrelations.h \ - being/rank.h \ + enums/being/rank.h \ enums/being/targetcursorsize.h \ enums/being/targetcursortype.h \ listeners/playerrelationslistener.h \ diff --git a/src/being/rank.h b/src/being/rank.h deleted file mode 100644 index d05704d47..000000000 --- a/src/being/rank.h +++ /dev/null @@ -1,35 +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_RANK_H -#define BEING_RANK_H - -namespace Rank -{ - enum Rank - { - Blacksmith = 0, - Alchemist = 1, - Taekwon = 2, - Pk = 3 - }; -} // namespace Rank - -#endif // BEING_RANK_H diff --git a/src/enums/being/rank.h b/src/enums/being/rank.h new file mode 100644 index 000000000..7e27ba473 --- /dev/null +++ b/src/enums/being/rank.h @@ -0,0 +1,35 @@ +/* + * 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_RANK_H +#define ENUMS_BEING_RANK_H + +namespace Rank +{ + enum Rank + { + Blacksmith = 0, + Alchemist = 1, + Taekwon = 2, + Pk = 3 + }; +} // namespace Rank + +#endif // ENUMS_BEING_RANK_H diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h index 9974a4d61..ffbe31176 100644 --- a/src/net/beinghandler.h +++ b/src/net/beinghandler.h @@ -23,7 +23,8 @@ #define NET_BEINGHANDLER_H #include "being/being.h" -#include "being/rank.h" + +#include "enums/being/rank.h" #include "net/messagein.h" -- cgit v1.2.3-60-g2f50