diff options
author | Max Horn | 2008-11-08 01:34:02 +0000 |
---|---|---|
committer | Max Horn | 2008-11-08 01:34:02 +0000 |
commit | 7cbd04dc23db94c19bca8cec8350206b894b1958 (patch) | |
tree | 09a5f9cbd4cbee04c10577f0350ab6b1226563e6 | |
parent | 0508fec8a884b956b430c77d23388dd1213d8651 (diff) | |
download | scummvm-rg350-7cbd04dc23db94c19bca8cec8350206b894b1958.tar.gz scummvm-rg350-7cbd04dc23db94c19bca8cec8350206b894b1958.tar.bz2 scummvm-rg350-7cbd04dc23db94c19bca8cec8350206b894b1958.zip |
Thou shalst never use the 'using' keyword in a header file, lest the wrath of ye fingolfin will crush your sorrow bones to dust... *grrr* ;)
svn-id: r34937
-rw-r--r-- | gui/ThemeEngine.cpp | 2 | ||||
-rw-r--r-- | gui/ThemeEval.h | 2 | ||||
-rw-r--r-- | gui/ThemeParser.h | 6 | ||||
-rw-r--r-- | gui/launcher.cpp | 4 |
4 files changed, 6 insertions, 8 deletions
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp index bb46d35140..9e0ff396a6 100644 --- a/gui/ThemeEngine.cpp +++ b/gui/ThemeEngine.cpp @@ -673,7 +673,7 @@ bool ThemeEngine::loadThemeXML(const Common::String &themeName) { assert(_parser); _themeName.clear(); - FSNode node(themeName); + Common::FSNode node(themeName); if (!node.exists() || !node.isReadable()) return false; diff --git a/gui/ThemeEval.h b/gui/ThemeEval.h index 2a1d6d4eed..0b5537f190 100644 --- a/gui/ThemeEval.h +++ b/gui/ThemeEval.h @@ -75,7 +75,7 @@ public: return def; } - void setVar(const String &name, int val) { _vars[name] = val; } + void setVar(const Common::String &name, int val) { _vars[name] = val; } bool hasVar(const Common::String &name) { return _vars.contains(name) || _builtin.contains(name); } diff --git a/gui/ThemeParser.h b/gui/ThemeParser.h index 9e52f11b51..c565aadd07 100644 --- a/gui/ThemeParser.h +++ b/gui/ThemeParser.h @@ -40,12 +40,10 @@ namespace GUI { -using namespace Graphics; -using namespace Common; class ThemeEngine; -class ThemeParser : public XMLParser { - typedef void (VectorRenderer::*DrawingFunctionCallback)(const Common::Rect &, const DrawStep &); +class ThemeParser : public Common::XMLParser { + typedef void (Graphics::VectorRenderer::*DrawingFunctionCallback)(const Common::Rect &, const Graphics::DrawStep &); public: ThemeParser(GUI::ThemeEngine *parent); diff --git a/gui/launcher.cpp b/gui/launcher.cpp index a60aa41510..4a8211e03c 100644 --- a/gui/launcher.cpp +++ b/gui/launcher.cpp @@ -1000,13 +1000,13 @@ Common::String addGameToConf(const GameDescriptor &result) { // The auto detector or the user made a choice. // Pick a domain name which does not yet exist (after all, we // are *adding* a game to the config, not replacing). - String domain = result.preferredtarget(); + Common::String domain = result.preferredtarget(); assert(!domain.empty()); if (ConfMan.hasGameDomain(domain)) { int suffixN = 1; char suffix[16]; - String gameid(domain); + Common::String gameid(domain); while (ConfMan.hasGameDomain(domain)) { snprintf(suffix, 16, "-%d", suffixN); |