slot_rep: Rename notify() for clarity.

murraycu · murraycu · commit 831dfc8cdf2c · 2016-04-21T20:05:24.000+02:00
diff --git a/sigc++/functors/slot.h b/sigc++/functors/slot.h
@@ -267,7 +267,7 @@ struct visitor<slot<T_return, T_arg...>>
     const slot<T_return, T_arg...>& target)
   {
     if (target.rep_ && target.rep_->parent_ == nullptr)
-      target.rep_->set_parent(action.action_.rep_, &internal::slot_rep::notify);
+      target.rep_->set_parent(action.action_.rep_, &internal::slot_rep::notify_slot_rep_invalidated);
   }
 
   static void do_visit_each(
diff --git a/sigc++/functors/slot_base.cc b/sigc++/functors/slot_base.cc
@@ -77,7 +77,7 @@ slot_rep::disconnect()
 
 // static
 void
-slot_rep::notify(notifiable* data)
+slot_rep::notify_slot_rep_invalidated(notifiable* data)
 {
   auto self_ = static_cast<slot_rep*>(data);
 
diff --git a/sigc++/functors/slot_base.h b/sigc++/functors/slot_base.h
@@ -131,8 +131,9 @@ struct SIGC_API slot_rep : public trackable
    * referred object dying.
    * @param data The slot_rep object that is becoming invalid (@p this).
    */
-  static void notify(notifiable* data);
+  static void notify_slot_rep_invalidated(notifiable* data);
 
+public:
   /// Callback that invokes the contained functor.
   /* This can't be a virtual function since number of arguments
    * must be flexible. We use function pointers to slot_call::call_it()
@@ -179,7 +180,7 @@ struct SIGC_API slot_do_bind
    */
   inline void operator()(const trackable& t) const
   {
-    t.add_destroy_notify_callback(rep_, &slot_rep::notify);
+    t.add_destroy_notify_callback(rep_, &slot_rep::notify_slot_rep_invalidated);
   }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ struct visitor<slot<T_return, T_arg...>>`
`267`	`267`	`const slot<T_return, T_arg...>& target)`
`268`	`268`	`{`
`269`	`269`	`if (target.rep_ && target.rep_->parent_ == nullptr)`
`270`		`- target.rep_->set_parent(action.action_.rep_, &internal::slot_rep::notify);`
	`270`	`+ target.rep_->set_parent(action.action_.rep_, &internal::slot_rep::notify_slot_rep_invalidated);`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`static void do_visit_each(`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ slot_rep::disconnect()`
`77`	`77`
`78`	`78`	`// static`
`79`	`79`	`void`
`80`		`-slot_rep::notify(notifiable* data)`
	`80`	`+slot_rep::notify_slot_rep_invalidated(notifiable* data)`
`81`	`81`	`{`
`82`	`82`	`auto self_ = static_cast<slot_rep*>(data);`
`83`	`83`