Moved from Unreal 4.21 to 4.22

mihe · Apr 2, 2019 · 6ad1f0b · 6ad1f0b
1 parent cfccbd0
commit 6ad1f0b
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 21 deletions.
diff --git a/Source/TsuEditor/Private/TsuBlueprintCompiler.cpp b/Source/TsuEditor/Private/TsuBlueprintCompiler.cpp
@@ -19,9 +19,8 @@
 FTsuBlueprintCompiler::FTsuBlueprintCompiler(
 	UBlueprint* SourceSketch,
 	FCompilerResultsLog& MessageLog,
-	const FKismetCompilerOptions& CompilerOptions,
-	TArray<UObject*>* ObjLoaded)
-	: Super(SourceSketch, MessageLog, CompilerOptions, ObjLoaded)
+	const FKismetCompilerOptions& CompilerOptions)
+	: Super(SourceSketch, MessageLog, CompilerOptions)
 {
 }
 

diff --git a/Source/TsuEditor/Private/TsuBlueprintCompiler.h b/Source/TsuEditor/Private/TsuBlueprintCompiler.h
@@ -29,8 +29,7 @@ class FTsuBlueprintCompiler final
 	FTsuBlueprintCompiler(
 		UBlueprint* SourceSketch,
 		FCompilerResultsLog& MessageLog,
-		const FKismetCompilerOptions& CompilerOptions,
-		TArray<UObject*>* ObjLoaded);
+		const FKismetCompilerOptions& CompilerOptions);
 
 	static TArray<FTsuCompilationMessage> CompileScript(const FString& Filename, struct FTsuParsedFile& Result);
 

diff --git a/Source/TsuEditor/Private/TsuEditorModule.cpp b/Source/TsuEditor/Private/TsuEditorModule.cpp
@@ -77,12 +77,11 @@ class FTsuEditorModule final
 	void Compile(
 		UBlueprint* Blueprint,
 		const FKismetCompilerOptions& CompileOptions,
-		FCompilerResultsLog& Results,
-		TArray<UObject*>* ObjLoaded) override
+		FCompilerResultsLog& Results) override
 	{
 		if (auto TsuBlueprint = Cast<UTsuBlueprint>(Blueprint))
 		{
-			FTsuBlueprintCompiler Compiler(TsuBlueprint, Results, CompileOptions, ObjLoaded);
+			FTsuBlueprintCompiler Compiler{TsuBlueprint, Results, CompileOptions};
 			Compiler.Compile();
 			check(Compiler.NewClass);
 		}
@@ -96,8 +95,7 @@ class FTsuEditorModule final
 		return MakeShared<FTsuBlueprintCompiler>(
 			CastChecked<UTsuBlueprint>(InBlueprint),
 			InMessageLog,
-			InCompileOptions,
-			nullptr);
+			InCompileOptions);
 	}
 
 private:

diff --git a/Source/TsuEditor/Private/TsuFactory.cpp b/Source/TsuEditor/Private/TsuFactory.cpp
@@ -106,13 +106,15 @@ UTsuBlueprint* UTsuFactory::CreateBlueprint(UClass* Class, UObject* Parent, FNam
 			UTsuBlueprintGeneratedClass::StaticClass(),
 			TEXT("UTsuFactory")));
 
-	FEditorDelegates::OnAssetPreImport.Broadcast(this, Class, Parent, Name, Type);
+	auto ImportSubsystem = GEditor->GetEditorSubsystem<UImportSubsystem>();
+
+	ImportSubsystem->OnAssetPreImport.Broadcast(this, Class, Parent, Name, Type);
 
 	Blueprint->AssetImportData->Update(CurrentFilename);
 
 	FKismetEditorUtilities::CompileBlueprint(Blueprint);
 
-	FEditorDelegates::OnAssetPostImport.Broadcast(this, Blueprint);
+	ImportSubsystem->OnAssetPostImport.Broadcast(this, Blueprint);
 
 	return Blueprint;
 }
@@ -136,7 +138,9 @@ UTsuBlueprint* UTsuFactory::UpdateBlueprint(
 		});
 	}();
 
-	FEditorDelegates::OnAssetPreImport.Broadcast(this, Class, Parent, Name, Type);
+	auto ImportSubsystem = GEditor->GetEditorSubsystem<UImportSubsystem>();
+
+	ImportSubsystem->OnAssetPreImport.Broadcast(this, Class, Parent, Name, Type);
 
 	Blueprint->Modify(true);
 
@@ -190,7 +194,7 @@ UTsuBlueprint* UTsuFactory::UpdateBlueprint(
 		FKismetEditorUtilities::CompileBlueprint(Blueprint);
 	}
 
-	FEditorDelegates::OnAssetPostImport.Broadcast(this, Blueprint);
+	ImportSubsystem->OnAssetPostImport.Broadcast(this, Blueprint);
 
 	return Blueprint;
 }
diff --git a/Source/TsuRuntime/Private/TsuRuntimeBlueprintCompiler.cpp b/Source/TsuRuntime/Private/TsuRuntimeBlueprintCompiler.cpp
@@ -9,9 +9,8 @@
 FTsuRuntimeBlueprintCompiler::FTsuRuntimeBlueprintCompiler(
 	UBlueprint* SourceSketch,
 	FCompilerResultsLog& MessageLog,
-	const FKismetCompilerOptions& CompilerOptions,
-	TArray<UObject*>* ObjLoaded)
-	: Super(SourceSketch, MessageLog, CompilerOptions, ObjLoaded)
+	const FKismetCompilerOptions& CompilerOptions)
+	: Super(SourceSketch, MessageLog, CompilerOptions)
 {
 }
 

diff --git a/Source/TsuRuntime/Private/TsuRuntimeBlueprintCompiler.h b/Source/TsuRuntime/Private/TsuRuntimeBlueprintCompiler.h
@@ -16,8 +16,7 @@ class FTsuRuntimeBlueprintCompiler final
 	FTsuRuntimeBlueprintCompiler(
 		UBlueprint* SourceSketch,
 		FCompilerResultsLog& MessageLog,
-		const FKismetCompilerOptions& CompilerOptions,
-		TArray<UObject*>* ObjLoaded);
+		const FKismetCompilerOptions& CompilerOptions);
 
 private:
 	void SpawnNewClass(const FString& NewClassName) override;

diff --git a/Source/TsuRuntime/Private/TsuRuntimeModule.cpp b/Source/TsuRuntime/Private/TsuRuntimeModule.cpp
@@ -122,8 +122,7 @@ class FTsuRuntimeModule final
 		return MakeShared<FTsuRuntimeBlueprintCompiler>(
 			CastChecked<UTsuBlueprint>(InBlueprint),
 			InMessageLog,
-			InCompileOptions,
-			nullptr);
+			InCompileOptions);
 	}
 
 	void AddCleanupDelegates()