From c610da0076606a891993f051627f114c60582202 Mon Sep 17 00:00:00 2001 From: Marius Date: Mon, 27 Feb 2012 10:10:53 +0200 Subject: [PATCH] GetUserData -> WidgetGetUserData --- src/motif.c | 6 +++--- src/motifutils.c | 24 ++++++++++++------------ src/qtgui/qtgrace.cpp | 28 ++++++++++++++-------------- src/widgets.h | 2 +- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/motif.c b/src/motif.c index d2ff6249..d13b00c1 100644 --- a/src/motif.c +++ b/src/motif.c @@ -63,7 +63,7 @@ int WidgetIsManaged(Widget w) return (XtIsManaged(w) == True) ? TRUE:FALSE; } -void *GetUserData(Widget w) +void *WidgetGetUserData(Widget w) { void *udata = NULL; XtVaGetValues(w, XmNuserData, &udata, NULL); @@ -569,7 +569,7 @@ void FormAddHChild(Widget form, Widget child) { Widget last_widget; - last_widget = GetUserData(form); + last_widget = WidgetGetUserData(form); if (last_widget) { XtVaSetValues(child, XmNleftAttachment, XmATTACH_WIDGET, @@ -600,7 +600,7 @@ void FormAddVChild(Widget form, Widget child) child = XtParent(child); } - last_widget = GetUserData(form); + last_widget = WidgetGetUserData(form); if (last_widget) { XtVaSetValues(child, XmNtopAttachment, XmATTACH_WIDGET, diff --git a/src/motifutils.c b/src/motifutils.c index d526afcf..10a66943 100644 --- a/src/motifutils.c +++ b/src/motifutils.c @@ -181,7 +181,7 @@ OptionStructure *CreateBitmapOptionChoice(Widget parent, char *labelstr, int nco void UpdateCharOptionChoice(OptionStructure *opt, int font) { int *old_font; - old_font = (int *) GetUserData(opt->menu); + old_font = (int *) WidgetGetUserData(opt->menu); if (*old_font != font) { int i, csize = 24; for (i = 0; i < opt->nchoices; i++) { @@ -1682,7 +1682,7 @@ static void SetPenChoice_int(Widget button, Pen *pen, int call_cb) return; } - pdata = GetUserData(button); + pdata = WidgetGetUserData(button); pdata->pen = *pen; if (!gc_pen) { @@ -1727,7 +1727,7 @@ static void pen_popup(Widget parent, return; } - pdata = GetUserData(parent); + pdata = WidgetGetUserData(parent); if (e->state & ShiftMask) { popup = pdata->pattern_popup; @@ -1744,10 +1744,10 @@ static void pen_popup(Widget parent, static void cc_cb(Widget w, XtPointer client_data, XtPointer call_data) { Pen pen; - Widget button = GetUserData(XtParent(w)); + Widget button = WidgetGetUserData(XtParent(w)); Button_PData *pdata; - pdata = GetUserData(button); + pdata = WidgetGetUserData(button); pen = pdata->pen; pen.color = (long) client_data; @@ -1907,7 +1907,7 @@ static void define_pen_choice_dialog(Widget but, void *data) Button_PData *pdata; Pen pen; - pdata = GetUserData(ui->pen_button); + pdata = WidgetGetUserData(ui->pen_button); pen = pdata->pen; @@ -1956,7 +1956,7 @@ Widget CreatePenChoice(Widget parent, char *s) int GetPenChoice(Widget pen_button, Pen *pen) { - Button_PData *pdata = GetUserData(pen_button); + Button_PData *pdata = WidgetGetUserData(pen_button); if (pdata) { *pen = pdata->pen; return RETURN_SUCCESS; @@ -1967,7 +1967,7 @@ int GetPenChoice(Widget pen_button, Pen *pen) void AddPenChoiceCB(Widget button, Pen_CBProc cbproc, void *anydata) { - Button_PData *pdata = GetUserData(button); + Button_PData *pdata = WidgetGetUserData(button); if (pdata->cb_proc) { errmsg("AddPenChoiceCB: only one callback is supported"); @@ -3822,7 +3822,7 @@ void TreeRefresh(Widget w) { TreeRefresh_CBdata *cbdata; - cbdata = (TreeRefresh_CBdata *) GetUserData(w); + cbdata = (TreeRefresh_CBdata *) WidgetGetUserData(w); if (cbdata->timeout_id) { XtRemoveTimeOut(cbdata->timeout_id); @@ -4074,7 +4074,7 @@ void TableAddCols(Widget w, int ncols) int i; unsigned char *alignment, xm_alignment; - td = (TableData*) GetUserData(w); + td = (TableData*) WidgetGetUserData(w); xm_alignment = align_to_xmalign(td->default_col_label_alignment); widths = xmalloc(ncols*SIZEOF_SHORT); alignment = xmalloc(ncols); @@ -4143,7 +4143,7 @@ void TableSetDefaultColWidth(Widget w, int width) short *widths; int ncols, i; - td = (TableData*) GetUserData(w); + td = (TableData*) WidgetGetUserData(w); td->default_col_width = width; ncols = TableGetNcols(w); @@ -4184,7 +4184,7 @@ void TableSetDefaultColLabelAlignment(Widget w, int align) unsigned char *alignment, xm_alignment; int ncols, i; - td = (TableData*) GetUserData(w); + td = (TableData*) WidgetGetUserData(w); td->default_col_label_alignment = align; xm_alignment = align_to_xmalign(align); diff --git a/src/qtgui/qtgrace.cpp b/src/qtgui/qtgrace.cpp index 6bc2eab4..d8272a4c 100644 --- a/src/qtgui/qtgrace.cpp +++ b/src/qtgui/qtgrace.cpp @@ -985,7 +985,7 @@ void SetMinimumDimensions(Widget w, unsigned int width, unsigned int height) // // return udata; //} -void *GetUserData(Widget w) +void *WidgetGetUserData(Widget w) { void *udata = NULL; udata = w->userData(0); @@ -1515,7 +1515,7 @@ OptionStructure *CreateBitmapOptionChoice(Widget parent, char *labelstr, int nco void UpdateCharOptionChoice(OptionStructure *opt, int font) { int *old_font; - old_font = (int *) GetUserData(opt->menu); + old_font = (int *) WidgetGetUserData(opt->menu); if (*old_font != font) { int i, csize = 24; for (i = 0; i < opt->nchoices; i++) { @@ -5141,7 +5141,7 @@ static void SetPenChoice_int(Widget button, Pen *pen, int call_cb) return; } - pdata = (Button_PData *) GetUserData(button); + pdata = (Button_PData *) WidgetGetUserData(button); pdata->pen = *pen; get_rgb(canvas, pen->color, &fg_rgb); @@ -5202,7 +5202,7 @@ static void pen_popup(Widget w, XtPointer client_data, XtPointer call_data) Button_PData *pdata; Widget popup; - pdata = (Button_PData *) GetUserData(w); + pdata = (Button_PData *) WidgetGetUserData(w); // if (e->state & ShiftMask) { // popup = pdata->pattern_popup; @@ -5232,12 +5232,12 @@ static void cc_cb(Widget w, XtPointer client_data, XtPointer call_data) { QTableWidget *tableWidget = (QTableWidget *) w; QTableWidgetItem *item = tableWidget->currentItem(); - QPushButton *button = (QPushButton *) GetUserData(tableWidget); + QPushButton *button = (QPushButton *) WidgetGetUserData(tableWidget); QMenu *menu = (QMenu *) tableWidget->parentWidget(); Pen pen; Button_PData *pdata; - pdata = (Button_PData *) GetUserData(button); + pdata = (Button_PData *) WidgetGetUserData(button); pen = pdata->pen; pen.color = item->data(Qt::UserRole).toInt(); @@ -5524,7 +5524,7 @@ static void define_pen_choice_dialog(Widget but, void *data) Button_PData *pdata; Pen pen; - pdata = (Button_PData *) GetUserData(ui->pen_button); + pdata = (Button_PData *) WidgetGetUserData(ui->pen_button); pen = pdata->pen; @@ -5629,7 +5629,7 @@ Widget CreatePenChoice(Widget parent, char *s) //} int GetPenChoice(Widget pen_button, Pen *pen) { - Button_PData *pdata = (Button_PData *) GetUserData(pen_button); + Button_PData *pdata = (Button_PData *) WidgetGetUserData(pen_button); if (pdata) { *pen = pdata->pen; return RETURN_SUCCESS; @@ -5651,7 +5651,7 @@ int GetPenChoice(Widget pen_button, Pen *pen) //} void AddPenChoiceCB(Widget button, Pen_CBProc cbproc, void *anydata) { - Button_PData *pdata = (Button_PData *) GetUserData(button); + Button_PData *pdata = (Button_PData *) WidgetGetUserData(button); if (pdata->cb_proc) { errmsg("AddPenChoiceCB: only one callback is supported"); @@ -9617,7 +9617,7 @@ void TableAddCols(Widget w, int ncols) model->setColumnCount(cc + ncols); - td = (TableData*) GetUserData(w); + td = (TableData*) WidgetGetUserData(w); TableSetDefaultColWidth(w, td->default_col_width); } @@ -9649,7 +9649,7 @@ void TableSetColWidths(Widget w, int *widths) int i, cc = TableGetNcols(w); QHeaderView *hHeader = view->horizontalHeader(); - td = (TableData*) GetUserData(w); + td = (TableData*) WidgetGetUserData(w); for (i = 0; i < cc; i++) { hHeader->resizeSection(i, widths[i] * td->font_width + 2*td->frame_width); @@ -9660,7 +9660,7 @@ void TableSetDefaultRowLabelWidth(Widget w, int width) { QTableView *view = (QTableView*) w; QHeaderView *vHeader = view->verticalHeader(); - TableData *td = (TableData*) GetUserData(w); + TableData *td = (TableData*) WidgetGetUserData(w); vHeader->setFixedWidth(width * td->font_width + 2*td->frame_width); } @@ -9690,7 +9690,7 @@ void TableSetDefaultColWidth(Widget w, int width) int i, cc = TableGetNcols(w); QHeaderView *hHeader = view->horizontalHeader(); - td = (TableData*) GetUserData(w); + td = (TableData*) WidgetGetUserData(w); td->default_col_width = width; @@ -9774,7 +9774,7 @@ void TableUpdateVisibleRowsCols(Widget w) QHeaderView *hHeader = view->horizontalHeader(); QHeaderView *vHeader = view->verticalHeader(); - td = (TableData*) GetUserData(w); + td = (TableData*) WidgetGetUserData(w); if (!hHeader->isHidden()) { height = qMax(hHeader->minimumHeight(), hHeader->sizeHint().height()); diff --git a/src/widgets.h b/src/widgets.h index b7c2aa9d..9c7905da 100644 --- a/src/widgets.h +++ b/src/widgets.h @@ -45,7 +45,7 @@ void WidgetManage(Widget w); void WidgetUnmanage(Widget w); int WidgetIsManaged(Widget w); -void *GetUserData(Widget w); +void *WidgetGetUserData(Widget w); void SetUserData(Widget w, void *udata); void WidgetSetSensitive(Widget w, int onoff); void SetHeight(Widget w, unsigned int height); -- 2.11.4.GIT