CONST -> const

3 files changed, 64 insertions, 64 deletions

diff --git a/generic/tclOO.decls b/generic/tclOO.decls
index 1868397..dd33f14 100644
--- a/generic/tclOO.decls
+++ b/generic/tclOO.decls
@@ -1,5 +1,5 @@
 # -*- tcl -*-
-# $Id: tclOO.decls,v 1.3 2008/07/24 22:57:56 nijtmans Exp $
+# $Id: tclOO.decls,v 1.4 2008/10/17 18:42:12 nijtmans Exp $
 
 # public API
 library tclOO
@@ -8,8 +8,8 @@ hooks tclOOInt
 
 declare 0 generic {
     Tcl_Object Tcl_CopyObjectInstance(Tcl_Interp *interp,
-	    Tcl_Object sourceObject, CONST char *targetName,
-	    CONST char *targetNamespaceName)
+	    Tcl_Object sourceObject, const char *targetName,
+	    const char *targetNamespaceName)
 }
 declare 1 generic {
     Tcl_Object Tcl_GetClassAsObject(Tcl_Class clazz)
@@ -36,7 +36,7 @@ declare 8 generic {
     int Tcl_MethodIsPublic(Tcl_Method method)
 }
 declare 9 generic {
-    int Tcl_MethodIsType(Tcl_Method method, CONST Tcl_MethodType *typePtr,
+    int Tcl_MethodIsType(Tcl_Method method, const Tcl_MethodType *typePtr,
 	    ClientData *clientDataPtr)
 }
 declare 10 generic {
@@ -44,18 +44,18 @@ declare 10 generic {
 }
 declare 11 generic {
     Tcl_Method Tcl_NewInstanceMethod(Tcl_Interp *interp, Tcl_Object object,
-	    Tcl_Obj *nameObj, int isPublic, CONST Tcl_MethodType *typePtr,
+	    Tcl_Obj *nameObj, int isPublic, const Tcl_MethodType *typePtr,
 	    ClientData clientData)
 }
 declare 12 generic {
     Tcl_Method Tcl_NewMethod(Tcl_Interp *interp, Tcl_Class cls,
-	    Tcl_Obj *nameObj, int isPublic, CONST Tcl_MethodType *typePtr,
+	    Tcl_Obj *nameObj, int isPublic, const Tcl_MethodType *typePtr,
 	    ClientData clientData)
 }
 declare 13 generic {
     Tcl_Object Tcl_NewObjectInstance(Tcl_Interp *interp, Tcl_Class cls,
-	    CONST char *nameStr, CONST char *nsNameStr, int objc,
-	    Tcl_Obj *CONST *objv, int skip)
+	    const char *nameStr, const char *nsNameStr, int objc,
+	    Tcl_Obj *const *objv, int skip)
 }
 declare 14 generic {
     int Tcl_ObjectDeleted(Tcl_Object object)
@@ -74,23 +74,23 @@ declare 18 generic {
 }
 declare 19 generic {
     ClientData Tcl_ClassGetMetadata(Tcl_Class clazz,
-	    CONST Tcl_ObjectMetadataType *typePtr)
+	    const Tcl_ObjectMetadataType *typePtr)
 }
 declare 20 generic {
     void Tcl_ClassSetMetadata(Tcl_Class clazz,
-	    CONST Tcl_ObjectMetadataType *typePtr, ClientData metadata)
+	    const Tcl_ObjectMetadataType *typePtr, ClientData metadata)
 }
 declare 21 generic {
     ClientData Tcl_ObjectGetMetadata(Tcl_Object object,
-	    CONST Tcl_ObjectMetadataType *typePtr)
+	    const Tcl_ObjectMetadataType *typePtr)
 }
 declare 22 generic {
     void Tcl_ObjectSetMetadata(Tcl_Object object,
-	    CONST Tcl_ObjectMetadataType *typePtr, ClientData metadata)
+	    const Tcl_ObjectMetadataType *typePtr, ClientData metadata)
 }
 declare 23 generic {
     int Tcl_ObjectContextInvokeNext(Tcl_Interp *interp,
-	    Tcl_ObjectContext context, int objc, Tcl_Obj *CONST *objv,
+	    Tcl_ObjectContext context, int objc, Tcl_Obj *const *objv,
 	    int skip)
 }
 declare 24 generic {
@@ -118,13 +118,13 @@ declare 0 generic {
 declare 1 generic {
     Tcl_Method TclOOMakeProcInstanceMethod(Tcl_Interp *interp, Object *oPtr,
 	    int flags, Tcl_Obj *nameObj, Tcl_Obj *argsObj, Tcl_Obj *bodyObj,
-	    CONST Tcl_MethodType *typePtr, ClientData clientData,
+	    const Tcl_MethodType *typePtr, ClientData clientData,
 	    Proc **procPtrPtr)
 }
 declare 2 generic {
     Tcl_Method TclOOMakeProcMethod(Tcl_Interp *interp, Class *clsPtr,
-	    int flags, Tcl_Obj *nameObj, CONST char *namePtr,
-	    Tcl_Obj *argsObj, Tcl_Obj *bodyObj, CONST Tcl_MethodType *typePtr,
+	    int flags, Tcl_Obj *nameObj, const char *namePtr,
+	    Tcl_Obj *argsObj, Tcl_Obj *bodyObj, const Tcl_MethodType *typePtr,
 	    ClientData clientData, Proc **procPtrPtr)
 }
 declare 3 generic {
@@ -139,7 +139,7 @@ declare 4 generic {
 }
 declare 5 generic {
     int TclOOObjectCmdCore(Object *oPtr, Tcl_Interp *interp, int objc,
-	    Tcl_Obj *CONST *objv, int publicOnly, Class *startCls)
+	    Tcl_Obj *const *objv, int publicOnly, Class *startCls)
 }
 declare 6 generic {
     int TclOOIsReachable(Class *targetPtr, Class *startPtr)
@@ -169,21 +169,21 @@ declare 10 generic {
 declare 11 generic {
     int TclOOInvokeObject(Tcl_Interp *interp, Tcl_Object object,
 	    Tcl_Class startCls, int publicPrivate, int objc,
-	    Tcl_Obj *CONST *objv)
+	    Tcl_Obj *const *objv)
 }
 declare 12 generic {
     void TclOOObjectSetFilters(Object *oPtr, int numFilters,
-	    Tcl_Obj *CONST *filters)
+	    Tcl_Obj *const *filters)
 }
 declare 13 generic {
     void TclOOClassSetFilters(Tcl_Interp *interp, Class *classPtr,
-	    int numFilters, Tcl_Obj *CONST *filters)
+	    int numFilters, Tcl_Obj *const *filters)
 }
 declare 14 generic {
     void TclOOObjectSetMixins(Object *oPtr, int numMixins,
-	    Class *CONST *mixins)
+	    Class *const *mixins)
 }
 declare 15 generic {
     void TclOOClassSetMixins(Tcl_Interp *interp, Class *classPtr,
-	    int numMixins, Class *CONST *mixins)
+	    int numMixins, Class *const *mixins)
 }
diff --git a/generic/tclOODecls.h b/generic/tclOODecls.h
index c86267c..31f807d 100644
--- a/generic/tclOODecls.h
+++ b/generic/tclOODecls.h
@@ -1,5 +1,5 @@
 /*
- * $Id: tclOODecls.h,v 1.8 2008/07/24 22:57:57 nijtmans Exp $
+ * $Id: tclOODecls.h,v 1.9 2008/10/17 18:42:12 nijtmans Exp $
  *
  * This file is (mostly) automatically generated from tclOO.decls.
  */
@@ -46,8 +46,8 @@ extern const char *TclOOInitializeStubs(Tcl_Interp *, const char *version);
 /* 0 */
 EXTERN Tcl_Object	Tcl_CopyObjectInstance (Tcl_Interp * interp, 
 				Tcl_Object sourceObject, 
-				CONST char * targetName, 
-				CONST char * targetNamespaceName);
+				const char * targetName, 
+				const char * targetNamespaceName);
 #endif
 #ifndef Tcl_GetClassAsObject_TCL_DECLARED
 #define Tcl_GetClassAsObject_TCL_DECLARED
@@ -94,7 +94,7 @@ EXTERN int		Tcl_MethodIsPublic (Tcl_Method method);
 #define Tcl_MethodIsType_TCL_DECLARED
 /* 9 */
 EXTERN int		Tcl_MethodIsType (Tcl_Method method, 
-				CONST Tcl_MethodType * typePtr, 
+				const Tcl_MethodType * typePtr, 
 				ClientData * clientDataPtr);
 #endif
 #ifndef Tcl_MethodName_TCL_DECLARED
@@ -107,7 +107,7 @@ EXTERN Tcl_Obj *	Tcl_MethodName (Tcl_Method method);
 /* 11 */
 EXTERN Tcl_Method	Tcl_NewInstanceMethod (Tcl_Interp * interp, 
 				Tcl_Object object, Tcl_Obj * nameObj, 
-				int isPublic, CONST Tcl_MethodType * typePtr, 
+				int isPublic, const Tcl_MethodType * typePtr, 
 				ClientData clientData);
 #endif
 #ifndef Tcl_NewMethod_TCL_DECLARED
@@ -115,16 +115,16 @@ EXTERN Tcl_Method	Tcl_NewInstanceMethod (Tcl_Interp * interp,
 /* 12 */
 EXTERN Tcl_Method	Tcl_NewMethod (Tcl_Interp * interp, Tcl_Class cls, 
 				Tcl_Obj * nameObj, int isPublic, 
-				CONST Tcl_MethodType * typePtr, 
+				const Tcl_MethodType * typePtr, 
 				ClientData clientData);
 #endif
 #ifndef Tcl_NewObjectInstance_TCL_DECLARED
 #define Tcl_NewObjectInstance_TCL_DECLARED
 /* 13 */
 EXTERN Tcl_Object	Tcl_NewObjectInstance (Tcl_Interp * interp, 
-				Tcl_Class cls, CONST char * nameStr, 
-				CONST char * nsNameStr, int objc, 
-				Tcl_Obj *CONST * objv, int skip);
+				Tcl_Class cls, const char * nameStr, 
+				const char * nsNameStr, int objc, 
+				Tcl_Obj *const * objv, int skip);
 #endif
 #ifndef Tcl_ObjectDeleted_TCL_DECLARED
 #define Tcl_ObjectDeleted_TCL_DECLARED
@@ -157,26 +157,26 @@ EXTERN int		Tcl_ObjectContextSkippedArgs (
 #define Tcl_ClassGetMetadata_TCL_DECLARED
 /* 19 */
 EXTERN ClientData	Tcl_ClassGetMetadata (Tcl_Class clazz, 
-				CONST Tcl_ObjectMetadataType * typePtr);
+				const Tcl_ObjectMetadataType * typePtr);
 #endif
 #ifndef Tcl_ClassSetMetadata_TCL_DECLARED
 #define Tcl_ClassSetMetadata_TCL_DECLARED
 /* 20 */
 EXTERN void		Tcl_ClassSetMetadata (Tcl_Class clazz, 
-				CONST Tcl_ObjectMetadataType * typePtr, 
+				const Tcl_ObjectMetadataType * typePtr, 
 				ClientData metadata);
 #endif
 #ifndef Tcl_ObjectGetMetadata_TCL_DECLARED
 #define Tcl_ObjectGetMetadata_TCL_DECLARED
 /* 21 */
 EXTERN ClientData	Tcl_ObjectGetMetadata (Tcl_Object object, 
-				CONST Tcl_ObjectMetadataType * typePtr);
+				const Tcl_ObjectMetadataType * typePtr);
 #endif
 #ifndef Tcl_ObjectSetMetadata_TCL_DECLARED
 #define Tcl_ObjectSetMetadata_TCL_DECLARED
 /* 22 */
 EXTERN void		Tcl_ObjectSetMetadata (Tcl_Object object, 
-				CONST Tcl_ObjectMetadataType * typePtr, 
+				const Tcl_ObjectMetadataType * typePtr, 
 				ClientData metadata);
 #endif
 #ifndef Tcl_ObjectContextInvokeNext_TCL_DECLARED
@@ -184,7 +184,7 @@ EXTERN void		Tcl_ObjectSetMetadata (Tcl_Object object,
 /* 23 */
 EXTERN int		Tcl_ObjectContextInvokeNext (Tcl_Interp * interp, 
 				Tcl_ObjectContext context, int objc, 
-				Tcl_Obj *CONST * objv, int skip);
+				Tcl_Obj *const * objv, int skip);
 #endif
 #ifndef Tcl_ObjectGetMethodNameMapper_TCL_DECLARED
 #define Tcl_ObjectGetMethodNameMapper_TCL_DECLARED
@@ -219,7 +219,7 @@ typedef struct TclOOStubs {
     int magic;
     CONST struct TclOOStubHooks *hooks;
 
-    Tcl_Object (*tcl_CopyObjectInstance) (Tcl_Interp * interp, Tcl_Object sourceObject, CONST char * targetName, CONST char * targetNamespaceName); /* 0 */
+    Tcl_Object (*tcl_CopyObjectInstance) (Tcl_Interp * interp, Tcl_Object sourceObject, const char * targetName, const char * targetNamespaceName); /* 0 */
     Tcl_Object (*tcl_GetClassAsObject) (Tcl_Class clazz); /* 1 */
     Tcl_Class (*tcl_GetObjectAsClass) (Tcl_Object object); /* 2 */
     Tcl_Command (*tcl_GetObjectCommand) (Tcl_Object object); /* 3 */
@@ -228,21 +228,21 @@ typedef struct TclOOStubs {
     Tcl_Class (*tcl_MethodDeclarerClass) (Tcl_Method method); /* 6 */
     Tcl_Object (*tcl_MethodDeclarerObject) (Tcl_Method method); /* 7 */
     int (*tcl_MethodIsPublic) (Tcl_Method method); /* 8 */
-    int (*tcl_MethodIsType) (Tcl_Method method, CONST Tcl_MethodType * typePtr, ClientData * clientDataPtr); /* 9 */
+    int (*tcl_MethodIsType) (Tcl_Method method, const Tcl_MethodType * typePtr, ClientData * clientDataPtr); /* 9 */
     Tcl_Obj * (*tcl_MethodName) (Tcl_Method method); /* 10 */
-    Tcl_Method (*tcl_NewInstanceMethod) (Tcl_Interp * interp, Tcl_Object object, Tcl_Obj * nameObj, int isPublic, CONST Tcl_MethodType * typePtr, ClientData clientData); /* 11 */
-    Tcl_Method (*tcl_NewMethod) (Tcl_Interp * interp, Tcl_Class cls, Tcl_Obj * nameObj, int isPublic, CONST Tcl_MethodType * typePtr, ClientData clientData); /* 12 */
-    Tcl_Object (*tcl_NewObjectInstance) (Tcl_Interp * interp, Tcl_Class cls, CONST char * nameStr, CONST char * nsNameStr, int objc, Tcl_Obj *CONST * objv, int skip); /* 13 */
+    Tcl_Method (*tcl_NewInstanceMethod) (Tcl_Interp * interp, Tcl_Object object, Tcl_Obj * nameObj, int isPublic, const Tcl_MethodType * typePtr, ClientData clientData); /* 11 */
+    Tcl_Method (*tcl_NewMethod) (Tcl_Interp * interp, Tcl_Class cls, Tcl_Obj * nameObj, int isPublic, const Tcl_MethodType * typePtr, ClientData clientData); /* 12 */
+    Tcl_Object (*tcl_NewObjectInstance) (Tcl_Interp * interp, Tcl_Class cls, const char * nameStr, const char * nsNameStr, int objc, Tcl_Obj *const * objv, int skip); /* 13 */
     int (*tcl_ObjectDeleted) (Tcl_Object object); /* 14 */
     int (*tcl_ObjectContextIsFiltering) (Tcl_ObjectContext context); /* 15 */
     Tcl_Method (*tcl_ObjectContextMethod) (Tcl_ObjectContext context); /* 16 */
     Tcl_Object (*tcl_ObjectContextObject) (Tcl_ObjectContext context); /* 17 */
     int (*tcl_ObjectContextSkippedArgs) (Tcl_ObjectContext context); /* 18 */
-    ClientData (*tcl_ClassGetMetadata) (Tcl_Class clazz, CONST Tcl_ObjectMetadataType * typePtr); /* 19 */
-    void (*tcl_ClassSetMetadata) (Tcl_Class clazz, CONST Tcl_ObjectMetadataType * typePtr, ClientData metadata); /* 20 */
-    ClientData (*tcl_ObjectGetMetadata) (Tcl_Object object, CONST Tcl_ObjectMetadataType * typePtr); /* 21 */
-    void (*tcl_ObjectSetMetadata) (Tcl_Object object, CONST Tcl_ObjectMetadataType * typePtr, ClientData metadata); /* 22 */
-    int (*tcl_ObjectContextInvokeNext) (Tcl_Interp * interp, Tcl_ObjectContext context, int objc, Tcl_Obj *CONST * objv, int skip); /* 23 */
+    ClientData (*tcl_ClassGetMetadata) (Tcl_Class clazz, const Tcl_ObjectMetadataType * typePtr); /* 19 */
+    void (*tcl_ClassSetMetadata) (Tcl_Class clazz, const Tcl_ObjectMetadataType * typePtr, ClientData metadata); /* 20 */
+    ClientData (*tcl_ObjectGetMetadata) (Tcl_Object object, const Tcl_ObjectMetadataType * typePtr); /* 21 */
+    void (*tcl_ObjectSetMetadata) (Tcl_Object object, const Tcl_ObjectMetadataType * typePtr, ClientData metadata); /* 22 */
+    int (*tcl_ObjectContextInvokeNext) (Tcl_Interp * interp, Tcl_ObjectContext context, int objc, Tcl_Obj *const * objv, int skip); /* 23 */
     Tcl_ObjectMapMethodNameProc (*tcl_ObjectGetMethodNameMapper) (Tcl_Object object); /* 24 */
     void (*tcl_ObjectSetMethodNameMapper) (Tcl_Object object, Tcl_ObjectMapMethodNameProc mapMethodNameProc); /* 25 */
     void (*tcl_ClassSetConstructor) (Tcl_Interp * interp, Tcl_Class clazz, Tcl_Method method); /* 26 */
diff --git a/generic/tclOOIntDecls.h b/generic/tclOOIntDecls.h
index 680aa61..49aa7de 100644
--- a/generic/tclOOIntDecls.h
+++ b/generic/tclOOIntDecls.h
@@ -1,5 +1,5 @@
 /*
- * $Id: tclOOIntDecls.h,v 1.8 2008/07/24 22:57:57 nijtmans Exp $
+ * $Id: tclOOIntDecls.h,v 1.9 2008/10/17 18:42:12 nijtmans Exp $
  *
  * This file is (mostly) automatically generated from tclOO.decls.
  */
@@ -41,7 +41,7 @@ EXTERN Tcl_Object	TclOOGetDefineCmdContext (Tcl_Interp * interp);
 EXTERN Tcl_Method	TclOOMakeProcInstanceMethod (Tcl_Interp * interp, 
 				Object * oPtr, int flags, Tcl_Obj * nameObj, 
 				Tcl_Obj * argsObj, Tcl_Obj * bodyObj, 
-				CONST Tcl_MethodType * typePtr, 
+				const Tcl_MethodType * typePtr, 
 				ClientData clientData, Proc ** procPtrPtr);
 #endif
 #ifndef TclOOMakeProcMethod_TCL_DECLARED
@@ -49,9 +49,9 @@ EXTERN Tcl_Method	TclOOMakeProcInstanceMethod (Tcl_Interp * interp,
 /* 2 */
 EXTERN Tcl_Method	TclOOMakeProcMethod (Tcl_Interp * interp, 
 				Class * clsPtr, int flags, Tcl_Obj * nameObj, 
-				CONST char * namePtr, Tcl_Obj * argsObj, 
+				const char * namePtr, Tcl_Obj * argsObj, 
 				Tcl_Obj * bodyObj, 
-				CONST Tcl_MethodType * typePtr, 
+				const Tcl_MethodType * typePtr, 
 				ClientData clientData, Proc ** procPtrPtr);
 #endif
 #ifndef TclOONewProcInstanceMethod_TCL_DECLARED
@@ -75,7 +75,7 @@ EXTERN Method *		TclOONewProcMethod (Tcl_Interp * interp,
 /* 5 */
 EXTERN int		TclOOObjectCmdCore (Object * oPtr, 
 				Tcl_Interp * interp, int objc, 
-				Tcl_Obj *CONST * objv, int publicOnly, 
+				Tcl_Obj *const * objv, int publicOnly, 
 				Class * startCls);
 #endif
 #ifndef TclOOIsReachable_TCL_DECLARED
@@ -128,33 +128,33 @@ EXTERN Tcl_Method	TclOONewProcMethodEx (Tcl_Interp * interp,
 EXTERN int		TclOOInvokeObject (Tcl_Interp * interp, 
 				Tcl_Object object, Tcl_Class startCls, 
 				int publicPrivate, int objc, 
-				Tcl_Obj *CONST * objv);
+				Tcl_Obj *const * objv);
 #endif
 #ifndef TclOOObjectSetFilters_TCL_DECLARED
 #define TclOOObjectSetFilters_TCL_DECLARED
 /* 12 */
 EXTERN void		TclOOObjectSetFilters (Object * oPtr, int numFilters, 
-				Tcl_Obj *CONST * filters);
+				Tcl_Obj *const * filters);
 #endif
 #ifndef TclOOClassSetFilters_TCL_DECLARED
 #define TclOOClassSetFilters_TCL_DECLARED
 /* 13 */
 EXTERN void		TclOOClassSetFilters (Tcl_Interp * interp, 
 				Class * classPtr, int numFilters, 
-				Tcl_Obj *CONST * filters);
+				Tcl_Obj *const * filters);
 #endif
 #ifndef TclOOObjectSetMixins_TCL_DECLARED
 #define TclOOObjectSetMixins_TCL_DECLARED
 /* 14 */
 EXTERN void		TclOOObjectSetMixins (Object * oPtr, int numMixins, 
-				Class *CONST * mixins);
+				Class *const * mixins);
 #endif
 #ifndef TclOOClassSetMixins_TCL_DECLARED
 #define TclOOClassSetMixins_TCL_DECLARED
 /* 15 */
 EXTERN void		TclOOClassSetMixins (Tcl_Interp * interp, 
 				Class * classPtr, int numMixins, 
-				Class *CONST * mixins);
+				Class *const * mixins);
 #endif
 
 typedef struct TclOOIntStubs {
@@ -162,21 +162,21 @@ typedef struct TclOOIntStubs {
     CONST struct TclOOIntStubHooks *hooks;
 
     Tcl_Object (*tclOOGetDefineCmdContext) (Tcl_Interp * interp); /* 0 */
-    Tcl_Method (*tclOOMakeProcInstanceMethod) (Tcl_Interp * interp, Object * oPtr, int flags, Tcl_Obj * nameObj, Tcl_Obj * argsObj, Tcl_Obj * bodyObj, CONST Tcl_MethodType * typePtr, ClientData clientData, Proc ** procPtrPtr); /* 1 */
-    Tcl_Method (*tclOOMakeProcMethod) (Tcl_Interp * interp, Class * clsPtr, int flags, Tcl_Obj * nameObj, CONST char * namePtr, Tcl_Obj * argsObj, Tcl_Obj * bodyObj, CONST Tcl_MethodType * typePtr, ClientData clientData, Proc ** procPtrPtr); /* 2 */
+    Tcl_Method (*tclOOMakeProcInstanceMethod) (Tcl_Interp * interp, Object * oPtr, int flags, Tcl_Obj * nameObj, Tcl_Obj * argsObj, Tcl_Obj * bodyObj, const Tcl_MethodType * typePtr, ClientData clientData, Proc ** procPtrPtr); /* 1 */
+    Tcl_Method (*tclOOMakeProcMethod) (Tcl_Interp * interp, Class * clsPtr, int flags, Tcl_Obj * nameObj, const char * namePtr, Tcl_Obj * argsObj, Tcl_Obj * bodyObj, const Tcl_MethodType * typePtr, ClientData clientData, Proc ** procPtrPtr); /* 2 */
     Method * (*tclOONewProcInstanceMethod) (Tcl_Interp * interp, Object * oPtr, int flags, Tcl_Obj * nameObj, Tcl_Obj * argsObj, Tcl_Obj * bodyObj, ProcedureMethod ** pmPtrPtr); /* 3 */
     Method * (*tclOONewProcMethod) (Tcl_Interp * interp, Class * clsPtr, int flags, Tcl_Obj * nameObj, Tcl_Obj * argsObj, Tcl_Obj * bodyObj, ProcedureMethod ** pmPtrPtr); /* 4 */
-    int (*tclOOObjectCmdCore) (Object * oPtr, Tcl_Interp * interp, int objc, Tcl_Obj *CONST * objv, int publicOnly, Class * startCls); /* 5 */
+    int (*tclOOObjectCmdCore) (Object * oPtr, Tcl_Interp * interp, int objc, Tcl_Obj *const * objv, int publicOnly, Class * startCls); /* 5 */
     int (*tclOOIsReachable) (Class * targetPtr, Class * startPtr); /* 6 */
     Method * (*tclOONewForwardMethod) (Tcl_Interp * interp, Class * clsPtr, int isPublic, Tcl_Obj * nameObj, Tcl_Obj * prefixObj); /* 7 */
     Method * (*tclOONewForwardInstanceMethod) (Tcl_Interp * interp, Object * oPtr, int isPublic, Tcl_Obj * nameObj, Tcl_Obj * prefixObj); /* 8 */
     Tcl_Method (*tclOONewProcInstanceMethodEx) (Tcl_Interp * interp, Tcl_Object oPtr, TclOO_PreCallProc preCallPtr, TclOO_PostCallProc postCallPtr, ProcErrorProc errProc, ClientData clientData, Tcl_Obj * nameObj, Tcl_Obj * argsObj, Tcl_Obj * bodyObj, int flags, void ** internalTokenPtr); /* 9 */
     Tcl_Method (*tclOONewProcMethodEx) (Tcl_Interp * interp, Tcl_Class clsPtr, TclOO_PreCallProc preCallPtr, TclOO_PostCallProc postCallPtr, ProcErrorProc errProc, ClientData clientData, Tcl_Obj * nameObj, Tcl_Obj * argsObj, Tcl_Obj * bodyObj, int flags, void ** internalTokenPtr); /* 10 */
-    int (*tclOOInvokeObject) (Tcl_Interp * interp, Tcl_Object object, Tcl_Class startCls, int publicPrivate, int objc, Tcl_Obj *CONST * objv); /* 11 */
-    void (*tclOOObjectSetFilters) (Object * oPtr, int numFilters, Tcl_Obj *CONST * filters); /* 12 */
-    void (*tclOOClassSetFilters) (Tcl_Interp * interp, Class * classPtr, int numFilters, Tcl_Obj *CONST * filters); /* 13 */
-    void (*tclOOObjectSetMixins) (Object * oPtr, int numMixins, Class *CONST * mixins); /* 14 */
-    void (*tclOOClassSetMixins) (Tcl_Interp * interp, Class * classPtr, int numMixins, Class *CONST * mixins); /* 15 */
+    int (*tclOOInvokeObject) (Tcl_Interp * interp, Tcl_Object object, Tcl_Class startCls, int publicPrivate, int objc, Tcl_Obj *const * objv); /* 11 */
+    void (*tclOOObjectSetFilters) (Object * oPtr, int numFilters, Tcl_Obj *const * filters); /* 12 */
+    void (*tclOOClassSetFilters) (Tcl_Interp * interp, Class * classPtr, int numFilters, Tcl_Obj *const * filters); /* 13 */
+    void (*tclOOObjectSetMixins) (Object * oPtr, int numMixins, Class *const * mixins); /* 14 */
+    void (*tclOOClassSetMixins) (Tcl_Interp * interp, Class * classPtr, int numMixins, Class *const * mixins); /* 15 */
 } TclOOIntStubs;
 
 #if defined(USE_TCLOO_STUBS) && !defined(USE_TCLOO_STUB_PROCS)