From 289e003d66486fa6d178662780e9604cd4e4cbf2 Mon Sep 17 00:00:00 2001 From: mazze Date: Sat, 14 Mar 2009 16:22:11 +0000 Subject: [PATCH] Some compiler warnings removed. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@30907 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/system/Wanderer/Classes/icondrawerlist.c | 1 - workbench/system/Wanderer/Classes/iconlist.c | 10 ++--- workbench/system/Wanderer/Classes/iconlistview.c | 7 ++- .../system/Wanderer/Tools/DiskInfo/diskinfo.c | 33 +++++++------- workbench/system/Wanderer/Tools/DiskInfo/main.c | 2 +- .../Wanderer/Tools/ExecuteCommand/executecommand.c | 6 +-- .../system/Wanderer/Tools/ExecuteCommand/main.c | 2 +- workbench/system/Wanderer/Tools/Info/main.c | 34 +++++++------- workbench/system/Wanderer/Tools/WBNewDrawer/main.c | 18 ++++---- workbench/system/Wanderer/Tools/WBRename/main.c | 8 ++-- workbench/system/Wanderer/filesystems.c | 2 +- workbench/system/Wanderer/iconwindow.c | 10 ++--- workbench/system/Wanderer/iconwindowbackfill.c | 12 ++--- workbench/system/Wanderer/iconwindowcontents.c | 38 ++++++++-------- workbench/system/Wanderer/wanderer.c | 52 +++++++++++----------- workbench/system/Wanderer/wandererprefs.c | 7 ++- 16 files changed, 117 insertions(+), 125 deletions(-) diff --git a/workbench/system/Wanderer/Classes/icondrawerlist.c b/workbench/system/Wanderer/Classes/icondrawerlist.c index ce468ef4d..3f749c1c5 100644 --- a/workbench/system/Wanderer/Classes/icondrawerlist.c +++ b/workbench/system/Wanderer/Classes/icondrawerlist.c @@ -352,7 +352,6 @@ MUIM_IconList_Update **************************************************************************/ IPTR IconDrawerList__MUIM_IconList_Update(struct IClass *CLASS, Object *obj, struct MUIP_IconList_Update *message) { - struct IconDrawerList_DATA *data = INST_DATA(CLASS, obj); //struct IconEntry *node; D(bug("[IconDrawerList]: %s()\n", __PRETTY_FUNCTION__)); diff --git a/workbench/system/Wanderer/Classes/iconlist.c b/workbench/system/Wanderer/Classes/iconlist.c index b1ff031d7..b06128452 100644 --- a/workbench/system/Wanderer/Classes/iconlist.c +++ b/workbench/system/Wanderer/Classes/iconlist.c @@ -693,8 +693,8 @@ D(bug("[IconList]: %s: txwidth = %d\n", __PRETTY_FUNCTION__, txwidth)); labelSplit_CharsDone = labelSplit_CharsDone + 1; } - while(TextLength(data->icld_BufferRastPort, labelSplit_SplitStart, labelSplit_CurSplitLength) < txwidth) labelSplit_CurSplitLength++; - while(TextLength(data->icld_BufferRastPort, labelSplit_SplitStart, labelSplit_CurSplitLength) > txwidth) labelSplit_CurSplitLength--; + while(TextLength(data->icld_BufferRastPort, (char *)labelSplit_SplitStart, labelSplit_CurSplitLength) < txwidth) labelSplit_CurSplitLength++; + while(TextLength(data->icld_BufferRastPort, (char *)labelSplit_SplitStart, labelSplit_CurSplitLength) > txwidth) labelSplit_CurSplitLength--; #if defined(DEBUG_ILC_ICONRENDERING) D(bug("[IconList]: %s: labelSplit_CurSplitLength = %d\n", __PRETTY_FUNCTION__, labelSplit_CurSplitLength)); #endif @@ -2631,14 +2631,14 @@ D(bug("[IconList] %s#%d: UPDATE_RESIZE.\n", __PRETTY_FUNCTION__, draw_id)); { if ((data->icld_BufferRastPort = CreateRastPort())!=NULL) { - data->icld_BufferRastPort->BitMap = bitmap_New; + data->icld_BufferRastPort->BitMap = (struct BitMap *)bitmap_New; SET(obj, MUIA_IconList_BufferRastport, data->icld_BufferRastPort); data->icld_DrawOffsetX = 0; data->icld_DrawOffsetY = 0; } else { - FreeBitMap(bitmap_New); + FreeBitMap((struct BitMap *)bitmap_New); data->icld_BufferRastPort = data->icld_DisplayRastPort; data->icld_DrawOffsetX = _mleft(obj); data->icld_DrawOffsetY = _mtop(obj); @@ -2646,7 +2646,7 @@ D(bug("[IconList] %s#%d: UPDATE_RESIZE.\n", __PRETTY_FUNCTION__, draw_id)); } if (bitmap_Old != (struct Bitmap *)data->icld_BufferRastPort->BitMap) - FreeBitMap(bitmap_Old); + FreeBitMap((struct BitMap *)bitmap_Old); } data->icld_UpdateMode = 0; diff --git a/workbench/system/Wanderer/Classes/iconlistview.c b/workbench/system/Wanderer/Classes/iconlistview.c index f4d19f87a..28dca6d39 100644 --- a/workbench/system/Wanderer/Classes/iconlistview.c +++ b/workbench/system/Wanderer/Classes/iconlistview.c @@ -211,14 +211,14 @@ IPTR IconListview__OM_NEW(struct IClass *cl, Object *obj, struct opSet *msg) { struct IconListview_DATA *data; //struct TagItem *tags,*tag; - Object *iconlist = (Object*)GetTagData(MUIA_IconListview_IconList, NULL, msg->ops_AttrList); + Object *iconlist = (Object*)GetTagData(MUIA_IconListview_IconList, 0, msg->ops_AttrList); Object *vert,*horiz,*button,*group; struct Hook *layout_hook = AllocVec(sizeof(struct Hook), MEMF_CLEAR); int usewinborder; if (!layout_hook) - return NULL; + return 0; usewinborder = GetTagData(MUIA_IconListview_UseWinBorder, FALSE, msg->ops_AttrList); #ifdef __AROS__ @@ -266,7 +266,7 @@ IPTR IconListview__OM_NEW(struct IClass *cl, Object *obj, struct opSet *msg) { MUI_DisposeObject(group); FreeVec(layout_hook); - return NULL; + return 0; } data = INST_DATA(cl, obj); @@ -310,7 +310,6 @@ IPTR IconListview__OM_DISPOSE(struct IClass *cl, Object *obj, Msg msg) IPTR IconListview__OM_SET(struct IClass *cl, Object *obj, struct opSet *msg) { - struct IconListview_DATA *data = INST_DATA(cl, obj); struct TagItem *tag, *tags; for (tags = msg->ops_AttrList; (tag = NextTagItem((const struct TagItem **)&tags)); ) diff --git a/workbench/system/Wanderer/Tools/DiskInfo/diskinfo.c b/workbench/system/Wanderer/Tools/DiskInfo/diskinfo.c index 39ede59fe..54d23e2f0 100644 --- a/workbench/system/Wanderer/Tools/DiskInfo/diskinfo.c +++ b/workbench/system/Wanderer/Tools/DiskInfo/diskinfo.c @@ -165,7 +165,7 @@ Object *DiskInfo__OM_NEW D(bug("[DiskInfo] %s: Volume '%s'\n", __PRETTY_FUNCTION__, volname)); /* find the volumes doslist information .. */ - IPTR volunit = NULL; + IPTR volunit = 0; filesystem = _(MSG_UNKNOWN); dl = LockDosList(LDF_VOLUMES|LDF_READ); if (dl) { @@ -173,7 +173,7 @@ Object *DiskInfo__OM_NEW if (dn) { ULONG i; - volunit = dn->dol_Ext.dol_AROS.dol_Unit; + volunit = (IPTR)dn->dol_Ext.dol_AROS.dol_Unit; D(bug("[DiskInfo] %s: Volume's unit @ %p\n", __PRETTY_FUNCTION__, volunit)); @@ -202,13 +202,13 @@ Object *DiskInfo__OM_NEW UnLockDosList(LDF_VOLUMES|LDF_READ); } /* If we know the volumes unit - find its device information .. */ - if (volunit != NULL) + if (volunit != 0) { dl = LockDosList(LDF_DEVICES|LDF_READ); if (dl) { while((dl = NextDosEntry(dl, LDF_DEVICES))) { - if (dl->dol_Ext.dol_AROS.dol_Unit == volunit) + if ((IPTR)dl->dol_Ext.dol_AROS.dol_Unit == volunit) { struct FileSysStartupMsg *fsstartup = (struct FileSysStartupMsg *)BADDR(dl->dol_misc.dol_handler.dol_Startup); dosdevname = (UBYTE*)AROS_BSTR_ADDR(dl->dol_Name); @@ -299,7 +299,7 @@ Object *DiskInfo__OM_NEW Child, HVSpace, Child, (IPTR) HGroup, Child, HVSpace, - Child, (IPTR)(voliconobj = IconImageObject, + Child, (IPTR)(voliconobj = (Object *)IconImageObject, MUIA_InputMode, MUIV_InputMode_Toggle, MUIA_IconImage_File, (IPTR) volicon, End), @@ -353,9 +353,9 @@ Object *DiskInfo__OM_NEW Child, (IPTR) ColGroup(2), Child, (IPTR) TextObject, MUIA_Text_PreParse, (IPTR) "\33r", - MUIA_Text_Contents, (IPTR) __(MSG_NAME), + MUIA_Text_Contents, __(MSG_NAME), End, - Child, (IPTR)(volnameobj = TextObject, TextFrame, + Child, (IPTR)(volnameobj = (Object *)TextObject, TextFrame, MUIA_Background, MUII_TextBack, MUIA_Text_PreParse, (IPTR) "\33b\33l", MUIA_Text_Contents, (IPTR) volname, @@ -364,17 +364,17 @@ Object *DiskInfo__OM_NEW Child, (IPTR) TextObject, TextFrame, MUIA_FramePhantomHoriz, (IPTR)TRUE, MUIA_Text_PreParse, (IPTR) "\33r", - MUIA_Text_Contents, (IPTR) __(MSG_SIZE), + MUIA_Text_Contents, __(MSG_SIZE), End, Child, (IPTR) TextObject, TextFrame, MUIA_FramePhantomHoriz, (IPTR)TRUE, MUIA_Text_PreParse, (IPTR) "\33r", - MUIA_Text_Contents, (IPTR) __(MSG_USED), + MUIA_Text_Contents, __(MSG_USED), End, Child, (IPTR) TextObject, TextFrame, MUIA_FramePhantomHoriz, (IPTR)TRUE, MUIA_Text_PreParse, (IPTR) "\33r", - MUIA_Text_Contents, (IPTR) __(MSG_FREE), + MUIA_Text_Contents, __(MSG_FREE), End, End, Child, (IPTR) HGroup, @@ -384,18 +384,18 @@ Object *DiskInfo__OM_NEW MUIA_Text_PreParse, (IPTR) "\33l", MUIA_Text_Contents, (IPTR) size, End, - Child, (IPTR)(volusedobj = TextObject, TextFrame, + Child, (IPTR)(volusedobj = (Object *)TextObject, TextFrame, MUIA_Background, MUII_TextBack, MUIA_Text_PreParse, (IPTR) "\33l", MUIA_Text_Contents, (IPTR) used, End), - Child, (IPTR)(volfreeobj = TextObject, TextFrame, + Child, (IPTR)(volfreeobj = (Object *)TextObject, TextFrame, MUIA_Background, MUII_TextBack, MUIA_Text_PreParse, (IPTR) "\33l", MUIA_Text_Contents, (IPTR) free, End), End, - Child, (IPTR)(volusegaugeobj = GaugeObject, GaugeFrame, + Child, (IPTR)(volusegaugeobj = (Object *)GaugeObject, GaugeFrame, MUIA_Gauge_InfoText, "", MUIA_Gauge_Horiz, FALSE, MUIA_Gauge_Current, percent, @@ -403,7 +403,7 @@ Object *DiskInfo__OM_NEW End, Child, (IPTR) TextObject, MUIA_Text_PreParse, (IPTR) "\33r", - MUIA_Text_Contents, (IPTR) __(MSG_BLOCK_SIZE), + MUIA_Text_Contents, __(MSG_BLOCK_SIZE), End, Child, (IPTR) TextObject, TextFrame, MUIA_Background, MUII_TextBack, @@ -412,7 +412,7 @@ Object *DiskInfo__OM_NEW End, Child, (IPTR) TextObject, MUIA_Text_PreParse, (IPTR) "\33r", - MUIA_Text_Contents, (IPTR) __(MSG_STATUS), + MUIA_Text_Contents, __(MSG_STATUS), End, Child, (IPTR) TextObject, TextFrame, MUIA_Background, MUII_TextBack, @@ -424,7 +424,7 @@ Object *DiskInfo__OM_NEW End, Child, HVSpace, End, - Child, (IPTR) (grpformat = HGroup, + Child, (IPTR) (grpformat = (Object *)HGroup, // grpformat object userlevel sensitive Child, HVSpace, End), @@ -549,7 +549,6 @@ IPTR DiskInfo__MUIM_DiskInfo_HandleNotify if (id.id_DiskType != ID_NO_DISK_PRESENT) { ULONG percent; - TEXT volname[108]; TEXT used[64]; TEXT free[64]; //TEXT blocksize[16]; diff --git a/workbench/system/Wanderer/Tools/DiskInfo/main.c b/workbench/system/Wanderer/Tools/DiskInfo/main.c index f79914ba2..c86865017 100644 --- a/workbench/system/Wanderer/Tools/DiskInfo/main.c +++ b/workbench/system/Wanderer/Tools/DiskInfo/main.c @@ -62,7 +62,7 @@ int main(int argc, char **argv) { initial = startup->sm_ArgList[1].wa_Lock; D(bug("[DiskInfo] main, initial: 0x%08lX\n", initial)); - application = DiskInfoObject, + application = (Object *)DiskInfoObject, MUIA_DiskInfo_Initial, (IPTR) initial, MUIA_DiskInfo_Aspect, 0, End; diff --git a/workbench/system/Wanderer/Tools/ExecuteCommand/executecommand.c b/workbench/system/Wanderer/Tools/ExecuteCommand/executecommand.c index 2b1230040..74691a625 100644 --- a/workbench/system/Wanderer/Tools/ExecuteCommand/executecommand.c +++ b/workbench/system/Wanderer/Tools/ExecuteCommand/executecommand.c @@ -110,7 +110,7 @@ Object *ExecuteCommand__OM_NEW MUIA_Application_Version, (IPTR) VERSION, MUIA_Application_Copyright, (IPTR)"© 2006, The AROS Development Team", MUIA_Application_Description, __(MSG_DESCRIPTION), - SubWindow, (IPTR) (window = WindowObject, + SubWindow, (IPTR) (window = (Object *)WindowObject, MUIA_Window_Title, __(MSG_DESCRIPTION), MUIA_Window_Activate, TRUE, MUIA_Window_NoMenus, TRUE, @@ -119,8 +119,8 @@ Object *ExecuteCommand__OM_NEW WindowContents, (IPTR) VGroup, Child, (IPTR) VGroup, Child, (IPTR) LLabel(_(MSG_LABEL_COMMANDLINE)), - Child, (IPTR) (commandPop = PopaslObject, - MUIA_Popstring_String, (IPTR) (commandString = StringObject, + Child, (IPTR) (commandPop = (Object *)PopaslObject, + MUIA_Popstring_String, (IPTR) (commandString = (Object *)StringObject, MUIA_String_Contents, (IPTR) initial, MUIA_CycleChain, 1, StringFrame, diff --git a/workbench/system/Wanderer/Tools/ExecuteCommand/main.c b/workbench/system/Wanderer/Tools/ExecuteCommand/main.c index c0d3eca4b..29a849ac6 100644 --- a/workbench/system/Wanderer/Tools/ExecuteCommand/main.c +++ b/workbench/system/Wanderer/Tools/ExecuteCommand/main.c @@ -56,7 +56,7 @@ int main(int argc, char **argv) } } - application = ExecuteCommandObject, + application = (Object *)ExecuteCommandObject, MUIA_ExecuteCommand_Parent, (IPTR) parent, MUIA_ExecuteCommand_Initial, (IPTR) initial, End; diff --git a/workbench/system/Wanderer/Tools/Info/main.c b/workbench/system/Wanderer/Tools/Info/main.c index b366448bc..3c5e305d9 100644 --- a/workbench/system/Wanderer/Tools/Info/main.c +++ b/workbench/system/Wanderer/Tools/Info/main.c @@ -518,7 +518,7 @@ D(bug("[WBInfo] scan file\n")); sprintf(datetime, "%s %s", time, date); /* fill size */ - sprintf(size, "%ld", ap->ap_Info.fib_Size); + sprintf(size, "%d", ap->ap_Info.fib_Size); /* fill protection */ protection = ap->ap_Info.fib_Protection; @@ -548,7 +548,7 @@ D(bug("[WBInfo] scan file\n")); D(bug("[WBInfo] file has icon\n")); type = (char *) typeNames[icon->do_Type]; D(bug("[WBInfo] icon type is: %s\n", type)); - sprintf(stack, "%ld", icon->do_StackSize); + sprintf(stack, "%d", icon->do_StackSize); if (icon->do_DefaultTool) sprintf(deftool, "%s", icon->do_DefaultTool); else @@ -561,7 +561,7 @@ D(bug("[WBInfo] icon type is: %s\n", type)); if (icon->do_Type == 2) { - sizespace = TextObject, + sizespace = (Object *)TextObject, ButtonFrame, MUIA_Background, MUII_TextBack, MUIA_Text_PreParse, (IPTR) "\33r", @@ -572,7 +572,7 @@ D(bug("[WBInfo] icon type is: %s\n", type)); } else { - sizespace = TextObject, + sizespace = (Object *)TextObject, TextFrame, MUIA_Background, MUII_TextBack, MUIA_Text_PreParse, (IPTR) "\33r", @@ -580,7 +580,7 @@ D(bug("[WBInfo] icon type is: %s\n", type)); End; } - application = ApplicationObject, + application = (Object *)ApplicationObject, MUIA_Application_Title, __(MSG_TITLE), MUIA_Application_Version, (IPTR) "$VER: Info 0.3 ("ADATE") © AROS Dev Team", MUIA_Application_Description, __(MSG_DESCRIPTION), @@ -588,21 +588,21 @@ D(bug("[WBInfo] icon type is: %s\n", type)); MUIA_Application_Menustrip, (IPTR) MenuitemObject, MUIA_Family_Child, (IPTR) MenuitemObject, MUIA_Menuitem_Title, __(MSG_PROJECT), - MUIA_Family_Child, (IPTR)(infomenu = MenuitemObject, MUIA_Menuitem_Title, + MUIA_Family_Child, (IPTR)(infomenu = (Object *)MenuitemObject, MUIA_Menuitem_Title, __(MSG_INFORMATION), MUIA_Menuitem_Shortcut, (IPTR) "I", End), - MUIA_Family_Child, (IPTR)(protectmenu = MenuitemObject, MUIA_Menuitem_Title, + MUIA_Family_Child, (IPTR)(protectmenu = (Object *)MenuitemObject, MUIA_Menuitem_Title, __(MSG_PROTECTION),MUIA_Menuitem_Shortcut, (IPTR) "P", End), - MUIA_Family_Child, (IPTR)(toolmenu = MenuitemObject, MUIA_Menuitem_Title, + MUIA_Family_Child, (IPTR)(toolmenu = (Object *)MenuitemObject, MUIA_Menuitem_Title, __(MSG_TOOLTYPES),MUIA_Menuitem_Shortcut, (IPTR) "T", End), MUIA_Family_Child, (IPTR) MenuitemObject, MUIA_Menuitem_Title, ~0, End, - MUIA_Family_Child, (IPTR) (aboutmenu = MenuitemObject, MUIA_Menuitem_Title, + MUIA_Family_Child, (IPTR) (aboutmenu = (Object *)MenuitemObject, MUIA_Menuitem_Title, __(MSG_ABOUT), (IPTR) MUIA_Menuitem_Shortcut, (IPTR) "?", End), MUIA_Family_Child, (IPTR) MenuitemObject, MUIA_Menuitem_Title, ~0, End, - MUIA_Family_Child, (IPTR) (quit = MenuitemObject, MUIA_Menuitem_Title, + MUIA_Family_Child, (IPTR) (quit = (Object *)MenuitemObject, MUIA_Menuitem_Title, __(MSG_QUIT), MUIA_Menuitem_Shortcut, (IPTR) "Q", End), End, End, - SubWindow, (IPTR) (window = WindowObject, + SubWindow, (IPTR) (window = (Object *)WindowObject, MUIA_Window_Title, (IPTR) __(MSG_ICON), MUIA_Window_ID, MAKE_ID('I','N','F','O'), MUIA_Window_Activate, TRUE, @@ -630,21 +630,21 @@ D(bug("[WBInfo] icon type is: %s\n", type)); Child, (IPTR) HGroup, Child, (IPTR) ColGroup(2), Child, (IPTR) Label2(__(MSG_TYPE)), - Child, (IPTR) (typespace = TextObject, + Child, (IPTR) (typespace = (Object *)TextObject, TextFrame, MUIA_Background, MUII_TextBack, MUIA_Text_PreParse, (IPTR) "\33r", MUIA_Text_Contents, (IPTR) type, End), Child, (IPTR) Label2(__(MSG_DATE)), - Child, (IPTR) (datespace = TextObject, + Child, (IPTR) (datespace = (Object *)TextObject, TextFrame, MUIA_Background, MUII_TextBack, MUIA_Text_PreParse, (IPTR) "\33r", MUIA_Text_Contents, (IPTR) datetime, End), Child, (IPTR) Label2(__(MSG_VERSION)), - Child, (IPTR) (versionspace = TextObject, + Child, (IPTR) (versionspace = (Object *)TextObject, ButtonFrame, MUIA_Background, MUII_TextBack, MUIA_Text_PreParse, (IPTR) "\33r", @@ -657,11 +657,11 @@ D(bug("[WBInfo] icon type is: %s\n", type)); End, End, Child, (IPTR) HVSpace, - Child, (IPTR) (group = HGroup, + Child, (IPTR) (group = (Object *)HGroup, End), Child, (IPTR) HGroup, Child, (IPTR) Label2(__(MSG_COMMENT)), - Child, (IPTR) (commentspace = StringObject, + Child, (IPTR) (commentspace = (Object *)StringObject, StringFrame, MUIA_CycleChain, 1, End), @@ -714,7 +714,7 @@ D(bug("[WBInfo] icon type is: %s\n", type)); GroupSpacing(0), Child, (IPTR) (editor = MUI_NewObject(MUIC_TextEditor, TAG_DONE)), - Child, (IPTR) (slider = ScrollbarObject, + Child, (IPTR) (slider = (Object *)ScrollbarObject, End), End, #endif diff --git a/workbench/system/Wanderer/Tools/WBNewDrawer/main.c b/workbench/system/Wanderer/Tools/WBNewDrawer/main.c index bc50bf6d5..08e270281 100644 --- a/workbench/system/Wanderer/Tools/WBNewDrawer/main.c +++ b/workbench/system/Wanderer/Tools/WBNewDrawer/main.c @@ -32,7 +32,7 @@ static void bt_ok_hook_function(void); static void Cleanup(STRPTR s); static BOOL doNewDrawer(void); static void MakeGUI(void); -static const STRPTR SelectDefaultName(STRPTR basename); +static CONST_STRPTR SelectDefaultName(STRPTR basename); static Object *app, *window, *bt_ok, *bt_cancel, *cm_icons, *str_name; static struct Hook bt_ok_hook; @@ -75,9 +75,9 @@ int main(int argc, char **argv) static void MakeGUI(void) { - const STRPTR defname = SelectDefaultName(_(MSG_BASENAME)); + CONST_STRPTR defname = SelectDefaultName(_(MSG_BASENAME)); bt_ok_hook.h_Entry = (APTR)bt_ok_hook_function; - (IPTR)(app = ApplicationObject, + app = (Object *)ApplicationObject, MUIA_Application_Title , __(MSG_TITLE), MUIA_Application_Version , (IPTR) versionstring, MUIA_Application_Copyright , __(MSG_COPYRIGHT), @@ -86,7 +86,7 @@ static void MakeGUI(void) MUIA_Application_Base , (IPTR) "NEWDRAWER", MUIA_Application_UseCommodities, FALSE, MUIA_Application_UseRexx, FALSE, - SubWindow, (IPTR)(window = WindowObject, + SubWindow, (IPTR)(window = (Object *)WindowObject, MUIA_Window_Title, __(MSG_WINDOW_TITLE), MUIA_Window_NoMenus, TRUE, MUIA_Window_CloseGadget, FALSE, @@ -98,7 +98,7 @@ static void MakeGUI(void) End), Child, (IPTR) (ColGroup(2), Child, (IPTR) Label2(__(MSG_NAME)), - Child, (IPTR)(str_name = StringObject, + Child, (IPTR)(str_name = (Object *)StringObject, MUIA_CycleChain, 1, MUIA_String_Contents, (IPTR) defname, MUIA_String_MaxLen, MAXFILENAMELENGTH, @@ -122,8 +122,8 @@ static void MakeGUI(void) End), End), End), - End); - FreeVec(defname); + End; + FreeVec((APTR)defname); if (!app) Cleanup(_(MSG_FAILED_CREATE_APP)); @@ -213,7 +213,7 @@ end: * You have to free the return value with FreeVec. * */ -static const STRPTR SelectDefaultName(STRPTR basename) +static CONST_STRPTR SelectDefaultName(STRPTR basename) { if (basename == NULL) basename = "Rename_Me"; @@ -229,7 +229,7 @@ static const STRPTR SelectDefaultName(STRPTR basename) if (number == 0) strcpy(buffer, basename); else - sprintf(buffer,"%s_%ld", basename, number); + sprintf(buffer,"%s_%d", basename, number); test = Lock(buffer, ACCESS_READ); UnLock(test); diff --git a/workbench/system/Wanderer/Tools/WBRename/main.c b/workbench/system/Wanderer/Tools/WBRename/main.c index dfe01d1cd..c19b3f89e 100644 --- a/workbench/system/Wanderer/Tools/WBRename/main.c +++ b/workbench/system/Wanderer/Tools/WBRename/main.c @@ -80,7 +80,7 @@ int main(int argc, char **argv) static void MakeGUI(void) { bt_ok_hook.h_Entry = (APTR)bt_ok_hook_function; - (IPTR)(app = ApplicationObject, + app = (Object *)ApplicationObject, MUIA_Application_Title , __(MSG_TITLE), MUIA_Application_Version , (IPTR) versionstring, MUIA_Application_Copyright , __(MSG_COPYRIGHT), @@ -89,7 +89,7 @@ static void MakeGUI(void) MUIA_Application_Base , (IPTR) "WBRENAME", MUIA_Application_UseCommodities, FALSE, MUIA_Application_UseRexx, FALSE, - SubWindow, (IPTR)(window = WindowObject, + SubWindow, (IPTR)(window = (Object *)WindowObject, MUIA_Window_Title, __(MSG_WINDOW_TITLE), MUIA_Window_NoMenus, TRUE, MUIA_Window_CloseGadget, FALSE, @@ -101,7 +101,7 @@ static void MakeGUI(void) End), Child, (IPTR) (HGroup, Child, (IPTR) Label2(__(MSG_NAME)), - Child, (IPTR)(str_name = StringObject, + Child, (IPTR)(str_name = (Object *)StringObject, MUIA_CycleChain, 1, MUIA_String_Contents, (IPTR) oldname, MUIA_String_MaxLen, MAXFILENAMELENGTH, @@ -120,7 +120,7 @@ static void MakeGUI(void) End), End), End), - End); + End; if (!app) Cleanup(_(MSG_FAILED_CREATE_APP)); diff --git a/workbench/system/Wanderer/filesystems.c b/workbench/system/Wanderer/filesystems.c index 8ba32b4ac..600b87bb0 100644 --- a/workbench/system/Wanderer/filesystems.c +++ b/workbench/system/Wanderer/filesystems.c @@ -14,7 +14,7 @@ void strcrem(char *s, char *d, char c) { while (*s) { if (*s != c) *d++= *s; - *s++;//"value computed is not used" ? + s++; } *d = 0; } diff --git a/workbench/system/Wanderer/iconwindow.c b/workbench/system/Wanderer/iconwindow.c index 0fe274aee..a6d23ce99 100644 --- a/workbench/system/Wanderer/iconwindow.c +++ b/workbench/system/Wanderer/iconwindow.c @@ -248,7 +248,9 @@ HOOKPROTO(IconWindow__HookFunc_ProcessBackgroundFunc, void, APTR *obj, APTR para AROS_USERFUNC_EXIT } +#ifndef __AROS__ MakeStaticHook(iwd_ProcessBackground_hook,IconWindow__HookFunc_ProcessBackgroundFunc); +#endif /// ///IconWindow__HookFunc_WandererBackFillFunc() @@ -561,9 +563,9 @@ D(bug("[IconWindow] %s: Allocated WindowBackFillHook @ 0x%p\n", __PRETTY_FUNCTIO else { struct DiskObject *drawericon = NULL; - IPTR geticon_error = NULL, geticon_isdefault = NULL; + IPTR geticon_error = 0, geticon_isdefault = 0; IPTR _newIconWin__TitleLen = 0; - IPTR current_DispFlags = 0, current_SortFlags = 0; + IPTR current_DispFlags = 0; IPTR icon__DispFlags = 0,icon__DispFlagMask = ~0; _newIconWin__WindowTop = MUIV_Window_TopEdge_Centered; @@ -1449,10 +1451,6 @@ IPTR IconWindow__MUIM_IconWindow_Open { // SETUP_ICONWINDOW_INST_DATA; - #ifdef __AROS__ - IPTR CURDISPFLAGS; - #endif - D(bug("[IconWindow]: %s()\n", __PRETTY_FUNCTION__)); if (!XGET(self, MUIA_Window_Open)) diff --git a/workbench/system/Wanderer/iconwindowbackfill.c b/workbench/system/Wanderer/iconwindowbackfill.c index 416f1448a..8556e95fd 100644 --- a/workbench/system/Wanderer/iconwindowbackfill.c +++ b/workbench/system/Wanderer/iconwindowbackfill.c @@ -654,7 +654,7 @@ check_imagebuffer: break; } - if (this_Buffer->bfsib_BitMap = AllocBitMap(this_BFI->bfi_CopyWidth, this_BFI->bfi_CopyHeight, Depth, Depth == 8 ? BMF_MINPLANES : 0L, this_BFI->bfi_Screen->RastPort.BitMap)) + if ((this_Buffer->bfsib_BitMap = AllocBitMap(this_BFI->bfi_CopyWidth, this_BFI->bfi_CopyHeight, Depth, Depth == 8 ? BMF_MINPLANES : 0L, this_BFI->bfi_Screen->RastPort.BitMap))) { struct Rectangle CopyBounds; @@ -759,7 +759,7 @@ check_imagebuffer: this_Buffer->bfsib_BitMapWidth = this_BFI->bfi_CopyWidth; this_Buffer->bfsib_BitMapHeight = this_BFI->bfi_CopyHeight; - if (this_Buffer->bfsib_BitMap = AllocBitMap(this_BFI->bfi_CopyWidth, this_BFI->bfi_CopyHeight, Depth, Depth == 8 ? BMF_MINPLANES : 0L, this_BFI->bfi_Screen->RastPort.BitMap)) + if ((this_Buffer->bfsib_BitMap = AllocBitMap(this_BFI->bfi_CopyWidth, this_BFI->bfi_CopyHeight, Depth, Depth == 8 ? BMF_MINPLANES : 0L, this_BFI->bfi_Screen->RastPort.BitMap))) { struct Rectangle CopyBounds; @@ -841,7 +841,7 @@ IPTR ImageBackFill__MUIM_IconWindow_BackFill_Setup this_BFI = AllocVec(sizeof(struct BackFillInfo), MEMF_CLEAR|MEMF_PUBLIC); D(bug("[IconWindow.ImageBackFill] MUIM_IconWindow_BackFill_Setup: Allocated BackFillInfo @ %x\n", this_BFI)); - return this_BFI; + return (IPTR)this_BFI; } /// @@ -851,7 +851,7 @@ IPTR ImageBackFill__MUIM_IconWindow_BackFill_Cleanup Class *CLASS, Object *self, struct MUIP_IconWindow_BackFill_Cleanup *message ) { - struct BackFillInfo *this_BFI = message->BackFill_Data; + struct BackFillInfo *this_BFI = (struct BackFillInfo *)message->BackFill_Data; D(bug("[IconWindow.ImageBackFill] MUIM_IconWindow_BackFill_Cleanup()\n")); @@ -881,10 +881,10 @@ IPTR ImageBackFill__MUIM_IconWindow_BackFill_DrawBackground D(bug("[IconWindow.ImageBackFill] MUIM_IconWindow_BackFill_DrawBackground()\n")); - if ((this_BFI = message->BackFill_Data) != NULL) + if ((this_BFI = (struct BackFillInfo *)message->BackFill_Data) != NULL) { D(bug("[IconWindow.ImageBackFill] MUIM_IconWindow_BackFill_DrawBackground: Got BackFill_Data @ %x\n", this_BFI)); - this_BFI->bfi_RastPort = message->draw_RastPort; + this_BFI->bfi_RastPort = (struct RastPort *)message->draw_RastPort; if ((this_BFI->bfi_Buffer) && (this_BFI->bfi_RastPort)) { diff --git a/workbench/system/Wanderer/iconwindowcontents.c b/workbench/system/Wanderer/iconwindowcontents.c index 33589b3c8..e63b48c34 100644 --- a/workbench/system/Wanderer/iconwindowcontents.c +++ b/workbench/system/Wanderer/iconwindowcontents.c @@ -545,7 +545,7 @@ BOOL IconWindowIconList__Func_ParseBackdrop(Class *CLASS, Object *self, char *bd if ((bdrp_file = AllocVec(strlen(bdrp_dir) + 9 + 1, MEMF_CLEAR|MEMF_PUBLIC)) != NULL) { sprintf(bdrp_file, "%s.backdrop", bdrp_dir); - if (bdrp_lock = Open(bdrp_file, MODE_OLDFILE)) + if ((bdrp_lock = Open(bdrp_file, MODE_OLDFILE))) { D(bug("[IconWindowIconList] IconWindowIconList__Func_ParseBackdrop: Loading config file: '%s'\n", bdrp_file)); if ((linebuf = AllocMem(BDRPLINELEN_MAX, MEMF_PUBLIC)) != NULL) @@ -576,7 +576,7 @@ D(bug("[IconWindowIconList] IconWindowIconList__Func_ParseBackdrop: LEAVEOUT Ico if (bdrp_currfile_dob) { struct IconEntry *this_entry = NULL; - if (this_entry = DoMethod(self, MUIM_IconList_CreateEntry, (IPTR)bdrp_fullfile, (IPTR)bdrp_namepart, (IPTR)NULL, (IPTR)bdrp_currfile_dob, 0)) + if ((this_entry = (struct IconEntry *)DoMethod(self, MUIM_IconList_CreateEntry, (IPTR)bdrp_fullfile, (IPTR)bdrp_namepart, (IPTR)NULL, (IPTR)bdrp_currfile_dob, 0))) { struct FileInfoBlock *fib = AllocDosObject(DOS_FIB, NULL); if (fib) @@ -624,11 +624,11 @@ D(bug("[IconWindowIconList] %s: LEAVEOUT Unknown Entry Type @ 0x%p\n", __PRETTY_ ///OM_NEW() Object *IconWindowIconList__OM_NEW(Class *CLASS, Object *self, struct opSet *message) { - IPTR _newIconList__FSNotifyPort = NULL; + IPTR _newIconList__FSNotifyPort = 0; D(bug("[IconWindowIconList] IconWindowIconList__OM_NEW()\n")); - _newIconList__FSNotifyPort = (Object *)GetTagData(MUIA_Wanderer_FileSysNotifyPort, (IPTR) NULL, message->ops_AttrList); + _newIconList__FSNotifyPort = GetTagData(MUIA_Wanderer_FileSysNotifyPort, (IPTR) NULL, message->ops_AttrList); self = (Object *) DoSuperNewTags ( @@ -648,9 +648,9 @@ Object *IconWindowIconList__OM_NEW(Class *CLASS, Object *self, struct opSet *mes data->iwcd_ProcessIconListPrefs_hook = &Hook_ProcessIconListPrefsFunc; #endif - if (_newIconList__FSNotifyPort != NULL) + if (_newIconList__FSNotifyPort != 0) { - struct IconWindowIconDrawerList_DATA *drawerlist_data = (IPTR)data; + struct IconWindowIconDrawerList_DATA *drawerlist_data = (struct IconWindowIconDrawerList_DATA *)data; drawerlist_data->iwdcd_DrawerNotifyRequest.nr_stuff.nr_Msg.nr_Port = _newIconList__FSNotifyPort; D(bug("[IconWindowIconList] IconWindowIconList__OM_NEW: FS Notify Port @ 0x%p\n", _newIconList__FSNotifyPort)); } @@ -679,13 +679,13 @@ IPTR IconWindowIconList__OM_SET(Class *CLASS, Object *self, struct opSet *messag case MUIA_IconWindow_Window: { D(bug("[IconWindowIconList] %s: MUIA_IconWindow_Window @ %p\n", __PRETTY_FUNCTION__, tag->ti_Data)); - data->iwcd_IconWindow = tag->ti_Data; + data->iwcd_IconWindow = (Object *)tag->ti_Data; break; } case MUIA_IconList_BufferRastport: { D(bug("[IconWindowIconList] %s: MUIA_IconList_BufferRastport @ %p\n", __PRETTY_FUNCTION__, tag->ti_Data)); - data->iwcd_RastPort = tag->ti_Data; + data->iwcd_RastPort = (struct RastPort *)tag->ti_Data; break; } } @@ -697,8 +697,8 @@ IPTR IconWindowIconList__OM_SET(Class *CLASS, Object *self, struct opSet *messag ///OM_GET() IPTR IconWindowIconList__OM_GET(Class *CLASS, Object *self, struct opGet *message) { - SETUP_INST_DATA; - IPTR *store = message->opg_Storage; + //SETUP_INST_DATA; + //IPTR *store = message->opg_Storage; IPTR rv = TRUE; switch (message->opg_AttrID) @@ -732,7 +732,7 @@ IPTR IconWindowIconList__MUIM_Setup GET(_win(self), MUIA_IconWindow_BackgroundAttrib, &data->iwcd_ViewPrefs_ID); D(bug("[IconWindowIconList] IconWindowIconList__MUIM_Setup: Window Background = '%s'\n", data->iwcd_ViewPrefs_ID)); - data->iwcd_ViewPrefs_NotificationObject = DoMethod(prefs, + data->iwcd_ViewPrefs_NotificationObject = (Object *)DoMethod(prefs, MUIM_WandererPrefs_ViewSettings_GetNotifyObject, data->iwcd_ViewPrefs_ID); @@ -906,7 +906,7 @@ D(bug("[IconWindowIconList] IconWindowIconList__MUIM_Setup: Background Notificat if (directory_path != NULL) { - struct IconWindowIconDrawerList_DATA *drawerlist_data = (IPTR)data; + struct IconWindowIconDrawerList_DATA *drawerlist_data = (struct IconWindowIconDrawerList_DATA *)data; if (drawerlist_data->iwdcd_DrawerNotifyRequest.nr_stuff.nr_Msg.nr_Port != NULL) { @@ -1024,7 +1024,7 @@ IPTR IconWindowIconList__MUIM_Cleanup } else { - struct IconWindowIconDrawerList_DATA *drawerlist_data = (IPTR)data; + struct IconWindowIconDrawerList_DATA *drawerlist_data = (struct IconWindowIconDrawerList_DATA *)data; if (drawerlist_data->iwdcd_DrawerNotifyRequest.nr_Name != NULL) { D(bug("[IconWindowIconList] IconWindowIconList__MUIM_Cleanup: (DRAWER WINDOW) Removing our Drawer Notification Request\n")); @@ -1042,7 +1042,7 @@ IPTR IconWindowIconList__MUIM_HandleEvent Class *CLASS, Object *self, struct MUIP_HandleEvent *message ) { - SETUP_INST_DATA; + //SETUP_INST_DATA; struct IntuiMessage *imsg = message->imsg; @@ -1073,7 +1073,7 @@ IPTR IconWindowIconList__MUIM_DrawBackground SETUP_INST_DATA; IPTR retVal = (IPTR)TRUE; - IPTR clip = NULL, adjust_left = 0, adjust_top = 0; + IPTR clip = 0; struct RastPort *DrawBackGround_RastPort; struct IconWindowBackFillMsg DrawBackGround_BackFillMsg; @@ -1133,7 +1133,7 @@ IPTR IconWindowIconList__MUIM_DrawBackground iwc_ParentBackground: - clip = MUI_AddClipping(muiRenderInfo(self), message->left, message->top, message->width, message->height); + clip = (IPTR)MUI_AddClipping(muiRenderInfo(self), message->left, message->top, message->width, message->height); message->width = _mwidth(self); message->height = _mheight(self); @@ -1142,7 +1142,7 @@ iwc_ParentBackground: retVal = DoSuperMethodA(CLASS, self, (Msg) message); - MUI_RemoveClipping(muiRenderInfo(self),clip); + MUI_RemoveClipping(muiRenderInfo(self), (APTR)clip); return retVal; } @@ -1216,7 +1216,7 @@ D(bug("[IconWindowIconList] IconWindowIconList__MUIM_IconList_Update: checking e if (_nb_dob) { struct Node *this_entry = NULL; - if (this_entry = DoMethod(self, MUIM_IconList_CreateEntry, (IPTR)"?wanderer.networkbrowse?", (IPTR)"Network Access..", (IPTR)NULL, (IPTR)_nb_dob, 0)) + if ((this_entry = (struct Node *)DoMethod(self, MUIM_IconList_CreateEntry, (IPTR)"?wanderer.networkbrowse?", (IPTR)"Network Access..", (IPTR)NULL, (IPTR)_nb_dob, 0))) { this_entry->ln_Pri = 3; /// Network Access gets Priority 3 so its displayed after special dirs sort_list = TRUE; @@ -1263,7 +1263,7 @@ D(bug("[IconWindowIconList] IconWindowIconList__MUIM_IconList_Update: checking e if (_nb_dob) { struct Node *this_entry = NULL; - if (this_entry = DoMethod(self, MUIM_IconList_CreateEntry, userfiles_path, (IPTR)"User Files..", (IPTR)NULL, (IPTR)_nb_dob, 0)) + if ((this_entry = (struct Node *)DoMethod(self, MUIM_IconList_CreateEntry, userfiles_path, (IPTR)"User Files..", (IPTR)NULL, (IPTR)_nb_dob, 0))) { this_entry->ln_Pri = 5; /// Special dirs get Priority 5 sort_list = TRUE; diff --git a/workbench/system/Wanderer/wanderer.c b/workbench/system/Wanderer/wanderer.c index ca1260d44..c34e00f23 100644 --- a/workbench/system/Wanderer/wanderer.c +++ b/workbench/system/Wanderer/wanderer.c @@ -568,7 +568,7 @@ D(bug("[WANDERER] Wanderer__HookFunc_ActionFunc: ICONWINDOW_ACTION_OPEN - offset /* process all selected entries */ do { - DoMethod(drop->source_iconlistobj, MUIM_IconList_NextIcon, MUIV_IconList_NextIcon_Selected, (IPTR) &ent); + DoMethod((Object *)drop->source_iconlistobj, MUIM_IconList_NextIcon, MUIV_IconList_NextIcon_Selected, (IPTR) &ent); /* if not end of selection, process */ if ( (int)ent != MUIV_IconList_NextIcon_End) @@ -588,7 +588,7 @@ D(bug("[WANDERER] Wanderer__HookFunc_ActionFunc: ICONWINDOW_ACTION_OPEN - offset {NP_Name , (IPTR)"wanderer copy" }, {NP_UserData , (IPTR)message_filelist }, {NP_StackSize, 40000 }, - {TAG_DONE , NULL } + {TAG_DONE , 0 } }; child = CreateNewProc(tags); @@ -665,7 +665,7 @@ D(bug("[WANDERER] Wanderer__HookFunc_ActionFunc: ICONWINDOW_ACTION_OPEN - offset D(bug("[WANDERER] AppWindowMsg: win:%s files:%s mx:%d my:%d\n",win->Title, filelist, wscreen->MouseX - win->LeftEdge, wscreen->MouseY - win->TopEdge);) /* send appwindow msg struct containing selected files to destination */ - SendAppWindowMessage(win, files, filelist, 0, wscreen->MouseX - win->LeftEdge, wscreen->MouseY - win->TopEdge, 0, 0); + SendAppWindowMessage(win, files, (char **)filelist, 0, wscreen->MouseX - win->LeftEdge, wscreen->MouseY - win->TopEdge, 0, 0); } FreeVec(filelist); @@ -1249,13 +1249,13 @@ void wanderer_menufunc_window_select() ///wanderer_menufunc_window_snapshot() void wanderer_menufunc_window_snapshot(IPTR *flags) { - Object *window = (Object *) XGET(_WandererIntern_AppObj, MUIA_Wanderer_ActiveWindow); - Object *iconList = (Object *) XGET(window, MUIA_IconWindow_IconList); - char *dir_name = XGET(window, MUIA_IconWindow_Location); - struct DiskObject *drawericon = NULL; - IPTR geticon_error = NULL; - IPTR display_bits = 0, sort_bits = 0; - BOOL snapshot_all = *flags; + Object *window = (Object *) XGET(_WandererIntern_AppObj, MUIA_Wanderer_ActiveWindow); + Object *iconList = (Object *) XGET(window, MUIA_IconWindow_IconList); + char *dir_name = (char *)XGET(window, MUIA_IconWindow_Location); + struct DiskObject *drawericon = NULL; + IPTR geticon_error = 0; + IPTR display_bits = 0, sort_bits = 0; + BOOL snapshot_all = *flags; D(bug("[wanderer] wanderer_menufunc_window_snapshot()\n")); D(bug("[wanderer] wanderer_menufunc_window_snapshot: Dir '%s'\n", dir_name)); @@ -1267,7 +1267,7 @@ D(bug("[wanderer] wanderer_menufunc_window_snapshot: Dir '%s'\n", dir_name)); struct TagItem icon_tags[] = { { ICONPUTA_OnlyUpdatePosition, TRUE }, - { TAG_DONE, NULL } + { TAG_DONE, 0 } }; D(bug("[wanderer] wanderer_menufunc_window_snapshot: snapshot ALL\n")); @@ -1314,7 +1314,7 @@ D(bug("[wanderer] wanderer_menufunc_window_snapshot: Icon for '%s' has no DRAWER drawericon->do_DrawerData = AllocMem(sizeof(struct DrawerData), MEMF_CLEAR|MEMF_PUBLIC); } - drawericon->do_Gadget.UserData = 1; + drawericon->do_Gadget.UserData = (APTR)1; drawericon->do_DrawerData->dd_NewWindow.TopEdge = XGET(window, MUIA_Window_TopEdge); drawericon->do_DrawerData->dd_NewWindow.LeftEdge = XGET(window, MUIA_Window_LeftEdge); @@ -1663,7 +1663,7 @@ void wanderer_menufunc_icon_snapshot(IPTR *flags) struct TagItem icontags[] = { { ICONPUTA_OnlyUpdatePosition, TRUE }, - { TAG_DONE, NULL } + { TAG_DONE, 0 } }; D(bug("[wanderer] wanderer_menufunc_icon_snapshot()\n")); @@ -1986,9 +1986,6 @@ void wanderer_menufunc_icon_format(void) Object *window = (Object *) XGET(_WandererIntern_AppObj, MUIA_Wanderer_ActiveWindow); Object *iconList = (Object *) XGET(window, MUIA_IconWindow_IconList); struct IconList_Entry *entry = ( void*) MUIV_IconList_NextIcon_Start; - struct MUIDisplayObjects dobjects; - struct Hook displayCopyHook; - struct Hook displayDelHook; DoMethod(iconList, MUIM_IconList_NextIcon, MUIV_IconList_NextIcon_Selected, (IPTR) &entry); @@ -2138,7 +2135,7 @@ VOID DoAllMenuNotifies(Object *strip, STRPTR path) DoMenuNotify(strip, MEN_WINDOW_SNAP_WIN, wanderer_menufunc_window_snapshot, FALSE); DoMenuNotify(strip, MEN_WINDOW_SNAP_ALL, - wanderer_menufunc_window_snapshot, TRUE); + wanderer_menufunc_window_snapshot, (APTR)TRUE); DoMenuNotify(strip, MEN_WINDOW_SELECT, wanderer_menufunc_window_select, NULL); @@ -2166,7 +2163,7 @@ VOID DoAllMenuNotifies(Object *strip, STRPTR path) DoMenuNotify(strip, MEN_ICON_INFORMATION, wanderer_menufunc_icon_information, NULL); DoMenuNotify(strip, MEN_ICON_SNAPSHOT, - wanderer_menufunc_icon_snapshot,TRUE); + wanderer_menufunc_icon_snapshot, (APTR)TRUE); DoMenuNotify(strip, MEN_ICON_UNSNAPSHOT, wanderer_menufunc_icon_snapshot, FALSE); DoMenuNotify(strip, MEN_ICON_LEAVEOUT, @@ -2194,7 +2191,7 @@ VOID DoAllMenuNotifies(Object *strip, STRPTR path) ///Wanderer__Func_UpdateMenuStates() VOID Wanderer__Func_UpdateMenuStates(Object *WindowObj, Object *IconlistObj) { - IPTR current_DispFlags = NULL, current_SortFlags = NULL; + IPTR current_DispFlags = 0, current_SortFlags = 0; Object *current_Menustrip = NULL, *current_MenuItem = NULL; struct IconList_Entry *icon_entry = (IPTR)MUIV_IconList_NextIcon_Start; int selected_count = 0; @@ -2382,7 +2379,6 @@ HOOKPROTO(Wanderer__HookFunc_UpdateMenuStatesFunc, ULONG, struct dCopyStruct *ob { #endif AROS_USERFUNC_INIT - Object *self = ( Object *)obj; Object *window = *( Object **)param; Object *iconlist = NULL; @@ -2396,6 +2392,8 @@ D(bug("[Wanderer] Wanderer__HookFunc_UpdateMenuStatesFunc: iconlist @ %p\n", ico D(bug("[Wanderer] Wanderer__HookFunc_UpdateMenuStatesFunc: Update Complete.\n")); + return 0; + AROS_USERFUNC_EXIT } @@ -2506,7 +2504,7 @@ D(bug("[Wanderer] Wanderer__OM_NEW: Prefs-notification setup on '%s'\n", data->w D(bug("[Wanderer] Wanderer__OM_NEW: FAILED to setup Prefs-notification!\n")); } #ifdef __AROS__ - data->wd_Prefs = WandererPrefsObject, End; // FIXME: error handling + data->wd_Prefs = (Object *)WandererPrefsObject, End; // FIXME: error handling #else data->wd_Prefs = NewObject(WandererPrefs_CLASS->mcc_Class, NULL, TAG_DONE); // FIXME: error handling #endif @@ -2885,7 +2883,7 @@ D(bug("[Wanderer] Wanderer__MUIM_Wanderer_HandleNotify: Wanderer Prefs-File Chan else if (notifyMessage_UserData != (IPTR) NULL) { D(bug("[Wanderer] Wanderer__MUIM_Wanderer_HandleNotify: Drawer Window contents changed .. Updating\n")); - DoMethod(notifyMessage_UserData, MUIM_IconList_Update); + DoMethod((Object *)notifyMessage_UserData, MUIM_IconList_Update); } ReplyMsg((struct Message *)notifyMessage); @@ -3091,18 +3089,18 @@ D(bug("[Wanderer] Wanderer__MUIM_Wanderer_CreateDrawerWindow: Using Screen @ %x\ /* Create a new icon drawer window with the correct drawer being set */ #ifdef __AROS__ - window = IconWindowObject, + window = (Object *)IconWindowObject, MUIA_UserData, 1, - MUIA_Wanderer_Prefs, data->wd_Prefs, - MUIA_Wanderer_Screen, data->wd_Screen, - MUIA_Window_ScreenTitle, GetUserScreenTitle(data->wd_Prefs), + MUIA_Wanderer_Prefs, (IPTR)data->wd_Prefs, + MUIA_Wanderer_Screen, (IPTR)data->wd_Screen, + MUIA_Window_ScreenTitle, (IPTR)GetUserScreenTitle(data->wd_Prefs), MUIA_Window_Menustrip, (IPTR) _NewWandDrawerMenu__menustrip, TAG_IconWindow_Drawer, (IPTR) message->drawer, MUIA_IconWindow_Font, useFont, MUIA_IconWindow_ActionHook, (IPTR) &_WandererIntern_hook_action, MUIA_IconWindow_IsRoot, isWorkbenchWindow ? TRUE : FALSE, isWorkbenchWindow ? MUIA_IconWindow_IsBackdrop : TAG_IGNORE, useBackdrop, - isWorkbenchWindow ? TAG_IGNORE : MUIA_Wanderer_FileSysNotifyPort, data->wd_NotifyPort, + isWorkbenchWindow ? TAG_IGNORE : MUIA_Wanderer_FileSysNotifyPort, (IPTR)data->wd_NotifyPort, MUIA_Window_IsSubWindow, isWorkbenchWindow ? FALSE : TRUE, MUIA_IconWindowExt_Toolbar_Enabled, hasToolbar ? TRUE : FALSE, End; diff --git a/workbench/system/Wanderer/wandererprefs.c b/workbench/system/Wanderer/wandererprefs.c index 223289059..9197990de 100644 --- a/workbench/system/Wanderer/wandererprefs.c +++ b/workbench/system/Wanderer/wandererprefs.c @@ -593,7 +593,7 @@ BOOL WPEditor_ProccessNetworkChunk(Class *CLASS, Object *self, UBYTE *_viewSetti { //SETUP_INST_DATA; - struct TagItem *network_tags =(struct TagItem32 *) _viewSettings_Chunk; + struct TagItem *network_tags = (struct TagItem *)_viewSettings_Chunk; SET(self, AROS_LE2LONG(network_tags[0].ti_Tag), AROS_LE2LONG(network_tags[0].ti_Data)); return TRUE; @@ -644,7 +644,6 @@ BOOL WandererPrefs_ProccessViewSettingsChunk(Class *CLASS, Object *self, char *_ { SETUP_INST_DATA; - BOOL background_node_found = FALSE; struct WandererPrefs_ViewSettingsNode *_viewSettings_Node = NULL; D(bug("[WANDERER.PREFS] WandererPrefs_ProccessViewSettingsChunk()\n")); @@ -666,7 +665,7 @@ D(bug("[WANDERER.PREFS] WandererPrefs_ProccessViewSettingsChunk: Creating new no _viewSettings_Node->wpbn_Name = AllocVec(strlen(_viewSettings_ViewName) + 1, MEMF_CLEAR|MEMF_PUBLIC); strcpy(_viewSettings_Node->wpbn_Name, _viewSettings_ViewName); #ifdef __AROS__ - _viewSettings_Node->wpbn_NotifyObject = NotifyObject, End; + _viewSettings_Node->wpbn_NotifyObject = (Object *)NotifyObject, End; #else _viewSettings_Node->wpbn_NotifyObject = MUI_NewObject(MUIC_Notify, TAG_DONE); #endif @@ -895,7 +894,7 @@ D(bug("[WANDERER.PREFS] WandererPrefs__MUIM_WandererPrefs_ViewSettings_GetNotify current_Node->wpbn_Name = AllocVec(strlen(message->Background_Name) + 1, MEMF_CLEAR|MEMF_PUBLIC); strcpy(current_Node->wpbn_Name, message->Background_Name); #ifdef __AROS__ - current_Node->wpbn_NotifyObject = NotifyObject, End; + current_Node->wpbn_NotifyObject = (Object *)NotifyObject, End; #else current_Node->wpbn_NotifyObject = MUI_NewObject(MUIC_Notify, TAG_DONE); #endif -- 2.11.4.GIT