History

Fix smart pointer casts

Atlante45 committed 11 years ago

Commit ee134071 parent 35644998 files · +26 −26Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 8 files). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+3−3
@@ -411,7 +411,7 @@ bool EntityScriptingInterface::setVoxels(QUuid entityID, · 410 unmodified lines
411411 return false;
412412 }
413413
414− EntityItemPointer entity = static_cast<EntityItemPointer>(_entityTree->findEntityByEntityItemID(entityID));
414+ EntityItemPointer entity = _entityTree->findEntityByEntityItemID(entityID);
415415 if (!entity) {
416416 qCDebug(entities) << "EntityScriptingInterface::setVoxelSphere no entity with ID" << entityID;
417417 return false;
@@ -424,7 +424,7 @@ bool EntityScriptingInterface::setVoxels(QUuid entityID, · 6 unmodified lines
424424
425425 auto now = usecTimestampNow();
426426
427− PolyVoxEntityItem* polyVoxEntity = static_cast<PolyVoxEntityItem*>(entity.get());
427+ auto polyVoxEntity = std::dynamic_pointer_cast<PolyVoxEntityItem>(entity);
428428 _entityTree->lockForWrite();
429429 actor(*polyVoxEntity);
430430 entity->setLastEdited(now);
@@ -460,7 +460,7 @@ bool EntityScriptingInterface::setPoints(QUuid entityID, std::function<bool(Line · 29 unmodified lines
460460
461461 auto now = usecTimestampNow();
462462
463− LineEntityItem* lineEntity = static_cast<LineEntityItem*>(entity.get());
463+ auto lineEntity = std::static_pointer_cast<LineEntityItem>(entity);
464464 _entityTree->lockForWrite();
465465 bool success = actor(*lineEntity);
466466 entity->setLastEdited(now);