From bfdd5aa4be7fb4f16488fbdd893cf12eee20187d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 6 Jan 2015 18:44:14 +0300 Subject: Move chatmsgtype.h into gui subdir. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/enums/chatmsgtype.h | 42 ------------------------------------- src/enums/gui/chatmsgtype.h | 42 +++++++++++++++++++++++++++++++++++++ src/gui/chatlog.h | 2 +- src/gui/widgets/tabs/chat/chattab.h | 2 +- src/gui/windows/chatwindow.h | 2 +- src/net/eathena/chathandler.h | 2 +- 8 files changed, 48 insertions(+), 48 deletions(-) delete mode 100644 src/enums/chatmsgtype.h create mode 100644 src/enums/gui/chatmsgtype.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fa5ee1c29..38a2d8782 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1094,7 +1094,7 @@ SET(SRCS gui/buttontext.h gui/chatconsts.h gui/chatlog.h - gui/chatmsgtype.h + enums/gui/chatmsgtype.h gui/cliprect.h gui/color.cpp gui/color.h diff --git a/src/Makefile.am b/src/Makefile.am index 9acd5be53..041fc9320 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -178,7 +178,7 @@ manaplus_SOURCES += events/actionevent.h \ gui/buttontext.h \ gui/chatconsts.h \ gui/chatlog.h \ - gui/chatmsgtype.h \ + enums/gui/chatmsgtype.h \ gui/cliprect.h \ gui/color.h \ gui/dialogtype.h \ diff --git a/src/enums/chatmsgtype.h b/src/enums/chatmsgtype.h deleted file mode 100644 index 94b9e62b3..000000000 --- a/src/enums/chatmsgtype.h +++ /dev/null @@ -1,42 +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 GUI_CHATMSGTYPE_H -#define GUI_CHATMSGTYPE_H - -namespace ChatMsgType -{ - enum Type - { - BY_GM = 0, - BY_PLAYER, - BY_OTHER, - BY_SERVER, - BY_CHANNEL, - ACT_WHISPER, // getting whispered at - ACT_IS, // equivalent to "/me" on IRC - BY_LOGGER, - BY_UNKNOWN = -1 - }; -} // namespace ChatMsgType - -#endif // GUI_CHATMSGTYPE_H diff --git a/src/enums/gui/chatmsgtype.h b/src/enums/gui/chatmsgtype.h new file mode 100644 index 000000000..94b9e62b3 --- /dev/null +++ b/src/enums/gui/chatmsgtype.h @@ -0,0 +1,42 @@ +/* + * 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 GUI_CHATMSGTYPE_H +#define GUI_CHATMSGTYPE_H + +namespace ChatMsgType +{ + enum Type + { + BY_GM = 0, + BY_PLAYER, + BY_OTHER, + BY_SERVER, + BY_CHANNEL, + ACT_WHISPER, // getting whispered at + ACT_IS, // equivalent to "/me" on IRC + BY_LOGGER, + BY_UNKNOWN = -1 + }; +} // namespace ChatMsgType + +#endif // GUI_CHATMSGTYPE_H diff --git a/src/gui/chatlog.h b/src/gui/chatlog.h index 9495bb0e3..8e8e70696 100644 --- a/src/gui/chatlog.h +++ b/src/gui/chatlog.h @@ -23,7 +23,7 @@ #ifndef GUI_CHATLOG_H #define GUI_CHATLOG_H -#include "enums/chatmsgtype.h" +#include "enums/gui/chatmsgtype.h" #include diff --git a/src/gui/widgets/tabs/chat/chattab.h b/src/gui/widgets/tabs/chat/chattab.h index 8c5cb3036..1c735de24 100644 --- a/src/gui/widgets/tabs/chat/chattab.h +++ b/src/gui/widgets/tabs/chat/chattab.h @@ -23,7 +23,7 @@ #ifndef GUI_WIDGETS_TABS_CHAT_CHATTAB_H #define GUI_WIDGETS_TABS_CHAT_CHATTAB_H -#include "enums/chatmsgtype.h" +#include "enums/gui/chatmsgtype.h" #include "gui/widgets/browserbox.h" diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h index d4bc4510a..7891a7292 100644 --- a/src/gui/windows/chatwindow.h +++ b/src/gui/windows/chatwindow.h @@ -25,7 +25,7 @@ #include "being/beingdirection.h" -#include "enums/chatmsgtype.h" +#include "enums/gui/chatmsgtype.h" #include "gui/widgets/window.h" diff --git a/src/net/eathena/chathandler.h b/src/net/eathena/chathandler.h index a9e702a76..e4a588fef 100644 --- a/src/net/eathena/chathandler.h +++ b/src/net/eathena/chathandler.h @@ -25,7 +25,7 @@ #include "net/ea/chathandler.h" -#include "enums/chatmsgtype.h" +#include "enums/gui/chatmsgtype.h" #include "net/eathena/messagehandler.h" -- cgit v1.2.3-70-g09d2