From cac34c03ac4f3b143325331ab94c25319c77707b Mon Sep 17 00:00:00 2001 From: nijtmans Date: Wed, 3 Jan 2007 04:10:48 +0000 Subject: various "const" additions in implementation --- generic/tk3d.c | 4 ++-- generic/tkBitmap.c | 4 ++-- generic/tkButton.c | 20 ++++++++++---------- generic/tkColor.c | 4 ++-- generic/tkCursor.c | 4 ++-- generic/tkFont.c | 4 ++-- generic/tkImgPhoto.c | 4 ++-- generic/tkObj.c | 12 ++++++------ 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/generic/tk3d.c b/generic/tk3d.c index cee599f..77c118e 100644 --- a/generic/tk3d.c +++ b/generic/tk3d.c @@ -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: tk3d.c,v 1.16 2005/11/17 10:57:35 dkf Exp $ + * RCS: @(#) $Id: tk3d.c,v 1.17 2007/01/03 04:10:48 nijtmans Exp $ */ #include "tk3d.h" @@ -1321,7 +1321,7 @@ static void InitBorderObj( Tcl_Obj *objPtr) /* The object to convert. */ { - Tcl_ObjType *typePtr; + const Tcl_ObjType *typePtr; /* * Free the old internalRep before setting the new one. diff --git a/generic/tkBitmap.c b/generic/tkBitmap.c index c4900bc..60fce0f 100644 --- a/generic/tkBitmap.c +++ b/generic/tkBitmap.c @@ -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: tkBitmap.c,v 1.15 2006/02/27 11:34:49 dkf Exp $ + * RCS: @(#) $Id: tkBitmap.c,v 1.16 2007/01/03 04:10:55 nijtmans Exp $ */ #include "tkPort.h" @@ -959,7 +959,7 @@ static void InitBitmapObj( Tcl_Obj *objPtr) /* The object to convert. */ { - Tcl_ObjType *typePtr; + const Tcl_ObjType *typePtr; /* * Free the old internalRep before setting the new one. diff --git a/generic/tkButton.c b/generic/tkButton.c index 0b763d1..0af1702 100644 --- a/generic/tkButton.c +++ b/generic/tkButton.c @@ -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: tkButton.c,v 1.24 2005/11/04 11:52:50 dkf Exp $ + * RCS: @(#) $Id: tkButton.c,v 1.25 2007/01/03 04:10:54 nijtmans Exp $ */ #include "tkButton.h" @@ -27,14 +27,14 @@ static Tcl_ThreadDataKey dataKey; * tkButton.h. */ -static char *classNames[] = {"Label", "Button", "Checkbutton", "Radiobutton"}; +static const char *classNames[] = {"Label", "Button", "Checkbutton", "Radiobutton"}; /* * The following table defines the legal values for the -default option. It is * used together with the "enum defaultValue" declaration in tkButton.h. */ -static char *defaultStrings[] = { +static const char *defaultStrings[] = { "active", "disabled", "normal", NULL }; @@ -43,7 +43,7 @@ static char *defaultStrings[] = { * It is used together with the "enum state" declaration in tkButton.h. */ -static char *stateStrings[] = { +static const char *stateStrings[] = { "active", "disabled", "normal", NULL }; @@ -52,7 +52,7 @@ static char *stateStrings[] = { * It is used with the "enum compound" declaration in tkButton.h */ -static char *compoundStrings[] = { +static const char *compoundStrings[] = { "bottom", "center", "left", "none", "right", "top", NULL }; @@ -61,7 +61,7 @@ static char *compoundStrings[] = { * separate table for each of the four widget classes. */ -static Tk_OptionSpec labelOptionSpecs[] = { +static const Tk_OptionSpec labelOptionSpecs[] = { {TK_OPTION_BORDER, "-activebackground", "activeBackground", "Foreground", DEF_BUTTON_ACTIVE_BG_COLOR, -1, Tk_Offset(TkButton, activeBorder), 0, (ClientData) DEF_BUTTON_ACTIVE_BG_MONO, 0}, @@ -146,7 +146,7 @@ static Tk_OptionSpec labelOptionSpecs[] = { {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, 0, 0, 0} }; -static Tk_OptionSpec buttonOptionSpecs[] = { +static const Tk_OptionSpec buttonOptionSpecs[] = { {TK_OPTION_BORDER, "-activebackground", "activeBackground", "Foreground", DEF_BUTTON_ACTIVE_BG_COLOR, -1, Tk_Offset(TkButton, activeBorder), 0, (ClientData) DEF_BUTTON_ACTIVE_BG_MONO, 0}, @@ -247,7 +247,7 @@ static Tk_OptionSpec buttonOptionSpecs[] = { {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, -1, 0, 0, 0} }; -static Tk_OptionSpec checkbuttonOptionSpecs[] = { +static const Tk_OptionSpec checkbuttonOptionSpecs[] = { {TK_OPTION_BORDER, "-activebackground", "activeBackground", "Foreground", DEF_BUTTON_ACTIVE_BG_COLOR, -1, Tk_Offset(TkButton, activeBorder), 0, (ClientData) DEF_BUTTON_ACTIVE_BG_MONO, 0}, @@ -360,7 +360,7 @@ static Tk_OptionSpec checkbuttonOptionSpecs[] = { {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, -1, 0, 0, 0} }; -static Tk_OptionSpec radiobuttonOptionSpecs[] = { +static const Tk_OptionSpec radiobuttonOptionSpecs[] = { {TK_OPTION_BORDER, "-activebackground", "activeBackground", "Foreground", DEF_BUTTON_ACTIVE_BG_COLOR, -1, Tk_Offset(TkButton, activeBorder), 0, (ClientData) DEF_BUTTON_ACTIVE_BG_MONO, 0}, @@ -477,7 +477,7 @@ static Tk_OptionSpec radiobuttonOptionSpecs[] = { * such as TYPE_LABEL, to the option template for that class of widgets. */ -static Tk_OptionSpec *optionSpecs[] = { +static const Tk_OptionSpec * const optionSpecs[] = { labelOptionSpecs, buttonOptionSpecs, checkbuttonOptionSpecs, diff --git a/generic/tkColor.c b/generic/tkColor.c index 0eb80f7..c64fe80 100644 --- a/generic/tkColor.c +++ b/generic/tkColor.c @@ -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: tkColor.c,v 1.12 2005/11/17 10:57:35 dkf Exp $ + * RCS: @(#) $Id: tkColor.c,v 1.13 2007/01/03 04:10:54 nijtmans Exp $ */ #include "tkColor.h" @@ -705,7 +705,7 @@ static void InitColorObj( Tcl_Obj *objPtr) /* The object to convert. */ { - Tcl_ObjType *typePtr; + const Tcl_ObjType *typePtr; /* * Free the old internalRep before setting the new one. diff --git a/generic/tkCursor.c b/generic/tkCursor.c index 9be2a2e..bf3ab05 100644 --- a/generic/tkCursor.c +++ b/generic/tkCursor.c @@ -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: tkCursor.c,v 1.14 2005/11/17 10:57:35 dkf Exp $ + * RCS: @(#) $Id: tkCursor.c,v 1.15 2007/01/03 04:10:54 nijtmans Exp $ */ #include "tkPort.h" @@ -752,7 +752,7 @@ static void InitCursorObj( Tcl_Obj *objPtr) /* The object to convert. */ { - Tcl_ObjType *typePtr; + const Tcl_ObjType *typePtr; /* * Free the old internalRep before setting the new one. diff --git a/generic/tkFont.c b/generic/tkFont.c index ba286b5..50f55f1 100644 --- a/generic/tkFont.c +++ b/generic/tkFont.c @@ -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.c,v 1.30 2006/12/10 05:26:42 das Exp $ + * RCS: @(#) $Id: tkFont.c,v 1.31 2007/01/03 04:10:54 nijtmans Exp $ */ #include "tkPort.h" @@ -1295,7 +1295,7 @@ SetFontFromAny( Tcl_Interp *interp, /* Used for error reporting if not NULL. */ Tcl_Obj *objPtr) /* The object to convert. */ { - Tcl_ObjType *typePtr; + const Tcl_ObjType *typePtr; /* * Free the old internalRep before setting the new one. diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c index 64c6e82..f5c3e2b 100644 --- a/generic/tkImgPhoto.c +++ b/generic/tkImgPhoto.c @@ -17,7 +17,7 @@ * Department of Computer Science, * Australian National University. * - * RCS: @(#) $Id: tkImgPhoto.c,v 1.66 2007/01/02 22:50:30 dkf Exp $ + * RCS: @(#) $Id: tkImgPhoto.c,v 1.67 2007/01/03 04:10:54 nijtmans Exp $ */ #include "tkInt.h" @@ -2463,7 +2463,7 @@ ImgPhotoGet( nBlue = 32; mono = 0; } else if (visInfoPtr->depth >= 3) { - int *ip = paletteChoice[visInfoPtr->depth - 3]; + const int *ip = paletteChoice[visInfoPtr->depth - 3]; nRed = ip[0]; nGreen = ip[1]; diff --git a/generic/tkObj.c b/generic/tkObj.c index f4ca2fd..7910c9f 100644 --- a/generic/tkObj.c +++ b/generic/tkObj.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkObj.c,v 1.15 2005/11/17 16:21:56 dkf Exp $ + * RCS: @(#) $Id: tkObj.c,v 1.16 2007/01/03 04:10:55 nijtmans Exp $ */ #include "tkInt.h" @@ -282,7 +282,7 @@ SetPixelFromAny( Tcl_Interp *interp, /* Used for error reporting if not NULL. */ Tcl_Obj *objPtr) /* The object to convert. */ { - Tcl_ObjType *typePtr; + const Tcl_ObjType *typePtr; char *string, *rest; double d; int i, units; @@ -544,14 +544,14 @@ SetMMFromAny( Tcl_Interp *interp, /* Used for error reporting if not NULL. */ Tcl_Obj *objPtr) /* The object to convert. */ { - Tcl_ObjType *typePtr; + const Tcl_ObjType *typePtr; char *string, *rest; double d; int units; MMRep *mmPtr; - static Tcl_ObjType *tclDoubleObjType = NULL; - static Tcl_ObjType *tclIntObjType = NULL; + static const Tcl_ObjType *tclDoubleObjType = NULL; + static const Tcl_ObjType *tclIntObjType = NULL; if (tclDoubleObjType == NULL) { /* @@ -729,7 +729,7 @@ SetWindowFromAny( Tcl_Interp *interp, /* Used for error reporting if not NULL. */ register Tcl_Obj *objPtr) /* The object to convert. */ { - Tcl_ObjType *typePtr; + const Tcl_ObjType *typePtr; WindowRep *winPtr; /* -- cgit v0.12