gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 21:08:08 +01:00
Code Issues Projects Releases Wiki Activity

Fix the use of uinptr_t

Browse Source 
Remove the additional cast to (int), as that makes no sense.
This commit is contained in:
Carlos R. Mafra
2009-09-14 15:57:52 +02:00
parent f6645ac564
commit 513a509096
12 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WINGs/Examples/fontl.c
View File

@@ -36,7 +36,7 @@ void show(WMWidget * self, void *data)
void *d; void *d;
WMLabel *l = (WMLabel *) data; WMLabel *l = (WMLabel *) data;
d = WMGetHangedData(self); 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); WMSetLabelText(l, buf);
} }

2
WINGs/Examples/puzzle.c
View File

@@ -134,7 +134,7 @@ void buttonClick(WMWidget * w, void *ptr)
{ {
char buffer[300]; char buffer[300];
if (SlideButton((int)(uintptr_t) ptr)) { if (SlideButton((uintptr_t)ptr)) {
MoveCount++; MoveCount++;
if (CheckWin()) { if (CheckWin()) {

6
WINGs/Extras/test.c
View File

@@ -36,7 +36,7 @@ void *valueForCell(WMTableViewDelegate * self, WMTableColumn * column, int row)
col2[i] = 0; col2[i] = 0;
} }
} }
if ((int)(uintptr_t) WMGetTableColumnId(column) == 1) if ((uintptr_t)WMGetTableColumnId(column) == 1)
return col1[row]; return col1[row];
else else
return (void *)(uintptr_t) col2[row]; 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) 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; col1[row] = data;
else else
col2[row] = (int)(uintptr_t) data; col2[row] = (uintptr_t) data;
} }
static WMTableViewDelegate delegate = { static WMTableViewDelegate delegate = {

12
WINGs/Extras/wtabledelegates.c
View File

@@ -192,7 +192,7 @@ static void ESCellPainter(WMTableColumnDelegate * self, WMTableColumn * column,
{ {
EnumSelectorData *strdata = (EnumSelectorData *) self->data; EnumSelectorData *strdata = (EnumSelectorData *) self->data;
WMTableView *table = WMGetTableColumnTableView(column); 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, stringDraw(WMWidgetScreen(table), d,
strdata->gc, strdata->selGC, strdata->textColor, strdata->font, strdata->gc, strdata->selGC, strdata->textColor, strdata->font,
@@ -203,7 +203,7 @@ static void selectedESCellPainter(WMTableColumnDelegate * self, WMTableColumn *
{ {
EnumSelectorData *strdata = (EnumSelectorData *) self->data; EnumSelectorData *strdata = (EnumSelectorData *) self->data;
WMTableView *table = WMGetTableColumnTableView(column); 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, stringDraw(WMWidgetScreen(table), d,
strdata->gc, strdata->selGC, strdata->textColor, strdata->font, strdata->gc, strdata->selGC, strdata->textColor, strdata->font,
@@ -214,7 +214,7 @@ static void beginESCellEdit(WMTableColumnDelegate * self, WMTableColumn * column
{ {
EnumSelectorData *strdata = (EnumSelectorData *) self->data; EnumSelectorData *strdata = (EnumSelectorData *) self->data;
WMRect rect = WMTableViewRectForCell(strdata->table, column, row); 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); wassertr(data < strdata->count);
@@ -285,7 +285,7 @@ static void BSCellPainter(WMTableColumnDelegate * self, WMTableColumn * column,
{ {
BooleanSwitchData *strdata = (BooleanSwitchData *) self->data; BooleanSwitchData *strdata = (BooleanSwitchData *) self->data;
WMTableView *table = WMGetTableColumnTableView(column); 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); WMScreen *scr = WMWidgetScreen(table);
if (i) { if (i) {
@@ -302,7 +302,7 @@ static void selectedBSCellPainter(WMTableColumnDelegate * self, WMTableColumn *
{ {
BooleanSwitchData *strdata = (BooleanSwitchData *) self->data; BooleanSwitchData *strdata = (BooleanSwitchData *) self->data;
WMTableView *table = WMGetTableColumnTableView(column); 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); WMScreen *scr = WMWidgetScreen(table);
if (i) { if (i) {
@@ -319,7 +319,7 @@ static void beginBSCellEdit(WMTableColumnDelegate * self, WMTableColumn * column
{ {
BooleanSwitchData *strdata = (BooleanSwitchData *) self->data; BooleanSwitchData *strdata = (BooleanSwitchData *) self->data;
WMRect rect = WMTableViewRectForCell(strdata->table, column, row); 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); WMSetButtonSelected(strdata->widget, data);
WMMoveWidget(strdata->widget, rect.pos.x + 1, rect.pos.y + 1); WMMoveWidget(strdata->widget, rect.pos.x + 1, rect.pos.y + 1);

7
WINGs/wfilepanel.c
View File

@@ -118,13 +118,14 @@ static void textChangedObserver(void *observerData, WMNotification * notificatio
char *text; char *text;
WMList *list; WMList *list;
int col = WMGetBrowserNumberOfColumns(panel->browser) - 1; int col = WMGetBrowserNumberOfColumns(panel->browser) - 1;
int i, textEvent; int i;
uintptr_t textEvent;
if (!(list = WMGetBrowserListInColumn(panel->browser, col))) if (!(list = WMGetBrowserListInColumn(panel->browser, col)))
return; return;
text = WMGetTextFieldText(panel->fileField); text = WMGetTextFieldText(panel->fileField);
textEvent = (int)(uintptr_t) WMGetNotificationClientData(notification); textEvent = (uintptr_t)WMGetNotificationClientData(notification);
if (panel->flags.autoCompletion && textEvent != WMDeleteTextEvent) if (panel->flags.autoCompletion && textEvent != WMDeleteTextEvent)
i = closestListItem(list, text, False); i = closestListItem(list, text, False);
@@ -157,7 +158,7 @@ static void textEditedObserver(void *observerData, WMNotification * notification
{ {
W_FilePanel *panel = (W_FilePanel *) observerData; W_FilePanel *panel = (W_FilePanel *) observerData;
if ((int)(uintptr_t) WMGetNotificationClientData(notification) == WMReturnTextMovement) { if ((uintptr_t)WMGetNotificationClientData(notification) == WMReturnTextMovement) {
WMPerformButtonClick(panel->okButton); WMPerformButtonClick(panel->okButton);
} }
} }

8
WINGs/wfontpanel.c
View File

@@ -686,8 +686,8 @@ static void typefaceClick(WMWidget * w, void *data)
WMClearList(panel->sizLs); WMClearList(panel->sizLs);
WM_ITERATE_ARRAY(face->sizes, size, i) { WM_ITERATE_ARRAY(face->sizes, size, i) {
if ((int)(uintptr_t) size != 0) { if ((uintptr_t)size != 0) {
sprintf(buffer, "%i", (int)(uintptr_t) size); sprintf(buffer, "%li", (uintptr_t)size);
WMAddListItem(panel->sizLs, buffer); 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) { WM_ITERATE_ARRAY(face->sizes, vsize, i) {
char buffer[32]; char buffer[32];
if ((int)(uintptr_t) vsize != 0) { if ((uintptr_t)vsize != 0) {
sprintf(buffer, "%i", (int)(uintptr_t) vsize); sprintf(buffer, "%li", (uintptr_t)vsize);
WMAddListItem(panel->sizLs, buffer); WMAddListItem(panel->sizLs, buffer);
} }

2
WINGs/wpanel.c
View File

@@ -317,7 +317,7 @@ static void endedEditingObserver(void *observerData, WMNotification * notificati
{ {
WMInputPanel *panel = (WMInputPanel *) observerData; WMInputPanel *panel = (WMInputPanel *) observerData;
switch ((int)(uintptr_t) WMGetNotificationClientData(notification)) { switch ((uintptr_t)WMGetNotificationClientData(notification)) {
case WMReturnTextMovement: case WMReturnTextMovement:
if (panel->defBtn) if (panel->defBtn)
WMPerformButtonClick(panel->defBtn); WMPerformButtonClick(panel->defBtn);

4
WPrefs.app/editmenu.c
View File

@@ -829,14 +829,14 @@ static void stopEditItem(WEditMenu * menu, Bool apply)
static void textEndedEditing(struct WMTextFieldDelegate *self, WMNotification * notif) static void textEndedEditing(struct WMTextFieldDelegate *self, WMNotification * notif)
{ {
WEditMenu *menu = (WEditMenu *) self->data; WEditMenu *menu = (WEditMenu *) self->data;
int reason; uintptr_t reason;
int i; int i;
WEditMenuItem *item; WEditMenuItem *item;
if (!menu->flags.isEditing) if (!menu->flags.isEditing)
return; return;
reason = (int)(uintptr_t) WMGetNotificationClientData(notif); reason = (uintptr_t)WMGetNotificationClientData(notif);
switch (reason) { switch (reason) {
case WMEscapeTextMovement: case WMEscapeTextMovement:

2
src/icon.c
View File

@@ -62,7 +62,7 @@ static void miniwindowDblClick(WObjDescriptor * desc, XEvent * event);
static void appearanceObserver(void *self, WMNotification * notif) static void appearanceObserver(void *self, WMNotification * notif)
{ {
WIcon *icon = (WIcon *) self; WIcon *icon = (WIcon *) self;
int flags = (int)(uintptr_t) WMGetNotificationClientData(notif); uintptr_t flags = (uintptr_t)WMGetNotificationClientData(notif);
if (flags & WTextureSettings) { if (flags & WTextureSettings) {
icon->force_paint = 1; icon->force_paint = 1;

2
src/menu.c
View File

@@ -93,7 +93,7 @@ static void closeCascade(WMenu * menu);
static void appearanceObserver(void *self, WMNotification * notif) static void appearanceObserver(void *self, WMNotification * notif)
{ {
WMenu *menu = (WMenu *) self; WMenu *menu = (WMenu *) self;
int flags = (int)(uintptr_t) WMGetNotificationClientData(notif); uintptr_t flags = (uintptr_t)WMGetNotificationClientData(notif);
if (!menu->flags.realized) if (!menu->flags.realized)
return; return;

2
src/switchmenu.c
View File

@@ -417,7 +417,7 @@ static void wsobserver(void *self, WMNotification * notif)
void *data = WMGetNotificationClientData(notif); void *data = WMGetNotificationClientData(notif);
if (strcmp(name, WMNWorkspaceNameChanged) == 0) { if (strcmp(name, WMNWorkspaceNameChanged) == 0) {
UpdateSwitchMenuWorkspace(scr, (int)(uintptr_t) data); UpdateSwitchMenuWorkspace(scr, (uintptr_t)data);
} else if (strcmp(name, WMNWorkspaceChanged) == 0) { } else if (strcmp(name, WMNWorkspaceChanged) == 0) {
} }

2
src/window.c
View File

@@ -129,7 +129,7 @@ static void resizebarMouseDown(WCoreWindow * sender, void *data, XEvent * event)
static void appearanceObserver(void *self, WMNotification * notif) static void appearanceObserver(void *self, WMNotification * notif)
{ {
WWindow *wwin = (WWindow *) self; 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)) if (!wwin->frame || (!wwin->frame->titlebar && !wwin->frame->resizebar))
return; return;