summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-16 15:15:37 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-16 15:15:37 +0300
commit6279b10249efa59b3161b014899465fe4bb08da4 (patch)
treedc61c653afa8aae8d647eaf1f65453cde93a88fd /src
parent65b3a9a1067a6f4d5d5950ccb41a426e782b69be (diff)
downloadplus-6279b10249efa59b3161b014899465fe4bb08da4.tar.gz
plus-6279b10249efa59b3161b014899465fe4bb08da4.tar.bz2
plus-6279b10249efa59b3161b014899465fe4bb08da4.tar.xz
plus-6279b10249efa59b3161b014899465fe4bb08da4.zip
Move chatlog into separate file.
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/gui/chatlog.h48
-rw-r--r--src/gui/widgets/tabs/chattab.cpp2
-rw-r--r--src/gui/windows/chatwindow.h17
5 files changed, 52 insertions, 17 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 08b278a76..102f5faf5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -859,6 +859,7 @@ SET(SRCS
listeners/actionlistener.h
gui/widgets/basiccontainer.h
gui/chatconsts.h
+ gui/chatlog.h
gui/cliprect.h
gui/color.h
listeners/deathlistener.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 7688d13b5..1f953a17a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -155,6 +155,7 @@ manaplus_SOURCES += events/actionevent.h \
listeners/actionlistener.h \
gui/widgets/basiccontainer.h \
gui/chatconsts.h \
+ gui/chatlog.h \
gui/cliprect.h \
gui/color.h \
listeners/deathlistener.h \
diff --git a/src/gui/chatlog.h b/src/gui/chatlog.h
new file mode 100644
index 000000000..c39146ff2
--- /dev/null
+++ b/src/gui/chatlog.h
@@ -0,0 +1,48 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2004-2009 The Mana World Development Team
+ * Copyright (C) 2009-2010 The Mana Developers
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GUI_CHATLOG_H
+#define GUI_CHATLOG_H
+
+#include "gui/windows/chatwindow.h"
+
+#include <string>
+
+#include "localconsts.h"
+
+/** One item in the chat log */
+struct CHATLOG final
+{
+ CHATLOG() :
+ nick(),
+ text(),
+ own(BY_UNKNOWN)
+ {
+ }
+
+ A_DELETE_COPY(CHATLOG)
+
+ std::string nick;
+ std::string text;
+ Own own;
+};
+#endif // GUI_CHATLOG_H
diff --git a/src/gui/widgets/tabs/chattab.cpp b/src/gui/widgets/tabs/chattab.cpp
index fccc421ae..12632e89d 100644
--- a/src/gui/widgets/tabs/chattab.cpp
+++ b/src/gui/widgets/tabs/chattab.cpp
@@ -32,6 +32,8 @@
#include "being/localplayer.h"
+#include "gui/chatlog.h"
+
#include "gui/windows/helpwindow.h"
#include "gui/widgets/scrollarea.h"
diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h
index 114c6008c..98b1eb73e 100644
--- a/src/gui/windows/chatwindow.h
+++ b/src/gui/windows/chatwindow.h
@@ -59,23 +59,6 @@ enum Own
BY_UNKNOWN = -1
};
-/** One item in the chat log */
-struct CHATLOG final
-{
- CHATLOG() :
- nick(),
- text(),
- own(BY_UNKNOWN)
- {
- }
-
- A_DELETE_COPY(CHATLOG)
-
- std::string nick;
- std::string text;
- Own own;
-};
-
/**
* The chat window.
*