summaryrefslogtreecommitdiff
path: root/sigc++
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2016-04-21 17:46:02 +0200
committerMurray Cumming <murrayc@murrayc.com>2016-04-21 17:50:00 +0200
commita422dce07b1c6906f7006b22e00fa418a89e4877 (patch)
tree0954d5daec327982b65170ecb90182f6f304e4cc /sigc++
parent672f831e08c501253566368c5d33185f1e822181 (diff)
downloadsigc++-a422dce07b1c6906f7006b22e00fa418a89e4877.tar.gz
connection: Rename notify() for clarity.
Diffstat (limited to 'sigc++')
-rw-r--r--sigc++/connection.cc8
-rw-r--r--sigc++/connection.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/sigc++/connection.cc b/sigc++/connection.cc
index bbcfcb7..61ba3e4 100644
--- a/sigc++/connection.cc
+++ b/sigc++/connection.cc
@@ -30,7 +30,7 @@ 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);
}
@@ -38,7 +38,7 @@ 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
index a753b21..5a3c3be 100644
--- a/sigc++/connection.h
+++ b/sigc++/connection.h
@@ -101,7 +101,7 @@ private:
/** 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.