SpaceFile: Filelist: reorder a bit things, also cleanup some unused and pure-private funcs.

1 files changed, 30 insertions, 27 deletions

diff --git a/source/blender/editors/space_file/filelist.h b/source/blender/editors/space_file/filelist.h
index c37bb882168..b874783126a 100644
--- a/source/blender/editors/space_file/filelist.h
+++ b/source/blender/editors/space_file/filelist.h
@@ -60,46 +60,49 @@ typedef enum FileCheckType {
 	CHECK_ALL = 3
 } FileCheckType;
 
-struct FileList *   filelist_new(short type);
-void                filelist_init_icons(void);
-void                filelist_free_icons(void);
-int                 filelist_find(struct FileList *filelist, const char *file);
-void                filelist_free(struct FileList *filelist);
+struct ListBase *   folderlist_new(void);
+void                folderlist_free(struct ListBase *folderlist);
+struct ListBase *   folderlist_duplicate(ListBase *folderlist);
+void                folderlist_popdir(struct ListBase *folderlist, char *dir);
+void                folderlist_pushdir(struct ListBase *folderlist, const char *dir);
+const char *        folderlist_peeklastdir(struct ListBase *folderdist);
+int                 folderlist_clear_next(struct SpaceFile *sfile);
+
+
 void                filelist_sort(struct FileList *filelist, short sort);
-int                 filelist_numfiles(struct FileList *filelist);
-const char *        filelist_dir(struct FileList *filelist);
-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);
-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);
 void                filelist_filter(struct FileList *filelist);
+
+void                filelist_init_icons(void);
+void                filelist_free_icons(void);
 void                filelist_imgsize(struct FileList *filelist, short w, short h);
-struct ImBuf *      filelist_getimage(struct FileList *filelist, int index);
-struct ImBuf *      filelist_geticon(struct FileList *filelist, int index);
-short               filelist_changed(struct FileList *filelist);
+struct ImBuf *      filelist_getimage(struct FileList *filelist, const int index);
+struct ImBuf *      filelist_geticon(struct FileList *filelist, const int index);
+
+struct FileList *   filelist_new(short type);
+void                filelist_free(struct FileList *filelist);
+
+const char *        filelist_dir(struct FileList *filelist);
 void                filelist_readdir(struct FileList *filelist);
+void                filelist_setdir(struct FileList *filelist, const char *dir);
 
 int                 filelist_empty(struct FileList *filelist);
-void                filelist_parent(struct FileList *filelist);
+int                 filelist_numfiles(struct FileList *filelist);
+struct direntry *   filelist_file(struct FileList *filelist, int index);
+int                 filelist_find(struct FileList *filelist, const char *file);
+
+short               filelist_changed(struct FileList *filelist);
+
+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);
+bool                filelist_is_selected(struct FileList *filelist, int index, FileCheckType check);
 
 struct BlendHandle *filelist_lib(struct FileList *filelist);
 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);
-void                filelist_hideparent(struct FileList *filelist, short hide);
-
-struct ListBase *   folderlist_new(void);
-void                folderlist_free(struct ListBase *folderlist);
-struct ListBase *   folderlist_duplicate(ListBase *folderlist);
-void                folderlist_popdir(struct ListBase *folderlist, char *dir);
-void                folderlist_pushdir(struct ListBase *folderlist, const char *dir);
-const char *        folderlist_peeklastdir(struct ListBase *folderdist);
-int                 folderlist_clear_next(struct SpaceFile *sfile);
 
 void                thumbnails_start(struct FileList *filelist, const struct bContext *C);
 void                thumbnails_stop(struct wmWindowManager *wm, struct FileList *filelist);