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>2014-02-03 11:55:59 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-02-03 12:35:44 +0400
commitd900f5be55d0812eb5c7dfd3ea47020c3edafd41 (patch)
tree7d5035e3dbafdcd4988e7ed57068e48c951a989a /source/blender/editors/space_file
parenta948ae2c5167c49819241572d3aacb4e4bf5b6d7 (diff)
Code cleanup: use bools where possible
Diffstat (limited to 'source/blender/editors/space_file')
-rw-r--r--source/blender/editors/space_file/file_intern.h2
-rw-r--r--source/blender/editors/space_file/file_ops.c2
-rw-r--r--source/blender/editors/space_file/filelist.c6
-rw-r--r--source/blender/editors/space_file/filelist.h4
4 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/space_file/file_intern.h b/source/blender/editors/space_file/file_intern.h
index 841cb0d5f77..7147353b3f1 100644
--- a/source/blender/editors/space_file/file_intern.h
+++ b/source/blender/editors/space_file/file_intern.h
@@ -53,7 +53,7 @@ void file_calc_previews(const bContext *C, ARegion *ar);
void file_draw_list(const bContext *C, ARegion *ar);
void file_draw_check_cb(bContext *C, void *arg1, void *arg2);
-int file_draw_check_exists(SpaceFile *sfile);
+bool file_draw_check_exists(SpaceFile *sfile);
/* file_ops.h */
struct wmOperatorType;
diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c
index 523383a8955..94f6174de65 100644
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@ -765,7 +765,7 @@ void file_draw_check_cb(bContext *C, void *UNUSED(arg1), void *UNUSED(arg2))
}
}
-int file_draw_check_exists(SpaceFile *sfile)
+bool file_draw_check_exists(SpaceFile *sfile)
{
if (sfile->op) { /* fails on reload */
if (RNA_struct_find_property(sfile->op->ptr, "check_existing")) {
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index 79b6a13b459..249ab3ef2c1 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -990,7 +990,7 @@ void filelist_select(struct FileList *filelist, FileSelection *sel, FileSelType
}
}
-int filelist_is_selected(struct FileList *filelist, int index, FileCheckType check)
+bool filelist_is_selected(struct FileList *filelist, int index, FileCheckType check)
{
struct direntry *file = filelist_file(filelist, index);
if (!file) {
@@ -1003,7 +1003,7 @@ int filelist_is_selected(struct FileList *filelist, int index, FileCheckType che
return S_ISREG(file->type) && (file->selflag & SELECTED_FILE);
case CHECK_ALL:
default:
- return (file->selflag & SELECTED_FILE);
+ return (file->selflag & SELECTED_FILE) != 0;
}
}
@@ -1028,7 +1028,7 @@ void filelist_sort(struct FileList *filelist, short sort)
}
-int filelist_islibrary(struct FileList *filelist, char *dir, char *group)
+bool filelist_islibrary(struct FileList *filelist, char *dir, char *group)
{
return BLO_is_a_library(filelist->dir, dir, group);
}
diff --git a/source/blender/editors/space_file/filelist.h b/source/blender/editors/space_file/filelist.h
index eb99b0d21ab..c37bb882168 100644
--- a/source/blender/editors/space_file/filelist.h
+++ b/source/blender/editors/space_file/filelist.h
@@ -72,7 +72,7 @@ void filelist_setdir(struct FileList *filelist, const char *dir);
struct direntry * filelist_file(struct FileList *filelist, int index);
void filelist_select(struct FileList *filelist, FileSelection *sel, FileSelType select, unsigned int flag, FileCheckType check);
void filelist_select_file(struct FileList *filelist, int index, FileSelType select, unsigned int flag, FileCheckType check);
-int filelist_is_selected(struct FileList *filelist, int index, FileCheckType check);
+bool filelist_is_selected(struct FileList *filelist, int index, FileCheckType check);
void filelist_hidedot(struct FileList *filelist, short hide);
void filelist_setfilter(struct FileList *filelist, unsigned int filter);
void filelist_setfilter_types(struct FileList *filelist, const char *filter_glob);
@@ -87,7 +87,7 @@ int filelist_empty(struct FileList *filelist);
void filelist_parent(struct FileList *filelist);
struct BlendHandle *filelist_lib(struct FileList *filelist);
-int filelist_islibrary(struct FileList *filelist, char *dir, char *group);
+bool filelist_islibrary(struct FileList *filelist, char *dir, char *group);
void filelist_from_main(struct FileList *filelist);
void filelist_from_library(struct FileList *filelist);
void filelist_freelib(struct FileList *filelist);