summaryrefslogtreecommitdiff
path: root/src/gui/chatwindow.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-02-19 15:49:45 +0300
committerAndrei Karas <akaras@inbox.ru>2012-02-19 15:49:45 +0300
commitb30a5d2289a0b68410dee5343e148aba88ea4839 (patch)
tree9d756785b9166ced76675ad3ebe398c09b494a3c /src/gui/chatwindow.h
parent9a3a196dbf633a699c26d0227802a42f025c8bfd (diff)
parent164e4ed5a153ce06badb52f3a5a4dff16c58d7e6 (diff)
downloadmanaverse-b30a5d2289a0b68410dee5343e148aba88ea4839.tar.gz
manaverse-b30a5d2289a0b68410dee5343e148aba88ea4839.tar.bz2
manaverse-b30a5d2289a0b68410dee5343e148aba88ea4839.tar.xz
manaverse-b30a5d2289a0b68410dee5343e148aba88ea4839.zip
Merge branch 'master' into stripped
Diffstat (limited to 'src/gui/chatwindow.h')
-rw-r--r--src/gui/chatwindow.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h
index 82e3d31f2..b3dce33fc 100644
--- a/src/gui/chatwindow.h
+++ b/src/gui/chatwindow.h
@@ -80,7 +80,7 @@ struct CHATLOG
class ChatWindow : public Window,
public gcn::ActionListener,
public gcn::KeyListener,
- public Mana::Listener
+ public Listener
{
public:
/**
@@ -190,7 +190,7 @@ class ChatWindow : public Window,
*/
void mousePressed(gcn::MouseEvent &event);
- void processEvent(Mana::Channels channel, const Mana::Event &event);
+ void processEvent(Channels channel, const Event &event);
/**
* Scrolls the chat window