Rename remaining OSystem methods to match our coding guidelines

svn-id: r15332

6 files changed, 32 insertions, 32 deletions

diff --git a/backends/dc/dc.h b/backends/dc/dc.h
index 3f40f8667d..5d580d4318 100644
--- a/backends/dc/dc.h
+++ b/backends/dc/dc.h
@@ -87,17 +87,17 @@ class OSystem_Dreamcast : public OSystem {
   void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor);
   
   // Shaking is used in SCUMM. Set current shake position.
-  void set_shake_pos(int shake_pos);
+  void setShakePos(int shake_pos);
 
   // Get the number of milliseconds since the program was started.
-  uint32 get_msecs();
+  uint32 getMillis();
   
   // Delay for a specified amount of milliseconds
-  void delay_msecs(uint msecs);
+  void delayMillis(uint msecs);
   
   // Get the next event.
   // Returns true if an event was retrieved.	
-  bool poll_event(Event *event);
+  bool pollEvent(Event &event);
   
   // Set function that generates samples 
   bool setSoundCallback(SoundProc proc, void *param);
@@ -112,16 +112,16 @@ class OSystem_Dreamcast : public OSystem {
 
   // Poll cdrom status
   // Returns true if cd audio is playing
-  bool poll_cdrom();
+  bool pollCD();
 
   // Play cdrom audio track
-  void play_cdrom(int track, int num_loops, int start_frame, int duration);
+  void playCD(int track, int num_loops, int start_frame, int duration);
   
   // Stop cdrom audio track
-  void stop_cdrom();
+  void stopCD();
 
   // Update cdrom audio status
-  void update_cdrom();
+  void updateCD();
 
   // Quit
   void quit();
@@ -147,7 +147,7 @@ class OSystem_Dreamcast : public OSystem {
   void setWindowCaption(const char *caption);
 
   // Savefile handling
-  SaveFileManager *get_savefile_manager();
+  SaveFileManager *getSavefileManager();
 
 
   static OSystem *create();
diff --git a/backends/dc/dcmain.cpp b/backends/dc/dcmain.cpp
index 73d71a29f9..6700bdeb68 100644
--- a/backends/dc/dcmain.cpp
+++ b/backends/dc/dcmain.cpp
@@ -78,7 +78,7 @@ static bool find_track(int track, int &first_sec, int &last_sec)
   return false;
 }
 
-void OSystem_Dreamcast::play_cdrom(int track, int num_loops, int start_frame, int duration)
+void OSystem_Dreamcast::playCD(int track, int num_loops, int start_frame, int duration)
 {
   int first_sec, last_sec;
 #if 1
@@ -95,18 +95,18 @@ void OSystem_Dreamcast::play_cdrom(int track, int num_loops, int start_frame, in
   play_cdda_sectors(first_sec, last_sec, num_loops);
 }
 
-void OSystem_Dreamcast::stop_cdrom()
+void OSystem_Dreamcast::stopCD()
 {
   stop_cdda();
 }
 
-bool OSystem_Dreamcast::poll_cdrom()
+bool OSystem_Dreamcast::pollCD()
 {
   extern int getCdState();
   return getCdState() == 3;
 }
 
-void OSystem_Dreamcast::update_cdrom()
+void OSystem_Dreamcast::updateCD()
 {
   // Dummy.  The CD drive takes care of itself.
 }
diff --git a/backends/dc/display.cpp b/backends/dc/display.cpp
index 2e46967dea..6e221941dc 100644
--- a/backends/dc/display.cpp
+++ b/backends/dc/display.cpp
@@ -238,7 +238,7 @@ void OSystem_Dreamcast::setMouseCursor(const byte *buf, uint w, uint h,
   memcpy(_ms_buf, buf, w * h);
 }
 
-void OSystem_Dreamcast::set_shake_pos(int shake_pos)
+void OSystem_Dreamcast::setShakePos(int shake_pos)
 {
   _current_shake_pos = shake_pos;
 }
diff --git a/backends/dc/input.cpp b/backends/dc/input.cpp
index ad0164991b..a202411f51 100644
--- a/backends/dc/input.cpp
+++ b/backends/dc/input.cpp
@@ -170,7 +170,7 @@ int handleInput(struct mapledev *pad, int &mouse_x, int &mouse_y,
   return 0;
 }
 
-bool OSystem_Dreamcast::poll_event(Event *event)
+bool OSystem_Dreamcast::pollEvent(Event &event)
 {
   unsigned int t = Timer();
 
@@ -189,29 +189,29 @@ bool OSystem_Dreamcast::poll_event(Event *event)
   setimask(15);
   checkSound();
   int e = handleInput(locked_get_pads(), _ms_cur_x, _ms_cur_y,
-		      event->kbd.flags, (_softkbd_on? &_softkbd : NULL));
+		      event.kbd.flags, (_softkbd_on? &_softkbd : NULL));
   setimask(mask);
   if (_ms_cur_x<0) _ms_cur_x=0;
   if (_ms_cur_x>=_screen_w) _ms_cur_x=_screen_w-1;
   if (_ms_cur_y<0) _ms_cur_y=0;
   if (_ms_cur_y>=_screen_h) _ms_cur_y=_screen_h-1;
-  event->mouse.x = _ms_cur_x;
-  event->mouse.y = _ms_cur_y;
+  event.mouse.x = _ms_cur_x;
+  event.mouse.y = _ms_cur_y;
   if (_overlay_visible) {
-    event->mouse.x -= _overlay_x;
-    event->mouse.y -= _overlay_y;
+    event.mouse.x -= _overlay_x;
+    event.mouse.y -= _overlay_y;
   }
-  event->kbd.ascii = event->kbd.keycode = 0;
+  event.kbd.ascii = event.kbd.keycode = 0;
   if(e<0) {
-    event->event_code = (EventCode)-e;
+    event.event_code = (EventCode)-e;
     return true;
   } else if(e>0) {
     bool processed = false, down = !(e&(1<<30));
     e &= ~(1<<30);
     if(e < 1000) {
-      event->event_code = (down? EVENT_KEYDOWN : EVENT_KEYUP);
-      event->kbd.keycode = e;
-      event->kbd.ascii = (e>='a' && e<='z' && (event->kbd.flags & KBD_SHIFT)?
+      event.event_code = (down? EVENT_KEYDOWN : EVENT_KEYUP);
+      event.kbd.keycode = e;
+      event.kbd.ascii = (e>='a' && e<='z' && (event.kbd.flags & KBD_SHIFT)?
 			  e &~ 0x20 : e);
       processed = true;
     } else if(down) {
@@ -221,12 +221,12 @@ bool OSystem_Dreamcast::poll_event(Event *event)
     }
     return processed;
   } else if(_ms_cur_x != _ms_old_x || _ms_cur_y != _ms_old_y) {
-    event->event_code = EVENT_MOUSEMOVE;
+    event.event_code = EVENT_MOUSEMOVE;
     _ms_old_x = _ms_cur_x;
     _ms_old_y = _ms_cur_y;
     return true;
   } else {
-    event->event_code = (EventCode)0;
+    event.event_code = (EventCode)0;
     return false;
   }
 }
diff --git a/backends/dc/time.cpp b/backends/dc/time.cpp
index 2771fc33c2..fd1ceaedd0 100644
--- a/backends/dc/time.cpp
+++ b/backends/dc/time.cpp
@@ -27,7 +27,7 @@
 #include "dc.h"
 
 
-uint32 OSystem_Dreamcast::get_msecs()
+uint32 OSystem_Dreamcast::getMillis()
 {
   static uint32 msecs=0;
   static unsigned int t0=0;
@@ -43,14 +43,14 @@ uint32 OSystem_Dreamcast::get_msecs()
   return msecs += dm;
 }
 
-void OSystem_Dreamcast::delay_msecs(uint msecs)
+void OSystem_Dreamcast::delayMillis(uint msecs)
 {
-  get_msecs();
+  getMillis();
   unsigned int t, start = Timer();
   int time = (((unsigned int)msecs)*100000U)>>11;
   while(((int)((t = Timer())-start))<time)
     checkSound();
-  get_msecs();
+  getMillis();
 }
 
 void OSystem_Dreamcast::setTimerCallback(TimerProc callback, int timer)
diff --git a/backends/dc/vmsave.cpp b/backends/dc/vmsave.cpp
index 210177730f..0e9d87c18d 100644
--- a/backends/dc/vmsave.cpp
+++ b/backends/dc/vmsave.cpp
@@ -341,7 +341,7 @@ void VMSaveManager::list_savefiles(const char *prefix, const char *directory,
     tryList(prefix, marks, num, i);
 }
 
-SaveFileManager *OSystem_Dreamcast::get_savefile_manager()
+SaveFileManager *OSystem_Dreamcast::getSavefileManager()
 {
   return new VMSaveManager();
 }