[Python-checkins] python/dist/src/Mac/Modules/qt _Qtmodule.c,1.13,1.14

[jackjansen@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Mac/Modules/qt
In directory sc8-pr-cvs1:/tmp/cvs-serv31491/qt

Modified Files:
	_Qtmodule.c 
Log Message:
- Various tweaks to shut up compiler warnings.
- Regenerated with the correct calls to PyType_Ready and the correct
  deallocator calls.


Index: _Qtmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/qt/_Qtmodule.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** _Qtmodule.c	19 Dec 2002 21:24:35 -0000	1.13
--- _Qtmodule.c	23 Dec 2002 23:16:24 -0000	1.14
***************
*** 131,135 ****
  {
  	DisposeMovieController(self->ob_itself);
! 	PyObject_Del(self);
  }
  
--- 131,135 ----
  {
  	DisposeMovieController(self->ob_itself);
! 	self->ob_type->tp_free((PyObject *)self);
  }
  
***************
*** 1202,1206 ****
  {
  	/* Cleanup of self->ob_itself goes here */
! 	PyObject_Del(self);
  }
  
--- 1202,1206 ----
  {
  	/* Cleanup of self->ob_itself goes here */
! 	self->ob_type->tp_free((PyObject *)self);
  }
  
***************
*** 1690,1694 ****
  {
  	DisposeUserData(self->ob_itself);
! 	PyObject_Del(self);
  }
  
--- 1690,1694 ----
  {
  	DisposeUserData(self->ob_itself);
! 	self->ob_type->tp_free((PyObject *)self);
  }
  
***************
*** 2031,2035 ****
  {
  	DisposeTrackMedia(self->ob_itself);
! 	PyObject_Del(self);
  }
  
--- 2031,2035 ----
  {
  	DisposeTrackMedia(self->ob_itself);
! 	self->ob_type->tp_free((PyObject *)self);
  }
  
***************
*** 3243,3247 ****
  {
  	DisposeMovieTrack(self->ob_itself);
! 	PyObject_Del(self);
  }
  
--- 3243,3247 ----
  {
  	DisposeMovieTrack(self->ob_itself);
! 	self->ob_type->tp_free((PyObject *)self);
  }
  
***************
*** 4561,4565 ****
  {
  	DisposeMovie(self->ob_itself);
! 	PyObject_Del(self);
  }
  
--- 4561,4565 ----
  {
  	DisposeMovie(self->ob_itself);
! 	self->ob_type->tp_free((PyObject *)self);
  }
  
***************
*** 9741,9744 ****
--- 9741,9745 ----
  		return;
  	MovieController_Type.ob_type = &PyType_Type;
+ 	if (PyType_Ready(&MovieController_Type) < 0) return;
  	Py_INCREF(&MovieController_Type);
  	PyModule_AddObject(m, "MovieController", (PyObject *)&MovieController_Type);
***************
*** 9747,9750 ****
--- 9748,9752 ----
  	PyModule_AddObject(m, "MovieControllerType", (PyObject *)&MovieController_Type);
  	TimeBase_Type.ob_type = &PyType_Type;
+ 	if (PyType_Ready(&TimeBase_Type) < 0) return;
  	Py_INCREF(&TimeBase_Type);
  	PyModule_AddObject(m, "TimeBase", (PyObject *)&TimeBase_Type);
***************
*** 9753,9756 ****
--- 9755,9759 ----
  	PyModule_AddObject(m, "TimeBaseType", (PyObject *)&TimeBase_Type);
  	UserData_Type.ob_type = &PyType_Type;
+ 	if (PyType_Ready(&UserData_Type) < 0) return;
  	Py_INCREF(&UserData_Type);
  	PyModule_AddObject(m, "UserData", (PyObject *)&UserData_Type);
***************
*** 9759,9762 ****
--- 9762,9766 ----
  	PyModule_AddObject(m, "UserDataType", (PyObject *)&UserData_Type);
  	Media_Type.ob_type = &PyType_Type;
+ 	if (PyType_Ready(&Media_Type) < 0) return;
  	Py_INCREF(&Media_Type);
  	PyModule_AddObject(m, "Media", (PyObject *)&Media_Type);
***************
*** 9765,9768 ****
--- 9769,9773 ----
  	PyModule_AddObject(m, "MediaType", (PyObject *)&Media_Type);
  	Track_Type.ob_type = &PyType_Type;
+ 	if (PyType_Ready(&Track_Type) < 0) return;
  	Py_INCREF(&Track_Type);
  	PyModule_AddObject(m, "Track", (PyObject *)&Track_Type);
***************
*** 9771,9774 ****
--- 9776,9780 ----
  	PyModule_AddObject(m, "TrackType", (PyObject *)&Track_Type);
  	Movie_Type.ob_type = &PyType_Type;
+ 	if (PyType_Ready(&Movie_Type) < 0) return;
  	Py_INCREF(&Movie_Type);
  	PyModule_AddObject(m, "Movie", (PyObject *)&Movie_Type);