From 876cb6022074601a94f9a3c65e1b0c5cb45a91cb Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Tue, 21 Jan 2020 15:12:05 +0100
Subject: [PATCH] char/chan: clean up MovingPartScalar/CharacterSlider
 constructors

These changes are a follow-up to 8b6f82256e31e7840c60775c8f2f9e1084aae972 but could not be made on that branch due to ABI compatibility reasons.
---
 panda/src/chan/movingPartScalar.I  |  2 +-
 panda/src/chan/movingPartScalar.h  |  2 +-
 panda/src/char/characterSlider.cxx | 11 ++---------
 panda/src/char/characterSlider.h   |  4 ++--
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/panda/src/chan/movingPartScalar.I b/panda/src/chan/movingPartScalar.I
index 1b585746e4..e67dad0562 100644
--- a/panda/src/chan/movingPartScalar.I
+++ b/panda/src/chan/movingPartScalar.I
@@ -25,7 +25,7 @@ MovingPartScalar(const MovingPartScalar &copy) :
  */
 INLINE MovingPartScalar::
 MovingPartScalar(PartGroup *parent, const std::string &name,
-                 const PN_stdfloat &default_value)
+                 PN_stdfloat default_value)
   : MovingPart<ACScalarSwitchType>(parent, name, default_value) {
 }
 
diff --git a/panda/src/chan/movingPartScalar.h b/panda/src/chan/movingPartScalar.h
index d05e58f4e7..ee55f2e7b8 100644
--- a/panda/src/chan/movingPartScalar.h
+++ b/panda/src/chan/movingPartScalar.h
@@ -31,7 +31,7 @@ protected:
 
 public:
   INLINE MovingPartScalar(PartGroup *parent, const std::string &name,
-                          const PN_stdfloat &default_value = 0);
+                          PN_stdfloat default_value = 0);
   virtual ~MovingPartScalar();
 
   virtual void get_blend_value(const PartBundle *root);
diff --git a/panda/src/char/characterSlider.cxx b/panda/src/char/characterSlider.cxx
index 8885c3acfd..26d0f35053 100644
--- a/panda/src/char/characterSlider.cxx
+++ b/panda/src/char/characterSlider.cxx
@@ -40,15 +40,8 @@ CharacterSlider(const CharacterSlider &copy) :
  *
  */
 CharacterSlider::
-CharacterSlider(PartGroup *parent, const std::string &name)
-  : MovingPartScalar(parent, name) {
-}
-
-/**
- *
- */
-CharacterSlider::
-CharacterSlider(PartGroup *parent, const std::string &name, const PN_stdfloat &default_value)
+CharacterSlider(PartGroup *parent, const std::string &name,
+                PN_stdfloat default_value)
   : MovingPartScalar(parent, name, default_value) {
 }
 
diff --git a/panda/src/char/characterSlider.h b/panda/src/char/characterSlider.h
index 54cc7cfd1d..6a5da971b8 100644
--- a/panda/src/char/characterSlider.h
+++ b/panda/src/char/characterSlider.h
@@ -31,8 +31,8 @@ protected:
   CharacterSlider(const CharacterSlider &copy);
 
 PUBLISHED:
-  explicit CharacterSlider(PartGroup *parent, const std::string &name);
-  explicit CharacterSlider(PartGroup *parent, const std::string &name, const PN_stdfloat &default_value);
+  explicit CharacterSlider(PartGroup *parent, const std::string &name,
+                           PN_stdfloat default_value = 0);
   virtual ~CharacterSlider();
 
 public: