From b8ce07744da6d0c2c8a963644172529038cd0024 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Thu, 17 May 2018 14:50:14 -0700
Subject: [PATCH] initialize prop defaults, no bool returns

---
 libraries/entities/src/EntityItem.cpp |  8 ++------
 libraries/entities/src/EntityItem.h   | 14 +++++++-------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index e6aa572330..667ca9296d 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -3095,25 +3095,21 @@ void EntityItem::setCloneOriginID(const QUuid& value) {
     });
 }
 
-bool EntityItem::addCloneID(const QUuid& cloneID) {
+void EntityItem::addCloneID(const QUuid& cloneID) {
     withWriteLock([&] {
         if (!_cloneIDs.contains(cloneID)) {
             _cloneIDs.append(cloneID);
-            return true;
         }
     });
-    return false;
 }
 
-bool EntityItem::removeCloneID(const QUuid& cloneID) {
+void EntityItem::removeCloneID(const QUuid& cloneID) {
     withWriteLock([&] {
         int index = _cloneIDs.indexOf(cloneID);
         if (index >= 0) {
             _cloneIDs.removeAt(index);
-            return true;
         }
     });
-    return false;
 }
 
 const QList<QUuid> EntityItem::getCloneIDs() const {
diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h
index cc8cefb17b..9b1230c843 100644
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@@ -507,8 +507,8 @@ public:
     void setSimulationOwnershipExpiry(uint64_t expiry) { _simulationOwnershipExpiry = expiry; }
     uint64_t getSimulationOwnershipExpiry() const { return _simulationOwnershipExpiry; }
 
-    bool addCloneID(const QUuid& cloneID);
-    bool removeCloneID(const QUuid& cloneID);
+    void addCloneID(const QUuid& cloneID);
+    void removeCloneID(const QUuid& cloneID);
     const QList<QUuid> getCloneIDs() const;
     void setCloneIDs(const QList<QUuid>& cloneIDs);
 
@@ -666,11 +666,11 @@ protected:
 
     bool _cauterized { false }; // if true, don't draw because it would obscure 1st-person camera
 
-    bool _cloneable;
-    float _cloneLifetime;
-    float _cloneLimit;
-    bool _cloneDynamic;
-    bool _cloneAvatarEntity;
+    bool _cloneable { ENTITY_ITEM_CLONEABLE };
+    float _cloneLifetime { ENTITY_ITEM_CLONE_LIFETIME };
+    float _cloneLimit { ENTITY_ITEM_CLONE_LIMIT };
+    bool _cloneDynamic { ENTITY_ITEM_CLONE_DYNAMIC };
+    bool _cloneAvatarEntity { ENTITY_ITEM_CLONE_AVATAR_ENTITY };
     QUuid _cloneOriginID;
     QList<QUuid> _cloneIDs;