slot_rep: Rename dup() to clone()

Kjell Ahlstedt · Kjell Ahlstedt · commit 1e258cf7165d · 2017-02-13T19:06:18.000+01:00
because clone() is the usual name of such a function. Bug 777618
diff --git a/sigc++/functors/slot.h b/sigc++/functors/slot.h
@@ -102,7 +102,7 @@ struct typed_slot_rep : public slot_rep
    * slot_rep object is registered in the referred trackables.
    * @return A deep copy of the slot_rep object.
    */
-  slot_rep* dup() const override { return new typed_slot_rep(*this); }
+  slot_rep* clone() const override { return new typed_slot_rep(*this); }
 };
 
 /** Abstracts functor execution.
diff --git a/sigc++/functors/slot_base.cc b/sigc++/functors/slot_base.cc
@@ -94,10 +94,10 @@ slot_base::slot_base(const slot_base& src) : rep_(nullptr), blocked_(src.blocked
   {
     // Check call_ so we can ignore invalidated slots.
     // Otherwise, destroyed bound reference parameters (whose destruction caused the slot's
-    // invalidation) may be used during dup().
-    // Note: I'd prefer to check somewhere during dup(). murrayc.
+    // invalidation) may be used during clone().
+    // Note: I'd prefer to check somewhere during clone(). murrayc.
     if (src.rep_->call_)
-      rep_ = src.rep_->dup();
+      rep_ = src.rep_->clone();
     else
     {
       *this = slot_base(); // Return the default invalid slot.
@@ -116,9 +116,9 @@ slot_base::slot_base(slot_base&& src) : rep_(nullptr), blocked_(src.blocked_)
 
       // Check call_ so we can ignore invalidated slots.
       // Otherwise, destroyed bound reference parameters (whose destruction
-      // caused the slot's invalidation) may be used during dup().
+      // caused the slot's invalidation) may be used during clone().
       if (src.rep_->call_)
-        rep_ = src.rep_->dup();
+        rep_ = src.rep_->clone();
       else
         blocked_ = false; // Return the default invalid slot.
     }
@@ -184,7 +184,7 @@ slot_base::operator=(const slot_base& src)
     return *this;
   }
 
-  auto new_rep_ = src.rep_->dup();
+  auto new_rep_ = src.rep_->clone();
 
   if (rep_) // Silently exchange the slot_rep.
   {
@@ -219,7 +219,7 @@ slot_base::operator=(slot_base&& src)
   {
     // src is connected to a parent, e.g. a sigc::signal.
     // Copy, don't move! See https://bugzilla.gnome.org/show_bug.cgi?id=756484
-    new_rep_ = src.rep_->dup();
+    new_rep_ = src.rep_->clone();
   }
   else
   {
diff --git a/sigc++/functors/slot_base.h b/sigc++/functors/slot_base.h
@@ -40,7 +40,7 @@ using hook = void* (*)(void*);
  *
  * The base class slot_rep serves the purpose to
  * - form a common pointer type (slot_rep*),
- * - offer the possibility to create duplicates (dup()),
+ * - offer the possibility to create duplicates (clone()),
  * - offer a notification callback (notify()),
  * - implement some of slot_base's interface that depends
  *   on the notification callback, i.e.
@@ -88,7 +88,7 @@ struct SIGC_API slot_rep : public trackable
   /** Makes a deep copy of the slot_rep object.
    * @return A deep copy of the slot_rep object.
    */
-  virtual slot_rep* dup() const = 0;
+  virtual slot_rep* clone() const = 0;
 
   /** Set the parent with a callback.
    * slots have one parent exclusively.

Original file line number	Diff line number	Diff line change
`@@ -94,10 +94,10 @@ slot_base::slot_base(const slot_base& src) : rep_(nullptr), blocked_(src.blocked`
`94`	`94`	`{`
`95`	`95`	`// Check call_ so we can ignore invalidated slots.`
`96`	`96`	`// Otherwise, destroyed bound reference parameters (whose destruction caused the slot's`
`97`		`- // invalidation) may be used during dup().`
`98`		`- // Note: I'd prefer to check somewhere during dup(). murrayc.`
	`97`	`+ // invalidation) may be used during clone().`
	`98`	`+ // Note: I'd prefer to check somewhere during clone(). murrayc.`
`99`	`99`	`if (src.rep_->call_)`
`100`		`- rep_ = src.rep_->dup();`
	`100`	`+ rep_ = src.rep_->clone();`
`101`	`101`	`else`
`102`	`102`	`{`
`103`	`103`	`*this = slot_base(); // Return the default invalid slot.`
`@@ -116,9 +116,9 @@ slot_base::slot_base(slot_base&& src) : rep_(nullptr), blocked_(src.blocked_)`
`116`	`116`
`117`	`117`	`// Check call_ so we can ignore invalidated slots.`
`118`	`118`	`// Otherwise, destroyed bound reference parameters (whose destruction`
`119`		`- // caused the slot's invalidation) may be used during dup().`
	`119`	`+ // caused the slot's invalidation) may be used during clone().`
`120`	`120`	`if (src.rep_->call_)`
`121`		`- rep_ = src.rep_->dup();`
	`121`	`+ rep_ = src.rep_->clone();`
`122`	`122`	`else`
`123`	`123`	`blocked_ = false; // Return the default invalid slot.`
`124`	`124`	`}`
`@@ -184,7 +184,7 @@ slot_base::operator=(const slot_base& src)`
`184`	`184`	`return *this;`
`185`	`185`	`}`
`186`	`186`
`187`		`- auto new_rep_ = src.rep_->dup();`
	`187`	`+ auto new_rep_ = src.rep_->clone();`
`188`	`188`
`189`	`189`	`if (rep_) // Silently exchange the slot_rep.`
`190`	`190`	`{`
`@@ -219,7 +219,7 @@ slot_base::operator=(slot_base&& src)`
`219`	`219`	`{`
`220`	`220`	`// src is connected to a parent, e.g. a sigc::signal.`
`221`	`221`	`// Copy, don't move! See https://bugzilla.gnome.org/show_bug.cgi?id=756484`
`222`		`- new_rep_ = src.rep_->dup();`
	`222`	`+ new_rep_ = src.rep_->clone();`
`223`	`223`	`}`
`224`	`224`	`else`
`225`	`225`	`{`