From a555eeda23d8c6329b398fb6f4c09f985024f720 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 2 Sep 2014 18:43:16 -0700 Subject: [PATCH] CR feedback and warning fixes --- assignment-client/src/Agent.cpp | 9 +++------ interface/src/entities/EntityTreeRenderer.h | 2 +- libraries/entities/src/DeleteEntityOperator.cpp | 2 +- libraries/entities/src/EntityTypes.h | 3 ++- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp index 0594d997bd..ea49b90852 100644 --- a/assignment-client/src/Agent.cpp +++ b/assignment-client/src/Agent.cpp @@ -244,20 +244,17 @@ void Agent::run() { _scriptEngine.registerGlobalObject("VoxelViewer", &_voxelViewer); // connect the VoxelViewer and the VoxelScriptingInterface to each other - JurisdictionListener* voxelJL = _scriptEngine.getVoxelsScriptingInterface()->getJurisdictionListener(); - _voxelViewer.setJurisdictionListener(voxelJL); + _voxelViewer.setJurisdictionListener(_scriptEngine.getVoxelsScriptingInterface()->getJurisdictionListener()); _voxelViewer.init(); _scriptEngine.getVoxelsScriptingInterface()->setVoxelTree(_voxelViewer.getTree()); _scriptEngine.registerGlobalObject("ParticleViewer", &_particleViewer); - JurisdictionListener* particleJL = _scriptEngine.getParticlesScriptingInterface()->getJurisdictionListener(); - _particleViewer.setJurisdictionListener(particleJL); + _particleViewer.setJurisdictionListener(_scriptEngine.getParticlesScriptingInterface()->getJurisdictionListener()); _particleViewer.init(); _scriptEngine.getParticlesScriptingInterface()->setParticleTree(_particleViewer.getTree()); _scriptEngine.registerGlobalObject("EntityViewer", &_entityViewer); - JurisdictionListener* modelJL = _scriptEngine.getEntityScriptingInterface()->getJurisdictionListener(); - _entityViewer.setJurisdictionListener(modelJL); + _entityViewer.setJurisdictionListener(_scriptEngine.getEntityScriptingInterface()->getJurisdictionListener()); _entityViewer.init(); _scriptEngine.getEntityScriptingInterface()->setEntityTree(_entityViewer.getTree()); diff --git a/interface/src/entities/EntityTreeRenderer.h b/interface/src/entities/EntityTreeRenderer.h index 0c85ecdc18..f6a5c41a39 100644 --- a/interface/src/entities/EntityTreeRenderer.h +++ b/interface/src/entities/EntityTreeRenderer.h @@ -43,7 +43,7 @@ public: void update(); - EntityTree* getTree() { return (EntityTree*)_tree; } + EntityTree* getTree() { return static_cast(_tree); } void processEraseMessage(const QByteArray& dataByteArray, const SharedNodePointer& sourceNode); diff --git a/libraries/entities/src/DeleteEntityOperator.cpp b/libraries/entities/src/DeleteEntityOperator.cpp index 793baeb88c..bda16351ed 100644 --- a/libraries/entities/src/DeleteEntityOperator.cpp +++ b/libraries/entities/src/DeleteEntityOperator.cpp @@ -100,7 +100,7 @@ bool DeleteEntityOperator::PreRecursion(OctreeElement* element) { if (entityTreeElement == details.containingElement) { EntityItemID entityItemID = details.entity->getEntityItemID(); EntityItem* theEntity = entityTreeElement->getEntityWithEntityItemID(entityItemID); // find the actual entity - bool removed = entityTreeElement->removeEntityItem(theEntity); // remove it from the element + entityTreeElement->removeEntityItem(theEntity); // remove it from the element _tree->setContainingElement(entityItemID, NULL); // update or id to element lookup delete theEntity; // now actually delete the entity! _foundCount++; diff --git a/libraries/entities/src/EntityTypes.h b/libraries/entities/src/EntityTypes.h index 7e9828c441..541aeada4f 100644 --- a/libraries/entities/src/EntityTypes.h +++ b/libraries/entities/src/EntityTypes.h @@ -63,7 +63,8 @@ private: /// returns a newly constructed (heap allocated) instance of your type. e.g. The following prototype: // static EntityItem* factory(const EntityItemID& entityID, const EntityItemProperties& properties); #define REGISTER_ENTITY_TYPE_WITH_FACTORY(x,y) static bool x##Registration = \ - EntityTypes::registerEntityType(EntityTypes::x, #x, y); + EntityTypes::registerEntityType(EntityTypes::x, #x, y); \ + assert(x##Registration); #endif // hifi_EntityTypes_h