summaryrefslogtreecommitdiff
path: root/src/gui/chatwindow.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-02-08 02:13:16 +0300
committerAndrei Karas <akaras@inbox.ru>2012-02-08 02:19:35 +0300
commit178f4811e8602ba7dacb1a0513baa546088d517d (patch)
treec23cf5dd5d752216e88473c51e7730700942d0fc /src/gui/chatwindow.cpp
parentda44888ee2de9ae1e5c006126e84b36fcc95d4e5 (diff)
downloadmanaplus-178f4811e8602ba7dacb1a0513baa546088d517d.tar.gz
manaplus-178f4811e8602ba7dacb1a0513baa546088d517d.tar.bz2
manaplus-178f4811e8602ba7dacb1a0513baa546088d517d.tar.xz
manaplus-178f4811e8602ba7dacb1a0513baa546088d517d.zip
Fix compilation errors and more style.
Diffstat (limited to 'src/gui/chatwindow.cpp')
-rw-r--r--src/gui/chatwindow.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index 452d2420e..4fa608f35 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -159,7 +159,7 @@ ChatWindow::ChatWindow():
mGMLoaded(false)
{
listen(CHANNEL_NOTICES);
- listen(Mana::CHANNEL_ATTRIBUTES);
+ listen(CHANNEL_ATTRIBUTES);
setWindowName("Chat");
@@ -866,19 +866,19 @@ void ChatWindow::keyPressed(gcn::KeyEvent &event)
addInputText(Temp, false);
}
-void ChatWindow::processEvent(Mana::Channels channel, const Mana::Event &event)
+void ChatWindow::processEvent(Channels channel, const Event &event)
{
- if (channel == Mana::CHANNEL_NOTICES)
+ if (channel == CHANNEL_NOTICES)
{
- if (event.getName() == Mana::EVENT_SERVERNOTICE && localChatTab)
+ if (event.getName() == EVENT_SERVERNOTICE && localChatTab)
localChatTab->chatLog(event.getString("message"), BY_SERVER);
}
- else if (channel == Mana::CHANNEL_ATTRIBUTES)
+ else if (channel == CHANNEL_ATTRIBUTES)
{
if (!config.getBoolValue("showBattleEvents"))
return;
- if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE)
+ if (event.getName() == EVENT_UPDATEATTRIBUTE)
{
switch (event.getInt("id"))
{
@@ -902,7 +902,7 @@ void ChatWindow::processEvent(Mana::Channels channel, const Mana::Event &event)
break;
};
}
- else if (event.getName() == Mana::EVENT_UPDATESTAT)
+ else if (event.getName() == EVENT_UPDATESTAT)
{
if (!config.getBoolValue("showJobExp"))
return;