summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2016-04-27 13:43:54 +0200
committerMurray Cumming <murrayc@murrayc.com>2016-04-27 13:43:58 +0200
commit17176689106bb14b75ac741c8e86e10792839b09 (patch)
tree5aa38363ef28b5221e88482788286804c6987bc3
parentff08099a41a9c8019aa0004c76073e0d91fce5c3 (diff)
downloadsigc++-17176689106bb14b75ac741c8e86e10792839b09.tar.gz
copy operations: Name all parameters src.
To make it more obvious that these are copy operations.
-rw-r--r--sigc++/connection.cc4
-rw-r--r--sigc++/connection.h2
-rw-r--r--sigc++/functors/slot.h4
-rw-r--r--sigc++/signal.h10
4 files changed, 10 insertions, 10 deletions
diff --git a/sigc++/connection.cc b/sigc++/connection.cc
index 7f1ba8b..10549b3 100644
--- 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
index e8ec869..4624636 100644
--- 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
index a40f9bc..8807660 100644
--- a/sigc++/functors/slot.h
+++ b/sigc++/functors/slot.h
@@ -63,8 +63,8 @@ public:
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
index 8c80659..a7327c7 100644
--- 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_;