qulogic/libgnt

gnt: Rename things consistently to fix GIR warnings.

2016-09-01, Elliott Sales de Andrade
9096a263e2f3
Parents cdbda37176f1
Children 9064526f0678
gnt: Rename things consistently to fix GIR warnings.
  • +1 -1
    gntbox.h
  • +1 -1
    gntslider.h
  • +2 -2
    gnttree.h
  • +7 -7
    gntwidget.c
  • +7 -7
    gntwidget.h
  • +2 -2
    gntwindow.h
  • +1 -1
    gntwm.h
  • +1 -1
    gntws.h
  • --- a/gntbox.h Mon Aug 22 23:03:22 2016 -0400
    +++ b/gntbox.h Thu Sep 01 01:28:11 2016 -0400
    @@ -133,7 +133,7 @@
    *
    * Since: 2.8.0
    */
    -void gnt_box_add_widget_in_front(GntBox *b, GntWidget *widget);
    +void gnt_box_add_widget_in_front(GntBox *box, GntWidget *widget);
    /**
    * gnt_box_set_title:
    --- a/gntslider.h Mon Aug 22 23:03:22 2016 -0400
    +++ b/gntslider.h Thu Sep 01 01:28:11 2016 -0400
    @@ -66,7 +66,7 @@
    {
    GntWidgetClass parent;
    - void (*changed)(GntSlider *slider, int);
    + void (*changed)(GntSlider *slider, int value);
    /*< private >*/
    void (*gnt_reserved1)(void);
    --- a/gnttree.h Mon Aug 22 23:03:22 2016 -0400
    +++ b/gnttree.h Thu Sep 01 01:28:11 2016 -0400
    @@ -44,8 +44,8 @@
    #define GNT_TYPE_TREE_ROW (gnt_tree_row_get_type())
    -typedef guint (*GntTreeHashFunc)(gconstpointer);
    -typedef gboolean (*GntTreeHashEqualityFunc)(gconstpointer, gconstpointer);
    +typedef guint (*GntTreeHashFunc)(gconstpointer key);
    +typedef gboolean (*GntTreeHashEqualityFunc)(gconstpointer a, gconstpointer b);
    typedef struct _GntTree GntTree;
    typedef struct _GntTreePriv GntTreePriv;
    --- a/gntwidget.c Mon Aug 22 23:03:22 2016 -0400
    +++ b/gntwidget.c Thu Sep 01 01:28:11 2016 -0400
    @@ -302,15 +302,15 @@
    }
    void
    -gnt_widget_destroy(GntWidget *obj)
    +gnt_widget_destroy(GntWidget *widget)
    {
    - g_return_if_fail(GNT_IS_WIDGET(obj));
    + g_return_if_fail(GNT_IS_WIDGET(widget));
    - if(!(GNT_WIDGET_FLAGS(obj) & GNT_WIDGET_DESTROYING)) {
    - GNT_WIDGET_SET_FLAGS(obj, GNT_WIDGET_DESTROYING);
    - gnt_widget_hide(obj);
    - delwin(obj->window);
    - g_object_run_dispose(G_OBJECT(obj));
    + if(!(GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_DESTROYING)) {
    + GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_DESTROYING);
    + gnt_widget_hide(widget);
    + delwin(widget->window);
    + g_object_run_dispose(G_OBJECT(widget));
    }
    GNTDEBUG;
    }
    --- a/gntwidget.h Mon Aug 22 23:03:22 2016 -0400
    +++ b/gntwidget.h Thu Sep 01 01:28:11 2016 -0400
    @@ -116,20 +116,20 @@
    {
    GntBindableClass parent;
    - void (*map)(GntWidget *obj);
    - void (*show)(GntWidget *obj); /* This will call draw() and take focus (if it can take focus) */
    - void (*destroy)(GntWidget *obj);
    - void (*draw)(GntWidget *obj); /* This will draw the widget */
    - void (*hide)(GntWidget *obj);
    + void (*map)(GntWidget *widget);
    + void (*show)(GntWidget *widget); /* This will call draw() and take focus (if it can take focus) */
    + void (*destroy)(GntWidget *widget);
    + void (*draw)(GntWidget *widget); /* This will draw the widget */
    + void (*hide)(GntWidget *widget);
    void (*expose)(GntWidget *widget, int x, int y, int width, int height);
    void (*gained_focus)(GntWidget *widget);
    void (*lost_focus)(GntWidget *widget);
    void (*size_request)(GntWidget *widget);
    - gboolean (*confirm_size)(GntWidget *widget, int x, int y);
    + gboolean (*confirm_size)(GntWidget *widget, int width, int height);
    void (*size_changed)(GntWidget *widget, int w, int h);
    void (*set_position)(GntWidget *widget, int x, int y);
    - gboolean (*key_pressed)(GntWidget *widget, const char *key);
    + gboolean (*key_pressed)(GntWidget *widget, const char *keys);
    void (*activate)(GntWidget *widget);
    gboolean (*clicked)(GntWidget *widget, GntMouseEvent event, int x, int y);
    --- a/gntwindow.h Mon Aug 22 23:03:22 2016 -0400
    +++ b/gntwindow.h Thu Sep 01 01:28:11 2016 -0400
    @@ -151,8 +151,8 @@
    */
    GntWindowFlags gnt_window_get_maximize(GntWindow *window);
    -void gnt_window_workspace_hiding(GntWindow *);
    -void gnt_window_workspace_showing(GntWindow *);
    +void gnt_window_workspace_hiding(GntWindow *window);
    +void gnt_window_workspace_showing(GntWindow *window);
    G_END_DECLS
    --- a/gntwm.h Mon Aug 22 23:03:22 2016 -0400
    +++ b/gntwm.h Thu Sep 01 01:28:11 2016 -0400
    @@ -141,7 +141,7 @@
    GntBindableClass parent;
    /* This is called when a new window is shown */
    - void (*new_window)(GntWM *wm, GntWidget *win);
    + void (*new_window)(GntWM *wm, GntWidget *widget);
    void (*decorate_window)(GntWM *wm, GntWidget *win);
    /* This is called when a window is being closed */
    --- a/gntws.h Mon Aug 22 23:03:22 2016 -0400
    +++ b/gntws.h Thu Sep 01 01:28:11 2016 -0400
    @@ -61,7 +61,7 @@
    {
    GntBindableClass parent;
    - void (*draw_taskbar)(GntWS *ws, gboolean );
    + void (*draw_taskbar)(GntWS *ws, gboolean reposition);
    void (*res1)(void);
    void (*res2)(void);