summaryrefslogtreecommitdiff
path: root/src/event.h
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/event.h
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/event.h')
-rw-r--r--src/event.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/event.h b/src/event.h
index 74a4e1f5..4ee0c326 100644
--- a/src/event.h
+++ b/src/event.h
@@ -28,9 +28,6 @@
class ActorSprite;
class Item;
-namespace Mana
-{
-
// Possible exception that can be thrown
enum BadEvent {
BAD_KEY,
@@ -297,7 +294,7 @@ public:
* given channel.
*/
static inline void trigger(Channel channel, Type type)
- { trigger(channel, Mana::Event(type)); }
+ { trigger(channel, Event(type)); }
protected:
friend class Listener;
@@ -327,11 +324,9 @@ private:
VariableMap mData;
};
-} // namespace Mana
-
#define SERVER_NOTICE(message) { \
-Mana::Event event(Mana::Event::ServerNotice); \
+Event event(Event::ServerNotice); \
event.setString("message", message); \
-event.trigger(Mana::Event::NoticesChannel, event); }
+event.trigger(Event::NoticesChannel, event); }
#endif // EVENT_H