[Scummvm-cvs-logs] CVS: scummvm/common system.cpp,1.12,1.13 system.h,1.69,1.70 timer.cpp,1.29,1.30

[Max Horn]

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

Modified Files:
	system.cpp system.h timer.cpp 
Log Message:
Rename remaining OSystem methods to match our coding guidelines

Index: system.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/system.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- system.cpp	25 Jun 2004 22:11:47 -0000	1.12
+++ system.cpp	28 Sep 2004 20:19:25 -0000	1.13
@@ -92,7 +92,7 @@
 	dialog.runModal();
 }
 
-SaveFileManager *OSystem::get_savefile_manager() {
+SaveFileManager *OSystem::getSavefileManager() {
 	return new DefaultSaveFileManager();
 }
 

Index: system.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/system.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- system.h	4 Sep 2004 01:31:03 -0000	1.69
+++ system.h	28 Sep 2004 20:19:25 -0000	1.70
@@ -277,7 +277,7 @@
 	 *       frontend - we should consider removing it from the backend API
 	 *       and instead implement the functionality in the frontend.
 	 */
-	virtual void set_shake_pos(int shakeOffset) = 0;
+	virtual void setShakePos(int shakeOffset) = 0;
 
 	//@}
 
@@ -383,7 +383,7 @@
 
 	/**
 	 * Data structure for an event. A pointer to an instance of Event
-	 * can be passed to poll_event. 
+	 * can be passed to pollEvent. 
 	 */
 	struct Event {
 		/** The type of the event. */
@@ -433,13 +433,13 @@
 	 * @param event	point to an Event struct, which will be filled with the event data.
 	 * @return true if an event was retrieved.
 	 */
-	virtual bool poll_event(Event *event) = 0;
+	virtual bool pollEvent(Event &event) = 0;
 
 	/** Get the number of milliseconds since the program was started. */
-	virtual uint32 get_msecs() = 0;
+	virtual uint32 getMillis() = 0;
 
 	/** Delay/sleep for the specified amount of milliseconds. */
-	virtual void delay_msecs(uint msecs) = 0;
+	virtual void delayMillis(uint msecs) = 0;
 
 	/**
 	 * Set the timer callback, a function which is periodically invoked by the
@@ -558,7 +558,7 @@
 	 * Poll CD status.
 	 * @return true if CD audio is playing
 	 */
-	virtual bool poll_cdrom() = 0;
+	virtual bool pollCD() = 0;
 
 	/**
 	 * Start audio CD playback. 
@@ -567,17 +567,17 @@
 	 * @param start_frame	the frame at which playback should start (75 frames = 1 second).
 	 * @param duration		the number of frames to play.
 	 */
-	virtual void play_cdrom(int track, int num_loops, int start_frame, int duration) = 0;
+	virtual void playCD(int track, int num_loops, int start_frame, int duration) = 0;
 
 	/**
 	 * Stop audio CD playback.
 	 */
-	virtual void stop_cdrom() = 0;
+	virtual void stopCD() = 0;
 
 	/**
 	 * Update cdrom audio status.
 	 */
-	virtual void update_cdrom() = 0;
+	virtual void updateCD() = 0;
 
 	//@}
 
@@ -609,7 +609,7 @@
 	virtual void displayMessageOnOSD(const char *msg);
 
 	/** Savefile management. */
-	virtual SaveFileManager *get_savefile_manager();
+	virtual SaveFileManager *getSavefileManager();
 
 	//@}
 };

Index: timer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/timer.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- timer.cpp	27 Mar 2004 18:30:30 -0000	1.29
+++ timer.cpp	28 Sep 2004 20:19:25 -0000	1.30
@@ -43,7 +43,7 @@
 		_timerSlots[i].counter = 0;
 	}
 
-	_thisTime = _system->get_msecs();
+	_thisTime = _system->getMillis();
 
 	// Set the timer last, after everything has been initialised
 	_system->setTimerCallback(&timer_handler, 10);
@@ -79,7 +79,7 @@
 	uint32 interval, l;
 
 	_lastTime = _thisTime;
-	_thisTime = _system->get_msecs();
+	_thisTime = _system->getMillis();
 	interval = 1000 * (_thisTime - _lastTime);
 
 	for (l = 0; l < MAX_TIMERS; l++) {