more 'const uint64_t&' purges

assignment-client/src/avatars/AvatarMixerClientData.cpp

@@ -33,7 +33,7 @@ uint64_t AvatarMixerClientData::getLastOtherAvatarEncodeTime(QUuid otherAvatar)
     return 0;
 }
 
-void AvatarMixerClientData::setLastOtherAvatarEncodeTime(const QUuid& otherAvatar, const uint64_t& time) {
+void AvatarMixerClientData::setLastOtherAvatarEncodeTime(const QUuid& otherAvatar, uint64_t time) {
     std::unordered_map<QUuid, uint64_t>::iterator itr = _lastOtherAvatarEncodeTime.find(otherAvatar);
     if (itr != _lastOtherAvatarEncodeTime.end()) {
         itr->second = time;

assignment-client/src/avatars/AvatarMixerClientData.h

@@ -113,7 +113,7 @@ public:
     ViewFrustum getViewFrustum() const { return _currentViewFrustum; }
 
     uint64_t getLastOtherAvatarEncodeTime(QUuid otherAvatar) const;
-    void setLastOtherAvatarEncodeTime(const QUuid& otherAvatar, const uint64_t& time);
+    void setLastOtherAvatarEncodeTime(const QUuid& otherAvatar, uint64_t time);
 
     QVector<JointData>& getLastOtherAvatarSentJoints(QUuid otherAvatar) {
         auto& lastOtherAvatarSentJoints = _lastOtherAvatarSentJoints[otherAvatar];

libraries/entities/src/EntitySimulation.cpp

@@ -70,7 +70,7 @@ void EntitySimulation::prepareEntityForDelete(EntityItemPointer entity) {
 }
 
 // protected
-void EntitySimulation::expireMortalEntities(const uint64_t& now) {
+void EntitySimulation::expireMortalEntities(uint64_t now) {
     if (now > _nextExpiry) {
         PROFILE_RANGE_EX(simulation_physics, "ExpireMortals", 0xffff00ff, (uint64_t)_mortalEntities.size());
         // only search for expired entities if we expect to find one
@@ -99,7 +99,7 @@ void EntitySimulation::expireMortalEntities(const uint64_t& now) {
 }
 
 // protected
-void EntitySimulation::callUpdateOnEntitiesThatNeedIt(const uint64_t& now) {
+void EntitySimulation::callUpdateOnEntitiesThatNeedIt(uint64_t now) {
     PerformanceTimer perfTimer("updatingEntities");
     QMutexLocker lock(&_mutex);
     SetOfEntities::iterator itemItr = _entitiesToUpdate.begin();
@@ -231,7 +231,7 @@ void EntitySimulation::clearEntities() {
     _deadEntities.clear();
 }
 
-void EntitySimulation::moveSimpleKinematics(const uint64_t& now) {
+void EntitySimulation::moveSimpleKinematics(uint64_t now) {
     PROFILE_RANGE_EX(simulation_physics, "MoveSimples", 0xffff00ff, (uint64_t)_simpleKinematicEntities.size());
     SetOfEntities::iterator itemItr = _simpleKinematicEntities.begin();
     while (itemItr != _simpleKinematicEntities.end()) {

libraries/entities/src/EntitySimulation.h

@@ -71,7 +71,7 @@ public:
 
     void clearEntities();
 
-    void moveSimpleKinematics(const uint64_t& now);
+    void moveSimpleKinematics(uint64_t now);
 
     EntityTreePointer getEntityTree() { return _entityTree; }
 
@@ -83,14 +83,14 @@ public:
 protected:
     // These pure virtual methods are protected because they are not to be called will-nilly. The base class
     // calls them in the right places.
-    virtual void updateEntitiesInternal(const uint64_t& now) = 0;
+    virtual void updateEntitiesInternal(uint64_t now) = 0;
     virtual void addEntityInternal(EntityItemPointer entity) = 0;
     virtual void removeEntityInternal(EntityItemPointer entity);
     virtual void changeEntityInternal(EntityItemPointer entity) = 0;
     virtual void clearEntitiesInternal() = 0;
 
-    void expireMortalEntities(const uint64_t& now);
+    void expireMortalEntities(uint64_t now);
-    void callUpdateOnEntitiesThatNeedIt(const uint64_t& now);
+    void callUpdateOnEntitiesThatNeedIt(uint64_t now);
     virtual void sortEntitiesThatMoved();
 
     QMutex _mutex{ QMutex::Recursive };

libraries/entities/src/SimpleEntitySimulation.cpp

@@ -50,7 +50,7 @@ void SimpleEntitySimulation::clearOwnership(const QUuid& ownerID) {
     }
 }
 
-void SimpleEntitySimulation::updateEntitiesInternal(const uint64_t& now) {
+void SimpleEntitySimulation::updateEntitiesInternal(uint64_t now) {
     if (now > _nextOwnerlessExpiry) {
         // search for ownerless objects that have expired
         QMutexLocker lock(&_mutex);

libraries/entities/src/SimpleEntitySimulation.h

@@ -28,7 +28,7 @@ public:
     void clearOwnership(const QUuid& ownerID);
 
 protected:
-    virtual void updateEntitiesInternal(const uint64_t& now) override;
+    virtual void updateEntitiesInternal(uint64_t now) override;
     virtual void addEntityInternal(EntityItemPointer entity) override;
     virtual void removeEntityInternal(EntityItemPointer entity) override;
     virtual void changeEntityInternal(EntityItemPointer entity) override;

libraries/entities/src/SimulationOwner.cpp

@@ -101,22 +101,22 @@ bool SimulationOwner::set(const SimulationOwner& owner) {
     return setID(owner._id) || oldPriority != _priority;
 }
 
-void SimulationOwner::setPendingPriority(uint8_t priority, const quint64& timestamp) {
+void SimulationOwner::setPendingPriority(uint8_t priority, uint64_t timestamp) {
     _pendingBidPriority = priority;
     _pendingBidTimestamp = timestamp;
     _pendingState = (_pendingBidPriority == 0) ? PENDING_STATE_RELEASE : PENDING_STATE_TAKE;
 }
 
 void SimulationOwner::updateExpiry() {
-    const quint64 OWNERSHIP_LOCKOUT_EXPIRY = 200 * USECS_PER_MSEC;
+    const uint64_t OWNERSHIP_LOCKOUT_EXPIRY = 200 * USECS_PER_MSEC;
     _expiry = usecTimestampNow() + OWNERSHIP_LOCKOUT_EXPIRY;
 }
 
-bool SimulationOwner::pendingRelease(const quint64& timestamp) {
+bool SimulationOwner::pendingRelease(uint64_t timestamp) {
     return _pendingBidPriority == 0 && _pendingState == PENDING_STATE_RELEASE && _pendingBidTimestamp >= timestamp;
 }
 
-bool SimulationOwner::pendingTake(const quint64& timestamp) {
+bool SimulationOwner::pendingTake(uint64_t timestamp) {
     return _pendingBidPriority > 0 && _pendingState == PENDING_STATE_TAKE && _pendingBidTimestamp >= timestamp;
 }
 

libraries/entities/src/SimulationOwner.h

@@ -110,7 +110,7 @@ public:
     SimulationOwner(const QUuid& id, uint8_t priority);
 
     const QUuid& getID() const { return _id; }
-    const quint64& getExpiry() const { return _expiry; }
+    const uint64_t& getExpiry() const { return _expiry; }
     uint8_t getPriority() const { return _priority; }
 
     QByteArray toByteArray() const;
@@ -125,7 +125,7 @@ public:
     bool setID(const QUuid& id);
     bool set(const QUuid& id, uint8_t priority);
     bool set(const SimulationOwner& owner);
-    void setPendingPriority(uint8_t priority, const quint64& timestamp);
+    void setPendingPriority(uint8_t priority, uint64_t timestamp);
 
     bool isNull() const { return _id.isNull(); }
     bool matchesValidID(const QUuid& id) const { return _id == id && !_id.isNull(); }
@@ -135,8 +135,8 @@ public:
     bool hasExpired() const { return usecTimestampNow() > _expiry; }
 
     uint8_t getPendingPriority() const { return _pendingBidPriority; }
-    bool pendingRelease(const quint64& timestamp); // return true if valid pending RELEASE
+    bool pendingRelease(uint64_t timestamp); // return true if valid pending RELEASE
-    bool pendingTake(const quint64& timestamp); // return true if valid pending TAKE
+    bool pendingTake(uint64_t timestamp); // return true if valid pending TAKE
     void clearCurrentOwner();
 
     bool operator>=(uint8_t priority) const { return _priority >= priority; }
@@ -152,8 +152,8 @@ public:
 
 private:
     QUuid _id; // owner
-    quint64 _expiry; // time when ownership can transition at equal priority
+    uint64_t _expiry; // time when ownership can transition at equal priority
-    quint64 _pendingBidTimestamp; // time when pending bid was set
+    uint64_t _pendingBidTimestamp; // time when pending bid was set
     uint8_t _priority; // priority of current owner
     uint8_t _pendingBidPriority; // priority at which we'd like to own it
     uint8_t _pendingState; // NOTHING, TAKE, or RELEASE

libraries/physics/src/PhysicalEntitySimulation.cpp

@@ -40,7 +40,7 @@ void PhysicalEntitySimulation::init(
 }
 
 // begin EntitySimulation overrides
-void PhysicalEntitySimulation::updateEntitiesInternal(const uint64_t& now) {
+void PhysicalEntitySimulation::updateEntitiesInternal(uint64_t now) {
     // Do nothing here because the "internal" update the PhysicsEngine::stepSimualtion() which is done elsewhere.
 }
 

libraries/physics/src/PhysicalEntitySimulation.h

@@ -56,7 +56,7 @@ signals:
 
 protected: // only called by EntitySimulation
     // overrides for EntitySimulation
-    virtual void updateEntitiesInternal(const uint64_t& now) override;
+    virtual void updateEntitiesInternal(uint64_t now) override;
     virtual void addEntityInternal(EntityItemPointer entity) override;
     virtual void removeEntityInternal(EntityItemPointer entity) override;
     virtual void changeEntityInternal(EntityItemPointer entity) override;