glib2 0.90.7 → 0.90.8

data/ext/glib2/rbgobj_boxed.c

@@ -43,8 +43,7 @@ boxed_free(boxed_holder *holder)
 /**********************************************************************/
 
 static VALUE
-rbgobj_boxed_s_allocate(klass)
-    VALUE klass;
+rbgobj_boxed_s_allocate(VALUE klass)
 {
     const RGObjClassInfo* cinfo = rbgobj_lookup_class(klass);
     boxed_holder* holder;
@@ -63,16 +62,14 @@ rbgobj_boxed_s_allocate(klass)
 }
 
 static VALUE
-rbgobj_boxed_init(self)
-    VALUE self;
+rbgobj_boxed_init(VALUE self)
 {
     rb_raise(rb_eTypeError, "can't initialize %s",
              rb_class2name(CLASS_OF(self)));
 }
 
 static VALUE
-rbgobj_boxed_inspect(self)
-    VALUE self;
+rbgobj_boxed_inspect(VALUE self)
 {
     boxed_holder* holder;
     gchar* s;
@@ -93,8 +90,7 @@ rbgobj_boxed_inspect(self)
 }
 
 static VALUE
-rbgobj_boxed_init_copy(self, orig)
-    VALUE self, orig;
+rbgobj_boxed_init_copy(VALUE self, VALUE orig)
 {
     boxed_holder* holder1;
     boxed_holder* holder2;
@@ -119,8 +115,7 @@ rbgobj_boxed_init_copy(self, orig)
 
 /* deprecated */
 VALUE
-rbgobj_boxed_create(klass)
-    VALUE klass;
+rbgobj_boxed_create(VALUE klass)
 {
     return rbgobj_boxed_s_allocate(klass);
 }
@@ -128,9 +123,7 @@ rbgobj_boxed_create(klass)
 /**********************************************************************/
 
 void
-rbgobj_boxed_initialize(obj, boxed)
-    VALUE obj;
-    gpointer boxed;
+rbgobj_boxed_initialize(VALUE obj, gpointer boxed)
 { 
     boxed_holder* holder;
     Data_Get_Struct(obj, boxed_holder, holder);
@@ -139,9 +132,7 @@ rbgobj_boxed_initialize(obj, boxed)
 }
 
 gpointer
-rbgobj_boxed_get(obj, gtype)
-    VALUE obj;
-    GType gtype;
+rbgobj_boxed_get(VALUE obj, GType gtype)
 {
     boxed_holder* holder;
 
@@ -161,9 +152,7 @@ rbgobj_boxed_get(obj, gtype)
 }
 
 VALUE
-rbgobj_make_boxed(p, gtype)
-    gpointer p;
-    GType gtype;
+rbgobj_make_boxed(gpointer p, GType gtype)
 {
     const RGObjClassInfo* cinfo;
     VALUE result;
@@ -189,8 +178,7 @@ rbgobj_make_boxed(p, gtype)
 }
 
 void
-rbgobj_boxed_not_copy_obj(gtype)
-    GType gtype;
+rbgobj_boxed_not_copy_obj(GType gtype)
 {
     RGObjClassInfo* cinfo = (RGObjClassInfo*)GTYPE2CINFO(gtype);
     cinfo->flags |= RBGOBJ_BOXED_NOT_COPY;

data/ext/glib2/rbgobj_closure.c

@@ -31,9 +31,7 @@ struct _GRClosure
 };
 
 static VALUE
-rclosure_default_g2r_func(num, values)
-    guint num;
-    const GValue* values;
+rclosure_default_g2r_func(guint num, const GValue *values)
 {
     int i;
     VALUE args = rb_ary_new2(num);
@@ -283,8 +281,7 @@ Init_rclosure()
 /**********************************************************************/
 
 static VALUE
-closure_initialize(self)
-    VALUE self;
+closure_initialize(VALUE self)
 {
     GClosure* closure = g_rclosure_new(rb_block_proc(), Qnil, NULL);
     G_INITIALIZE(self, closure);
@@ -293,24 +290,21 @@ closure_initialize(self)
 }
 
 static VALUE
-closure_in_marshal(self)
-    VALUE self;
+closure_in_marshal(VALUE self)
 {
     GClosure* closure = RVAL2BOXED(self, G_TYPE_CLOSURE);
     return CBOOL2RVAL(closure->in_marshal);
 }
 
 static VALUE
-closure_is_invalid(self)
-    VALUE self;
+closure_is_invalid(VALUE self)
 {
     GClosure* closure = RVAL2BOXED(self, G_TYPE_CLOSURE);
     return CBOOL2RVAL(closure->is_invalid);
 }
 
 static VALUE
-closure_invalidate(self)
-    VALUE self;
+closure_invalidate(VALUE self)
 {
     GClosure* closure = RVAL2BOXED(self, G_TYPE_CLOSURE);
     g_closure_invalidate(closure);

data/ext/glib2/rbgobj_enums.c

@@ -332,8 +332,7 @@ rbgobj_init_enum_class(VALUE klass)
 }
 
 static VALUE
-enum_s_range(self)
-    VALUE self;
+enum_s_range(VALUE self)
 {
     GEnumClass* gclass = g_type_class_ref(CLASS2GTYPE(self));
     VALUE result = rb_range_new(INT2NUM(gclass->minimum),

data/ext/glib2/rbgobj_object.c

@@ -25,8 +25,7 @@ static GQuark RUBY_GOBJECT_OBJ_KEY;
 
 /* deperecated */
 void
-rbgobj_add_abstract_but_create_instance_class(gtype)
-    GType gtype;
+rbgobj_add_abstract_but_create_instance_class(GType gtype)
 {
 }
 
@@ -65,8 +64,7 @@ holder_free(gobj_holder *holder)
 }
 
 static VALUE
-gobj_s_allocate(klass)
-    VALUE klass;
+gobj_s_allocate(VALUE klass)
 {
     gobj_holder* holder;
     VALUE result;
@@ -82,16 +80,13 @@ gobj_s_allocate(klass)
 
 /* deprecated */
 VALUE
-rbgobj_create_object(klass)
-    VALUE klass;
+rbgobj_create_object(VALUE klass)
 {
     return gobj_s_allocate(klass);
 }
 
 void
-rbgobj_gobject_initialize(obj, cobj)
-    VALUE obj;
-    gpointer cobj;
+rbgobj_gobject_initialize(VALUE obj, gpointer cobj)
 {
     gobj_holder* holder = g_object_get_qdata((GObject*)cobj, RUBY_GOBJECT_OBJ_KEY);
     if (holder)
@@ -136,8 +131,7 @@ rbgobj_get_ruby_object_from_gobject(GObject* gobj, gboolean alloc)
 }
 
 GObject*
-rbgobj_get_gobject(obj)
-    VALUE obj;
+rbgobj_get_gobject(VALUE obj)
 {
     gobj_holder* holder;
 
@@ -155,10 +149,7 @@ rbgobj_get_gobject(obj)
 }
 
 static VALUE
-dummy_init(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+dummy_init(int argc, VALUE *argv, VALUE self)
 {
     GType gtype = CLASS2GTYPE(CLASS_OF(self));
     if (G_TYPE_IS_ABSTRACT(gtype))
@@ -168,8 +159,7 @@ dummy_init(argc, argv, self)
 }
 
 void
-rbgobj_init_object_class(klass)
-    VALUE klass;
+rbgobj_init_object_class(VALUE klass)
 {
     rbgobj_define_property_accessors(klass);
     if (G_TYPE_IS_ABSTRACT(CLASS2GTYPE(klass)))
@@ -179,8 +169,7 @@ rbgobj_init_object_class(klass)
 /**********************************************************************/
 
 static gboolean
-is_gtkobject(gobj)
-    GObject* gobj;
+is_gtkobject(GObject *gobj)
 {
     static GType gtype_gtkobject = G_TYPE_INVALID;
     if (!gtype_gtkobject)
@@ -218,10 +207,7 @@ gobj_mark(gpointer ptr)
 }
 
 static VALUE
-gobj_s_gobject_new(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+gobj_s_gobject_new(int argc, VALUE *argv, VALUE self)
 {
     const RGObjClassInfo* cinfo = rbgobj_lookup_class(self);
     VALUE params_hash;
@@ -261,9 +247,7 @@ struct param_setup_arg {
 };
 
 static VALUE
-_params_setup(arg, param_setup_arg)
-    VALUE arg;
-    struct param_setup_arg* param_setup_arg;
+_params_setup(VALUE arg, struct param_setup_arg *param_setup_arg)
 {
     guint index;
     VALUE name, val;
@@ -318,9 +302,7 @@ gobj_new_ensure(struct param_setup_arg* arg)
 }
 
 GObject*
-rbgobj_gobject_new(gtype, params_hash)
-    GType gtype;
-    VALUE params_hash;
+rbgobj_gobject_new(GType gtype, VALUE params_hash)
 {
     GObject* result;
 
@@ -381,8 +363,7 @@ gobj_s_install_property(int argc, VALUE* argv, VALUE self)
 }
 
 static VALUE
-gobj_s_property(self, property_name)
-     VALUE self, property_name;
+gobj_s_property(VALUE self, VALUE property_name)
 {
     GObjectClass* oclass;
     const char* name;
@@ -437,10 +418,7 @@ static VALUE type_to_prop_setter_table;
 static VALUE type_to_prop_getter_table;
 
 void
-rbgobj_register_property_setter(gtype, name, func)
-    GType gtype;
-    const char* name;
-    RValueToGValueFunc func;
+rbgobj_register_property_setter(GType gtype, const char *name, RValueToGValueFunc func)
 {
     GObjectClass* oclass;
     GParamSpec* pspec;
@@ -461,10 +439,7 @@ rbgobj_register_property_setter(gtype, name, func)
 }
 
 void
-rbgobj_register_property_getter(gtype, name, func)
-    GType gtype;
-    const char* name;
-    GValueToRValueFunc func;
+rbgobj_register_property_getter(GType gtype, const char *name, GValueToRValueFunc func)
 {
     GObjectClass* oclass;
     GParamSpec* pspec;
@@ -483,8 +458,7 @@ rbgobj_register_property_getter(gtype, name, func)
 }
 
 static VALUE
-gobj_set_property(self, prop_name, val)
-    VALUE self, prop_name, val;
+gobj_set_property(VALUE self, VALUE prop_name, VALUE val)
 {
     GParamSpec* pspec;
     const char* name;
@@ -531,8 +505,7 @@ gobj_set_property(self, prop_name, val)
 }
 
 static VALUE
-gobj_get_property(self, prop_name)
-    VALUE self, prop_name;
+gobj_get_property(VALUE self, VALUE prop_name)
 {
     GParamSpec* pspec;
     const char* name;
@@ -578,8 +551,7 @@ gobj_get_property(self, prop_name)
 static VALUE gobj_thaw_notify(VALUE self);
 
 static VALUE
-gobj_freeze_notify(self)
-    VALUE self;
+gobj_freeze_notify(VALUE self)
 {
     g_object_freeze_notify(RVAL2GOBJ(self));
     if (rb_block_given_p()) {
@@ -589,24 +561,21 @@ gobj_freeze_notify(self)
 }
 
 static VALUE
-gobj_notify(self, property_name)
-    VALUE self, property_name;
+gobj_notify(VALUE self, VALUE property_name)
 {
     g_object_notify(RVAL2GOBJ(self), StringValuePtr(property_name));
     return self;
 }
 
 static VALUE
-gobj_thaw_notify(self)
-    VALUE self;
+gobj_thaw_notify(VALUE self)
 {
     g_object_thaw_notify(RVAL2GOBJ(self));
     return self;
 }
 
 static VALUE
-gobj_is_destroyed(self)
-    VALUE self;
+gobj_is_destroyed(VALUE self)
 {
     gobj_holder* holder;
 
@@ -619,8 +588,7 @@ gobj_is_destroyed(self)
 }
 
 static VALUE
-gobj_inspect(self)
-    VALUE self;
+gobj_inspect(VALUE self)
 {
     gobj_holder* holder;
     const char *class_name;
@@ -643,10 +611,7 @@ gobj_inspect(self)
 }
 
 static VALUE
-gobj_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+gobj_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE params_hash;
     GObject* gobj;
@@ -670,8 +635,7 @@ gobj_initialize(argc, argv, self)
 }
 
 static VALUE
-gobj_ref_count(self)
-    VALUE self;
+gobj_ref_count(VALUE self)
 {
     gobj_holder* holder;
     Data_Get_Struct(self, gobj_holder, holder);

data/ext/glib2/rbgobj_param.c

@@ -24,16 +24,14 @@ typedef struct {
 } pspec_holder;
 
 static void
-pspec_mark(holder)
-    pspec_holder* holder;
+pspec_mark(pspec_holder *holder)
 {
     if (holder->instance)
         rbgobj_instance_call_cinfo_mark(holder->instance);
 }
 
 static void
-pspec_free(holder)
-    pspec_holder* holder;
+pspec_free(pspec_holder *holder)
 {
     if (holder->instance){
         rbgobj_instance_call_cinfo_free(holder->instance);
@@ -52,9 +50,7 @@ rbgobj_get_param_spec(VALUE obj)
 }
 
 void
-rbgobj_param_spec_initialize(self, pspec)
-    VALUE self;
-    GParamSpec* pspec;
+rbgobj_param_spec_initialize(VALUE self, GParamSpec *pspec)
 {
     pspec_holder* holder;
     Data_Get_Struct(self, pspec_holder, holder);
@@ -221,8 +217,7 @@ value_validate_ensure(struct validate_arg* arg)
 }
 
 static VALUE
-value_validate(self, obj)
-    VALUE self, obj;
+value_validate(VALUE self, VALUE obj)
 {
     struct validate_arg arg;
     GValue value = {0,};
@@ -274,8 +269,7 @@ value_convert(int argc, VALUE* argv, VALUE self)
 }
 
 static VALUE
-values_compare(self, a, b)
-    VALUE self, a, b;
+values_compare(VALUE self, VALUE a, VALUE b)
 {
     GParamSpec* pspec = rbgobj_get_param_spec(self);
     GType type = G_PARAM_SPEC_VALUE_TYPE(pspec);
@@ -300,8 +294,7 @@ values_compare(self, a, b)
 
 
 static VALUE
-get_ref_count(self)
-    VALUE self;
+get_ref_count(VALUE self)
 {
     return INT2NUM(G_PARAM_SPEC(rbgobj_get_param_spec(self))->ref_count);
 }
@@ -309,8 +302,7 @@ get_ref_count(self)
 
 #define param_is_flag(flag) \
     static VALUE \
-    param_is_##flag(self) \
-        VALUE self; \
+    param_is_##flag(VALUE self) \
     { \
         GParamSpec* pspec = G_PARAM_SPEC(rbgobj_get_param_spec(self)); \
         return CBOOL2RVAL(pspec->flags & flag); \

data/ext/glib2/rbgobj_signal.c

@@ -24,10 +24,7 @@ VALUE rbgobj_signal_wrap(guint sig_id);
 static VALUE signal_func_table;
 
 void
-rbgobj_set_signal_func(klass, sig_name, func)
-    VALUE klass;
-    gchar* sig_name; 
-    GValToRValSignalFunc func;
+rbgobj_set_signal_func(VALUE klass, gchar *sig_name, GValToRValSignalFunc func)
 {
     VALUE obj = Data_Wrap_Struct(rb_cData, NULL, NULL, func);
     guint signal_id = g_signal_lookup(sig_name, CLASS2GTYPE(klass));
@@ -203,10 +200,7 @@ gobj_s_signal(VALUE self, VALUE name)
 }
 
 static VALUE
-gobj_sig_has_handler_pending(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+gobj_sig_has_handler_pending(int argc, VALUE *argv, VALUE self)
 {
     VALUE sig, may_be_blocked;
     const char* sig_name;
@@ -229,11 +223,7 @@ gobj_sig_has_handler_pending(argc, argv, self)
 }
 
 static VALUE
-gobj_sig_connect_impl(after, argc, argv, self)
-    gboolean after;
-    int argc;
-    VALUE *argv;
-    VALUE self;
+gobj_sig_connect_impl(gboolean after, int argc, VALUE *argv, VALUE self)
 {
     VALUE sig, rest;
     int i;
@@ -273,27 +263,20 @@ gobj_sig_connect_impl(after, argc, argv, self)
 }
 
 static VALUE
-gobj_sig_connect(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+gobj_sig_connect(int argc, VALUE *argv, VALUE self)
 {
     return gobj_sig_connect_impl(FALSE, argc, argv, self);
 }
 
 static VALUE
-gobj_sig_connect_after(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+gobj_sig_connect_after(int argc, VALUE *argv, VALUE self)
 {
     return gobj_sig_connect_impl(TRUE, argc, argv, self);
 }
 
 #if 0
 static VALUE
-gobj_sig_get_invocation_hint(self)
-     VALUE self;
+gobj_sig_get_invocation_hint(VALUE self)
 {
     GSignalInvocationHint* hint;
     hint = g_signal_get_invocation_hint(RVAL2GOBJ(self));
@@ -366,10 +349,7 @@ emit_ensure(struct emit_arg* arg)
 }
 
 static VALUE
-gobj_sig_emit(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+gobj_sig_emit(int argc, VALUE *argv, VALUE self)
 {
     VALUE sig;
     const char* sig_name;
@@ -402,8 +382,7 @@ gobj_sig_emit(argc, argv, self)
 }
 
 static VALUE
-gobj_sig_emit_stop(self, sig)
-    VALUE self, sig;
+gobj_sig_emit_stop(VALUE self, VALUE sig)
 {
     gpointer instance = RVAL2GOBJ(self);
     const char* sig_name;
@@ -427,8 +406,7 @@ gobj_sig_emit_stop(self, sig)
 static VALUE gobj_sig_handler_unblock(VALUE self, VALUE id);
 
 static VALUE
-_sig_handler_block_ensure(arg)
-    VALUE arg;
+_sig_handler_block_ensure(VALUE arg)
 {
     VALUE self = RARRAY_PTR(arg)[0];
     VALUE id   = RARRAY_PTR(arg)[1];
@@ -437,8 +415,7 @@ _sig_handler_block_ensure(arg)
 }
 
 static VALUE
-gobj_sig_handler_block(self, id)
-    VALUE self, id;
+gobj_sig_handler_block(VALUE self, VALUE id)
 {
     g_signal_handler_block(RVAL2GOBJ(self), NUM2ULONG(id));
     if (rb_block_given_p())
@@ -448,24 +425,21 @@ gobj_sig_handler_block(self, id)
 }
 
 static VALUE
-gobj_sig_handler_unblock(self, id)
-    VALUE self, id;
+gobj_sig_handler_unblock(VALUE self, VALUE id)
 {
     g_signal_handler_unblock(RVAL2GOBJ(self), NUM2ULONG(id));
     return self;
 }
 
 static VALUE
-gobj_sig_handler_disconnect(self, id)
-    VALUE self, id;
+gobj_sig_handler_disconnect(VALUE self, VALUE id)
 {
     g_signal_handler_disconnect(RVAL2GOBJ(self), NUM2ULONG(id));
     return self;
 }
 
 static VALUE
-gobj_sig_handler_is_connected(self, id)
-     VALUE self, id;
+gobj_sig_handler_is_connected(VALUE self, VALUE id)
 {
     return CBOOL2RVAL(g_signal_handler_is_connected(RVAL2GOBJ(self), NUM2ULONG(id)));
 }
@@ -540,10 +514,7 @@ chain_from_overridden_body(struct emit_arg* arg)
 }
 
 static VALUE
-gobj_sig_chain_from_overridden(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+gobj_sig_chain_from_overridden(int argc, VALUE *argv, VALUE self)
 {
     struct emit_arg arg;
 
@@ -568,8 +539,7 @@ gobj_sig_chain_from_overridden(argc, argv, self)
 }
 
 static VALUE
-gobj_s_method_added(klass, id)
-    VALUE klass, id;
+gobj_s_method_added(VALUE klass, VALUE id)
 {
     const RGObjClassInfo* cinfo = rbgobj_lookup_class(klass);
     const char* name = rb_id2name(SYM2ID(id));
@@ -654,8 +624,7 @@ Init_signal_misc()
 /**********************************************************************/
 
 VALUE
-rbgobj_signal_wrap(sig_id)
-    guint sig_id;
+rbgobj_signal_wrap(guint sig_id)
 {
     VALUE result;
     GSignalQuery* query;
@@ -666,8 +635,7 @@ rbgobj_signal_wrap(sig_id)
 }
 
 static VALUE
-query_signal_id(self)
-    VALUE self;
+query_signal_id(VALUE self)
 {
     GSignalQuery* query;
     Data_Get_Struct(self, GSignalQuery, query);
@@ -675,8 +643,7 @@ query_signal_id(self)
 }
 
 static VALUE
-query_signal_name(self)
-    VALUE self;
+query_signal_name(VALUE self)
 {
     GSignalQuery* query;
     Data_Get_Struct(self, GSignalQuery, query);
@@ -684,8 +651,7 @@ query_signal_name(self)
 }
 
 static VALUE
-query_itype(self)
-    VALUE self;
+query_itype(VALUE self)
 {
     GSignalQuery* query;
     Data_Get_Struct(self, GSignalQuery, query);
@@ -693,8 +659,7 @@ query_itype(self)
 }
 
 static VALUE
-query_owner(self)
-    VALUE self;
+query_owner(VALUE self)
 {
     GSignalQuery* query;
     Data_Get_Struct(self, GSignalQuery, query);
@@ -702,8 +667,7 @@ query_owner(self)
 }
 
 static VALUE
-query_return_type(self)
-    VALUE self;
+query_return_type(VALUE self)
 {
     GSignalQuery* query;
     Data_Get_Struct(self, GSignalQuery, query);
@@ -711,8 +675,7 @@ query_return_type(self)
 }
 
 static VALUE
-query_signal_flags(self)
-    VALUE self;
+query_signal_flags(VALUE self)
 {
     GSignalQuery* query;
     Data_Get_Struct(self, GSignalQuery, query);
@@ -720,8 +683,7 @@ query_signal_flags(self)
 }
 
 static VALUE
-query_param_types(self)
-    VALUE self;
+query_param_types(VALUE self)
 {
     GSignalQuery* query;
     VALUE result;
@@ -736,8 +698,7 @@ query_param_types(self)
 }
 
 static VALUE
-query_inspect(self)
-    VALUE self;
+query_inspect(VALUE self)
 {
     GSignalQuery* query;
     gchar* s;
@@ -759,8 +720,7 @@ query_inspect(self)
 
 #define query_is_flag(flag) \
     static VALUE \
-    query_is_##flag(self) \
-        VALUE self; \
+    query_is_##flag(VALUE self) \
     { \
         GSignalQuery* query; \
         Data_Get_Struct(self, GSignalQuery, query); \