griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Use const for File Browser file list queries

Browse Source
This commit is contained in:
Julian Eisel
2023-06-22 12:59:58 +02:00
parent c1d6f8b567
commit fcd1bb170c
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/editors/space_file/filelist.cc
View File

@@ -258,7 +258,9 @@ struct FileList {
* \param do_change: When true, the callback may change given string in place to a valid value.
* \return True when `dirpath` is valid.
*/
bool (*check_dir_fn)(FileList *filelist, char dirpath[FILE_MAX_LIBEXTRA], const bool do_change);
bool (*check_dir_fn)(const FileList *filelist,
char dirpath[FILE_MAX_LIBEXTRA],
const bool do_change);
/** Fill `filelist` (to be called by read job). */
void (*read_job_fn)(FileListReadJob *job_params, bool *stop, bool *do_update, float *progress);
@@ -1350,7 +1352,7 @@ static void parent_dir_until_exists_or_default_root(char *dir)
}
}
static bool filelist_checkdir_dir(FileList * /*filelist*/,
static bool filelist_checkdir_dir(const FileList * /*filelist*/,
char dirpath[FILE_MAX_LIBEXTRA],
const bool do_change)
{
@@ -1361,7 +1363,7 @@ static bool filelist_checkdir_dir(FileList * /*filelist*/,
return BLI_is_dir(dirpath);
}
static bool filelist_checkdir_lib(FileList * /*filelist*/,
static bool filelist_checkdir_lib(const FileList * /*filelist*/,
char dirpath[FILE_MAX_LIBEXTRA],
const bool do_change)
{
@@ -1380,7 +1382,7 @@ static bool filelist_checkdir_lib(FileList * /*filelist*/,
return is_valid;
}
static bool filelist_checkdir_main(FileList *filelist,
static bool filelist_checkdir_main(const FileList *filelist,
char dirpath[FILE_MAX_LIBEXTRA],
const bool do_change)
{
@@ -1388,7 +1390,7 @@ static bool filelist_checkdir_main(FileList *filelist,
return filelist_checkdir_lib(filelist, dirpath, do_change);
}
static bool filelist_checkdir_return_always_valid(FileList * /*filelist*/,
static bool filelist_checkdir_return_always_valid(const FileList * /*filelist*/,
char /*dirpath*/[FILE_MAX_LIBEXTRA],
const bool /*do_change*/)
{
@@ -2005,7 +2007,7 @@ const char *filelist_dir(const FileList *filelist)
return filelist->filelist.root;
}
bool filelist_is_dir(FileList *filelist, const char *path)
bool filelist_is_dir(const FileList *filelist, const char *path)
{
return filelist->check_dir_fn(filelist, (char *)path, false);
}
@@ -2035,7 +2037,7 @@ void filelist_setrecursion(FileList *filelist, const int recursion_level)
}
}
bool filelist_needs_force_reset(FileList *filelist)
bool filelist_needs_force_reset(const FileList *filelist)
{
return (filelist->flags & (FL_FORCE_RESET | FL_FORCE_RESET_MAIN_FILES)) != 0;
}
@@ -2053,12 +2055,12 @@ void filelist_tag_force_reset_mainfiles(FileList *filelist)
filelist->flags |= FL_FORCE_RESET_MAIN_FILES;
}
bool filelist_is_ready(FileList *filelist)
bool filelist_is_ready(const FileList *filelist)
{
return (filelist->flags & FL_IS_READY) != 0;
}
bool filelist_pending(FileList *filelist)
bool filelist_pending(const FileList *filelist)
{
return (filelist->flags & FL_IS_PENDING) != 0;
}
@@ -2800,7 +2802,7 @@ int ED_file_extension_icon(const char *path)
}
}
int filelist_needs_reading(FileList *filelist)
int filelist_needs_reading(const FileList *filelist)
{
return (filelist->filelist.entries_num == FILEDIR_NBR_ENTRIES_UNSET) ||
filelist_needs_force_reset(filelist);

10
source/blender/editors/space_file/filelist.h
View File

@@ -100,7 +100,7 @@ void filelist_free(struct FileList *filelist);
* #filelist_file_get_full_path().
*/
const char *filelist_dir(const struct FileList *filelist);
bool filelist_is_dir(struct FileList *filelist, const char *path);
bool filelist_is_dir(const struct FileList *filelist, const char *path);
/**
* May modify in place given `dirpath`, which is expected to be #FILE_MAX_LIBEXTRA length.
*/
@@ -113,7 +113,7 @@ void filelist_setdir(struct FileList *filelist, char dirpath[1090 /*FILE_MAX_LIB
* unless it is tagged for a full refresh.
*/
int filelist_files_ensure(struct FileList *filelist);
int filelist_needs_reading(struct FileList *filelist);
int filelist_needs_reading(const struct FileList *filelist);
/**
* Request a file from the file browser cache, adding it to the cache if necessary.
*
@@ -158,12 +158,12 @@ void filelist_file_cache_slidingwindow_set(struct FileList *filelist, size_t win
*/
bool filelist_file_cache_block(struct FileList *filelist, int index);
bool filelist_needs_force_reset(struct FileList *filelist);
bool filelist_needs_force_reset(const struct FileList *filelist);
void filelist_tag_force_reset(struct FileList *filelist);
void filelist_tag_force_reset_mainfiles(struct FileList *filelist);
bool filelist_pending(struct FileList *filelist);
bool filelist_pending(const struct FileList *filelist);
bool filelist_needs_reset_on_main_changes(const struct FileList *filelist);
bool filelist_is_ready(struct FileList *filelist);
bool filelist_is_ready(const struct FileList *filelist);
unsigned int filelist_entry_select_set(const struct FileList *filelist,
const struct FileDirEntry *entry,