[libsigcplusplus] signal_base: Rename notify() to notify_self_and_iter().



commit 729aade77001f6b06915712983e6f6db409bdd40
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Apr 21 12:27:16 2016 +0200

    signal_base: Rename notify() to notify_self_and_iter().
    
    To make it clearer that this is only ever called for self_and_iter.

 sigc++/signal_base.cc |    6 +++---
 sigc++/signal_base.h  |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/sigc++/signal_base.cc b/sigc++/signal_base.cc
index 898bc70..40e3356 100644
--- a/sigc++/signal_base.cc
+++ b/sigc++/signal_base.cc
@@ -144,7 +144,7 @@ signal_impl::insert(signal_impl::iterator_type i, const slot_base& slot_)
 {
   auto iter = slots_.insert(i, slot_);
   auto si = new self_and_iter(this, iter);
-  iter->set_parent(si, &notify);
+  iter->set_parent(si, &notify_self_and_iter_invalidated);
   return iter;
 }
 
@@ -153,7 +153,7 @@ signal_impl::insert(signal_impl::iterator_type i, slot_base&& slot_)
 {
   auto iter = slots_.insert(i, std::move(slot_));
   auto si = new self_and_iter(this, iter);
-  iter->set_parent(si, &notify);
+  iter->set_parent(si, &notify_self_and_iter_invalidated);
   return iter;
 }
 
@@ -178,7 +178,7 @@ signal_impl::sweep()
 
 // static
 void
-signal_impl::notify(notifiable* d)
+signal_impl::notify_self_and_iter_invalidated(notifiable* d)
 {
   std::unique_ptr<self_and_iter> si(static_cast<self_and_iter*>(d));
 
diff --git a/sigc++/signal_base.h b/sigc++/signal_base.h
index 4e334f5..d46fd02 100644
--- a/sigc++/signal_base.h
+++ b/sigc++/signal_base.h
@@ -175,7 +175,7 @@ private:
    * erase() to sweep() when the signal is being emitted.
    * @param d A local structure, created in insert().
    */
-  static void notify(notifiable* d);
+  static void notify_self_and_iter_invalidated(notifiable* d);
 
 public:
   /// The list of slots.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]