summaryrefslogtreecommitdiff
path: root/src/gui/chat.cpp
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2011-04-09 00:16:28 +0200
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2011-04-09 17:54:13 +0200
commit404d3f7f2f9aa455bea423a6a00025df23cd6687 (patch)
tree27f6655b3345be1ab109433a55b0512dfe48cb34 /src/gui/chat.cpp
parent1e1f619b9ae5aa26058c499c988f45d1fb1b6d53 (diff)
downloadMana-404d3f7f2f9aa455bea423a6a00025df23cd6687.tar.gz
Mana-404d3f7f2f9aa455bea423a6a00025df23cd6687.tar.bz2
Mana-404d3f7f2f9aa455bea423a6a00025df23cd6687.tar.xz
Mana-404d3f7f2f9aa455bea423a6a00025df23cd6687.zip
Removed the Mana namespace
It's just an annoyance when it's only applied to a few classes. Either we place everything in this namespace or nothing, and at the moment I don't see any rationale for placing everything in a Mana namespace. Acked-by: Jared Adams
Diffstat (limited to 'src/gui/chat.cpp')
-rw-r--r--src/gui/chat.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 17eb8af3..491542a8 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -90,8 +90,8 @@ ChatWindow::ChatWindow():
mAutoComplete(new ChatAutoComplete),
mTmpVisible(false)
{
- listen(Mana::Event::ChatChannel);
- listen(Mana::Event::NoticesChannel);
+ listen(Event::ChatChannel);
+ listen(Event::NoticesChannel);
setWindowName("Chat");
@@ -375,33 +375,33 @@ void ChatWindow::mouseDragged(gcn::MouseEvent &event)
}
}
-void ChatWindow::event(Mana::Event::Channel channel, const Mana::Event &event)
+void ChatWindow::event(Event::Channel channel, const Event &event)
{
- if (channel == Mana::Event::NoticesChannel)
+ if (channel == Event::NoticesChannel)
{
- if (event.getType() == Mana::Event::ServerNotice)
+ if (event.getType() == Event::ServerNotice)
localChatTab->chatLog(event.getString("message"), BY_SERVER);
}
- else if (channel == Mana::Event::ChatChannel)
+ else if (channel == Event::ChatChannel)
{
- if (event.getType() == Mana::Event::Whisper)
+ if (event.getType() == Event::Whisper)
{
whisper(event.getString("nick"), event.getString("message"));
}
- else if (event.getType() == Mana::Event::WhisperError)
+ else if (event.getType() == Event::WhisperError)
{
whisper(event.getString("nick"),
event.getString("error"), BY_SERVER);
}
- else if (event.getType() == Mana::Event::Player)
+ else if (event.getType() == Event::Player)
{
localChatTab->chatLog(event.getString("message"), BY_PLAYER);
}
- else if (event.getType() == Mana::Event::Announcement)
+ else if (event.getType() == Event::Announcement)
{
localChatTab->chatLog(event.getString("message"), BY_GM);
}
- else if (event.getType() == Mana::Event::Being)
+ else if (event.getType() == Event::Being)
{
if (event.getInt("permissions") & PlayerRelation::SPEECH_LOG)
localChatTab->chatLog(event.getString("message"), BY_OTHER);