diff options
author | Campbell Barton <campbell@blender.org> | 2022-03-10 03:33:31 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-03-10 08:27:18 +0300 |
commit | 36dd3f42bc70cdaacca1e1f78c0dd9641432eb20 (patch) | |
tree | 46352c4a0c8e6e4b2a321a7a4978d485aaa7618b | |
parent | 1829232598e6e94e6b0735d86ae8ea34a4bff0c8 (diff) |
Cleanup: use 'WM_file_' prefix for file operations
-rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/WM_api.h | 7 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 6 |
4 files changed, 9 insertions, 8 deletions
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 339d0bf380c..3b9632342ec 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -638,7 +638,7 @@ static void rna_userdef_autosave_update(Main *bmain, Scene *scene, PointerRNA *p wmWindowManager *wm = bmain->wm.first; if (wm) { - WM_autosave_init(wm); + WM_file_autosave_init(wm); } rna_userdef_update(bmain, scene, ptr); } diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index 6f8233c153e..2f9062959c7 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -242,11 +242,12 @@ void WM_window_set_dpi(const wmWindow *win); bool WM_stereo3d_enabled(struct wmWindow *win, bool only_fullscreen_test); -/* files */ +/* wm_files.c */ + void WM_file_autoexec_init(const char *filepath); bool WM_file_read(struct bContext *C, const char *filepath, struct ReportList *reports); -void WM_autosave_init(struct wmWindowManager *wm); -bool WM_recover_last_session(struct bContext *C, struct ReportList *reports); +void WM_file_autosave_init(struct wmWindowManager *wm); +bool WM_file_recover_last_session(struct bContext *C, struct ReportList *reports); void WM_file_tag_modified(void); /** diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c index a55f5af03d1..487eafc736c 100644 --- a/source/blender/windowmanager/intern/wm.c +++ b/source/blender/windowmanager/intern/wm.c @@ -484,7 +484,7 @@ void WM_check(bContext *C) /* Case: file-read. */ if ((wm->initialized & WM_WINDOW_IS_INIT) == 0) { WM_keyconfig_init(C); - WM_autosave_init(wm); + WM_file_autosave_init(wm); } /* Case: no open windows at all, for old file reads. */ diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 7471d41b44c..5bf5780b93f 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -1966,7 +1966,7 @@ void wm_autosave_timer_end(wmWindowManager *wm) } } -void WM_autosave_init(wmWindowManager *wm) +void WM_file_autosave_init(wmWindowManager *wm) { wm_autosave_timer_begin(wm); } @@ -2860,7 +2860,7 @@ void WM_OT_revert_mainfile(wmOperatorType *ot) /** \name Recover Last Session Operator * \{ */ -bool WM_recover_last_session(bContext *C, ReportList *reports) +bool WM_file_recover_last_session(bContext *C, ReportList *reports) { char filepath[FILE_MAX]; BLI_join_dirfile(filepath, sizeof(filepath), BKE_tempdir_base(), BLENDER_QUIT_FILE); @@ -2874,7 +2874,7 @@ static int wm_recover_last_session_exec(bContext *C, wmOperator *op) { wm_open_init_use_scripts(op, true); SET_FLAG_FROM_TEST(G.f, RNA_boolean_get(op->ptr, "use_scripts"), G_FLAG_SCRIPT_AUTOEXEC); - if (WM_recover_last_session(C, op->reports)) { + if (WM_file_recover_last_session(C, op->reports)) { if (!G.background) { wmOperatorType *ot = op->type; PointerRNA *props_ptr = MEM_callocN(sizeof(PointerRNA), __func__); |