connection: Rename notify() for clarity.

murraycu · murraycu · commit a422dce07b1c · 2016-04-21T17:50:00.000+02:00
diff --git a/sigc++/connection.cc b/sigc++/connection.cc
@@ -30,15 +30,15 @@ connection::connection(slot_base* slot)
 : slot_(slot)
 {
   if (slot_)
-    slot_->add_destroy_notify_callback(this, &notify);
+    slot_->add_destroy_notify_callback(this, &notify_slot_invalidated);
 }
 
 
 connection::connection(const connection& c) : slot_(c.slot_)
 {
   // Let the connection forget about the signal handler when the handler object dies:
   if (slot_)
-    slot_->add_destroy_notify_callback(this, &notify);
+    slot_->add_destroy_notify_callback(this, &notify_slot_invalidated);
 }
 
 connection&
@@ -105,11 +105,11 @@ connection::set_slot(slot_base* sl)
   slot_ = sl;
 
   if (slot_)
-    slot_->add_destroy_notify_callback(this, &notify);
+    slot_->add_destroy_notify_callback(this, &notify_slot_invalidated);
 }
 
 void
-connection::notify(notifiable* data)
+connection::notify_slot_invalidated(notifiable* data)
 {
   auto self = static_cast<connection*>(data);
   self->slot_ = nullptr;
diff --git a/sigc++/connection.h b/sigc++/connection.h
@@ -101,7 +101,7 @@ struct SIGC_API connection : public notifiable
   /** Callback that is executed when the referred slot is destroyed.
    * @param data The connection object notified (@p this).
    */
-  static void notify(notifiable* data);
+  static void notify_slot_invalidated(notifiable* data);
 
   /* Referred slot. Set to zero from notify().
    * A value of zero indicates an "empty" connection.

Original file line number	Diff line number	Diff line change
`@@ -30,15 +30,15 @@ connection::connection(slot_base* slot)`
`30`	`30`	`: slot_(slot)`
`31`	`31`	`{`
`32`	`32`	`if (slot_)`
`33`		`- slot_->add_destroy_notify_callback(this, &notify);`
	`33`	`+ slot_->add_destroy_notify_callback(this, &notify_slot_invalidated);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`
`37`	`37`	`connection::connection(const connection& c) : slot_(c.slot_)`
`38`	`38`	`{`
`39`	`39`	`// Let the connection forget about the signal handler when the handler object dies:`
`40`	`40`	`if (slot_)`
`41`		`- slot_->add_destroy_notify_callback(this, &notify);`
	`41`	`+ slot_->add_destroy_notify_callback(this, &notify_slot_invalidated);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`connection&`
`@@ -105,11 +105,11 @@ connection::set_slot(slot_base* sl)`
`105`	`105`	`slot_ = sl;`
`106`	`106`
`107`	`107`	`if (slot_)`
`108`		`- slot_->add_destroy_notify_callback(this, &notify);`
	`108`	`+ slot_->add_destroy_notify_callback(this, &notify_slot_invalidated);`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`void`
`112`		`-connection::notify(notifiable* data)`
	`112`	`+connection::notify_slot_invalidated(notifiable* data)`
`113`	`113`	`{`
`114`	`114`	`auto self = static_cast<connection*>(data);`
`115`	`115`	`self->slot_ = nullptr;`