From 6a68281308bb7cba0bceeea5c30664b1e44c757e Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 20 Nov 2014 09:39:41 -0800
Subject: [PATCH] Remove EntityScriptingInterface::getEntityItemID

---
 examples/libraries/entityList.js                   | 11 +++++------
 .../entities/src/EntityScriptingInterface.cpp      | 14 --------------
 libraries/entities/src/EntityScriptingInterface.h  |  3 ---
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/examples/libraries/entityList.js b/examples/libraries/entityList.js
index 65c06c8cea..eb01295d97 100644
--- a/examples/libraries/entityList.js
+++ b/examples/libraries/entityList.js
@@ -33,12 +33,11 @@ EntityListTool = function(opts) {
             var ids = data.entityIds;
             var entityIDs = [];
             for (var i = 0; i < ids.length; i++) {
-                var entityID = Entities.getEntityItemID(ids[i]);
-                if (entityID.isKnownID) {
-                    entityIDs.push(entityID);
-                } else {
-                    print("Tried to select invalid entity: " + ids[i]);
-                }
+                entityIDs.push({
+                    id: ids[i],
+                    isKnownID: true,
+                    creatorTokenID: 0,
+                });
             }
             selectionManager.setSelections(entityIDs);
             if (data.focus) {
diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index e66da97390..29c4a8b19a 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -44,20 +44,6 @@ EntityItemID EntityScriptingInterface::addEntity(const EntityItemProperties& pro
     return id;
 }
 
-EntityItemID EntityScriptingInterface::getEntityItemID(const QString& uuid) {
-    EntityItemID entityID = EntityItemID(QUuid(uuid), UNKNOWN_ENTITY_TOKEN, false);
-
-    _entityTree->lockForRead();
-    EntityItem* entity = const_cast<EntityItem*>(_entityTree->findEntityByEntityItemID(entityID));
-    _entityTree->unlock();
-
-    if (entity) {
-        return entity->getEntityItemID();
-    }
-
-    return entityID;
-}
-
 EntityItemID EntityScriptingInterface::identifyEntity(EntityItemID entityID) {
     EntityItemID actualID = entityID;
 
diff --git a/libraries/entities/src/EntityScriptingInterface.h b/libraries/entities/src/EntityScriptingInterface.h
index 7269579ab0..2150fa51da 100644
--- a/libraries/entities/src/EntityScriptingInterface.h
+++ b/libraries/entities/src/EntityScriptingInterface.h
@@ -64,9 +64,6 @@ public slots:
     /// adds a model with the specific properties
     Q_INVOKABLE EntityItemID addEntity(const EntityItemProperties& properties);
 
-    // Get EntityItemID from uuid string
-    Q_INVOKABLE EntityItemID getEntityItemID(const QString& entityID);
-
     /// identify a recently created model to determine its true ID
     Q_INVOKABLE EntityItemID identifyEntity(EntityItemID entityID);