diff --git a/WINGs/Examples/fontl.c b/WINGs/Examples/fontl.c index 4e1f642e..ed02d328 100644 --- a/WINGs/Examples/fontl.c +++ b/WINGs/Examples/fontl.c @@ -36,7 +36,7 @@ void show(WMWidget * self, void *data) void *d; WMLabel *l = (WMLabel *) data; d = WMGetHangedData(self); - sprintf(buf, "%i - 0x%x - 0%o", (int)(uintptr_t) d, (int)(uintptr_t) d, (int)(uintptr_t) d); + sprintf(buf, "%i - 0x%x - 0%o", (int)d, (int)d, (int)d); WMSetLabelText(l, buf); } diff --git a/WINGs/Examples/puzzle.c b/WINGs/Examples/puzzle.c index 85e59563..0c50b75b 100644 --- a/WINGs/Examples/puzzle.c +++ b/WINGs/Examples/puzzle.c @@ -134,7 +134,7 @@ void buttonClick(WMWidget * w, void *ptr) { char buffer[300]; - if (SlideButton((int)(uintptr_t) ptr)) { + if (SlideButton((uintptr_t)ptr)) { MoveCount++; if (CheckWin()) { diff --git a/WINGs/Extras/test.c b/WINGs/Extras/test.c index e3c4d6b8..6ab8db07 100644 --- a/WINGs/Extras/test.c +++ b/WINGs/Extras/test.c @@ -36,7 +36,7 @@ void *valueForCell(WMTableViewDelegate * self, WMTableColumn * column, int row) col2[i] = 0; } } - if ((int)(uintptr_t) WMGetTableColumnId(column) == 1) + if ((uintptr_t)WMGetTableColumnId(column) == 1) return col1[row]; else return (void *)(uintptr_t) col2[row]; @@ -44,10 +44,10 @@ void *valueForCell(WMTableViewDelegate * self, WMTableColumn * column, int row) void setValueForCell(WMTableViewDelegate * self, WMTableColumn * column, int row, void *data) { - if ((int)(uintptr_t) WMGetTableColumnId(column) == 1) + if ((uintptr_t)WMGetTableColumnId(column) == 1) col1[row] = data; else - col2[row] = (int)(uintptr_t) data; + col2[row] = (uintptr_t) data; } static WMTableViewDelegate delegate = { diff --git a/WINGs/Extras/wtabledelegates.c b/WINGs/Extras/wtabledelegates.c index 5b6e4617..488900ba 100644 --- a/WINGs/Extras/wtabledelegates.c +++ b/WINGs/Extras/wtabledelegates.c @@ -192,7 +192,7 @@ static void ESCellPainter(WMTableColumnDelegate * self, WMTableColumn * column, { EnumSelectorData *strdata = (EnumSelectorData *) self->data; WMTableView *table = WMGetTableColumnTableView(column); - int i = (int)(uintptr_t) WMTableViewDataForCell(table, column, row); + uintptr_t i = (uintptr_t)WMTableViewDataForCell(table, column, row); stringDraw(WMWidgetScreen(table), d, strdata->gc, strdata->selGC, strdata->textColor, strdata->font, @@ -203,7 +203,7 @@ static void selectedESCellPainter(WMTableColumnDelegate * self, WMTableColumn * { EnumSelectorData *strdata = (EnumSelectorData *) self->data; WMTableView *table = WMGetTableColumnTableView(column); - int i = (int)(uintptr_t) WMTableViewDataForCell(table, column, row); + uintptr_t i = (uintptr_t)WMTableViewDataForCell(table, column, row); stringDraw(WMWidgetScreen(table), d, strdata->gc, strdata->selGC, strdata->textColor, strdata->font, @@ -214,7 +214,7 @@ static void beginESCellEdit(WMTableColumnDelegate * self, WMTableColumn * column { EnumSelectorData *strdata = (EnumSelectorData *) self->data; WMRect rect = WMTableViewRectForCell(strdata->table, column, row); - int data = (int)(uintptr_t) WMTableViewDataForCell(strdata->table, column, row); + uintptr_t data = (uintptr_t)WMTableViewDataForCell(strdata->table, column, row); wassertr(data < strdata->count); @@ -285,7 +285,7 @@ static void BSCellPainter(WMTableColumnDelegate * self, WMTableColumn * column, { BooleanSwitchData *strdata = (BooleanSwitchData *) self->data; WMTableView *table = WMGetTableColumnTableView(column); - int i = (int)(uintptr_t) WMTableViewDataForCell(table, column, row); + uintptr_t i = (uintptr_t)WMTableViewDataForCell(table, column, row); WMScreen *scr = WMWidgetScreen(table); if (i) { @@ -302,7 +302,7 @@ static void selectedBSCellPainter(WMTableColumnDelegate * self, WMTableColumn * { BooleanSwitchData *strdata = (BooleanSwitchData *) self->data; WMTableView *table = WMGetTableColumnTableView(column); - int i = (int)(uintptr_t) WMTableViewDataForCell(table, column, row); + uintptr_t i = (uintptr_t)WMTableViewDataForCell(table, column, row); WMScreen *scr = WMWidgetScreen(table); if (i) { @@ -319,7 +319,7 @@ static void beginBSCellEdit(WMTableColumnDelegate * self, WMTableColumn * column { BooleanSwitchData *strdata = (BooleanSwitchData *) self->data; WMRect rect = WMTableViewRectForCell(strdata->table, column, row); - int data = (int)(uintptr_t) WMTableViewDataForCell(strdata->table, column, row); + uintptr_t data = (uintptr_t)WMTableViewDataForCell(strdata->table, column, row); WMSetButtonSelected(strdata->widget, data); WMMoveWidget(strdata->widget, rect.pos.x + 1, rect.pos.y + 1); diff --git a/WINGs/wfilepanel.c b/WINGs/wfilepanel.c index 33e3dab5..29de7b5e 100644 --- a/WINGs/wfilepanel.c +++ b/WINGs/wfilepanel.c @@ -118,13 +118,14 @@ static void textChangedObserver(void *observerData, WMNotification * notificatio char *text; WMList *list; int col = WMGetBrowserNumberOfColumns(panel->browser) - 1; - int i, textEvent; + int i; + uintptr_t textEvent; if (!(list = WMGetBrowserListInColumn(panel->browser, col))) return; text = WMGetTextFieldText(panel->fileField); - textEvent = (int)(uintptr_t) WMGetNotificationClientData(notification); + textEvent = (uintptr_t)WMGetNotificationClientData(notification); if (panel->flags.autoCompletion && textEvent != WMDeleteTextEvent) i = closestListItem(list, text, False); @@ -157,7 +158,7 @@ static void textEditedObserver(void *observerData, WMNotification * notification { W_FilePanel *panel = (W_FilePanel *) observerData; - if ((int)(uintptr_t) WMGetNotificationClientData(notification) == WMReturnTextMovement) { + if ((uintptr_t)WMGetNotificationClientData(notification) == WMReturnTextMovement) { WMPerformButtonClick(panel->okButton); } } diff --git a/WINGs/wfontpanel.c b/WINGs/wfontpanel.c index 523f85ce..0cca5d67 100644 --- a/WINGs/wfontpanel.c +++ b/WINGs/wfontpanel.c @@ -686,8 +686,8 @@ static void typefaceClick(WMWidget * w, void *data) WMClearList(panel->sizLs); WM_ITERATE_ARRAY(face->sizes, size, i) { - if ((int)(uintptr_t) size != 0) { - sprintf(buffer, "%i", (int)(uintptr_t) size); + if ((uintptr_t)size != 0) { + sprintf(buffer, "%li", (uintptr_t)size); WMAddListItem(panel->sizLs, buffer); } @@ -782,8 +782,8 @@ static void setFontPanelFontName(FontPanel * panel, char *family, char *style, d WM_ITERATE_ARRAY(face->sizes, vsize, i) { char buffer[32]; - if ((int)(uintptr_t) vsize != 0) { - sprintf(buffer, "%i", (int)(uintptr_t) vsize); + if ((uintptr_t)vsize != 0) { + sprintf(buffer, "%li", (uintptr_t)vsize); WMAddListItem(panel->sizLs, buffer); } diff --git a/WINGs/wpanel.c b/WINGs/wpanel.c index 4550c438..f85804f8 100644 --- a/WINGs/wpanel.c +++ b/WINGs/wpanel.c @@ -317,7 +317,7 @@ static void endedEditingObserver(void *observerData, WMNotification * notificati { WMInputPanel *panel = (WMInputPanel *) observerData; - switch ((int)(uintptr_t) WMGetNotificationClientData(notification)) { + switch ((uintptr_t)WMGetNotificationClientData(notification)) { case WMReturnTextMovement: if (panel->defBtn) WMPerformButtonClick(panel->defBtn); diff --git a/WPrefs.app/editmenu.c b/WPrefs.app/editmenu.c index f5b84aac..b0f462cf 100644 --- a/WPrefs.app/editmenu.c +++ b/WPrefs.app/editmenu.c @@ -829,14 +829,14 @@ static void stopEditItem(WEditMenu * menu, Bool apply) static void textEndedEditing(struct WMTextFieldDelegate *self, WMNotification * notif) { WEditMenu *menu = (WEditMenu *) self->data; - int reason; + uintptr_t reason; int i; WEditMenuItem *item; if (!menu->flags.isEditing) return; - reason = (int)(uintptr_t) WMGetNotificationClientData(notif); + reason = (uintptr_t)WMGetNotificationClientData(notif); switch (reason) { case WMEscapeTextMovement: diff --git a/src/icon.c b/src/icon.c index 30ee1fe9..b27e32ff 100644 --- a/src/icon.c +++ b/src/icon.c @@ -62,7 +62,7 @@ static void miniwindowDblClick(WObjDescriptor * desc, XEvent * event); static void appearanceObserver(void *self, WMNotification * notif) { WIcon *icon = (WIcon *) self; - int flags = (int)(uintptr_t) WMGetNotificationClientData(notif); + uintptr_t flags = (uintptr_t)WMGetNotificationClientData(notif); if (flags & WTextureSettings) { icon->force_paint = 1; diff --git a/src/menu.c b/src/menu.c index 2076e755..3a73cf8e 100644 --- a/src/menu.c +++ b/src/menu.c @@ -93,7 +93,7 @@ static void closeCascade(WMenu * menu); static void appearanceObserver(void *self, WMNotification * notif) { WMenu *menu = (WMenu *) self; - int flags = (int)(uintptr_t) WMGetNotificationClientData(notif); + uintptr_t flags = (uintptr_t)WMGetNotificationClientData(notif); if (!menu->flags.realized) return; diff --git a/src/switchmenu.c b/src/switchmenu.c index 8a11701c..849ec8b6 100644 --- a/src/switchmenu.c +++ b/src/switchmenu.c @@ -417,7 +417,7 @@ static void wsobserver(void *self, WMNotification * notif) void *data = WMGetNotificationClientData(notif); if (strcmp(name, WMNWorkspaceNameChanged) == 0) { - UpdateSwitchMenuWorkspace(scr, (int)(uintptr_t) data); + UpdateSwitchMenuWorkspace(scr, (uintptr_t)data); } else if (strcmp(name, WMNWorkspaceChanged) == 0) { } diff --git a/src/window.c b/src/window.c index c23394f5..62407767 100644 --- a/src/window.c +++ b/src/window.c @@ -129,7 +129,7 @@ static void resizebarMouseDown(WCoreWindow * sender, void *data, XEvent * event) static void appearanceObserver(void *self, WMNotification * notif) { WWindow *wwin = (WWindow *) self; - int flags = (int)(uintptr_t) WMGetNotificationClientData(notif); + uintptr_t flags = (uintptr_t)WMGetNotificationClientData(notif); if (!wwin->frame || (!wwin->frame->titlebar && !wwin->frame->resizebar)) return;