izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

ObjectPtr upgrade for engine plugins used from UnrealEditor -allmodules. Automated upgrade process.

Browse Source 
#rb none
#preflight 62fe7f270601ad0504910c30

[CL 21447894 by Zousar Shaker in ue5-main branch]
This commit is contained in:
Zousar Shaker
2022-08-18 15:08:49 -04:00
parent d4b40c56af
commit 3f4252aa56
537 changed files with 1262 additions and 1262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Engine/Plugins/Runtime/SmartObjects/Source/SmartObjectsModule/Private/SmartObjectSubsystemRenderingActor.h
View File

@@ -45,6 +45,6 @@ public:
private:
UPROPERTY()
USmartObjectSubsystemRenderingComponent* RenderingComponent;
TObjectPtr<USmartObjectSubsystemRenderingComponent> RenderingComponent;
};

8
Engine/Plugins/Runtime/SmartObjects/Source/SmartObjectsModule/Private/SmartObjectTestingActor.h
View File

@@ -83,7 +83,7 @@ protected:
private:
UPROPERTY(Transient)
ASmartObjectTestingActor* SmartObjectTestingActor;
TObjectPtr<ASmartObjectTestingActor> SmartObjectTestingActor;
};
@@ -167,13 +167,13 @@ protected:
void ResetTests();
UPROPERTY(EditAnywhere, Category = Test, Instanced)
TArray<USmartObjectTest*> Tests;
TArray<TObjectPtr<USmartObjectTest>> Tests;
UPROPERTY(Transient)
USmartObjectTestRenderingComponent* RenderingComponent;
TObjectPtr<USmartObjectTestRenderingComponent> RenderingComponent;
UPROPERTY(Transient)
USmartObjectSubsystem* SmartObjectSubsystem = nullptr;
TObjectPtr<USmartObjectSubsystem> SmartObjectSubsystem = nullptr;
UPROPERTY(EditAnywhere, Category = Test)
bool bRunTestsEachFrame = false;

4
Engine/Plugins/Runtime/SmartObjects/Source/SmartObjectsModule/Public/GenericSmartObject.h
View File

@@ -22,10 +22,10 @@ public:
protected:
UPROPERTY(EditAnywhere, Category = SmartObject, NoClear)
USmartObjectComponent* SOComponent;
TObjectPtr<USmartObjectComponent> SOComponent;
#if WITH_EDITORONLY_DATA
UPROPERTY(NoClear)
USmartObjectRenderingComponent* RenderingComponent;
TObjectPtr<USmartObjectRenderingComponent> RenderingComponent;
#endif // WITH_EDITORONLY_DATA
};

6
Engine/Plugins/Runtime/SmartObjects/Source/SmartObjectsModule/Public/SmartObjectDefinition.h
View File

@@ -68,7 +68,7 @@ struct SMARTOBJECTSMODULE_API FSmartObjectSlotDefinition
* Note that there should be only one definition of each type since the first one will be selected.
*/
UPROPERTY(EditDefaultsOnly, Category = SmartObject, Instanced)
TArray<USmartObjectBehaviorDefinition*> BehaviorDefinitions;
TArray<TObjectPtr<USmartObjectBehaviorDefinition>> BehaviorDefinitions;
};
/**
@@ -227,7 +227,7 @@ private:
/** List of behavior definitions of different types provided to SO's user if the slot does not provide one. */
UPROPERTY(EditDefaultsOnly, Category = SmartObject, Instanced)
TArray<USmartObjectBehaviorDefinition*> DefaultBehaviorDefinitions;
TArray<TObjectPtr<USmartObjectBehaviorDefinition>> DefaultBehaviorDefinitions;
/** This object is available if user tags match this query; always available if query is empty. */
UPROPERTY(EditDefaultsOnly, Category = SmartObject)
@@ -266,7 +266,7 @@ struct SMARTOBJECTSMODULE_API FSmartObjectSlotDefinitionFragment : public FMassS
/** Pointer to the parent object definition to preserve slot definition pointer validity. */
UPROPERTY(Transient)
const USmartObjectDefinition* SmartObjectDefinition = nullptr;
TObjectPtr<const USmartObjectDefinition> SmartObjectDefinition = nullptr;
/** Pointer to the slot definition contained by the SmartObject definition. */
const FSmartObjectSlotDefinition* SlotDefinition = nullptr;

2
Engine/Plugins/Runtime/SmartObjects/Source/SmartObjectsModule/Public/SmartObjectRuntime.h
View File

@@ -188,7 +188,7 @@ private:
/** Associated smart object definition */
UPROPERTY()
const USmartObjectDefinition* Definition = nullptr;
TObjectPtr<const USmartObjectDefinition> Definition = nullptr;
/** Instance specific transform */
FTransform Transform;

2
Engine/Plugins/Runtime/SmartObjects/Source/SmartObjectsModule/Public/SmartObjectSubsystem.h
View File

@@ -554,7 +554,7 @@ protected:
/** List of registered components. */
UPROPERTY(Transient)
TArray<USmartObjectComponent*> RegisteredSOComponents;
TArray<TObjectPtr<USmartObjectComponent>> RegisteredSOComponents;
uint32 NextFreeUserID = 1;