From 83099766302abfee6387e0b847fcec1fa657b81c Mon Sep 17 00:00:00 2001 From: joye Date: Fri, 17 Jan 2014 16:16:12 +0000 Subject: *** empty log message *** --- configure | 2 -- configure.in | 2 -- src/bltGrElemBar.C | 2 +- src/bltGrElemOp.C | 10 +++++----- src/bltGrLegd.C | 4 ++-- src/bltGrMarker.C | 24 ++++++++++++------------ src/bltGrPenOp.C | 10 +++++----- src/bltGraph.h | 1 - src/bltVecInt.h | 1 - 9 files changed, 25 insertions(+), 31 deletions(-) diff --git a/configure b/configure index 4ccaa83..8daf43f 100755 --- a/configure +++ b/configure @@ -5542,13 +5542,11 @@ done bltGrPen.c bltGrPs.c bltGraph.c - bltHash.c bltImage.c bltInt.c bltList.c bltNsUtil.c bltParse.c - bltPool.c bltPs.c bltPsAfm.c bltSpline.c diff --git a/configure.in b/configure.in index 5836143..4860457 100755 --- a/configure.in +++ b/configure.in @@ -87,13 +87,11 @@ TEA_ADD_SOURCES([ bltGrPen.c bltGrPs.c bltGraph.c - bltHash.c bltImage.c bltInt.c bltList.c bltNsUtil.c bltParse.c - bltPool.c bltPs.c bltPsAfm.c bltSpline.c diff --git a/src/bltGrElemBar.C b/src/bltGrElemBar.C index 462c1dc..376e23b 100644 --- a/src/bltGrElemBar.C +++ b/src/bltGrElemBar.C @@ -2416,7 +2416,7 @@ Blt_InitBarSetTable(Graph *graphPtr) hPtr2 = Tcl_NextHashEntry(&iter2)) { size_t count; - count = (size_t)Blt_GetHashValue(hPtr2); + count = (size_t)Tcl_GetHashValue(hPtr2); groupPtr->nSegments = count; groupPtr->axes = keyPtr->axes; Tcl_SetHashValue(hPtr2, groupPtr); diff --git a/src/bltGrElemOp.C b/src/bltGrElemOp.C index 68b2104..fe1fd6c 100644 --- a/src/bltGrElemOp.C +++ b/src/bltGrElemOp.C @@ -983,7 +983,7 @@ Blt_GetElement(Tcl_Interp *interp, Graph *graphPtr, Tcl_Obj *objPtr, char *name; name = Tcl_GetString(objPtr); - hPtr = Blt_FindHashEntry(&graphPtr->elements.table, name); + hPtr = Tcl_FindHashEntry(&graphPtr->elements.table, name); if (hPtr == NULL) { if (interp != NULL) { Tcl_AppendResult(interp, "can't find element \"", name, @@ -991,7 +991,7 @@ Blt_GetElement(Tcl_Interp *interp, Graph *graphPtr, Tcl_Obj *objPtr, } return TCL_ERROR; } - *elemPtrPtr = Blt_GetHashValue(hPtr); + *elemPtrPtr = Tcl_GetHashValue(hPtr); return TCL_OK; } @@ -1076,7 +1076,7 @@ CreateElement(Graph *graphPtr, Tcl_Interp *interp, int objc, "\" can't start with a '-'", (char *)NULL); return TCL_ERROR; } - hPtr = Blt_CreateHashEntry(&graphPtr->elements.table, string, &isNew); + hPtr = Tcl_CreateHashEntry(&graphPtr->elements.table, string, &isNew); if (!isNew) { Tcl_AppendResult(interp, "element \"", string, "\" already exists in \"", Tcl_GetString(objv[0]), @@ -1091,7 +1091,7 @@ CreateElement(Graph *graphPtr, Tcl_Interp *interp, int objc, } assert(elemPtr->configSpecs != NULL); elemPtr->hashPtr = hPtr; - Blt_SetHashValue(hPtr, elemPtr); + Tcl_SetHashValue(hPtr, elemPtr); if (Blt_ConfigureComponentFromObj(interp, graphPtr->tkwin, elemPtr->obj.name, "Element", elemPtr->configSpecs, objc - 4, objv + 4, @@ -1826,7 +1826,7 @@ ExistsOp( { Tcl_HashEntry *hPtr; - hPtr = Blt_FindHashEntry(&graphPtr->elements.table, Tcl_GetString(objv[3])); + hPtr = Tcl_FindHashEntry(&graphPtr->elements.table, Tcl_GetString(objv[3])); Tcl_SetBooleanObj(Tcl_GetObjResult(interp), (hPtr != NULL)); return TCL_OK; } diff --git a/src/bltGrLegd.C b/src/bltGrLegd.C index 03ccf15..b3c235a 100644 --- a/src/bltGrLegd.C +++ b/src/bltGrLegd.C @@ -981,7 +981,7 @@ SelectElement(Legend *legendPtr, Element *elemPtr) Blt_ChainLink link; link = Blt_Chain_Append(legendPtr->selected, elemPtr); - Blt_SetHashValue(hPtr, link); + Tcl_SetHashValue(hPtr, link); } } @@ -994,7 +994,7 @@ DeselectElement(Legend *legendPtr, Element *elemPtr) if (hPtr != NULL) { Blt_ChainLink link; - link = Blt_GetHashValue(hPtr); + link = Tcl_GetHashValue(hPtr); Blt_Chain_DeleteLink(legendPtr->selected, link); Tcl_DeleteHashEntry(hPtr); } diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C index d81becb..0f5be4b 100644 --- a/src/bltGrMarker.C +++ b/src/bltGrMarker.C @@ -1375,11 +1375,11 @@ IsElementHidden(Marker *markerPtr) Graph *graphPtr = markerPtr->obj.graphPtr; /* Look up the named element and see if it's hidden */ - hPtr = Blt_FindHashEntry(&graphPtr->elements.table, markerPtr->elemName); + hPtr = Tcl_FindHashEntry(&graphPtr->elements.table, markerPtr->elemName); if (hPtr != NULL) { Element *elemPtr; - elemPtr = Blt_GetHashValue(hPtr); + elemPtr = Tcl_GetHashValue(hPtr); if ((elemPtr->link == NULL) || (elemPtr->flags & HIDE)) { return TRUE; } @@ -3535,9 +3535,9 @@ GetMarkerFromObj(Tcl_Interp *interp, Graph *graphPtr, Tcl_Obj *objPtr, const char *string; string = Tcl_GetString(objPtr); - hPtr = Blt_FindHashEntry(&graphPtr->markers.table, string); + hPtr = Tcl_FindHashEntry(&graphPtr->markers.table, string); if (hPtr != NULL) { - *markerPtrPtr = Blt_GetHashValue(hPtr); + *markerPtrPtr = Tcl_GetHashValue(hPtr); return TCL_OK; } if (interp != NULL) { @@ -3556,7 +3556,7 @@ RenameMarker(Graph *graphPtr, Marker *markerPtr, const char *oldName, Tcl_HashEntry *hPtr; /* Rename the marker only if no marker already exists by that name */ - hPtr = Blt_CreateHashEntry(&graphPtr->markers.table, newName, &isNew); + hPtr = Tcl_CreateHashEntry(&graphPtr->markers.table, newName, &isNew); if (!isNew) { Tcl_AppendResult(graphPtr->interp, "can't rename marker: \"", newName, "\" already exists", (char *)NULL); @@ -3564,10 +3564,10 @@ RenameMarker(Graph *graphPtr, Marker *markerPtr, const char *oldName, } markerPtr->obj.name = Blt_Strdup(newName); markerPtr->hashPtr = hPtr; - Blt_SetHashValue(hPtr, (char *)markerPtr); + Tcl_SetHashValue(hPtr, (char *)markerPtr); /* Delete the old hash entry */ - hPtr = Blt_FindHashEntry(&graphPtr->markers.table, oldName); + hPtr = Tcl_FindHashEntry(&graphPtr->markers.table, oldName); Tcl_DeleteHashEntry(hPtr); if (oldName != NULL) { free((void*)oldName); @@ -3850,18 +3850,18 @@ CreateOp(Graph *graphPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) DestroyMarker(markerPtr); return TCL_ERROR; } - hPtr = Blt_CreateHashEntry(&graphPtr->markers.table, name, &isNew); + hPtr = Tcl_CreateHashEntry(&graphPtr->markers.table, name, &isNew); if (!isNew) { Marker *oldPtr; /* * Marker by the same name already exists. Delete the old marker and * it's list entry. But save the hash entry. */ - oldPtr = Blt_GetHashValue(hPtr); + oldPtr = Tcl_GetHashValue(hPtr); oldPtr->hashPtr = NULL; DestroyMarker(oldPtr); } - Blt_SetHashValue(hPtr, markerPtr); + Tcl_SetHashValue(hPtr, markerPtr); markerPtr->hashPtr = hPtr; /* Unlike elements, new markers are drawn on top of old markers. */ markerPtr->link = Blt_Chain_Prepend(graphPtr->markers.displayList,markerPtr); @@ -4103,7 +4103,7 @@ ExistsOp(Graph *graphPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) { Tcl_HashEntry *hPtr; - hPtr = Blt_FindHashEntry(&graphPtr->markers.table, Tcl_GetString(objv[3])); + hPtr = Tcl_FindHashEntry(&graphPtr->markers.table, Tcl_GetString(objv[3])); Tcl_SetBooleanObj(Tcl_GetObjResult(interp), (hPtr != NULL)); return TCL_OK; } @@ -4336,7 +4336,7 @@ Blt_DestroyMarkers(Graph *graphPtr) hPtr != NULL; hPtr = Tcl_NextHashEntry(&iter)) { Marker *markerPtr; - markerPtr = Blt_GetHashValue(hPtr); + markerPtr = Tcl_GetHashValue(hPtr); /* * Dereferencing the pointer to the hash table prevents the hash table * entry from being automatically deleted. diff --git a/src/bltGrPenOp.C b/src/bltGrPenOp.C index a2ab730..e1f67ab 100644 --- a/src/bltGrPenOp.C +++ b/src/bltGrPenOp.C @@ -289,7 +289,7 @@ GetPenFromObj(Tcl_Interp *interp, Graph *graphPtr, Tcl_Obj *objPtr, name = Tcl_GetString(objPtr); hPtr = Tcl_FindHashEntry(&graphPtr->penTable, name); if (hPtr != NULL) { - penPtr = Blt_GetHashValue(hPtr); + penPtr = Tcl_GetHashValue(hPtr); if (penPtr->flags & DELETE_PENDING) { penPtr = NULL; } @@ -370,7 +370,7 @@ Blt_CreatePen(Graph *graphPtr, const char *penName, ClassId classId, classId = CID_ELEM_LINE; hPtr = Tcl_CreateHashEntry(&graphPtr->penTable, penName, &isNew); if (!isNew) { - penPtr = Blt_GetHashValue(hPtr); + penPtr = Tcl_GetHashValue(hPtr); if ((penPtr->flags & DELETE_PENDING) == 0) { Tcl_AppendResult(graphPtr->interp, "pen \"", penName, "\" already exists in \"", Tk_PathName(graphPtr->tkwin), "\"", @@ -394,7 +394,7 @@ Blt_CreatePen(Graph *graphPtr, const char *penName, ClassId classId, penPtr->classId = classId; penPtr->hashPtr = hPtr; penPtr->graphPtr = graphPtr; - Blt_SetHashValue(hPtr, penPtr); + Tcl_SetHashValue(hPtr, penPtr); } configFlags = (penPtr->flags & (ACTIVE_PEN | NORMAL_PEN)); if (Blt_ConfigureComponentFromObj(graphPtr->interp, graphPtr->tkwin, @@ -421,7 +421,7 @@ Blt_GetPenFromObj(Tcl_Interp *interp, Graph *graphPtr, Tcl_Obj *objPtr, name = Tcl_GetString(objPtr); hPtr = Tcl_FindHashEntry(&graphPtr->penTable, name); if (hPtr != NULL) { - penPtr = Blt_GetHashValue(hPtr); + penPtr = Tcl_GetHashValue(hPtr); if (penPtr->flags & DELETE_PENDING) { penPtr = NULL; } @@ -694,7 +694,7 @@ NamesOp(Tcl_Interp *interp, Graph *graphPtr, int objc, Tcl_Obj *const *objv) hPtr != NULL; hPtr = Tcl_NextHashEntry(&iter)) { Pen *penPtr; - penPtr = Blt_GetHashValue(hPtr); + penPtr = Tcl_GetHashValue(hPtr); if ((penPtr->flags & DELETE_PENDING) == 0) { int i; diff --git a/src/bltGraph.h b/src/bltGraph.h index 8a74ce3..df7be39 100644 --- a/src/bltGraph.h +++ b/src/bltGraph.h @@ -34,7 +34,6 @@ #include "bltInt.h" #include "bltWindow.h" -#include "bltHash.h" #include "bltBind.h" #include "bltChain.h" #include "bltPs.h" diff --git a/src/bltVecInt.h b/src/bltVecInt.h index 4eb4b7f..72581ab 100644 --- a/src/bltVecInt.h +++ b/src/bltVecInt.h @@ -31,7 +31,6 @@ #include "bltInt.h" -#include #include #include -- cgit v0.12