From a5c7269096f1b57c02865251b2cb0fc6737f85e4 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 9 Nov 2015 11:28:02 -0800
Subject: [PATCH] Use make_shared

---
 interface/src/InterfaceActionFactory.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/interface/src/InterfaceActionFactory.cpp b/interface/src/InterfaceActionFactory.cpp
index 67b3b4a649..8ace11c0a0 100644
--- a/interface/src/InterfaceActionFactory.cpp
+++ b/interface/src/InterfaceActionFactory.cpp
@@ -21,17 +21,17 @@
 EntityActionPointer interfaceActionFactory(EntityActionType type, const QUuid& id, EntityItemPointer ownerEntity) {
     switch (type) {
         case ACTION_TYPE_NONE:
-            return nullptr;
+            return EntityActionPointer();
         case ACTION_TYPE_OFFSET:
-            return (EntityActionPointer) new ObjectActionOffset(id, ownerEntity);
+            return std::make_shared<ObjectActionOffset>(id, ownerEntity);
         case ACTION_TYPE_SPRING:
-            return (EntityActionPointer) new ObjectActionSpring(id, ownerEntity);
+            return std::make_shared<ObjectActionSpring>(id, ownerEntity);
         case ACTION_TYPE_HOLD:
-            return (EntityActionPointer) new AvatarActionHold(id, ownerEntity);
+            return std::make_shared<AvatarActionHold>(id, ownerEntity);
     }
 
-    assert(false);
-    return nullptr;
+    Q_ASSERT_X(false, Q_FUNC_INFO, "Unknown entity action type");
+    return EntityActionPointer();
 }