diff options
author | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2017-02-13 20:28:31 +0100 |
---|---|---|
committer | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2017-02-13 20:28:31 +0100 |
commit | bd38451594cbb2f734b97f61d248d4c645999a15 (patch) | |
tree | 8626b0223c27eee42d528a24be5795dc68dfff98 | |
parent | 1e258cf7165d77151f6ef2821dc5c28753196444 (diff) | |
download | sigc++-bd38451594cbb2f734b97f61d248d4c645999a15.tar.gz |
slot_rep: Fix the notify_slot_rep_invalidated() name in comments
slot_rep::notify() has been renamed to notify_slot_rep_invalidated(),
but the name was not updated in all comments.
-rw-r--r-- | sigc++/functors/slot.h | 2 | ||||
-rw-r--r-- | sigc++/functors/slot_base.cc | 2 | ||||
-rw-r--r-- | sigc++/functors/slot_base.h | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sigc++/functors/slot.h b/sigc++/functors/slot.h index 79b39d1..7326fcd 100644 --- a/sigc++/functors/slot.h +++ b/sigc++/functors/slot.h @@ -250,7 +250,7 @@ public: * the outer slot as the parent of the inner slot. The second overload, called from * the destructor or destroy() of the outer slot, unsets the parent of the inner slot. * When an object referenced from the inner slot is deleted, the inner slot calls - * its slot_rep::disconnect(), which calls the outer slot's slot_rep::notify(). + * its slot_rep::disconnect(), which calls the outer slot's slot_rep::notify_slot_rep_invalidated(). * The outer slot is informed just as if one of its directly referenced objects * had been deleted. Result: The outer slot is disconnected from its parent, * if any (for instance a sigc::signal). diff --git a/sigc++/functors/slot_base.cc b/sigc++/functors/slot_base.cc index 2373a9a..1281fb9 100644 --- a/sigc++/functors/slot_base.cc +++ b/sigc++/functors/slot_base.cc @@ -153,7 +153,7 @@ slot_base::delete_rep_with_check() return; // Make sure we are notified if disconnect() deletes rep_, which is trackable. - // Compare slot_rep::notify(). + // Compare slot_rep::notify_slot_rep_invalidated(). sigc::internal::weak_raw_ptr<rep_type> notifier(rep_); rep_->disconnect(); // Disconnect the slot (might lead to deletion of rep_!). diff --git a/sigc++/functors/slot_base.h b/sigc++/functors/slot_base.h index 891c3cf..55cf3e6 100644 --- a/sigc++/functors/slot_base.h +++ b/sigc++/functors/slot_base.h @@ -41,13 +41,13 @@ using hook = void* (*)(void*); * The base class slot_rep serves the purpose to * - form a common pointer type (slot_rep*), * - offer the possibility to create duplicates (clone()), - * - offer a notification callback (notify()), + * - offer a notification callback (notify_slot_rep_invalidated()), * - implement some of slot_base's interface that depends * on the notification callback, i.e. * -# the possibility to set a single parent with a callback - * (set_parent()) that is executed from notify(), + * (set_parent()) that is executed from notify_slot_rep_invalidated(), * -# a generic function pointer, call_, that is simply - * set to zero in notify() to invalidate the slot. + * set to zero in notify_slot_rep_invalidated() to invalidate the slot. * * slot_rep inherits trackable so that connection objects can * refer to the slot and are notified when the slot is destroyed. @@ -93,7 +93,7 @@ public: /** Set the parent with a callback. * slots have one parent exclusively. * @param parent The new parent. - * @param cleanup The callback to execute from notify(). + * @param cleanup The callback to execute from notify_slot_rep_invalidated(). */ inline void set_parent(notifiable* parent, notifiable::func_destroy_notify cleanup) noexcept { @@ -138,7 +138,7 @@ public: }; /** Functor used to add a dependency to a trackable. - * Consequently slot_rep::notify() gets executed when the + * Consequently slot_rep::notify_slot_rep_invalidated() gets executed when the * trackable is destroyed or overwritten. */ struct SIGC_API slot_do_bind |