From 62400fd7b5ef30bbd2f2e420acdc09a67cf4a2c9 Mon Sep 17 00:00:00 2001 From: jmcmullan Date: Thu, 14 Jul 2011 12:12:07 +0000 Subject: [PATCH] gadtools.library: Clean up unused variables Signed-off-by: Jason S. McMullan git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@40109 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/libs/gadtools/checkboxclass.c | 3 --- workbench/libs/gadtools/cycleclass.c | 3 --- workbench/libs/gadtools/gadgets.c | 13 +++++-------- workbench/libs/gadtools/listviewclass.c | 10 ++++------ workbench/libs/gadtools/paletteclass.c | 3 +-- workbench/libs/gadtools/sliderclass.c | 3 --- 6 files changed, 10 insertions(+), 25 deletions(-) diff --git a/workbench/libs/gadtools/checkboxclass.c b/workbench/libs/gadtools/checkboxclass.c index bf5a65faee..a5c0491bc4 100644 --- a/workbench/libs/gadtools/checkboxclass.c +++ b/workbench/libs/gadtools/checkboxclass.c @@ -184,11 +184,8 @@ IPTR GTCheckBox__OM_SET(Class *cl, struct Gadget *g, struct opSet *msg) IPTR GTCheckBox__OM_GET(Class *cl, struct Gadget *g, struct opGet *msg) { - struct CheckBoxData *data; IPTR retval; - data = INST_DATA(cl, g); - switch (msg->opg_AttrID) { case GTA_GadgetKind: diff --git a/workbench/libs/gadtools/cycleclass.c b/workbench/libs/gadtools/cycleclass.c index fb8f9256cb..a8659bc291 100644 --- a/workbench/libs/gadtools/cycleclass.c +++ b/workbench/libs/gadtools/cycleclass.c @@ -320,12 +320,9 @@ IPTR GTCycle__GM_HITTEST(Class *cl, struct Gadget *g, struct gpHitTest *msg) IPTR GTCycle__GM_GOACTIVE(Class *cl, struct Gadget *g, struct gpInput *msg) { - struct CycleData *data; struct RastPort *rp; IPTR retval; - data = INST_DATA(cl, g); - g->Flags |= GFLG_SELECTED; rp = ObtainGIRPort(msg->gpi_GInfo); diff --git a/workbench/libs/gadtools/gadgets.c b/workbench/libs/gadtools/gadgets.c index 10c396951b..19c86e4307 100644 --- a/workbench/libs/gadtools/gadgets.c +++ b/workbench/libs/gadtools/gadgets.c @@ -715,7 +715,6 @@ struct Gadget *makescroller(struct GadToolsBase_intern *GadToolsBase, UWORD freedom = stags[3].ti_Data; /* default */ WORD arrowdim = 0 /* -1*/, arrowkind = SCROLLER_KIND; - BOOL relverify, immediate; ULONG scr_dim_tag; EnterFunc(bug("makescroller(stdgadtags=%p, vi=%p, taglist = %p)\n", @@ -737,8 +736,8 @@ struct Gadget *makescroller(struct GadToolsBase_intern *GadToolsBase, freedom = stags[3].ti_Data = FREEVERT; break; case GA_Disabled: stags[4].ti_Data = tidata; break; - case GA_RelVerify: relverify = stags[5].ti_Data = tidata; break; - case GA_Immediate: immediate = stags[6].ti_Data = tidata; break; + case GA_RelVerify: stags[5].ti_Data = tidata; break; + case GA_Immediate: stags[6].ti_Data = tidata; break; case GTSC_Arrows: arrowdim = (WORD)tidata; break; case GTA_Scroller_ArrowKind: arrowkind = (WORD)tidata; break; @@ -834,8 +833,6 @@ struct Gadget *makescroller(struct GadToolsBase_intern *GadToolsBase, atags[12].ti_Data = (IPTR)GetTagData(GA_Previous, 0, stdgadtags); /* These must be the same as for scroller */ -/* atags[8].ti_Data = (IPTR)relverify; - atags[9].ti_Data = (IPTR)immediate;*/ atags[10].ti_Data = (IPTR)GetTagData(GA_ID, 0, stdgadtags); if (freedom == FREEVERT) @@ -1130,9 +1127,9 @@ struct Gadget *makelistview(struct GadToolsBase_intern *GadToolsBase, struct TagItem *lv_width_tag, *lv_height_tag; WORD lv_width, lv_height; #if CORRECT_LISTVIEWHEIGHT - WORD viewheight; + WORD viewheight, totalitemheight = 0; #endif - WORD ysize, totalitemheight = 0; + WORD ysize; struct TagItem *tag, lvtags[] = { @@ -1258,10 +1255,10 @@ struct Gadget *makelistview(struct GadToolsBase_intern *GadToolsBase, } +#if CORRECT_LISTVIEWHEIGHT /* GTLV_ItemHeight + LAYOUTA_Spacing */ totalitemheight = lvtags[5].ti_Data + lvtags[9].ti_Data; -#if CORRECT_LISTVIEWHEIGHT /* stegerg: I think it looks better without this adjustment. Think of GTLV_ShowSelected and aligning with other gadgets */ diff --git a/workbench/libs/gadtools/listviewclass.c b/workbench/libs/gadtools/listviewclass.c index fa1d76d18c..a3b993f05c 100644 --- a/workbench/libs/gadtools/listviewclass.c +++ b/workbench/libs/gadtools/listviewclass.c @@ -237,8 +237,6 @@ STATIC VOID RenderEntries(Class *cl, struct Gadget *g, struct gpRender *msg, for ( ; node->ln_Succ && numentries; node = node->ln_Succ) { - ULONG retval; - D(bug("RenderEntries: Rendering entry %d: node %s\n", current_entry, node->ln_Name)); /* update state */ @@ -259,7 +257,7 @@ STATIC VOID RenderEntries(Class *cl, struct Gadget *g, struct gpRender *msg, drawmsg.lvdm_Bounds.MinY = top; drawmsg.lvdm_Bounds.MaxY = top + data->ld_ItemHeight - 1; - retval = CallHookPkt( data->ld_CallBack, node, &drawmsg); + CallHookPkt( data->ld_CallBack, node, &drawmsg); numentries --; current_entry ++; @@ -311,7 +309,7 @@ STATIC WORD ShownEntries(struct Gadget *g, struct LVData *data) STATIC VOID UpdateScroller(struct Gadget *g, struct LVData *data, struct GadgetInfo *gi, struct GadToolsBase_intern *GadToolsBase) { - ULONG Result; + D(ULONG Result;) struct TagItem scrtags[] = { {PGA_Top , 0L }, @@ -339,12 +337,12 @@ STATIC VOID UpdateScroller(struct Gadget *g, struct LVData *data, struct GadgetI if (gi) { D(bug("UpdateScroller: SetGadgetAttrs\n")); - Result = SetGadgetAttrsA((struct Gadget *)data->ld_Scroller, gi->gi_Window, NULL, scrtags); + D(Result = )SetGadgetAttrsA((struct Gadget *)data->ld_Scroller, gi->gi_Window, NULL, scrtags); } else { D(bug("UpdateScroller: SetAttrs (no gadgetinfo)\n")); - Result = SetAttrsA(data->ld_Scroller, scrtags); + D(Result = )SetAttrsA(data->ld_Scroller, scrtags); } D(bug("UpdateScroller: Result 0x%lx\n",Result)); } diff --git a/workbench/libs/gadtools/paletteclass.c b/workbench/libs/gadtools/paletteclass.c index b9978b09c3..bfab07b512 100644 --- a/workbench/libs/gadtools/paletteclass.c +++ b/workbench/libs/gadtools/paletteclass.c @@ -286,13 +286,12 @@ VOID UpdateActiveColor( struct PaletteData *data, STATIC VOID RenderFrame(struct PaletteData *data, struct RastPort *rp, struct IBox *gadbox, struct DrawInfo *dri, BOOL recessed, BOOL edgesonly, Class *cl) { - WORD left, top, right, bottom; + WORD left, top; EnterFunc(bug("RenderFrame(rp=%p, gadbox=%p, dri=%p)\n", rp, gadbox, dri)); left = gadbox->Left; top = gadbox->Top; - right = left + gadbox->Width - 1; bottom = top + gadbox->Height - 1; if (!data->pd_Frame) { diff --git a/workbench/libs/gadtools/sliderclass.c b/workbench/libs/gadtools/sliderclass.c index eb8a3f4ed6..f252364734 100644 --- a/workbench/libs/gadtools/sliderclass.c +++ b/workbench/libs/gadtools/sliderclass.c @@ -57,7 +57,6 @@ STATIC VOID notifylevel(Class *cl, Object *o, WORD level, struct GadgetInfo *gin IPTR GTSlider__OM_SET(Class * cl, Object * o, struct opSet * msg) { - IPTR retval = 0UL; const struct TagItem *tstate; struct TagItem *tag, *dosuper_tags, tags[] = { @@ -116,8 +115,6 @@ IPTR GTSlider__OM_SET(Class * cl, Object * o, struct opSet * msg) tags[2].ti_Data = (IPTR)msg->ops_AttrList; dosuper_tags = tags; - - retval = 1UL; } ReturnInt ("Slider::Set", IPTR, DoSuperMethod(cl, o, OM_SET, (IPTR) dosuper_tags, (IPTR) msg->ops_GInfo)); -- 2.11.4.GIT