From 8cd5dd5aeaecd296476ed072ee3b88894b9426de Mon Sep 17 00:00:00 2001 From: mazze Date: Sat, 14 Mar 2009 13:38:20 +0000 Subject: [PATCH] Some compiler warnings removed. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@30902 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- .../classes/datatypes/amigaguide/amigaguideclass.c | 14 +------------- workbench/classes/datatypes/amigaguide/file.c | 4 ---- workbench/classes/datatypes/amigaguide/navigator.c | 6 ------ workbench/classes/datatypes/amigaguide/nodeclass.c | 14 -------------- workbench/classes/datatypes/amigaguide/process.c | 4 ---- workbench/classes/datatypes/amigaguide/util.c | 19 +++---------------- workbench/classes/datatypes/bmp/bmpclass.c | 2 +- workbench/classes/datatypes/ppm/ppmclass.c | 4 ++-- workbench/classes/datatypes/sound/dispatch.c | 4 ++-- .../classes/gadgets/aroscheckbox/checkboxclass.c | 2 +- workbench/classes/gadgets/aroslist/listclass.c | 4 ++-- workbench/classes/gadgets/aroslistview/helpfuncs.c | 4 ++-- .../classes/gadgets/aroslistview/listviewclass.c | 10 +++++----- .../classes/gadgets/arosmutualexclude/mxclass.c | 4 ++-- .../gadgets/gradientslider/gradientsliderclass.c | 5 +++-- workbench/classes/zune/aboutwindow/aboutwindow.c | 22 +++++++++++----------- workbench/classes/zune/calendar/calendar.c | 4 ++-- workbench/classes/zune/clock/clock.c | 2 +- workbench/classes/zune/iconimage/iconimage.c | 3 ++- workbench/classes/zune/prefseditor/prefseditor.c | 6 +++--- workbench/classes/zune/prefswindow/prefswindow.c | 4 ++-- .../zune/systemprefswindow/systemprefswindow.c | 5 +++-- 22 files changed, 48 insertions(+), 98 deletions(-) diff --git a/workbench/classes/datatypes/amigaguide/amigaguideclass.c b/workbench/classes/datatypes/amigaguide/amigaguideclass.c index 74d567b74..ffd8aca8e 100644 --- a/workbench/classes/datatypes/amigaguide/amigaguideclass.c +++ b/workbench/classes/datatypes/amigaguide/amigaguideclass.c @@ -167,9 +167,7 @@ void MakeNavGadget(Class *cl, Object *obj, struct IBox *domain) ULONG om_new(Class *cl, Object *obj, struct opSet *msg) { ULONG rv; - CLASSBASE; INSTDATA; - Object *newobj; STRPTR nodename = "main"; ULONG sourcetype; @@ -178,7 +176,7 @@ ULONG om_new(Class *cl, Object *obj, struct opSet *msg) struct TagItem *tstate = msg->ops_AttrList; struct TagItem *tag; - rv = DoSuperMethodA(cl, obj, msg); + rv = DoSuperMethodA(cl, obj, (Msg)msg); if (rv == 0) return rv; else @@ -305,7 +303,6 @@ ULONG om_new(Class *cl, Object *obj, struct opSet *msg) ULONG om_dispose(Class *cl,Object *obj,Msg msg) { - CLASSBASE; INSTDATA; ULONG rv; struct AmigaGuideObject *ago; @@ -443,7 +440,6 @@ ULONG om_get(Class *cl,Object *obj,struct opGet *msg) ULONG _om_update(Class *cl, Object *obj, struct opSet *msg) { - CLASSBASE; ULONG rv = 0; struct TagItem *tstate = msg->ops_AttrList; @@ -496,7 +492,6 @@ ULONG _om_update(Class *cl, Object *obj, struct opSet *msg) ULONG _om_set(Class *cl,Object *obj,struct opSet *msg) { - CLASSBASE; INSTDATA; ULONG rv = 0; @@ -544,7 +539,6 @@ ULONG _om_set(Class *cl,Object *obj,struct opSet *msg) ULONG gm_layout(Class *cl, Object *obj, struct gpLayout *msg) { - CLASSBASE; INSTDATA; ULONG rc; @@ -633,7 +627,6 @@ ULONG gm_layout(Class *cl, Object *obj, struct gpLayout *msg) ULONG gm_render(Class *cl, Object *obj, struct gpRender *msg) { - CLASSBASE; INSTDATA; struct DTSpecialInfo *si= CAST_GAD(obj)->SpecialInfo; ULONG rv = 0; @@ -736,7 +729,6 @@ ULONG gm_render(Class *cl, Object *obj, struct gpRender *msg) ULONG gm_input(Class *cl, Object *obj, struct gpInput *msg) { - CLASSBASE; INSTDATA; struct DTSpecialInfo *si= CAST_GAD(obj)->SpecialInfo; ULONG rv = GMR_MEACTIVE; @@ -807,7 +799,6 @@ ULONG dtm_removedtobject(Class *cl, Object *obj, Msg msg) ULONG dtm_asynclayout(Class *cl, Object *obj, struct gpLayout *msg) { - CLASSBASE; INSTDATA; struct DTSpecialInfo *si = (struct DTSpecialInfo *) CAST_GAD(obj)->SpecialInfo; struct DTSpecialInfo *sosi = (struct DTSpecialInfo *) CAST_GAD(data->ag_Actual)->SpecialInfo; @@ -992,7 +983,6 @@ ULONG dtm_asynclayout(Class *cl, Object *obj, struct gpLayout *msg) ULONG dtm_trigger(Class *cl, Object *obj, struct dtTrigger *msg) { - CLASSBASE; INSTDATA; ULONG rv = 0; @@ -1142,7 +1132,6 @@ ULONG dtm_trigger(Class *cl, Object *obj, struct dtTrigger *msg) static void UpdateNavigator(Class *cl, Object *obj, struct GadgetInfo *ginfo) { - CLASSBASE; INSTDATA; struct AmigaGuideObject *agobj = data->ag_ActualObject; @@ -1206,7 +1195,6 @@ static void ActivateAGObject(Class *cl, Object *obj, struct GadgetInfo *ginfo, struct AmigaGuideObject *agobj) { - CLASSBASE; INSTDATA; struct gpLayout layout; struct IBox *domain; diff --git a/workbench/classes/datatypes/amigaguide/file.c b/workbench/classes/datatypes/amigaguide/file.c index 7da66d615..8092241d9 100644 --- a/workbench/classes/datatypes/amigaguide/file.c +++ b/workbench/classes/datatypes/amigaguide/file.c @@ -15,7 +15,6 @@ struct AmigaGuideFile *AllocAGFile(Class *cl, Object *obj) { - CLASSBASE; INSTDATA; struct AmigaGuideFile *agf; @@ -42,8 +41,6 @@ void AddMacro(Class *cl, Object *obj, struct AmigaGuideFile *agf, STRPTR name, ULONG namelen, STRPTR macro, ULONG macrolen) { - CLASSBASE; - struct AmigaGuideMacro *mac; struct Node *n; STRPTR macrostring; @@ -84,7 +81,6 @@ struct AmigaGuideNode * ParseNodeLine(Class *cl, Object *obj, struct AmigaGuideFile *agf, STRPTR args, LONG linelen) { - CLASSBASE; struct AmigaGuideNode *agn; ULONG size = sizeof(struct AmigaGuideNode); STRPTR name; diff --git a/workbench/classes/datatypes/amigaguide/navigator.c b/workbench/classes/datatypes/amigaguide/navigator.c index 458d5253b..d42b3f91d 100644 --- a/workbench/classes/datatypes/amigaguide/navigator.c +++ b/workbench/classes/datatypes/amigaguide/navigator.c @@ -128,7 +128,6 @@ static void draw_button(Class *cl, Object *obj, struct GadgetInfo *ginfo, struct RastPort *rp, ULONG idx) { - CLASSBASE; INSTDATA; struct TextExtent textext; @@ -173,7 +172,6 @@ BOOL gi_draw_button(Class *cl, Object *obj, struct GadgetInfo *ginfo, ULONG idx) { - CLASSBASE; struct RastPort *rp; if((rp = ObtainGIRPort(ginfo)) != NULL) @@ -195,7 +193,6 @@ BOOL gi_draw_button(Class *cl, Object *obj, static ULONG om_new(Class *cl, Object *obj, struct opSet *msg) { - CLASSBASE; INSTDATA; ULONG rv = 0; @@ -309,7 +306,6 @@ ULONG gm_input(Class *cl, Object *obj, struct gpInput *msg) static ULONG gm_layout(Class *cl, Object *obj, struct gpLayout *msg) { - CLASSBASE; INSTDATA; struct GadgetInfo *ginfo = msg->gpl_GInfo; @@ -368,7 +364,6 @@ ULONG gm_layout(Class *cl, Object *obj, struct gpLayout *msg) static ULONG gm_render(Class *cl, Object *obj, struct gpRender *msg) { - CLASSBASE; INSTDATA; struct GadgetInfo *ginfo = msg->gpr_GInfo; @@ -479,7 +474,6 @@ ULONG nvm_changed(Class *cl, Object *obj, Msg msg) static ULONG navclass_dispatcher(Class *cl, Object *obj, Msg msg) { - CLASSBASE; LONG rv = 0; switch(msg->MethodID) diff --git a/workbench/classes/datatypes/amigaguide/nodeclass.c b/workbench/classes/datatypes/amigaguide/nodeclass.c index a4ae323cf..d494f8e6a 100644 --- a/workbench/classes/datatypes/amigaguide/nodeclass.c +++ b/workbench/classes/datatypes/amigaguide/nodeclass.c @@ -244,7 +244,6 @@ static ULONG dtm_asynclayout(Class *cl, Object *obj, struct gpLayout *msg); static APTR AllocNodeMem(Class *cl, Object *obj, ULONG size) { - CLASSBASE; INSTDATA; APTR mem; @@ -254,7 +253,6 @@ APTR AllocNodeMem(Class *cl, Object *obj, ULONG size) static void FreeNodeMem(Class *cl, Object *obj, APTR mem, ULONG size) { - CLASSBASE; INSTDATA; FreePooled(data->n_Pool, mem, size); } @@ -281,7 +279,6 @@ void FreeNodeVec(Class *cl, Object *obj, APTR mem) static LONG GetAmigaGuideAttr(Class *cl, Object *obj, STRPTR attr, LONG attr_len) { - CLASSBASE; const struct AmigaGuideAttr *attrs = amigaguide_attrs; while(attrs->aga_Id != ATTR_MAX) @@ -298,7 +295,6 @@ static LONG GetPenColor(Class *cl, Object *obj, struct ParseNodeData *pd, STRPTR arg, LONG arg_len, LONG *val) { - CLASSBASE; const struct DrawInfoPen { STRPTR Name; @@ -381,7 +377,6 @@ static STRPTR CopyLineString(Class *cl, Object *obj, STRPTR str, LONG len) { - CLASSBASE; INSTDATA; STRPTR cpy; STRPTR end = str + ((len == -1) ? strlen(str) : len); @@ -398,7 +393,6 @@ struct Line *AllocLine(Class *cl, Object *obj, struct ParseNodeData *pd, STRPTR text, LONG len) { - CLASSBASE; INSTDATA; struct Line *line; @@ -459,7 +453,6 @@ struct Line *AllocTextLine(Class *cl, Object *obj, struct ParseNodeData *pd, STRPTR text, LONG len) { - CLASSBASE; INSTDATA; struct Line *line = NULL; @@ -591,7 +584,6 @@ BOOL DoNodeAttr(Class *cl, Object *obj, struct ParseNodeData *pd, LONG id, STRPTR attrargs, LONG attrargs_len, STRPTR *ptr_ptr, BOOL *newline) { - CLASSBASE; INSTDATA; struct Line *line; STRPTR ptr = *ptr_ptr; @@ -748,7 +740,6 @@ void FindAndExpandMacro(Class *cl, Object *obj, struct ParseNodeData *pd, STRPTR attr, LONG attr_len, STRPTR args, LONG args_len, STRPTR *ptr_ptr, BOOL *newline) { - CLASSBASE; INSTDATA; struct AmigaGuideMacro *agm = NULL; struct Node *n = data->n_AGFile->agf_Macros.lh_Head; @@ -874,7 +865,6 @@ void FindAndExpandMacro(Class *cl, Object *obj, struct ParseNodeData *pd, static LONG ParseNode(Class *cl, Object *obj, struct ParseNodeData *pd) { - CLASSBASE; INSTDATA; struct Line *line; @@ -1230,7 +1220,6 @@ static ULONG om_new(Class *cl, Object *obj, struct opSet *msg) { ULONG rv = (ULONG) obj; - CLASSBASE; INSTDATA; ULONG sourcetype = DTST_FILE; @@ -1326,7 +1315,6 @@ ULONG om_new(Class *cl, Object *obj, struct opSet *msg) static ULONG om_dispose(Class *cl,Object *obj,Msg msg) { - CLASSBASE; INSTDATA; ULONG rv; @@ -1383,7 +1371,6 @@ ULONG om_get(Class *cl,Object *obj,struct opGet *msg) static ULONG om_set(Class *cl,Object *obj,struct opSet *msg) { - CLASSBASE; INSTDATA; ULONG rv = 0; @@ -1418,7 +1405,6 @@ ULONG om_set(Class *cl,Object *obj,struct opSet *msg) static ULONG dtm_asynclayout(Class *cl, Object *obj, struct gpLayout *msg) { - CLASSBASE; INSTDATA; struct DTSpecialInfo *si= CAST_GAD(obj)->SpecialInfo; ULONG lines = 0; diff --git a/workbench/classes/datatypes/amigaguide/process.c b/workbench/classes/datatypes/amigaguide/process.c index b253f96e8..d2a71ce57 100644 --- a/workbench/classes/datatypes/amigaguide/process.c +++ b/workbench/classes/datatypes/amigaguide/process.c @@ -98,7 +98,6 @@ struct AmigaGuideDTMsg static void DoRexxTrigger(Class *cl, Object *obj, ULONG function, APTR trigger_data) { - CLASSBASE; INSTDATA; if(data->ag_Window != NULL) @@ -389,7 +388,6 @@ RegCall GetA4 void asyncmethodfunc(void) BOOL SendAGTrigger(Class *cl, Object *obj, struct dtTrigger *dtt) { - CLASSBASE; INSTDATA; struct AmigaGuideDTMsg *msg; @@ -409,7 +407,6 @@ BOOL SendAGTrigger(Class *cl, Object *obj, struct dtTrigger *dtt) BOOL SendAGLayout(Class *cl, Object *obj, struct gpLayout *gpl) { - CLASSBASE; INSTDATA; struct AmigaGuideDTMsg *msg; @@ -463,7 +460,6 @@ struct Process *CreateAGProcess(Class *cl, Object *obj) void DeleteAGProcess(Class *cl, Object *obj) { - CLASSBASE; INSTDATA; if(data->ag_Process != NULL) diff --git a/workbench/classes/datatypes/amigaguide/util.c b/workbench/classes/datatypes/amigaguide/util.c index c83a11bfa..029872741 100644 --- a/workbench/classes/datatypes/amigaguide/util.c +++ b/workbench/classes/datatypes/amigaguide/util.c @@ -106,7 +106,6 @@ LONG GetNodeCommand(struct ClassBase *cb, APTR AllocAGMem(Class *cl, Object *obj, ULONG size) { - CLASSBASE; INSTDATA; APTR mem; @@ -115,7 +114,6 @@ APTR AllocAGMem(Class *cl, Object *obj, ULONG size) } void FreeAGMem(Class *cl, Object *obj, APTR mem, ULONG size) { - CLASSBASE; INSTDATA; FreePooled(data->ag_Pool, mem, size); } @@ -255,7 +253,7 @@ BOOL GetDTDomain(Class *cl, Object *obj, struct IBox *domain) get.MethodID = OM_GET; get.opg_AttrID = DTA_Domain; - get.opg_Storage = (ULONG *) &tmp; + get.opg_Storage = (IPTR *) &tmp; /* CHECK: get domain from superclass, because we have overloaded the DTA_Domain attribute */ @@ -272,7 +270,6 @@ BOOL GetDTDomain(Class *cl, Object *obj, struct IBox *domain) struct AmigaGuideNode *GetAGNode(Class *cl, Object *obj, struct AmigaGuideFile *agf, STRPTR name) { - CLASSBASE; struct Node *n; /* search node list for the given name case insensitive. */ @@ -342,16 +339,15 @@ ULONG GotoObject(Class *cl, Object *obj, struct GadgetInfo *ginfo, STRPTR name, ULONG GotoObjectTag(Class *cl, Object *obj, struct GadgetInfo *ginfo, Tag tag) { - CLASSBASE; INSTDATA; STRPTR gobj = NULL; /* try to get the object to goto from the actual object */ - GetAttr(tag, data->ag_Actual, (ULONG *) &gobj); + GetAttr(tag, data->ag_Actual, (IPTR *) &gobj); /* no object found. so try global object. */ if(gobj == NULL) - GetAttr(tag, obj, (ULONG *) &gobj); + GetAttr(tag, obj, (IPTR *) &gobj); if(gobj == NULL) return 0; @@ -362,7 +358,6 @@ ULONG GotoObjectTag(Class *cl, Object *obj, struct GadgetInfo *ginfo, Tag tag) struct AmigaGuideObject *AllocAGObject(Class *cl, Object *obj) { - CLASSBASE; struct AmigaGuideObject *agobj; agobj = AllocAGMem(cl, obj, sizeof(struct AmigaGuideObject)); if(agobj == NULL) @@ -376,7 +371,6 @@ struct AmigaGuideObject *AllocAGObjectNode(Class *cl, Object *obj, struct AmigaGuideFile *agf, struct AmigaGuideNode *agnode) { - CLASSBASE; struct AmigaGuideObject *agobj; LONG err = 0; @@ -415,8 +409,6 @@ struct AmigaGuideObject *AllocAGObjectNode(Class *cl, Object *obj, void FreeAGObject(Class *cl, Object *obj, struct AmigaGuideObject *agobj) { - CLASSBASE; - if(agobj != NULL) { if(agobj->ago_Object != NULL && !agobj->ago_NoDispose) @@ -457,7 +449,6 @@ void FreeAGObject(Class *cl, Object *obj, struct AmigaGuideObject *agobj) void ParseFontLine(Class *cl, Object *obj, STRPTR args, struct TextAttr *ta) { - CLASSBASE; STRPTR ptr = args; STRPTR tmp; LONG size; @@ -544,7 +535,6 @@ static BPTR MyLock(struct ClassBase *cb,STRPTR file, BOOL *nodetype, BPTR dir) static BPTR GetObjectDir(Class *cl, Object *obj) { - CLASSBASE; struct DataType *dt; BPTR handle; ULONG type; @@ -764,7 +754,6 @@ LONG mysprintf(struct ClassBase *cb, STRPTR buf, LONG len, STRPTR format,...) ULONG SendRexxCommand(Class *cl, Object *obj, STRPTR command, ULONG mode) { - CLASSBASE; INSTDATA; struct MsgPort *rxport; @@ -824,7 +813,6 @@ ULONG SendRexxCommand(Class *cl, Object *obj, STRPTR command, ULONG mode) ULONG SystemCommand(Class *cl, Object *obj, STRPTR command) { - CLASSBASE; struct TagItem tags[] = { {SYS_Output, 0}, {TAG_DONE, 0} }; ULONG rc = 0; BPTR dir = GetObjectDir(cl, obj); @@ -857,7 +845,6 @@ ULONG SystemCommand(Class *cl, Object *obj, STRPTR command) BOOL GetFontDimension(Class *cl, Object *obj, STRPTR font, WORD *x, WORD *y) { - CLASSBASE; struct TextFont *tf; UBYTE fontname[128]; struct TextAttr ta; diff --git a/workbench/classes/datatypes/bmp/bmpclass.c b/workbench/classes/datatypes/bmp/bmpclass.c index b2624db81..da80bb8aa 100644 --- a/workbench/classes/datatypes/bmp/bmpclass.c +++ b/workbench/classes/datatypes/bmp/bmpclass.c @@ -175,7 +175,7 @@ static BOOL LoadBMP_Colormap(BmpHandleType *bmphandle, int numcolors, colormap[i].blue = *(bmphandle->filebufpos)++; colormap[i].green = *(bmphandle->filebufpos)++; colormap[i].red = *(bmphandle->filebufpos)++; - *(bmphandle->filebufpos)++; + bmphandle->filebufpos++; colregs[j++] = ((ULONG)colormap[i].red)<<24; colregs[j++] = ((ULONG)colormap[i].green)<<24; colregs[j++] = ((ULONG)colormap[i].blue)<<24; diff --git a/workbench/classes/datatypes/ppm/ppmclass.c b/workbench/classes/datatypes/ppm/ppmclass.c index 9385cdc17..754980565 100644 --- a/workbench/classes/datatypes/ppm/ppmclass.c +++ b/workbench/classes/datatypes/ppm/ppmclass.c @@ -199,7 +199,7 @@ IPTR PPM__OM_NEW(Class *cl, Object *o, struct opSet *msg) } } - NumChars=StrToLong(LineBuffer, &Width); + NumChars=StrToLong(LineBuffer, (LONG *)&Width); if(!((NumChars>0) && (Width>0))) { @@ -213,7 +213,7 @@ IPTR PPM__OM_NEW(Class *cl, Object *o, struct opSet *msg) D(bug("ppm.datatype/OM_NEW: Width: %ld\n", (long) Width)); D(bug("ppm.datatype/OM_NEW: NumChars: %ld\n", (long) NumChars)); - NumChars=StrToLong(LineBuffer+NumChars, &Height); + NumChars=StrToLong(LineBuffer+NumChars, (LONG *)&Height); if(!((NumChars>0) && (Height>0))) { diff --git a/workbench/classes/datatypes/sound/dispatch.c b/workbench/classes/datatypes/sound/dispatch.c index 5f31ef2c5..1a60d0306 100644 --- a/workbench/classes/datatypes/sound/dispatch.c +++ b/workbench/classes/datatypes/sound/dispatch.c @@ -639,7 +639,7 @@ void __regargs GetSoundDTPrefs( struct ClassBase *cb ) rdargs->RDA_Source.CS_Length = len; rdargs->RDA_Flags = RDAF_NOPROMPT; - if( ( freeargs = ReadArgs( TEMPLATE, (LONG *)&args, rdargs ) ) ) + if( ( freeargs = ReadArgs( TEMPLATE, (IPTR *)&args, rdargs ) ) ) { dbug( kprintf( "List of options:\n" ); ) @@ -1458,7 +1458,7 @@ IPTR __regargs Sound_SET( Class *cl, Object *o, struct opSet *ops ) retval = DoSuperMethodA( cl, o, (Msg) ops ); dbug( kprintf("parsing list\n"); ) - parsetaglist( cl, o, ops, &cnt ); + parsetaglist( cl, o, ops, (ULONG *)&cnt ); dbug( kprintf("refreshing\n"); ) if( retval || ( ( id->ForceRefresh ) && ( id->Gadget ) ) ) { diff --git a/workbench/classes/gadgets/aroscheckbox/checkboxclass.c b/workbench/classes/gadgets/aroscheckbox/checkboxclass.c index 3cc339dd7..7c3b59ca7 100644 --- a/workbench/classes/gadgets/aroscheckbox/checkboxclass.c +++ b/workbench/classes/gadgets/aroscheckbox/checkboxclass.c @@ -246,7 +246,7 @@ IPTR AROSCheckbox__OM_DISPOSE(Class *cl, Class *obj, struct opSet *msg) DisposeObject(G(obj)->GadgetRender); G(obj)->GadgetRender = NULL; } - return DoSuperMethodA(cl, obj, (Msg)msg); + return DoSuperMethodA(cl, (Object *)obj, (Msg)msg); } /****************************************************************************************/ diff --git a/workbench/classes/gadgets/aroslist/listclass.c b/workbench/classes/gadgets/aroslist/listclass.c index 38503e23c..335ef21a5 100644 --- a/workbench/classes/gadgets/aroslist/listclass.c +++ b/workbench/classes/gadgets/aroslist/listclass.c @@ -56,7 +56,7 @@ STATIC VOID SetActive(LONG pos, struct ListData *data) data->ld_Active = pos; return; } -STATIC _OM_SET(Class *cl, Object *o,struct opSet *msg) +STATIC IPTR _OM_SET(Class *cl, Object *o,struct opSet *msg) { IPTR retval = (IPTR)0; @@ -96,7 +96,7 @@ STATIC _OM_SET(Class *cl, Object *o,struct opSet *msg) } IPTR AROSList__OM_SET(Class *cl, Object *o,struct opSet *msg) { - IPTR retval = DoSuperMethodA(cl, o, msg); + IPTR retval = DoSuperMethodA(cl, o, (Msg)msg); retval += _OM_SET(cl, o, msg); return retval; } diff --git a/workbench/classes/gadgets/aroslistview/helpfuncs.c b/workbench/classes/gadgets/aroslistview/helpfuncs.c index a97f785e3..2ed33fe0c 100644 --- a/workbench/classes/gadgets/aroslistview/helpfuncs.c +++ b/workbench/classes/gadgets/aroslistview/helpfuncs.c @@ -231,7 +231,7 @@ VOID RenderEntries( Class *cl, SetFont(msg->gpr_RPort, data->lvd_Font); if (!(data->lvd_Flags & (LVFLG_READONLY|LVFLG_MULTISELECT))) - GetAttr(AROSA_List_Active, data->lvd_List, &activepos); + GetAttr(AROSA_List_Active, data->lvd_List, (IPTR *)&activepos); getentry_msg.MethodID = AROSM_List_GetEntry; getentry_msg.ItemPtr = &item; @@ -585,7 +585,7 @@ UWORD ShownEntries(struct LVData *data, ULONG numentries; UWORD shown; - GetAttr(AROSA_List_Entries, data->lvd_List, &numentries); + GetAttr(AROSA_List_Entries, data->lvd_List, (IPTR *)&numentries); /* This formula has a little "bug": The height of the rendered texts ** are ibox.Height - height of 2 borders - 1 horizontal spacing line, but diff --git a/workbench/classes/gadgets/aroslistview/listviewclass.c b/workbench/classes/gadgets/aroslistview/listviewclass.c index 662660977..09516ebd0 100644 --- a/workbench/classes/gadgets/aroslistview/listviewclass.c +++ b/workbench/classes/gadgets/aroslistview/listviewclass.c @@ -104,7 +104,7 @@ STATIC IPTR _OM_SET(Class *cl, Object *o,struct opSet *msg) data->lvd_List = (Object *)tag->ti_Data; - GetAttr(AROSA_List_Entries, data->lvd_List, &numentries); + GetAttr(AROSA_List_Entries, data->lvd_List, (IPTR *)&numentries); SetAttrs(data->lvd_List, AROSA_List_Active, AROSV_List_Active_None, TAG_END); @@ -262,7 +262,7 @@ STATIC IPTR _OM_SET(Class *cl, Object *o,struct opSet *msg) IPTR AROSListview__OM_SET(Class *cl, Object *o,struct opSet *msg) { - IPTR retval = DoSuperMethodA(cl, o, msg); + IPTR retval = DoSuperMethodA(cl, o, (Msg)msg); retval += (IPTR)_OM_SET(cl, o, (struct opSet *)msg); return retval; @@ -274,7 +274,7 @@ IPTR AROSListview__OM_SET(Class *cl, Object *o,struct opSet *msg) IPTR AROSListview__OM_UPDATE(Class *cl, Object *o,struct opSet *msg) { - IPTR retval = DoSuperMethodA(cl, o, msg); + IPTR retval = DoSuperMethodA(cl, o, (Msg)msg); struct LVData *data = INST_DATA(cl, o); retval += (IPTR)_OM_SET(cl, o, (struct opSet *)msg); @@ -522,7 +522,7 @@ IPTR AROSListview__GM_GOACTIVE(Class *cl, Object *o, struct gpInput *msg) GetGadgetIBox(o, msg->gpi_GInfo, &container); - GetAttr(AROSA_List_Entries, data->lvd_List, &numentries); + GetAttr(AROSA_List_Entries, data->lvd_List, (IPTR *)&numentries); /* How many entries are currently shown in the listview ? */ shown = ShownEntries(data, &container); @@ -535,7 +535,7 @@ IPTR AROSListview__GM_GOACTIVE(Class *cl, Object *o, struct gpInput *msg) if (clickpos < shown) { - GetAttr(AROSA_List_Active, data->lvd_List, &active); + GetAttr(AROSA_List_Active, data->lvd_List, (IPTR *)&active); /* Check for a doubleclick */ activepos = active - data->lvd_First; diff --git a/workbench/classes/gadgets/arosmutualexclude/mxclass.c b/workbench/classes/gadgets/arosmutualexclude/mxclass.c index 59b610ad9..6279a3733 100644 --- a/workbench/classes/gadgets/arosmutualexclude/mxclass.c +++ b/workbench/classes/gadgets/arosmutualexclude/mxclass.c @@ -388,8 +388,8 @@ IPTR AROSMX__OM_GET(Class *cl, Object *o, struct opGet *msg) struct MXData *data = INST_DATA(cl, o); if (msg->opg_AttrID == GTMX_Active) { - msg->opg_Storage = (IPTR)data->active; - return (IPTR)1; + *(msg->opg_Storage) = (IPTR)data->active; + return 1; } else return DoSuperMethodA(cl, o, msg); diff --git a/workbench/classes/gadgets/gradientslider/gradientsliderclass.c b/workbench/classes/gadgets/gradientslider/gradientsliderclass.c index 0cadbea7d..95dc7ce1a 100644 --- a/workbench/classes/gadgets/gradientslider/gradientsliderclass.c +++ b/workbench/classes/gadgets/gradientslider/gradientsliderclass.c @@ -105,7 +105,8 @@ STATIC VOID notify_curval(Class *cl, Object *o, struct GadgetInfo *gi, BOOL inte IPTR GradientSlider__OM_SET(Class *cl, Object *o, struct opSet *msg) { - struct TagItem *tag, *tstate; + const struct TagItem *tstate; + struct TagItem *tag; IPTR retval; struct GradientSliderData *data = INST_DATA(cl, o); BOOL redraw_all = data->savebm == NULL; @@ -692,7 +693,7 @@ IPTR GradientSlider__GM_HANDLEINPUT(Class *cl, Object *o, struct gpInput *msg) IPTR GradientSlider__GM_DOMAIN(Class *cl, Object *o, struct gpDomain *msg) { struct GradientSliderData *data = INST_DATA(cl, o); - struct DrawInfo *dri = (struct DrawInfo *) GetTagData( GA_DrawInfo, NULL, msg->gpd_Attrs ); + struct DrawInfo *dri = (struct DrawInfo *) GetTagData( GA_DrawInfo, 0, msg->gpd_Attrs ); struct RastPort *rp = msg->gpd_RPort; UWORD width, height, x=1,y=1; diff --git a/workbench/classes/zune/aboutwindow/aboutwindow.c b/workbench/classes/zune/aboutwindow/aboutwindow.c index f5ac5a6b3..95c24c6bc 100644 --- a/workbench/classes/zune/aboutwindow/aboutwindow.c +++ b/workbench/classes/zune/aboutwindow/aboutwindow.c @@ -69,8 +69,8 @@ BOOL NamesToList Object *list, struct TagItem *tags, struct AboutWindow_DATA *data ) { - struct TagItem *tstate = tags, - *tag = NULL; + const struct TagItem *tstate = tags; + struct TagItem *tag = NULL; BOOL success = TRUE; IPTR section = SID_NONE; CONST_STRPTR sectionName = NULL; @@ -157,8 +157,8 @@ Object *AboutWindow__OM_NEW ) { struct AboutWindow_DATA *data = NULL; + const struct TagItem *tstate = message->ops_AttrList; struct TagItem *tag = NULL, - *tstate = message->ops_AttrList, *authorsTags = NULL, *sponsorsTags = NULL; struct Catalog *catalog = NULL; @@ -256,7 +256,7 @@ Object *AboutWindow__OM_NEW { strlcat(path, "PROGDIR:", 512); strlcat(path, FilePart(program), 512); - imageObject = IconImageObject, + imageObject = (Object *)IconImageObject, MUIA_IconImage_File, (IPTR) path, End; } @@ -292,24 +292,24 @@ Object *AboutWindow__OM_NEW WindowContents, (IPTR) VGroup, GroupSpacing(6), - Child, (IPTR) (imageGroup = HGroup, + Child, (IPTR) (imageGroup = (Object *)HGroup, MUIA_Weight, 0, Child, (IPTR) HVSpace, Child, (IPTR) imageObject, Child, (IPTR) HVSpace, End), - Child, (IPTR) (versionObject = TextObject, + Child, (IPTR) (versionObject = (Object *)TextObject, MUIA_Text_PreParse, (IPTR) MUIX_C, MUIA_Text_Contents, (IPTR) NULL, End), - Child, (IPTR) (copyrightObject = TextObject, + Child, (IPTR) (copyrightObject = (Object *)TextObject, MUIA_Text_PreParse, (IPTR) MUIX_C, MUIA_Text_Contents, (IPTR) NULL, End), - Child, (IPTR) (descriptionGroup = VGroup, + Child, (IPTR) (descriptionGroup = (Object *)VGroup, Child, (IPTR) VSpace(6), - Child, (IPTR) (descriptionObject = TextObject, + Child, (IPTR) (descriptionObject = (Object *)TextObject, MUIA_Text_PreParse, (IPTR) MUIX_I MUIX_C, MUIA_Text_Contents, (IPTR) NULL, End), @@ -317,12 +317,12 @@ Object *AboutWindow__OM_NEW Child, (IPTR) VSpace(6), Child, (IPTR) RegisterGroup(pages), Child, (IPTR) ListviewObject, - MUIA_Listview_List, (IPTR) (authorsList = ListObject, + MUIA_Listview_List, (IPTR) (authorsList = (Object *)ListObject, ReadListFrame, End), End, Child, (IPTR) ListviewObject, - MUIA_Listview_List, (IPTR) (sponsorsList = ListObject, + MUIA_Listview_List, (IPTR) (sponsorsList = (Object *)ListObject, ReadListFrame, End), End, diff --git a/workbench/classes/zune/calendar/calendar.c b/workbench/classes/zune/calendar/calendar.c index eba2a0d1a..72a4d172e 100644 --- a/workbench/classes/zune/calendar/calendar.c +++ b/workbench/classes/zune/calendar/calendar.c @@ -133,8 +133,8 @@ IPTR Calendar__OM_SET(Class *cl, Object *obj, struct opSet *msg) { struct Calendar_DATA *data = INST_DATA(cl, obj); struct ClockData old_clockdata; - struct TagItem *tags = msg->ops_AttrList; - struct TagItem *tag; + const struct TagItem *tags = msg->ops_AttrList; + struct TagItem *tag; BOOL redraw = FALSE; old_clockdata = data->clockdata; diff --git a/workbench/classes/zune/clock/clock.c b/workbench/classes/zune/clock/clock.c index 9846a1b64..f0e43a95d 100644 --- a/workbench/classes/zune/clock/clock.c +++ b/workbench/classes/zune/clock/clock.c @@ -86,7 +86,7 @@ IPTR Clock__OM_SET(Class *cl, Object *obj, struct opSet *msg) { struct Clock_DATA *data = INST_DATA(cl, obj); struct ClockData old_clockdata; - struct TagItem *tags = msg->ops_AttrList; + const struct TagItem *tags = msg->ops_AttrList; struct TagItem *tag; BOOL redraw = FALSE; diff --git a/workbench/classes/zune/iconimage/iconimage.c b/workbench/classes/zune/iconimage/iconimage.c index 26b42610d..44670d50e 100644 --- a/workbench/classes/zune/iconimage/iconimage.c +++ b/workbench/classes/zune/iconimage/iconimage.c @@ -34,7 +34,8 @@ Object *IconImage__OM_NEW ) { struct IconImage_DATA *data = NULL; - struct TagItem *tag = NULL, *tstate = message->ops_AttrList; + const struct TagItem *tstate = message->ops_AttrList; + struct TagItem *tag = NULL; struct DiskObject *diskObject = NULL; CONST_STRPTR file = NULL; diff --git a/workbench/classes/zune/prefseditor/prefseditor.c b/workbench/classes/zune/prefseditor/prefseditor.c index 6cfd8aadc..0927c1ffb 100644 --- a/workbench/classes/zune/prefseditor/prefseditor.c +++ b/workbench/classes/zune/prefseditor/prefseditor.c @@ -38,7 +38,7 @@ Object *PrefsEditor__OM_NEW Class *CLASS, Object *self, struct opSet *message ) { - self = (Object *) DoSuperMethodA(CLASS, self, message); + self = (Object *) DoSuperMethodA(CLASS, self, (Msg)message); if (self != NULL) { @@ -154,8 +154,8 @@ IPTR PrefsEditor__OM_SET ) { SETUP_INST_DATA; - struct TagItem *tstate = message->ops_AttrList, - *tag, + const struct TagItem *tstate = message->ops_AttrList; + struct TagItem *tag, noforward_attrs[] = { { MUIA_Group_Forward, FALSE }, diff --git a/workbench/classes/zune/prefswindow/prefswindow.c b/workbench/classes/zune/prefswindow/prefswindow.c index 29c9a31d8..a554a2697 100644 --- a/workbench/classes/zune/prefswindow/prefswindow.c +++ b/workbench/classes/zune/prefswindow/prefswindow.c @@ -181,8 +181,8 @@ IPTR PrefsWindow__OM_SET ) { struct PrefsWindow_DATA *data = INST_DATA(CLASS, self); - struct TagItem *tstate = message->ops_AttrList, - *tag; + const struct TagItem *tstate = message->ops_AttrList; + struct TagItem *tag; while ((tag = NextTagItem(&tstate)) != NULL) { diff --git a/workbench/classes/zune/systemprefswindow/systemprefswindow.c b/workbench/classes/zune/systemprefswindow/systemprefswindow.c index 4c0c8f08e..a5974ce75 100644 --- a/workbench/classes/zune/systemprefswindow/systemprefswindow.c +++ b/workbench/classes/zune/systemprefswindow/systemprefswindow.c @@ -64,7 +64,7 @@ Object *MakeMenuitem(CONST_STRPTR text) shortcut = NULL; } - return MenuitemObject, + return (Object *)MenuitemObject, MUIA_Menuitem_Title, (IPTR) title, shortcut != NULL ? MUIA_Menuitem_Shortcut : @@ -222,7 +222,8 @@ IPTR SystemPrefsWindow__OM_SET ) { SETUP_INST_DATA; - struct TagItem *tstate = message->ops_AttrList, *tag; + const struct TagItem *tstate = message->ops_AttrList; + struct TagItem *tag; while ((tag = NextTagItem(&tstate)) != NULL) { -- 2.11.4.GIT