qt-changes.diff   [plain text]


diff -ur Mac/Modules/qt/_Qtmodule.c.orig Mac/Modules/qt/_Qtmodule.c
--- Mac/Modules/qt/_Qtmodule.c.orig	2005-07-03 16:59:44.000000000 -0400
+++ Mac/Modules/qt/_Qtmodule.c	2007-10-28 20:09:41.000000000 -0400
@@ -11550,7 +11550,7 @@
 	PyMac_PRECHECK(GraphicsImportSetDataReference);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &dataRef,
 	                      PyMac_GetOSType, &dataReType))
 		return NULL;
@@ -11573,7 +11573,7 @@
 	PyMac_PRECHECK(GraphicsImportGetDataReference);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportGetDataReference(ci,
 	                                     &dataRef,
@@ -11595,7 +11595,7 @@
 	PyMac_PRECHECK(GraphicsImportSetDataFile);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_GetFSSpec, &theFile))
 		return NULL;
 	_rv = GraphicsImportSetDataFile(ci,
@@ -11615,7 +11615,7 @@
 	PyMac_PRECHECK(GraphicsImportGetDataFile);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_GetFSSpec, &theFile))
 		return NULL;
 	_rv = GraphicsImportGetDataFile(ci,
@@ -11635,7 +11635,7 @@
 	PyMac_PRECHECK(GraphicsImportSetDataHandle);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &h))
 		return NULL;
 	_rv = GraphicsImportSetDataHandle(ci,
@@ -11655,7 +11655,7 @@
 	PyMac_PRECHECK(GraphicsImportGetDataHandle);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportGetDataHandle(ci,
 	                                  &h);
@@ -11675,7 +11675,7 @@
 	PyMac_PRECHECK(GraphicsImportGetImageDescription);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportGetImageDescription(ci,
 	                                        &desc);
@@ -11696,7 +11696,7 @@
 	PyMac_PRECHECK(GraphicsImportGetDataOffsetAndSize);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportGetDataOffsetAndSize(ci,
 	                                         &offset,
@@ -11720,7 +11720,7 @@
 	PyMac_PRECHECK(GraphicsImportReadData);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&sll",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &dataPtr,
 	                      &dataOffset,
 	                      &dataSize))
@@ -11744,7 +11744,7 @@
 	PyMac_PRECHECK(GraphicsImportSetClip);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &clipRgn))
 		return NULL;
 	_rv = GraphicsImportSetClip(ci,
@@ -11764,7 +11764,7 @@
 	PyMac_PRECHECK(GraphicsImportGetClip);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportGetClip(ci,
 	                            &clipRgn);
@@ -11784,7 +11784,7 @@
 	PyMac_PRECHECK(GraphicsImportSetSourceRect);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_GetRect, &sourceRect))
 		return NULL;
 	_rv = GraphicsImportSetSourceRect(ci,
@@ -11804,7 +11804,7 @@
 	PyMac_PRECHECK(GraphicsImportGetSourceRect);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportGetSourceRect(ci,
 	                                  &sourceRect);
@@ -11824,7 +11824,7 @@
 	PyMac_PRECHECK(GraphicsImportGetNaturalBounds);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportGetNaturalBounds(ci,
 	                                     &naturalBounds);
@@ -11843,7 +11843,7 @@
 	PyMac_PRECHECK(GraphicsImportDraw);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportDraw(ci);
 	_res = Py_BuildValue("l",
@@ -11862,7 +11862,7 @@
 	PyMac_PRECHECK(GraphicsImportSetGWorld);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      GrafObj_Convert, &port,
 	                      OptResObj_Convert, &gd))
 		return NULL;
@@ -11885,7 +11885,7 @@
 	PyMac_PRECHECK(GraphicsImportGetGWorld);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportGetGWorld(ci,
 	                              &port,
@@ -11907,7 +11907,7 @@
 	PyMac_PRECHECK(GraphicsImportSetBoundsRect);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_GetRect, &bounds))
 		return NULL;
 	_rv = GraphicsImportSetBoundsRect(ci,
@@ -11927,7 +11927,7 @@
 	PyMac_PRECHECK(GraphicsImportGetBoundsRect);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportGetBoundsRect(ci,
 	                                  &bounds);
@@ -11948,7 +11948,7 @@
 	PyMac_PRECHECK(GraphicsImportSaveAsPicture);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&h",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_GetFSSpec, &fss,
 	                      &scriptTag))
 		return NULL;
@@ -11971,7 +11971,7 @@
 	PyMac_PRECHECK(GraphicsImportSetGraphicsMode);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&lO&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &graphicsMode,
 	                      QdRGB_Convert, &opColor))
 		return NULL;
@@ -11994,7 +11994,7 @@
 	PyMac_PRECHECK(GraphicsImportGetGraphicsMode);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportGetGraphicsMode(ci,
 	                                    &graphicsMode,
@@ -12016,7 +12016,7 @@
 	PyMac_PRECHECK(GraphicsImportSetQuality);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &quality))
 		return NULL;
 	_rv = GraphicsImportSetQuality(ci,
@@ -12036,7 +12036,7 @@
 	PyMac_PRECHECK(GraphicsImportGetQuality);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportGetQuality(ci,
 	                               &quality);
@@ -12057,7 +12057,7 @@
 	PyMac_PRECHECK(GraphicsImportSaveAsQuickTimeImageFile);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&h",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_GetFSSpec, &fss,
 	                      &scriptTag))
 		return NULL;
@@ -12080,7 +12080,7 @@
 	PyMac_PRECHECK(GraphicsImportSetDataReferenceOffsetAndLimit);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&ll",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &offset,
 	                      &limit))
 		return NULL;
@@ -12103,7 +12103,7 @@
 	PyMac_PRECHECK(GraphicsImportGetDataReferenceOffsetAndLimit);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportGetDataReferenceOffsetAndLimit(ci,
 	                                                   &offset,
@@ -12126,7 +12126,7 @@
 	PyMac_PRECHECK(GraphicsImportGetAliasedDataReference);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportGetAliasedDataReference(ci,
 	                                            &dataRef,
@@ -12148,7 +12148,7 @@
 	PyMac_PRECHECK(GraphicsImportValidate);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportValidate(ci,
 	                             &valid);
@@ -12168,7 +12168,7 @@
 	PyMac_PRECHECK(GraphicsImportGetMetaData);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&s",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &userData))
 		return NULL;
 	_rv = GraphicsImportGetMetaData(ci,
@@ -12188,7 +12188,7 @@
 	PyMac_PRECHECK(GraphicsImportGetMIMETypeList);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&s",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &qtAtomContainerPtr))
 		return NULL;
 	_rv = GraphicsImportGetMIMETypeList(ci,
@@ -12208,7 +12208,7 @@
 	PyMac_PRECHECK(GraphicsImportDoesDrawAllPixels);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportDoesDrawAllPixels(ci,
 	                                      &drawsAllPixels);
@@ -12228,7 +12228,7 @@
 	PyMac_PRECHECK(GraphicsImportGetAsPicture);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportGetAsPicture(ci,
 	                                 &picture);
@@ -12251,7 +12251,7 @@
 	PyMac_PRECHECK(GraphicsImportExportImageFile);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&O&h",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_GetOSType, &fileType,
 	                      PyMac_GetOSType, &fileCreator,
 	                      PyMac_GetFSSpec, &fss,
@@ -12277,7 +12277,7 @@
 	PyMac_PRECHECK(GraphicsImportGetExportImageTypeList);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&s",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &qtAtomContainerPtr))
 		return NULL;
 	_rv = GraphicsImportGetExportImageTypeList(ci,
@@ -12297,7 +12297,7 @@
 	PyMac_PRECHECK(GraphicsImportGetExportSettingsAsAtomContainer);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&s",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &qtAtomContainerPtr))
 		return NULL;
 	_rv = GraphicsImportGetExportSettingsAsAtomContainer(ci,
@@ -12317,7 +12317,7 @@
 	PyMac_PRECHECK(GraphicsImportSetExportSettingsFromAtomContainer);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&s",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &qtAtomContainer))
 		return NULL;
 	_rv = GraphicsImportSetExportSettingsFromAtomContainer(ci,
@@ -12337,7 +12337,7 @@
 	PyMac_PRECHECK(GraphicsImportGetImageCount);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportGetImageCount(ci,
 	                                  &imageCount);
@@ -12357,7 +12357,7 @@
 	PyMac_PRECHECK(GraphicsImportSetImageIndex);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &imageIndex))
 		return NULL;
 	_rv = GraphicsImportSetImageIndex(ci,
@@ -12377,7 +12377,7 @@
 	PyMac_PRECHECK(GraphicsImportGetImageIndex);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportGetImageIndex(ci,
 	                                  &imageIndex);
@@ -12398,7 +12398,7 @@
 	PyMac_PRECHECK(GraphicsImportGetDataOffsetAndSize64);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportGetDataOffsetAndSize64(ci,
 	                                           &offset,
@@ -12422,7 +12422,7 @@
 	PyMac_PRECHECK(GraphicsImportReadData64);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&sO&l",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &dataPtr,
 	                      PyMac_Getwide, &dataOffset,
 	                      &dataSize))
@@ -12447,7 +12447,7 @@
 	PyMac_PRECHECK(GraphicsImportSetDataReferenceOffsetAndLimit64);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_Getwide, &offset,
 	                      PyMac_Getwide, &limit))
 		return NULL;
@@ -12470,7 +12470,7 @@
 	PyMac_PRECHECK(GraphicsImportGetDataReferenceOffsetAndLimit64);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportGetDataReferenceOffsetAndLimit64(ci,
 	                                                     &offset,
@@ -12492,7 +12492,7 @@
 	PyMac_PRECHECK(GraphicsImportGetDefaultClip);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportGetDefaultClip(ci,
 	                                   &defaultRgn);
@@ -12513,7 +12513,7 @@
 	PyMac_PRECHECK(GraphicsImportGetDefaultGraphicsMode);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportGetDefaultGraphicsMode(ci,
 	                                           &defaultGraphicsMode,
@@ -12535,7 +12535,7 @@
 	PyMac_PRECHECK(GraphicsImportGetDefaultSourceRect);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportGetDefaultSourceRect(ci,
 	                                         &defaultSourceRect);
@@ -12555,7 +12555,7 @@
 	PyMac_PRECHECK(GraphicsImportGetColorSyncProfile);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportGetColorSyncProfile(ci,
 	                                        &profile);
@@ -12575,7 +12575,7 @@
 	PyMac_PRECHECK(GraphicsImportSetDestRect);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_GetRect, &destRect))
 		return NULL;
 	_rv = GraphicsImportSetDestRect(ci,
@@ -12595,7 +12595,7 @@
 	PyMac_PRECHECK(GraphicsImportGetDestRect);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportGetDestRect(ci,
 	                                &destRect);
@@ -12615,7 +12615,7 @@
 	PyMac_PRECHECK(GraphicsImportSetFlags);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &flags))
 		return NULL;
 	_rv = GraphicsImportSetFlags(ci,
@@ -12635,7 +12635,7 @@
 	PyMac_PRECHECK(GraphicsImportGetFlags);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportGetFlags(ci,
 	                             &flags);
@@ -12656,7 +12656,7 @@
 	PyMac_PRECHECK(GraphicsImportGetBaseDataOffsetAndSize64);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportGetBaseDataOffsetAndSize64(ci,
 	                                               &offset,
@@ -12677,7 +12677,7 @@
 	PyMac_PRECHECK(GraphicsImportSetImageIndexToThumbnail);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImportSetImageIndexToThumbnail(ci);
 	_res = Py_BuildValue("l",
@@ -12695,7 +12695,7 @@
 	PyMac_PRECHECK(GraphicsExportDoExport);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportDoExport(ci,
 	                             &actualSizeWritten);
@@ -12715,7 +12715,7 @@
 	PyMac_PRECHECK(GraphicsExportCanTranscode);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportCanTranscode(ci,
 	                                 &canTranscode);
@@ -12734,7 +12734,7 @@
 	PyMac_PRECHECK(GraphicsExportDoTranscode);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportDoTranscode(ci);
 	_res = Py_BuildValue("l",
@@ -12753,7 +12753,7 @@
 	PyMac_PRECHECK(GraphicsExportCanUseCompressor);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&s",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &codecSettingsAtomContainerPtr))
 		return NULL;
 	_rv = GraphicsExportCanUseCompressor(ci,
@@ -12776,7 +12776,7 @@
 	PyMac_PRECHECK(GraphicsExportDoUseCompressor);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&s",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &codecSettingsAtomContainer))
 		return NULL;
 	_rv = GraphicsExportDoUseCompressor(ci,
@@ -12797,7 +12797,7 @@
 	PyMac_PRECHECK(GraphicsExportDoStandaloneExport);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportDoStandaloneExport(ci);
 	_res = Py_BuildValue("l",
@@ -12816,7 +12816,7 @@
 	PyMac_PRECHECK(GraphicsExportGetDefaultFileTypeAndCreator);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetDefaultFileTypeAndCreator(ci,
 	                                                 &fileType,
@@ -12838,7 +12838,7 @@
 	PyMac_PRECHECK(GraphicsExportGetDefaultFileNameExtension);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetDefaultFileNameExtension(ci,
 	                                                &fileNameExtension);
@@ -12858,7 +12858,7 @@
 	PyMac_PRECHECK(GraphicsExportGetMIMETypeList);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&s",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &qtAtomContainerPtr))
 		return NULL;
 	_rv = GraphicsExportGetMIMETypeList(ci,
@@ -12878,7 +12878,7 @@
 	PyMac_PRECHECK(GraphicsExportSetSettingsFromAtomContainer);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&s",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &qtAtomContainer))
 		return NULL;
 	_rv = GraphicsExportSetSettingsFromAtomContainer(ci,
@@ -12898,7 +12898,7 @@
 	PyMac_PRECHECK(GraphicsExportGetSettingsAsAtomContainer);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&s",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &qtAtomContainerPtr))
 		return NULL;
 	_rv = GraphicsExportGetSettingsAsAtomContainer(ci,
@@ -12918,7 +12918,7 @@
 	PyMac_PRECHECK(GraphicsExportGetSettingsAsText);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetSettingsAsText(ci,
 	                                      &theText);
@@ -12938,7 +12938,7 @@
 	PyMac_PRECHECK(GraphicsExportSetDontRecompress);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&b",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &dontRecompress))
 		return NULL;
 	_rv = GraphicsExportSetDontRecompress(ci,
@@ -12958,7 +12958,7 @@
 	PyMac_PRECHECK(GraphicsExportGetDontRecompress);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetDontRecompress(ci,
 	                                      &dontRecompress);
@@ -12978,7 +12978,7 @@
 	PyMac_PRECHECK(GraphicsExportSetInterlaceStyle);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &interlaceStyle))
 		return NULL;
 	_rv = GraphicsExportSetInterlaceStyle(ci,
@@ -12998,7 +12998,7 @@
 	PyMac_PRECHECK(GraphicsExportGetInterlaceStyle);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetInterlaceStyle(ci,
 	                                      &interlaceStyle);
@@ -13018,7 +13018,7 @@
 	PyMac_PRECHECK(GraphicsExportSetMetaData);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&s",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &userData))
 		return NULL;
 	_rv = GraphicsExportSetMetaData(ci,
@@ -13038,7 +13038,7 @@
 	PyMac_PRECHECK(GraphicsExportGetMetaData);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&s",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &userData))
 		return NULL;
 	_rv = GraphicsExportGetMetaData(ci,
@@ -13058,7 +13058,7 @@
 	PyMac_PRECHECK(GraphicsExportSetTargetDataSize);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &targetDataSize))
 		return NULL;
 	_rv = GraphicsExportSetTargetDataSize(ci,
@@ -13078,7 +13078,7 @@
 	PyMac_PRECHECK(GraphicsExportGetTargetDataSize);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetTargetDataSize(ci,
 	                                      &targetDataSize);
@@ -13098,7 +13098,7 @@
 	PyMac_PRECHECK(GraphicsExportSetCompressionMethod);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &compressionMethod))
 		return NULL;
 	_rv = GraphicsExportSetCompressionMethod(ci,
@@ -13118,7 +13118,7 @@
 	PyMac_PRECHECK(GraphicsExportGetCompressionMethod);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetCompressionMethod(ci,
 	                                         &compressionMethod);
@@ -13138,7 +13138,7 @@
 	PyMac_PRECHECK(GraphicsExportSetCompressionQuality);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &spatialQuality))
 		return NULL;
 	_rv = GraphicsExportSetCompressionQuality(ci,
@@ -13158,7 +13158,7 @@
 	PyMac_PRECHECK(GraphicsExportGetCompressionQuality);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetCompressionQuality(ci,
 	                                          &spatialQuality);
@@ -13179,7 +13179,7 @@
 	PyMac_PRECHECK(GraphicsExportSetResolution);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_GetFixed, &horizontalResolution,
 	                      PyMac_GetFixed, &verticalResolution))
 		return NULL;
@@ -13202,7 +13202,7 @@
 	PyMac_PRECHECK(GraphicsExportGetResolution);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetResolution(ci,
 	                                  &horizontalResolution,
@@ -13224,7 +13224,7 @@
 	PyMac_PRECHECK(GraphicsExportSetDepth);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &depth))
 		return NULL;
 	_rv = GraphicsExportSetDepth(ci,
@@ -13244,7 +13244,7 @@
 	PyMac_PRECHECK(GraphicsExportGetDepth);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetDepth(ci,
 	                             &depth);
@@ -13264,7 +13264,7 @@
 	PyMac_PRECHECK(GraphicsExportSetColorSyncProfile);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &colorSyncProfile))
 		return NULL;
 	_rv = GraphicsExportSetColorSyncProfile(ci,
@@ -13284,7 +13284,7 @@
 	PyMac_PRECHECK(GraphicsExportGetColorSyncProfile);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetColorSyncProfile(ci,
 	                                        &colorSyncProfile);
@@ -13306,7 +13306,7 @@
 	PyMac_PRECHECK(GraphicsExportSetInputDataReference);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &dataRef,
 	                      PyMac_GetOSType, &dataRefType,
 	                      ResObj_Convert, &desc))
@@ -13331,7 +13331,7 @@
 	PyMac_PRECHECK(GraphicsExportGetInputDataReference);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetInputDataReference(ci,
 	                                          &dataRef,
@@ -13354,7 +13354,7 @@
 	PyMac_PRECHECK(GraphicsExportSetInputFile);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_GetFSSpec, &theFile,
 	                      ResObj_Convert, &desc))
 		return NULL;
@@ -13376,7 +13376,7 @@
 	PyMac_PRECHECK(GraphicsExportGetInputFile);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_GetFSSpec, &theFile))
 		return NULL;
 	_rv = GraphicsExportGetInputFile(ci,
@@ -13397,7 +13397,7 @@
 	PyMac_PRECHECK(GraphicsExportSetInputHandle);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &h,
 	                      ResObj_Convert, &desc))
 		return NULL;
@@ -13419,7 +13419,7 @@
 	PyMac_PRECHECK(GraphicsExportGetInputHandle);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetInputHandle(ci,
 	                                   &h);
@@ -13441,7 +13441,7 @@
 	PyMac_PRECHECK(GraphicsExportSetInputPtr);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&slO&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &p,
 	                      &size,
 	                      ResObj_Convert, &desc))
@@ -13465,8 +13465,8 @@
 	PyMac_PRECHECK(GraphicsExportSetInputGraphicsImporter);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
-	                      CmpObj_Convert, &grip))
+	                      CmpInstObj_Convert, &ci,
+	                      CmpInstObj_Convert, &grip))
 		return NULL;
 	_rv = GraphicsExportSetInputGraphicsImporter(ci,
 	                                             grip);
@@ -13485,13 +13485,13 @@
 	PyMac_PRECHECK(GraphicsExportGetInputGraphicsImporter);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetInputGraphicsImporter(ci,
 	                                             &grip);
 	_res = Py_BuildValue("lO&",
 	                     _rv,
-	                     CmpObj_New, grip);
+	                     CmpInstObj_New, grip);
 	return _res;
 }
 
@@ -13505,7 +13505,7 @@
 	PyMac_PRECHECK(GraphicsExportSetInputPicture);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &picture))
 		return NULL;
 	_rv = GraphicsExportSetInputPicture(ci,
@@ -13525,7 +13525,7 @@
 	PyMac_PRECHECK(GraphicsExportGetInputPicture);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetInputPicture(ci,
 	                                    &picture);
@@ -13545,7 +13545,7 @@
 	PyMac_PRECHECK(GraphicsExportSetInputGWorld);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      GWorldObj_Convert, &gworld))
 		return NULL;
 	_rv = GraphicsExportSetInputGWorld(ci,
@@ -13565,7 +13565,7 @@
 	PyMac_PRECHECK(GraphicsExportGetInputGWorld);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetInputGWorld(ci,
 	                                   &gworld);
@@ -13585,7 +13585,7 @@
 	PyMac_PRECHECK(GraphicsExportSetInputPixmap);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &pixmap))
 		return NULL;
 	_rv = GraphicsExportSetInputPixmap(ci,
@@ -13605,7 +13605,7 @@
 	PyMac_PRECHECK(GraphicsExportGetInputPixmap);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetInputPixmap(ci,
 	                                   &pixmap);
@@ -13626,7 +13626,7 @@
 	PyMac_PRECHECK(GraphicsExportSetInputOffsetAndLimit);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&ll",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &offset,
 	                      &limit))
 		return NULL;
@@ -13649,7 +13649,7 @@
 	PyMac_PRECHECK(GraphicsExportGetInputOffsetAndLimit);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetInputOffsetAndLimit(ci,
 	                                           &offset,
@@ -13671,7 +13671,7 @@
 	PyMac_PRECHECK(GraphicsExportMayExporterReadInputData);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportMayExporterReadInputData(ci,
 	                                             &mayReadInputData);
@@ -13691,7 +13691,7 @@
 	PyMac_PRECHECK(GraphicsExportGetInputDataSize);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetInputDataSize(ci,
 	                                     &size);
@@ -13713,7 +13713,7 @@
 	PyMac_PRECHECK(GraphicsExportReadInputData);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&sll",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &dataPtr,
 	                      &dataOffset,
 	                      &dataSize))
@@ -13737,7 +13737,7 @@
 	PyMac_PRECHECK(GraphicsExportGetInputImageDescription);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetInputImageDescription(ci,
 	                                             &desc);
@@ -13757,7 +13757,7 @@
 	PyMac_PRECHECK(GraphicsExportGetInputImageDimensions);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetInputImageDimensions(ci,
 	                                            &dimensions);
@@ -13777,7 +13777,7 @@
 	PyMac_PRECHECK(GraphicsExportGetInputImageDepth);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetInputImageDepth(ci,
 	                                       &inputDepth);
@@ -13800,7 +13800,7 @@
 	PyMac_PRECHECK(GraphicsExportDrawInputImage);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      GrafObj_Convert, &gw,
 	                      OptResObj_Convert, &gd,
 	                      PyMac_GetRect, &srcRect,
@@ -13827,7 +13827,7 @@
 	PyMac_PRECHECK(GraphicsExportSetOutputDataReference);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &dataRef,
 	                      PyMac_GetOSType, &dataRefType))
 		return NULL;
@@ -13850,7 +13850,7 @@
 	PyMac_PRECHECK(GraphicsExportGetOutputDataReference);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetOutputDataReference(ci,
 	                                           &dataRef,
@@ -13872,7 +13872,7 @@
 	PyMac_PRECHECK(GraphicsExportSetOutputFile);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_GetFSSpec, &theFile))
 		return NULL;
 	_rv = GraphicsExportSetOutputFile(ci,
@@ -13892,7 +13892,7 @@
 	PyMac_PRECHECK(GraphicsExportGetOutputFile);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_GetFSSpec, &theFile))
 		return NULL;
 	_rv = GraphicsExportGetOutputFile(ci,
@@ -13912,7 +13912,7 @@
 	PyMac_PRECHECK(GraphicsExportSetOutputHandle);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &h))
 		return NULL;
 	_rv = GraphicsExportSetOutputHandle(ci,
@@ -13932,7 +13932,7 @@
 	PyMac_PRECHECK(GraphicsExportGetOutputHandle);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetOutputHandle(ci,
 	                                    &h);
@@ -13954,7 +13954,7 @@
 	PyMac_PRECHECK(GraphicsExportSetOutputOffsetAndMaxSize);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&llb",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &offset,
 	                      &maxSize,
 	                      &truncateFile))
@@ -13980,7 +13980,7 @@
 	PyMac_PRECHECK(GraphicsExportGetOutputOffsetAndMaxSize);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetOutputOffsetAndMaxSize(ci,
 	                                              &offset,
@@ -14005,7 +14005,7 @@
 	PyMac_PRECHECK(GraphicsExportSetOutputFileTypeAndCreator);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_GetOSType, &fileType,
 	                      PyMac_GetOSType, &fileCreator))
 		return NULL;
@@ -14028,7 +14028,7 @@
 	PyMac_PRECHECK(GraphicsExportGetOutputFileTypeAndCreator);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetOutputFileTypeAndCreator(ci,
 	                                                &fileType,
@@ -14050,7 +14050,7 @@
 	PyMac_PRECHECK(GraphicsExportSetOutputMark);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &mark))
 		return NULL;
 	_rv = GraphicsExportSetOutputMark(ci,
@@ -14070,7 +14070,7 @@
 	PyMac_PRECHECK(GraphicsExportGetOutputMark);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetOutputMark(ci,
 	                                  &mark);
@@ -14092,7 +14092,7 @@
 	PyMac_PRECHECK(GraphicsExportReadOutputData);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&sll",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &dataPtr,
 	                      &dataOffset,
 	                      &dataSize))
@@ -14118,7 +14118,7 @@
 	PyMac_PRECHECK(GraphicsExportSetThumbnailEnabled);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&bll",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &enableThumbnail,
 	                      &maxThumbnailWidth,
 	                      &maxThumbnailHeight))
@@ -14144,7 +14144,7 @@
 	PyMac_PRECHECK(GraphicsExportGetThumbnailEnabled);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetThumbnailEnabled(ci,
 	                                        &thumbnailEnabled,
@@ -14168,7 +14168,7 @@
 	PyMac_PRECHECK(GraphicsExportSetExifEnabled);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&b",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &enableExif))
 		return NULL;
 	_rv = GraphicsExportSetExifEnabled(ci,
@@ -14188,7 +14188,7 @@
 	PyMac_PRECHECK(GraphicsExportGetExifEnabled);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsExportGetExifEnabled(ci,
 	                                   &exifEnabled);
@@ -14211,7 +14211,7 @@
 	PyMac_PRECHECK(ImageTranscoderBeginSequence);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&sl",
-	                      CmpObj_Convert, &itc,
+	                      CmpInstObj_Convert, &itc,
 	                      ResObj_Convert, &srcDesc,
 	                      &data,
 	                      &dataSize))
@@ -14237,7 +14237,7 @@
 	PyMac_PRECHECK(ImageTranscoderDisposeData);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&s",
-	                      CmpObj_Convert, &itc,
+	                      CmpInstObj_Convert, &itc,
 	                      &dstData))
 		return NULL;
 	_rv = ImageTranscoderDisposeData(itc,
@@ -14256,7 +14256,7 @@
 	PyMac_PRECHECK(ImageTranscoderEndSequence);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &itc))
+	                      CmpInstObj_Convert, &itc))
 		return NULL;
 	_rv = ImageTranscoderEndSequence(itc);
 	_res = Py_BuildValue("l",
@@ -14853,7 +14853,7 @@
 	PyMac_PRECHECK(TweenerReset);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &tc))
+	                      CmpInstObj_Convert, &tc))
 		return NULL;
 	_rv = TweenerReset(tc);
 	_res = Py_BuildValue("l",
@@ -14967,7 +14967,7 @@
 	PyMac_PRECHECK(MovieImportHandle);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&O&ll",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &dataH,
 	                      MovieObj_Convert, &theMovie,
 	                      TrackObj_Convert, &targetTrack,
@@ -15008,7 +15008,7 @@
 	PyMac_PRECHECK(MovieImportFile);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&O&ll",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_GetFSSpec, &theFile,
 	                      MovieObj_Convert, &theMovie,
 	                      TrackObj_Convert, &targetTrack,
@@ -15043,7 +15043,7 @@
 	PyMac_PRECHECK(MovieImportSetSampleDuration);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&ll",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &duration,
 	                      &scale))
 		return NULL;
@@ -15066,7 +15066,7 @@
 	PyMac_PRECHECK(MovieImportSetSampleDescription);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &desc,
 	                      PyMac_GetOSType, &mediaType))
 		return NULL;
@@ -15088,7 +15088,7 @@
 	PyMac_PRECHECK(MovieImportSetMediaFile);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &alias))
 		return NULL;
 	_rv = MovieImportSetMediaFile(ci,
@@ -15109,7 +15109,7 @@
 	PyMac_PRECHECK(MovieImportSetDimensions);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_GetFixed, &width,
 	                      PyMac_GetFixed, &height))
 		return NULL;
@@ -15131,7 +15131,7 @@
 	PyMac_PRECHECK(MovieImportSetChunkSize);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &chunkSize))
 		return NULL;
 	_rv = MovieImportSetChunkSize(ci,
@@ -15152,7 +15152,7 @@
 	PyMac_PRECHECK(MovieImportSetAuxiliaryData);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &data,
 	                      PyMac_GetOSType, &handleType))
 		return NULL;
@@ -15174,7 +15174,7 @@
 	PyMac_PRECHECK(MovieImportSetFromScrap);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&b",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &fromScrap))
 		return NULL;
 	_rv = MovieImportSetFromScrap(ci,
@@ -15196,7 +15196,7 @@
 	PyMac_PRECHECK(MovieImportDoUserDialog);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_GetFSSpec, &theFile,
 	                      ResObj_Convert, &theData))
 		return NULL;
@@ -15220,7 +15220,7 @@
 	PyMac_PRECHECK(MovieImportSetDuration);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &duration))
 		return NULL;
 	_rv = MovieImportSetDuration(ci,
@@ -15240,7 +15240,7 @@
 	PyMac_PRECHECK(MovieImportGetAuxiliaryDataType);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = MovieImportGetAuxiliaryDataType(ci,
 	                                      &auxType);
@@ -15262,7 +15262,7 @@
 	PyMac_PRECHECK(MovieImportValidate);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_GetFSSpec, &theFile,
 	                      ResObj_Convert, &theData))
 		return NULL;
@@ -15286,7 +15286,7 @@
 	PyMac_PRECHECK(MovieImportGetFileType);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = MovieImportGetFileType(ci,
 	                             &fileType);
@@ -15314,7 +15314,7 @@
 	PyMac_PRECHECK(MovieImportDataRef);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&O&O&ll",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &dataRef,
 	                      PyMac_GetOSType, &dataRefType,
 	                      MovieObj_Convert, &theMovie,
@@ -15351,7 +15351,7 @@
 	PyMac_PRECHECK(MovieImportGetSampleDescription);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = MovieImportGetSampleDescription(ci,
 	                                      &desc,
@@ -15374,7 +15374,7 @@
 	PyMac_PRECHECK(MovieImportSetOffsetAndLimit);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&ll",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &offset,
 	                      &limit))
 		return NULL;
@@ -15397,7 +15397,7 @@
 	PyMac_PRECHECK(MovieImportSetOffsetAndLimit64);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_Getwide, &offset,
 	                      PyMac_Getwide, &limit))
 		return NULL;
@@ -15420,7 +15420,7 @@
 	PyMac_PRECHECK(MovieImportIdle);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &inFlags))
 		return NULL;
 	_rv = MovieImportIdle(ci,
@@ -15444,7 +15444,7 @@
 	PyMac_PRECHECK(MovieImportValidateDataRef);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &dataRef,
 	                      PyMac_GetOSType, &dataRefType))
 		return NULL;
@@ -15468,7 +15468,7 @@
 	PyMac_PRECHECK(MovieImportGetLoadState);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = MovieImportGetLoadState(ci,
 	                              &importerLoadState);
@@ -15488,7 +15488,7 @@
 	PyMac_PRECHECK(MovieImportGetMaxLoadedTime);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = MovieImportGetMaxLoadedTime(ci,
 	                                  &time);
@@ -15508,7 +15508,7 @@
 	PyMac_PRECHECK(MovieImportEstimateCompletionTime);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = MovieImportEstimateCompletionTime(ci,
 	                                        &time);
@@ -15528,7 +15528,7 @@
 	PyMac_PRECHECK(MovieImportSetDontBlock);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&b",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &dontBlock))
 		return NULL;
 	_rv = MovieImportSetDontBlock(ci,
@@ -15548,7 +15548,7 @@
 	PyMac_PRECHECK(MovieImportGetDontBlock);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = MovieImportGetDontBlock(ci,
 	                              &willBlock);
@@ -15568,7 +15568,7 @@
 	PyMac_PRECHECK(MovieImportSetIdleManager);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      IdleManagerObj_Convert, &im))
 		return NULL;
 	_rv = MovieImportSetIdleManager(ci,
@@ -15588,7 +15588,7 @@
 	PyMac_PRECHECK(MovieImportSetNewMovieFlags);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &newMovieFlags))
 		return NULL;
 	_rv = MovieImportSetNewMovieFlags(ci,
@@ -15608,7 +15608,7 @@
 	PyMac_PRECHECK(MovieImportGetDestinationMediaType);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = MovieImportGetDestinationMediaType(ci,
 	                                         &mediaType);
@@ -15632,7 +15632,7 @@
 	PyMac_PRECHECK(MovieExportToHandle);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&O&ll",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &dataH,
 	                      MovieObj_Convert, &theMovie,
 	                      TrackObj_Convert, &onlyThisTrack,
@@ -15664,7 +15664,7 @@
 	PyMac_PRECHECK(MovieExportToFile);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&O&ll",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_GetFSSpec, &theFile,
 	                      MovieObj_Convert, &theMovie,
 	                      TrackObj_Convert, &onlyThisTrack,
@@ -15693,7 +15693,7 @@
 	PyMac_PRECHECK(MovieExportGetAuxiliaryData);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &dataH))
 		return NULL;
 	_rv = MovieExportGetAuxiliaryData(ci,
@@ -15716,7 +15716,7 @@
 	PyMac_PRECHECK(MovieExportSetSampleDescription);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &desc,
 	                      PyMac_GetOSType, &mediaType))
 		return NULL;
@@ -15742,7 +15742,7 @@
 	PyMac_PRECHECK(MovieExportDoUserDialog);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&ll",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      MovieObj_Convert, &theMovie,
 	                      TrackObj_Convert, &onlyThisTrack,
 	                      &startTime,
@@ -15770,7 +15770,7 @@
 	PyMac_PRECHECK(MovieExportGetCreatorType);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = MovieExportGetCreatorType(ci,
 	                                &creator);
@@ -15795,7 +15795,7 @@
 	PyMac_PRECHECK(MovieExportToDataRef);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&O&O&ll",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &dataRef,
 	                      PyMac_GetOSType, &dataRefType,
 	                      MovieObj_Convert, &theMovie,
@@ -15826,7 +15826,7 @@
 	PyMac_PRECHECK(MovieExportFromProceduresToDataRef);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &dataRef,
 	                      PyMac_GetOSType, &dataRefType))
 		return NULL;
@@ -15850,7 +15850,7 @@
 	PyMac_PRECHECK(MovieExportValidate);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      MovieObj_Convert, &theMovie,
 	                      TrackObj_Convert, &onlyThisTrack))
 		return NULL;
@@ -15874,7 +15874,7 @@
 	PyMac_PRECHECK(MovieExportGetFileNameExtension);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = MovieExportGetFileNameExtension(ci,
 	                                      &extension);
@@ -15894,7 +15894,7 @@
 	PyMac_PRECHECK(MovieExportGetShortFileTypeString);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_GetStr255, typeString))
 		return NULL;
 	_rv = MovieExportGetShortFileTypeString(ci,
@@ -15914,7 +15914,7 @@
 	PyMac_PRECHECK(MovieExportGetSourceMediaType);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = MovieExportGetSourceMediaType(ci,
 	                                    &mediaType);
@@ -15934,7 +15934,7 @@
 	PyMac_PRECHECK(TextExportGetTimeFraction);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = TextExportGetTimeFraction(ci,
 	                                &movieTimeFraction);
@@ -15954,7 +15954,7 @@
 	PyMac_PRECHECK(TextExportSetTimeFraction);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &movieTimeFraction))
 		return NULL;
 	_rv = TextExportSetTimeFraction(ci,
@@ -15974,7 +15974,7 @@
 	PyMac_PRECHECK(TextExportGetSettings);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = TextExportGetSettings(ci,
 	                            &setting);
@@ -15994,7 +15994,7 @@
 	PyMac_PRECHECK(TextExportSetSettings);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &setting))
 		return NULL;
 	_rv = TextExportSetSettings(ci,
@@ -16014,7 +16014,7 @@
 	PyMac_PRECHECK(MIDIImportGetSettings);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = MIDIImportGetSettings(ci,
 	                            &setting);
@@ -16034,7 +16034,7 @@
 	PyMac_PRECHECK(MIDIImportSetSettings);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &setting))
 		return NULL;
 	_rv = MIDIImportSetSettings(ci,
@@ -16054,7 +16054,7 @@
 	PyMac_PRECHECK(GraphicsImageImportSetSequenceEnabled);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&b",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &enable))
 		return NULL;
 	_rv = GraphicsImageImportSetSequenceEnabled(ci,
@@ -16074,7 +16074,7 @@
 	PyMac_PRECHECK(GraphicsImageImportGetSequenceEnabled);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = GraphicsImageImportGetSequenceEnabled(ci,
 	                                            &enable);
@@ -16096,7 +16096,7 @@
 	PyMac_PRECHECK(PreviewShowData);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&O&",
-	                      CmpObj_Convert, &p,
+	                      CmpInstObj_Convert, &p,
 	                      PyMac_GetOSType, &dataType,
 	                      ResObj_Convert, &data,
 	                      PyMac_GetRect, &inHere))
@@ -16122,7 +16122,7 @@
 	PyMac_PRECHECK(PreviewMakePreviewReference);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &p,
+	                      CmpInstObj_Convert, &p,
 	                      PyMac_GetFSSpec, &sourceFile))
 		return NULL;
 	_rv = PreviewMakePreviewReference(p,
@@ -16147,7 +16147,7 @@
 	PyMac_PRECHECK(PreviewEvent);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &p))
+	                      CmpInstObj_Convert, &p))
 		return NULL;
 	_rv = PreviewEvent(p,
 	                   &e,
@@ -16172,7 +16172,7 @@
 	PyMac_PRECHECK(DataCodecDecompress);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&slsl",
-	                      CmpObj_Convert, &dc,
+	                      CmpInstObj_Convert, &dc,
 	                      &srcData,
 	                      &srcSize,
 	                      &dstData,
@@ -16199,7 +16199,7 @@
 	PyMac_PRECHECK(DataCodecGetCompressBufferSize);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &dc,
+	                      CmpInstObj_Convert, &dc,
 	                      &srcSize))
 		return NULL;
 	_rv = DataCodecGetCompressBufferSize(dc,
@@ -16226,7 +16226,7 @@
 	PyMac_PRECHECK(DataCodecCompress);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&slsl",
-	                      CmpObj_Convert, &dc,
+	                      CmpInstObj_Convert, &dc,
 	                      &srcData,
 	                      &srcSize,
 	                      &dstData,
@@ -16256,7 +16256,7 @@
 	PyMac_PRECHECK(DataCodecBeginInterruptSafe);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &dc,
+	                      CmpInstObj_Convert, &dc,
 	                      &maxSrcSize))
 		return NULL;
 	_rv = DataCodecBeginInterruptSafe(dc,
@@ -16275,7 +16275,7 @@
 	PyMac_PRECHECK(DataCodecEndInterruptSafe);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &dc))
+	                      CmpInstObj_Convert, &dc))
 		return NULL;
 	_rv = DataCodecEndInterruptSafe(dc);
 	_res = Py_BuildValue("l",
@@ -17694,7 +17694,7 @@
 	PyMac_PRECHECK(VDGetMaxSrcRect);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&h",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &inputStd))
 		return NULL;
 	_rv = VDGetMaxSrcRect(ci,
@@ -17717,7 +17717,7 @@
 	PyMac_PRECHECK(VDGetActiveSrcRect);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&h",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &inputStd))
 		return NULL;
 	_rv = VDGetActiveSrcRect(ci,
@@ -17739,7 +17739,7 @@
 	PyMac_PRECHECK(VDSetDigitizerRect);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDSetDigitizerRect(ci,
 	                         &digitizerRect);
@@ -17759,7 +17759,7 @@
 	PyMac_PRECHECK(VDGetDigitizerRect);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDGetDigitizerRect(ci,
 	                         &digitizerRect);
@@ -17780,7 +17780,7 @@
 	PyMac_PRECHECK(VDGetVBlankRect);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&h",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &inputStd))
 		return NULL;
 	_rv = VDGetVBlankRect(ci,
@@ -17802,7 +17802,7 @@
 	PyMac_PRECHECK(VDGetMaskPixMap);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &maskPixMap))
 		return NULL;
 	_rv = VDGetMaskPixMap(ci,
@@ -17822,7 +17822,7 @@
 	PyMac_PRECHECK(VDUseThisCLUT);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &colorTableHandle))
 		return NULL;
 	_rv = VDUseThisCLUT(ci,
@@ -17844,7 +17844,7 @@
 	PyMac_PRECHECK(VDSetInputGammaValue);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_GetFixed, &channel1,
 	                      PyMac_GetFixed, &channel2,
 	                      PyMac_GetFixed, &channel3))
@@ -17870,7 +17870,7 @@
 	PyMac_PRECHECK(VDGetInputGammaValue);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDGetInputGammaValue(ci,
 	                           &channel1,
@@ -17894,7 +17894,7 @@
 	PyMac_PRECHECK(VDSetBrightness);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDSetBrightness(ci,
 	                      &brightness);
@@ -17914,7 +17914,7 @@
 	PyMac_PRECHECK(VDGetBrightness);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDGetBrightness(ci,
 	                      &brightness);
@@ -17934,7 +17934,7 @@
 	PyMac_PRECHECK(VDSetContrast);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDSetContrast(ci,
 	                    &contrast);
@@ -17954,7 +17954,7 @@
 	PyMac_PRECHECK(VDSetHue);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDSetHue(ci,
 	               &hue);
@@ -17974,7 +17974,7 @@
 	PyMac_PRECHECK(VDSetSharpness);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDSetSharpness(ci,
 	                     &sharpness);
@@ -17994,7 +17994,7 @@
 	PyMac_PRECHECK(VDSetSaturation);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDSetSaturation(ci,
 	                      &saturation);
@@ -18014,7 +18014,7 @@
 	PyMac_PRECHECK(VDGetContrast);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDGetContrast(ci,
 	                    &contrast);
@@ -18034,7 +18034,7 @@
 	PyMac_PRECHECK(VDGetHue);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDGetHue(ci,
 	               &hue);
@@ -18054,7 +18054,7 @@
 	PyMac_PRECHECK(VDGetSharpness);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDGetSharpness(ci,
 	                     &sharpness);
@@ -18074,7 +18074,7 @@
 	PyMac_PRECHECK(VDGetSaturation);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDGetSaturation(ci,
 	                      &saturation);
@@ -18093,7 +18093,7 @@
 	PyMac_PRECHECK(VDGrabOneFrame);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDGrabOneFrame(ci);
 	_res = Py_BuildValue("l",
@@ -18112,7 +18112,7 @@
 	PyMac_PRECHECK(VDGetMaxAuxBuffer);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDGetMaxAuxBuffer(ci,
 	                        &pm,
@@ -18135,7 +18135,7 @@
 	PyMac_PRECHECK(VDGetCurrentFlags);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDGetCurrentFlags(ci,
 	                        &inputCurrentFlag,
@@ -18157,7 +18157,7 @@
 	PyMac_PRECHECK(VDSetKeyColor);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &index))
 		return NULL;
 	_rv = VDSetKeyColor(ci,
@@ -18177,7 +18177,7 @@
 	PyMac_PRECHECK(VDGetKeyColor);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDGetKeyColor(ci,
 	                    &index);
@@ -18197,7 +18197,7 @@
 	PyMac_PRECHECK(VDAddKeyColor);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDAddKeyColor(ci,
 	                    &index);
@@ -18217,7 +18217,7 @@
 	PyMac_PRECHECK(VDGetNextKeyColor);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &index))
 		return NULL;
 	_rv = VDGetNextKeyColor(ci,
@@ -18238,7 +18238,7 @@
 	PyMac_PRECHECK(VDSetKeyColorRange);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDSetKeyColorRange(ci,
 	                         &minRGB,
@@ -18261,7 +18261,7 @@
 	PyMac_PRECHECK(VDGetKeyColorRange);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDGetKeyColorRange(ci,
 	                         &minRGB,
@@ -18283,7 +18283,7 @@
 	PyMac_PRECHECK(VDSetInputColorSpaceMode);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&h",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &colorSpaceMode))
 		return NULL;
 	_rv = VDSetInputColorSpaceMode(ci,
@@ -18303,7 +18303,7 @@
 	PyMac_PRECHECK(VDGetInputColorSpaceMode);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDGetInputColorSpaceMode(ci,
 	                               &colorSpaceMode);
@@ -18323,7 +18323,7 @@
 	PyMac_PRECHECK(VDSetClipState);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&h",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &clipEnable))
 		return NULL;
 	_rv = VDSetClipState(ci,
@@ -18343,7 +18343,7 @@
 	PyMac_PRECHECK(VDGetClipState);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDGetClipState(ci,
 	                     &clipEnable);
@@ -18363,7 +18363,7 @@
 	PyMac_PRECHECK(VDSetClipRgn);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &clipRegion))
 		return NULL;
 	_rv = VDSetClipRgn(ci,
@@ -18383,7 +18383,7 @@
 	PyMac_PRECHECK(VDClearClipRgn);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &clipRegion))
 		return NULL;
 	_rv = VDClearClipRgn(ci,
@@ -18403,7 +18403,7 @@
 	PyMac_PRECHECK(VDGetCLUTInUse);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDGetCLUTInUse(ci,
 	                     &colorTableHandle);
@@ -18423,7 +18423,7 @@
 	PyMac_PRECHECK(VDSetPLLFilterType);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&h",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &pllType))
 		return NULL;
 	_rv = VDSetPLLFilterType(ci,
@@ -18443,7 +18443,7 @@
 	PyMac_PRECHECK(VDGetPLLFilterType);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDGetPLLFilterType(ci,
 	                         &pllType);
@@ -18465,7 +18465,7 @@
 	PyMac_PRECHECK(VDGetMaskandValue);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&H",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &blendLevel))
 		return NULL;
 	_rv = VDGetMaskandValue(ci,
@@ -18489,7 +18489,7 @@
 	PyMac_PRECHECK(VDSetMasterBlendLevel);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDSetMasterBlendLevel(ci,
 	                            &blendLevel);
@@ -18509,7 +18509,7 @@
 	PyMac_PRECHECK(VDSetPlayThruOnOff);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&h",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &state))
 		return NULL;
 	_rv = VDSetPlayThruOnOff(ci,
@@ -18529,7 +18529,7 @@
 	PyMac_PRECHECK(VDSetFieldPreference);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&h",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &fieldFlag))
 		return NULL;
 	_rv = VDSetFieldPreference(ci,
@@ -18549,7 +18549,7 @@
 	PyMac_PRECHECK(VDGetFieldPreference);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDGetFieldPreference(ci,
 	                           &fieldFlag);
@@ -18570,7 +18570,7 @@
 	PyMac_PRECHECK(VDPreflightGlobalRect);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      GrafObj_Convert, &theWindow))
 		return NULL;
 	_rv = VDPreflightGlobalRect(ci,
@@ -18593,7 +18593,7 @@
 	PyMac_PRECHECK(VDSetPlayThruGlobalRect);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      GrafObj_Convert, &theWindow))
 		return NULL;
 	_rv = VDSetPlayThruGlobalRect(ci,
@@ -18615,7 +18615,7 @@
 	PyMac_PRECHECK(VDSetBlackLevelValue);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDSetBlackLevelValue(ci,
 	                           &blackLevel);
@@ -18635,7 +18635,7 @@
 	PyMac_PRECHECK(VDGetBlackLevelValue);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDGetBlackLevelValue(ci,
 	                           &blackLevel);
@@ -18655,7 +18655,7 @@
 	PyMac_PRECHECK(VDSetWhiteLevelValue);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDSetWhiteLevelValue(ci,
 	                           &whiteLevel);
@@ -18675,7 +18675,7 @@
 	PyMac_PRECHECK(VDGetWhiteLevelValue);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDGetWhiteLevelValue(ci,
 	                           &whiteLevel);
@@ -18701,7 +18701,7 @@
 	PyMac_PRECHECK(VDGetVideoDefaults);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDGetVideoDefaults(ci,
 	                         &blackLevel,
@@ -18733,7 +18733,7 @@
 	PyMac_PRECHECK(VDGetNumberOfInputs);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDGetNumberOfInputs(ci,
 	                          &inputs);
@@ -18754,7 +18754,7 @@
 	PyMac_PRECHECK(VDGetInputFormat);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&h",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &input))
 		return NULL;
 	_rv = VDGetInputFormat(ci,
@@ -18776,7 +18776,7 @@
 	PyMac_PRECHECK(VDSetInput);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&h",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &input))
 		return NULL;
 	_rv = VDSetInput(ci,
@@ -18796,7 +18796,7 @@
 	PyMac_PRECHECK(VDGetInput);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDGetInput(ci,
 	                 &input);
@@ -18816,7 +18816,7 @@
 	PyMac_PRECHECK(VDSetInputStandard);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&h",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &inputStandard))
 		return NULL;
 	_rv = VDSetInputStandard(ci,
@@ -18836,7 +18836,7 @@
 	PyMac_PRECHECK(VDSetupBuffers);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &bufferList))
 		return NULL;
 	_rv = VDSetupBuffers(ci,
@@ -18856,7 +18856,7 @@
 	PyMac_PRECHECK(VDGrabOneFrameAsync);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&h",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &buffer))
 		return NULL;
 	_rv = VDGrabOneFrameAsync(ci,
@@ -18876,7 +18876,7 @@
 	PyMac_PRECHECK(VDDone);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&h",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &buffer))
 		return NULL;
 	_rv = VDDone(ci,
@@ -18901,7 +18901,7 @@
 	PyMac_PRECHECK(VDSetCompression);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&hlll",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_GetOSType, &compressType,
 	                      &depth,
 	                      &spatialQuality,
@@ -18930,7 +18930,7 @@
 	PyMac_PRECHECK(VDCompressOneFrameAsync);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDCompressOneFrameAsync(ci);
 	_res = Py_BuildValue("l",
@@ -18948,7 +18948,7 @@
 	PyMac_PRECHECK(VDGetImageDescription);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &desc))
 		return NULL;
 	_rv = VDGetImageDescription(ci,
@@ -18967,7 +18967,7 @@
 	PyMac_PRECHECK(VDResetCompressSequence);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDResetCompressSequence(ci);
 	_res = Py_BuildValue("l",
@@ -18985,7 +18985,7 @@
 	PyMac_PRECHECK(VDSetCompressionOnOff);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&b",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &state))
 		return NULL;
 	_rv = VDSetCompressionOnOff(ci,
@@ -19005,7 +19005,7 @@
 	PyMac_PRECHECK(VDGetCompressionTypes);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      ResObj_Convert, &h))
 		return NULL;
 	_rv = VDGetCompressionTypes(ci,
@@ -19025,7 +19025,7 @@
 	PyMac_PRECHECK(VDSetTimeBase);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      TimeBaseObj_Convert, &t))
 		return NULL;
 	_rv = VDSetTimeBase(ci,
@@ -19045,7 +19045,7 @@
 	PyMac_PRECHECK(VDSetFrameRate);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_GetFixed, &framesPerSecond))
 		return NULL;
 	_rv = VDSetFrameRate(ci,
@@ -19067,7 +19067,7 @@
 	PyMac_PRECHECK(VDGetDataRate);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDGetDataRate(ci,
 	                    &milliSecPerFrame,
@@ -19091,7 +19091,7 @@
 	PyMac_PRECHECK(VDGetSoundInputDriver);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_GetStr255, soundDriverName))
 		return NULL;
 	_rv = VDGetSoundInputDriver(ci,
@@ -19112,7 +19112,7 @@
 	PyMac_PRECHECK(VDGetDMADepths);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDGetDMADepths(ci,
 	                     &depthArray,
@@ -19134,7 +19134,7 @@
 	PyMac_PRECHECK(VDGetPreferredTimeScale);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDGetPreferredTimeScale(ci,
 	                              &preferred);
@@ -19153,7 +19153,7 @@
 	PyMac_PRECHECK(VDReleaseAsyncBuffers);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDReleaseAsyncBuffers(ci);
 	_res = Py_BuildValue("l",
@@ -19171,7 +19171,7 @@
 	PyMac_PRECHECK(VDSetDataRate);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &bytesPerSecond))
 		return NULL;
 	_rv = VDSetDataRate(ci,
@@ -19193,7 +19193,7 @@
 	PyMac_PRECHECK(VDGetTimeCode);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&ss",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &timeCodeFormat,
 	                      &timeCodeTime))
 		return NULL;
@@ -19217,7 +19217,7 @@
 	PyMac_PRECHECK(VDUseSafeBuffers);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&b",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &useSafeBuffers))
 		return NULL;
 	_rv = VDUseSafeBuffers(ci,
@@ -19238,7 +19238,7 @@
 	PyMac_PRECHECK(VDGetSoundInputSource);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &videoInput))
 		return NULL;
 	_rv = VDGetSoundInputSource(ci,
@@ -19265,7 +19265,7 @@
 	PyMac_PRECHECK(VDGetCompressionTime);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&h",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_GetOSType, &compressionType,
 	                      &depth))
 		return NULL;
@@ -19295,7 +19295,7 @@
 	PyMac_PRECHECK(VDSetPreferredPacketSize);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &preferredPacketSizeInBytes))
 		return NULL;
 	_rv = VDSetPreferredPacketSize(ci,
@@ -19316,7 +19316,7 @@
 	PyMac_PRECHECK(VDSetPreferredImageDimensions);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&ll",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &width,
 	                      &height))
 		return NULL;
@@ -19339,7 +19339,7 @@
 	PyMac_PRECHECK(VDGetPreferredImageDimensions);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &ci))
+	                      CmpInstObj_Convert, &ci))
 		return NULL;
 	_rv = VDGetPreferredImageDimensions(ci,
 	                                    &width,
@@ -19362,7 +19362,7 @@
 	PyMac_PRECHECK(VDGetInputName);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&lO&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &videoInput,
 	                      PyMac_GetStr255, name))
 		return NULL;
@@ -19384,7 +19384,7 @@
 	PyMac_PRECHECK(VDSetDestinationPort);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      GrafObj_Convert, &destPort))
 		return NULL;
 	_rv = VDSetDestinationPort(ci,
@@ -19405,7 +19405,7 @@
 	PyMac_PRECHECK(VDGetDeviceNameAndFlags);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      PyMac_GetStr255, outName))
 		return NULL;
 	_rv = VDGetDeviceNameAndFlags(ci,
@@ -19427,7 +19427,7 @@
 	PyMac_PRECHECK(VDCaptureStateChanging);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &ci,
+	                      CmpInstObj_Convert, &ci,
 	                      &inStateFlags))
 		return NULL;
 	_rv = VDCaptureStateChanging(ci,
@@ -19686,7 +19686,7 @@
 	PyMac_PRECHECK(SGInitialize);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &s))
+	                      CmpInstObj_Convert, &s))
 		return NULL;
 	_rv = SGInitialize(s);
 	_res = Py_BuildValue("l",
@@ -19705,7 +19705,7 @@
 	PyMac_PRECHECK(SGSetDataOutput);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&l",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      PyMac_GetFSSpec, &movieFile,
 	                      &whereFlags))
 		return NULL;
@@ -19728,7 +19728,7 @@
 	PyMac_PRECHECK(SGGetDataOutput);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      PyMac_GetFSSpec, &movieFile))
 		return NULL;
 	_rv = SGGetDataOutput(s,
@@ -19751,7 +19751,7 @@
 	PyMac_PRECHECK(SGSetGWorld);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      GrafObj_Convert, &gp,
 	                      OptResObj_Convert, &gd))
 		return NULL;
@@ -19774,7 +19774,7 @@
 	PyMac_PRECHECK(SGGetGWorld);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &s))
+	                      CmpInstObj_Convert, &s))
 		return NULL;
 	_rv = SGGetGWorld(s,
 	                  &gp,
@@ -19797,7 +19797,7 @@
 	PyMac_PRECHECK(SGNewChannel);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      PyMac_GetOSType, &channelType))
 		return NULL;
 	_rv = SGNewChannel(s,
@@ -19819,7 +19819,7 @@
 	PyMac_PRECHECK(SGDisposeChannel);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      CmpInstObj_Convert, &c))
 		return NULL;
 	_rv = SGDisposeChannel(s,
@@ -19838,7 +19838,7 @@
 	PyMac_PRECHECK(SGStartPreview);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &s))
+	                      CmpInstObj_Convert, &s))
 		return NULL;
 	_rv = SGStartPreview(s);
 	_res = Py_BuildValue("l",
@@ -19855,7 +19855,7 @@
 	PyMac_PRECHECK(SGStartRecord);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &s))
+	                      CmpInstObj_Convert, &s))
 		return NULL;
 	_rv = SGStartRecord(s);
 	_res = Py_BuildValue("l",
@@ -19872,7 +19872,7 @@
 	PyMac_PRECHECK(SGIdle);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &s))
+	                      CmpInstObj_Convert, &s))
 		return NULL;
 	_rv = SGIdle(s);
 	_res = Py_BuildValue("l",
@@ -19889,7 +19889,7 @@
 	PyMac_PRECHECK(SGStop);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &s))
+	                      CmpInstObj_Convert, &s))
 		return NULL;
 	_rv = SGStop(s);
 	_res = Py_BuildValue("l",
@@ -19907,7 +19907,7 @@
 	PyMac_PRECHECK(SGPause);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&b",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      &pause))
 		return NULL;
 	_rv = SGPause(s,
@@ -19928,7 +19928,7 @@
 	PyMac_PRECHECK(SGPrepare);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&bb",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      &prepareForPreview,
 	                      &prepareForRecord))
 		return NULL;
@@ -19949,7 +19949,7 @@
 	PyMac_PRECHECK(SGRelease);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &s))
+	                      CmpInstObj_Convert, &s))
 		return NULL;
 	_rv = SGRelease(s);
 	_res = Py_BuildValue("l",
@@ -19966,7 +19966,7 @@
 	PyMac_PRECHECK(SGGetMovie);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &s))
+	                      CmpInstObj_Convert, &s))
 		return NULL;
 	_rv = SGGetMovie(s);
 	_res = Py_BuildValue("O&",
@@ -19984,7 +19984,7 @@
 	PyMac_PRECHECK(SGSetMaximumRecordTime);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      &ticks))
 		return NULL;
 	_rv = SGSetMaximumRecordTime(s,
@@ -20004,7 +20004,7 @@
 	PyMac_PRECHECK(SGGetMaximumRecordTime);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &s))
+	                      CmpInstObj_Convert, &s))
 		return NULL;
 	_rv = SGGetMaximumRecordTime(s,
 	                             &ticks);
@@ -20024,7 +20024,7 @@
 	PyMac_PRECHECK(SGGetStorageSpaceRemaining);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &s))
+	                      CmpInstObj_Convert, &s))
 		return NULL;
 	_rv = SGGetStorageSpaceRemaining(s,
 	                                 &bytes);
@@ -20044,7 +20044,7 @@
 	PyMac_PRECHECK(SGGetTimeRemaining);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &s))
+	                      CmpInstObj_Convert, &s))
 		return NULL;
 	_rv = SGGetTimeRemaining(s,
 	                         &ticksLeft);
@@ -20067,7 +20067,7 @@
 	PyMac_PRECHECK(SGGrabPict);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&hl",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      PyMac_GetRect, &bounds,
 	                      &offscreenDepth,
 	                      &grabPictFlags))
@@ -20093,7 +20093,7 @@
 	PyMac_PRECHECK(SGGetLastMovieResID);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &s))
+	                      CmpInstObj_Convert, &s))
 		return NULL;
 	_rv = SGGetLastMovieResID(s,
 	                          &resID);
@@ -20113,7 +20113,7 @@
 	PyMac_PRECHECK(SGSetFlags);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      &sgFlags))
 		return NULL;
 	_rv = SGSetFlags(s,
@@ -20133,7 +20133,7 @@
 	PyMac_PRECHECK(SGGetFlags);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &s))
+	                      CmpInstObj_Convert, &s))
 		return NULL;
 	_rv = SGGetFlags(s,
 	                 &sgFlags);
@@ -20154,7 +20154,7 @@
 	PyMac_PRECHECK(SGNewChannelFromComponent);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      CmpObj_Convert, &sgChannelComponent))
 		return NULL;
 	_rv = SGNewChannelFromComponent(s,
@@ -20177,7 +20177,7 @@
 	PyMac_PRECHECK(SGSetSettings);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&l",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      UserDataObj_Convert, &ud,
 	                      &flags))
 		return NULL;
@@ -20200,7 +20200,7 @@
 	PyMac_PRECHECK(SGGetSettings);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      &flags))
 		return NULL;
 	_rv = SGGetSettings(s,
@@ -20224,7 +20224,7 @@
 	PyMac_PRECHECK(SGGetIndChannel);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&h",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      &index))
 		return NULL;
 	_rv = SGGetIndChannel(s,
@@ -20248,7 +20248,7 @@
 	PyMac_PRECHECK(SGUpdate);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      ResObj_Convert, &updateRgn))
 		return NULL;
 	_rv = SGUpdate(s,
@@ -20268,7 +20268,7 @@
 	PyMac_PRECHECK(SGGetPause);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &s))
+	                      CmpInstObj_Convert, &s))
 		return NULL;
 	_rv = SGGetPause(s,
 	                 &paused);
@@ -20290,7 +20290,7 @@
 	PyMac_PRECHECK(SGSetChannelSettings);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&l",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      CmpInstObj_Convert, &c,
 	                      UserDataObj_Convert, &ud,
 	                      &flags))
@@ -20316,7 +20316,7 @@
 	PyMac_PRECHECK(SGGetChannelSettings);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&l",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      CmpInstObj_Convert, &c,
 	                      &flags))
 		return NULL;
@@ -20341,7 +20341,7 @@
 	PyMac_PRECHECK(SGGetMode);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &s))
+	                      CmpInstObj_Convert, &s))
 		return NULL;
 	_rv = SGGetMode(s,
 	                &previewMode,
@@ -20365,7 +20365,7 @@
 	PyMac_PRECHECK(SGSetDataRef);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&l",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      ResObj_Convert, &dataRef,
 	                      PyMac_GetOSType, &dataRefType,
 	                      &whereFlags))
@@ -20391,7 +20391,7 @@
 	PyMac_PRECHECK(SGGetDataRef);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &s))
+	                      CmpInstObj_Convert, &s))
 		return NULL;
 	_rv = SGGetDataRef(s,
 	                   &dataRef,
@@ -20418,7 +20418,7 @@
 	PyMac_PRECHECK(SGNewOutput);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&l",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      ResObj_Convert, &dataRef,
 	                      PyMac_GetOSType, &dataRefType,
 	                      &whereFlags))
@@ -20444,7 +20444,7 @@
 	PyMac_PRECHECK(SGDisposeOutput);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      SGOutputObj_Convert, &sgOut))
 		return NULL;
 	_rv = SGDisposeOutput(s,
@@ -20465,7 +20465,7 @@
 	PyMac_PRECHECK(SGSetOutputFlags);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&l",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      SGOutputObj_Convert, &sgOut,
 	                      &whereFlags))
 		return NULL;
@@ -20488,7 +20488,7 @@
 	PyMac_PRECHECK(SGSetChannelOutput);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      CmpInstObj_Convert, &c,
 	                      SGOutputObj_Convert, &sgOut))
 		return NULL;
@@ -20511,7 +20511,7 @@
 	PyMac_PRECHECK(SGGetDataOutputStorageSpaceRemaining);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      SGOutputObj_Convert, &sgOut))
 		return NULL;
 	_rv = SGGetDataOutputStorageSpaceRemaining(s,
@@ -20534,7 +20534,7 @@
 	PyMac_PRECHECK(SGHandleUpdateEvent);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      PyMac_GetEventRecord, &event))
 		return NULL;
 	_rv = SGHandleUpdateEvent(s,
@@ -20557,7 +20557,7 @@
 	PyMac_PRECHECK(SGSetOutputNextOutput);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      SGOutputObj_Convert, &sgOut,
 	                      SGOutputObj_Convert, &nextOut))
 		return NULL;
@@ -20580,7 +20580,7 @@
 	PyMac_PRECHECK(SGGetOutputNextOutput);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      SGOutputObj_Convert, &sgOut))
 		return NULL;
 	_rv = SGGetOutputNextOutput(s,
@@ -20603,7 +20603,7 @@
 	PyMac_PRECHECK(SGSetOutputMaximumOffset);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      SGOutputObj_Convert, &sgOut,
 	                      PyMac_Getwide, &maxOffset))
 		return NULL;
@@ -20626,7 +20626,7 @@
 	PyMac_PRECHECK(SGGetOutputMaximumOffset);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      SGOutputObj_Convert, &sgOut))
 		return NULL;
 	_rv = SGGetOutputMaximumOffset(s,
@@ -20650,7 +20650,7 @@
 	PyMac_PRECHECK(SGGetOutputDataReference);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      SGOutputObj_Convert, &sgOut))
 		return NULL;
 	_rv = SGGetOutputDataReference(s,
@@ -20678,7 +20678,7 @@
 	PyMac_PRECHECK(SGWriteExtendedMovieData);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&sl",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      CmpInstObj_Convert, &c,
 	                      &p,
 	                      &len))
@@ -20706,7 +20706,7 @@
 	PyMac_PRECHECK(SGGetStorageSpaceRemaining64);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &s))
+	                      CmpInstObj_Convert, &s))
 		return NULL;
 	_rv = SGGetStorageSpaceRemaining64(s,
 	                                   &bytes);
@@ -20727,7 +20727,7 @@
 	PyMac_PRECHECK(SGGetDataOutputStorageSpaceRemaining64);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      SGOutputObj_Convert, &sgOut))
 		return NULL;
 	_rv = SGGetDataOutputStorageSpaceRemaining64(s,
@@ -20752,7 +20752,7 @@
 	PyMac_PRECHECK(SGWriteMovieData);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&sl",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      CmpInstObj_Convert, &c,
 	                      &p,
 	                      &len))
@@ -20778,7 +20778,7 @@
 	PyMac_PRECHECK(SGGetTimeBase);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &s))
+	                      CmpInstObj_Convert, &s))
 		return NULL;
 	_rv = SGGetTimeBase(s,
 	                    &tb);
@@ -20804,7 +20804,7 @@
 	PyMac_PRECHECK(SGAddMovieData);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&slllh",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      CmpInstObj_Convert, &c,
 	                      &p,
 	                      &len,
@@ -20836,7 +20836,7 @@
 	PyMac_PRECHECK(SGChangedSource);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      CmpInstObj_Convert, &c))
 		return NULL;
 	_rv = SGChangedSource(s,
@@ -20863,7 +20863,7 @@
 	PyMac_PRECHECK(SGAddExtendedMovieData);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&slllh",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      CmpInstObj_Convert, &c,
 	                      &p,
 	                      &len,
@@ -20899,7 +20899,7 @@
 	PyMac_PRECHECK(SGAddOutputDataRefToMedia);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&O&",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      SGOutputObj_Convert, &sgOut,
 	                      MediaObj_Convert, &theMedia,
 	                      ResObj_Convert, &desc))
@@ -20923,7 +20923,7 @@
 	PyMac_PRECHECK(SGSetSettingsSummary);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      ResObj_Convert, &summaryText))
 		return NULL;
 	_rv = SGSetSettingsSummary(s,
@@ -21533,7 +21533,7 @@
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
 	                      CmpInstObj_Convert, &c,
-	                      CmpObj_Convert, &owner))
+	                      CmpInstObj_Convert, &owner))
 		return NULL;
 	_rv = SGInitChannel(c,
 	                    owner);
@@ -21615,7 +21615,7 @@
 	PyMac_PRECHECK(SGPanelGetDitl);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &s))
+	                      CmpInstObj_Convert, &s))
 		return NULL;
 	_rv = SGPanelGetDitl(s,
 	                     &ditl);
@@ -21635,7 +21635,7 @@
 	PyMac_PRECHECK(SGPanelGetTitle);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      PyMac_GetStr255, title))
 		return NULL;
 	_rv = SGPanelGetTitle(s,
@@ -21655,7 +21655,7 @@
 	PyMac_PRECHECK(SGPanelCanRun);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      CmpInstObj_Convert, &c))
 		return NULL;
 	_rv = SGPanelCanRun(s,
@@ -21677,7 +21677,7 @@
 	PyMac_PRECHECK(SGPanelInstall);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&h",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      CmpInstObj_Convert, &c,
 	                      DlgObj_Convert, &d,
 	                      &itemOffset))
@@ -21706,7 +21706,7 @@
 	PyMac_PRECHECK(SGPanelEvent);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&hO&",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      CmpInstObj_Convert, &c,
 	                      DlgObj_Convert, &d,
 	                      &itemOffset,
@@ -21739,7 +21739,7 @@
 	PyMac_PRECHECK(SGPanelItem);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&hh",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      CmpInstObj_Convert, &c,
 	                      DlgObj_Convert, &d,
 	                      &itemOffset,
@@ -21767,7 +21767,7 @@
 	PyMac_PRECHECK(SGPanelRemove);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&h",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      CmpInstObj_Convert, &c,
 	                      DlgObj_Convert, &d,
 	                      &itemOffset))
@@ -21791,8 +21791,8 @@
 	PyMac_PRECHECK(SGPanelSetGrabber);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &s,
-	                      CmpObj_Convert, &sg))
+	                      CmpInstObj_Convert, &s,
+	                      CmpInstObj_Convert, &sg))
 		return NULL;
 	_rv = SGPanelSetGrabber(s,
 	                        sg);
@@ -21811,7 +21811,7 @@
 	PyMac_PRECHECK(SGPanelSetResFile);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&h",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      &resRef))
 		return NULL;
 	_rv = SGPanelSetResFile(s,
@@ -21833,7 +21833,7 @@
 	PyMac_PRECHECK(SGPanelGetSettings);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&l",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      CmpInstObj_Convert, &c,
 	                      &flags))
 		return NULL;
@@ -21859,7 +21859,7 @@
 	PyMac_PRECHECK(SGPanelSetSettings);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&O&l",
-	                      CmpObj_Convert, &s,
+	                      CmpInstObj_Convert, &s,
 	                      CmpInstObj_Convert, &c,
 	                      UserDataObj_Convert, &ud,
 	                      &flags))
@@ -21883,7 +21883,7 @@
 	PyMac_PRECHECK(SGPanelValidateInput);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &s))
+	                      CmpInstObj_Convert, &s))
 		return NULL;
 	_rv = SGPanelValidateInput(s,
 	                           &ok);
@@ -21904,7 +21904,7 @@
 	PyMac_PRECHECK(SGPanelGetDITLForSize);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &s))
+	                      CmpInstObj_Convert, &s))
 		return NULL;
 	_rv = SGPanelGetDITLForSize(s,
 	                            &ditl,
@@ -22805,7 +22805,7 @@
 	PyMac_PRECHECK(QTVideoOutputGetCurrentClientName);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &vo,
+	                      CmpInstObj_Convert, &vo,
 	                      PyMac_GetStr255, str))
 		return NULL;
 	_rv = QTVideoOutputGetCurrentClientName(vo,
@@ -22825,7 +22825,7 @@
 	PyMac_PRECHECK(QTVideoOutputSetClientName);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &vo,
+	                      CmpInstObj_Convert, &vo,
 	                      PyMac_GetStr255, str))
 		return NULL;
 	_rv = QTVideoOutputSetClientName(vo,
@@ -22845,7 +22845,7 @@
 	PyMac_PRECHECK(QTVideoOutputGetClientName);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &vo,
+	                      CmpInstObj_Convert, &vo,
 	                      PyMac_GetStr255, str))
 		return NULL;
 	_rv = QTVideoOutputGetClientName(vo,
@@ -22864,7 +22864,7 @@
 	PyMac_PRECHECK(QTVideoOutputBegin);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &vo))
+	                      CmpInstObj_Convert, &vo))
 		return NULL;
 	_rv = QTVideoOutputBegin(vo);
 	_res = Py_BuildValue("l",
@@ -22881,7 +22881,7 @@
 	PyMac_PRECHECK(QTVideoOutputEnd);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &vo))
+	                      CmpInstObj_Convert, &vo))
 		return NULL;
 	_rv = QTVideoOutputEnd(vo);
 	_res = Py_BuildValue("l",
@@ -22899,7 +22899,7 @@
 	PyMac_PRECHECK(QTVideoOutputSetDisplayMode);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &vo,
+	                      CmpInstObj_Convert, &vo,
 	                      &displayModeID))
 		return NULL;
 	_rv = QTVideoOutputSetDisplayMode(vo,
@@ -22919,7 +22919,7 @@
 	PyMac_PRECHECK(QTVideoOutputGetDisplayMode);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &vo))
+	                      CmpInstObj_Convert, &vo))
 		return NULL;
 	_rv = QTVideoOutputGetDisplayMode(vo,
 	                                  &displayModeID);
@@ -22939,7 +22939,7 @@
 	PyMac_PRECHECK(QTVideoOutputGetGWorld);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &vo))
+	                      CmpInstObj_Convert, &vo))
 		return NULL;
 	_rv = QTVideoOutputGetGWorld(vo,
 	                             &gw);
@@ -22960,7 +22960,7 @@
 	PyMac_PRECHECK(QTVideoOutputGetIndSoundOutput);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &vo,
+	                      CmpInstObj_Convert, &vo,
 	                      &index))
 		return NULL;
 	_rv = QTVideoOutputGetIndSoundOutput(vo,
@@ -22982,7 +22982,7 @@
 	PyMac_PRECHECK(QTVideoOutputGetClock);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&",
-	                      CmpObj_Convert, &vo))
+	                      CmpInstObj_Convert, &vo))
 		return NULL;
 	_rv = QTVideoOutputGetClock(vo,
 	                            &clock);
@@ -23002,7 +23002,7 @@
 	PyMac_PRECHECK(QTVideoOutputSetEchoPort);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &vo,
+	                      CmpInstObj_Convert, &vo,
 	                      GrafObj_Convert, &echoPort))
 		return NULL;
 	_rv = QTVideoOutputSetEchoPort(vo,
@@ -23023,7 +23023,7 @@
 	PyMac_PRECHECK(QTVideoOutputGetIndImageDecompressor);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&l",
-	                      CmpObj_Convert, &vo,
+	                      CmpInstObj_Convert, &vo,
 	                      &index))
 		return NULL;
 	_rv = QTVideoOutputGetIndImageDecompressor(vo,
@@ -23045,7 +23045,7 @@
 	PyMac_PRECHECK(QTVideoOutputBaseSetEchoPort);
 #endif
 	if (!PyArg_ParseTuple(_args, "O&O&",
-	                      CmpObj_Convert, &vo,
+	                      CmpInstObj_Convert, &vo,
 	                      GrafObj_Convert, &echoPort))
 		return NULL;
 	_rv = QTVideoOutputBaseSetEchoPort(vo,
diff -ur Mac/Modules/qt/qtsupport.py.orig Mac/Modules/qt/qtsupport.py
--- Mac/Modules/qt/qtsupport.py.orig	2004-07-18 02:16:08.000000000 -0400
+++ Mac/Modules/qt/qtsupport.py	2007-10-28 19:43:23.000000000 -0400
@@ -135,19 +135,22 @@
 CompressorComponent = OpaqueByValueType('CompressorComponent', 'CmpObj')
 DecompressorComponent = OpaqueByValueType('DecompressorComponent', 'CmpObj')
 CodecComponent = OpaqueByValueType('CodecComponent', 'CmpObj')
-GraphicsImportComponent = OpaqueByValueType('GraphicsImportComponent', 'CmpObj')
-GraphicsExportComponent = OpaqueByValueType('GraphicsExportComponent', 'CmpObj')
-ImageTranscoderComponent = OpaqueByValueType('ImageTranscoderComponent', 'CmpObj')
-DataCodecComponent = OpaqueByValueType('DataCodecComponent', 'CmpObj')
-GraphicImageMovieImportComponent = OpaqueByValueType('GraphicImageMovieImportComponent', 'CmpObj')
-MovieExportComponent = OpaqueByValueType('MovieExportComponent', 'CmpObj')
-MovieImportComponent = OpaqueByValueType('MovieImportComponent', 'CmpObj')
-QTVideoOutputComponent = OpaqueByValueType('QTVideoOutputComponent', 'CmpObj')
-SeqGrabComponent = OpaqueByValueType('SeqGrabComponent', 'CmpObj')
-TextExportComponent = OpaqueByValueType('TextExportComponent', 'CmpObj')
-TweenerComponent = OpaqueByValueType('TweenerComponent', 'CmpObj')
-pnotComponent = OpaqueByValueType('pnotComponent', 'CmpObj')
-VideoDigitizerComponent = OpaqueByValueType('VideoDigitizerComponent', 'CmpObj')
+
+# Despite their names, these are all ComponentInstance types
+GraphicsImportComponent = OpaqueByValueType('GraphicsImportComponent', 'CmpInstObj')
+GraphicsExportComponent = OpaqueByValueType('GraphicsExportComponent', 'CmpInstObj')
+ImageTranscoderComponent = OpaqueByValueType('ImageTranscoderComponent', 'CmpInstObj')
+MovieImportComponent = OpaqueByValueType('MovieImportComponent', 'CmpInstObj')
+MovieExportComponent = OpaqueByValueType('MovieExportComponent', 'CmpInstObj')
+TextExportComponent = OpaqueByValueType('TextExportComponent', 'CmpInstObj')
+GraphicImageMovieImportComponent = OpaqueByValueType('GraphicImageMovieImportComponent', 'CmpInstObj')
+pnotComponent = OpaqueByValueType('pnotComponent', 'CmpInstObj')
+# DataCompressorComponent, DataDecompressorComponent would go here
+DataCodecComponent = OpaqueByValueType('DataCodecComponent', 'CmpInstObj')
+TweenerComponent = OpaqueByValueType('TweenerComponent', 'CmpInstObj')
+QTVideoOutputComponent = OpaqueByValueType('QTVideoOutputComponent', 'CmpInstObj')
+SeqGrabComponent = OpaqueByValueType('SeqGrabComponent', 'CmpInstObj')
+VideoDigitizerComponent = OpaqueByValueType('VideoDigitizerComponent', 'CmpInstObj')
 
 ComponentInstance = OpaqueByValueType('ComponentInstance', 'CmpInstObj')
 MediaHandler = OpaqueByValueType('MediaHandler', 'CmpInstObj')