summaryrefslogtreecommitdiff
path: root/src/gui/widgets/tabs/chat
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/widgets/tabs/chat')
-rw-r--r--src/gui/widgets/tabs/chat/chattab.h3
-rw-r--r--src/gui/widgets/tabs/chat/chattabtype.h42
2 files changed, 1 insertions, 44 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