summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-21 17:49:12 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-21 17:59:11 +0300
commite787d4c803476b5d5969dd8578cb8a645a7443cb (patch)
tree1672b7012af526b022ebb67253568c97799b723c /src/gui
parent29c335b22add00a7542f229714626df96e73530c (diff)
downloadmanaplus-e787d4c803476b5d5969dd8578cb8a645a7443cb.tar.gz
manaplus-e787d4c803476b5d5969dd8578cb8a645a7443cb.tar.bz2
manaplus-e787d4c803476b5d5969dd8578cb8a645a7443cb.tar.xz
manaplus-e787d4c803476b5d5969dd8578cb8a645a7443cb.zip
Move chattabtype into enums directory.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/tabs/chat/chattab.h3
-rw-r--r--src/gui/widgets/tabs/chat/chattabtype.h42
-rw-r--r--src/gui/windows/chatwindow.h3
3 files changed, 2 insertions, 46 deletions
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 <http://www.gnu.org/licenses/>.
- */
-
-#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"