Merge remote branch 'upstream/master' into pegasus

2 files changed, 7 insertions, 5 deletions

diff --git a/engines/testbed/config-params.cpp b/engines/testbed/config-params.cpp
index 9a5062185b..d7ead48f63 100644
--- a/engines/testbed/config-params.cpp
+++ b/engines/testbed/config-params.cpp
@@ -24,7 +24,9 @@
 
 #include "testbed/config-params.h"
 
+namespace Common {
 DECLARE_SINGLETON(Testbed::ConfigParams);
+}
 
 namespace Testbed {
 
diff --git a/engines/testbed/config-params.h b/engines/testbed/config-params.h
index e982f62c72..6906d9248e 100644
--- a/engines/testbed/config-params.h
+++ b/engines/testbed/config-params.h
@@ -34,7 +34,7 @@ class ConfigParams : public Common::Singleton<ConfigParams> {
 private:
 	friend class Common::Singleton<SingletonBaseType>;
 	ConfigParams();
-	
+
 	/**
 	 * Private variables related to log files.
 	 */
@@ -57,16 +57,16 @@ private:
 	TestbedConfigManager *_testbedConfMan;
 
 public:
-	
+
 	bool isRerunRequired();
 	void setRerunFlag(bool flag) { _rerunTests = flag; }
 
 	bool isSessionInteractive() { return _isInteractive; }
 	void setSessionAsInteractive(bool status) { _isInteractive = status; }
-	
+
 	bool isGameDataFound() { return _isGameDataFound; }
 	void setGameDataFound(bool status) { _isGameDataFound = status; }
-	
+
 	TestbedConfigManager *getTestbedConfigManager() { return _testbedConfMan; }
 	void setTestbedConfigManager(TestbedConfigManager* confMan) { _testbedConfMan = confMan; }
 
@@ -74,7 +74,7 @@ public:
 	void setLogDirectory(const Common::String &dirname) { _logDirectory = dirname; }
 	Common::String &getLogFilename() { return _logFilename; }
 	void setLogFilename(const Common::String &filename) { _logFilename = filename; }
-	
+
 	Common::WriteStream *getLogWriteStream() { return _ws; }
 	Graphics::FontManager::FontUsage getCurrentFontUsageType() { return _displayFont; }
 	void setCurrentFontUsageType(Graphics::FontManager::FontUsage f) { _displayFont = f; }