updating ETriggerType to EPfTriggerType (#46)

PlayFab · Apr 13, 2021 · 87d3470 · 87d3470
1 parent 3f00a9b
commit 87d3470
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 8 deletions.
diff --git a/4.23/ExampleProject/Plugins/PlayFab/Source/PlayFab/Classes/PlayFabEnums.h b/4.23/ExampleProject/Plugins/PlayFab/Source/PlayFab/Classes/PlayFabEnums.h
@@ -1363,7 +1363,7 @@ enum class EIdentifiedDeviceType : uint8
 /** TriggerType */
 
 UENUM(BlueprintType)
-enum class ETriggerType : uint8
+enum class EPfTriggerType : uint8
 {
     pfenum_HTTP UMETA(DisplayName = "HTTP"),
     pfenum_Queue UMETA(DisplayName = "Queue"),

diff --git a/4.23/PlayFabPlugin/PlayFab/Source/PlayFab/Classes/PlayFabEnums.h b/4.23/PlayFabPlugin/PlayFab/Source/PlayFab/Classes/PlayFabEnums.h
@@ -1363,7 +1363,7 @@ enum class EIdentifiedDeviceType : uint8
 /** TriggerType */
 
 UENUM(BlueprintType)
-enum class ETriggerType : uint8
+enum class EPfTriggerType : uint8
 {
     pfenum_HTTP UMETA(DisplayName = "HTTP"),
     pfenum_Queue UMETA(DisplayName = "Queue"),

diff --git a/4.24/ExampleProject/Plugins/PlayFab/Source/PlayFab/Classes/PlayFabEnums.h b/4.24/ExampleProject/Plugins/PlayFab/Source/PlayFab/Classes/PlayFabEnums.h
@@ -1363,7 +1363,7 @@ enum class EIdentifiedDeviceType : uint8
 /** TriggerType */
 
 UENUM(BlueprintType)
-enum class ETriggerType : uint8
+enum class EPfTriggerType : uint8
 {
     pfenum_HTTP UMETA(DisplayName = "HTTP"),
     pfenum_Queue UMETA(DisplayName = "Queue"),

diff --git a/4.24/PlayFabPlugin/PlayFab/Source/PlayFab/Classes/PlayFabEnums.h b/4.24/PlayFabPlugin/PlayFab/Source/PlayFab/Classes/PlayFabEnums.h
@@ -1363,7 +1363,7 @@ enum class EIdentifiedDeviceType : uint8
 /** TriggerType */
 
 UENUM(BlueprintType)
-enum class ETriggerType : uint8
+enum class EPfTriggerType : uint8
 {
     pfenum_HTTP UMETA(DisplayName = "HTTP"),
     pfenum_Queue UMETA(DisplayName = "Queue"),

diff --git a/4.25/ExampleProject/Plugins/PlayFab/Source/PlayFab/Classes/PlayFabEnums.h b/4.25/ExampleProject/Plugins/PlayFab/Source/PlayFab/Classes/PlayFabEnums.h
@@ -1363,7 +1363,7 @@ enum class EIdentifiedDeviceType : uint8
 /** TriggerType */
 
 UENUM(BlueprintType)
-enum class ETriggerType : uint8
+enum class EPfTriggerType : uint8
 {
     pfenum_HTTP UMETA(DisplayName = "HTTP"),
     pfenum_Queue UMETA(DisplayName = "Queue"),

diff --git a/4.25/PlayFabPlugin/PlayFab/Source/PlayFab/Classes/PlayFabEnums.h b/4.25/PlayFabPlugin/PlayFab/Source/PlayFab/Classes/PlayFabEnums.h
@@ -1363,7 +1363,7 @@ enum class EIdentifiedDeviceType : uint8
 /** TriggerType */
 
 UENUM(BlueprintType)
-enum class ETriggerType : uint8
+enum class EPfTriggerType : uint8
 {
     pfenum_HTTP UMETA(DisplayName = "HTTP"),
     pfenum_Queue UMETA(DisplayName = "Queue"),

diff --git a/4.26/ExampleProject/Plugins/PlayFab/Source/PlayFab/Classes/PlayFabEnums.h b/4.26/ExampleProject/Plugins/PlayFab/Source/PlayFab/Classes/PlayFabEnums.h
@@ -1363,7 +1363,7 @@ enum class EIdentifiedDeviceType : uint8
 /** TriggerType */
 
 UENUM(BlueprintType)
-enum class ETriggerType : uint8
+enum class EPfTriggerType : uint8
 {
     pfenum_HTTP UMETA(DisplayName = "HTTP"),
     pfenum_Queue UMETA(DisplayName = "Queue"),

diff --git a/4.26/PlayFabPlugin/PlayFab/Source/PlayFab/Classes/PlayFabEnums.h b/4.26/PlayFabPlugin/PlayFab/Source/PlayFab/Classes/PlayFabEnums.h
@@ -1363,7 +1363,7 @@ enum class EIdentifiedDeviceType : uint8
 /** TriggerType */
 
 UENUM(BlueprintType)
-enum class ETriggerType : uint8
+enum class EPfTriggerType : uint8
 {
     pfenum_HTTP UMETA(DisplayName = "HTTP"),
     pfenum_Queue UMETA(DisplayName = "Queue"),

diff --git a/UpgradeGuide_2104.md b/UpgradeGuide_2104.md
@@ -0,0 +1,12 @@
+# Unreal 2104 Upgrade Guide
+
+We have ran into a generic naming conflict with the enum ETriggerType. We are updating our enum to EPfTriggerType.
+
+## Upgrade instructions
+
+If you are using ETriggerType, see the new name in "PlayFabPlugin/Source/PlayFab/Classes/PlayFabEnums.h". If you used this enum via C++ code:
+
+* Replace:
+    * ETriggerType
+* With:
+    * EPfTriggerType
diff --git a/template/makeBp.js b/template/makeBp.js
@@ -72,6 +72,8 @@ function getDataTypeSafeName(apiElement, attrName) {
     var pfTypeName = apiElement[attrName];
     if (pfTypeName === "SourceType") // In Unreal, the Enum ESourceType exists in the Android builder and conflicts with our ESourceType enum
         return "PfSourceType";
+    if (pfTypeName === "TriggerType") // In Unreal, the Enum ETriggerType exists in the Enhanced Input plugin and conflicts with our ETriggerType enum
+        return "PfTriggerType"
     return pfTypeName;
 }
 exports.getDataTypeSafeName = getDataTypeSafeName;