[Scummvm-cvs-logs] CVS: scummvm/common savefile.cpp,1.24,1.25 savefile.h,1.18,1.19 system.cpp,1.23,1.24 system.h,1.101,1.102 timer.cpp,1.33,1.34 timer.h,1.21,1.22
Max Horn
fingolfin at users.sourceforge.net
Tue May 10 16:20:24 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sword1 animation.cpp,1.38,1.39 control.cpp,1.51,1.52 credits.cpp,1.11,1.12 music.cpp,1.41,1.42 music.h,1.18,1.19 resman.cpp,1.29,1.30 resman.h,1.14,1.15 sound.h,1.18,1.19 sword1.cpp,1.85,1.86
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky control.cpp,1.94,1.95 control.h,1.36,1.37
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22345/common
Modified Files:
savefile.cpp savefile.h system.cpp system.h timer.cpp timer.h
Log Message:
Moved (In/Out)SaveFile(Manager) and Timer to namespace Common
Index: savefile.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/savefile.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- savefile.cpp 9 May 2005 21:21:18 -0000 1.24
+++ savefile.cpp 10 May 2005 23:17:14 -0000 1.25
@@ -32,6 +32,8 @@
#endif
+namespace Common {
+
const char *SaveFileManager::getSavePath() const {
#if defined(__PALM_OS__)
@@ -195,3 +197,6 @@
}
return sf;
}
+
+
+} // End of namespace Common
Index: savefile.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/savefile.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- savefile.h 8 May 2005 23:32:31 -0000 1.18
+++ savefile.h 10 May 2005 23:17:14 -0000 1.19
@@ -27,6 +27,8 @@
#include "common/stream.h"
+namespace Common {
+
/**
* A class which allows game engines to load game state data.
* That typically means "save games", but also includes things like the
@@ -94,4 +96,6 @@
SaveFile *makeSaveFile(const char *filename, bool saveOrLoad);
};
+} // End of namespace Common
+
#endif
Index: system.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/system.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- system.cpp 31 Mar 2005 05:35:03 -0000 1.23
+++ system.cpp 10 May 2005 23:17:14 -0000 1.24
@@ -89,6 +89,6 @@
dialog.runModal();
}
-SaveFileManager *OSystem::getSavefileManager() {
- return new DefaultSaveFileManager();
+Common::SaveFileManager *OSystem::getSavefileManager() {
+ return new Common::DefaultSaveFileManager();
}
Index: system.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/system.h,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- system.h 9 May 2005 17:24:23 -0000 1.101
+++ system.h 10 May 2005 23:17:14 -0000 1.102
@@ -29,10 +29,12 @@
#include "common/singleton.h"
namespace Graphics {
-struct Surface;
-} // end of namespace Graphics
+ struct Surface;
+}
-class SaveFileManager;
+namespace Common {
+ class SaveFileManager;
+}
/**
* Interface for ScummVM backends. If you want to port ScummVM to a system
@@ -897,7 +899,7 @@
virtual void displayMessageOnOSD(const char *msg);
/** Savefile management. */
- virtual SaveFileManager *getSavefileManager();
+ virtual Common::SaveFileManager *getSavefileManager();
//@}
};
Index: timer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/timer.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- timer.cpp 28 Jan 2005 22:05:42 -0000 1.33
+++ timer.cpp 10 May 2005 23:17:15 -0000 1.34
@@ -26,6 +26,8 @@
#include "common/util.h"
#include "common/system.h"
+namespace Common {
+
Timer *g_timer = NULL;
Timer::Timer(OSystem *system) :
@@ -55,7 +57,7 @@
_system->setTimerCallback(0, 0);
{
- Common::StackLock lock(_mutex);
+ StackLock lock(_mutex);
for (int i = 0; i < MAX_TIMERS; i++) {
_timerSlots[i].procedure = NULL;
_timerSlots[i].interval = 0;
@@ -71,7 +73,7 @@
}
int Timer::handler(int t) {
- Common::StackLock lock(_mutex);
+ StackLock lock(_mutex);
uint32 interval, l;
_lastTime = _thisTime;
@@ -96,7 +98,7 @@
bool Timer::installTimerProc(TimerProc procedure, int32 interval, void *refCon) {
assert(interval > 0);
- Common::StackLock lock(_mutex);
+ StackLock lock(_mutex);
for (int l = 0; l < MAX_TIMERS; l++) {
if (!_timerSlots[l].procedure) {
@@ -113,7 +115,7 @@
}
void Timer::removeTimerProc(TimerProc procedure) {
- Common::StackLock lock(_mutex);
+ StackLock lock(_mutex);
for (int l = 0; l < MAX_TIMERS; l++) {
if (_timerSlots[l].procedure == procedure) {
@@ -125,4 +127,6 @@
}
}
+} // End of namespace Common
+
#endif
Index: timer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/timer.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- timer.h 28 Jan 2005 22:05:43 -0000 1.21
+++ timer.h 10 May 2005 23:17:15 -0000 1.22
@@ -33,13 +33,15 @@
class OSystem;
+namespace Common {
+
class Timer {
public:
typedef void (*TimerProc)(void *refCon);
private:
OSystem *_system;
- Common::Mutex _mutex;
+ Mutex _mutex;
void *_timerHandler;
int32 _thisTime;
int32 _lastTime;
@@ -81,6 +83,8 @@
extern Timer *g_timer;
+} // End of namespace Common
+
#endif
#endif
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sword1 animation.cpp,1.38,1.39 control.cpp,1.51,1.52 credits.cpp,1.11,1.12 music.cpp,1.41,1.42 music.h,1.18,1.19 resman.cpp,1.29,1.30 resman.h,1.14,1.15 sound.h,1.18,1.19 sword1.cpp,1.85,1.86
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky control.cpp,1.94,1.95 control.h,1.36,1.37
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list