Merge pull request #230 from Free2Play-Entertainment/fname

Converted FVaRest_NamedType::Name to FText
ufna · Oct 19, 2019 · 958cb15 · 958cb15
2 parents 09c62ad + 9434ec7
commit 958cb15
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Source/VaRestEditorPlugin/Classes/VaRest_BreakJson.h b/Source/VaRestEditorPlugin/Classes/VaRest_BreakJson.h
@@ -30,7 +30,7 @@ struct FVaRest_NamedType
 	GENERATED_USTRUCT_BODY();
 
 	UPROPERTY(EditAnywhere, Category = NamedType)
-	FString Name;
+	FText Name;
 
 	UPROPERTY(EditAnywhere, Category = NamedType)
 	EVaRest_JsonType Type;

diff --git a/Source/VaRestEditorPlugin/Private/VaRest_BreakJson.cpp b/Source/VaRestEditorPlugin/Private/VaRest_BreakJson.cpp
@@ -273,7 +273,7 @@ void UVaRest_BreakJson::CreateProjectionPins(UEdGraphPin* Source)
 #endif
 
 		UObject* Subtype = nullptr;
-		FString FieldName = (*it).Name;
+		FString FieldName = (*it).Name.ToString();
 
 		switch ((*it).Type)
 		{
@@ -297,7 +297,7 @@ void UVaRest_BreakJson::CreateProjectionPins(UEdGraphPin* Source)
 
 		UEdGraphNode::FCreatePinParams OutputPinParams;
 		OutputPinParams.ContainerType = (*it).bIsArray ? EPinContainerType::Array : EPinContainerType::None;
-		UEdGraphPin* OutputPin = CreatePin(EGPD_Output, Type, TEXT(""), Subtype, FName(*(*it).Name), OutputPinParams);
+		UEdGraphPin* OutputPin = CreatePin(EGPD_Output, Type, TEXT(""), Subtype, FName((*(*it).Name.ToString())), OutputPinParams);
 	}
 }
 
@@ -559,7 +559,7 @@ void UVaRest_MakeJson::CreateProjectionPins(UEdGraphPin* Source)
 	{
 		FName Type;
 		UObject* Subtype = nullptr;
-		FString FieldName = (*it).Name;
+		FString FieldName = (*it).Name.ToString();
 
 		switch ((*it).Type)
 		{
@@ -583,7 +583,7 @@ void UVaRest_MakeJson::CreateProjectionPins(UEdGraphPin* Source)
 
 		UEdGraphNode::FCreatePinParams InputPinParams;
 		InputPinParams.ContainerType = (*it).bIsArray ? EPinContainerType::Array : EPinContainerType::None;
-		UEdGraphPin* InputPin = CreatePin(EGPD_Input, Type, TEXT(""), Subtype, FName(*(*it).Name), InputPinParams);
+		UEdGraphPin* InputPin = CreatePin(EGPD_Input, Type, TEXT(""), Subtype, FName((*(*it).Name.ToString())), InputPinParams);
 
 #if ENGINE_MINOR_VERSION >= 20
 		InputPin->SetSavePinIfOrphaned(false);