qulogic/libgnt

Revert changes to libgnt/*.h from the prev commit
soc.2013.gobjectification.plugins
2014-02-07, Ankit Vani
1a745e722aba
Parents 54ff9fb64abd
Children ab3dc7b088b8
Revert changes to libgnt/*.h from the prev commit
6 files changed, 20 insertions(+), 23 deletions(-)
  • +2 -2
    gntbindable.h
  • +4 -4
    gntbox.h
  • +4 -4
    gntbutton.h
  • +4 -4
    gntlabel.h
  • +2 -5
    gnttree.h
  • +4 -4
    gntwidget.h
    • --- a/gntbindable.h Fri Feb 07 01:06:02 2014 +0530
    +++ b/gntbindable.h Fri Feb 07 01:17:31 2014 +0530
    @@ -89,8 +89,8 @@
    {
    char *name; /* The name of the action */
    union {
    - GntBindableActionCallback action;
    - GntBindableActionCallbackNoParam action_noparam;
    + gboolean (*action)(GntBindable *bindable, GList *params);
    + gboolean (*action_noparam)(GntBindable *bindable);
    } u;
    };
    --- a/gntbox.h Fri Feb 07 01:06:02 2014 +0530
    +++ b/gntbox.h Fri Feb 07 01:17:31 2014 +0530
    @@ -72,10 +72,10 @@
    GList *focus; /* List of widgets to cycle focus (only valid for parent boxes) */
    /*< private >*/
    - void *res1;
    - void *res2;
    - void *res3;
    - void *res4;
    + void (*gnt_reserved1)(void);
    + void (*gnt_reserved2)(void);
    + void (*gnt_reserved3)(void);
    + void (*gnt_reserved4)(void);
    };
    struct _GntBoxClass
    --- a/gntbutton.h Fri Feb 07 01:06:02 2014 +0530
    +++ b/gntbutton.h Fri Feb 07 01:17:31 2014 +0530
    @@ -57,10 +57,10 @@
    GntButtonPriv *priv;
    /*< private >*/
    - void *res1;
    - void *res2;
    - void *res3;
    - void *res4;
    + void (*gnt_reserved1)(void);
    + void (*gnt_reserved2)(void);
    + void (*gnt_reserved3)(void);
    + void (*gnt_reserved4)(void);
    };
    struct _GntButtonClass
    --- a/gntlabel.h Fri Feb 07 01:06:02 2014 +0530
    +++ b/gntlabel.h Fri Feb 07 01:17:31 2014 +0530
    @@ -51,10 +51,10 @@
    GntTextFormatFlags flags;
    /*< private >*/
    - void *res1;
    - void *res2;
    - void *res3;
    - void *res4;
    + void (*gnt_reserved1)(void);
    + void (*gnt_reserved2)(void);
    + void (*gnt_reserved3)(void);
    + void (*gnt_reserved4)(void);
    };
    struct _GntLabelClass
    --- a/gnttree.h Fri Feb 07 01:06:02 2014 +0530
    +++ b/gnttree.h Fri Feb 07 01:17:31 2014 +0530
    @@ -42,9 +42,6 @@
    #define GNT_IS_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_TREE))
    #define GNT_TREE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_TREE, GntTreeClass))
    -typedef guint (*GntTreeHashFunc)(gconstpointer);
    -typedef gboolean (*GntTreeHashEqualityFunc)(gconstpointer, gconstpointer);
    -
    typedef struct _GntTree GntTree;
    typedef struct _GntTreePriv GntTreePriv;
    typedef struct _GntTreeClass GntTreeClass;
    @@ -81,8 +78,8 @@
    GList *list; /* List of GntTreeRow s */
    GHashTable *hash; /* We need this for quickly referencing the rows */
    - GntTreeHashFunc hash_func;
    - GntTreeHashEqualityFunc hash_eq_func;
    + guint (*hash_func)(gconstpointer);
    + gboolean (*hash_eq_func)(gconstpointer, gconstpointer);
    GDestroyNotify key_destroy;
    GDestroyNotify value_destroy;
    --- a/gntwidget.h Fri Feb 07 01:06:02 2014 +0530
    +++ b/gntwidget.h Fri Feb 07 01:17:31 2014 +0530
    @@ -107,10 +107,10 @@
    WINDOW *window;
    /*< private >*/
    - void *res1;
    - void *res2;
    - void *res3;
    - void *res4;
    + void (*gnt_reserved1)(void);
    + void (*gnt_reserved2)(void);
    + void (*gnt_reserved3)(void);
    + void (*gnt_reserved4)(void);
    };
    struct _GntWidgetClass