From 608b402de7d6d65c3c82aac6ea0129e3a1ac678f Mon Sep 17 00:00:00 2001 From: nijtmans Date: Wed, 5 Nov 2008 23:29:58 +0000 Subject: no need to use CONST in internal header files --- ChangeLog | 2 ++ generic/tkFont.h | 10 +++++----- generic/tkInt.decls | 6 +++--- generic/tkInt.h | 16 ++++++++-------- generic/tkIntDecls.h | 10 +++++----- 5 files changed, 23 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7a13d4..f50c983 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ * unix/tkUnixCursor.c: * unix/tkUnixSend.c: * unix/tkUnixRFont.c: + * generic/tkInt.h: no need to use CONST in internal header files + * generic/tkFont.h * generic/tkInt.decls: CONSTify string and fileName parameters of TkGetBitmapData * generic/tkImgBmap.c: * generic/tkBitmap.c: remove unneccessary type cast diff --git a/generic/tkFont.h b/generic/tkFont.h index 078e151..5a16d01 100644 --- a/generic/tkFont.h +++ b/generic/tkFont.h @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkFont.h,v 1.12 2008/11/02 09:54:02 nijtmans Exp $ + * RCS: @(#) $Id: tkFont.h,v 1.13 2008/11/05 23:29:58 nijtmans Exp $ */ #ifndef _TKFONT @@ -197,12 +197,12 @@ typedef struct TkXLFDAttributes { MODULE_SCOPE int TkFontParseXLFD(const char *string, TkFontAttributes *faPtr, TkXLFDAttributes *xaPtr); -MODULE_SCOPE CONST86 char *CONST86 * TkFontGetAliasList(const char *faceName); -MODULE_SCOPE CONST86 char *CONST86 *CONST86 * TkFontGetFallbacks(void); +MODULE_SCOPE const char *const * TkFontGetAliasList(const char *faceName); +MODULE_SCOPE const char *const *const * TkFontGetFallbacks(void); MODULE_SCOPE int TkFontGetPixels(Tk_Window tkwin, int size); MODULE_SCOPE int TkFontGetPoints(Tk_Window tkwin, int size); -MODULE_SCOPE CONST86 char *CONST86 * TkFontGetGlobalClass(void); -MODULE_SCOPE CONST86 char *CONST86 * TkFontGetSymbolClass(void); +MODULE_SCOPE const char *const * TkFontGetGlobalClass(void); +MODULE_SCOPE const char *const * TkFontGetSymbolClass(void); MODULE_SCOPE int TkCreateNamedFont(Tcl_Interp *interp, Tk_Window tkwin, const char *name, TkFontAttributes *faPtr); MODULE_SCOPE int TkDeleteNamedFont(Tcl_Interp *interp, diff --git a/generic/tkInt.decls b/generic/tkInt.decls index 3e09fd4..6864169 100644 --- a/generic/tkInt.decls +++ b/generic/tkInt.decls @@ -10,7 +10,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: tkInt.decls,v 1.48 2008/11/05 22:48:58 nijtmans Exp $ +# RCS: @(#) $Id: tkInt.decls,v 1.49 2008/11/05 23:29:58 nijtmans Exp $ library tk @@ -72,7 +72,7 @@ declare 12 generic { } declare 13 generic { int TkCreateFrame(ClientData clientData, Tcl_Interp *interp, - int argc, CONST86 char *const *argv, int toplevel, const char *appName) + int argc, const char *const *argv, int toplevel, const char *appName) } declare 14 generic { Tk_Window TkCreateMainWindow(Tcl_Interp *interp, @@ -142,7 +142,7 @@ declare 32 generic { Tk_Window tkwin, Tk_Uid string) } declare 33 generic { - CONST84_RETURN char *TkGetDefaultScreenName(Tcl_Interp *interp, + const char *TkGetDefaultScreenName(Tcl_Interp *interp, const char *screenName) } declare 34 generic { diff --git a/generic/tkInt.h b/generic/tkInt.h index 77bd915..e2d7df3 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: $Id: tkInt.h,v 1.90 2008/10/30 21:39:16 nijtmans Exp $ + * RCS: $Id: tkInt.h,v 1.91 2008/11/05 23:29:58 nijtmans Exp $ */ #ifndef _TKINT @@ -1127,7 +1127,7 @@ MODULE_SCOPE int TkCanvasGetCoordObj(Tcl_Interp *interp, MODULE_SCOPE int TkCanvasDashParseProc(ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); -MODULE_SCOPE CONST86 char * TkCanvasDashPrintProc(ClientData clientData, +MODULE_SCOPE const char * TkCanvasDashPrintProc(ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); MODULE_SCOPE int TkGetDoublePixels(Tcl_Interp *interp, Tk_Window tkwin, @@ -1135,19 +1135,19 @@ MODULE_SCOPE int TkGetDoublePixels(Tcl_Interp *interp, Tk_Window tkwin, MODULE_SCOPE int TkOffsetParseProc(ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); -MODULE_SCOPE CONST86 char * TkOffsetPrintProc(ClientData clientData, +MODULE_SCOPE const char * TkOffsetPrintProc(ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); MODULE_SCOPE int TkOrientParseProc(ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); -MODULE_SCOPE CONST86 char * TkOrientPrintProc(ClientData clientData, +MODULE_SCOPE const char * TkOrientPrintProc(ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); MODULE_SCOPE int TkPixelParseProc(ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); -MODULE_SCOPE CONST86 char * TkPixelPrintProc(ClientData clientData, +MODULE_SCOPE const char * TkPixelPrintProc(ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); MODULE_SCOPE int TkPostscriptImage(Tcl_Interp *interp, Tk_Window tkwin, @@ -1156,19 +1156,19 @@ MODULE_SCOPE int TkPostscriptImage(Tcl_Interp *interp, Tk_Window tkwin, MODULE_SCOPE int TkSmoothParseProc(ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *recordPtr, int offset); -MODULE_SCOPE CONST86 char * TkSmoothPrintProc(ClientData clientData, +MODULE_SCOPE const char * TkSmoothPrintProc(ClientData clientData, Tk_Window tkwin, char *recordPtr, int offset, Tcl_FreeProc **freeProcPtr); MODULE_SCOPE int TkStateParseProc(ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); -MODULE_SCOPE CONST86 char * TkStatePrintProc(ClientData clientData, +MODULE_SCOPE const char * TkStatePrintProc(ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); MODULE_SCOPE int TkTileParseProc(ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); -MODULE_SCOPE CONST86 char * TkTilePrintProc(ClientData clientData, Tk_Window tkwin, +MODULE_SCOPE const char * TkTilePrintProc(ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); MODULE_SCOPE void TkMapTopFrame(Tk_Window tkwin); diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h index 606b15e..c7e2324 100644 --- a/generic/tkIntDecls.h +++ b/generic/tkIntDecls.h @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkIntDecls.h,v 1.38 2008/11/05 22:48:58 nijtmans Exp $ + * RCS: @(#) $Id: tkIntDecls.h,v 1.39 2008/11/05 23:29:58 nijtmans Exp $ */ #ifndef _TKINTDECLS @@ -121,7 +121,7 @@ EXTERN TkCursor * TkCreateCursorFromData (Tk_Window tkwin, /* 13 */ EXTERN int TkCreateFrame (ClientData clientData, Tcl_Interp * interp, int argc, - CONST86 char *const * argv, int toplevel, + const char *const * argv, int toplevel, const char * appName); #endif #ifndef TkCreateMainWindow_TCL_DECLARED @@ -239,7 +239,7 @@ EXTERN TkCursor * TkGetCursorByName (Tcl_Interp * interp, #ifndef TkGetDefaultScreenName_TCL_DECLARED #define TkGetDefaultScreenName_TCL_DECLARED /* 33 */ -EXTERN CONST84_RETURN char * TkGetDefaultScreenName (Tcl_Interp * interp, +EXTERN const char * TkGetDefaultScreenName (Tcl_Interp * interp, const char * screenName); #endif #ifndef TkGetDisplay_TCL_DECLARED @@ -980,7 +980,7 @@ typedef struct TkIntStubs { int (*tkCopyAndGlobalEval) (Tcl_Interp * interp, char * script); /* 10 */ unsigned long (*tkCreateBindingProcedure) (Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object, const char * eventString, TkBindEvalProc * evalProc, TkBindFreeProc * freeProc, ClientData clientData); /* 11 */ TkCursor * (*tkCreateCursorFromData) (Tk_Window tkwin, const char * source, const char * mask, int width, int height, int xHot, int yHot, XColor fg, XColor bg); /* 12 */ - int (*tkCreateFrame) (ClientData clientData, Tcl_Interp * interp, int argc, CONST86 char *const * argv, int toplevel, const char * appName); /* 13 */ + int (*tkCreateFrame) (ClientData clientData, Tcl_Interp * interp, int argc, const char *const * argv, int toplevel, const char * appName); /* 13 */ Tk_Window (*tkCreateMainWindow) (Tcl_Interp * interp, const char * screenName, const char * baseName); /* 14 */ Time (*tkCurrentTime) (TkDisplay * dispPtr); /* 15 */ void (*tkDeleteAllImages) (TkMainInfo * mainPtr); /* 16 */ @@ -1000,7 +1000,7 @@ typedef struct TkIntStubs { char * (*tkGetBitmapData) (Tcl_Interp * interp, const char * string, const char * fileName, int * widthPtr, int * heightPtr, int * hotXPtr, int * hotYPtr); /* 30 */ void (*tkGetButtPoints) (double p1[], double p2[], double width, int project, double m1[], double m2[]); /* 31 */ TkCursor * (*tkGetCursorByName) (Tcl_Interp * interp, Tk_Window tkwin, Tk_Uid string); /* 32 */ - CONST84_RETURN char * (*tkGetDefaultScreenName) (Tcl_Interp * interp, const char * screenName); /* 33 */ + const char * (*tkGetDefaultScreenName) (Tcl_Interp * interp, const char * screenName); /* 33 */ TkDisplay * (*tkGetDisplay) (Display * display); /* 34 */ int (*tkGetDisplayOf) (Tcl_Interp * interp, int objc, Tcl_Obj *const objv[], Tk_Window * tkwinPtr); /* 35 */ TkWindow * (*tkGetFocusWin) (TkWindow * winPtr); /* 36 */ -- cgit v0.12