修改：移除一些UE5的编译警告

xuyanghuang-tencent · xuyanghuang-tencent · commit b82f439fadf9 · 2023-11-06T18:13:53.000+08:00
diff --git a/Plugins/UnLua/Source/UnLua/Private/DefaultParamCollection.cpp b/Plugins/UnLua/Source/UnLua/Private/DefaultParamCollection.cpp
@@ -13,11 +13,16 @@
 // See the License for the specific language governing permissions and limitations under the License.
 
 #include "DefaultParamCollection.h"
+#include "Misc/EngineVersionComparison.h"
 #include "CoreUObject.h"
 
 TMap<FName, FFunctionCollection> GDefaultParamCollection;
 
+#if UE_VERSION_OLDER_THAN(5, 2, 0)
 PRAGMA_DISABLE_OPTIMIZATION
+#else
+UE_DISABLE_OPTIMIZATION
+#endif
 
 void CreateDefaultParamCollection()
 {
@@ -30,4 +35,8 @@ void CreateDefaultParamCollection()
     }
 }
 
+#if UE_VERSION_OLDER_THAN(5, 2, 0)
 PRAGMA_ENABLE_OPTIMIZATION
+#else
+UE_ENABLE_OPTIMIZATION
+#endif
diff --git a/Plugins/UnLua/Source/UnLua/Private/DefaultParamCollection.h b/Plugins/UnLua/Source/UnLua/Private/DefaultParamCollection.h
@@ -15,6 +15,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
+#include "UnLuaCompatibility.h"
 
 class IParamValue
 {
@@ -53,7 +54,7 @@ class FRuntimeEnumParamValue : public IParamValue
     {
         if (!bInitialized)
         {
-            UEnum* Enum = FindObjectChecked<UEnum>(ANY_PACKAGE, *TypeName);
+            UEnum* Enum = FindFirstObject<UEnum>(*TypeName);
             Value = Enum->GetValueByIndex(Index);
             bInitialized = true;
         }
diff --git a/Plugins/UnLua/Source/UnLua/Private/ReflectionUtils/ClassDesc.cpp b/Plugins/UnLua/Source/UnLua/Private/ReflectionUtils/ClassDesc.cpp
@@ -12,6 +12,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
 // See the License for the specific language governing permissions and limitations under the License.
 
+#include "UnLuaCompatibility.h"
 #include "ClassDesc.h"
 #include "FieldDesc.h"
 #include "PropertyDesc.h"
@@ -163,7 +164,7 @@ void FClassDesc::Load()
     UnLoad();
 
     FString Name = (ClassName[0] == 'U' || ClassName[0] == 'A' || ClassName[0] == 'F') ? ClassName.RightChop(1) : ClassName;
-    UStruct* Found = FindObject<UStruct>(ANY_PACKAGE, *Name);
+    UStruct* Found = FindFirstObject<UStruct>(*Name);
     if (!Found)
         Found = LoadObject<UStruct>(nullptr, *Name);
 
diff --git a/Plugins/UnLua/Source/UnLua/Private/ReflectionUtils/EnumDesc.cpp b/Plugins/UnLua/Source/UnLua/Private/ReflectionUtils/EnumDesc.cpp
@@ -12,6 +12,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
 // See the License for the specific language governing permissions and limitations under the License.
 
+#include "UnLuaCompatibility.h"
 #include "EnumDesc.h"
 #include "LowLevel.h"
 
@@ -28,7 +29,7 @@ void FEnumDesc::Load()
     if (Enum.IsValid())
         return;
 
-    Enum = FindObject<UEnum>(ANY_PACKAGE, *EnumName);
+    Enum = FindFirstObject<UEnum>(*EnumName);
     if (!Enum.IsValid())
         Enum = LoadObject<UEnum>(nullptr, *EnumName);
 
diff --git a/Plugins/UnLua/Source/UnLua/Private/Registries/ClassRegistry.cpp b/Plugins/UnLua/Source/UnLua/Private/Registries/ClassRegistry.cpp
@@ -13,6 +13,7 @@
 // See the License for the specific language governing permissions and limitations under the License.
 
 #include "Registries/ClassRegistry.h"
+#include "UnLuaCompatibility.h"
 #include "LuaEnv.h"
 #include "Binding.h"
 #include "LowLevel.h"
@@ -280,11 +281,11 @@ namespace UnLua
         FString Name = UTF8_TO_TCHAR(InName);
 
         // find candidates in memory
-        UField* Ret = FindObject<UClass>(ANY_PACKAGE, *Name);
+        UField* Ret = FindFirstObject<UClass>(*Name);
         if (!Ret)
-            Ret = FindObject<UScriptStruct>(ANY_PACKAGE, *Name);
+            Ret = FindFirstObject<UScriptStruct>(*Name);
         if (!Ret)
-            Ret = FindObject<UEnum>(ANY_PACKAGE, *Name);
+            Ret = FindFirstObject<UEnum>(*Name);
 
         // load candidates if not found
         if (!Ret)
diff --git a/Plugins/UnLua/Source/UnLua/Private/Registries/PropertyRegistry.cpp b/Plugins/UnLua/Source/UnLua/Private/Registries/PropertyRegistry.cpp
@@ -1,4 +1,5 @@
 #include "Misc/EngineVersionComparison.h"
+#include "UnLuaCompatibility.h"
 #include "PropertyRegistry.h"
 #include "Binding.h"
 #include "ClassRegistry.h"
@@ -12,7 +13,7 @@ namespace UnLua
     FPropertyRegistry::FPropertyRegistry(FLuaEnv* Env)
         : Env(Env)
     {
-        PropertyCollector = FindObject<UScriptStruct>(ANY_PACKAGE, TEXT("PropertyCollector"));
+        PropertyCollector = FindFirstObject<UScriptStruct>(TEXT("PropertyCollector"));
         check(PropertyCollector);
     }
 
diff --git a/Plugins/UnLua/Source/UnLua/Private/UnLuaCompatibility.h b/Plugins/UnLua/Source/UnLua/Private/UnLuaCompatibility.h
@@ -16,6 +16,7 @@
 
 #include "CoreUObject.h"
 #include "Runtime/Launch/Resources/Version.h"
+#include "Misc/EngineVersionComparison.h"
 
 #if ENGINE_MAJOR_VERSION <= 4 && ENGINE_MINOR_VERSION < 19
 #define DEFINE_FUNCTION(func) void func( FFrame& Stack, RESULT_DECL )
@@ -152,3 +153,13 @@ struct TMulticastDelegateTraits<FMulticastScriptDelegate>
         return (FMulticastScriptDelegate*)PropertyValue;
     }
 };
+
+#if UE_VERSION_OLDER_THAN(5, 1, 0)
+
+template< class T >
+inline T* FindFirstObject(const TCHAR* Name)
+{
+    return FindObject<T>(ANY_PACKAGE, Name);
+}
+
+#endif
diff --git a/Plugins/UnLua/Source/UnLua/Private/UnLuaDebugBase.cpp b/Plugins/UnLua/Source/UnLua/Private/UnLuaDebugBase.cpp
@@ -12,7 +12,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
 // See the License for the specific language governing permissions and limitations under the License.
 
-#include "Misc/EngineVersionComparison.h"
+#include "UnLuaCompatibility.h"
 #include "UnLuaDebugBase.h"
 #include "Containers/LuaSet.h"
 #include "Containers/LuaMap.h"
@@ -227,7 +227,7 @@ namespace UnLua
         if (ClassNamePtr)
         {
             FString ClassName(ClassNamePtr);
-            UStruct *Struct = FindObject<UStruct>(ANY_PACKAGE, *ClassName + 1);
+            UStruct *Struct = FindFirstObject<UStruct>(*ClassName + 1);
             if (Struct)
             {
                 // the userdata is a struct instance
diff --git a/Plugins/UnLua/Source/UnLuaEditor/Private/Toolbars/UnLuaEditorToolbar.cpp b/Plugins/UnLua/Source/UnLuaEditor/Private/Toolbars/UnLuaEditorToolbar.cpp
@@ -1,4 +1,5 @@
-﻿#include "UnLuaPrivate.h"
+﻿#include "Misc/EngineVersionComparison.h"
+#include "UnLuaPrivate.h"
 #include "UnLuaEditorCore.h"
 #include "UnLuaEditorToolbar.h"
 #include "UnLuaEditorCommands.h"
@@ -147,7 +148,11 @@ void FUnLuaEditorToolbar::BindToLua_Executed() const
     if (TargetClass->ImplementsInterface(UUnLuaInterface::StaticClass()))
         return;
 
+#if UE_VERSION_OLDER_THAN(5, 1, 0)
     const auto Ok = FBlueprintEditorUtils::ImplementNewInterface(Blueprint, FName("UnLuaInterface"));
+#else
+    const auto Ok = FBlueprintEditorUtils::ImplementNewInterface(Blueprint, FTopLevelAssetPath(UUnLuaInterface::StaticClass()));
+#endif
     if (!Ok)
         return;
 
@@ -178,7 +183,7 @@ void FUnLuaEditorToolbar::BindToLua_Executed() const
         InterfaceDesc.Graphs[0]->Nodes[1]->Pins[1]->DefaultValue = LuaModuleName;
     }
 
-#if ENGINE_MAJOR_VERSION > 4 || (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION >= 26)
+#if !UE_VERSION_OLDER_THAN(4, 26, 0)
 
     const auto BlueprintEditors = FModuleManager::LoadModuleChecked<FBlueprintEditorModule>("Kismet").GetBlueprintEditors();
     for (auto BlueprintEditor : BlueprintEditors)
@@ -209,9 +214,13 @@ void FUnLuaEditorToolbar::UnbindFromLua_Executed() const
     if (!TargetClass->ImplementsInterface(UUnLuaInterface::StaticClass()))
         return;
 
+#if UE_VERSION_OLDER_THAN(5, 1, 0)
     FBlueprintEditorUtils::RemoveInterface(Blueprint, FName("UnLuaInterface"));
+#else
+    FBlueprintEditorUtils::RemoveInterface(Blueprint, FTopLevelAssetPath(UUnLuaInterface::StaticClass()));
+#endif
 
-#if ENGINE_MAJOR_VERSION > 4 || (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION >= 26)
+#if !UE_VERSION_OLDER_THAN(4, 26, 0)
 
     const auto BlueprintEditors = FModuleManager::LoadModuleChecked<FBlueprintEditorModule>("Kismet").GetBlueprintEditors();
     for (auto BlueprintEditor : BlueprintEditors)
diff --git a/Plugins/UnLua/Source/UnLuaEditor/Private/UnLuaAboutScreen.cpp b/Plugins/UnLua/Source/UnLuaEditor/Private/UnLuaAboutScreen.cpp
@@ -13,6 +13,7 @@
 // See the License for the specific language governing permissions and limitations under the License.
 
 #include "UnLuaAboutScreen.h"
+#include "Misc/EngineVersionComparison.h"
 #include "Widgets/SBoxPanel.h"
 #include "Widgets/SOverlay.h"
 #include "Widgets/SWindow.h"
@@ -63,7 +64,11 @@ void SUnLuaAboutScreen::Construct(const FArguments& InArgs)
                   .Padding(FMargin(10.f, 10.f, 0.f, 0.f))
                 [
                     SAssignNew(LogoButton, SButton)
+#if UE_VERSION_OLDER_THAN(5, 1, 0)
                     .ButtonStyle(FEditorStyle::Get(), "NoBorder")
+#else
+                    .ButtonStyle(FAppStyle::Get(), "NoBorder")
+#endif
                     .OnClicked(this, &SUnLuaAboutScreen::OnLogoButtonClicked)
                     [
                         SNew(SImage).Image(FUnLuaEditorStyle::GetInstance()->GetBrush("UnLuaEditor.UnLuaLogo"))
diff --git a/Plugins/UnLua/Source/UnLuaEditor/Private/UnLuaIntelliSenseGenerator.cpp b/Plugins/UnLua/Source/UnLuaEditor/Private/UnLuaIntelliSenseGenerator.cpp
@@ -14,7 +14,7 @@
 
 #include "Misc/EngineVersionComparison.h"
 #include "UnLuaIntelliSenseGenerator.h"
-#if UE_VERSION_NEWER_THAN(5, 2, 0)
+#if UE_VERSION_NEWER_THAN(5, 1, 0)
 #include "AssetRegistry/AssetRegistryModule.h"
 #else
 #include "AssetRegistryModule.h"
@@ -108,8 +108,13 @@ void FUnLuaIntelliSenseGenerator::UpdateAll()
 
 bool FUnLuaIntelliSenseGenerator::IsBlueprint(const FAssetData& AssetData)
 {
+#if UE_VERSION_OLDER_THAN(5, 1, 0)
     const FName AssetClass = AssetData.AssetClass;
     return AssetClass == UBlueprint::StaticClass()->GetFName() || AssetClass == UWidgetBlueprint::StaticClass()->GetFName();
+#else
+    const auto AssetClassPath = AssetData.AssetClassPath.ToString();
+    return AssetClassPath == UBlueprint::StaticClass()->GetName() || AssetClassPath == UWidgetBlueprint::StaticClass()->GetName();
+#endif
 }
 
 bool FUnLuaIntelliSenseGenerator::ShouldExport(const FAssetData& AssetData, bool bLoad)
diff --git a/Plugins/UnLuaTestSuite/Source/UnLuaTestSuite/Private/Tests/Issue562Test.cpp b/Plugins/UnLuaTestSuite/Source/UnLuaTestSuite/Private/Tests/Issue562Test.cpp
@@ -14,6 +14,7 @@
 
 
 #include "LowLevel.h"
+#include "UnLuaCompatibility.h"
 #include "UnLuaSettings.h"
 #include "UnLuaTestCommon.h"
 #include "UnLuaTestHelpers.h"
@@ -40,11 +41,11 @@ struct FUnLuaTest_Issue562 : FUnLuaTestBase
         )";
         UnLua::RunChunk(L, Chunk1);
 
-        const auto Before = FindObject<UClass>(ANY_PACKAGE, TEXT("BPI_Issue562_C"));
+        const auto Before = FindFirstObject<UClass>(TEXT("BPI_Issue562_C"));
         RUNNER_TEST_NOT_NULL(Before);
 
         CollectGarbage(RF_NoFlags, true);
-        const auto After = FindObject<UClass>(ANY_PACKAGE, TEXT("BPI_Issue562_C"));
+        const auto After = FindFirstObject<UClass>(TEXT("BPI_Issue562_C"));
         RUNNER_TEST_NULL(After);
 
         lua_gc(L, LUA_GCCOLLECT);
diff --git a/Plugins/UnLuaTestSuite/Source/UnLuaTestSuite/Private/Tests/Issue585Test.cpp b/Plugins/UnLuaTestSuite/Source/UnLuaTestSuite/Private/Tests/Issue585Test.cpp
@@ -12,7 +12,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
 // See the License for the specific language governing permissions and limitations under the License.
 
-
+#include "UnLuaCompatibility.h"
 #include "UnLuaSettings.h"
 #include "UnLuaTestCommon.h"
 #include "UnLuaTestHelpers.h"
@@ -40,7 +40,7 @@ struct FUnLuaTest_Issue585 : FUnLuaTestBase
 
         // 无引用被GC回收
         CollectGarbage(RF_NoFlags, true);
-        RUNNER_TEST_NULL(FindObject<UEnum>(ANY_PACKAGE, TEXT("Enum_UserDefined")));
+        RUNNER_TEST_NULL(FindFirstObject<UEnum>(TEXT("Enum_UserDefined")));
 
         // 被回收后能够自动加载
         const auto Chunk2 = R"(
@@ -50,7 +50,7 @@ struct FUnLuaTest_Issue585 : FUnLuaTestBase
         
         // 无引用被GC回收
         CollectGarbage(RF_NoFlags, true);
-        RUNNER_TEST_NULL(FindObject<UEnum>(ANY_PACKAGE, TEXT("Enum_UserDefined")));
+        RUNNER_TEST_NULL(FindFirstObject<UEnum>(TEXT("Enum_UserDefined")));
 
         // 支持UnLua.Ref来持有
         const auto Chunk3 = R"(

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`#pragma once`
`16`	`16`
`17`	`17`	`#include "CoreMinimal.h"`
	`18`	`+#include "UnLuaCompatibility.h"`
`18`	`19`
`19`	`20`	`class IParamValue`
`20`	`21`	`{`
`@@ -53,7 +54,7 @@ class FRuntimeEnumParamValue : public IParamValue`
`53`	`54`	`{`
`54`	`55`	`if (!bInitialized)`
`55`	`56`	`{`
`56`		`- UEnum* Enum = FindObjectChecked<UEnum>(ANY_PACKAGE, *TypeName);`
	`57`	`+ UEnum* Enum = FindFirstObject<UEnum>(*TypeName);`
`57`	`58`	`Value = Enum->GetValueByIndex(Index);`
`58`	`59`	`bInitialized = true;`
`59`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include "Misc/EngineVersionComparison.h"`
	`2`	`+#include "UnLuaCompatibility.h"`
`2`	`3`	`#include "PropertyRegistry.h"`
`3`	`4`	`#include "Binding.h"`
`4`	`5`	`#include "ClassRegistry.h"`
`@@ -12,7 +13,7 @@ namespace UnLua`
`12`	`13`	`FPropertyRegistry::FPropertyRegistry(FLuaEnv* Env)`
`13`	`14`	`: Env(Env)`
`14`	`15`	`{`
`15`		`- PropertyCollector = FindObject<UScriptStruct>(ANY_PACKAGE, TEXT("PropertyCollector"));`
	`16`	`+ PropertyCollector = FindFirstObject<UScriptStruct>(TEXT("PropertyCollector"));`
`16`	`17`	`check(PropertyCollector);`
`17`	`18`	`}`
`18`	`19`