aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
authorMax Horn2004-03-15 01:18:47 +0000
committerMax Horn2004-03-15 01:18:47 +0000
commite8f7214acbfa67874b230edba9cdbc38288c6a7e (patch)
tree2320a25d223ada20cff51a00bfb54a8c2961d5cd /backends
parent08332ab559f45366e3c965990d7ecf7f6ebc8db7 (diff)
downloadscummvm-rg350-e8f7214acbfa67874b230edba9cdbc38288c6a7e.tar.gz
scummvm-rg350-e8f7214acbfa67874b230edba9cdbc38288c6a7e.tar.bz2
scummvm-rg350-e8f7214acbfa67874b230edba9cdbc38288c6a7e.zip
Renamed OSystem::set_timer() to setTimerCallback(); more OSystem Doxygen changes
svn-id: r13289
Diffstat (limited to 'backends')
-rw-r--r--backends/PalmOS/Src/palm.cpp2
-rw-r--r--backends/PalmOS/Src/palm.h2
-rw-r--r--backends/dc/dc.h2
-rw-r--r--backends/dc/time.cpp2
-rw-r--r--backends/gp32/gp32.cpp2
-rw-r--r--backends/gp32/gp32.h2
-rw-r--r--backends/morphos/morphos.cpp4
-rw-r--r--backends/morphos/morphos.h2
-rw-r--r--backends/sdl/sdl-common.h2
-rw-r--r--backends/sdl/sdl.cpp2
-rw-r--r--backends/x11/x11.cpp4
11 files changed, 13 insertions, 13 deletions
diff --git a/backends/PalmOS/Src/palm.cpp b/backends/PalmOS/Src/palm.cpp
index 1c4948ad9c..8bcbea07d8 100644
--- a/backends/PalmOS/Src/palm.cpp
+++ b/backends/PalmOS/Src/palm.cpp
@@ -739,7 +739,7 @@ void OSystem_PALMOS::delay_msecs(uint msecs) {
} while (current < last);
}
-void OSystem_PALMOS::set_timer(TimerProc callback, int timer) {
+void OSystem_PALMOS::setTimerCallback(TimerProc callback, int timer) {
if (callback != NULL) {
_timer.duration = timer;
_timer.nextExpiry = get_msecs() + timer;
diff --git a/backends/PalmOS/Src/palm.h b/backends/PalmOS/Src/palm.h
index 7e39b43862..910daff9c0 100644
--- a/backends/PalmOS/Src/palm.h
+++ b/backends/PalmOS/Src/palm.h
@@ -126,7 +126,7 @@ public:
void update_cdrom();
// Add a callback timer
- void set_timer(TimerProc callback, int timer);
+ void setTimerCallback(TimerProc callback, int timer);
// Mutex handling
MutexRef createMutex();
diff --git a/backends/dc/dc.h b/backends/dc/dc.h
index 7a17b964a1..b040edab92 100644
--- a/backends/dc/dc.h
+++ b/backends/dc/dc.h
@@ -135,7 +135,7 @@ class OSystem_Dreamcast : public OSystem {
void copy_rect_overlay(const int16 *buf, int pitch, int x, int y, int w, int h);
// Add a callback timer
- void set_timer(TimerProc callback, int timer);
+ void setTimerCallback(TimerProc callback, int timer);
// Mutex handling
MutexRef createMutex();
diff --git a/backends/dc/time.cpp b/backends/dc/time.cpp
index b508b3c45d..2771fc33c2 100644
--- a/backends/dc/time.cpp
+++ b/backends/dc/time.cpp
@@ -53,7 +53,7 @@ void OSystem_Dreamcast::delay_msecs(uint msecs)
get_msecs();
}
-void OSystem_Dreamcast::set_timer(TimerProc callback, int timer)
+void OSystem_Dreamcast::setTimerCallback(TimerProc callback, int timer)
{
if (callback != NULL) {
_timer_duration = timer;
diff --git a/backends/gp32/gp32.cpp b/backends/gp32/gp32.cpp
index c8662beca6..8d5462e48e 100644
--- a/backends/gp32/gp32.cpp
+++ b/backends/gp32/gp32.cpp
@@ -1069,7 +1069,7 @@ void OSystem_GP32::stop_cdrom() { }
void OSystem_GP32::update_cdrom() { }
// Add a new callback timer
-void OSystem_GP32::set_timer(TimerProc callback, int timer) { }
+void OSystem_GP32::setTimerCallback(TimerProc callback, int timer) { }
// Mutex handling
OSystem::MutexRef OSystem_GP32::createMutex() {
diff --git a/backends/gp32/gp32.h b/backends/gp32/gp32.h
index 6fddf3fcfd..11f44c9a61 100644
--- a/backends/gp32/gp32.h
+++ b/backends/gp32/gp32.h
@@ -100,7 +100,7 @@ public:
void update_cdrom();
// Add a new callback timer
- void set_timer(TimerProc callback, int timer);
+ void setTimerCallback(TimerProc callback, int timer);
// Mutex handling
OSystem::MutexRef createMutex();
diff --git a/backends/morphos/morphos.cpp b/backends/morphos/morphos.cpp
index d8c00e3d4e..a68b818295 100644
--- a/backends/morphos/morphos.cpp
+++ b/backends/morphos/morphos.cpp
@@ -322,9 +322,9 @@ void OSystem_MorphOS::delay_msecs(uint msecs)
TimeDelay(UNIT_MICROHZ, 0, msecs*1000);
}
-void OSystem_MorphOS::set_timer(TimerProc callback, int timer)
+void OSystem_MorphOS::setTimerCallback(TimerProc callback, int timer)
{
- warning("set_timer() unexpectedly called");
+ warning("setTimerCallback() unexpectedly called");
}
OSystem::MutexRef OSystem_MorphOS::createMutex()
diff --git a/backends/morphos/morphos.h b/backends/morphos/morphos.h
index 6e606c61ff..fd40369fd1 100644
--- a/backends/morphos/morphos.h
+++ b/backends/morphos/morphos.h
@@ -85,7 +85,7 @@ class OSystem_MorphOS : public OSystem
virtual void delay_msecs(uint msecs);
// Add a new callback timer
- virtual void set_timer(TimerProc callback, int timer);
+ virtual void setTimerCallback(TimerProc callback, int timer);
// Mutex handling
virtual MutexRef createMutex();
diff --git a/backends/sdl/sdl-common.h b/backends/sdl/sdl-common.h
index 18ad04aabf..c71e147956 100644
--- a/backends/sdl/sdl-common.h
+++ b/backends/sdl/sdl-common.h
@@ -102,7 +102,7 @@ public:
// Add a callback timer
- void set_timer(TimerProc callback, int timer);
+ void setTimerCallback(TimerProc callback, int timer);
// Mutex handling
MutexRef createMutex();
diff --git a/backends/sdl/sdl.cpp b/backends/sdl/sdl.cpp
index e87c661c1b..783238f802 100644
--- a/backends/sdl/sdl.cpp
+++ b/backends/sdl/sdl.cpp
@@ -122,7 +122,7 @@ void OSystem_SDL::delay_msecs(uint msecs) {
SDL_Delay(msecs);
}
-void OSystem_SDL::set_timer(TimerProc callback, int timer) {
+void OSystem_SDL::setTimerCallback(TimerProc callback, int timer) {
SDL_SetTimer(timer, (SDL_TimerCallback) callback);
}
diff --git a/backends/x11/x11.cpp b/backends/x11/x11.cpp
index b48d4244eb..92e034644f 100644
--- a/backends/x11/x11.cpp
+++ b/backends/x11/x11.cpp
@@ -123,7 +123,7 @@ public:
uint32 property(int param, Property *value);
// Add a callback timer
- void set_timer(TimerProc callback, int interval);
+ void setTimerCallback(TimerProc callback, int interval);
// Mutex handling
MutexRef createMutex();
@@ -1033,7 +1033,7 @@ bool OSystem_X11::poll_event(Event *scumm_event)
return false;
}
-void OSystem_X11::set_timer(TimerProc callback, int interval)
+void OSystem_X11::setTimerCallback(TimerProc callback, int interval)
{
if (callback != NULL) {
_timer_duration = interval;