Integrating latest 47acbe8

Gems/GraphCanvas/Code/Source/Components/Slots/SlotComponent.cpp

@@ -114,12 +114,12 @@ namespace GraphCanvas
         SlotRequestBus::Handler::BusDisconnect();
     }
 
-    void SlotComponent::SetScene([[maybe_unused]] const AZ::EntityId& sceneId)
+    void SlotComponent::SetScene(const AZ::EntityId&)
     {
         AZ_Error("Graph Canvas", false, "The scene cannot be set directly on a slot; it follows that of the node to which it belongs (slot: %s)", GetEntityId().ToString().data());
     }
 
-    void SlotComponent::ClearScene([[maybe_unused]] const AZ::EntityId& oldSceneId)
+    void SlotComponent::ClearScene(const AZ::EntityId&)
     {
         AZ_Error("Graph Canvas", false, "The scene cannot be cleared directly on a slot; it follows that of the node to which it belongs (slot: %s)", GetEntityId().ToString().data());
     }
@@ -136,17 +136,6 @@ namespace GraphCanvas
         return sceneId;
     }
 
-    bool SlotComponent::LockForExternalMovement(const AZ::EntityId&)
-    {
-        AZ_Error("Graph Canvas", false, "The slot should not be controlled directly, as the node it belongs to already controls it's postioning (slot: %s)", GetEntityId().ToString().data());
-        return false;
-    }
-
-    void SlotComponent::UnlockForExternalMovement(const AZ::EntityId&)
-    {
-        AZ_Error("Graph Canvas", false, "The slot should not be controlled directly, as the node it belongs to already controls it's postioning (slot: %s)", GetEntityId().ToString().data());
-    }
-
     void SlotComponent::OnSceneSet(const AZ::EntityId& sceneId)
     {
         SceneMemberNotificationBus::Event(GetEntityId(), &SceneMemberNotifications::OnSceneSet, sceneId);
@@ -258,7 +247,7 @@ namespace GraphCanvas
         SlotNotificationBus::Event(GetEntityId(), &SlotNotifications::OnTooltipChanged, m_slotConfiguration.m_tooltip);
     }
 
-    void SlotComponent::DisplayProposedConnection(const AZ::EntityId& connectionId, [[maybe_unused]] const Endpoint& endpoint)
+    void SlotComponent::DisplayProposedConnection(const AZ::EntityId& connectionId, const Endpoint& /*endpoint*/)
     {
         bool needsStyleUpdate = m_connections.empty();
         m_connections.emplace_back(connectionId);
@@ -269,7 +258,7 @@ namespace GraphCanvas
         }
     }
 
-    void SlotComponent::RemoveProposedConnection(const AZ::EntityId& connectionId, [[maybe_unused]] const Endpoint& endpoint)
+    void SlotComponent::RemoveProposedConnection(const AZ::EntityId& connectionId, const Endpoint& /*endpoint*/)
     {
         auto it = AZStd::find(m_connections.begin(), m_connections.end(), connectionId);
 
@@ -481,6 +470,11 @@ namespace GraphCanvas
         SceneRequestBus::Event(GetScene(), &SceneRequests::Delete, deleteIds);
     }
 
+    const SlotConfiguration& SlotComponent::GetSlotConfiguration() const
+    {
+        return m_slotConfiguration;
+    }
+
     SlotConfiguration* SlotComponent::CloneSlotConfiguration() const
     {
         SlotConfiguration* slotConfiguration = aznew SlotConfiguration();