From e787d4c803476b5d5969dd8578cb8a645a7443cb Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 21 Apr 2016 17:49:12 +0300 Subject: Move chattabtype into enums directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/enums/gui/chattabtype.h | 42 +++++++++++++++++++++++++++++++++ src/gui/widgets/tabs/chat/chattab.h | 3 +-- src/gui/widgets/tabs/chat/chattabtype.h | 42 --------------------------------- src/gui/windows/chatwindow.h | 3 +-- 6 files changed, 46 insertions(+), 48 deletions(-) create mode 100644 src/enums/gui/chattabtype.h delete mode 100644 src/gui/widgets/tabs/chat/chattabtype.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 55d64075c..45ef888a1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -135,7 +135,6 @@ SET(SRCS gui/widgets/characterviewnormal.h gui/widgets/characterviewsmall.cpp gui/widgets/characterviewsmall.h - gui/widgets/tabs/chat/chattabtype.h gui/widgets/tabs/debugwindowtabs.cpp gui/widgets/tabs/debugwindowtabs.h gui/widgets/tabs/chat/chattab.cpp @@ -1247,6 +1246,7 @@ SET(SRCS const/gui/chat.h gui/chatlog.h enums/gui/chatmsgtype.h + enums/gui/chattabtype.h gui/cliprect.h gui/color.cpp gui/color.h diff --git a/src/Makefile.am b/src/Makefile.am index 24c8de57b..0da76f1a0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -103,6 +103,7 @@ SRC += events/actionevent.h \ const/gui/pages.h \ gui/chatlog.h \ enums/gui/chatmsgtype.h \ + enums/gui/chattabtype.h \ gui/cliprect.h \ gui/color.h \ enums/gui/dialogtype.h \ @@ -878,7 +879,6 @@ manaplus_SOURCES += main.cpp \ gui/widgets/tabs/chat/battletab.h \ gui/widgets/tabs/chat/channeltab.cpp \ gui/widgets/tabs/chat/channeltab.h \ - gui/widgets/tabs/chat/chattabtype.h \ gui/widgets/tabs/debugwindowtabs.cpp \ gui/widgets/tabs/debugwindowtabs.h \ gui/widgets/tabs/chat/chattab.cpp \ diff --git a/src/enums/gui/chattabtype.h b/src/enums/gui/chattabtype.h new file mode 100644 index 000000000..54f42e6cc --- /dev/null +++ b/src/enums/gui/chattabtype.h @@ -0,0 +1,42 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2016 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_GUI_CHATTABTYPE_H +#define ENUMS_GUI_CHATTABTYPE_H + +namespace ChatTabType +{ + enum Type + { + UNKNOWN = 0, + INPUT, + WHISPER, + PARTY, + GUILD, + DEBUG, + TRADE, + BATTLE, + LANG, + GM, + CHANNEL + }; +} // namespace ChatTabType + +#endif // ENUMS_GUI_CHATTABTYPE_H diff --git a/src/gui/widgets/tabs/chat/chattab.h b/src/gui/widgets/tabs/chat/chattab.h index dc2062946..2d40e5769 100644 --- a/src/gui/widgets/tabs/chat/chattab.h +++ b/src/gui/widgets/tabs/chat/chattab.h @@ -24,6 +24,7 @@ #define GUI_WIDGETS_TABS_CHAT_CHATTAB_H #include "enums/gui/chatmsgtype.h" +#include "enums/gui/chattabtype.h" #include "enums/simpletypes/ignorerecord.h" #include "enums/simpletypes/online.h" @@ -33,8 +34,6 @@ #include "gui/widgets/tabs/tab.h" -#include "gui/widgets/tabs/chat/chattabtype.h" - #include "localconsts.h" class ScrollArea; diff --git a/src/gui/widgets/tabs/chat/chattabtype.h b/src/gui/widgets/tabs/chat/chattabtype.h deleted file mode 100644 index 620d64a22..000000000 --- a/src/gui/widgets/tabs/chat/chattabtype.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2011-2016 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_WIDGETS_TABS_CHAT_CHATTABTYPE_H -#define GUI_WIDGETS_TABS_CHAT_CHATTABTYPE_H - -namespace ChatTabType -{ - enum Type - { - UNKNOWN = 0, - INPUT, - WHISPER, - PARTY, - GUILD, - DEBUG, - TRADE, - BATTLE, - LANG, - GM, - CHANNEL - }; -} // namespace ChatTabType - -#endif // GUI_WIDGETS_TABS_CHAT_CHATTABTYPE_H diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h index 49c068a0f..76ca9af02 100644 --- a/src/gui/windows/chatwindow.h +++ b/src/gui/windows/chatwindow.h @@ -24,14 +24,13 @@ #define GUI_WINDOWS_CHATWINDOW_H #include "enums/gui/chatmsgtype.h" +#include "enums/gui/chattabtype.h" #include "enums/simpletypes/ignorerecord.h" #include "enums/simpletypes/tryremovecolors.h" #include "gui/widgets/window.h" -#include "gui/widgets/tabs/chat/chattabtype.h" - #include "listeners/actionlistener.h" #include "listeners/attributelistener.h" #include "listeners/debugmessagelistener.h" -- cgit v1.2.3-70-g09d2