- Update for 5.7. Fixed deprecation warnings.

Author: rfsheffer

Source/RyEditorK2Nodes/Private/K2Node_LoadPackageWithPriority.cpp

@@ -413,7 +413,11 @@ UEnum* UK2Node_LoadPackageWithPriority::GetRyAsyncLoadingResultEnum()
 {
 	if(!RyAsyncLoadingResultEnum)
 	{
+#if (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 7) || ENGINE_MAJOR_VERSION > 5
+		RyAsyncLoadingResultEnum = FindObject<UEnum>(nullptr, TEXT("/Script/RyRuntime.ERyAsyncLoadingResult"), EFindObjectFlags::ExactClass);
+#else
 		RyAsyncLoadingResultEnum = FindObject<UEnum>(nullptr, TEXT("/Script/RyRuntime.ERyAsyncLoadingResult"), true);
+#endif
 		check(RyAsyncLoadingResultEnum);
 		PreloadObject(RyAsyncLoadingResultEnum);
 	}

Source/RyRuntime/Private/RyRuntimeLevelHelpers.cpp

@@ -311,7 +311,11 @@ bool URyRuntimeLevelHelpers::IsLevelPersistentLevel(const ULevel* levelIn)
 */
 UObject* URyRuntimeLevelHelpers::FindObjectInLevelByName(ULevel* levelToSearch, const FString& nameToFind)
 {
+#if (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 7) || ENGINE_MAJOR_VERSION > 5
+    return StaticFindObject(/*Class=*/ nullptr, levelToSearch, *nameToFind, EFindObjectFlags::ExactClass);
+#else
     return StaticFindObject(/*Class=*/ nullptr, levelToSearch, *nameToFind, true);
+#endif
 }
 
 //---------------------------------------------------------------------------------------------------------------------

Source/RyRuntime/Private/RyRuntimeMetaHelpers.cpp

@@ -15,7 +15,11 @@ bool URyRuntimeMetaHelpers::GetEnumIndexFromName(const FString enumName, FName e
 #if ENGINE_MAJOR_VERSION < 5
 	outerIn = ANY_PACKAGE;
 #endif
+#if (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 7) || ENGINE_MAJOR_VERSION > 5
+	const UEnum* EnumPtr = FindObject<UEnum>(outerIn, *enumName);
+#else
 	const UEnum* EnumPtr = FindObject<UEnum>(outerIn, *enumName, false);
+#endif
 	if(!EnumPtr)
 	{
 		// Look for the dynamic enum
@@ -57,7 +61,11 @@ bool URyRuntimeMetaHelpers::GetEnumValueFromName(const FString enumName, const F
 #if ENGINE_MAJOR_VERSION < 5
 	outerIn = ANY_PACKAGE;
 #endif
+#if (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 7) || ENGINE_MAJOR_VERSION > 5
+	const UEnum* EnumPtr = FindObject<UEnum>(outerIn, *enumName);
+#else
 	const UEnum* EnumPtr = FindObject<UEnum>(outerIn, *enumName, false);
+#endif
 	if(!EnumPtr)
 	{
 		// Look for the dynamic enum
@@ -98,7 +106,11 @@ bool URyRuntimeMetaHelpers::GetEnumNameByIndex(const FString enumName, const uin
 #if ENGINE_MAJOR_VERSION < 5
 	outerIn = ANY_PACKAGE;
 #endif
+#if (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 7) || ENGINE_MAJOR_VERSION > 5
+	const UEnum* EnumPtr = FindObject<UEnum>(outerIn, *enumName);
+#else
 	const UEnum* EnumPtr = FindObject<UEnum>(outerIn, *enumName, false);
+#endif
 	if(!EnumPtr)
 	{
 		// Look for the dynamic enum
@@ -134,7 +146,11 @@ bool URyRuntimeMetaHelpers::GetEnumNameByValue(const FString enumName, const int
 #if ENGINE_MAJOR_VERSION < 5
 	outerIn = ANY_PACKAGE;
 #endif
+#if (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 7) || ENGINE_MAJOR_VERSION > 5
+	const UEnum* EnumPtr = FindObject<UEnum>(outerIn, *enumName);
+#else
 	const UEnum* EnumPtr = FindObject<UEnum>(outerIn, *enumName, false);
+#endif
 	if(!EnumPtr)
 	{
 		// Look for the dynamic enum

Source/RyRuntime/Public/RyRuntimeMathHelpers.h

@@ -538,20 +538,20 @@ class RYRUNTIME_API URyRuntimeMathHelpers : public UBlueprintFunctionLibrary
 	/** 
 	* Checks whether the given location is inside this box.
 	* 
-	* @param position - The location to test for inside the bounding volume.
+	* @param in - The location to test for inside the bounding volume.
 	* @return true if location is inside this volume.
 	*/
 	UFUNCTION(BlueprintPure, Category="RyRuntime|Math|Box")
-	static bool IsPositionInsideBox(const FVector& position, const FBox& box);
+	static bool IsPositionInsideBox(const FVector& in, const FBox& box);
 
 	/** 
 	* Checks whether the given location is inside or on this box.
 	* 
-	* @param position - The location to test for inside the bounding volume.
+	* @param in - The location to test for inside the bounding volume.
 	* @return true if location is inside this volume.
 	*/
 	UFUNCTION(BlueprintPure, Category="RyRuntime|Math|Box")
-	static bool IsPositionInsideOrOnBox(const FVector& position, const FBox& box);
+	static bool IsPositionInsideOrOnBox(const FVector& in, const FBox& box);
 
 	/** 
 	* Checks whether a given box is fully encapsulated by this box.
@@ -565,11 +565,11 @@ class RYRUNTIME_API URyRuntimeMathHelpers : public UBlueprintFunctionLibrary
 	/** 
 	* Checks whether the given location is inside this box in the XY plane.
 	* 
-	* @param position - The location to test for inside the bounding box.
+	* @param in - The location to test for inside the bounding box.
 	* @return true if location is inside this box in the XY plane.
 	*/
 	UFUNCTION(BlueprintPure, Category="RyRuntime|Math|Box")
-	static bool IsPositionInsideBoxXY(const FVector& position, const FBox& box);
+	static bool IsPositionInsideBoxXY(const FVector& in, const FBox& box);
 
 	/** 
 	* Checks whether the given box is fully encapsulated by this box in the XY plane.
@@ -1073,18 +1073,18 @@ void URyRuntimeMathHelpers::TransformBoxBy(const FBox& boxToTransform, const FTr
 /**
 */
 FORCEINLINE
-bool URyRuntimeMathHelpers::IsPositionInsideBox(const FVector& position, const FBox& box)
+bool URyRuntimeMathHelpers::IsPositionInsideBox(const FVector& in, const FBox& box)
 {
-	return box.IsInside(position);
+	return box.IsInside(in);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
 */
 FORCEINLINE
-bool URyRuntimeMathHelpers::IsPositionInsideOrOnBox(const FVector& position, const FBox& box)
+bool URyRuntimeMathHelpers::IsPositionInsideOrOnBox(const FVector& in, const FBox& box)
 {
-	return box.IsInsideOrOn(position);
+	return box.IsInsideOrOn(in);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -1100,9 +1100,9 @@ bool URyRuntimeMathHelpers::IsBoxInsideOtherBox(const FBox& box, const FBox& oth
 /**
 */
 FORCEINLINE
-bool URyRuntimeMathHelpers::IsPositionInsideBoxXY(const FVector& position, const FBox& box)
+bool URyRuntimeMathHelpers::IsPositionInsideBoxXY(const FVector& in, const FBox& box)
 {
-	return box.IsInsideXY(position);
+	return box.IsInsideXY(in);
 }
 
 //---------------------------------------------------------------------------------------------------------------------