summaryrefslogtreecommitdiff
path: root/src/gui/viewport.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/viewport.cpp
parent1e1f619b9ae5aa26058c499c988f45d1fb1b6d53 (diff)
downloadmana-client-404d3f7f2f9aa455bea423a6a00025df23cd6687.tar.gz
mana-client-404d3f7f2f9aa455bea423a6a00025df23cd6687.tar.bz2
mana-client-404d3f7f2f9aa455bea423a6a00025df23cd6687.tar.xz
mana-client-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/viewport.cpp')
-rw-r--r--src/gui/viewport.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 3ec88102..e5211baa 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -71,8 +71,8 @@ Viewport::Viewport():
setFocusable(true);
- listen(Mana::Event::ConfigChannel);
- listen(Mana::Event::ActorSpriteChannel);
+ listen(Event::ConfigChannel);
+ listen(Event::ActorSpriteChannel);
}
Viewport::~Viewport()
@@ -584,10 +584,10 @@ void Viewport::hideBeingPopup()
mBeingPopup->setVisible(false);
}
-void Viewport::event(Mana::Event::Channel channel, const Mana::Event &event)
+void Viewport::event(Event::Channel channel, const Event &event)
{
- if (channel == Mana::Event::ActorSpriteChannel
- && event.getType() == Mana::Event::Destroyed)
+ if (channel == Event::ActorSpriteChannel
+ && event.getType() == Event::Destroyed)
{
ActorSprite *actor = event.getActor("source");
@@ -597,8 +597,8 @@ void Viewport::event(Mana::Event::Channel channel, const Mana::Event &event)
if (mHoverItem == actor)
mHoverItem = 0;
}
- else if (channel == Mana::Event::ConfigChannel &&
- event.getType() == Mana::Event::ConfigOptionChanged)
+ else if (channel == Event::ConfigChannel &&
+ event.getType() == Event::ConfigOptionChanged)
{
const std::string option = event.getString("option");
if (option == "ScrollLaziness" || option == "ScrollRadius")