From 410b960d2e3ac19df78b0f5ce42d4cef18c0df25 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 6 Jan 2015 16:03:16 +0300 Subject: Move guildpositionflags.h into enums directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/being/playerinfo.h | 2 +- src/enums/guildpositionflags.h | 38 ++++++++++++++++++++++++++++++++++++++ src/guildpositionflags.h | 38 -------------------------------------- 5 files changed, 41 insertions(+), 41 deletions(-) create mode 100644 src/enums/guildpositionflags.h delete mode 100644 src/guildpositionflags.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 752bc9fe6..c11d34c4f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -884,7 +884,7 @@ SET(SRCS guild.h guildmanager.cpp guildmanager.h - guildpositionflags.h + enums/guildpositionflags.h particle/imageparticle.cpp particle/imageparticle.h imagesprite.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 82d94ac2d..d186aa9e8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1008,7 +1008,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ guild.h \ guildmanager.cpp \ guildmanager.h \ - guildpositionflags.h \ + enums/guildpositionflags.h \ particle/imageparticle.cpp \ particle/imageparticle.h \ imagesprite.cpp \ diff --git a/src/being/playerinfo.h b/src/being/playerinfo.h index 298005ed5..c49326bb4 100644 --- a/src/being/playerinfo.h +++ b/src/being/playerinfo.h @@ -23,8 +23,8 @@ #define BEING_PLAYERINFO_H #include "equipment.h" -#include "guildpositionflags.h" +#include "enums/guildpositionflags.h" #include "enums/state.h" #include diff --git a/src/enums/guildpositionflags.h b/src/enums/guildpositionflags.h new file mode 100644 index 000000000..c1967f701 --- /dev/null +++ b/src/enums/guildpositionflags.h @@ -0,0 +1,38 @@ +/* + * 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_GUILDPOSITIONFLAGS_H +#define ENUMS_GUILDPOSITIONFLAGS_H + +class Guild; + +namespace GuildPositionFlags +{ + enum Type + { + None = 0x00, + Invite = 0x01, + Expel = 0x10 + }; +} + +#endif // ENUMS_GUILDPOSITIONFLAGS_H diff --git a/src/guildpositionflags.h b/src/guildpositionflags.h deleted file mode 100644 index d88e602ad..000000000 --- a/src/guildpositionflags.h +++ /dev/null @@ -1,38 +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 GUILDPOSITIONFLAGS_H -#define GUILDPOSITIONFLAGS_H - -class Guild; - -namespace GuildPositionFlags -{ - enum Type - { - None = 0x00, - Invite = 0x01, - Expel = 0x10 - }; -} - -#endif // GUILDPOSITIONFLAGS_H -- cgit v1.2.3-60-g2f50