Connection: Constructor: Take slot_base as reference.

murraycu · murraycu · commit 3f7189989cd0 · 2016-04-22T10:05:23.000+02:00
This constructor existed before, so this avoids an API break.
diff --git a/sigc++/connection.cc b/sigc++/connection.cc
@@ -26,8 +26,8 @@ connection::connection() noexcept : slot_(nullptr)
 {
 }
 
-connection::connection(slot_base* slot)
-: slot_(slot)
+connection::connection(slot_base& slot)
+: slot_(&slot)
 {
   if (slot_)
     slot_->add_destroy_notify_callback(this, &notify_slot_invalidated);
diff --git a/sigc++/connection.h b/sigc++/connection.h
@@ -48,10 +48,10 @@ struct SIGC_API connection : public notifiable
    */
   connection(const connection& c);
 
-  /** Constructs a connection object from a slot list iterator.
-   * @param it The slot list iterator to take the slot from.
+  /** Constructs a connection object from a slot object.
+   * @param sl The slot to operate on.
    */
-  explicit connection(slot_base* slot);
+  explicit connection(slot_base& slot);
 
   /** Overrides this connection object copying another one.
    * @param c The connection object to make a copy from.
diff --git a/sigc++/signal.h b/sigc++/signal.h
@@ -433,7 +433,7 @@ class signal_with_accumulator : public signal_base
   {
     auto iter = signal_base::connect(slot_);
     auto& slot_base = *iter;
-    return connection(&slot_base);
+    return connection(slot_base);
   }
 
   /** Add a slot to the list of slots.
@@ -445,7 +445,7 @@ class signal_with_accumulator : public signal_base
   {
     auto iter = signal_base::connect(std::move(slot_));
     auto& slot_base = *iter;
-    return connection(&slot_base);
+    return connection(slot_base);
   }
 
   /** Triggers the emission of the signal.

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ connection::connection() noexcept : slot_(nullptr)`
`26`	`26`	`{`
`27`	`27`	`}`
`28`	`28`
`29`		`-connection::connection(slot_base* slot)`
`30`		`-: slot_(slot)`
	`29`	`+connection::connection(slot_base& slot)`
	`30`	`+: slot_(&slot)`
`31`	`31`	`{`
`32`	`32`	`if (slot_)`
`33`	`33`	`slot_->add_destroy_notify_callback(this, &notify_slot_invalidated);`
Original file line number	Diff line number	Diff line change
`@@ -433,7 +433,7 @@ class signal_with_accumulator : public signal_base`
`433`	`433`	`{`
`434`	`434`	`auto iter = signal_base::connect(slot_);`
`435`	`435`	`auto& slot_base = *iter;`
`436`		`- return connection(&slot_base);`
	`436`	`+ return connection(slot_base);`
`437`	`437`	`}`
`438`	`438`
`439`	`439`	`/** Add a slot to the list of slots.`
`@@ -445,7 +445,7 @@ class signal_with_accumulator : public signal_base`
`445`	`445`	`{`
`446`	`446`	`auto iter = signal_base::connect(std::move(slot_));`
`447`	`447`	`auto& slot_base = *iter;`
`448`		`- return connection(&slot_base);`
	`448`	`+ return connection(slot_base);`
`449`	`449`	`}`
`450`	`450`
`451`	`451`	`/** Triggers the emission of the signal.`