From de8e1e4b7ad775aee03f9faf137194e38d19574b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 12 Oct 2014 12:07:17 +0300 Subject: Move ChatTabType into chat subdir. --- src/gui/widgets/tabs/chat/battletab.h | 2 +- src/gui/widgets/tabs/chat/chattab.cpp | 2 +- src/gui/widgets/tabs/chat/chattabtype.h | 41 +++++++++++++++++++++++++++++++++ src/gui/widgets/tabs/chattabtype.h | 41 --------------------------------- src/gui/widgets/tabs/gmtab.h | 2 +- src/gui/widgets/tabs/guildchattab.h | 2 +- src/gui/widgets/tabs/langtab.h | 2 +- src/gui/widgets/tabs/tradetab.h | 2 +- src/gui/widgets/tabs/whispertab.h | 2 +- 9 files changed, 48 insertions(+), 48 deletions(-) create mode 100644 src/gui/widgets/tabs/chat/chattabtype.h delete mode 100644 src/gui/widgets/tabs/chattabtype.h (limited to 'src/gui') diff --git a/src/gui/widgets/tabs/chat/battletab.h b/src/gui/widgets/tabs/chat/battletab.h index 2660455d0..0d933e740 100644 --- a/src/gui/widgets/tabs/chat/battletab.h +++ b/src/gui/widgets/tabs/chat/battletab.h @@ -24,7 +24,7 @@ #define GUI_WIDGETS_TABS_CHAT_BATTLETAB_H #include "gui/widgets/tabs/chat/chattab.h" -#include "gui/widgets/tabs/chattabtype.h" +#include "gui/widgets/tabs/chat/chattabtype.h" /** * A tab for a party chat channel. diff --git a/src/gui/widgets/tabs/chat/chattab.cpp b/src/gui/widgets/tabs/chat/chattab.cpp index 0ad9bbf34..88df68774 100644 --- a/src/gui/widgets/tabs/chat/chattab.cpp +++ b/src/gui/widgets/tabs/chat/chattab.cpp @@ -40,7 +40,7 @@ #include "gui/widgets/itemlinkhandler.h" #include "gui/widgets/tabbedarea.h" -#include "gui/widgets/tabs/chattabtype.h" +#include "gui/widgets/tabs/chat/chattabtype.h" #include "input/inputmanager.h" diff --git a/src/gui/widgets/tabs/chat/chattabtype.h b/src/gui/widgets/tabs/chat/chattabtype.h new file mode 100644 index 000000000..4b0af6423 --- /dev/null +++ b/src/gui/widgets/tabs/chat/chattabtype.h @@ -0,0 +1,41 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2014 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 + }; +} // namespace ChatTabType + +#endif // GUI_WIDGETS_TABS_CHAT_CHATTABTYPE_H diff --git a/src/gui/widgets/tabs/chattabtype.h b/src/gui/widgets/tabs/chattabtype.h deleted file mode 100644 index 802b33a43..000000000 --- a/src/gui/widgets/tabs/chattabtype.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2011-2014 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_CHATTABTYPE_H -#define GUI_WIDGETS_TABS_CHATTABTYPE_H - -namespace ChatTabType -{ - enum Type - { - UNKNOWN = 0, - INPUT, - WHISPER, - PARTY, - GUILD, - DEBUG, - TRADE, - BATTLE, - LANG, - GM - }; -} // namespace ChatTabType - -#endif // GUI_WIDGETS_TABS_CHATTABTYPE_H diff --git a/src/gui/widgets/tabs/gmtab.h b/src/gui/widgets/tabs/gmtab.h index 2f0fa8c68..ebd171a5e 100644 --- a/src/gui/widgets/tabs/gmtab.h +++ b/src/gui/widgets/tabs/gmtab.h @@ -22,7 +22,7 @@ #define GUI_WIDGETS_TABS_GMTAB_H #include "gui/widgets/tabs/chat/chattab.h" -#include "gui/widgets/tabs/chattabtype.h" +#include "gui/widgets/tabs/chat/chattabtype.h" /** * A tab for whispers from a single player. diff --git a/src/gui/widgets/tabs/guildchattab.h b/src/gui/widgets/tabs/guildchattab.h index 59656068a..5a876bcd4 100644 --- a/src/gui/widgets/tabs/guildchattab.h +++ b/src/gui/widgets/tabs/guildchattab.h @@ -24,7 +24,7 @@ #define GUI_WIDGETS_TABS_GUILDCHATTAB_H #include "gui/widgets/tabs/chat/chattab.h" -#include "gui/widgets/tabs/chattabtype.h" +#include "gui/widgets/tabs/chat/chattabtype.h" /** * A tab for a guild chat channel. diff --git a/src/gui/widgets/tabs/langtab.h b/src/gui/widgets/tabs/langtab.h index 2bb1047d0..1eec0ab84 100644 --- a/src/gui/widgets/tabs/langtab.h +++ b/src/gui/widgets/tabs/langtab.h @@ -22,7 +22,7 @@ #define GUI_WIDGETS_TABS_LANGTAB_H #include "gui/widgets/tabs/chat/chattab.h" -#include "gui/widgets/tabs/chattabtype.h" +#include "gui/widgets/tabs/chat/chattabtype.h" class LangTab final : public ChatTab { diff --git a/src/gui/widgets/tabs/tradetab.h b/src/gui/widgets/tabs/tradetab.h index dd5c9eb76..10c2ee02c 100644 --- a/src/gui/widgets/tabs/tradetab.h +++ b/src/gui/widgets/tabs/tradetab.h @@ -24,7 +24,7 @@ #define GUI_WIDGETS_TABS_TRADETAB_H #include "gui/widgets/tabs/chat/chattab.h" -#include "gui/widgets/tabs/chattabtype.h" +#include "gui/widgets/tabs/chat/chattabtype.h" /** * A tab for a party chat channel. diff --git a/src/gui/widgets/tabs/whispertab.h b/src/gui/widgets/tabs/whispertab.h index 045d4bfce..57c215dd9 100644 --- a/src/gui/widgets/tabs/whispertab.h +++ b/src/gui/widgets/tabs/whispertab.h @@ -24,7 +24,7 @@ #define GUI_WIDGETS_TABS_WHISPERTAB_H #include "gui/widgets/tabs/chat/chattab.h" -#include "gui/widgets/tabs/chattabtype.h" +#include "gui/widgets/tabs/chat/chattabtype.h" /** * A tab for whispers from a single player. -- cgit v1.2.3-60-g2f50