[Scummvm-cvs-logs] CVS: scummvm/common debugger.cpp,1.13,1.14 timer.cpp,1.31,1.32 timer.h,1.19,1.20

[Max Horn]

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

Modified Files:
	debugger.cpp timer.cpp timer.h 
Log Message:
system.h was being included in tons of places, without any good reason; reduced this (total dependencies on system.h went down from 193 to 85 files)

Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/debugger.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- debugger.cpp	1 Jan 2005 16:08:49 -0000	1.13
+++ debugger.cpp	10 Jan 2005 22:05:35 -0000	1.14
@@ -21,6 +21,7 @@
 #include "stdafx.h"
 
 #include "common/debugger.h"
+#include "common/system.h"
 
 #if USE_CONSOLE
 	#include "gui/console.h"

Index: timer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/timer.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- timer.cpp	1 Jan 2005 16:08:50 -0000	1.31
+++ timer.cpp	10 Jan 2005 22:05:35 -0000	1.32
@@ -24,6 +24,7 @@
 #include "common/scummsys.h"
 #include "common/timer.h"
 #include "common/util.h"
+#include "common/system.h"
 
 Timer *g_timer = NULL;
 

Index: timer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/timer.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- timer.h	1 Jan 2005 16:08:50 -0000	1.19
+++ timer.h	10 Jan 2005 22:05:35 -0000	1.20
@@ -22,7 +22,7 @@
 #define COMMON_TIMER_H
 
 #include "common/scummsys.h"
-#include "common/system.h"
+#include "common/mutex.h"
 
 #define MAX_TIMERS 2
 
@@ -31,13 +31,15 @@
 #include "morphos_timer.h"
 #else
 
+class OSystem;
+
 class Timer {
 public:
 	typedef void (*TimerProc)(void *refCon);
 
 private:
 	OSystem *_system;
-	OSystem::MutexRef _mutex;
+	Common::MutexRef _mutex;
 	void *_timerHandler;
 	int32 _thisTime;
 	int32 _lastTime;