diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.cpp index 6be8c94848..b6bd26fa6c 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.cpp @@ -85,12 +85,12 @@ namespace ScriptCanvasEditor GraphCanvas::TranslationKey key; - AZStd::string updatedMethodName = methodName; + AZStd::string updatedMethodName; if (propertyStatus != ScriptCanvas::PropertyStatus::None) { updatedMethodName = (propertyStatus == ScriptCanvas::PropertyStatus::Getter) ? "Get" : "Set"; - updatedMethodName.append(methodName); } + updatedMethodName.append(methodName); key << "BehaviorClass" << className << "methods" << updatedMethodName << "details"; diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/MethodConfiguration.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/MethodConfiguration.cpp index 3ae7660c79..67f947004b 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/MethodConfiguration.cpp +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/MethodConfiguration.cpp @@ -56,7 +56,7 @@ namespace ScriptCanvas { const Data::Type outputType = (unpackedTypes.size() == 1 && AZ::BehaviorContextHelper::IsStringParameter(*result)) ? Data::Type::String() : Data::FromAZType(unpackedTypes[resultIndex]); - AZStd::string resultSlotName(Data::GetName(outputType).data()); + AZStd::string resultSlotName(Data::GetName(outputType)); AZStd::string className = outputConfig.config.m_className ? *outputConfig.config.m_className : ""; if (className.empty()) @@ -80,7 +80,6 @@ namespace ScriptCanvas if (outputConfig.isReturnValueOverloaded) { DynamicDataSlotConfiguration slotConfiguration; - //slotConfiguration.m_name = outputConfig.outputNamePrefix + resultSlotName; slotConfiguration.m_dynamicDataType = outputConfig.methodNode->GetOverloadedOutputType(resultIndex); diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeFunctionGeneric.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeFunctionGeneric.h index 8ee657111e..549c56d07d 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeFunctionGeneric.h +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeFunctionGeneric.h @@ -256,7 +256,6 @@ namespace ScriptCanvas { DataSlotConfiguration slotConfiguration; - //slotConfiguration.m_name = AZStd::string::format("%s: %s", Data::Traits::GetName().data(), t_Traits::GetArgName(Index)); slotConfiguration.m_name = t_Traits::GetArgName(Index); slotConfiguration.ConfigureDatum(AZStd::move(Datum(Data::FromAZType(Data::Traits::GetAZType()), Datum::eOriginality::Copy))); diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp index 0f766db133..65d1f21518 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp @@ -518,7 +518,7 @@ namespace ScriptCanvas { const AZ::BehaviorParameter& argument(event.m_parameters[AZ::eBehaviorBusForwarderEventIndices::Result]); Data::Type inputType(AZ::BehaviorContextHelper::IsStringParameter(argument) ? Data::Type::String() : Data::FromAZType(argument.m_typeId)); - const AZStd::string argName(Data::GetName(inputType).data()); + const AZStd::string argName(Data::GetName(inputType)); DataSlotConfiguration resultConfiguration; diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.cpp index 169ffacce2..26a9b4fc96 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.cpp +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.cpp @@ -272,7 +272,7 @@ namespace ScriptCanvas Data::Type outputType(AZ::BehaviorContextHelper::IsStringParameter(*result) ? Data::Type::String() : Data::FromAZType(result->m_typeId)); // multiple outs will need out value names - const AZStd::string resultSlotName(Data::GetName(outputType).c_str()); + const AZStd::string resultSlotName(Data::GetName(outputType)); DataSlotConfiguration slotConfiguration; @@ -343,7 +343,7 @@ namespace ScriptCanvas { Data::Type outputType(AZ::BehaviorContextHelper::IsStringParameter(*result) ? Data::Type::String() : Data::FromAZType(result->m_typeId)); // multiple outs will need out value names - const AZStd::string resultSlotName(Data::GetName(outputType).c_str()); + const AZStd::string resultSlotName(Data::GetName(outputType)); Slot* slot = GetSlotByName(resultSlotName);