copy operations: Name all parameters src.

murraycu · murraycu · commit 17176689106b · 2016-04-27T13:43:58.000+02:00
To make it more obvious that these are copy operations.
diff --git a/sigc++/connection.cc b/sigc++/connection.cc
@@ -42,9 +42,9 @@ connection::connection(const connection& c) : slot_(c.slot_)
 }
 
 connection&
-connection::operator=(const connection& c)
+connection::operator=(const connection& src)
 {
-  set_slot(c.slot_);
+  set_slot(src.slot_);
   return *this;
 }
 
diff --git a/sigc++/connection.h b/sigc++/connection.h
@@ -56,7 +56,7 @@ struct SIGC_API connection : public notifiable
   /** Overrides this connection object copying another one.
    * @param c The connection object to make a copy from.
    */
-  connection& operator=(const connection& c);
+  connection& operator=(const connection& src);
 
   ~connection();
 
diff --git a/sigc++/functors/slot.h b/sigc++/functors/slot.h
@@ -63,8 +63,8 @@ struct typed_slot_rep : public slot_rep
     sigc::visit_each_trackable(slot_do_bind(this), *functor_);
   }
 
-  inline typed_slot_rep(const typed_slot_rep& cl)
-    : slot_rep(cl.call_, &destroy, &dup), functor_(std::make_unique<adaptor_type>(*cl.functor_))
+  inline typed_slot_rep(const typed_slot_rep& src)
+    : slot_rep(src.call_, &destroy, &dup), functor_(std::make_unique<adaptor_type>(*src.functor_))
   {
     sigc::visit_each_trackable(slot_do_bind(this), *functor_);
   }
diff --git a/sigc++/signal.h b/sigc++/signal.h
@@ -105,15 +105,15 @@ struct slot_iterator_buf
     return tmp;
   }
 
-  bool operator==(const slot_iterator_buf& other) const
+  bool operator==(const slot_iterator_buf& src) const
   {
-    return (!c_ || (i_ == other.i_));
+    return (!c_ || (i_ == src.i_));
   } /* If '!c_' the iterators are empty.
      * Unfortunately, empty stl iterators are not equal.
      * We are forcing equality so that 'first==last'
      * in the accumulator's emit function yields true. */
 
-  bool operator!=(const slot_iterator_buf& other) const { return (c_ && (i_ != other.i_)); }
+  bool operator!=(const slot_iterator_buf& src) const { return (c_ && (i_ != src.i_)); }
 
 private:
   iterator_type i_;
@@ -181,9 +181,9 @@ struct slot_iterator_buf<T_emitter, void>
     return tmp;
   }
 
-  bool operator==(const slot_iterator_buf& other) const { return i_ == other.i_; }
+  bool operator==(const slot_iterator_buf& src) const { return i_ == src.i_; }
 
-  bool operator!=(const slot_iterator_buf& other) const { return i_ != other.i_; }
+  bool operator!=(const slot_iterator_buf& src) const { return i_ != src.i_; }
 
 private:
   iterator_type i_;

Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,9 @@ connection::connection(const connection& c) : slot_(c.slot_)`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`connection&`
`45`		`-connection::operator=(const connection& c)`
	`45`	`+connection::operator=(const connection& src)`
`46`	`46`	`{`
`47`		`- set_slot(c.slot_);`
	`47`	`+ set_slot(src.slot_);`
`48`	`48`	`return *this;`
`49`	`49`	`}`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,8 @@ struct typed_slot_rep : public slot_rep`
`63`	`63`	`sigc::visit_each_trackable(slot_do_bind(this), *functor_);`
`64`	`64`	`}`
`65`	`65`
`66`		`- inline typed_slot_rep(const typed_slot_rep& cl)`
`67`		`- : slot_rep(cl.call_, &destroy, &dup), functor_(std::make_unique<adaptor_type>(*cl.functor_))`
	`66`	`+ inline typed_slot_rep(const typed_slot_rep& src)`
	`67`	`+ : slot_rep(src.call_, &destroy, &dup), functor_(std::make_unique<adaptor_type>(*src.functor_))`
`68`	`68`	`{`
`69`	`69`	`sigc::visit_each_trackable(slot_do_bind(this), *functor_);`
`70`	`70`	`}`