[Python-checkins] python/dist/src/Mac/Modules/qt _Qtmodule.c,1.14,1.15 qtscan.py,1.21,1.22

2003年2月04日 07:35:09 -0800

Update of /cvsroot/python/python/dist/src/Mac/Modules/qt
In directory sc8-pr-cvs1:/tmp/cvs-serv7139
Modified Files:
	_Qtmodule.c qtscan.py 
Log Message:
Changed an edit instruction because of a changed parameter name (sigh).
Index: _Qtmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/qt/_Qtmodule.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** _Qtmodule.c	23 Dec 2002 23:16:24 -0000	1.14
--- _Qtmodule.c	4 Feb 2003 15:35:06 -0000	1.15
***************
*** 15,21 ****
 /* Macro to test whether a weak-loaded CFM function exists */
 #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\
! 	PyErr_SetString(PyExc_NotImplementedError, \
! 	"Not available in this shared library/OS version"); \
! 	return NULL; \
 }} while(0)
 
--- 15,21 ----
 /* Macro to test whether a weak-loaded CFM function exists */
 #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\
! PyErr_SetString(PyExc_NotImplementedError, \
! "Not available in this shared library/OS version"); \
! return NULL; \
 }} while(0)
 
***************
*** 9341,9345 ****
 	PyMac_PRECHECK(ConvertTime);
 #endif
! 	if (!PyArg_ParseTuple(_args, "O&",
 	 TimeBaseObj_Convert, &newBase))
 		return NULL;
--- 9341,9346 ----
 	PyMac_PRECHECK(ConvertTime);
 #endif
! 	if (!PyArg_ParseTuple(_args, "O&O&",
! 	 QtTimeRecord_Convert, &theTime,
 	 TimeBaseObj_Convert, &newBase))
 		return NULL;
***************
*** 9359,9363 ****
 	PyMac_PRECHECK(ConvertTimeScale);
 #endif
! 	if (!PyArg_ParseTuple(_args, "l",
 	 &newScale))
 		return NULL;
--- 9360,9365 ----
 	PyMac_PRECHECK(ConvertTimeScale);
 #endif
! 	if (!PyArg_ParseTuple(_args, "O&l",
! 	 QtTimeRecord_Convert, &theTime,
 	 &newScale))
 		return NULL;
***************
*** 9692,9698 ****
 	 PyDoc_STR("() -> (TimeBase _rv)")},
 	{"ConvertTime", (PyCFunction)Qt_ConvertTime, 1,
! 	 PyDoc_STR("(TimeBase newBase) -> (TimeRecord theTime)")},
 	{"ConvertTimeScale", (PyCFunction)Qt_ConvertTimeScale, 1,
! 	 PyDoc_STR("(TimeScale newScale) -> (TimeRecord theTime)")},
 	{"AddTime", (PyCFunction)Qt_AddTime, 1,
 	 PyDoc_STR("(TimeRecord dst, TimeRecord src) -> (TimeRecord dst)")},
--- 9694,9700 ----
 	 PyDoc_STR("() -> (TimeBase _rv)")},
 	{"ConvertTime", (PyCFunction)Qt_ConvertTime, 1,
! 	 PyDoc_STR("(TimeRecord theTime, TimeBase newBase) -> (TimeRecord theTime)")},
 	{"ConvertTimeScale", (PyCFunction)Qt_ConvertTimeScale, 1,
! 	 PyDoc_STR("(TimeRecord theTime, TimeScale newScale) -> (TimeRecord theTime)")},
 	{"AddTime", (PyCFunction)Qt_AddTime, 1,
 	 PyDoc_STR("(TimeRecord dst, TimeRecord src) -> (TimeRecord dst)")},
Index: qtscan.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/qt/qtscan.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** qtscan.py	12 Dec 2002 10:31:52 -0000	1.21
--- qtscan.py	4 Feb 2003 15:35:07 -0000	1.22
***************
*** 140,143 ****
--- 140,144 ----
 			# ConvertTime and ConvertTimeScale
 			([('TimeRecord', 'inout', 'OutMode')], [('TimeRecord', 'inout', 'InOutMode')]),
+ 			([('TimeRecord', 'theTime', 'OutMode')], [('TimeRecord', 'theTime', 'InOutMode')]),
 			
 			# AddTime and SubtractTime