From 73f84c16812093cdd80b76995527af620cba134e Mon Sep 17 00:00:00 2001 From: jyelon Date: Wed, 8 Apr 2026 03:40:59 -0400 Subject: [PATCH] Renaming --- .../UEWingman/Handlers/ActorComponent_Add.h | 4 ++-- .../UEWingman/Handlers/ActorComponent_Remove.h | 2 +- .../Handlers/ActorComponent_Reparent.h | 6 +++--- .../Source/UEWingman/Handlers/Blueprint_Dump.h | 2 +- .../UEWingman/Handlers/GraphNode_SetDefaults.h | 2 +- .../UEWingman/Handlers/GraphPin_Connect.h | 4 ++-- .../UEWingman/Handlers/GraphPin_Disconnect.h | 4 ++-- .../Source/UEWingman/Private/WingComponent.cpp | 18 +++++++++--------- .../Source/UEWingman/Private/WingFetcher.cpp | 14 +++++++------- .../Source/UEWingman/Private/WingProperty.cpp | 6 +++--- .../Source/UEWingman/Private/WingUtils.cpp | 2 +- .../Source/UEWingman/Public/WingBasics.h | 6 +++--- .../Source/UEWingman/Public/WingComponent.h | 14 +++++++------- .../Source/UEWingman/Public/WingLogCapture.h | 2 +- .../Source/UEWingman/Public/WingUtils.h | 6 +++--- 15 files changed, 46 insertions(+), 46 deletions(-) diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Add.h b/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Add.h index 4622b18f..88b3ab3f 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Add.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Add.h @@ -65,8 +65,8 @@ public: if (!UWingComponent::CheckValidComponentClass(ComponentClass, WingOut::Stdout)) return; // Find the specified parent component - TArray> AllComponents = UWingComponent::GetAll(BP); - TStrongObjectPtr ParentComp = WingUtils::FindOneWithExternalID(Parent, AllComponents, TEXT("Component"), WingOut::Stdout); + TArray> AllComponents = UWingComponent::GetAll(BP); + TStrongObjectPtr ParentComp = WingUtils::FindOneWithExternalID(Parent, AllComponents, TEXT("Component"), WingOut::Stdout); if (!ParentComp) return; // Create the SCS node diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Remove.h b/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Remove.h index 06f9b50a..0a8c4642 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Remove.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Remove.h @@ -29,7 +29,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UWingComponentReference* CompRef = F.Walk(Component).Cast(); + UWingComponentRef* CompRef = F.Walk(Component).Cast(); if (!CompRef) return; if (!UWingComponent::DeleteComponent(CompRef, WingOut::Stdout)) return; diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Reparent.h b/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Reparent.h index 72d81321..274bf59b 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Reparent.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Reparent.h @@ -34,13 +34,13 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UWingComponentReference* CompRef = F.Walk(Component).Cast(); + UWingComponentRef* CompRef = F.Walk(Component).Cast(); if (!CompRef) return; // Find the new parent among all components (if specified) UBlueprint *BP = CompRef->BP; - TArray> AllComponents = UWingComponent::GetAll(BP); - TStrongObjectPtr NewParent = WingUtils::FindOneWithExternalID(Parent, AllComponents, TEXT("Component"), WingOut::Stdout); + TArray> AllComponents = UWingComponent::GetAll(BP); + TStrongObjectPtr NewParent = WingUtils::FindOneWithExternalID(Parent, AllComponents, TEXT("Component"), WingOut::Stdout); if (!NewParent) return; if (!UWingComponent::ReparentComponent(CompRef, NewParent.Get(), WingOut::Stdout)) return; diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Blueprint_Dump.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Blueprint_Dump.h index 47166861..270b2d94 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/Blueprint_Dump.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Blueprint_Dump.h @@ -69,7 +69,7 @@ public: BlueprintVars.Print(WingOut::StdoutBuffer); // Components - TArray> Components = UWingComponent::GetAll(BP); + TArray> Components = UWingComponent::GetAll(BP); if (!Components.IsEmpty()) WingOut::Stdout.Print(TEXT("\nComponents:\n")); UWingComponent::PrintAll(BP, WingOut::Stdout); diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetDefaults.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetDefaults.h index a4f61362..ef0ae128 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetDefaults.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetDefaults.h @@ -56,7 +56,7 @@ public: void HandleK2Entry(const FSetNodeDefaultEntry& Entry, UEdGraph* GraphObj, const UEdGraphSchema_K2* K2Schema) { WingFetcher F(GraphObj, WingOut::Stdout); - UWingPinReference* PinRef = F.Node(Entry.Node).Pin(Entry.Name).Cast(); + UWingGraphPinRef* PinRef = F.Node(Entry.Node).Pin(Entry.Name).Cast(); if (!PinRef) return; UEdGraphPin* Pin = WingUtils::CheckGetPin(PinRef->Node, PinRef->PinName, WingOut::Stdout); if (!Pin) return; diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Connect.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Connect.h index a8647469..928e41d4 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Connect.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Connect.h @@ -63,13 +63,13 @@ public: continue; WingFetcher FS(G, WingOut::Stdout); - UWingPinReference* SourcePinRef = FS.Walk(Entry.SourcePin).Cast(); + UWingGraphPinRef* SourcePinRef = FS.Walk(Entry.SourcePin).Cast(); if (!SourcePinRef) continue; UEdGraphPin* SourcePin = WingUtils::CheckGetPin(SourcePinRef->Node, SourcePinRef->PinName, WingOut::Stdout); if (!SourcePin) continue; WingFetcher FT(G, WingOut::Stdout); - UWingPinReference* TargetPinRef = FT.Walk(Entry.TargetPin).Cast(); + UWingGraphPinRef* TargetPinRef = FT.Walk(Entry.TargetPin).Cast(); if (!TargetPinRef) continue; UEdGraphPin* TargetPin = WingUtils::CheckGetPin(TargetPinRef->Node, TargetPinRef->PinName, WingOut::Stdout); if (!TargetPin) continue; diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Disconnect.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Disconnect.h index d292c11f..7d866e2d 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Disconnect.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Disconnect.h @@ -62,7 +62,7 @@ public: if (!FWingProperty::PopulateFromJson(EntryProps, *DiscVal, false, WingOut::Stdout)) continue; WingFetcher FP(G, WingOut::Stdout); - UWingPinReference* PinRef = FP.Walk(Entry.Pin).Cast(); + UWingGraphPinRef* PinRef = FP.Walk(Entry.Pin).Cast(); if (!PinRef) continue; UEdGraphPin* Pin = WingUtils::CheckGetPin(PinRef->Node, PinRef->PinName, WingOut::Stdout); if (!Pin) continue; @@ -72,7 +72,7 @@ public: if (!Entry.TargetPin.IsEmpty()) { WingFetcher FT(G, WingOut::Stdout); - UWingPinReference* TargetRef = FT.Walk(Entry.TargetPin).Cast(); + UWingGraphPinRef* TargetRef = FT.Walk(Entry.TargetPin).Cast(); if (!TargetRef) continue; UEdGraphPin* Target = WingUtils::CheckGetPin(TargetRef->Node, TargetRef->PinName, WingOut::Stdout); if (!Target) continue; diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingComponent.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingComponent.cpp index 7d139f25..5592bba3 100644 --- a/Plugins/UEWingman/Source/UEWingman/Private/WingComponent.cpp +++ b/Plugins/UEWingman/Source/UEWingman/Private/WingComponent.cpp @@ -136,7 +136,7 @@ void UWingComponent::AddChildNode(UBlueprint *BP, USCS_Node *NewNode, FoundCompo } } -bool UWingComponent::AddComponent(UBlueprint *BP, UClass *Class, UWingComponentReference *Parent, FName Name, WingOut Errors) +bool UWingComponent::AddComponent(UBlueprint *BP, UClass *Class, UWingComponentRef *Parent, FName Name, WingOut Errors) { TSet Names; FBlueprintEditorUtils::GetClassVariableList(BP, Names); @@ -164,7 +164,7 @@ bool UWingComponent::AddComponent(UBlueprint *BP, UClass *Class, UWingComponentR return true; } -bool UWingComponent::ReparentComponent(UWingComponentReference *Ref, UWingComponentReference *Parent, WingOut Errors) +bool UWingComponent::ReparentComponent(UWingComponentRef *Ref, UWingComponentRef *Parent, WingOut Errors) { FoundComponent ParentComponent = FindComponent(Ref->BP, Parent->VariableName); if (!CheckValidParent(ParentComponent, Errors)) return false; @@ -184,7 +184,7 @@ bool UWingComponent::ReparentComponent(UWingComponentReference *Ref, UWingCompon return true; } -bool UWingComponent::DeleteComponent(UWingComponentReference *Ref, WingOut Errors) +bool UWingComponent::DeleteComponent(UWingComponentRef *Ref, WingOut Errors) { FoundComponent ThisComponent = FindComponent(Ref->BP, Ref->VariableName); if (!CheckExists(ThisComponent, Errors)) return false; @@ -211,7 +211,7 @@ TMap UWingComponent::CalculateParentNames(USimpleConstructionScrip return ParentNames; } -UActorComponent* UWingComponent::GetImmutableTemplate(const UWingComponentReference *Ref) +UActorComponent* UWingComponent::GetImmutableTemplate(const UWingComponentRef *Ref) { FoundComponent FC = FindComponent(Ref->BP, Ref->VariableName); if (FC.Native) return FC.Native; @@ -229,7 +229,7 @@ UActorComponent* UWingComponent::GetImmutableTemplate(const UWingComponentRefere return nullptr; } -UActorComponent* UWingComponent::GetMutableTemplate(const UWingComponentReference *Ref) +UActorComponent* UWingComponent::GetMutableTemplate(const UWingComponentRef *Ref) { FoundComponent FC = FindComponent(Ref->BP, Ref->VariableName); if (FC.Native) return FC.Native; @@ -244,9 +244,9 @@ UActorComponent* UWingComponent::GetMutableTemplate(const UWingComponentReferenc return Override; } -TArray> UWingComponent::GetAll(UBlueprint* BP) +TArray> UWingComponent::GetAll(UBlueprint* BP) { - TArray> Result; + TArray> Result; if (!BP) return Result; // Find the native ancestor class @@ -261,7 +261,7 @@ TArray> UWingComponent::GetAll(UBluepr CDO->GetComponents(NativeComponents); for (UActorComponent* Comp : NativeComponents) { - UWingComponentReference* Ref = NewObject(); + UWingComponentRef* Ref = NewObject(); Ref->BP = BP; Ref->VariableName = Comp->GetFName(); Result.Emplace(Ref); @@ -275,7 +275,7 @@ TArray> UWingComponent::GetAll(UBluepr if (WalkBP->SimpleConstructionScript == nullptr) continue; for (USCS_Node* Node : WalkBP->SimpleConstructionScript->GetAllNodes()) { - UWingComponentReference* Ref = NewObject(); + UWingComponentRef* Ref = NewObject(); Ref->BP = BP; Ref->VariableName = Node->GetVariableName(); Result.Emplace(Ref); diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingFetcher.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingFetcher.cpp index b739f6d3..1a0429ae 100644 --- a/Plugins/UEWingman/Source/UEWingman/Private/WingFetcher.cpp +++ b/Plugins/UEWingman/Source/UEWingman/Private/WingFetcher.cpp @@ -266,7 +266,7 @@ WingFetcher& WingFetcher::Pin(const FString& Value) } return SetError(); } - UWingPinReference* Ref = NewObject(); + UWingGraphPinRef* Ref = NewObject(); Ref->Node = N; Ref->PinName = Found->GetFName(); SetObj(Ref); @@ -284,12 +284,12 @@ WingFetcher& WingFetcher::Component(const FString& Value) return SetError(); } - TArray> AllComponents = UWingComponent::GetAll(BP); - TStrongObjectPtr Found = WingUtils::FindOneWithExternalID(Value, AllComponents, TEXT("component"), Errors); + TArray> AllComponents = UWingComponent::GetAll(BP); + TStrongObjectPtr Found = WingUtils::FindOneWithExternalID(Value, AllComponents, TEXT("component"), Errors); if (!Found) { Errors.Printf(TEXT("Components that exist in the blueprint:\n")); - for (const TStrongObjectPtr& C : AllComponents) + for (const TStrongObjectPtr& C : AllComponents) { Errors.Printf(TEXT(" %s\n"), *WingUtils::FormatName(C.Get())); } @@ -376,9 +376,9 @@ WingFetcher& WingFetcher::StructProp(const FString& Value) UStruct *HostType = Obj.Get()->GetClass(); bool HostEditable = true; - // If we are *already* inside a UWingStructPointer, update the host + // If we are *already* inside a UWingStructRef, update the host // fields, to make it possible to navigate even further inside. - if (UWingStructPointer *SPtr = ::Cast(Obj.Get())) + if (UWingStructRef *SPtr = ::Cast(Obj.Get())) { HostObject = SPtr->Object; HostBase = SPtr->StructBase; @@ -393,7 +393,7 @@ WingFetcher& WingFetcher::StructProp(const FString& Value) return SetError(); } - UWingStructPointer* Ptr = NewObject(); + UWingStructRef* Ptr = NewObject(); Ptr->Object = HostObject; Ptr->StructType = StructProp->Struct; Ptr->StructBase = StructProp->ContainerPtrToValuePtr(HostBase); diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingProperty.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingProperty.cpp index 99e872ed..67a855c5 100644 --- a/Plugins/UEWingman/Source/UEWingman/Private/WingProperty.cpp +++ b/Plugins/UEWingman/Source/UEWingman/Private/WingProperty.cpp @@ -427,9 +427,9 @@ TArray FWingProperty::GetDetails(UObject* Obj, bool Mutable) { if (!Obj) return {}; - // If it's a UWingStructPointer, return the properties + // If it's a UWingStructRef, return the properties // of the struct instead. Propagate editability of the host. - if (UWingStructPointer *SP = Cast(Obj)) + if (UWingStructRef *SP = Cast(Obj)) { TArray Result = GetVisible(FWingStructAndUStruct(SP->StructBase, SP->StructType)); @@ -450,7 +450,7 @@ TArray FWingProperty::GetDetails(UObject* Obj, bool Mutable) } // Component references: get the proper template. - if (UWingComponentReference* Ref = ::Cast(Obj)) + if (UWingComponentRef* Ref = ::Cast(Obj)) { Obj = Mutable ? UWingComponent::GetMutableTemplate(Ref) : UWingComponent::GetImmutableTemplate(Ref); if (!Obj) diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingUtils.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingUtils.cpp index 638b28e5..d3e64ad2 100644 --- a/Plugins/UEWingman/Source/UEWingman/Private/WingUtils.cpp +++ b/Plugins/UEWingman/Source/UEWingman/Private/WingUtils.cpp @@ -245,7 +245,7 @@ FString WingUtils::FormatName(const FBPInterfaceDescription &IFace) return FormatName(IFace.Interface); } -FString WingUtils::FormatName(const UWingComponentReference *Ref) +FString WingUtils::FormatName(const UWingComponentRef *Ref) { return ExternalizeID(Ref->VariableName); } diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingBasics.h b/Plugins/UEWingman/Source/UEWingman/Public/WingBasics.h index 8d0d39cd..5f46f227 100644 --- a/Plugins/UEWingman/Source/UEWingman/Public/WingBasics.h +++ b/Plugins/UEWingman/Source/UEWingman/Public/WingBasics.h @@ -187,7 +187,7 @@ struct FWingStructAndUStruct // Pin Ref: A pointer to a graph node, plus a pin name. UCLASS() -class UWingPinReference : public UObject +class UWingGraphPinRef : public UObject { GENERATED_BODY() @@ -202,7 +202,7 @@ public: // name. The component can be an inherited component, as // opposed to one that is defined in the blueprint itself. UCLASS() -class UWingComponentReference : public UObject +class UWingComponentRef : public UObject { GENERATED_BODY() public: @@ -218,7 +218,7 @@ public: // struct is marked CPF_Edit. If not, then the intent is // that this struct is for viewing only. UCLASS() -class UWingStructPointer : public UObject +class UWingStructRef : public UObject { GENERATED_BODY() public: diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingComponent.h b/Plugins/UEWingman/Source/UEWingman/Public/WingComponent.h index 1d3437f2..013fb659 100644 --- a/Plugins/UEWingman/Source/UEWingman/Public/WingComponent.h +++ b/Plugins/UEWingman/Source/UEWingman/Public/WingComponent.h @@ -8,22 +8,22 @@ class USCS_Node; class UActorComponent; class USimpleConstructionScript; class UClass; -class UWingComponentReference; +class UWingComponentRef; class WingOut; struct UWingComponent { public: - static UActorComponent* GetImmutableTemplate(const UWingComponentReference *Ref); - static UActorComponent* GetMutableTemplate(const UWingComponentReference *Ref); + static UActorComponent* GetImmutableTemplate(const UWingComponentRef *Ref); + static UActorComponent* GetMutableTemplate(const UWingComponentRef *Ref); - static bool ReparentComponent(UWingComponentReference *Ref, UWingComponentReference *Parent, WingOut Errors); - static bool DeleteComponent(UWingComponentReference *Ref, WingOut Errors); + static bool ReparentComponent(UWingComponentRef *Ref, UWingComponentRef *Parent, WingOut Errors); + static bool DeleteComponent(UWingComponentRef *Ref, WingOut Errors); static bool AddComponent(UBlueprint *BP, UClass *Class, - UWingComponentReference *Parent, FName Name, WingOut Errors); + UWingComponentRef *Parent, FName Name, WingOut Errors); - static TArray> GetAll(UBlueprint* BP); + static TArray> GetAll(UBlueprint* BP); static void PrintAll(UBlueprint* BP, WingOut Out); static bool CheckValidComponentClass(UClass *Class, WingOut Errors); diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingLogCapture.h b/Plugins/UEWingman/Source/UEWingman/Public/WingLogCapture.h index d171d2a0..e9c26e5d 100644 --- a/Plugins/UEWingman/Source/UEWingman/Public/WingLogCapture.h +++ b/Plugins/UEWingman/Source/UEWingman/Public/WingLogCapture.h @@ -7,7 +7,7 @@ class FLogCaptureOutputDevice : public FOutputDevice { public: TArray CapturedErrors; - bool bEnabled = true; + bool bEnabled = false; void Install() { GLog->AddOutputDevice(this); } void Uninstall() { GLog->RemoveOutputDevice(this); } diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingUtils.h b/Plugins/UEWingman/Source/UEWingman/Public/WingUtils.h index 3b78e151..6dadf375 100644 --- a/Plugins/UEWingman/Source/UEWingman/Public/WingUtils.h +++ b/Plugins/UEWingman/Source/UEWingman/Public/WingUtils.h @@ -63,8 +63,8 @@ public: static FName GetFName(const FWingProperty &Prop); static FName GetFName(const FUserPinInfo &Pin) { return Pin.PinName; } static FName GetFName(const TSharedPtr &Pin) { return Pin->PinName; } - static FName GetFName(const UWingComponentReference *Ref) { return Ref->VariableName; } - static FName GetFName(const TStrongObjectPtr &Ref) { return Ref->VariableName; } + static FName GetFName(const UWingComponentRef *Ref) { return Ref->VariableName; } + static FName GetFName(const TStrongObjectPtr &Ref) { return Ref->VariableName; } static FName GetFName(const UWidget *Widget) { return Widget->GetFName(); } static FName GetFName(const WingVariables::Var &Var) { return Var.Name; } @@ -190,7 +190,7 @@ public: static FString FormatName(const TSharedPtr &Handle); static FString FormatName(const FUserPinInfo &Pin); static FString FormatName(const FBPInterfaceDescription &IFace); - static FString FormatName(const UWingComponentReference *Ref); + static FString FormatName(const UWingComponentRef *Ref); static FString FormatName(const UWidget *Widget); ////////////////////////////////////////////////////////