diff options
author | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2016-12-27 15:30:49 +0100 |
---|---|---|
committer | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2016-12-27 15:30:49 +0100 |
commit | f8e1885a493c76c1d03bac408fb3286858efb968 (patch) | |
tree | 53aa94075f36e85e3dbca75546d17eb1937ef4f5 | |
parent | 97e7b1a91c635c5960f1b21ff266d50cc15c260c (diff) | |
download | glibmm-f8e1885a493c76c1d03bac408fb3286858efb968.tar.gz |
Fix some TODO comments requiring ABI break
* gio/src/gio_vfuncs.defs: Add GAsyncResult::is_tagged():
* gio/src/action.hg: get_state_hint_variant() returns VariantContainerBase.
* gio/src/actiongroup.hg: Remove the deprecated get_action_state_hint().
* gio/src/asyncresult.hg: Add is_tagged_vfunc().
* glib/src/checksum.hg: update(): The length parameter is a gssize.
-rw-r--r-- | gio/src/action.hg | 5 | ||||
-rw-r--r-- | gio/src/actiongroup.hg | 3 | ||||
-rw-r--r-- | gio/src/asyncresult.hg | 11 | ||||
-rw-r--r-- | gio/src/gio_vfuncs.defs | 8 | ||||
-rw-r--r-- | glib/src/checksum.hg | 5 |
5 files changed, 14 insertions, 18 deletions
diff --git a/gio/src/action.hg b/gio/src/action.hg index ffff5822..b9b59932 100644 --- a/gio/src/action.hg +++ b/gio/src/action.hg @@ -102,10 +102,7 @@ public: template <typename T_Value> void get_state_hint(T_Value& value) const; - //TODO: When we can break ABI, Return a Glib::VariantContainerBase, - // as we already do for ActionGroup::get_action_state_hint(), - // because that is what this returns (to specify a range). - _WRAP_METHOD(Glib::VariantBase get_state_hint_variant() const, g_action_get_state_hint) + _WRAP_METHOD(Glib::VariantContainerBase get_state_hint_variant() const, g_action_get_state_hint) _WRAP_METHOD(bool get_enabled() const, g_action_get_enabled) diff --git a/gio/src/actiongroup.hg b/gio/src/actiongroup.hg index 5877e20b..6d250bad 100644 --- a/gio/src/actiongroup.hg +++ b/gio/src/actiongroup.hg @@ -75,9 +75,6 @@ public: _WRAP_METHOD(Glib::VariantType get_action_parameter_type(const Glib::ustring& action_name) const, g_action_group_get_action_parameter_type) _WRAP_METHOD(Glib::VariantType get_action_state_type(const Glib::ustring& action_name) const, g_action_group_get_action_state_type) - - _WRAP_METHOD(Glib::VariantContainerBase get_action_state_hint(const Glib::ustring& action_name) const, g_action_group_get_action_state_hint, deprecated "Use the get_action_state() method that takes an output parameter instead.") - //TODO: How do we check for a nullptr Variant? /** * Requests a hint about the valid range of values for the state of the diff --git a/gio/src/asyncresult.hg b/gio/src/asyncresult.hg index 31b6a157..f0d2d684 100644 --- a/gio/src/asyncresult.hg +++ b/gio/src/asyncresult.hg @@ -117,15 +117,12 @@ public: _WRAP_METHOD(bool is_tagged(gpointer source_tag) const, g_async_result_is_tagged) - - // TODO: For some reason, the compiler cannot find an unwrap() for ObjectBase. + // The compiler cannot find an unwrap() for ObjectBase, because + // ObjectBase::BaseObjectType is not declared. //#m4 _CONVERSION(`Glib::RefPtr<Glib::ObjectBase>',`GObject*',__CONVERT_REFPTR_TO_P) #m4 _CONVERSION(`Glib::RefPtr<Glib::ObjectBase>',`GObject*',`unwrap_objectbase_custom($3)') - _WRAP_VFUNC(Glib::RefPtr<Glib::ObjectBase> get_source_object(), - "get_source_object") - - //TODO: is_tagged() vfunc when we can break ABI. + _WRAP_VFUNC(Glib::RefPtr<Glib::ObjectBase> get_source_object(), "get_source_object") + _WRAP_VFUNC(bool is_tagged(gpointer source_tag), "is_tagged") }; } // namespace Gio - diff --git a/gio/src/gio_vfuncs.defs b/gio/src/gio_vfuncs.defs index 116b0033..f8c94dac 100644 --- a/gio/src/gio_vfuncs.defs +++ b/gio/src/gio_vfuncs.defs @@ -359,6 +359,14 @@ (return-type "GObject*") ) +(define-vfunc is_tagged + (of-object "GAsyncResult") + (return-type "gboolean") + (parameters + '("gpointer" "source_tag") + ) +) + ; GBufferedInputStream (define-vfunc fill diff --git a/glib/src/checksum.hg b/glib/src/checksum.hg index 26770dd5..b3a55555 100644 --- a/glib/src/checksum.hg +++ b/glib/src/checksum.hg @@ -61,9 +61,7 @@ public: _WRAP_METHOD(void reset(), g_checksum_reset) - //TODO: length should really be gssize, not gsize, when we can break ABI: -#m4 _CONVERSION(`gsize',`gssize',`(gssize)($3)') - _WRAP_METHOD(void update(const guchar* data, gsize length), g_checksum_update) + _WRAP_METHOD(void update(const guchar* data, gssize length), g_checksum_update) /** Feeds data into an existing Checksum. * The checksum must still be open, that is get_string() or get_digest() must not have been called on the checksum. @@ -99,4 +97,3 @@ public: }; } //namespace Glib - |