Commit: 8b19837b8330f6c06bb1a3b10134141652310955
Author: Bastien Montagne
Date: Sun Feb 1 21:02:29 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rB8b19837b8330f6c06bb1a3b10134141652310955
Cleanup: add 'ED_' prefix to public fsmenu functions...
===================================================================
M source/blender/editors/include/ED_fileselect.h
M source/blender/editors/space_file/file_ops.c
M source/blender/editors/space_file/fsmenu.c
M source/blender/editors/space_file/space_file.c
M source/blender/makesrna/intern/rna_space.c
M source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
diff --git a/source/blender/editors/include/ED_fileselect.h
b/source/blender/editors/include/ED_fileselect.h
index 21ce0e3..ccc8093 100644
--- a/source/blender/editors/include/ED_fileselect.h
+++ b/source/blender/editors/include/ED_fileselect.h
@@ -127,20 +127,19 @@ typedef enum FSMenuInsert {
struct FSMenu;
struct FSMenuEntry;
-struct FSMenu *fsmenu_get(void);
-struct FSMenuEntry *fsmenu_get_category(struct FSMenu *fsmenu, FSMenuCategory
category);
-void fsmenu_set_category(struct FSMenu *fsmenu, FSMenuCategory category,
struct FSMenuEntry *fsm_head);
+struct FSMenu *ED_fsmenu_get(void);
+struct FSMenuEntry *ED_fsmenu_get_category(struct FSMenu *fsmenu,
FSMenuCategory category);
+void ED_fsmenu_set_category(struct FSMenu *fsmenu, FSMenuCategory category,
struct FSMenuEntry *fsm_head);
-/** Returns the number of entries in the Fileselect Menu */
-int fsmenu_get_nentries(struct FSMenu *fsmenu, FSMenuCategory category);
+int ED_fsmenu_get_nentries(struct FSMenu *fsmenu, FSMenuCategory category);
-struct FSMenuEntry *fsmenu_get_entry(struct FSMenu *fsmenu, FSMenuCategory
category, int index);
+struct FSMenuEntry *ED_fsmenu_get_entry(struct FSMenu *fsmenu, FSMenuCategory
category, int index);
-char *fsmenu_entry_get_path(struct FSMenuEntry *fsentry);
-void fsmenu_entry_set_path(struct FSMenuEntry *fsentry, const char *path);
+char *ED_fsmenu_entry_get_path(struct FSMenuEntry *fsentry);
+void ED_fsmenu_entry_set_path(struct FSMenuEntry *fsentry, const char *path);
-char *fsmenu_entry_get_name(struct FSMenuEntry *fsentry);
-void fsmenu_entry_set_name(struct FSMenuEntry *fsentry, const char *name);
+char *ED_fsmenu_entry_get_name(struct FSMenuEntry *fsentry);
+void ED_fsmenu_entry_set_name(struct FSMenuEntry *fsentry, const char *name);
#endif /* __ED_FILESELECT_H__ */
diff --git a/source/blender/editors/space_file/file_ops.c
b/source/blender/editors/space_file/file_ops.c
index 085ed60..6640a7d 100644
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@ -502,7 +502,7 @@ static int bookmark_add_exec(bContext *C, wmOperator
*UNUSED(op))
{
ScrArea *sa = CTX_wm_area(C);
SpaceFile *sfile = CTX_wm_space_file(C);
- struct FSMenu *fsmenu = fsmenu_get();
+ struct FSMenu *fsmenu = ED_fsmenu_get();
struct FileSelectParams *params = ED_fileselect_get_params(sfile);
if (params->dir[0] != '\0') {
@@ -533,8 +533,8 @@ static int bookmark_delete_exec(bContext *C, wmOperator *op)
{
ScrArea *sa = CTX_wm_area(C);
SpaceFile *sfile = CTX_wm_space_file(C);
- struct FSMenu *fsmenu = fsmenu_get();
- int nentries = fsmenu_get_nentries(fsmenu, FS_CATEGORY_BOOKMARKS);
+ struct FSMenu *fsmenu = ED_fsmenu_get();
+ int nentries = ED_fsmenu_get_nentries(fsmenu, FS_CATEGORY_BOOKMARKS);
PropertyRNA *prop = RNA_struct_find_property(op->ptr, "index");
@@ -588,14 +588,14 @@ static int bookmark_move_exec(bContext *C, wmOperator *op)
{
ScrArea *sa = CTX_wm_area(C);
SpaceFile *sfile = CTX_wm_space_file(C);
- struct FSMenu *fsmenu = fsmenu_get();
- struct FSMenuEntry *fsmentry = fsmenu_get_category(fsmenu,
FS_CATEGORY_BOOKMARKS);
+ struct FSMenu *fsmenu = ED_fsmenu_get();
+ struct FSMenuEntry *fsmentry = ED_fsmenu_get_category(fsmenu,
FS_CATEGORY_BOOKMARKS);
struct FSMenuEntry *fsme_psrc, *fsme_pdst, *fsme;
char fname[FILE_MAX];
const int direction = RNA_enum_get(op->ptr, "direction");
- const int totitems = fsmenu_get_nentries(fsmenu, FS_CATEGORY_BOOKMARKS);
+ const int totitems = ED_fsmenu_get_nentries(fsmenu,
FS_CATEGORY_BOOKMARKS);
const int act_index = sfile->bookmarknr;
int new_index, i;
@@ -642,7 +642,7 @@ static int bookmark_move_exec(bContext *C, wmOperator *op)
/* destination is first element of the list... */
fsme->next = fsmentry;
fsmentry = fsme;
- fsmenu_set_category(fsmenu, FS_CATEGORY_BOOKMARKS,
fsmentry);
+ ED_fsmenu_set_category(fsmenu, FS_CATEGORY_BOOKMARKS,
fsmentry);
}
}
else {
@@ -666,7 +666,7 @@ static int bookmark_move_exec(bContext *C, wmOperator *op)
/* source is first element of the list... */
fsme = fsmentry;
fsmentry = fsme->next;
- fsmenu_set_category(fsmenu, FS_CATEGORY_BOOKMARKS,
fsmentry);
+ ED_fsmenu_set_category(fsmenu, FS_CATEGORY_BOOKMARKS,
fsmentry);
}
fsme->next = fsme_pdst->next;
fsme_pdst->next = fsme;
@@ -711,9 +711,9 @@ static int reset_recent_exec(bContext *C, wmOperator
*UNUSED(op))
{
ScrArea *sa = CTX_wm_area(C);
char name[FILE_MAX];
- struct FSMenu *fsmenu = fsmenu_get();
+ struct FSMenu *fsmenu = ED_fsmenu_get();
- while (fsmenu_get_entry(fsmenu, FS_CATEGORY_RECENT, 0) != NULL) {
+ while (ED_fsmenu_get_entry(fsmenu, FS_CATEGORY_RECENT, 0) != NULL) {
fsmenu_remove_entry(fsmenu, FS_CATEGORY_RECENT, 0);
}
BLI_make_file_string("/", name,
BKE_appdir_folder_id_create(BLENDER_USER_CONFIG, NULL), BLENDER_BOOKMARK_FILE);
@@ -994,11 +994,13 @@ int file_exec(bContext *C, wmOperator *exec_op)
file_sfile_to_operator(op, sfile, filepath);
if (BLI_exists(sfile->params->dir)) {
- fsmenu_insert_entry(fsmenu_get(), FS_CATEGORY_RECENT,
sfile->params->dir, NULL, FS_INSERT_SAVE | FS_INSERT_FIRST);
+ fsmenu_insert_entry(ED_fsmenu_get(),
FS_CATEGORY_RECENT, sfile->params->dir, NULL,
+ FS_INSERT_SAVE | FS_INSERT_FIRST);
}
- BLI_make_file_string(G.main->name, filepath,
BKE_appdir_folder_id_create(BLENDER_USER_CONFIG, NULL), BLENDER_BOOKMARK_FILE);
- fsmenu_write_file(fsmenu_get(), filepath);
+ BLI_make_file_string(G.main->name, filepath,
BKE_appdir_folder_id_create(BLENDER_USER_CONFIG, NULL),
+ BLENDER_BOOKMARK_FILE);
+ fsmenu_write_file(ED_fsmenu_get(), filepath);
WM_event_fileselect_event(wm, op, EVT_FILESELECT_EXEC);
}
@@ -1077,7 +1079,7 @@ static int file_refresh_exec(bContext *C, wmOperator
*UNUSED(unused))
{
wmWindowManager *wm = CTX_wm_manager(C);
SpaceFile *sfile = CTX_wm_space_file(C);
- struct FSMenu *fsmenu = fsmenu_get();
+ struct FSMenu *fsmenu = ED_fsmenu_get();
ED_fileselect_clear(wm, sfile);
diff --git a/source/blender/editors/space_file/fsmenu.c
b/source/blender/editors/space_file/fsmenu.c
index 4188b9a..1c18f56 100644
--- a/source/blender/editors/space_file/fsmenu.c
+++ b/source/blender/editors/space_file/fsmenu.c
@@ -76,7 +76,7 @@ typedef struct FSMenu {
static FSMenu *g_fsmenu = NULL;
-FSMenu *fsmenu_get(void)
+FSMenu *ED_fsmenu_get(void)
{
if (!g_fsmenu) {
g_fsmenu = MEM_callocN(sizeof(struct FSMenu), "fsmenu");
@@ -84,7 +84,7 @@ FSMenu *fsmenu_get(void)
return g_fsmenu;
}
-struct FSMenuEntry *fsmenu_get_category(struct FSMenu *fsmenu, FSMenuCategory
category)
+struct FSMenuEntry *ED_fsmenu_get_category(struct FSMenu *fsmenu,
FSMenuCategory category)
{
FSMenuEntry *fsm_head = NULL;
@@ -105,7 +105,7 @@ struct FSMenuEntry *fsmenu_get_category(struct FSMenu
*fsmenu, FSMenuCategory ca
return fsm_head;
}
-void fsmenu_set_category(struct FSMenu *fsmenu, FSMenuCategory category,
FSMenuEntry *fsm_head)
+void ED_fsmenu_set_category(struct FSMenu *fsmenu, FSMenuCategory category,
FSMenuEntry *fsm_head)
{
switch (category) {
case FS_CATEGORY_SYSTEM:
@@ -123,35 +123,35 @@ void fsmenu_set_category(struct FSMenu *fsmenu,
FSMenuCategory category, FSMenuE
}
}
-int fsmenu_get_nentries(struct FSMenu *fsmenu, FSMenuCategory category)
+int ED_fsmenu_get_nentries(struct FSMenu *fsmenu, FSMenuCategory category)
{
FSMenuEntry *fsm_iter;
int count = 0;
- for (fsm_iter = fsmenu_get_category(fsmenu, category); fsm_iter;
fsm_iter = fsm_iter->next) {
+ for (fsm_iter = ED_fsmenu_get_category(fsmenu, category); fsm_iter;
fsm_iter = fsm_iter->next) {
count++;
}
return count;
}
-FSMenuEntry *fsmenu_get_entry(struct FSMenu *fsmenu, FSMenuCategory category,
int index)
+FSMenuEntry *ED_fsmenu_get_entry(struct FSMenu *fsmenu, FSMenuCategory
category, int index)
{
FSMenuEntry *fsm_iter;
- for (fsm_iter = fsmenu_get_category(fsmenu, category); fsm_iter &&
index; fsm_iter = fsm_iter->next) {
+ for (fsm_iter = ED_fsmenu_get_category(fsmenu, category); fsm_iter &&
index; fsm_iter = fsm_iter->next) {
index--;
}
return fsm_iter;
}
-char *fsmenu_entry_get_path(struct FSMenuEntry *fsentry)
+char *ED_fsmenu_entry_get_path(struct FSMenuEntry *fsentry)
{
return fsentry->path;
}
-void fsmenu_entry_set_path(struct FSMenuEntry *fsentry, const char *path)
+void ED_fsmenu_entry_set_path(struct FSMenuEntry *fsentry, const char *path)
{
MEM_SAFE_FREE(fsentry->path);
@@ -172,7 +172,7 @@ static void fsmenu_entry_generate_name(struct FSMenuEntry
*fsentry, char *name,
}
}
-char *fsmenu_entry_get_name(struct FSMenuEntry *fsentry)
+char *ED_fsmenu_entry_get_name(struct FSMenuEntry *fsentry)
{
if (fsentry->name[0]) {
return fsentry->name;
@@ -187,7 +187,7 @@ char *fsmenu_entry_get_name(struct FSMenuEntry *fsentry)
}
}
-void fsmenu_entry_set_name(struct FSMenuEntry *fsentry, const char *name)
+void ED_fsmenu_entry_set_name(struct FSMenuEntry *fsentry, const char *name)
{
if (!STREQ(name, fsentry->name)) {
char tmp_name[FILE_MAXFILE];
@@ -208,7 +208,7 @@ short fsmenu_can_save(struct FSMenu *fsmenu, FSMenuCategory
category, int idx)
{
FSMenuEntry *fsm_iter;
- for (fsm_iter = fsmenu_get_category(fsmenu, category); fsm_iter && idx;
fsm_iter = fsm_iter->next) {
+ for (fsm_iter = ED_fsmenu_get_category(fsmenu, category); fsm_iter &&
idx; fsm_iter = fsm_iter->next) {
idx--;
}
@@ -221,7 +221,7 @@ void fsmenu_insert_entry(struct FSMenu *fsmenu,
FSMenuCategory category, const c
FSMenuEntry *fsm_iter;
FSMenuEntry *fsm_head;
- fsm_head = fsmenu_get_category(fsmenu, category);
+ fsm_head = ED_fsmenu_get_category(fsmenu, category);
fsm_prev = fsm_head; /* this is odd and not really correct? */
for (fsm_iter = fsm_head; fsm_iter; fsm_prev = fsm_iter, fsm_iter =
fsm_iter->next) {
@@ -232,7 +232,7 @@ void fsmenu_insert_entry(struct FSMenu *fsmenu,
FSMenuCategory category, const c
if (fsm_iter != fsm_head) {
fsm_prev->next = fsm_iter->next;
fsm_iter->next = fsm_head;
- fsmenu_set_category(fsmenu,
category, fsm_iter);
+ ED_fsmenu_set_category(fsmenu,
category, fsm_iter);
}
}
return;
@@ -264,7 +264,7 @@
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
