diff options
author | Marcin Kolny <marcin.kolny@gmail.com> | 2016-11-07 22:37:21 +0100 |
---|---|---|
committer | Marcin Kolny <marcin.kolny@gmail.com> | 2016-11-07 22:37:21 +0100 |
commit | 9a80bedb31ebe953282852a21ec27cba20c59a42 (patch) | |
tree | 4ae396a87d618b03011d416ba9be3196f03e2bb2 | |
parent | 0a8a049e76f006a5cf57cf5e35cb95b5b5654a7e (diff) | |
download | glibmm-mkolny/use-mmgirgenerator.tar.gz |
uptake newest version of the generatormkolny/use-mmgirgenerator
-rw-r--r-- | gio/src/gio_methods.defs | 32 | ||||
-rw-r--r-- | gio/src/liststore.hg | 2 | ||||
-rw-r--r-- | gio/src/settings.hg | 2 | ||||
-rw-r--r-- | glib/src/glib_functions.defs | 153 |
4 files changed, 94 insertions, 95 deletions
diff --git a/gio/src/gio_methods.defs b/gio/src/gio_methods.defs index 2f379e26..f0878880 100644 --- a/gio/src/gio_methods.defs +++ b/gio/src/gio_methods.defs @@ -831,7 +831,7 @@ (c-name "g_pollable_source_new_full") (return-type "GSource*") (parameters - '("gpointer" "pollable_stream") + '("GObject*" "pollable_stream") '("GSource*" "child_source") '("GCancellable*" "cancellable") ) @@ -1330,7 +1330,7 @@ (c-name "g_application_bind_busy_property") (return-type "void") (parameters - '("gpointer" "object") + '("GObject*" "object") '("const-gchar*" "property") ) ) @@ -1510,7 +1510,7 @@ (c-name "g_application_unbind_busy_property") (return-type "void") (parameters - '("gpointer" "object") + '("GObject*" "object") '("const-gchar*" "property") ) ) @@ -6144,7 +6144,7 @@ (c-name "g_list_store_append") (return-type "void") (parameters - '("gpointer" "item") + '("GObject*" "item") ) ) @@ -6154,7 +6154,7 @@ (return-type "void") (parameters '("guint" "position") - '("gpointer" "item") + '("GObject*" "item") ) ) @@ -6163,7 +6163,7 @@ (c-name "g_list_store_insert_sorted") (return-type "guint") (parameters - '("gpointer" "item") + '("GObject*" "item") '("GCompareDataFunc" "compare_func") '("gpointer" "user_data") ) @@ -7416,7 +7416,7 @@ (return-type "GPropertyAction*") (parameters '("const-gchar*" "name") - '("gpointer" "object") + '("GObject*" "object") '("const-gchar*" "property_name") ) ) @@ -7795,7 +7795,7 @@ (c-name "g_settings_unbind") (return-type "void") (parameters - '("gpointer" "object") + '("GObject*" "object") '("const-gchar*" "property") ) ) @@ -7812,7 +7812,7 @@ (return-type "void") (parameters '("const-gchar*" "key") - '("gpointer" "object") + '("GObject*" "object") '("const-gchar*" "property") '("GSettingsBindFlags" "flags") ) @@ -7824,7 +7824,7 @@ (return-type "void") (parameters '("const-gchar*" "key") - '("gpointer" "object") + '("GObject*" "object") '("const-gchar*" "property") '("GSettingsBindFlags" "flags") '("GSettingsBindGetMapping" "get_mapping") @@ -7840,7 +7840,7 @@ (return-type "void") (parameters '("const-gchar*" "key") - '("gpointer" "object") + '("GObject*" "object") '("const-gchar*" "property") '("gboolean" "inverted") ) @@ -10306,7 +10306,7 @@ (c-name "g_task_new") (return-type "GTask*") (parameters - '("gpointer" "source_object") + '("GObject*" "source_object") '("GCancellable*" "cancellable") '("GAsyncReadyCallback" "callback") '("gpointer" "callback_data") @@ -10317,8 +10317,8 @@ (c-name "g_task_is_valid") (return-type "gboolean") (parameters - '("gpointer" "result") - '("gpointer" "source_object") + '("GAsyncResult*" "result") + '("GObject*" "source_object") ) ) @@ -10326,7 +10326,7 @@ (c-name "g_task_report_error") (return-type "void") (parameters - '("gpointer" "source_object") + '("GObject*" "source_object") '("GAsyncReadyCallback" "callback") '("gpointer" "callback_data") '("gpointer" "source_tag") @@ -10338,7 +10338,7 @@ (c-name "g_task_report_new_error") (return-type "void") (parameters - '("gpointer" "source_object") + '("GObject*" "source_object") '("GAsyncReadyCallback" "callback") '("gpointer" "callback_data") '("gpointer" "source_tag") diff --git a/gio/src/liststore.hg b/gio/src/liststore.hg index 840d7397..bc8d7907 100644 --- a/gio/src/liststore.hg +++ b/gio/src/liststore.hg @@ -49,7 +49,7 @@ protected: public: _WRAP_CREATE(GType item_type) -#m4 _CONVERSION(`const Glib::RefPtr<Glib::ObjectBase>&',`gpointer',`($3)->gobj()') +#m4 _CONVERSION(`const Glib::RefPtr<Glib::ObjectBase>&',`GObject*',`($3)->gobj()') _WRAP_METHOD(void insert(guint position, const Glib::RefPtr<Glib::ObjectBase>& item), g_list_store_insert, newin "2,50") diff --git a/gio/src/settings.hg b/gio/src/settings.hg index dbdbf201..ddb77f7f 100644 --- a/gio/src/settings.hg +++ b/gio/src/settings.hg @@ -189,7 +189,7 @@ _DEPRECATE_IFDEF_END deprecated "Use g_settings_schema_key_range_check() instead.") //TODO: Wrap GSettingsSchema -#m4 _CONVERSION(`Glib::ObjectBase*',`gpointer',(gpointer)$3->gobj()) +#m4 _CONVERSION(`Glib::ObjectBase*',`GObject*',$3->gobj()) _WRAP_METHOD(void bind(const Glib::ustring& key, Glib::ObjectBase* object, const Glib::ustring& property, SettingsBindFlags flags=SETTINGS_BIND_DEFAULT), g_settings_bind) void bind(const Glib::ustring& key, const Glib::PropertyProxy_Base& property_proxy, SettingsBindFlags flags=SETTINGS_BIND_DEFAULT); // TODO: implement bind_with_mapping diff --git a/glib/src/glib_functions.defs b/glib/src/glib_functions.defs index ae201fe9..552e2494 100644 --- a/glib/src/glib_functions.defs +++ b/glib/src/glib_functions.defs @@ -380,7 +380,7 @@ (c-name "g_base64_decode_inplace") (return-type "guchar*") (parameters - '("const-gchar*" "text") + '("gchar*" "text") '("gsize*" "out_len") ) ) @@ -7669,7 +7669,6 @@ (of-object "GIOChannel") (c-name "g_io_channel_write_chars") (return-type "GIOStatus") - (parameters '("const-gchar*" "buf") '("gssize" "count") @@ -14491,7 +14490,7 @@ (c-name "g_signal_chain_from_overridden_handler") (return-type "void") (parameters - '("gpointer" "instance") + '("GTypeInstance*" "instance") '("..." "...") ) ) @@ -14500,7 +14499,7 @@ (c-name "g_signal_connect_closure") (return-type "gulong") (parameters - '("gpointer" "instance") + '("GObject*" "instance") '("const-gchar*" "detailed_signal") '("GClosure*" "closure") '("gboolean" "after") @@ -14511,7 +14510,7 @@ (c-name "g_signal_connect_closure_by_id") (return-type "gulong") (parameters - '("gpointer" "instance") + '("GObject*" "instance") '("guint" "signal_id") '("GQuark" "detail") '("GClosure*" "closure") @@ -14523,7 +14522,7 @@ (c-name "g_signal_connect_data") (return-type "gulong") (parameters - '("gpointer" "instance") + '("GObject*" "instance") '("const-gchar*" "detailed_signal") '("GCallback" "c_handler") '("gpointer" "data") @@ -14536,10 +14535,10 @@ (c-name "g_signal_connect_object") (return-type "gulong") (parameters - '("gpointer" "instance") + '("GTypeInstance*" "instance") '("const-gchar*" "detailed_signal") '("GCallback" "c_handler") - '("gpointer" "gobject") + '("GObject*" "gobject") '("GConnectFlags" "connect_flags") ) ) @@ -14548,7 +14547,7 @@ (c-name "g_signal_emit") (return-type "void") (parameters - '("gpointer" "instance") + '("GObject*" "instance") '("guint" "signal_id") '("GQuark" "detail") '("..." "...") @@ -14559,7 +14558,7 @@ (c-name "g_signal_emit_by_name") (return-type "void") (parameters - '("gpointer" "instance") + '("GObject*" "instance") '("const-gchar*" "detailed_signal") '("..." "...") ) @@ -14569,7 +14568,7 @@ (c-name "g_signal_emit_valist") (return-type "void") (parameters - '("gpointer" "instance") + '("GTypeInstance*" "instance") '("guint" "signal_id") '("GQuark" "detail") '("va_list" "var_args") @@ -14591,7 +14590,7 @@ (c-name "g_signal_get_invocation_hint") (return-type "GSignalInvocationHint*") (parameters - '("gpointer" "instance") + '("GObject*" "instance") ) ) @@ -14599,7 +14598,7 @@ (c-name "g_signal_handler_block") (return-type "void") (parameters - '("gpointer" "instance") + '("GObject*" "instance") '("gulong" "handler_id") ) ) @@ -14608,7 +14607,7 @@ (c-name "g_signal_handler_disconnect") (return-type "void") (parameters - '("gpointer" "instance") + '("GObject*" "instance") '("gulong" "handler_id") ) ) @@ -14617,7 +14616,7 @@ (c-name "g_signal_handler_find") (return-type "gulong") (parameters - '("gpointer" "instance") + '("GObject*" "instance") '("GSignalMatchType" "mask") '("guint" "signal_id") '("GQuark" "detail") @@ -14631,7 +14630,7 @@ (c-name "g_signal_handler_is_connected") (return-type "gboolean") (parameters - '("gpointer" "instance") + '("GObject*" "instance") '("gulong" "handler_id") ) ) @@ -14640,7 +14639,7 @@ (c-name "g_signal_handler_unblock") (return-type "void") (parameters - '("gpointer" "instance") + '("GObject*" "instance") '("gulong" "handler_id") ) ) @@ -14649,7 +14648,7 @@ (c-name "g_signal_handlers_block_matched") (return-type "guint") (parameters - '("gpointer" "instance") + '("GObject*" "instance") '("GSignalMatchType" "mask") '("guint" "signal_id") '("GQuark" "detail") @@ -14663,7 +14662,7 @@ (c-name "g_signal_handlers_destroy") (return-type "void") (parameters - '("gpointer" "instance") + '("GObject*" "instance") ) ) @@ -14671,7 +14670,7 @@ (c-name "g_signal_handlers_disconnect_matched") (return-type "guint") (parameters - '("gpointer" "instance") + '("GObject*" "instance") '("GSignalMatchType" "mask") '("guint" "signal_id") '("GQuark" "detail") @@ -14685,7 +14684,7 @@ (c-name "g_signal_handlers_unblock_matched") (return-type "guint") (parameters - '("gpointer" "instance") + '("GObject*" "instance") '("GSignalMatchType" "mask") '("guint" "signal_id") '("GQuark" "detail") @@ -14699,7 +14698,7 @@ (c-name "g_signal_has_handler_pending") (return-type "gboolean") (parameters - '("gpointer" "instance") + '("GObject*" "instance") '("guint" "signal_id") '("GQuark" "detail") '("gboolean" "may_be_blocked") @@ -14864,7 +14863,7 @@ (c-name "g_signal_stop_emission") (return-type "void") (parameters - '("gpointer" "instance") + '("GObject*" "instance") '("guint" "signal_id") '("GQuark" "detail") ) @@ -14874,7 +14873,7 @@ (c-name "g_signal_stop_emission_by_name") (return-type "void") (parameters - '("gpointer" "instance") + '("GObject*" "instance") '("const-gchar*" "detailed_signal") ) ) @@ -15117,7 +15116,7 @@ (c-name "g_type_default_interface_unref") (return-type "void") (parameters - '("gpointer" "g_iface") + '("GTypeInterface*" "g_iface") ) ) @@ -15231,7 +15230,7 @@ (c-name "g_type_interface_peek") (return-type "gpointer") (parameters - '("gpointer" "instance_class") + '("GTypeClass*" "instance_class") '("GType" "iface_type") ) ) @@ -15497,7 +15496,7 @@ (parameters '("GClosure*" "closure") '("GValue*" "return_value") - '("gpointer" "instance") + '("GTypeInstance*" "instance") '("va_list" "args") '("gpointer" "marshal_data") '("int" "n_params") @@ -15524,7 +15523,7 @@ (parameters '("GClosure*" "closure") '("GValue*" "return_value") - '("gpointer" "instance") + '("GTypeInstance*" "instance") '("va_list" "args") '("gpointer" "marshal_data") '("int" "n_params") @@ -15551,7 +15550,7 @@ (parameters '("GClosure*" "closure") '("GValue*" "return_value") - '("gpointer" "instance") + '("GTypeInstance*" "instance") '("va_list" "args") '("gpointer" "marshal_data") '("int" "n_params") @@ -15578,7 +15577,7 @@ (parameters '("GClosure*" "closure") '("GValue*" "return_value") - '("gpointer" "instance") + '("GTypeInstance*" "instance") '("va_list" "args") '("gpointer" "marshal_data") '("int" "n_params") @@ -15605,7 +15604,7 @@ (parameters '("GClosure*" "closure") '("GValue*" "return_value") - '("gpointer" "instance") + '("GTypeInstance*" "instance") '("va_list" "args") '("gpointer" "marshal_data") '("int" "n_params") @@ -15632,7 +15631,7 @@ (parameters '("GClosure*" "closure") '("GValue*" "return_value") - '("gpointer" "instance") + '("GTypeInstance*" "instance") '("va_list" "args") '("gpointer" "marshal_data") '("int" "n_params") @@ -15659,7 +15658,7 @@ (parameters '("GClosure*" "closure") '("GValue*" "return_value") - '("gpointer" "instance") + '("GTypeInstance*" "instance") '("va_list" "args") '("gpointer" "marshal_data") '("int" "n_params") @@ -15686,7 +15685,7 @@ (parameters '("GClosure*" "closure") '("GValue*" "return_value") - '("gpointer" "instance") + '("GTypeInstance*" "instance") '("va_list" "args") '("gpointer" "marshal_data") '("int" "n_params") @@ -15713,7 +15712,7 @@ (parameters '("GClosure*" "closure") '("GValue*" "return_value") - '("gpointer" "instance") + '("GTypeInstance*" "instance") '("va_list" "args") '("gpointer" "marshal_data") '("int" "n_params") @@ -15740,7 +15739,7 @@ (parameters '("GClosure*" "closure") '("GValue*" "return_value") - '("gpointer" "instance") + '("GTypeInstance*" "instance") '("va_list" "args") '("gpointer" "marshal_data") '("int" "n_params") @@ -15767,7 +15766,7 @@ (parameters '("GClosure*" "closure") '("GValue*" "return_value") - '("gpointer" "instance") + '("GTypeInstance*" "instance") '("va_list" "args") '("gpointer" "marshal_data") '("int" "n_params") @@ -15794,7 +15793,7 @@ (parameters '("GClosure*" "closure") '("GValue*" "return_value") - '("gpointer" "instance") + '("GTypeInstance*" "instance") '("va_list" "args") '("gpointer" "marshal_data") '("int" "n_params") @@ -15821,7 +15820,7 @@ (parameters '("GClosure*" "closure") '("GValue*" "return_value") - '("gpointer" "instance") + '("GTypeInstance*" "instance") '("va_list" "args") '("gpointer" "marshal_data") '("int" "n_params") @@ -15848,7 +15847,7 @@ (parameters '("GClosure*" "closure") '("GValue*" "return_value") - '("gpointer" "instance") + '("GTypeInstance*" "instance") '("va_list" "args") '("gpointer" "marshal_data") '("int" "n_params") @@ -15875,7 +15874,7 @@ (parameters '("GClosure*" "closure") '("GValue*" "return_value") - '("gpointer" "instance") + '("GTypeInstance*" "instance") '("va_list" "args") '("gpointer" "marshal_data") '("int" "n_params") @@ -15902,7 +15901,7 @@ (parameters '("GClosure*" "closure") '("GValue*" "return_value") - '("gpointer" "instance") + '("GTypeInstance*" "instance") '("va_list" "args") '("gpointer" "marshal_data") '("int" "n_params") @@ -15929,7 +15928,7 @@ (parameters '("GClosure*" "closure") '("GValue*" "return_value") - '("gpointer" "instance") + '("GTypeInstance*" "instance") '("va_list" "args") '("gpointer" "marshal_data") '("int" "n_params") @@ -15969,7 +15968,7 @@ (parameters '("GClosure*" "closure") '("GValue*" "return_value") - '("gpointer" "instance") + '("GTypeInstance*" "instance") '("va_list" "args") '("gpointer" "marshal_data") '("int" "n_params") @@ -15983,7 +15982,7 @@ (parameters '("GClosure*" "closure") '("GValue*" "return_value") - '("gpointer" "instance") + '("GTypeInstance*" "instance") '("va_list" "args") '("gpointer" "marshal_data") '("int" "n_params") @@ -16010,7 +16009,7 @@ (parameters '("GClosure*" "closure") '("GValue*" "return_value") - '("gpointer" "instance") + '("GTypeInstance*" "instance") '("va_list" "args") '("gpointer" "marshal_data") '("int" "n_params") @@ -16037,7 +16036,7 @@ (parameters '("GClosure*" "closure") '("GValue*" "return_value") - '("gpointer" "instance") + '("GTypeInstance*" "instance") '("va_list" "args") '("gpointer" "marshal_data") '("int" "n_params") @@ -16064,7 +16063,7 @@ (parameters '("GClosure*" "closure") '("GValue*" "return_value") - '("gpointer" "instance") + '("GTypeInstance*" "instance") '("va_list" "args") '("gpointer" "marshal_data") '("int" "n_params") @@ -16091,7 +16090,7 @@ (parameters '("GClosure*" "closure") '("GValue*" "return_value") - '("gpointer" "instance") + '("GTypeInstance*" "instance") '("va_list" "args_list") '("gpointer" "marshal_data") '("int" "n_params") @@ -16305,7 +16304,7 @@ (c-name "g_object_interface_find_property") (return-type "GParamSpec*") (parameters - '("gpointer" "g_iface") + '("GTypeInterface*" "g_iface") '("const-gchar*" "property_name") ) ) @@ -16314,7 +16313,7 @@ (c-name "g_object_interface_install_property") (return-type "void") (parameters - '("gpointer" "g_iface") + '("GTypeInterface*" "g_iface") '("GParamSpec*" "pspec") ) ) @@ -16323,7 +16322,7 @@ (c-name "g_object_interface_list_properties") (return-type "GParamSpec**") (parameters - '("gpointer" "g_iface") + '("GTypeInterface*" "g_iface") '("guint*" "n_properties_p") ) ) @@ -16351,9 +16350,9 @@ (c-name "g_object_bind_property") (return-type "GBinding*") (parameters - '("gpointer" "source") + '("GObject*" "source") '("const-gchar*" "source_property") - '("gpointer" "target") + '("GObject*" "target") '("const-gchar*" "target_property") '("GBindingFlags" "flags") ) @@ -16363,9 +16362,9 @@ (c-name "g_object_bind_property_full") (return-type "GBinding*") (parameters - '("gpointer" "source") + '("GObject*" "source") '("const-gchar*" "source_property") - '("gpointer" "target") + '("GObject*" "target") '("const-gchar*" "target_property") '("GBindingFlags" "flags") '("GBindingTransformFunc" "transform_to") @@ -16379,9 +16378,9 @@ (c-name "g_object_bind_property_with_closures") (return-type "GBinding*") (parameters - '("gpointer" "source") + '("GObject*" "source") '("const-gchar*" "source_property") - '("gpointer" "target") + '("GObject*" "target") '("const-gchar*" "target_property") '("GBindingFlags" "flags") '("GClosure*" "transform_to") @@ -16393,7 +16392,7 @@ (c-name "g_object_connect") (return-type "gpointer") (parameters - '("gpointer" "object") + '("GObject*" "object") '("const-gchar*" "signal_spec") '("..." "...") ) @@ -16403,7 +16402,7 @@ (c-name "g_object_disconnect") (return-type "void") (parameters - '("gpointer" "object") + '("GObject*" "object") '("const-gchar*" "signal_spec") '("..." "...") ) @@ -16447,7 +16446,7 @@ (c-name "g_object_get") (return-type "void") (parameters - '("gpointer" "object") + '("GObject*" "object") '("const-gchar*" "first_property_name") '("..." "...") ) @@ -16495,7 +16494,7 @@ (c-name "g_object_is_floating") (return-type "gboolean") (parameters - '("gpointer" "object") + '("GObject*" "object") ) ) @@ -16521,7 +16520,7 @@ (c-name "g_object_ref") (return-type "gpointer") (parameters - '("gpointer" "object") + '("GObject*" "object") ) ) @@ -16529,7 +16528,7 @@ (c-name "g_object_ref_sink") (return-type "gpointer") (parameters - '("gpointer" "object") + '("GObject*" "object") ) ) @@ -16588,7 +16587,7 @@ (c-name "g_object_set") (return-type "void") (parameters - '("gpointer" "object") + '("GObject*" "object") '("const-gchar*" "first_property_name") '("..." "...") ) @@ -16684,7 +16683,7 @@ (c-name "g_object_unref") (return-type "void") (parameters - '("gpointer" "object") + '("GObject*" "object") ) ) @@ -16937,7 +16936,7 @@ (c-name "g_type_class_add_private") (return-type "void") (parameters - '("gpointer" "g_class") + '("GTypeClass*" "g_class") '("gsize" "private_size") ) ) @@ -16946,7 +16945,7 @@ (c-name "g_type_class_get_instance_private_offset") (return-type "gint") (parameters - '("gpointer" "g_class") + '("GTypeClass*" "g_class") ) ) @@ -16963,7 +16962,7 @@ (c-name "g_type_class_peek_parent") (return-type "gpointer") (parameters - '("gpointer" "g_class") + '("GTypeClass*" "g_class") ) ) @@ -16971,7 +16970,7 @@ (c-name "g_type_class_unref") (return-type "void") (parameters - '("gpointer" "g_class") + '("GTypeClass*" "g_class") ) ) @@ -16979,7 +16978,7 @@ (c-name "g_type_class_unref_uncached") (return-type "void") (parameters - '("gpointer" "g_class") + '("GTypeClass*" "g_class") ) ) @@ -17029,7 +17028,7 @@ (c-name "g_type_interface_peek_parent") (return-type "gpointer") (parameters - '("gpointer" "g_iface") + '("GTypeInterface*" "g_iface") ) ) @@ -17055,7 +17054,7 @@ (c-name "g_type_interface_peek") (return-type "gpointer") (parameters - '("gpointer" "instance_class") + '("GTypeClass*" "instance_class") '("GType" "iface_type") ) ) @@ -17326,7 +17325,7 @@ (c-name "g_value_init_from_instance") (return-type "void") (parameters - '("gpointer" "instance") + '("GTypeInstance*" "instance") ) ) @@ -17464,7 +17463,7 @@ (c-name "g_value_set_object") (return-type "void") (parameters - '("gpointer" "v_object") + '("GObject*" "v_object") ) ) @@ -17784,7 +17783,7 @@ (c-name "g_weak_ref_init") (return-type "void") (parameters - '("gpointer" "object") + '("GObject*" "object") ) ) @@ -17793,7 +17792,7 @@ (c-name "g_weak_ref_set") (return-type "void") (parameters - '("gpointer" "object") + '("GObject*" "object") ) ) |