From b664e07438eaaafc5afc64ab47e5e30850fc1a03 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 6 Jan 2015 17:24:20 +0300 Subject: Move partyshare.h into enums directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/enums/net/partyshare.h | 40 ++++++++++++++++++++++++++++++++++++++++ src/net/partyhandler.h | 4 ++-- src/net/partyshare.h | 40 ---------------------------------------- 5 files changed, 44 insertions(+), 44 deletions(-) create mode 100644 src/enums/net/partyshare.h delete mode 100644 src/net/partyshare.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9d17da0ba..0ca1648ee 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -562,7 +562,7 @@ SET(SRCS net/net.h net/netconsts.h net/partyhandler.h - net/partyshare.h + enums/net/partyshare.h net/pethandler.h net/playerhandler.h net/registrationoptions.h diff --git a/src/Makefile.am b/src/Makefile.am index 921299b8f..f63ebdb90 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -692,7 +692,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ net/netconsts.h \ net/npchandler.h \ net/partyhandler.h \ - net/partyshare.h \ + enums/net/partyshare.h \ net/pethandler.h \ net/playerhandler.h \ net/questhandler.h \ diff --git a/src/enums/net/partyshare.h b/src/enums/net/partyshare.h new file mode 100644 index 000000000..ad07ecf72 --- /dev/null +++ b/src/enums/net/partyshare.h @@ -0,0 +1,40 @@ +/* + * The ManaPlus Client + * Copyright (C) 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_NET_PARTYSHARE_H +#define ENUMS_NET_PARTYSHARE_H + +namespace Net +{ + namespace PartyShare + { + enum Type + { + UNKNOWN = -1, + NO, + YES, + NOT_POSSIBLE = 2 + }; + } +} // namespace Net + +#endif // ENUMS_NET_PARTYSHARE_H diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h index b69120e59..4bd27d15b 100644 --- a/src/net/partyhandler.h +++ b/src/net/partyhandler.h @@ -25,9 +25,9 @@ #include "localconsts.h" -#include "gui/widgets/tabs/chat/chattab.h" +#include "enums/net/partyshare.h" -#include "net/partyshare.h" +#include "gui/widgets/tabs/chat/chattab.h" #include diff --git a/src/net/partyshare.h b/src/net/partyshare.h deleted file mode 100644 index 884bef516..000000000 --- a/src/net/partyshare.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 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 NET_PARTYSHARE_H -#define NET_PARTYSHARE_H - -namespace Net -{ - namespace PartyShare - { - enum Type - { - UNKNOWN = -1, - NO, - YES, - NOT_POSSIBLE = 2 - }; - } -} // namespace Net - -#endif // NET_PARTYSHARE_H -- cgit v1.2.3-60-g2f50