[libsigcplusplus] slot_rep: Rename notify() for clarity.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsigcplusplus] slot_rep: Rename notify() for clarity.
- Date: Thu, 21 Apr 2016 18:07:22 +0000 (UTC)
commit 831dfc8cdf2cfb082f5cc1bc5393001bfa8a5155
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Apr 21 20:05:24 2016 +0200
slot_rep: Rename notify() for clarity.
sigc++/functors/slot.h | 2 +-
sigc++/functors/slot_base.cc | 2 +-
sigc++/functors/slot_base.h | 5 +++--
3 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/sigc++/functors/slot.h b/sigc++/functors/slot.h
index 2e8323e..19168d9 100644
--- a/sigc++/functors/slot.h
+++ b/sigc++/functors/slot.h
@@ -267,7 +267,7 @@ struct visitor<slot<T_return, T_arg...>>
const slot<T_return, T_arg...>& target)
{
if (target.rep_ && target.rep_->parent_ == nullptr)
- target.rep_->set_parent(action.action_.rep_, &internal::slot_rep::notify);
+ target.rep_->set_parent(action.action_.rep_, &internal::slot_rep::notify_slot_rep_invalidated);
}
static void do_visit_each(
diff --git a/sigc++/functors/slot_base.cc b/sigc++/functors/slot_base.cc
index c6098a7..e0a00e4 100644
--- a/sigc++/functors/slot_base.cc
+++ b/sigc++/functors/slot_base.cc
@@ -77,7 +77,7 @@ slot_rep::disconnect()
// static
void
-slot_rep::notify(notifiable* data)
+slot_rep::notify_slot_rep_invalidated(notifiable* data)
{
auto self_ = static_cast<slot_rep*>(data);
diff --git a/sigc++/functors/slot_base.h b/sigc++/functors/slot_base.h
index c970352..57c44d9 100644
--- a/sigc++/functors/slot_base.h
+++ b/sigc++/functors/slot_base.h
@@ -131,8 +131,9 @@ public:
* referred object dying.
* @param data The slot_rep object that is becoming invalid (@p this).
*/
- static void notify(notifiable* data);
+ static void notify_slot_rep_invalidated(notifiable* data);
+public:
/// Callback that invokes the contained functor.
/* This can't be a virtual function since number of arguments
* must be flexible. We use function pointers to slot_call::call_it()
@@ -179,7 +180,7 @@ struct SIGC_API slot_do_bind
*/
inline void operator()(const trackable& t) const
{
- t.add_destroy_notify_callback(rep_, &slot_rep::notify);
+ t.add_destroy_notify_callback(rep_, &slot_rep::notify_slot_rep_invalidated);
}
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]