[Bf-blender-cvs] [f58a2b3] ui-preview-buttons: Rename utility to class to be clearly a private member

[Campbell Barton]

Commit: f58a2b3a5bbc408c32d931d38ef308028f9f5c8c
Author: Campbell Barton
Date:   Wed May 6 00:50:07 2015 +1000
Branches: ui-preview-buttons
https://developer.blender.org/rBf58a2b3a5bbc408c32d931d38ef308028f9f5c8c

Rename utility to class to be clearly a private member

Also name internal data structure ImagePreview (incase we want other kinds of previews later)

===================================================================

M	release/scripts/modules/bpy/utils/previews.py
M	source/blender/makesrna/RNA_access.h
M	source/blender/makesrna/intern/rna_ID.c
M	source/blender/python/intern/bpy_app_previews.c

===================================================================

diff --git a/release/scripts/modules/bpy/utils/previews.py b/release/scripts/modules/bpy/utils/previews.py
index a848fcc..ccd0ebd 100644
--- a/release/scripts/modules/bpy/utils/previews.py
+++ b/release/scripts/modules/bpy/utils/previews.py
@@ -30,7 +30,6 @@ This allows addons to generate their own previews, and use them as icons in UI w
 __all__ = (
     "new",
     "remove",
-    "clear",
     )
 
 from bpy.app import _previews
@@ -39,7 +38,8 @@ _uuid_open = set()
 
 
 # High-level previews manager.
-class BPyPreviewsCollection(dict):
+# not accessed directly
+class _BPyImagePreviewCollection(dict):
     """
     Dict-like class of previews.
     """
@@ -111,7 +111,7 @@ def new():
     Return a new preview collection.
     """
 
-    return BPyPreviewsCollection()
+    return _BPyImagePreviewCollection()
 
 
 def remove(p):
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index 0601da3..965d1d9 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -280,6 +280,7 @@ extern StructRNA RNA_IKParam;
 extern StructRNA RNA_Image;
 extern StructRNA RNA_ImageFormatSettings;
 extern StructRNA RNA_ImagePaint;
+extern StructRNA RNA_ImagePreview;
 extern StructRNA RNA_ImageSequence;
 extern StructRNA RNA_ImageTexture;
 extern StructRNA RNA_ImageUser;
@@ -459,7 +460,6 @@ extern StructRNA RNA_PointLamp;
 extern StructRNA RNA_PointerProperty;
 extern StructRNA RNA_Pose;
 extern StructRNA RNA_PoseBone;
-extern StructRNA RNA_Preview;
 extern StructRNA RNA_Property;
 extern StructRNA RNA_PropertyGroup;
 extern StructRNA RNA_PropertyGroupItem;
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c
index 26ecb46..5edad21 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -684,9 +684,9 @@ static void rna_def_preview(BlenderRNA *brna)
 	StructRNA *srna;
 	PropertyRNA *prop;
 
-	srna = RNA_def_struct(brna, "Preview", NULL);
+	srna = RNA_def_struct(brna, "ImagePreview", NULL);
 	RNA_def_struct_sdna(srna, "PreviewImage");
-	RNA_def_struct_ui_text(srna, "Preview", "Preview image and icon");
+	RNA_def_struct_ui_text(srna, "Image Preview", "Preview image and icon");
 
 	prop = RNA_def_property(srna, "image_is_custom", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag[ICON_SIZE_PREVIEW]", USER_EDITED);
diff --git a/source/blender/python/intern/bpy_app_previews.c b/source/blender/python/intern/bpy_app_previews.c
index f6d09a5..1b93b49 100644
--- a/source/blender/python/intern/bpy_app_previews.c
+++ b/source/blender/python/intern/bpy_app_previews.c
@@ -78,7 +78,7 @@ static PyObject *app_previews_meth_new(PyObject *UNUSED(self), PyObject *args, P
 	}
 
 	prv = BKE_previewimg_cached_get(name);
-	RNA_pointer_create(NULL, &RNA_Preview, prv, &ptr);
+	RNA_pointer_create(NULL, &RNA_ImagePreview, prv, &ptr);
 
 	return pyrna_struct_CreatePyObject(&ptr);
 }
@@ -135,7 +135,7 @@ static PyObject *app_previews_meth_load(PyObject *UNUSED(self), PyObject *args,
 	}
 
 	prv = BKE_previewimg_cached_thumbnail_get(name, path, path_type, force_reload);
-	RNA_pointer_create(NULL, &RNA_Preview, prv, &ptr);
+	RNA_pointer_create(NULL, &RNA_ImagePreview, prv, &ptr);
 
 	return pyrna_struct_CreatePyObject(&ptr);
 }