[Scummvm-cvs-logs] SF.net SVN: scummvm:[34937] scummvm/trunk/gui

[fingolfin at users.sourceforge.net]

Revision: 34937
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34937&view=rev
Author:   fingolfin
Date:     2008-11-08 01:34:02 +0000 (Sat, 08 Nov 2008)

Log Message:
-----------
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* ;)

Modified Paths:
--------------
    scummvm/trunk/gui/ThemeEngine.cpp
    scummvm/trunk/gui/ThemeEval.h
    scummvm/trunk/gui/ThemeParser.h
    scummvm/trunk/gui/launcher.cpp

Modified: scummvm/trunk/gui/ThemeEngine.cpp
===================================================================
--- scummvm/trunk/gui/ThemeEngine.cpp	2008-11-08 01:30:32 UTC (rev 34936)
+++ scummvm/trunk/gui/ThemeEngine.cpp	2008-11-08 01:34:02 UTC (rev 34937)
@@ -673,7 +673,7 @@
 	assert(_parser);
 	_themeName.clear();
 
-	FSNode node(themeName);
+	Common::FSNode node(themeName);
 	if (!node.exists() || !node.isReadable())
 		return false;
 

Modified: scummvm/trunk/gui/ThemeEval.h
===================================================================
--- scummvm/trunk/gui/ThemeEval.h	2008-11-08 01:30:32 UTC (rev 34936)
+++ scummvm/trunk/gui/ThemeEval.h	2008-11-08 01:34:02 UTC (rev 34937)
@@ -75,7 +75,7 @@
 		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); }
 	

Modified: scummvm/trunk/gui/ThemeParser.h
===================================================================
--- scummvm/trunk/gui/ThemeParser.h	2008-11-08 01:30:32 UTC (rev 34936)
+++ scummvm/trunk/gui/ThemeParser.h	2008-11-08 01:34:02 UTC (rev 34937)
@@ -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);

Modified: scummvm/trunk/gui/launcher.cpp
===================================================================
--- scummvm/trunk/gui/launcher.cpp	2008-11-08 01:30:32 UTC (rev 34936)
+++ scummvm/trunk/gui/launcher.cpp	2008-11-08 01:34:02 UTC (rev 34937)
@@ -1000,13 +1000,13 @@
 	// 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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.