[Scummvm-cvs-logs] CVS: scummvm/base engine.cpp,1.39,1.40 engine.h,1.19,1.20 main.cpp,1.80,1.81

[Max Horn]

Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22345/base

Modified Files:
	engine.cpp engine.h main.cpp 
Log Message:
Moved (In/Out)SaveFile(Manager) and Timer to namespace Common

Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/engine.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- engine.cpp	10 May 2005 22:55:46 -0000	1.39
+++ engine.cpp	10 May 2005 23:17:13 -0000	1.40
@@ -39,7 +39,7 @@
 	g_engine = this;
 	_mixer = GameDetector::createMixer();
 
-	_timer = g_timer;
+	_timer = Common::g_timer;
 
 	// Add default file directory
 	Common::File::addDefaultDirectory(_gameDataPath);

Index: engine.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/engine.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- engine.h	1 Jan 2005 16:08:49 -0000	1.19
+++ engine.h	10 May 2005 23:17:14 -0000	1.20
@@ -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);

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/main.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- main.cpp	10 May 2005 22:55:46 -0000	1.80
+++ main.cpp	10 May 2005 23:17:14 -0000	1.81
@@ -405,7 +405,7 @@
 	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 @@
 	}
 
 	// ...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");