[libsigcplusplus] connection: Rename notify() for clarity.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsigcplusplus] connection: Rename notify() for clarity.
- Date: Thu, 21 Apr 2016 18:06:47 +0000 (UTC)
commit a422dce07b1c6906f7006b22e00fa418a89e4877
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Apr 21 17:46:02 2016 +0200
connection: Rename notify() for clarity.
sigc++/connection.cc | 8 ++++----
sigc++/connection.h | 2 +-
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, ¬ify);
+ slot_->add_destroy_notify_callback(this, ¬ify_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, ¬ify);
+ slot_->add_destroy_notify_callback(this, ¬ify_slot_invalidated);
}
connection&
@@ -105,11 +105,11 @@ connection::set_slot(slot_base* sl)
slot_ = sl;
if (slot_)
- slot_->add_destroy_notify_callback(this, ¬ify);
+ slot_->add_destroy_notify_callback(this, ¬ify_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.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]