feat: Raw Pointers to TObjectPtr migration
This commit is contained in:
1 parent
74badcca9b
commit
dbcd107343
5 files changed
+21
-21
No files matched your search
@@ -42,5 +42,5 @@ public:
|
||||
* Curve for the production to Heat
|
||||
*/
|
||||
UPROPERTY( EditDefaultsOnly, BlueprintReadOnly, Category = "Boiler" )
|
||||
UCurveFloat* mBoilerCurve;
|
||||
TObjectPtr<UCurveFloat> mBoilerCurve;
|
||||
};
|
||||
@@ -24,7 +24,7 @@ public:
|
||||
|
||||
/* The Adapter Cover Asset */
|
||||
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="ModAdapter")
|
||||
URRDADataAssetDSAdapterCovers* mAdapterCoversAsset;
|
||||
TObjectPtr<URRDADataAssetDSAdapterCovers> mAdapterCoversAsset;
|
||||
|
||||
/* Select which inventories can be accessed by Digital Storage */
|
||||
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="ModAdapter")
|
||||
|
||||
@@ -36,5 +36,5 @@ public:
|
||||
* Curve that defines the power output of the generator
|
||||
*/
|
||||
UPROPERTY( EditAnywhere, BlueprintReadWrite, Category = "Generator" )
|
||||
UCurveFloat* mGeneratorCurve;
|
||||
TObjectPtr<UCurveFloat> mGeneratorCurve;
|
||||
};
|
||||
@@ -28,7 +28,7 @@ struct FRRDADataHolderTurbineData
|
||||
GENERATED_BODY()
|
||||
|
||||
UPROPERTY(BlueprintReadOnly)
|
||||
TMap<TSubclassOf<UFGItemDescriptor>, URRDATurbineDataAsset*> Data;
|
||||
TMap<TSubclassOf<UFGItemDescriptor>, TObjectPtr<URRDATurbineDataAsset>> Data;
|
||||
};
|
||||
|
||||
USTRUCT(BlueprintType)
|
||||
@@ -37,7 +37,7 @@ struct FRRDADataHolderBoilerData
|
||||
GENERATED_BODY()
|
||||
|
||||
UPROPERTY(BlueprintReadOnly)
|
||||
TMap<TSubclassOf<UFGItemDescriptor>, URRDABoilerDataAsset*> Data;
|
||||
TMap<TSubclassOf<UFGItemDescriptor>, TObjectPtr<URRDABoilerDataAsset>> Data;
|
||||
};
|
||||
|
||||
USTRUCT(BlueprintType)
|
||||
@@ -46,7 +46,7 @@ struct FRRDADataHolderCoolerData
|
||||
GENERATED_BODY()
|
||||
|
||||
UPROPERTY(BlueprintReadOnly)
|
||||
TMap<TSubclassOf<UFGItemDescriptor>, URRDACoolerDataAsset*> Data;
|
||||
TMap<TSubclassOf<UFGItemDescriptor>, TObjectPtr<URRDACoolerDataAsset>> Data;
|
||||
};
|
||||
|
||||
USTRUCT(BlueprintType)
|
||||
@@ -55,7 +55,7 @@ struct FRRDADataHolderHeaterData
|
||||
GENERATED_BODY()
|
||||
|
||||
UPROPERTY(BlueprintReadOnly)
|
||||
TMap<TSubclassOf<UFGItemDescriptor>, URRDAHeaterDataAsset*> Data;
|
||||
TMap<TSubclassOf<UFGItemDescriptor>, TObjectPtr<URRDAHeaterDataAsset>> Data;
|
||||
};
|
||||
|
||||
USTRUCT(BlueprintType)
|
||||
@@ -64,13 +64,13 @@ struct FRRDADataHolderDSBuildingData
|
||||
GENERATED_BODY()
|
||||
|
||||
UPROPERTY()
|
||||
URRDADataAssetDSAdapterCovers* AdapterCovers;
|
||||
TObjectPtr<URRDADataAssetDSAdapterCovers> AdapterCovers;
|
||||
|
||||
UPROPERTY()
|
||||
URRDADataAssetDSModAdapter* ModAdapter;
|
||||
TObjectPtr<URRDADataAssetDSModAdapter> ModAdapter;
|
||||
|
||||
UPROPERTY()
|
||||
TArray<URRDADataAssetDSItemFilter*> ItemFilters;
|
||||
TArray<TObjectPtr<URRDADataAssetDSItemFilter>> ItemFilters;
|
||||
};
|
||||
|
||||
UCLASS()
|
||||
@@ -227,13 +227,13 @@ public:
|
||||
|
||||
public:
|
||||
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
|
||||
TMap<TSubclassOf<UFGItemDescriptor>, URRDADirtDataAsset*> mDirtAssets;
|
||||
TMap<TSubclassOf<UFGItemDescriptor>, TObjectPtr<URRDADirtDataAsset>> mDirtAssets;
|
||||
|
||||
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
|
||||
TMap<TSubclassOf<AFGBuildableFactory>, FRRDADataHolderDSBuildingData> mDSBuildingData;
|
||||
|
||||
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
|
||||
TMap<int32, URRDAGeneratorDataAsset*> mGeneratorAssets;
|
||||
TMap<int32, TObjectPtr<URRDAGeneratorDataAsset>> mGeneratorAssets;
|
||||
|
||||
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
|
||||
TMap<int32, FRRDADataHolderTurbineData> mTurbineAssets;
|
||||
@@ -248,13 +248,13 @@ public:
|
||||
TMap<ERRDAHeaterType, FRRDADataHolderHeaterData> mHeaterAssets;
|
||||
|
||||
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
|
||||
TArray<URRDADataAssetSolarPower*> mSolarPowerAssets;
|
||||
TArray<TObjectPtr<URRDADataAssetSolarPower>> mSolarPowerAssets;
|
||||
|
||||
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
|
||||
TSet<URRDADataAssetBase*> mDisabledDataAssets;
|
||||
TSet<TObjectPtr<URRDADataAssetBase>> mDisabledDataAssets;
|
||||
|
||||
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
|
||||
TSet<URRDADataAssetBase*> mEnabledDataAssets;
|
||||
TSet<TObjectPtr<URRDADataAssetBase>> mEnabledDataAssets;
|
||||
};
|
||||
|
||||
template <class T>
|
||||
|
||||
Reference in new issue
Block a user