Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-03-15 06:06:38 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-03-15 06:48:17 +0300
commit6cd15203788b80ab45cb2e7503de42e665a70869 (patch)
treeaf292ff255a5ac684bb3fa357b7ab6a46a5e90a6
parent88b24bc6bbbf35bde00c55834330b56708f25897 (diff)
Cleanup: replace 'timer_ended' with 'timer_end'
The previous naming made it seem as if the timer had already ended where as this function ends the timers.
-rw-r--r--source/blender/windowmanager/intern/wm.c2
-rw-r--r--source/blender/windowmanager/intern/wm_files.c4
-rw-r--r--source/blender/windowmanager/intern/wm_jobs.c2
-rw-r--r--source/blender/windowmanager/intern/wm_window.c2
-rw-r--r--source/blender/windowmanager/wm.h4
5 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c
index 3f1bbb7a669..ae5b6c468f7 100644
--- a/source/blender/windowmanager/intern/wm.c
+++ b/source/blender/windowmanager/intern/wm.c
@@ -570,7 +570,7 @@ void wm_add_default(Main *bmain, bContext *C)
void wm_close_and_free(bContext *C, wmWindowManager *wm)
{
if (wm->autosavetimer) {
- wm_autosave_timer_ended(wm);
+ wm_autosave_timer_end(wm);
}
#ifdef WITH_XR_OPENXR
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index ba40676d4cf..bada86b13aa 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -1645,7 +1645,7 @@ void wm_autosave_location(char *filepath)
void WM_autosave_init(wmWindowManager *wm)
{
- wm_autosave_timer_ended(wm);
+ wm_autosave_timer_end(wm);
if (U.flag & USER_AUTOSAVE) {
wm->autosavetimer = WM_event_add_timer(wm, NULL, TIMERAUTOSAVE, U.savetime * 60.0);
@@ -1694,7 +1694,7 @@ void wm_autosave_timer(Main *bmain, wmWindowManager *wm, wmTimer *UNUSED(wt))
wm->autosavetimer = WM_event_add_timer(wm, NULL, TIMERAUTOSAVE, U.savetime * 60.0);
}
-void wm_autosave_timer_ended(wmWindowManager *wm)
+void wm_autosave_timer_end(wmWindowManager *wm)
{
if (wm->autosavetimer) {
WM_event_remove_timer(wm, NULL, wm->autosavetimer);
diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c
index cf45d380c48..1cddc019ff8 100644
--- a/source/blender/windowmanager/intern/wm_jobs.c
+++ b/source/blender/windowmanager/intern/wm_jobs.c
@@ -605,7 +605,7 @@ void WM_jobs_kill(wmWindowManager *wm,
}
/* kill job entirely, also removes timer itself */
-void wm_jobs_timer_ended(wmWindowManager *wm, wmTimer *wt)
+void wm_jobs_timer_end(wmWindowManager *wm, wmTimer *wt)
{
LISTBASE_FOREACH (wmJob *, wm_job, &wm->jobs) {
if (wm_job->wt == wt) {
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 2fc941c3d6b..d75ba7865bd 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -216,7 +216,7 @@ void wm_window_free(bContext *C, wmWindowManager *wm, wmWindow *win)
/* end running jobs, a job end also removes its timer */
LISTBASE_FOREACH_MUTABLE (wmTimer *, wt, &wm->timers) {
if (wt->win == win && wt->event_type == TIMERJOBS) {
- wm_jobs_timer_ended(wm, wt);
+ wm_jobs_timer_end(wm, wt);
}
}
diff --git a/source/blender/windowmanager/wm.h b/source/blender/windowmanager/wm.h
index c26acfc9802..a8009282f62 100644
--- a/source/blender/windowmanager/wm.h
+++ b/source/blender/windowmanager/wm.h
@@ -71,11 +71,11 @@ void wm_tweakevent_test(bContext *C, const wmEvent *event, int action);
/* wm_jobs.c */
void wm_jobs_timer(wmWindowManager *wm, wmTimer *wt);
-void wm_jobs_timer_ended(wmWindowManager *wm, wmTimer *wt);
+void wm_jobs_timer_end(wmWindowManager *wm, wmTimer *wt);
/* wm_files.c */
void wm_autosave_timer(struct Main *bmain, wmWindowManager *wm, wmTimer *wt);
-void wm_autosave_timer_ended(wmWindowManager *wm);
+void wm_autosave_timer_end(wmWindowManager *wm);
void wm_autosave_delete(void);
void wm_autosave_read(bContext *C, struct ReportList *reports);
void wm_autosave_location(char *filepath);