misc small changes:

- rename rna collection structs Main prefix to BlendData: eg, MainObjects --> BlendDataObjects
- printing python collection now prints its type (when available)
- renamed shadowed vars in bpy_rna.c.
- when making functions static I also made debugging/test functions static, reverse and add definitions to headers instead.

4 files changed, 6 insertions, 5 deletions

diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index c9d74cbb39d..ed09cbebb56 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -351,6 +351,9 @@ void		WM_progress_clear(struct wmWindow *win);
 void		WM_toggle_console(struct bContext *C, short show);
 #endif
 
+/* debugging only, convenience function to write on crash */
+int write_crash_blend(void);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 0bfbb15f4ba..07448c400f4 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -446,7 +446,7 @@ int WM_read_homefile_exec(bContext *C, wmOperator *op)
 	return WM_read_homefile(C, op->reports, from_memory) ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
 }
 
-void read_history(void)
+void WM_read_history(void)
 {
 	char name[FILE_MAX];
 	LinkNode *l, *lines;
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index 0d1dfd5fbba..e32fac41d2e 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -175,7 +175,7 @@ void WM_init(bContext *C, int argc, char **argv)
 	
 	G.ndofdevice = -1;	/* XXX bad initializer, needs set otherwise buttons show! */
 	
-	read_history();
+	WM_read_history();
 
 	/* allow a path of "", this is what happens when making a new file */
 	/*
diff --git a/source/blender/windowmanager/wm_files.h b/source/blender/windowmanager/wm_files.h
index 15a38251795..d80c8ab7f8d 100644
--- a/source/blender/windowmanager/wm_files.h
+++ b/source/blender/windowmanager/wm_files.h
@@ -28,9 +28,7 @@
 #ifndef WM_FILES_H
 #define WM_FILES_H
 
-extern void read_history(void);
-extern void delete_autosave(void);
-
+extern void WM_read_history(void);
 
 #endif /* WM_FILES_H */