Get rid of pre-C89-isms (esp. CONST vs const).

1 files changed, 19 insertions, 19 deletions

diff --git a/generic/tkColor.c b/generic/tkColor.c
index 85593ac..8fbb85e 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.16 2007/12/13 15:24:13 dgp Exp $
+ * RCS: @(#) $Id: tkColor.c,v 1.17 2008/04/27 22:38:55 dkf Exp $
  */
 
 #include "tkInt.h"
@@ -129,8 +129,8 @@ Tk_AllocColorFromObj(
      */
 
     if (tkColPtr != NULL) {
-	TkColor *firstColorPtr = (TkColor *)
-		Tcl_GetHashValue(tkColPtr->hashPtr);
+	TkColor *firstColorPtr = Tcl_GetHashValue(tkColPtr->hashPtr);
+
 	FreeColorObjProc(objPtr);
 	for (tkColPtr = firstColorPtr; tkColPtr != NULL;
 		tkColPtr = tkColPtr->nextPtr) {
@@ -138,7 +138,7 @@ Tk_AllocColorFromObj(
 		    && (Tk_Colormap(tkwin) == tkColPtr->colormap)) {
 		tkColPtr->resourceRefCount++;
 		tkColPtr->objRefCount++;
-		objPtr->internalRep.twoPtrValue.ptr1 = (void *) tkColPtr;
+		objPtr->internalRep.twoPtrValue.ptr1 = tkColPtr;
 		return (XColor *) tkColPtr;
 	    }
 	}
@@ -149,7 +149,7 @@ Tk_AllocColorFromObj(
      */
 
     tkColPtr = (TkColor *) Tk_GetColor(interp, tkwin, Tcl_GetString(objPtr));
-    objPtr->internalRep.twoPtrValue.ptr1 = (void *) tkColPtr;
+    objPtr->internalRep.twoPtrValue.ptr1 = tkColPtr;
     if (tkColPtr != NULL) {
 	tkColPtr->objRefCount++;
     }
@@ -204,7 +204,7 @@ Tk_GetColor(
 
     nameHashPtr = Tcl_CreateHashEntry(&dispPtr->colorNameTable, name, &isNew);
     if (!isNew) {
-	existingColPtr = (TkColor *) Tcl_GetHashValue(nameHashPtr);
+	existingColPtr = Tcl_GetHashValue(nameHashPtr);
 	for (tkColPtr = existingColPtr; tkColPtr != NULL;
 		tkColPtr = tkColPtr->nextPtr) {
 	    if ((tkColPtr->screen == Tk_Screen(tkwin))
@@ -310,7 +310,7 @@ Tk_GetColorByValue(
     valueHashPtr = Tcl_CreateHashEntry(&dispPtr->colorValueTable,
 	    (char *) &valueKey, &isNew);
     if (!isNew) {
-	tkColPtr = (TkColor *) Tcl_GetHashValue(valueHashPtr);
+	tkColPtr = Tcl_GetHashValue(valueHashPtr);
 	tkColPtr->resourceRefCount++;
 	return &tkColPtr->color;
     }
@@ -355,7 +355,7 @@ Tk_GetColorByValue(
  *--------------------------------------------------------------
  */
 
-CONST char *
+const char *
 Tk_NameOfColor(
     XColor *colorPtr)		/* Color whose name is desired. */
 {
@@ -364,7 +364,7 @@ Tk_NameOfColor(
     if (tkColPtr->magic==COLOR_MAGIC && tkColPtr->type==TK_COLOR_BY_NAME) {
 	return tkColPtr->hashPtr->key.string;
     } else {
-	ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
+	ThreadSpecificData *tsdPtr =
 		Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
 	sprintf(tsdPtr->rgbString, "#%04x%04x%04x", colorPtr->red,
@@ -415,8 +415,8 @@ Tk_GCForColor(
 
     if (tkColPtr->gc == None) {
 	gcValues.foreground = tkColPtr->color.pixel;
-	tkColPtr->gc = XCreateGC(DisplayOfScreen(tkColPtr->screen),
-		drawable, GCForeground, &gcValues);
+	tkColPtr->gc = XCreateGC(DisplayOfScreen(tkColPtr->screen), drawable,
+		GCForeground, &gcValues);
     }
     return tkColPtr->gc;
 }
@@ -474,7 +474,7 @@ Tk_FreeColor(
     }
     TkpFreeColor(tkColPtr);
 
-    prevPtr = (TkColor *) Tcl_GetHashValue(tkColPtr->hashPtr);
+    prevPtr = Tcl_GetHashValue(tkColPtr->hashPtr);
     if (prevPtr == tkColPtr) {
 	if (tkColPtr->nextPtr == NULL) {
 	    Tcl_DeleteHashEntry(tkColPtr->hashPtr);
@@ -553,7 +553,7 @@ static void
 FreeColorObjProc(
     Tcl_Obj *objPtr)		/* The object we are releasing. */
 {
-    TkColor *tkColPtr = (TkColor *) objPtr->internalRep.twoPtrValue.ptr1;
+    TkColor *tkColPtr = objPtr->internalRep.twoPtrValue.ptr1;
 
     if (tkColPtr != NULL) {
 	tkColPtr->objRefCount--;
@@ -588,10 +588,10 @@ DupColorObjProc(
     Tcl_Obj *srcObjPtr,		/* The object we are copying from. */
     Tcl_Obj *dupObjPtr)		/* The object we are copying to. */
 {
-    TkColor *tkColPtr = (TkColor *) srcObjPtr->internalRep.twoPtrValue.ptr1;
+    TkColor *tkColPtr = srcObjPtr->internalRep.twoPtrValue.ptr1;
 
     dupObjPtr->typePtr = srcObjPtr->typePtr;
-    dupObjPtr->internalRep.twoPtrValue.ptr1 = (void *) tkColPtr;
+    dupObjPtr->internalRep.twoPtrValue.ptr1 = tkColPtr;
 
     if (tkColPtr != NULL) {
 	tkColPtr->objRefCount++;
@@ -638,7 +638,7 @@ Tk_GetColorFromObj(
      * map. If it is, we are done.
      */
 
-    tkColPtr = (TkColor *) objPtr->internalRep.twoPtrValue.ptr1;
+    tkColPtr = objPtr->internalRep.twoPtrValue.ptr1;
     if ((tkColPtr != NULL)
 	    && (tkColPtr->resourceRefCount > 0)
 	    && (Tk_Screen(tkwin) == tkColPtr->screen)
@@ -664,12 +664,12 @@ Tk_GetColorFromObj(
     if (hashPtr == NULL) {
 	goto error;
     }
-    for (tkColPtr = (TkColor *) Tcl_GetHashValue(hashPtr);
+    for (tkColPtr = Tcl_GetHashValue(hashPtr);
 	    (tkColPtr != NULL); tkColPtr = tkColPtr->nextPtr) {
 	if ((Tk_Screen(tkwin) == tkColPtr->screen)
 		&& (Tk_Colormap(tkwin) == tkColPtr->colormap)) {
 	    FreeColorObjProc(objPtr);
-	    objPtr->internalRep.twoPtrValue.ptr1 = (void *) tkColPtr;
+	    objPtr->internalRep.twoPtrValue.ptr1 = tkColPtr;
 	    tkColPtr->objRefCount++;
 	    return (XColor *) tkColPtr;
 	}
@@ -780,7 +780,7 @@ TkDebugColor(
     resultPtr = Tcl_NewObj();
     hashPtr = Tcl_FindHashEntry(&dispPtr->colorNameTable, name);
     if (hashPtr != NULL) {
-	TkColor *tkColPtr = (TkColor *) Tcl_GetHashValue(hashPtr);
+	TkColor *tkColPtr = Tcl_GetHashValue(hashPtr);
 
 	if (tkColPtr == NULL) {
 	    Tcl_Panic("TkDebugColor found empty hash table entry");