[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43003] trunk/blender/source/gameengine: use PyUnicode_From_STR_String in the game engine in more places.

[Campbell Barton]

Revision: 43003
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43003
Author:   campbellbarton
Date:     2011-12-30 12:44:16 +0000 (Fri, 30 Dec 2011)
Log Message:
-----------
use PyUnicode_From_STR_String in the game engine in more places.

Modified Paths:
--------------
    trunk/blender/source/gameengine/Expressions/StringValue.h
    trunk/blender/source/gameengine/Expressions/Value.h
    trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.h
    trunk/blender/source/gameengine/Ketsji/KX_FontObject.cpp
    trunk/blender/source/gameengine/Ketsji/KX_GameObject.h
    trunk/blender/source/gameengine/Ketsji/KX_Scene.h

Modified: trunk/blender/source/gameengine/Expressions/StringValue.h
===================================================================
--- trunk/blender/source/gameengine/Expressions/StringValue.h	2011-12-30 12:28:51 UTC (rev 43002)
+++ trunk/blender/source/gameengine/Expressions/StringValue.h	2011-12-30 12:44:16 UTC (rev 43003)
@@ -43,7 +43,7 @@
 	virtual CValue*		GetReplica();
 #ifdef WITH_PYTHON
 	virtual PyObject*	ConvertValueToPython() {
-		return PyUnicode_FromString(m_strString.Ptr());
+		return PyUnicode_From_STR_String(m_strString);
 	}
 #endif // WITH_PYTHON
 

Modified: trunk/blender/source/gameengine/Expressions/Value.h
===================================================================
--- trunk/blender/source/gameengine/Expressions/Value.h	2011-12-30 12:28:51 UTC (rev 43002)
+++ trunk/blender/source/gameengine/Expressions/Value.h	2011-12-30 12:44:16 UTC (rev 43003)
@@ -221,7 +221,7 @@
 	//static PyObject*	PyMake(PyObject*,PyObject*);
 	virtual PyObject *py_repr(void)
 	{
-		return PyUnicode_FromString((const char*)GetText());
+		return PyUnicode_From_STR_String(GetText());
 	}
 
 	virtual PyObject*	ConvertValueToPython() {

Modified: trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.h	2011-12-30 12:28:51 UTC (rev 43002)
+++ trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.h	2011-12-30 12:44:16 UTC (rev 43003)
@@ -106,7 +106,7 @@
 
 #ifdef WITH_PYTHON
 	// --------------------------------
-	virtual PyObject* py_repr(void) { return PyUnicode_FromString(mMaterial->matname.ReadPtr()); }
+	virtual PyObject* py_repr(void) { return PyUnicode_From_STR_String(mMaterial->matname); }
 
 	static PyObject* pyattr_get_shader(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 	static PyObject* pyattr_get_materialIndex(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);

Modified: trunk/blender/source/gameengine/Ketsji/KX_FontObject.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_FontObject.cpp	2011-12-30 12:28:51 UTC (rev 43002)
+++ trunk/blender/source/gameengine/Ketsji/KX_FontObject.cpp	2011-12-30 12:44:16 UTC (rev 43003)
@@ -215,7 +215,7 @@
 			str += '\n';
 		str += self->m_text[i];
 	}
-	return PyUnicode_FromString(str.ReadPtr());
+	return PyUnicode_From_STR_String(str);
 }
 
 int KX_FontObject::pyattr_set_text(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value)

Modified: trunk/blender/source/gameengine/Ketsji/KX_GameObject.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_GameObject.h	2011-12-30 12:28:51 UTC (rev 43002)
+++ trunk/blender/source/gameengine/Ketsji/KX_GameObject.h	2011-12-30 12:44:16 UTC (rev 43003)
@@ -888,7 +888,7 @@
 	 */
 	virtual PyObject* py_repr(void)
 	{
-		return PyUnicode_FromString(GetName().ReadPtr());
+		return PyUnicode_From_STR_String(GetName());
 	}
 
 	KX_PYMETHOD_O(KX_GameObject,SetWorldPosition);

Modified: trunk/blender/source/gameengine/Ketsji/KX_Scene.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Scene.h	2011-12-30 12:28:51 UTC (rev 43002)
+++ trunk/blender/source/gameengine/Ketsji/KX_Scene.h	2011-12-30 12:44:16 UTC (rev 43003)
@@ -617,7 +617,7 @@
 	static PyObject*	pyattr_get_drawing_callback_post(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 	static int			pyattr_set_drawing_callback_post(void *selv_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 
-	virtual PyObject* py_repr(void) { return PyUnicode_FromString(GetName().ReadPtr()); }
+	virtual PyObject* py_repr(void) { return PyUnicode_From_STR_String(GetName()); }
 	
 	/* getitem/setitem */
 	static PyMappingMethods	Mapping;