use Py_TYPE macro (no functional changes)

7 files changed, 27 insertions, 27 deletions

diff --git a/intern/audaspace/Python/AUD_PyAPI.cpp b/intern/audaspace/Python/AUD_PyAPI.cpp
index 0dfa39de66c..bbc7a0ca52e 100644
--- a/intern/audaspace/Python/AUD_PyAPI.cpp
+++ b/intern/audaspace/Python/AUD_PyAPI.cpp
@@ -226,7 +226,7 @@ Factory_lowpass(Factory* self, PyObject* args)
 	if(!PyArg_ParseTuple(args, "f|f:lowpass", &frequency, &Q))
 		return NULL;
 
-	PyTypeObject* type = ((PyObject*)self)->ob_type;
+	PyTypeObject* type = Py_TYPE(self);
 	Factory *parent = (Factory*)type->tp_alloc(type, 0);
 
 	if(parent != NULL)
@@ -267,7 +267,7 @@ Factory_delay(Factory* self, PyObject* args)
 	if(!PyArg_ParseTuple(args, "f:delay", &delay))
 		return NULL;
 
-	PyTypeObject* type = ((PyObject*)self)->ob_type;
+	PyTypeObject* type = Py_TYPE(self);
 	Factory *parent = (Factory*)type->tp_alloc(type, 0);
 
 	if(parent != NULL)
@@ -303,7 +303,7 @@ PyDoc_STRVAR(M_aud_Factory_join_doc,
 static PyObject *
 Factory_join(Factory* self, PyObject* object)
 {
-	PyTypeObject* type = ((PyObject*)self)->ob_type;
+	PyTypeObject* type = Py_TYPE(self);
 
 	if(!PyObject_TypeCheck(object, type))
 	{
@@ -354,7 +354,7 @@ Factory_highpass(Factory* self, PyObject* args)
 	if(!PyArg_ParseTuple(args, "f|f:highpass", &frequency, &Q))
 		return NULL;
 
-	PyTypeObject* type = ((PyObject*)self)->ob_type;
+	PyTypeObject* type = Py_TYPE(self);
 	Factory *parent = (Factory*)type->tp_alloc(type, 0);
 
 	if(parent != NULL)
@@ -395,7 +395,7 @@ Factory_limit(Factory* self, PyObject* args)
 	if(!PyArg_ParseTuple(args, "ff:limit", &start, &end))
 		return NULL;
 
-	PyTypeObject* type = ((PyObject*)self)->ob_type;
+	PyTypeObject* type = Py_TYPE(self);
 	Factory *parent = (Factory*)type->tp_alloc(type, 0);
 
 	if(parent != NULL)
@@ -439,7 +439,7 @@ Factory_pitch(Factory* self, PyObject* args)
 	if(!PyArg_ParseTuple(args, "f:pitch", &factor))
 		return NULL;
 
-	PyTypeObject* type = ((PyObject*)self)->ob_type;
+	PyTypeObject* type = Py_TYPE(self);
 	Factory *parent = (Factory*)type->tp_alloc(type, 0);
 
 	if(parent != NULL)
@@ -481,7 +481,7 @@ Factory_volume(Factory* self, PyObject* args)
 	if(!PyArg_ParseTuple(args, "f:volume", &volume))
 		return NULL;
 
-	PyTypeObject* type = ((PyObject*)self)->ob_type;
+	PyTypeObject* type = Py_TYPE(self);
 	Factory *parent = (Factory*)type->tp_alloc(type, 0);
 
 	if(parent != NULL)
@@ -524,7 +524,7 @@ Factory_fadein(Factory* self, PyObject* args)
 	if(!PyArg_ParseTuple(args, "ff:fadein", &start, &length))
 		return NULL;
 
-	PyTypeObject* type = ((PyObject*)self)->ob_type;
+	PyTypeObject* type = Py_TYPE(self);
 	Factory *parent = (Factory*)type->tp_alloc(type, 0);
 
 	if(parent != NULL)
@@ -568,7 +568,7 @@ Factory_fadeout(Factory* self, PyObject* args)
 	if(!PyArg_ParseTuple(args, "ff:fadeout", &start, &length))
 		return NULL;
 
-	PyTypeObject* type = ((PyObject*)self)->ob_type;
+	PyTypeObject* type = Py_TYPE(self);
 	Factory *parent = (Factory*)type->tp_alloc(type, 0);
 
 	if(parent != NULL)
@@ -610,7 +610,7 @@ Factory_loop(Factory* self, PyObject* args)
 	if(!PyArg_ParseTuple(args, "i:loop", &loop))
 		return NULL;
 
-	PyTypeObject* type = ((PyObject*)self)->ob_type;
+	PyTypeObject* type = Py_TYPE(self);
 	Factory *parent = (Factory*)type->tp_alloc(type, 0);
 
 	if(parent != NULL)
@@ -646,7 +646,7 @@ PyDoc_STRVAR(M_aud_Factory_mix_doc,
 static PyObject *
 Factory_mix(Factory* self, PyObject* object)
 {
-	PyTypeObject* type = ((PyObject*)self)->ob_type;
+	PyTypeObject* type = Py_TYPE(self);
 
 	if(!PyObject_TypeCheck(object, type))
 	{
@@ -686,7 +686,7 @@ PyDoc_STRVAR(M_aud_Factory_pingpong_doc,
 static PyObject *
 Factory_pingpong(Factory* self)
 {
-	PyTypeObject* type = ((PyObject*)self)->ob_type;
+	PyTypeObject* type = Py_TYPE(self);
 	Factory *parent = (Factory*)type->tp_alloc(type, 0);
 
 	if(parent != NULL)
@@ -725,7 +725,7 @@ PyDoc_STRVAR(M_aud_Factory_reverse_doc,
 static PyObject *
 Factory_reverse(Factory* self)
 {
-	PyTypeObject* type = ((PyObject*)self)->ob_type;
+	PyTypeObject* type = Py_TYPE(self);
 	Factory *parent = (Factory*)type->tp_alloc(type, 0);
 
 	if(parent != NULL)
@@ -763,7 +763,7 @@ PyDoc_STRVAR(M_aud_Factory_buffer_doc,
 static PyObject *
 Factory_buffer(Factory* self)
 {
-	PyTypeObject* type = ((PyObject*)self)->ob_type;
+	PyTypeObject* type = Py_TYPE(self);
 	Factory *parent = (Factory*)type->tp_alloc(type, 0);
 
 	if(parent != NULL)
@@ -802,7 +802,7 @@ Factory_square(Factory* self, PyObject* args)
 	if(!PyArg_ParseTuple(args, "|f:square", &threshold))
 		return NULL;
 
-	PyTypeObject* type = ((PyObject*)self)->ob_type;
+	PyTypeObject* type = Py_TYPE(self);
 	Factory *parent = (Factory*)type->tp_alloc(type, 0);
 
 	if(parent != NULL)
@@ -905,7 +905,7 @@ Factory_filter(Factory* self, PyObject* args)
 	else
 		a.push_back(1);
 
-	PyTypeObject* type = ((PyObject*)self)->ob_type;
+	PyTypeObject* type = Py_TYPE(self);
 	Factory *parent = (Factory*)type->tp_alloc(type, 0);
 
 	if(parent != NULL)
diff --git a/source/gameengine/Ketsji/KX_PythonSeq.h b/source/gameengine/Ketsji/KX_PythonSeq.h
index 6e9cf9a36aa..1c2d2869be0 100644
--- a/source/gameengine/Ketsji/KX_PythonSeq.h
+++ b/source/gameengine/Ketsji/KX_PythonSeq.h
@@ -51,8 +51,8 @@ enum KX_PYGENSEQ_TYPE {
 /* The Main PyType Object defined in Main.c */
 extern PyTypeObject KX_PythonSeq_Type;
 
-#define BPy_KX_PythonSeq_Check(v) \
-    ((v)->ob_type == &KX_PythonSeq_Type)
+#define BPy_KX_PythonSeq_Check(obj)  \
+    (Py_TYPE(obj) == &KX_PythonSeq_Type)
 
 typedef struct {
 	PyObject_VAR_HEAD
diff --git a/source/gameengine/VideoTexture/BlendType.h b/source/gameengine/VideoTexture/BlendType.h
index 4d63031a363..fad23af922e 100644
--- a/source/gameengine/VideoTexture/BlendType.h
+++ b/source/gameengine/VideoTexture/BlendType.h
@@ -43,15 +43,15 @@ public:
 		if (m_objType == NULL)
 		{
 			// compare names of type
-			if (strcmp(obj->ob_type->tp_name, m_name) == 0)
+			if (strcmp(Py_TYPE(obj)->tp_name, m_name) == 0)
 				// if name of type match, save pointer to type
-				m_objType = obj->ob_type;
+				m_objType = Py_TYPE(obj);
 			else
 				// if names of type don't match, return NULL
 				return NULL;
 		}
 		// if pointer to type is set and don't match to type of provided object, return NULL
-		else if (obj->ob_type != m_objType) 
+		else if (Py_TYPE(obj) != m_objType)
 			return NULL;
 		// return pointer to object, this class can only be used for KX object =>
 		// the Py object is actually a proxy
diff --git a/source/gameengine/VideoTexture/FilterBase.cpp b/source/gameengine/VideoTexture/FilterBase.cpp
index 28e36cf80e0..6fa249ff00a 100644
--- a/source/gameengine/VideoTexture/FilterBase.cpp
+++ b/source/gameengine/VideoTexture/FilterBase.cpp
@@ -141,7 +141,7 @@ int Filter_setPrevious (PyFilter * self, PyObject * value, void * closure)
 	if (self->m_filter != NULL)
 	{
 		// check new value
-		if (value == NULL || !pyFilterTypes.in(value->ob_type))
+		if (value == NULL || !pyFilterTypes.in(Py_TYPE(value)))
 		{
 			// report value error
 			PyErr_SetString(PyExc_TypeError, "Invalid type of value");
diff --git a/source/gameengine/VideoTexture/ImageBase.cpp b/source/gameengine/VideoTexture/ImageBase.cpp
index 0fe71dd8024..b1d77d8807f 100644
--- a/source/gameengine/VideoTexture/ImageBase.cpp
+++ b/source/gameengine/VideoTexture/ImageBase.cpp
@@ -567,7 +567,7 @@ PyObject * Image_setSource (PyImage * self, PyObject * args)
 	if (self->m_image != NULL)
 	{
 		// check type of object
-		if (pyImageTypes.in(obj->ob_type))
+		if (pyImageTypes.in(Py_TYPE(obj)))
 		{
 			// convert to image struct
 			PyImage * img = reinterpret_cast<PyImage*>(obj);
@@ -619,7 +619,7 @@ int Image_setFilter (PyImage * self, PyObject * value, void * closure)
 	if (self->m_image != NULL)
 	{
 		// check new value
-		if (value == NULL || !pyFilterTypes.in(value->ob_type))
+		if (value == NULL || !pyFilterTypes.in(Py_TYPE(value)))
 		{
 			// report value error
 			PyErr_SetString(PyExc_TypeError, "Invalid type of value");
diff --git a/source/gameengine/VideoTexture/Texture.cpp b/source/gameengine/VideoTexture/Texture.cpp
index ba9922d455f..e1ddd7fce1e 100644
--- a/source/gameengine/VideoTexture/Texture.cpp
+++ b/source/gameengine/VideoTexture/Texture.cpp
@@ -171,7 +171,7 @@ void Texture_dealloc (Texture * self)
 	// release scaled image buffer
 	delete [] self->m_scaledImg;
 	// release object
-	((PyObject *)self)->ob_type->tp_free((PyObject*)self);
+	Py_TYPE((PyObject *)self)->tp_free((PyObject*)self);
 }
 
 
@@ -410,7 +410,7 @@ PyObject * Texture_getSource (Texture * self, PyObject * value, void * closure)
 int Texture_setSource (Texture * self, PyObject * value, void * closure)
 {
 	// check new value
-	if (value == NULL || !pyImageTypes.in(value->ob_type))
+	if (value == NULL || !pyImageTypes.in(Py_TYPE(value)))
 	{
 		// report value error
 		PyErr_SetString(PyExc_TypeError, "Invalid type of value");
diff --git a/source/gameengine/VideoTexture/blendVideoTex.cpp b/source/gameengine/VideoTexture/blendVideoTex.cpp
index c93fadada77..abfd0ed49b7 100644
--- a/source/gameengine/VideoTexture/blendVideoTex.cpp
+++ b/source/gameengine/VideoTexture/blendVideoTex.cpp
@@ -91,7 +91,7 @@ static PyObject * imageToArray (PyObject * self, PyObject *args)
 	// parameter is Image object
 	PyObject * pyImg;
 	char *mode = NULL;
-	if (!PyArg_ParseTuple(args, "O|s:imageToArray", &pyImg, &mode) || !pyImageTypes.in(pyImg->ob_type))
+	if (!PyArg_ParseTuple(args, "O|s:imageToArray", &pyImg, &mode) || !pyImageTypes.in(Py_TYPE(pyImg)))
 	{
 		// if object is incorect, report error
 		PyErr_SetString(PyExc_TypeError, "VideoTexture.imageToArray(image): The value must be a image source object");