summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/chatlog.h2
-rw-r--r--src/gui/chatmsgtype.h42
-rw-r--r--src/gui/widgets/tabs/chat/chattab.h2
-rw-r--r--src/gui/windows/chatwindow.h2
4 files changed, 3 insertions, 45 deletions
diff --git a/src/gui/chatlog.h b/src/gui/chatlog.h
index 9f2adbe37..9495bb0e3 100644
--- a/src/gui/chatlog.h
+++ b/src/gui/chatlog.h
@@ -23,7 +23,7 @@
#ifndef GUI_CHATLOG_H
#define GUI_CHATLOG_H
-#include "gui/chatmsgtype.h"
+#include "enums/chatmsgtype.h"
#include <string>
diff --git a/src/gui/chatmsgtype.h b/src/gui/chatmsgtype.h
deleted file mode 100644
index 94b9e62b3..000000000
--- a/src/gui/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 <http://www.gnu.org/licenses/>.
- */
-
-#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/widgets/tabs/chat/chattab.h b/src/gui/widgets/tabs/chat/chattab.h
index 83b1c76f4..8c5cb3036 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 "gui/chatmsgtype.h"
+#include "enums/chatmsgtype.h"
#include "gui/widgets/browserbox.h"
diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h
index 5644d7d3c..d4bc4510a 100644
--- a/src/gui/windows/chatwindow.h
+++ b/src/gui/windows/chatwindow.h
@@ -25,7 +25,7 @@
#include "being/beingdirection.h"
-#include "gui/chatmsgtype.h"
+#include "enums/chatmsgtype.h"
#include "gui/widgets/window.h"