diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-04-09 00:16:28 +0200 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-04-09 17:54:13 +0200 |
commit | 404d3f7f2f9aa455bea423a6a00025df23cd6687 (patch) | |
tree | 27f6655b3345be1ab109433a55b0512dfe48cb34 /src/resources | |
parent | 1e1f619b9ae5aa26058c499c988f45d1fb1b6d53 (diff) | |
download | mana-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/resources')
-rw-r--r-- | src/resources/theme.cpp | 8 | ||||
-rw-r--r-- | src/resources/theme.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/resources/theme.cpp b/src/resources/theme.cpp index 0509681c..869f225c 100644 --- a/src/resources/theme.cpp +++ b/src/resources/theme.cpp @@ -111,7 +111,7 @@ Theme::Theme(): { initDefaultThemePath(); - listen(Mana::Event::ConfigChannel); + listen(Event::ConfigChannel); loadColors(); mColors[HIGHLIGHT].ch = 'H'; @@ -208,10 +208,10 @@ void Theme::updateAlpha() iter->second->updateAlpha(mMinimumOpacity); } -void Theme::event(Mana::Event::Channel channel, const Mana::Event &event) +void Theme::event(Event::Channel channel, const Event &event) { - if (channel == Mana::Event::ConfigChannel && - event.getType() == Mana::Event::ConfigOptionChanged && + if (channel == Event::ConfigChannel && + event.getType() == Event::ConfigOptionChanged && event.getString("option") == "guialpha") { updateAlpha(); diff --git a/src/resources/theme.h b/src/resources/theme.h index 050e6d2d..179662bc 100644 --- a/src/resources/theme.h +++ b/src/resources/theme.h @@ -100,7 +100,7 @@ class Skin Image *mStickyImageDown; /**< Sticky Button Image */ }; -class Theme : public Palette, public Mana::Listener +class Theme : public Palette, public Listener { public: static Theme *instance(); @@ -218,7 +218,7 @@ class Theme : public Palette, public Mana::Listener */ void setMinimumOpacity(float minimumOpacity); - void event(Mana::Event::Channel channel, const Mana::Event &event); + void event(Event::Channel channel, const Event &event); private: Theme(); |