Moved (In/Out)SaveFile(Manager) and Timer to namespace Common

svn-id: r18038

3 files changed, 9 insertions, 7 deletions

diff --git a/base/engine.cpp b/base/engine.cpp
index 081fd27b4f..5905e7e598 100644
--- a/base/engine.cpp
+++ b/base/engine.cpp
@@ -39,7 +39,7 @@ Engine::Engine(OSystem *syst)
 	g_engine = this;
 	_mixer = GameDetector::createMixer();
 
-	_timer = g_timer;
+	_timer = Common::g_timer;
 
 	// Add default file directory
 	Common::File::addDefaultDirectory(_gameDataPath);
diff --git a/base/engine.h b/base/engine.h
index b8d0e06f77..1aa2a07084 100644
--- a/base/engine.h
+++ b/base/engine.h
@@ -26,19 +26,21 @@
 
 class GameDetector;
 class OSystem;
-class SaveFileManager;
 class SoundMixer;
-class Timer;
+namespace Common {
+	class SaveFileManager;
+	class Timer;
+}
 
 class Engine {
 public:
 	OSystem *_system;
 	SoundMixer *_mixer;
-	Timer * _timer;
+	Common::Timer * _timer;
 
 protected:
 	const Common::String _gameDataPath;
-	SaveFileManager *_saveFileMan;
+	Common::SaveFileManager *_saveFileMan;
 
 public:
 	Engine(OSystem *syst);
diff --git a/base/main.cpp b/base/main.cpp
index 32e63c9f74..95681740b8 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -405,7 +405,7 @@ extern "C" int main(int argc, char *argv[]) {
 	system.initBackend();
 
 	// Create the timer services
-	g_timer = new Timer(&system);
+	Common::g_timer = new Common::Timer(&system);
 
 	// Set initial window caption
 	system.setWindowCaption(gScummVMFullVersion);
@@ -446,7 +446,7 @@ extern "C" int main(int argc, char *argv[]) {
 	}
 
 	// ...and quit (the return 0 should never be reached)
-	delete g_timer;
+	delete Common::g_timer;
 	system.quit();
 	
 	error("If you are seeing this, your OSystem backend is not working properly");