diff options
author | joye <joye> | 2014-02-28 17:36:23 (GMT) |
---|---|---|
committer | joye <joye> | 2014-02-28 17:36:23 (GMT) |
commit | 432ce5db7295e0bccbd9cbd4ac1e2e6257eadc37 (patch) | |
tree | 793fd346d7925b4c851888674889a4569672bc38 /src | |
parent | 51ac158464eb641e1cef0b14b7677f8753227a4f (diff) | |
download | blt-432ce5db7295e0bccbd9cbd4ac1e2e6257eadc37.zip blt-432ce5db7295e0bccbd9cbd4ac1e2e6257eadc37.tar.gz blt-432ce5db7295e0bccbd9cbd4ac1e2e6257eadc37.tar.bz2 |
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r-- | src/bltGrAxis.C | 96 | ||||
-rw-r--r-- | src/bltGrBind.C | 6 | ||||
-rw-r--r-- | src/bltGrBind.h | 6 | ||||
-rw-r--r-- | src/bltGrElemLine.C | 2 | ||||
-rw-r--r-- | src/bltGrElemOp.C | 68 | ||||
-rw-r--r-- | src/bltGrElemOp.h | 2 | ||||
-rw-r--r-- | src/bltGrHairs.C | 8 | ||||
-rw-r--r-- | src/bltGrLegd.C | 38 | ||||
-rw-r--r-- | src/bltGrLegd.h | 2 | ||||
-rw-r--r-- | src/bltGrMarker.C | 42 | ||||
-rw-r--r-- | src/bltGrMisc.C | 2 | ||||
-rw-r--r-- | src/bltGrPSOutput.C | 12 | ||||
-rw-r--r-- | src/bltGrPSOutput.h | 10 | ||||
-rw-r--r-- | src/bltGrPenOp.C | 26 | ||||
-rw-r--r-- | src/bltGraph.h | 20 | ||||
-rw-r--r-- | src/bltInt.C | 6 | ||||
-rw-r--r-- | src/bltNsUtil.C | 4 | ||||
-rw-r--r-- | src/bltNsUtil.h | 4 | ||||
-rw-r--r-- | src/bltOp.h | 2 | ||||
-rw-r--r-- | src/bltParse.C | 6 | ||||
-rw-r--r-- | src/bltParse.h | 6 | ||||
-rw-r--r-- | src/bltSwitch.C | 12 | ||||
-rw-r--r-- | src/bltSwitch.h | 4 | ||||
-rw-r--r-- | src/bltVecCmd.C | 74 | ||||
-rw-r--r-- | src/bltVecInt.h | 24 | ||||
-rw-r--r-- | src/bltVecMath.C | 22 | ||||
-rw-r--r-- | src/bltVector.C | 68 | ||||
-rw-r--r-- | src/bltVector.h | 24 |
28 files changed, 298 insertions, 298 deletions
diff --git a/src/bltGrAxis.C b/src/bltGrAxis.C index 1938154..c81aeae 100644 --- a/src/bltGrAxis.C +++ b/src/bltGrAxis.C @@ -104,16 +104,16 @@ static int nAxisNames = sizeof(axisNames) / sizeof(AxisName); // Defs static void ReleaseAxis(Axis *axisPtr); -static int GetAxisByClass(Tcl_Interp *interp, Graph* graphPtr, Tcl_Obj *objPtr, +static int GetAxisByClass(Tcl_Interp* interp, Graph* graphPtr, Tcl_Obj *objPtr, ClassId classId, Axis **axisPtrPtr); static void DestroyAxis(Axis *axisPtr); static Tcl_FreeProc FreeAxis; static void TimeScaleAxis(Axis *axisPtr, double min, double max); static int lastMargin; -typedef int (GraphAxisProc)(Tcl_Interp *interp, Axis *axisPtr, int objc, +typedef int (GraphAxisProc)(Tcl_Interp* interp, Axis *axisPtr, int objc, Tcl_Obj *const *objv); -typedef int (GraphVirtualAxisProc)(Tcl_Interp *interp, Graph* graphPtr, +typedef int (GraphVirtualAxisProc)(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv); INLINE static double @@ -141,7 +141,7 @@ Tk_ObjCustomOption yAxisObjOption = "yaxis", AxisSetProc, AxisGetProc, NULL, NULL, (ClientData)CID_AXIS_Y }; -static int AxisSetProc(ClientData clientData, Tcl_Interp *interp, +static int AxisSetProc(ClientData clientData, Tcl_Interp* interp, Tk_Window tkwin, Tcl_Obj** objPtr, char* widgRec, int offset, char* save, int flags) { @@ -610,7 +610,7 @@ static void FreeAxisProc(ClientData clientData, Display *display, } } -static int ObjToAxisProc(ClientData clientData, Tcl_Interp *interp, +static int ObjToAxisProc(ClientData clientData, Tcl_Interp* interp, Tk_Window tkwin, Tcl_Obj *objPtr, char *widgRec, int offset, int flags) { @@ -640,7 +640,7 @@ static int ObjToAxisProc(ClientData clientData, Tcl_Interp *interp, return TCL_OK; } -static Tcl_Obj *AxisToObjProc(ClientData clientData, Tcl_Interp *interp, +static Tcl_Obj *AxisToObjProc(ClientData clientData, Tcl_Interp* interp, Tk_Window tkwin, char *widgRec, int offset, int flags) { @@ -663,7 +663,7 @@ static void FreeFormatProc(ClientData clientData, Display *display, axisPtr->nFormats = 0; } -static int ObjToFormatProc(ClientData clientData, Tcl_Interp *interp, +static int ObjToFormatProc(ClientData clientData, Tcl_Interp* interp, Tk_Window tkwin, Tcl_Obj *objPtr, char *widgRec, int offset, int flags) { @@ -688,7 +688,7 @@ static int ObjToFormatProc(ClientData clientData, Tcl_Interp *interp, return TCL_OK; } -static Tcl_Obj *FormatToObjProc(ClientData clientData, Tcl_Interp *interp, +static Tcl_Obj *FormatToObjProc(ClientData clientData, Tcl_Interp* interp, Tk_Window tkwin, char *widgRec, int offset, int flags) { @@ -707,7 +707,7 @@ static Tcl_Obj *FormatToObjProc(ClientData clientData, Tcl_Interp *interp, return objPtr; } -static int ObjToLimitProc(ClientData clientData, Tcl_Interp *interp, +static int ObjToLimitProc(ClientData clientData, Tcl_Interp* interp, Tk_Window tkwin, Tcl_Obj *objPtr, char *widgRec, int offset, int flags) { @@ -723,7 +723,7 @@ static int ObjToLimitProc(ClientData clientData, Tcl_Interp *interp, return TCL_OK; } -static Tcl_Obj *LimitToObjProc(ClientData clientData, Tcl_Interp *interp, +static Tcl_Obj *LimitToObjProc(ClientData clientData, Tcl_Interp* interp, Tk_Window tkwin, char *widgRec, int offset, int flags) { @@ -738,7 +738,7 @@ static Tcl_Obj *LimitToObjProc(ClientData clientData, Tcl_Interp *interp, return objPtr; } -static int ObjToUseProc(ClientData clientData, Tcl_Interp *interp, +static int ObjToUseProc(ClientData clientData, Tcl_Interp* interp, Tk_Window tkwin, Tcl_Obj *objPtr, char *widgRec, int offset, int flags) { @@ -802,7 +802,7 @@ static int ObjToUseProc(ClientData clientData, Tcl_Interp *interp, return TCL_OK; } -static Tcl_Obj *UseToObjProc(ClientData clientData, Tcl_Interp *interp, +static Tcl_Obj *UseToObjProc(ClientData clientData, Tcl_Interp* interp, Tk_Window tkwin, char *widgRec, int offset, int flags) { @@ -828,7 +828,7 @@ static void FreeTicksProc(ClientData clientData, Display *display, *ticksPtrPtr = NULL; } -static int ObjToTicksProc(ClientData clientData, Tcl_Interp *interp, +static int ObjToTicksProc(ClientData clientData, Tcl_Interp* interp, Tk_Window tkwin, Tcl_Obj *objPtr, char *widgRec, int offset, int flags) { @@ -865,7 +865,7 @@ static int ObjToTicksProc(ClientData clientData, Tcl_Interp *interp, return TCL_OK; } -static Tcl_Obj *TicksToObjProc(ClientData clientData, Tcl_Interp *interp, +static Tcl_Obj *TicksToObjProc(ClientData clientData, Tcl_Interp* interp, Tk_Window tkwin, char *widgRec, int offset, int flags) { @@ -891,7 +891,7 @@ static Tcl_Obj *TicksToObjProc(ClientData clientData, Tcl_Interp *interp, return listObjPtr; } -static int ObjToLooseProc(ClientData clientData, Tcl_Interp *interp, +static int ObjToLooseProc(ClientData clientData, Tcl_Interp* interp, Tk_Window tkwin, Tcl_Obj *objPtr, char *widgRec, int offset, int flags) { @@ -931,7 +931,7 @@ static int ObjToLooseProc(ClientData clientData, Tcl_Interp *interp, return TCL_OK; } -static Tcl_Obj *LooseToObjProc(ClientData clientData, Tcl_Interp *interp, +static Tcl_Obj *LooseToObjProc(ClientData clientData, Tcl_Interp* interp, Tk_Window tkwin, char *widgRec, int offset, int flags) { @@ -991,7 +991,7 @@ static TickLabel *MakeLabel(Axis *axisPtr, double value) if (axisPtr->formatCmd != NULL) { Graph* graphPtr; - Tcl_Interp *interp; + Tcl_Interp* interp; Tk_Window tkwin; graphPtr = axisPtr->obj.graphPtr; @@ -2156,7 +2156,7 @@ static double AdjustViewport(double offset, double windowSize) return offset; } -static int GetAxisScrollInfo(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv, +static int GetAxisScrollInfo(Tcl_Interp* interp, int objc, Tcl_Obj *const *objv, double *offsetPtr, double windowSize, double scrollUnits, double scale) { @@ -3192,7 +3192,7 @@ static Axis *NewAxis(Graph* graphPtr, const char *name, int margin) return axisPtr; } -static int GetAxisFromObj(Tcl_Interp *interp, Graph* graphPtr, Tcl_Obj *objPtr, +static int GetAxisFromObj(Tcl_Interp* interp, Graph* graphPtr, Tcl_Obj *objPtr, Axis **axisPtrPtr) { Tcl_HashEntry *hPtr; @@ -3217,7 +3217,7 @@ static int GetAxisFromObj(Tcl_Interp *interp, Graph* graphPtr, Tcl_Obj *objPtr, return TCL_ERROR; } -static int GetAxisByClass(Tcl_Interp *interp, Graph* graphPtr, Tcl_Obj *objPtr, +static int GetAxisByClass(Tcl_Interp* interp, Graph* graphPtr, Tcl_Obj *objPtr, ClassId classId, Axis **axisPtrPtr) { Axis *axisPtr; @@ -3327,7 +3327,7 @@ int Blt_DefaultAxes(Graph* graphPtr) return TCL_OK; } -static int ActivateOp(Tcl_Interp *interp, Axis *axisPtr, int objc, Tcl_Obj *const *objv) +static int ActivateOp(Tcl_Interp* interp, Axis *axisPtr, int objc, Tcl_Obj *const *objv) { Graph* graphPtr = axisPtr->obj.graphPtr; const char *string; @@ -3345,7 +3345,7 @@ static int ActivateOp(Tcl_Interp *interp, Axis *axisPtr, int objc, Tcl_Obj *cons return TCL_OK; } -static int BindOp(Tcl_Interp *interp, Axis *axisPtr, int objc, Tcl_Obj *const *objv) +static int BindOp(Tcl_Interp* interp, Axis *axisPtr, int objc, Tcl_Obj *const *objv) { Graph* graphPtr = axisPtr->obj.graphPtr; @@ -3353,7 +3353,7 @@ static int BindOp(Tcl_Interp *interp, Axis *axisPtr, int objc, Tcl_Obj *const *o Blt_MakeAxisTag(graphPtr, axisPtr->obj.name), objc, objv); } -static int CgetOp(Tcl_Interp *interp, Axis *axisPtr, int objc, Tcl_Obj *const *objv) +static int CgetOp(Tcl_Interp* interp, Axis *axisPtr, int objc, Tcl_Obj *const *objv) { Graph* graphPtr = axisPtr->obj.graphPtr; @@ -3361,7 +3361,7 @@ static int CgetOp(Tcl_Interp *interp, Axis *axisPtr, int objc, Tcl_Obj *const *o (char*)axisPtr, objv[0], Blt_GraphType(graphPtr)); } -static int ConfigureOp(Tcl_Interp *interp, Axis *axisPtr, int objc, Tcl_Obj *const *objv) +static int ConfigureOp(Tcl_Interp* interp, Axis *axisPtr, int objc, Tcl_Obj *const *objv) { Graph* graphPtr = axisPtr->obj.graphPtr; int flags; @@ -3391,7 +3391,7 @@ static int ConfigureOp(Tcl_Interp *interp, Axis *axisPtr, int objc, Tcl_Obj *con return TCL_OK; } -static int LimitsOp(Tcl_Interp *interp, Axis *axisPtr, int objc, Tcl_Obj *const *objv) +static int LimitsOp(Tcl_Interp* interp, Axis *axisPtr, int objc, Tcl_Obj *const *objv) { Graph* graphPtr = axisPtr->obj.graphPtr; Tcl_Obj *listObjPtr; @@ -3414,7 +3414,7 @@ static int LimitsOp(Tcl_Interp *interp, Axis *axisPtr, int objc, Tcl_Obj *const return TCL_OK; } -static int InvTransformOp(Tcl_Interp *interp, Axis *axisPtr, int objc, +static int InvTransformOp(Tcl_Interp* interp, Axis *axisPtr, int objc, Tcl_Obj *const *objv) { Graph* graphPtr = axisPtr->obj.graphPtr; @@ -3443,7 +3443,7 @@ static int InvTransformOp(Tcl_Interp *interp, Axis *axisPtr, int objc, return TCL_OK; } -static int MarginOp(Tcl_Interp *interp, Axis *axisPtr, int objc, Tcl_Obj *const *objv) +static int MarginOp(Tcl_Interp* interp, Axis *axisPtr, int objc, Tcl_Obj *const *objv) { const char *marginName; @@ -3455,7 +3455,7 @@ static int MarginOp(Tcl_Interp *interp, Axis *axisPtr, int objc, Tcl_Obj *const return TCL_OK; } -static int TransformOp(Tcl_Interp *interp, Axis *axisPtr, int objc, Tcl_Obj *const *objv) +static int TransformOp(Tcl_Interp* interp, Axis *axisPtr, int objc, Tcl_Obj *const *objv) { Graph* graphPtr = axisPtr->obj.graphPtr; double x; @@ -3475,7 +3475,7 @@ static int TransformOp(Tcl_Interp *interp, Axis *axisPtr, int objc, Tcl_Obj *con return TCL_OK; } -static int TypeOp(Tcl_Interp *interp, Axis *axisPtr, int objc, Tcl_Obj *const *objv) +static int TypeOp(Tcl_Interp* interp, Axis *axisPtr, int objc, Tcl_Obj *const *objv) { const char *typeName; @@ -3491,7 +3491,7 @@ static int TypeOp(Tcl_Interp *interp, Axis *axisPtr, int objc, Tcl_Obj *const *o return TCL_OK; } -static int UseOp(Tcl_Interp *interp, Axis *axisPtr, int objc, Tcl_Obj *const *objv) +static int UseOp(Tcl_Interp* interp, Axis *axisPtr, int objc, Tcl_Obj *const *objv) { Graph* graphPtr = (Graph *)axisPtr; Blt_Chain chain; @@ -3570,7 +3570,7 @@ static int UseOp(Tcl_Interp *interp, Axis *axisPtr, int objc, Tcl_Obj *const *ob return TCL_OK; } -static int ViewOp(Tcl_Interp *interp, Axis *axisPtr, int objc, Tcl_Obj *const *objv) +static int ViewOp(Tcl_Interp* interp, Axis *axisPtr, int objc, Tcl_Obj *const *objv) { Graph* graphPtr; double axisOffset, axisScale; @@ -3649,7 +3649,7 @@ static int ViewOp(Tcl_Interp *interp, Axis *axisPtr, int objc, Tcl_Obj *const *o return TCL_OK; } -static int AxisCreateOp(Tcl_Interp *interp, Graph* graphPtr, int objc, +static int AxisCreateOp(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv) { Axis *axisPtr; @@ -3671,7 +3671,7 @@ static int AxisCreateOp(Tcl_Interp *interp, Graph* graphPtr, int objc, return TCL_OK; } -static int AxisActivateOp(Tcl_Interp *interp, Graph* graphPtr, int objc, +static int AxisActivateOp(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv) { Axis *axisPtr; @@ -3682,7 +3682,7 @@ static int AxisActivateOp(Tcl_Interp *interp, Graph* graphPtr, int objc, return ActivateOp(interp, axisPtr, objc, objv); } -static int AxisBindOp(Tcl_Interp *interp, Graph* graphPtr, int objc, +static int AxisBindOp(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv) { if (objc == 3) { @@ -3707,7 +3707,7 @@ static int AxisBindOp(Tcl_Interp *interp, Graph* graphPtr, int objc, Blt_MakeAxisTag(graphPtr, Tcl_GetString(objv[3])), objc - 4, objv + 4); } -static int AxisCgetOp(Tcl_Interp *interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv) +static int AxisCgetOp(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv) { Axis *axisPtr; @@ -3717,7 +3717,7 @@ static int AxisCgetOp(Tcl_Interp *interp, Graph* graphPtr, int objc, Tcl_Obj *co return CgetOp(interp, axisPtr, objc - 4, objv + 4); } -static int AxisConfigureOp(Tcl_Interp *interp, Graph* graphPtr, int objc, +static int AxisConfigureOp(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv) { Tcl_Obj *const *options; @@ -3759,7 +3759,7 @@ static int AxisConfigureOp(Tcl_Interp *interp, Graph* graphPtr, int objc, return TCL_OK; } -static int AxisDeleteOp(Tcl_Interp *interp, Graph* graphPtr, int objc, +static int AxisDeleteOp(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv) { int i; @@ -3778,7 +3778,7 @@ static int AxisDeleteOp(Tcl_Interp *interp, Graph* graphPtr, int objc, return TCL_OK; } -static int AxisFocusOp(Tcl_Interp *interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv) +static int AxisFocusOp(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv) { if (objc > 3) { Axis *axisPtr; @@ -3805,7 +3805,7 @@ static int AxisFocusOp(Tcl_Interp *interp, Graph* graphPtr, int objc, Tcl_Obj *c return TCL_OK; } -static int AxisGetOp(Tcl_Interp *interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv) +static int AxisGetOp(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv) { Axis *axisPtr; @@ -3829,7 +3829,7 @@ static int AxisGetOp(Tcl_Interp *interp, Graph* graphPtr, int objc, Tcl_Obj *con return TCL_OK; } -static int AxisInvTransformOp(Tcl_Interp *interp, Graph* graphPtr, int objc, +static int AxisInvTransformOp(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv) { Axis *axisPtr; @@ -3840,7 +3840,7 @@ static int AxisInvTransformOp(Tcl_Interp *interp, Graph* graphPtr, int objc, return InvTransformOp(interp, axisPtr, objc - 4, objv + 4); } -static int AxisLimitsOp(Tcl_Interp *interp, Graph* graphPtr, int objc, +static int AxisLimitsOp(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv) { Axis *axisPtr; @@ -3851,7 +3851,7 @@ static int AxisLimitsOp(Tcl_Interp *interp, Graph* graphPtr, int objc, return LimitsOp(interp, axisPtr, objc - 4, objv + 4); } -static int AxisMarginOp(Tcl_Interp *interp, Graph* graphPtr, int objc, +static int AxisMarginOp(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv) { Axis *axisPtr; @@ -3862,7 +3862,7 @@ static int AxisMarginOp(Tcl_Interp *interp, Graph* graphPtr, int objc, return MarginOp(interp, axisPtr, objc - 4, objv + 4); } -static int AxisNamesOp(Tcl_Interp *interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv) +static int AxisNamesOp(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv) { Tcl_Obj *listObjPtr; @@ -3908,7 +3908,7 @@ static int AxisNamesOp(Tcl_Interp *interp, Graph* graphPtr, int objc, Tcl_Obj *c return TCL_OK; } -static int AxisTransformOp(Tcl_Interp *interp, Graph* graphPtr, int objc, +static int AxisTransformOp(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv) { Axis *axisPtr; @@ -3919,7 +3919,7 @@ static int AxisTransformOp(Tcl_Interp *interp, Graph* graphPtr, int objc, return TransformOp(interp, axisPtr, objc - 4, objv + 4); } -static int AxisTypeOp(Tcl_Interp *interp, Graph* graphPtr, int objc, +static int AxisTypeOp(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv) { Axis *axisPtr; @@ -3931,7 +3931,7 @@ static int AxisTypeOp(Tcl_Interp *interp, Graph* graphPtr, int objc, } static int -AxisViewOp(Tcl_Interp *interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv) +AxisViewOp(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv) { Axis *axisPtr; @@ -3964,7 +3964,7 @@ static Blt_OpSpec virtAxisOps[] = { static int nVirtAxisOps = sizeof(virtAxisOps) / sizeof(Blt_OpSpec); int -Blt_VirtualAxisOp(Graph* graphPtr, Tcl_Interp *interp, int objc, +Blt_VirtualAxisOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { GraphVirtualAxisProc *proc; @@ -3995,7 +3995,7 @@ static Blt_OpSpec axisOps[] = { static int nAxisOps = sizeof(axisOps) / sizeof(Blt_OpSpec); int -Blt_AxisOp(Tcl_Interp *interp, Graph* graphPtr, int margin, int objc, +Blt_AxisOp(Tcl_Interp* interp, Graph* graphPtr, int margin, int objc, Tcl_Obj *const *objv) { int result; diff --git a/src/bltGrBind.C b/src/bltGrBind.C index a4bc7fb..0c876ce 100644 --- a/src/bltGrBind.C +++ b/src/bltGrBind.C @@ -461,7 +461,7 @@ BindProc( int Blt_ConfigureBindings( - Tcl_Interp *interp, + Tcl_Interp* interp, BindTable *bindPtr, ClientData item, int argc, @@ -519,7 +519,7 @@ Blt_ConfigureBindings( int Blt_ConfigureBindingsFromObj( - Tcl_Interp *interp, + Tcl_Interp* interp, BindTable *bindPtr, ClientData item, int objc, @@ -577,7 +577,7 @@ Blt_ConfigureBindingsFromObj( Blt_BindTable Blt_CreateBindingTable( - Tcl_Interp *interp, + Tcl_Interp* interp, Tk_Window tkwin, ClientData clientData, Blt_BindPickProc *pickProc, diff --git a/src/bltGrBind.h b/src/bltGrBind.h index dcafd05..01a72a9 100644 --- a/src/bltGrBind.h +++ b/src/bltGrBind.h @@ -93,14 +93,14 @@ struct _Blt_BindTable { extern void Blt_DestroyBindingTable(Blt_BindTable table); -extern Blt_BindTable Blt_CreateBindingTable(Tcl_Interp *interp, +extern Blt_BindTable Blt_CreateBindingTable(Tcl_Interp* interp, Tk_Window tkwin, ClientData clientData, Blt_BindPickProc *pickProc, Blt_BindTagProc *tagProc); -extern int Blt_ConfigureBindings(Tcl_Interp *interp, Blt_BindTable table, +extern int Blt_ConfigureBindings(Tcl_Interp* interp, Blt_BindTable table, ClientData item, int argc, const char **argv); -extern int Blt_ConfigureBindingsFromObj(Tcl_Interp *interp, +extern int Blt_ConfigureBindingsFromObj(Tcl_Interp* interp, Blt_BindTable table, ClientData item, int objc, Tcl_Obj *const *objv); extern void Blt_PickCurrentItem(Blt_BindTable table); diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C index d47b81b..7bd2866 100644 --- a/src/bltGrElemLine.C +++ b/src/bltGrElemLine.C @@ -388,7 +388,7 @@ Tk_ObjCustomOption symbolObjOption = "symbol", SymbolSetProc, SymbolGetProc, NULL, NULL, NULL }; -static int SymbolSetProc(ClientData clientData, Tcl_Interp *interp, +static int SymbolSetProc(ClientData clientData, Tcl_Interp* interp, Tk_Window tkwin, Tcl_Obj** objPtr, char* widgRec, int offset, char* save, int flags) { diff --git a/src/bltGrElemOp.C b/src/bltGrElemOp.C index a238ab3..8682f8b 100644 --- a/src/bltGrElemOp.C +++ b/src/bltGrElemOp.C @@ -48,22 +48,22 @@ // Defs static void DestroyElement(Element* elemPtr); -static int ElementObjConfigure(Tcl_Interp *interp, Graph* graphPtr, +static int ElementObjConfigure(Tcl_Interp* interp, Graph* graphPtr, Element* elemPtr, int objc, Tcl_Obj* const objv[]); static void FreeDataValues(ElemValues *valuesPtr); static void FreeElement(char* data); static void FindRange(ElemValues *valuesPtr); -static int GetIndex(Tcl_Interp *interp, Element* elemPtr, +static int GetIndex(Tcl_Interp* interp, Element* elemPtr, Tcl_Obj *objPtr, int *indexPtr); -static int GetPenStyleFromObj(Tcl_Interp *interp, Graph* graphPtr, +static int GetPenStyleFromObj(Tcl_Interp* interp, Graph* graphPtr, Tcl_Obj *objPtr, ClassId classId, PenStyle *stylePtr); -static int GetVectorData(Tcl_Interp *interp, ElemValues *valuesPtr, +static int GetVectorData(Tcl_Interp* interp, ElemValues *valuesPtr, const char *vecName); -static int ParseValues(Tcl_Interp *interp, Tcl_Obj *objPtr, int *nValuesPtr, +static int ParseValues(Tcl_Interp* interp, Tcl_Obj *objPtr, int *nValuesPtr, double **arrayPtr); -typedef int (GraphElementProc)(Graph* graphPtr, Tcl_Interp *interp, int objc, +typedef int (GraphElementProc)(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv); // OptionSpecs @@ -77,7 +77,7 @@ Tk_ObjCustomOption valuesObjOption = "values", ValuesSetProc, ValuesGetProc, NULL, NULL, NULL }; -static int ValuesSetProc(ClientData clientData, Tcl_Interp *interp, +static int ValuesSetProc(ClientData clientData, Tcl_Interp* interp, Tk_Window tkwin, Tcl_Obj** objPtr, char* widgRec, int offset, char* save, int flags) { @@ -156,7 +156,7 @@ Tk_ObjCustomOption pairsObjOption = "pairs", PairsSetProc, PairsGetProc, NULL, NULL, NULL }; -static int PairsSetProc(ClientData clientData, Tcl_Interp *interp, +static int PairsSetProc(ClientData clientData, Tcl_Interp* interp, Tk_Window tkwin, Tcl_Obj** objPtr, char* widgRec, int offset, char* save, int flags) { @@ -214,7 +214,7 @@ static Tcl_Obj* PairsGetProc(ClientData clientData, Tk_Window tkwin, return listObjPtr; }; -int StyleSetProc(ClientData clientData, Tcl_Interp *interp, +int StyleSetProc(ClientData clientData, Tcl_Interp* interp, Tk_Window tkwin, Tcl_Obj** objPtr, char* widgRec, int offset, char* save, int flags) { @@ -284,7 +284,7 @@ Tcl_Obj* StyleGetProc(ClientData clientData, Tk_Window tkwin, // Create -static int CreateElement(Graph* graphPtr, Tcl_Interp *interp, int objc, +static int CreateElement(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv, ClassId classId) { char *string = Tcl_GetString(objv[3]); @@ -415,7 +415,7 @@ static int ConfigureOp(Graph* graphPtr, Tcl_Interp* interp, return ElementObjConfigure(interp, graphPtr, elemPtr, objc-4, objv+4); } -static int ElementObjConfigure(Tcl_Interp *interp, Graph* graphPtr, +static int ElementObjConfigure(Tcl_Interp* interp, Graph* graphPtr, Element* elemPtr, int objc, Tcl_Obj* const objv[]) { @@ -459,7 +459,7 @@ static int ElementObjConfigure(Tcl_Interp *interp, Graph* graphPtr, // Ops -static int ActivateOp(Graph* graphPtr, Tcl_Interp *interp, +static int ActivateOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Element* elemPtr; @@ -513,7 +513,7 @@ static int ActivateOp(Graph* graphPtr, Tcl_Interp *interp, return TCL_OK; } -static int BindOp(Graph* graphPtr, Tcl_Interp *interp, +static int BindOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { if (objc == 3) { @@ -552,7 +552,7 @@ static Blt_CustomOption alongOption = ObjToAlong, AlongToObj, NULL, (ClientData)0 }; -static int ObjToAlong(ClientData clientData, Tcl_Interp *interp, +static int ObjToAlong(ClientData clientData, Tcl_Interp* interp, Tk_Window tkwin, Tcl_Obj *objPtr, char *widgRec, int offset, int flags) { @@ -574,7 +574,7 @@ static int ObjToAlong(ClientData clientData, Tcl_Interp *interp, return TCL_OK; } -static Tcl_Obj *AlongToObj(ClientData clientData, Tcl_Interp *interp, +static Tcl_Obj *AlongToObj(ClientData clientData, Tcl_Interp* interp, Tk_Window tkwin, char *widgRec, int offset, int flags) { @@ -609,7 +609,7 @@ static Blt_ConfigSpec closestSpecs[] = { (char *)NULL, 0, 0} }; -static int ClosestOp(Graph* graphPtr, Tcl_Interp *interp, +static int ClosestOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Element* elemPtr; @@ -720,7 +720,7 @@ static int ClosestOp(Graph* graphPtr, Tcl_Interp *interp, return TCL_OK; } -static int DeactivateOp(Graph* graphPtr, Tcl_Interp *interp, +static int DeactivateOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { int i; @@ -742,7 +742,7 @@ static int DeactivateOp(Graph* graphPtr, Tcl_Interp *interp, return TCL_OK; } -static int DeleteOp(Graph* graphPtr, Tcl_Interp *interp, +static int DeleteOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { int i; @@ -760,7 +760,7 @@ static int DeleteOp(Graph* graphPtr, Tcl_Interp *interp, return TCL_OK; } -static int ExistsOp(Graph* graphPtr, Tcl_Interp *interp, +static int ExistsOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Tcl_HashEntry *hPtr; @@ -770,7 +770,7 @@ static int ExistsOp(Graph* graphPtr, Tcl_Interp *interp, return TCL_OK; } -static int GetOp(Graph* graphPtr, Tcl_Interp *interp, +static int GetOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { char *string; @@ -808,7 +808,7 @@ static Tcl_Obj *DisplayListObj(Graph* graphPtr) return listObjPtr; } -static int LowerOp(Graph* graphPtr, Tcl_Interp *interp, +static int LowerOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { Blt_Chain chain; @@ -840,7 +840,7 @@ static int LowerOp(Graph* graphPtr, Tcl_Interp *interp, return TCL_OK; } -static int NamesOp(Graph* graphPtr, Tcl_Interp *interp, +static int NamesOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Tcl_Obj *listObjPtr; @@ -884,7 +884,7 @@ static int NamesOp(Graph* graphPtr, Tcl_Interp *interp, return TCL_OK; } -static int RaiseOp(Graph* graphPtr, Tcl_Interp *interp, +static int RaiseOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Blt_Chain chain; @@ -916,7 +916,7 @@ static int RaiseOp(Graph* graphPtr, Tcl_Interp *interp, return TCL_OK; } -static int ShowOp(Graph* graphPtr, Tcl_Interp *interp, +static int ShowOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { if (objc == 4) { @@ -964,7 +964,7 @@ static int ShowOp(Graph* graphPtr, Tcl_Interp *interp, return TCL_OK; } -static int TypeOp(Graph* graphPtr, Tcl_Interp *interp, +static int TypeOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { Element* elemPtr; @@ -1003,7 +1003,7 @@ static Blt_OpSpec elemOps[] = { }; static int numElemOps = sizeof(elemOps) / sizeof(Blt_OpSpec); -int Blt_ElementOp(Graph* graphPtr, Tcl_Interp *interp, +int Blt_ElementOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[], ClassId classId) { void *ptr; @@ -1032,7 +1032,7 @@ static void FreeElement(char* data) DestroyElement(elemPtr); } -static int GetPenStyleFromObj(Tcl_Interp *interp, Graph* graphPtr, +static int GetPenStyleFromObj(Tcl_Interp* interp, Graph* graphPtr, Tcl_Obj *objPtr, ClassId classId, PenStyle *stylePtr) { @@ -1077,7 +1077,7 @@ static void FreeVectorSource(ElemValues *valuesPtr) } } -static int FetchVectorValues(Tcl_Interp *interp, ElemValues *valuesPtr, +static int FetchVectorValues(Tcl_Interp* interp, ElemValues *valuesPtr, Blt_Vector *vector) { double *array; @@ -1103,7 +1103,7 @@ static int FetchVectorValues(Tcl_Interp *interp, ElemValues *valuesPtr, return TCL_OK; } -static void VectorChangedProc(Tcl_Interp *interp, ClientData clientData, +static void VectorChangedProc(Tcl_Interp* interp, ClientData clientData, Blt_VectorNotify notify) { ElemValues *valuesPtr = clientData; @@ -1132,7 +1132,7 @@ static void VectorChangedProc(Tcl_Interp *interp, ClientData clientData, } } -static int GetVectorData(Tcl_Interp *interp, ElemValues *valuesPtr, +static int GetVectorData(Tcl_Interp* interp, ElemValues *valuesPtr, const char *vecName) { Blt_Vector *vecPtr; @@ -1152,7 +1152,7 @@ static int GetVectorData(Tcl_Interp *interp, ElemValues *valuesPtr, return TCL_OK; } -static int ParseValues(Tcl_Interp *interp, Tcl_Obj *objPtr, int *nValuesPtr, +static int ParseValues(Tcl_Interp* interp, Tcl_Obj *objPtr, int *nValuesPtr, double **arrayPtr) { int objc; @@ -1331,7 +1331,7 @@ PenStyle **Blt_StyleMap(Element* elemPtr) } -static int GetIndex(Tcl_Interp *interp, Element* elemPtr, +static int GetIndex(Tcl_Interp* interp, Element* elemPtr, Tcl_Obj *objPtr, int *indexPtr) { char *string; @@ -1345,7 +1345,7 @@ static int GetIndex(Tcl_Interp *interp, Element* elemPtr, return TCL_OK; } -int Blt_GetElement(Tcl_Interp *interp, Graph* graphPtr, Tcl_Obj *objPtr, +int Blt_GetElement(Tcl_Interp* interp, Graph* graphPtr, Tcl_Obj *objPtr, Element **elemPtrPtr) { Tcl_HashEntry *hPtr; @@ -1460,7 +1460,7 @@ void Blt_ElementsToPostScript(Graph* graphPtr, Blt_Ps ps) } } -void Blt_ActiveElementsToPostScript( Graph* graphPtr, Blt_Ps ps) +void Blt_ActiveElementsToPostScript(Graph* graphPtr, Blt_Ps ps) { Blt_ChainLink link; diff --git a/src/bltGrElemOp.h b/src/bltGrElemOp.h index 2ae7794..ff31811 100644 --- a/src/bltGrElemOp.h +++ b/src/bltGrElemOp.h @@ -260,7 +260,7 @@ extern PenStyle **Blt_StyleMap (Element* elemPtr); extern void Blt_MapErrorBars(Graph *graphPtr, Element* elemPtr, PenStyle **dataToStyle); extern void Blt_FreeDataValues(ElemValues *evPtr); -extern int Blt_GetElement(Tcl_Interp *interp, Graph *graphPtr, +extern int Blt_GetElement(Tcl_Interp* interp, Graph *graphPtr, Tcl_Obj *objPtr, Element **elemPtrPtr); #endif /* _BLT_GR_ELEM_H */ diff --git a/src/bltGrHairs.C b/src/bltGrHairs.C index f115bfa..48b2657 100644 --- a/src/bltGrHairs.C +++ b/src/bltGrHairs.C @@ -160,7 +160,7 @@ static int ConfigureOp(Graph* graphPtr, Tcl_Interp* interp, return CrosshairsObjConfigure(interp, graphPtr, objc-3, objv+3); } -static int CrosshairsObjConfigure(Tcl_Interp *interp, Graph* graphPtr, +static int CrosshairsObjConfigure(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj* const objv[]) { Crosshairs* chPtr = graphPtr->crosshairs; @@ -262,7 +262,7 @@ int Blt_CrosshairsOp(Graph* graphPtr, Tcl_Interp* interp, // Widget commands -static int OnOp(Graph* graphPtr, Tcl_Interp *interp, +static int OnOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Crosshairs *chPtr = graphPtr->crosshairs; @@ -274,7 +274,7 @@ static int OnOp(Graph* graphPtr, Tcl_Interp *interp, return TCL_OK; } -static int OffOp(Graph* graphPtr, Tcl_Interp *interp, +static int OffOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Crosshairs *chPtr = graphPtr->crosshairs; @@ -286,7 +286,7 @@ static int OffOp(Graph* graphPtr, Tcl_Interp *interp, return TCL_OK; } -static int ToggleOp(Graph* graphPtr, Tcl_Interp *interp, +static int ToggleOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Crosshairs *chPtr = graphPtr->crosshairs; diff --git a/src/bltGrLegd.C b/src/bltGrLegd.C index 65e96d9..5f08907 100644 --- a/src/bltGrLegd.C +++ b/src/bltGrLegd.C @@ -189,7 +189,7 @@ struct _Legend { // Defs -static int LegendObjConfigure(Tcl_Interp *interp, Graph* graphPtr, +static int LegendObjConfigure(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj* const objv[]); static void ConfigureLegend(Graph* graphPtr); static int EntryIsSelected(Legend *legendPtr, Element* elemPtr); @@ -200,7 +200,7 @@ static void DeselectElement(Legend *legendPtr, Element* elemPtr); static int SelectRange(Legend *legendPtr, Element *fromPtr, Element *toPtr); static void EventuallyInvokeSelectCmd(Legend *legendPtr); static void SelectEntry(Legend *legendPtr, Element* elemPtr); -static int CreateLegendWindow(Tcl_Interp *interp, Legend *legendPtr, +static int CreateLegendWindow(Tcl_Interp* interp, Legend *legendPtr, const char *pathName); static Tcl_IdleProc DisplayLegend; @@ -227,7 +227,7 @@ Tk_ObjCustomOption positionObjOption = "position", PositionSetProc, PositionGetProc, NULL, NULL, NULL }; -static int PositionSetProc(ClientData clientData, Tcl_Interp *interp, +static int PositionSetProc(ClientData clientData, Tcl_Interp* interp, Tk_Window tkwin, Tcl_Obj** objPtr, char* widgRec, int offset, char* save, int flags) { @@ -588,7 +588,7 @@ static int ConfigureOp(Graph* graphPtr, Tcl_Interp* interp, return LegendObjConfigure(interp, graphPtr, objc-3, objv+3); } -static int LegendObjConfigure(Tcl_Interp *interp, Graph* graphPtr, +static int LegendObjConfigure(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj* const objv[]) { Legend* legendPtr = graphPtr->legend; @@ -666,7 +666,7 @@ int Blt_LegendOp(Graph* graphPtr, Tcl_Interp* interp, return (*proc) (graphPtr, interp, objc, objv); } -static int ActivateOp(Graph* graphPtr, Tcl_Interp *interp, +static int ActivateOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Legend *legendPtr = graphPtr->legend; @@ -746,7 +746,7 @@ static int ActivateOp(Graph* graphPtr, Tcl_Interp *interp, return TCL_OK; } -static int BindOp(Graph* graphPtr, Tcl_Interp *interp, +static int BindOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { if (objc == 3) { @@ -770,7 +770,7 @@ static int BindOp(Graph* graphPtr, Tcl_Interp *interp, return Blt_ConfigureBindingsFromObj(interp, graphPtr->legend->bindTable, Blt_MakeElementTag(graphPtr, Tcl_GetString(objv[3])), objc - 4, objv + 4); } -static int CurselectionOp(Graph* graphPtr, Tcl_Interp *interp, +static int CurselectionOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Legend *legendPtr = graphPtr->legend; @@ -811,7 +811,7 @@ static int CurselectionOp(Graph* graphPtr, Tcl_Interp *interp, return TCL_OK; } -static int FocusOp(Graph* graphPtr, Tcl_Interp *interp, +static int FocusOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Legend *legendPtr = graphPtr->legend; @@ -838,7 +838,7 @@ static int FocusOp(Graph* graphPtr, Tcl_Interp *interp, return TCL_OK; } -static int GetOp(Graph* graphPtr, Tcl_Interp *interp, +static int GetOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Legend *legendPtr = graphPtr->legend; @@ -859,7 +859,7 @@ static int GetOp(Graph* graphPtr, Tcl_Interp *interp, static Blt_OpSpec selectionOps[]; static int nSelectionOps; -static int SelectionOp(Graph* graphPtr, Tcl_Interp *interp, +static int SelectionOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { GraphLegendProc *proc; @@ -890,7 +890,7 @@ static int nLegendOps = sizeof(legendOps) / sizeof(Blt_OpSpec); // Selection Widget Ops -static int SelectionAnchorOp(Graph* graphPtr, Tcl_Interp *interp, +static int SelectionAnchorOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Legend *legendPtr = graphPtr->legend; @@ -910,7 +910,7 @@ static int SelectionAnchorOp(Graph* graphPtr, Tcl_Interp *interp, return TCL_OK; } -static int SelectionClearallOp(Graph* graphPtr, Tcl_Interp *interp, +static int SelectionClearallOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Legend *legendPtr = graphPtr->legend; @@ -919,7 +919,7 @@ static int SelectionClearallOp(Graph* graphPtr, Tcl_Interp *interp, return TCL_OK; } -static int SelectionIncludesOp(Graph* graphPtr, Tcl_Interp *interp, +static int SelectionIncludesOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Legend *legendPtr = graphPtr->legend; @@ -934,7 +934,7 @@ static int SelectionIncludesOp(Graph* graphPtr, Tcl_Interp *interp, return TCL_OK; } -static int SelectionMarkOp(Graph* graphPtr, Tcl_Interp *interp, +static int SelectionMarkOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Legend *legendPtr = graphPtr->legend; @@ -977,7 +977,7 @@ static int SelectionMarkOp(Graph* graphPtr, Tcl_Interp *interp, return TCL_OK; } -static int SelectionPresentOp(Graph* graphPtr, Tcl_Interp *interp, +static int SelectionPresentOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Legend *legendPtr = graphPtr->legend; @@ -988,7 +988,7 @@ static int SelectionPresentOp(Graph* graphPtr, Tcl_Interp *interp, return TCL_OK; } -static int SelectionSetOp(Graph* graphPtr, Tcl_Interp *interp, +static int SelectionSetOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Legend *legendPtr = graphPtr->legend; @@ -1105,7 +1105,7 @@ static void SelectCmdProc(ClientData clientData) Tcl_Preserve(legendPtr); legendPtr->flags &= ~SELECT_PENDING; if (legendPtr->selectCmd != NULL) { - Tcl_Interp *interp; + Tcl_Interp* interp; interp = legendPtr->graphPtr->interp; if (Tcl_GlobalEval(interp, legendPtr->selectCmd) != TCL_OK) { @@ -1142,7 +1142,7 @@ static void LostSelectionProc(ClientData clientData) ClearSelection(legendPtr); } -static int CreateLegendWindow(Tcl_Interp *interp, Legend *legendPtr, +static int CreateLegendWindow(Tcl_Interp* interp, Legend *legendPtr, const char *pathName) { Graph* graphPtr; @@ -1947,7 +1947,7 @@ static int GetElementFromObj(Graph* graphPtr, Tcl_Obj *objPtr, { Element* elemPtr; Legend *legendPtr; - Tcl_Interp *interp; + Tcl_Interp* interp; char c; const char *string; int last; diff --git a/src/bltGrLegd.h b/src/bltGrLegd.h index 28dd254..500320b 100644 --- a/src/bltGrLegd.h +++ b/src/bltGrLegd.h @@ -54,7 +54,7 @@ extern void Blt_DestroyLegend(Graph *graphPtr); extern void Blt_DrawLegend(Graph *graphPtr, Drawable drawable); extern void Blt_MapLegend(Graph *graphPtr, int width, int height); -extern int Blt_LegendOp(Graph *graphPtr, Tcl_Interp *interp, int objc, +extern int Blt_LegendOp(Graph *graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv); extern int Blt_Legend_Site(Graph *graphPtr); extern int Blt_Legend_Width(Graph *graphPtr); diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C index fee6e3e..9a7cb61 100644 --- a/src/bltGrMarker.C +++ b/src/bltGrMarker.C @@ -41,7 +41,7 @@ #include "bltBitmap.h" #include "bltConfig.h" -typedef int (GraphMarkerProc)(Graph* graphPtr, Tcl_Interp *interp, int objc, +typedef int (GraphMarkerProc)(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv); #define GETBITMAP(b) \ @@ -901,7 +901,7 @@ BoxesDontOverlap(Graph* graphPtr, Region2d *extsPtr) */ static int GetCoordinate( - Tcl_Interp *interp, /* Interpreter to return results */ + Tcl_Interp* interp, /* Interpreter to return results */ Tcl_Obj *objPtr, /* Numeric expression string to * parse */ double *valuePtr) /* Real-valued result of expression */ @@ -973,7 +973,7 @@ PrintCoordinate(double x) */ static int ParseCoordinates( - Tcl_Interp *interp, + Tcl_Interp* interp, Marker *markerPtr, int objc, Tcl_Obj *const *objv) @@ -1094,7 +1094,7 @@ FreeCoordsProc( static int ObjToCoordsProc( ClientData clientData, /* Not used. */ - Tcl_Interp *interp, /* Interpreter to return results */ + Tcl_Interp* interp, /* Interpreter to return results */ Tk_Window tkwin, /* Not used. */ Tcl_Obj *objPtr, /* TCL list of numeric expressions */ char* widgRec, /* Marker record */ @@ -1130,7 +1130,7 @@ ObjToCoordsProc( static Tcl_Obj * CoordsToObjProc( ClientData clientData, /* Not used. */ - Tcl_Interp *interp, + Tcl_Interp* interp, Tk_Window tkwin, /* Not used. */ char* widgRec, /* Marker record */ int offset, /* Not used. */ @@ -1152,7 +1152,7 @@ CoordsToObjProc( /*LINTLIBRARY*/ static int GetColorPair( - Tcl_Interp *interp, + Tcl_Interp* interp, Tk_Window tkwin, Tcl_Obj *fgObjPtr, Tcl_Obj *bgObjPtr, ColorPair *pairPtr, @@ -1246,7 +1246,7 @@ FreeColorPairProc( static int ObjToColorPairProc( ClientData clientData, /* Not used. */ - Tcl_Interp *interp, /* Interpreter to return results */ + Tcl_Interp* interp, /* Interpreter to return results */ Tk_Window tkwin, /* Not used. */ Tcl_Obj *objPtr, /* String representing color */ char* widgRec, /* Widget record */ @@ -1300,7 +1300,7 @@ static const char* NameOfColor(XColor* colorPtr) static Tcl_Obj * ColorPairToObjProc( ClientData clientData, /* Not used. */ - Tcl_Interp *interp, + Tcl_Interp* interp, Tk_Window tkwin, /* Not used. */ char* widgRec, /* Element information record */ int offset, /* Offset to field in structure */ @@ -3468,7 +3468,7 @@ CreatePolygonProc(void) } static int -GetMarkerFromObj(Tcl_Interp *interp, Graph* graphPtr, Tcl_Obj *objPtr, +GetMarkerFromObj(Tcl_Interp* interp, Graph* graphPtr, Tcl_Obj *objPtr, Marker **markerPtrPtr) { Tcl_HashEntry *hPtr; @@ -3528,7 +3528,7 @@ RenameMarker(Graph* graphPtr, Marker *markerPtr, const char* oldName, *--------------------------------------------------------------------------- */ static int -NamesOp(Graph* graphPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +NamesOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Tcl_Obj *listObjPtr; @@ -3580,7 +3580,7 @@ NamesOp(Graph* graphPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -BindOp(Graph* graphPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +BindOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { if (objc == 3) { Tcl_HashEntry *hp; @@ -3614,7 +3614,7 @@ BindOp(Graph* graphPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -CgetOp(Graph* graphPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +CgetOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Marker *markerPtr; @@ -3642,7 +3642,7 @@ CgetOp(Graph* graphPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) *--------------------------------------------------------------------------- */ static int -ConfigureOp(Graph* graphPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +ConfigureOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Marker *markerPtr; Tcl_Obj *const *options; @@ -3726,7 +3726,7 @@ ConfigureOp(Graph* graphPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) *--------------------------------------------------------------------------- */ static int -CreateOp(Graph* graphPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +CreateOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Marker *markerPtr; Tcl_HashEntry *hPtr; @@ -3830,7 +3830,7 @@ CreateOp(Graph* graphPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -DeleteOp(Graph* graphPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +DeleteOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { int i; @@ -3866,7 +3866,7 @@ DeleteOp(Graph* graphPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -GetOp(Graph* graphPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +GetOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Marker *markerPtr; const char* string; @@ -3907,7 +3907,7 @@ GetOp(Graph* graphPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -RelinkOp(Graph* graphPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +RelinkOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Blt_ChainLink link, place; Marker *markerPtr; @@ -3959,7 +3959,7 @@ RelinkOp(Graph* graphPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -FindOp(Graph* graphPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +FindOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Blt_ChainLink link; Region2d extents; @@ -4039,7 +4039,7 @@ FindOp(Graph* graphPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -ExistsOp(Graph* graphPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +ExistsOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Tcl_HashEntry *hPtr; @@ -4063,7 +4063,7 @@ ExistsOp(Graph* graphPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -TypeOp(Graph* graphPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +TypeOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Marker *markerPtr; const char* type; @@ -4123,7 +4123,7 @@ static int nMarkerOps = sizeof(markerOps) / sizeof(Blt_OpSpec); /*ARGSUSED*/ int -Blt_MarkerOp(Graph* graphPtr, Tcl_Interp *interp, int objc, +Blt_MarkerOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { GraphMarkerProc *proc; diff --git a/src/bltGrMisc.C b/src/bltGrMisc.C index e8fdd96..bb41f5c 100644 --- a/src/bltGrMisc.C +++ b/src/bltGrMisc.C @@ -462,7 +462,7 @@ Point2d Blt_GetProjection(int x, int y, Point2d *p, Point2d *q) * valid. *--------------------------------------------------------------------------- */ -void Blt_UpdateScrollbar(Tcl_Interp *interp, Tcl_Obj *scrollCmdObjPtr, +void Blt_UpdateScrollbar(Tcl_Interp* interp, Tcl_Obj *scrollCmdObjPtr, int first, int last, int width) { Tcl_Obj *cmdObjPtr; diff --git a/src/bltGrPSOutput.C b/src/bltGrPSOutput.C index 30c79a7..bff4ba2 100644 --- a/src/bltGrPSOutput.C +++ b/src/bltGrPSOutput.C @@ -79,7 +79,7 @@ static Tcl_Interp *psInterp = NULL; */ int Blt_Ps_GetPicaFromObj( - Tcl_Interp *interp, /* Use this for error reporting. */ + Tcl_Interp* interp, /* Use this for error reporting. */ Tcl_Obj *objPtr, /* String describing a number of * pixels. */ int *picaPtr) /* Place to store converted result. */ @@ -207,7 +207,7 @@ Blt_Ps_ComputeBoundingBox(PageSetup *setupPtr, int width, int height) } PostScript * -Blt_Ps_Create(Tcl_Interp *interp, PageSetup *setupPtr) +Blt_Ps_Create(Tcl_Interp* interp, PageSetup *setupPtr) { PostScript *psPtr; @@ -245,7 +245,7 @@ Blt_Ps_GetValue(PostScript *psPtr, int *lengthPtr) } void -Blt_Ps_SetInterp(PostScript *psPtr, Tcl_Interp *interp) +Blt_Ps_SetInterp(PostScript *psPtr, Tcl_Interp* interp) { Tcl_DStringResult(interp, &psPtr->dString); } @@ -269,7 +269,7 @@ Blt_Ps_GetDString(PostScript *psPtr) } int -Blt_Ps_SaveFile(Tcl_Interp *interp, PostScript *psPtr, const char *fileName) +Blt_Ps_SaveFile(Tcl_Interp* interp, PostScript *psPtr, const char *fileName) { Tcl_Channel channel; int nWritten, nBytes; @@ -339,7 +339,7 @@ TCL_VARARGS_DEF(PostScript *, arg1) } int -Blt_Ps_IncludeFile(Tcl_Interp *interp, Blt_Ps ps, const char *fileName) +Blt_Ps_IncludeFile(Tcl_Interp* interp, Blt_Ps ps, const char *fileName) { Tcl_Channel channel; Tcl_DString dString; @@ -944,7 +944,7 @@ void Blt_Ps_XSetFont(PostScript *psPtr, Tk_Font font) { #if 0 - Tcl_Interp *interp = psPtr->interp; + Tcl_Interp* interp = psPtr->interp; const char *family; /* Use the font variable information if it exists. */ diff --git a/src/bltGrPSOutput.h b/src/bltGrPSOutput.h index d97b193..e56c3ea 100644 --- a/src/bltGrPSOutput.h +++ b/src/bltGrPSOutput.h @@ -90,7 +90,7 @@ typedef struct { typedef struct _Blt_Ps *Blt_Ps; -extern Blt_Ps Blt_Ps_Create(Tcl_Interp *interp, PageSetup *setupPtr); +extern Blt_Ps Blt_Ps_Create(Tcl_Interp* interp, PageSetup *setupPtr); extern void Blt_Ps_Free(Blt_Ps ps); @@ -102,7 +102,7 @@ extern Tcl_DString *Blt_Ps_GetDString(Blt_Ps ps); extern char *Blt_Ps_GetScratchBuffer(Blt_Ps ps); -extern void Blt_Ps_SetInterp(Blt_Ps ps, Tcl_Interp *interp); +extern void Blt_Ps_SetInterp(Blt_Ps ps, Tcl_Interp* interp); extern void Blt_Ps_Append(Blt_Ps ps, const char *string); @@ -114,10 +114,10 @@ extern void Blt_Ps_Format TCL_VARARGS(Blt_Ps, ps); extern void Blt_Ps_SetClearBackground(Blt_Ps ps); -extern int Blt_Ps_IncludeFile(Tcl_Interp *interp, Blt_Ps ps, +extern int Blt_Ps_IncludeFile(Tcl_Interp* interp, Blt_Ps ps, const char *fileName); -extern int Blt_Ps_GetPicaFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, +extern int Blt_Ps_GetPicaFromObj(Tcl_Interp* interp, Tcl_Obj *objPtr, int *picaPtr); extern int Blt_Ps_ComputeBoundingBox(PageSetup *setupPtr, int w, int h); @@ -125,7 +125,7 @@ extern int Blt_Ps_ComputeBoundingBox(PageSetup *setupPtr, int w, int h); extern void Blt_Ps_Rectangle(Blt_Ps ps, int x, int y, int w, int h); -extern int Blt_Ps_SaveFile(Tcl_Interp *interp, Blt_Ps ps, +extern int Blt_Ps_SaveFile(Tcl_Interp* interp, Blt_Ps ps, const char *fileName); #ifdef _TK diff --git a/src/bltGrPenOp.C b/src/bltGrPenOp.C index 195f50f..916e140 100644 --- a/src/bltGrPenOp.C +++ b/src/bltGrPenOp.C @@ -44,11 +44,11 @@ // Defs static void DestroyPen(Pen* penPtr); -static int GetPenFromObj(Tcl_Interp *interp, Graph* graphPtr, Tcl_Obj *objPtr, +static int GetPenFromObj(Tcl_Interp* interp, Graph* graphPtr, Tcl_Obj *objPtr, Pen **penPtrPtr); -static int PenObjConfigure(Tcl_Interp *interp, Graph* graphPtr, Pen* penPtr, +static int PenObjConfigure(Tcl_Interp* interp, Graph* graphPtr, Pen* penPtr, int objc, Tcl_Obj* const objv[]); -typedef int (GraphPenProc)(Tcl_Interp *interp, Graph* graphPtr, int objc, +typedef int (GraphPenProc)(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv); // OptionSpecs @@ -64,7 +64,7 @@ Tk_ObjCustomOption linePenObjOption = "linePen", PenSetProc, PenGetProc, NULL, NULL, (ClientData)CID_ELEM_LINE }; -static int PenSetProc(ClientData clientData, Tcl_Interp *interp, +static int PenSetProc(ClientData clientData, Tcl_Interp* interp, Tk_Window tkwin, Tcl_Obj** objPtr, char* widgRec, int offset, char* save, int flags) { @@ -190,7 +190,7 @@ static int CgetOp(Tcl_Interp* interp, Graph* graphPtr, return TCL_OK; } -static int ConfigureOp(Tcl_Interp *interp, Graph* graphPtr, +static int ConfigureOp(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv) { Pen* penPtr; @@ -212,7 +212,7 @@ static int ConfigureOp(Tcl_Interp *interp, Graph* graphPtr, return PenObjConfigure(interp, graphPtr, penPtr, objc-4, objv+4); } -static int PenObjConfigure(Tcl_Interp *interp, Graph* graphPtr, Pen* penPtr, +static int PenObjConfigure(Tcl_Interp* interp, Graph* graphPtr, Pen* penPtr, int objc, Tcl_Obj* const objv[]) { Tk_SavedOptions savedOptions; @@ -255,7 +255,7 @@ static int PenObjConfigure(Tcl_Interp *interp, Graph* graphPtr, Pen* penPtr, // Ops -static int CreateOp(Tcl_Interp *interp, Graph* graphPtr, +static int CreateOp(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv) { if (Blt_CreatePen(graphPtr, interp, Tcl_GetString(objv[3]), graphPtr->classId, objc, objv) != TCL_OK) @@ -264,7 +264,7 @@ static int CreateOp(Tcl_Interp *interp, Graph* graphPtr, return TCL_OK; } -static int DeleteOp(Tcl_Interp *interp, Graph* graphPtr, +static int DeleteOp(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv) { int i; @@ -289,7 +289,7 @@ static int DeleteOp(Tcl_Interp *interp, Graph* graphPtr, return TCL_OK; } -static int NamesOp(Tcl_Interp *interp, Graph* graphPtr, +static int NamesOp(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv) { Tcl_Obj *listObjPtr; @@ -338,7 +338,7 @@ static int NamesOp(Tcl_Interp *interp, Graph* graphPtr, return TCL_OK; } -static int TypeOp(Tcl_Interp *interp, Graph* graphPtr, +static int TypeOp(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj *const *objv) { Pen* penPtr; @@ -364,7 +364,7 @@ static int nPenOps = sizeof(penOps) / sizeof(Blt_OpSpec); // Extern -int Blt_PenOp(Graph* graphPtr, Tcl_Interp *interp, +int Blt_PenOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { GraphPenProc *proc = Blt_GetOpFromObj(interp, nPenOps, penOps, BLT_OP_ARG2, @@ -401,7 +401,7 @@ void Blt_FreePen(Pen* penPtr) } } -int Blt_GetPenFromObj(Tcl_Interp *interp, Graph* graphPtr, Tcl_Obj *objPtr, +int Blt_GetPenFromObj(Tcl_Interp* interp, Graph* graphPtr, Tcl_Obj *objPtr, ClassId classId, Pen **penPtrPtr) { Pen* penPtr = NULL; @@ -434,7 +434,7 @@ int Blt_GetPenFromObj(Tcl_Interp *interp, Graph* graphPtr, Tcl_Obj *objPtr, // Support -static int GetPenFromObj(Tcl_Interp *interp, Graph* graphPtr, Tcl_Obj *objPtr, +static int GetPenFromObj(Tcl_Interp* interp, Graph* graphPtr, Tcl_Obj *objPtr, Pen **penPtrPtr) { Tcl_HashEntry *hPtr; diff --git a/src/bltGraph.h b/src/bltGraph.h index 5b9f79c..138473d 100644 --- a/src/bltGraph.h +++ b/src/bltGraph.h @@ -228,7 +228,7 @@ typedef struct { *--------------------------------------------------------------------------- */ struct _Graph { - Tcl_Interp *interp; /* Interpreter associated with graph */ + Tcl_Interp* interp; /* Interpreter associated with graph */ Tk_Window tkwin; /* Window that embodies the graph. * NULL means that the window has been * destroyed but the data structures @@ -522,7 +522,7 @@ extern void Blt_DrawMarkers(Graph* graphPtr, Drawable drawable, int under); extern void Blt_Draw2DSegments(Display *display, Drawable drawable, GC gc, Segment2d *segments, int nSegments); -extern int Blt_GetCoordinate(Tcl_Interp *interp, const char *string, +extern int Blt_GetCoordinate(Tcl_Interp* interp, const char *string, double *valuePtr); extern void Blt_InitBarSetTable(Graph* graphPtr); @@ -551,7 +551,7 @@ extern void Blt_MapMarkers(Graph* graphPtr); extern void Blt_DestroyPens(Graph* graphPtr); -extern int Blt_GetPenFromObj(Tcl_Interp *interp, Graph* graphPtr, +extern int Blt_GetPenFromObj(Tcl_Interp* interp, Graph* graphPtr, Tcl_Obj *objPtr, ClassId classId, Pen **penPtrPtr); extern Pen* Blt_BarPen(Graph* graphPtr, const char* penName); @@ -568,22 +568,22 @@ extern int Blt_InitBarPens(Graph* graphPtr); extern void Blt_FreePen(Pen* penPtr); -extern int Blt_VirtualAxisOp(Graph* graphPtr, Tcl_Interp *interp, +extern int Blt_VirtualAxisOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv); -extern int Blt_AxisOp(Tcl_Interp *interp, Graph* graphPtr, int margin, +extern int Blt_AxisOp(Tcl_Interp* interp, Graph* graphPtr, int margin, int objc, Tcl_Obj *const *objv); -extern int Blt_ElementOp(Graph* graphPtr, Tcl_Interp *interp, int objc, +extern int Blt_ElementOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv, ClassId classId); -extern int Blt_CrosshairsOp(Graph* graphPtr, Tcl_Interp *interp, int objc, +extern int Blt_CrosshairsOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv); -extern int Blt_MarkerOp(Graph* graphPtr, Tcl_Interp *interp, int objc, +extern int Blt_MarkerOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv); -extern int Blt_PenOp(Graph* graphPtr, Tcl_Interp *interp, int objc, +extern int Blt_PenOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv); extern int Blt_PointInPolygon(Point2d *samplePtr, Point2d *screenPts, @@ -595,7 +595,7 @@ extern int Blt_RegionInPolygon(Region2d *extsPtr, Point2d *points, extern int Blt_PointInSegments(Point2d *samplePtr, Segment2d *segments, int nSegments, double halo); -extern int Blt_PostScriptOp(Graph* graphPtr, Tcl_Interp *interp, int objc, +extern int Blt_PostScriptOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv); extern int Blt_GraphUpdateNeeded(Graph* graphPtr); diff --git a/src/bltInt.C b/src/bltInt.C index 2fdeaa9..284b72e 100644 --- a/src/bltInt.C +++ b/src/bltInt.C @@ -40,7 +40,7 @@ extern Tcl_AppInitProc Blt_VectorCmdInitProc; Tcl_AppInitProc Tkblt_Init; Tcl_AppInitProc Tkblt_SafeInit; -int Tkblt_Init(Tcl_Interp *interp) +int Tkblt_Init(Tcl_Interp* interp) { Tcl_Namespace *nsPtr; @@ -84,12 +84,12 @@ int Tkblt_Init(Tcl_Interp *interp) return TCL_OK; } -int Tkblt_SafeInit(Tcl_Interp *interp) +int Tkblt_SafeInit(Tcl_Interp* interp) { return Tkblt_Init(interp); } -int Blt_InitCmd(Tcl_Interp *interp, const char *nsName, +int Blt_InitCmd(Tcl_Interp* interp, const char *nsName, Blt_InitCmdSpec *specPtr) { Tcl_DString dString; diff --git a/src/bltNsUtil.C b/src/bltNsUtil.C index 0bea544..8b43b19 100644 --- a/src/bltNsUtil.C +++ b/src/bltNsUtil.C @@ -47,7 +47,7 @@ Blt_GetCommandNamespace(Tcl_Command cmdToken) } int -Blt_ParseObjectName(Tcl_Interp *interp, const char *path, +Blt_ParseObjectName(Tcl_Interp* interp, const char *path, Blt_ObjectName *namePtr, unsigned int flags) { char *last, *colon; @@ -131,7 +131,7 @@ static Tcl_Namespace* NamespaceOfVariable(Var *varPtr) */ Tcl_Namespace * -Blt_GetVariableNamespace(Tcl_Interp *interp, const char *path) +Blt_GetVariableNamespace(Tcl_Interp* interp, const char *path) { Blt_ObjectName objName; diff --git a/src/bltNsUtil.h b/src/bltNsUtil.h index 942b841..1affdb7 100644 --- a/src/bltNsUtil.h +++ b/src/bltNsUtil.h @@ -51,12 +51,12 @@ typedef struct { /* * Auxillary procedures */ -extern Tcl_Namespace *Blt_GetVariableNamespace(Tcl_Interp *interp, +extern Tcl_Namespace *Blt_GetVariableNamespace(Tcl_Interp* interp, const char *varName); extern Tcl_Namespace *Blt_GetCommandNamespace(Tcl_Command cmdToken); -extern int Blt_ParseObjectName(Tcl_Interp *interp, const char *name, +extern int Blt_ParseObjectName(Tcl_Interp* interp, const char *name, Blt_ObjectName *objNamePtr, unsigned int flags); extern char *Blt_MakeQualifiedName(Blt_ObjectName *objNamePtr, diff --git a/src/bltOp.h b/src/bltOp.h index c4a01bd..4722303 100644 --- a/src/bltOp.h +++ b/src/bltOp.h @@ -36,7 +36,7 @@ typedef enum { #define BLT_OP_BINARY_SEARCH 0 #define BLT_OP_LINEAR_SEARCH 1 -extern void *Blt_GetOpFromObj(Tcl_Interp *interp, int nSpecs, +extern void *Blt_GetOpFromObj(Tcl_Interp* interp, int nSpecs, Blt_OpSpec *specs, int operPos, int objc, Tcl_Obj *const *objv, int flags); diff --git a/src/bltParse.C b/src/bltParse.C index 7d31e3d..283b042 100644 --- a/src/bltParse.C +++ b/src/bltParse.C @@ -208,7 +208,7 @@ static unsigned char tclTypeTable[] = *--------------------------------------------------------------------------- */ int Blt_ParseNestedCmd( - Tcl_Interp *interp, /* Interpreter to use for nested command + Tcl_Interp* interp, /* Interpreter to use for nested command * evaluations and error messages. */ const char *string, /* Character just after opening bracket. */ int flags, /* Flags to pass to nested Tcl_Eval. */ @@ -247,7 +247,7 @@ int Blt_ParseNestedCmd( */ int Blt_ParseBraces( - Tcl_Interp *interp, /* Interpreter to use for nested command + Tcl_Interp* interp, /* Interpreter to use for nested command * evaluations and error messages. */ const char *string, /* Character just after opening bracket. */ const char **termPtr, /* Store address of terminating character @@ -423,7 +423,7 @@ void Blt_ExpandParseValue( *--------------------------------------------------------------------------- */ int Blt_ParseQuotes( - Tcl_Interp *interp, /* Interpreter to use for nested command + Tcl_Interp* interp, /* Interpreter to use for nested command * evaluations and error messages. */ const char *string, /* Character just after opening double- * quote. */ diff --git a/src/bltParse.h b/src/bltParse.h index fab12c1..9e2ee79 100644 --- a/src/bltParse.h +++ b/src/bltParse.h @@ -41,11 +41,11 @@ struct _ParseValue { ClientData clientData; }; -extern int Blt_ParseBraces(Tcl_Interp *interp, const char *string, +extern int Blt_ParseBraces(Tcl_Interp* interp, const char *string, const char **termPtr, ParseValue *pvPtr); -extern int Blt_ParseNestedCmd(Tcl_Interp *interp, const char *string, +extern int Blt_ParseNestedCmd(Tcl_Interp* interp, const char *string, int flags, const char **termPtr, ParseValue *pvPtr); -extern int Blt_ParseQuotes(Tcl_Interp *interp, const char *string, +extern int Blt_ParseQuotes(Tcl_Interp* interp, const char *string, int termChar, int flags, const char **termPtr, ParseValue * pvPtr); extern void Blt_ExpandParseValue(ParseValue *pvPtr, int needed); diff --git a/src/bltSwitch.C b/src/bltSwitch.C index 16cdd38..753c765 100644 --- a/src/bltSwitch.C +++ b/src/bltSwitch.C @@ -39,7 +39,7 @@ #include "bltSwitch.h" static void -DoHelp(Tcl_Interp *interp, Blt_SwitchSpec *specs) +DoHelp(Tcl_Interp* interp, Blt_SwitchSpec *specs) { Tcl_DString ds; Blt_SwitchSpec *sp; @@ -76,7 +76,7 @@ DoHelp(Tcl_Interp *interp, Blt_SwitchSpec *specs) */ static Blt_SwitchSpec * FindSwitchSpec( - Tcl_Interp *interp, /* Used for reporting errors. */ + Tcl_Interp* interp, /* Used for reporting errors. */ Blt_SwitchSpec *specs, /* Pointer to table of configuration * specifications for a widget. */ const char *name, /* Name identifying a particular switch. */ @@ -146,7 +146,7 @@ FindSwitchSpec( */ static int DoSwitch( - Tcl_Interp *interp, /* Interpreter for error reporting. */ + Tcl_Interp* interp, /* Interpreter for error reporting. */ Blt_SwitchSpec *sp, /* Specifier to apply. */ Tcl_Obj *objPtr, /* Value to use to fill in widgRec. */ void *record) /* Record whose fields are to be modified. @@ -322,7 +322,7 @@ DoSwitch( */ int Blt_ParseSwitches( - Tcl_Interp *interp, /* Interpreter for error reporting. */ + Tcl_Interp* interp, /* Interpreter for error reporting. */ Blt_SwitchSpec *specs, /* Describes legal switches. */ int objc, /* Number of elements in argv. */ Tcl_Obj *const *objv, /* Command-line switches. */ @@ -473,7 +473,7 @@ Blt_FreeSwitches( } int -Blt_ExprDoubleFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, double *valuePtr) +Blt_ExprDoubleFromObj(Tcl_Interp* interp, Tcl_Obj *objPtr, double *valuePtr) { /* First try to extract the value as a double precision number. */ if (Tcl_GetDoubleFromObj((Tcl_Interp *)NULL, objPtr, valuePtr) == TCL_OK) { @@ -488,7 +488,7 @@ Blt_ExprDoubleFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, double *valuePtr) int Blt_ExprIntFromObj( - Tcl_Interp *interp, + Tcl_Interp* interp, Tcl_Obj *objPtr, int *valuePtr) { diff --git a/src/bltSwitch.h b/src/bltSwitch.h index 3eb036d..f2c9c27 100644 --- a/src/bltSwitch.h +++ b/src/bltSwitch.h @@ -37,7 +37,7 @@ # include <stddef.h> -typedef int (Blt_SwitchParseProc)(ClientData clientData, Tcl_Interp *interp, +typedef int (Blt_SwitchParseProc)(ClientData clientData, Tcl_Interp* interp, const char *switchName, Tcl_Obj *valueObjPtr, char *record, int offset, int flags); typedef void (Blt_SwitchFreeProc)(char *record, int offset, int flags); @@ -121,7 +121,7 @@ typedef struct { #define BLT_SWITCH_SPECIFIED (1<<4) #define BLT_SWITCH_USER_BIT (1<<8) -extern int Blt_ParseSwitches(Tcl_Interp *interp, Blt_SwitchSpec *specPtr, +extern int Blt_ParseSwitches(Tcl_Interp* interp, Blt_SwitchSpec *specPtr, int objc, Tcl_Obj *const *objv, void *rec, int flags); extern void Blt_FreeSwitches(Blt_SwitchSpec *specs, void *rec, int flags); diff --git a/src/bltVecCmd.C b/src/bltVecCmd.C index 1dfcfc1..12ad4e8 100644 --- a/src/bltVecCmd.C +++ b/src/bltVecCmd.C @@ -60,7 +60,7 @@ #include "bltNsUtil.h" #include "bltSwitch.h" -typedef int (VectorCmdProc)(Vector *vPtr, Tcl_Interp *interp, int objc, +typedef int (VectorCmdProc)(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv); static Blt_SwitchParseProc ObjToFFTVector; @@ -149,7 +149,7 @@ static Blt_SwitchSpec fftSwitches[] = { static int ObjToFFTVector( ClientData clientData, /* Not used. */ - Tcl_Interp *interp, /* Interpreter to send results back to */ + Tcl_Interp* interp, /* Interpreter to send results back to */ const char *switchName, /* Not used. */ Tcl_Obj *objPtr, /* Name of vector. */ char *record, /* Structure record */ @@ -188,7 +188,7 @@ static int ObjToIndex( ClientData clientData, /* Contains the vector in question to verify * its length. */ - Tcl_Interp *interp, /* Interpreter to send results back to */ + Tcl_Interp* interp, /* Interpreter to send results back to */ const char *switchName, /* Not used. */ Tcl_Obj *objPtr, /* Name of vector. */ char *record, /* Structure record */ @@ -236,7 +236,7 @@ ReplicateValue(Vector *vPtr, int first, int last, double value) } static int -CopyList(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +CopyList(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { int i; @@ -276,7 +276,7 @@ AppendVector(Vector *destPtr, Vector *srcPtr) static int AppendList(Vector *vPtr, int objc, Tcl_Obj *const *objv) { - Tcl_Interp *interp = vPtr->interp; + Tcl_Interp* interp = vPtr->interp; int count; int i; double value; @@ -319,7 +319,7 @@ AppendList(Vector *vPtr, int objc, Tcl_Obj *const *objv) *--------------------------------------------------------------------------- */ static int -AppendOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +AppendOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { int i; int result; @@ -372,7 +372,7 @@ AppendOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -ClearOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +ClearOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Blt_Vec_FlushCache(vPtr); return TCL_OK; @@ -398,7 +398,7 @@ ClearOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -DeleteOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +DeleteOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { unsigned char *unsetArr; int i, j; @@ -467,7 +467,7 @@ DeleteOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -DupOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +DupOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { int i; @@ -503,7 +503,7 @@ DupOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) /* fft implementation */ /*ARGSUSED*/ static int -FFTOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +FFTOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Vector *v2Ptr = NULL; int isNew; @@ -556,7 +556,7 @@ FFTOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) /*ARGSUSED*/ static int -InverseFFTOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +InverseFFTOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { int isNew; char *name; @@ -606,7 +606,7 @@ InverseFFTOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) *--------------------------------------------------------------------------- */ static int -IndexOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +IndexOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { int first, last; char *string; @@ -671,7 +671,7 @@ IndexOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) *--------------------------------------------------------------------------- */ static int -LengthOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +LengthOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { if (objc == 3) { int nElem; @@ -714,7 +714,7 @@ LengthOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -MapOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +MapOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { if (objc > 2) { if (Blt_Vec_MapVariable(interp, vPtr, Tcl_GetString(objv[2])) @@ -742,7 +742,7 @@ MapOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -MaxOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +MaxOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Tcl_SetDoubleObj(Tcl_GetObjResult(interp), Blt_Vec_Max(vPtr)); return TCL_OK; @@ -764,7 +764,7 @@ MaxOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -MergeOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +MergeOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Vector **vecArr; int refSize, nElem; @@ -839,7 +839,7 @@ MergeOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -MinOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +MinOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Tcl_SetDoubleObj(Tcl_GetObjResult(interp), Blt_Vec_Min(vPtr)); return TCL_OK; @@ -860,7 +860,7 @@ MinOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -NormalizeOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +NormalizeOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { int i; double range; @@ -928,7 +928,7 @@ NormalizeOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -NotifyOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +NotifyOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { int option; int bool; @@ -990,7 +990,7 @@ NotifyOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -PopulateOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +PopulateOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Vector *v2Ptr; int size, density; @@ -1059,7 +1059,7 @@ PopulateOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -ValuesOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +ValuesOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { PrintSwitches switches; @@ -1122,7 +1122,7 @@ ValuesOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -RangeOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +RangeOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Tcl_Obj *listObjPtr; int first, last; @@ -1223,7 +1223,7 @@ enum NativeFormats { *--------------------------------------------------------------------------- */ static enum NativeFormats -GetBinaryFormat(Tcl_Interp *interp, char *string, int *sizePtr) +GetBinaryFormat(Tcl_Interp* interp, char *string, int *sizePtr) { char c; @@ -1389,7 +1389,7 @@ CopyValues(Vector *vPtr, char *byteArr, enum NativeFormats fmt, int size, */ /*ARGSUSED*/ static int -BinreadOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +BinreadOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Tcl_Channel channel; char *byteArr; @@ -1537,7 +1537,7 @@ BinreadOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -SearchOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +SearchOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { double min, max; int i; @@ -1605,7 +1605,7 @@ SearchOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -OffsetOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +OffsetOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { if (objc == 3) { int newOffset; @@ -1633,7 +1633,7 @@ OffsetOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -RandomOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +RandomOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { int i; @@ -1661,7 +1661,7 @@ RandomOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -SeqOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +SeqOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { int n; double start, stop; @@ -1715,7 +1715,7 @@ SeqOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -SetOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +SetOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { int result; Vector *v2Ptr; @@ -1783,7 +1783,7 @@ SetOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -SimplifyOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +SimplifyOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { size_t i, n; int length, nPoints; @@ -1828,7 +1828,7 @@ SimplifyOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -SplitOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +SplitOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { int nVectors; @@ -1936,7 +1936,7 @@ Blt_Vec_SortMap(Vector **vectors, int nVectors) } static size_t * -SortVectors(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +SortVectors(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Vector **vectors, *v2Ptr; size_t *map; @@ -1985,7 +1985,7 @@ SortVectors(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) *--------------------------------------------------------------------------- */ static int -SortOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +SortOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { Vector *v2Ptr; double *copy; @@ -2091,7 +2091,7 @@ SortOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -InstExprOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +InstExprOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { if (Blt_ExprVector(interp, Tcl_GetString(objv[2]), (Blt_Vector *)vPtr) @@ -2123,7 +2123,7 @@ InstExprOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) */ /*ARGSUSED*/ static int -ArithOp(Vector *vPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) +ArithOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { double value; int i; @@ -2275,7 +2275,7 @@ static Blt_OpSpec vectorInstOps[] = static int nInstOps = sizeof(vectorInstOps) / sizeof(Blt_OpSpec); int -Blt_Vec_InstCmd(ClientData clientData, Tcl_Interp *interp, int objc, +Blt_Vec_InstCmd(ClientData clientData, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { VectorCmdProc *proc; @@ -2305,7 +2305,7 @@ Blt_Vec_InstCmd(ClientData clientData, Tcl_Interp *interp, int objc, *--------------------------------------------------------------------------- */ char * -Blt_Vec_VarTrace(ClientData clientData, Tcl_Interp *interp, const char *part1, +Blt_Vec_VarTrace(ClientData clientData, Tcl_Interp* interp, const char *part1, const char *part2, int flags) { Blt_VectorIndexProc *indexProc; diff --git a/src/bltVecInt.h b/src/bltVecInt.h index 72581ab..953e0b7 100644 --- a/src/bltVecInt.h +++ b/src/bltVecInt.h @@ -57,7 +57,7 @@ typedef struct { Tcl_HashTable vectorTable; /* Table of vectors */ Tcl_HashTable mathProcTable; /* Table of vector math functions */ Tcl_HashTable indexProcTable; - Tcl_Interp *interp; + Tcl_Interp* interp; unsigned int nextId; } VectorInterpData; @@ -105,7 +105,7 @@ typedef struct { * entry in the vector hash table. */ VectorInterpData *dataPtr; - Tcl_Interp *interp; /* Interpreter associated with the + Tcl_Interp* interp; /* Interpreter associated with the * vector */ Tcl_HashEntry *hashPtr; /* If non-NULL, pointer in a hash table to @@ -188,7 +188,7 @@ extern void Blt_Vec_InstallMathFunctions(Tcl_HashTable *tablePtr); extern void Blt_Vec_UninstallMathFunctions(Tcl_HashTable *tablePtr); -extern VectorInterpData *Blt_Vec_GetInterpData (Tcl_Interp *interp); +extern VectorInterpData *Blt_Vec_GetInterpData (Tcl_Interp* interp); extern double Blt_Vec_Max(Vector *vecObjPtr); extern double Blt_Vec_Min(Vector *vecObjPtr); @@ -197,16 +197,16 @@ extern Vector *Blt_Vec_New(VectorInterpData *dataPtr); extern int Blt_Vec_Duplicate(Vector *destPtr, Vector *srcPtr); -extern int Blt_Vec_SetLength(Tcl_Interp *interp, Vector *vPtr, +extern int Blt_Vec_SetLength(Tcl_Interp* interp, Vector *vPtr, int length); -extern int Blt_Vec_SetSize(Tcl_Interp *interp, Vector *vPtr, +extern int Blt_Vec_SetSize(Tcl_Interp* interp, Vector *vPtr, int size); -extern int Blt_Vec_ChangeLength(Tcl_Interp *interp, Vector *vPtr, +extern int Blt_Vec_ChangeLength(Tcl_Interp* interp, Vector *vPtr, int length); -extern Vector *Blt_Vec_ParseElement(Tcl_Interp *interp, +extern Vector *Blt_Vec_ParseElement(Tcl_Interp* interp, VectorInterpData *dataPtr, const char *start, const char **endPtr, int flags); @@ -230,21 +230,21 @@ extern void Blt_Vec_FlushCache(Vector *vPtr); extern int Blt_Vec_Reset(Vector *vPtr, double *dataArr, int nValues, int arraySize, Tcl_FreeProc *freeProc); -extern int Blt_Vec_GetIndex(Tcl_Interp *interp, Vector *vPtr, +extern int Blt_Vec_GetIndex(Tcl_Interp* interp, Vector *vPtr, const char *string, int *indexPtr, int flags, Blt_VectorIndexProc **procPtrPtr); -extern int Blt_Vec_GetIndexRange(Tcl_Interp *interp, Vector *vPtr, +extern int Blt_Vec_GetIndexRange(Tcl_Interp* interp, Vector *vPtr, const char *string, int flags, Blt_VectorIndexProc **procPtrPtr); -extern int Blt_Vec_MapVariable(Tcl_Interp *interp, Vector *vPtr, +extern int Blt_Vec_MapVariable(Tcl_Interp* interp, Vector *vPtr, const char *name); -extern int Blt_Vec_FFT(Tcl_Interp *interp, Vector *realPtr, +extern int Blt_Vec_FFT(Tcl_Interp* interp, Vector *realPtr, Vector *phasesPtr, Vector *freqPtr, double delta, int flags, Vector *srcPtr); -extern int Blt_Vec_InverseFFT(Tcl_Interp *interp, Vector *iSrcPtr, +extern int Blt_Vec_InverseFFT(Tcl_Interp* interp, Vector *iSrcPtr, Vector *rDestPtr, Vector *iDestPtr, Vector *srcPtr); extern Tcl_ObjCmdProc Blt_Vec_InstCmd; diff --git a/src/bltVecMath.C b/src/bltVecMath.C index fd7db6a..918d119 100644 --- a/src/bltVecMath.C +++ b/src/bltVecMath.C @@ -163,7 +163,7 @@ static int precTable[] = * Forward declarations. */ -static int NextValue(Tcl_Interp *interp, ParseInfo *piPtr, int prec, +static int NextValue(Tcl_Interp* interp, ParseInfo *piPtr, int prec, Value *valuePtr); /* @@ -595,7 +595,7 @@ Fmod(double x, double y) */ static void MathError( - Tcl_Interp *interp, /* Where to store error message. */ + Tcl_Interp* interp, /* Where to store error message. */ double value) /* Value returned after error; used to * distinguish underflows from * overflows. */ @@ -651,7 +651,7 @@ MathError( static int ParseString( - Tcl_Interp *interp, /* Where to store error message. */ + Tcl_Interp* interp, /* Where to store error message. */ const char *string, /* String to turn into value. */ Value *valuePtr) /* Where to store value information. * Caller must have initialized pv field. */ @@ -729,7 +729,7 @@ ParseString( */ static int ParseMathFunction( - Tcl_Interp *interp, /* Interpreter to use for error reporting. */ + Tcl_Interp* interp, /* Interpreter to use for error reporting. */ const char *start, /* Start of string to parse */ ParseInfo *piPtr, /* Describes the state of the parse. * piPtr->nextPtr must point to the @@ -814,7 +814,7 @@ ParseMathFunction( */ static int NextToken( - Tcl_Interp *interp, /* Interpreter to use for error reporting. */ + Tcl_Interp* interp, /* Interpreter to use for error reporting. */ ParseInfo *piPtr, /* Describes the state of the parse. */ Value *valuePtr) /* Where to store value, if that is * what's parsed from string. Caller @@ -1060,7 +1060,7 @@ NextToken( */ static int NextValue( - Tcl_Interp *interp, /* Interpreter to use for error reporting. */ + Tcl_Interp* interp, /* Interpreter to use for error reporting. */ ParseInfo *piPtr, /* Describes the state of the parse * just before the value (i.e. NextToken will * be called to get first token of value). */ @@ -1606,7 +1606,7 @@ NextValue( */ static int EvaluateExpression( - Tcl_Interp *interp, /* Context in which to evaluate the + Tcl_Interp* interp, /* Context in which to evaluate the * expression. */ char *string, /* Expression to evaluate. */ Value *valuePtr) /* Where to store result. Should @@ -1670,7 +1670,7 @@ ComponentFunc( ClientData clientData, /* Contains address of procedure that * takes one double argument and * returns a double result. */ - Tcl_Interp *interp, + Tcl_Interp* interp, Vector *vPtr) { ComponentProc *procPtr = (ComponentProc *) clientData; @@ -1696,7 +1696,7 @@ ComponentFunc( } static int -ScalarFunc(ClientData clientData, Tcl_Interp *interp, Vector *vPtr) +ScalarFunc(ClientData clientData, Tcl_Interp* interp, Vector *vPtr) { double value; ScalarProc *procPtr = (ScalarProc *) clientData; @@ -1716,7 +1716,7 @@ ScalarFunc(ClientData clientData, Tcl_Interp *interp, Vector *vPtr) /*ARGSUSED*/ static int -VectorFunc(ClientData clientData, Tcl_Interp *interp, Vector *vPtr) +VectorFunc(ClientData clientData, Tcl_Interp* interp, Vector *vPtr) { VectorProc *procPtr = (VectorProc *) clientData; @@ -1850,7 +1850,7 @@ Blt_Vec_InstallSpecialIndices(Tcl_HashTable *tablePtr) */ int Blt_ExprVector( - Tcl_Interp *interp, /* Context in which to evaluate the + Tcl_Interp* interp, /* Context in which to evaluate the * expression. */ char *string, /* Expression to evaluate. */ Blt_Vector *vector) /* Where to store result. */ diff --git a/src/bltVector.C b/src/bltVector.C index dd68ef2..f149b35 100644 --- a/src/bltVector.C +++ b/src/bltVector.C @@ -117,7 +117,7 @@ static Blt_SwitchSpec createSwitches[] = {BLT_SWITCH_END} }; -typedef int (VectorCmdProc)(Vector *vecObjPtr, Tcl_Interp *interp, +typedef int (VectorCmdProc)(Vector *vecObjPtr, Tcl_Interp* interp, int objc, Tcl_Obj *const *objv); static Vector * @@ -159,7 +159,7 @@ GetVectorObject( { Blt_ObjectName objName; Vector *vPtr; - Tcl_Interp *interp; + Tcl_Interp* interp; interp = dataPtr->interp; if (!Blt_ParseObjectName(interp, name, &objName, @@ -221,7 +221,7 @@ Blt_Vec_UpdateRange(Vector *vPtr) */ int Blt_Vec_GetIndex( - Tcl_Interp *interp, + Tcl_Interp* interp, Vector *vPtr, const char *string, int *indexPtr, @@ -312,7 +312,7 @@ Blt_Vec_GetIndex( */ int Blt_Vec_GetIndexRange( - Tcl_Interp *interp, + Tcl_Interp* interp, Vector *vPtr, const char *string, int flags, @@ -369,7 +369,7 @@ Blt_Vec_GetIndexRange( Vector * Blt_Vec_ParseElement( - Tcl_Interp *interp, + Tcl_Interp* interp, VectorInterpData *dataPtr, /* Interpreter-specific data. */ const char *start, const char **endPtr, @@ -556,7 +556,7 @@ Blt_Vec_UpdateClients(Vector *vPtr) void Blt_Vec_FlushCache(Vector *vPtr) { - Tcl_Interp *interp = vPtr->interp; + Tcl_Interp* interp = vPtr->interp; if (vPtr->arrayName == NULL) { return; /* Doesn't use the variable API */ @@ -667,7 +667,7 @@ Blt_Vec_Max(Vector *vecObjPtr) static void DeleteCommand(Vector *vPtr) /* Vector associated with the TCL command. */ { - Tcl_Interp *interp = vPtr->interp; + Tcl_Interp* interp = vPtr->interp; char *qualName; /* Name of TCL command. */ Tcl_CmdInfo cmdInfo; Tcl_DString dString; @@ -703,7 +703,7 @@ DeleteCommand(Vector *vPtr) /* Vector associated with the TCL command. */ static void UnmapVariable(Vector *vPtr) { - Tcl_Interp *interp = vPtr->interp; + Tcl_Interp* interp = vPtr->interp; /* Unset the entire array */ Tcl_UntraceVar2(interp, vPtr->arrayName, (char *)NULL, @@ -740,7 +740,7 @@ UnmapVariable(Vector *vPtr) */ int Blt_Vec_MapVariable( - Tcl_Interp *interp, + Tcl_Interp* interp, Vector *vPtr, const char *path) { @@ -825,7 +825,7 @@ Blt_Vec_MapVariable( */ int Blt_Vec_SetSize( - Tcl_Interp *interp, + Tcl_Interp* interp, Vector *vPtr, int newSize) /* Size of array in elements */ { @@ -927,7 +927,7 @@ Blt_Vec_SetSize( */ int Blt_Vec_SetLength( - Tcl_Interp *interp, + Tcl_Interp* interp, Vector *vPtr, int newLength) /* Size of array in elements */ { @@ -973,7 +973,7 @@ Blt_Vec_SetLength( int Blt_Vec_ChangeLength( - Tcl_Interp *interp, + Tcl_Interp* interp, Vector *vPtr, int newLength) { @@ -1242,7 +1242,7 @@ Blt_Vec_Create( Blt_ObjectName objName; char *qualName; Tcl_HashEntry *hPtr; - Tcl_Interp *interp = dataPtr->interp; + Tcl_Interp* interp = dataPtr->interp; isNew = 0; vPtr = NULL; @@ -1383,7 +1383,7 @@ Blt_Vec_Duplicate(Vector *destPtr, Vector *srcPtr) static int VectorNamesOp( ClientData clientData, /* Interpreter-specific data. */ - Tcl_Interp *interp, + Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { @@ -1454,7 +1454,7 @@ VectorNamesOp( static int VectorCreate2( ClientData clientData, /* Interpreter-specific data. */ - Tcl_Interp *interp, + Tcl_Interp* interp, int argStart, int objc, Tcl_Obj *const *objv) @@ -1619,7 +1619,7 @@ VectorCreate2( static int VectorCreateOp( ClientData clientData, - Tcl_Interp *interp, + Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { @@ -1646,7 +1646,7 @@ VectorCreateOp( static int VectorDestroyOp( ClientData clientData, /* Interpreter-specific data. */ - Tcl_Interp *interp, /* Not used. */ + Tcl_Interp* interp, /* Not used. */ int objc, Tcl_Obj *const *objv) { @@ -1681,7 +1681,7 @@ VectorDestroyOp( static int VectorExprOp( ClientData clientData, /* Not Used. */ - Tcl_Interp *interp, + Tcl_Interp* interp, int objc, /* Not used. */ Tcl_Obj *const *objv) { @@ -1704,7 +1704,7 @@ static int nCmdOps = sizeof(vectorCmdOps) / sizeof(Blt_OpSpec); static int VectorCmd( ClientData clientData, /* Interpreter-specific data. */ - Tcl_Interp *interp, + Tcl_Interp* interp, int objc, Tcl_Obj *const *objv) { @@ -1763,7 +1763,7 @@ VectorCmd( static void VectorInterpDeleteProc( ClientData clientData, /* Interpreter-specific data. */ - Tcl_Interp *interp) + Tcl_Interp* interp) { VectorInterpData *dataPtr = clientData; Tcl_HashEntry *hPtr; @@ -1789,7 +1789,7 @@ VectorInterpDeleteProc( } VectorInterpData * -Blt_Vec_GetInterpData(Tcl_Interp *interp) +Blt_Vec_GetInterpData(Tcl_Interp* interp) { VectorInterpData *dataPtr; Tcl_InterpDeleteProc *proc; @@ -1830,7 +1830,7 @@ Blt_Vec_GetInterpData(Tcl_Interp *interp) */ int -Blt_VectorCmdInitProc(Tcl_Interp *interp) +Blt_VectorCmdInitProc(Tcl_Interp* interp) { static Blt_InitCmdSpec cmdSpec = {"vector", VectorCmd, }; @@ -1862,7 +1862,7 @@ Blt_VectorCmdInitProc(Tcl_Interp *interp) /*LINTLIBRARY*/ int Blt_CreateVector2( - Tcl_Interp *interp, + Tcl_Interp* interp, const char *vecName, const char *cmdName, const char *varName, int initialSize, Blt_Vector **vecPtrPtr) @@ -1899,7 +1899,7 @@ Blt_CreateVector2( int Blt_CreateVector( - Tcl_Interp *interp, + Tcl_Interp* interp, const char *name, int size, Blt_Vector **vecPtrPtr) @@ -1957,7 +1957,7 @@ Blt_DeleteVector(Blt_Vector *vecPtr) */ /*LINTLIBRARY*/ int -Blt_DeleteVectorByName(Tcl_Interp *interp, const char *name) +Blt_DeleteVectorByName(Tcl_Interp* interp, const char *name) { VectorInterpData *dataPtr; /* Interpreter-specific data. */ Vector *vPtr; @@ -1996,7 +1996,7 @@ Blt_DeleteVectorByName(Tcl_Interp *interp, const char *name) *--------------------------------------------------------------------------- */ int -Blt_VectorExists2(Tcl_Interp *interp, const char *vecName) +Blt_VectorExists2(Tcl_Interp* interp, const char *vecName) { VectorInterpData *dataPtr; /* Interpreter-specific data. */ @@ -2021,7 +2021,7 @@ Blt_VectorExists2(Tcl_Interp *interp, const char *vecName) *--------------------------------------------------------------------------- */ int -Blt_VectorExists(Tcl_Interp *interp, const char *vecName) +Blt_VectorExists(Tcl_Interp* interp, const char *vecName) { char *nameCopy; int result; @@ -2053,7 +2053,7 @@ Blt_VectorExists(Tcl_Interp *interp, const char *vecName) *--------------------------------------------------------------------------- */ int -Blt_GetVector(Tcl_Interp *interp, const char *name, Blt_Vector **vecPtrPtr) +Blt_GetVector(Tcl_Interp* interp, const char *name, Blt_Vector **vecPtrPtr) { VectorInterpData *dataPtr; /* Interpreter-specific data. */ Vector *vPtr; @@ -2094,7 +2094,7 @@ Blt_GetVector(Tcl_Interp *interp, const char *name, Blt_Vector **vecPtrPtr) */ int Blt_GetVectorFromObj( - Tcl_Interp *interp, + Tcl_Interp* interp, Tcl_Obj *objPtr, Blt_Vector **vecPtrPtr) { @@ -2206,7 +2206,7 @@ Blt_ResizeVector(Blt_Vector *vecPtr, int length) *--------------------------------------------------------------------------- */ Blt_VectorId -Blt_AllocVectorId(Tcl_Interp *interp, const char *name) +Blt_AllocVectorId(Tcl_Interp* interp, const char *name) { VectorInterpData *dataPtr; /* Interpreter-specific data. */ Vector *vPtr; @@ -2381,7 +2381,7 @@ Blt_VectorNotifyPending(Blt_VectorId clientId) */ int Blt_GetVectorById( - Tcl_Interp *interp, + Tcl_Interp* interp, Blt_VectorId clientId, /* Client token identifying the vector */ Blt_Vector **vecPtrPtr) { @@ -2402,7 +2402,7 @@ Blt_GetVectorById( /*LINTLIBRARY*/ void -Blt_InstallIndexProc(Tcl_Interp *interp, const char *string, +Blt_InstallIndexProc(Tcl_Interp* interp, const char *string, Blt_VectorIndexProc *procPtr) { VectorInterpData *dataPtr; /* Interpreter-specific data. */ @@ -2491,7 +2491,7 @@ smallest_power_of_2_not_less_than(int x) int Blt_Vec_FFT( - Tcl_Interp *interp, /* Interpreter to report errors to */ + Tcl_Interp* interp, /* Interpreter to report errors to */ Vector *realPtr, /* If non-NULL, indicates to compute and store the real values in this vector. */ Vector *phasesPtr, /* If non-NULL, indicates to compute @@ -2646,7 +2646,7 @@ Blt_Vec_FFT( int -Blt_Vec_InverseFFT(Tcl_Interp *interp, Vector *srcImagPtr, Vector *destRealPtr, +Blt_Vec_InverseFFT(Tcl_Interp* interp, Vector *srcImagPtr, Vector *destRealPtr, Vector *destImagPtr, Vector *srcPtr) { int length; diff --git a/src/bltVector.h b/src/bltVector.h index f5b59cd..52b907c 100644 --- a/src/bltVector.h +++ b/src/bltVector.h @@ -44,7 +44,7 @@ typedef enum { typedef struct _Blt_VectorId *Blt_VectorId; -typedef void (Blt_VectorChangedProc)(Tcl_Interp *interp, ClientData clientData, +typedef void (Blt_VectorChangedProc)(Tcl_Interp* interp, ClientData clientData, Blt_VectorNotify notify); typedef struct { @@ -90,7 +90,7 @@ typedef enum { extern double Blt_VecMin(Blt_Vector *vPtr); extern double Blt_VecMax(Blt_Vector *vPtr); -extern Blt_VectorId Blt_AllocVectorId(Tcl_Interp *interp, +extern Blt_VectorId Blt_AllocVectorId(Tcl_Interp* interp, const char *vecName); extern void Blt_SetVectorChangedProc(Blt_VectorId clientId, @@ -98,7 +98,7 @@ extern void Blt_SetVectorChangedProc(Blt_VectorId clientId, extern void Blt_FreeVectorId(Blt_VectorId clientId); -extern int Blt_GetVectorById(Tcl_Interp *interp, Blt_VectorId clientId, +extern int Blt_GetVectorById(Tcl_Interp* interp, Blt_VectorId clientId, Blt_Vector **vecPtrPtr); extern const char *Blt_NameOfVectorId(Blt_VectorId clientId); @@ -107,36 +107,36 @@ extern const char *Blt_NameOfVector(Blt_Vector *vecPtr); extern int Blt_VectorNotifyPending(Blt_VectorId clientId); -extern int Blt_CreateVector(Tcl_Interp *interp, const char *vecName, +extern int Blt_CreateVector(Tcl_Interp* interp, const char *vecName, int size, Blt_Vector ** vecPtrPtr); -extern int Blt_CreateVector2(Tcl_Interp *interp, const char *vecName, +extern int Blt_CreateVector2(Tcl_Interp* interp, const char *vecName, const char *cmdName, const char *varName, int initialSize, Blt_Vector **vecPtrPtr); -extern int Blt_GetVector(Tcl_Interp *interp, const char *vecName, +extern int Blt_GetVector(Tcl_Interp* interp, const char *vecName, Blt_Vector **vecPtrPtr); -extern int Blt_GetVectorFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, +extern int Blt_GetVectorFromObj(Tcl_Interp* interp, Tcl_Obj *objPtr, Blt_Vector **vecPtrPtr); -extern int Blt_VectorExists(Tcl_Interp *interp, const char *vecName); +extern int Blt_VectorExists(Tcl_Interp* interp, const char *vecName); extern int Blt_ResetVector(Blt_Vector *vecPtr, double *dataArr, int n, int arraySize, Tcl_FreeProc *freeProc); extern int Blt_ResizeVector(Blt_Vector *vecPtr, int n); -extern int Blt_DeleteVectorByName(Tcl_Interp *interp, const char *vecName); +extern int Blt_DeleteVectorByName(Tcl_Interp* interp, const char *vecName); extern int Blt_DeleteVector(Blt_Vector *vecPtr); -extern int Blt_ExprVector(Tcl_Interp *interp, char *expr, +extern int Blt_ExprVector(Tcl_Interp* interp, char *expr, Blt_Vector *vecPtr); -extern void Blt_InstallIndexProc(Tcl_Interp *interp, const char *indexName, +extern void Blt_InstallIndexProc(Tcl_Interp* interp, const char *indexName, Blt_VectorIndexProc * procPtr); -extern int Blt_VectorExists2(Tcl_Interp *interp, const char *vecName); +extern int Blt_VectorExists2(Tcl_Interp* interp, const char *vecName); #endif /* _BLT_VECTOR_H */ |