diff --git a/Source/PubnubLibrary/Private/FunctionLibraries/PubnubJsonUtilities.cpp b/Source/PubnubLibrary/Private/FunctionLibraries/PubnubJsonUtilities.cpp index 8c5c05e..4724a89 100644 --- a/Source/PubnubLibrary/Private/FunctionLibraries/PubnubJsonUtilities.cpp +++ b/Source/PubnubLibrary/Private/FunctionLibraries/PubnubJsonUtilities.cpp @@ -188,7 +188,7 @@ void UPubnubJsonUtilities::FetchHistoryJsonToData(FString ResponseJson, bool& Er } } -void UPubnubJsonUtilities::FOnGetAllUUIDMetadataJsonToData(FString ResponseJson, int& Status, TArray& UsersData, FString& PageNext, FString& PagePrev) +void UPubnubJsonUtilities::GetAllUUIDMetadataJsonToData(FString ResponseJson, int& Status, TArray& UsersData, FString& PageNext, FString& PagePrev) { TSharedPtr JsonObject = MakeShareable(new FJsonObject); @@ -213,7 +213,7 @@ void UPubnubJsonUtilities::FOnGetAllUUIDMetadataJsonToData(FString ResponseJson, } } -void UPubnubJsonUtilities::FOnGetUUIDMetadataJsonToData(FString ResponseJson, int& Status, FPubnubUserData& UserData) +void UPubnubJsonUtilities::GetUUIDMetadataJsonToData(FString ResponseJson, int& Status, FPubnubUserData& UserData) { TSharedPtr JsonObject = MakeShareable(new FJsonObject); @@ -234,7 +234,7 @@ void UPubnubJsonUtilities::FOnGetUUIDMetadataJsonToData(FString ResponseJson, in } } -void UPubnubJsonUtilities::FOnGetAllChannelMetadataJsonToData(FString ResponseJson, int& Status, TArray& ChannelsData, FString& PageNext, FString& PagePrev) +void UPubnubJsonUtilities::GetAllChannelMetadataJsonToData(FString ResponseJson, int& Status, TArray& ChannelsData, FString& PageNext, FString& PagePrev) { TSharedPtr JsonObject = MakeShareable(new FJsonObject); @@ -259,7 +259,7 @@ void UPubnubJsonUtilities::FOnGetAllChannelMetadataJsonToData(FString ResponseJs } } -void UPubnubJsonUtilities::FOnGetChannelMetadataJsonToData(FString ResponseJson, int& Status, FPubnubChannelData& ChannelData) +void UPubnubJsonUtilities::GetChannelMetadataJsonToData(FString ResponseJson, int& Status, FPubnubChannelData& ChannelData) { TSharedPtr JsonObject = MakeShareable(new FJsonObject); @@ -280,7 +280,7 @@ void UPubnubJsonUtilities::FOnGetChannelMetadataJsonToData(FString ResponseJson, } } -void UPubnubJsonUtilities::FOnGetMessageActionsJsonToData(FString ResponseJson, int& Status, TArray& MessageActions) +void UPubnubJsonUtilities::GetMessageActionsJsonToData(FString ResponseJson, int& Status, TArray& MessageActions) { TSharedPtr JsonObject = MakeShareable(new FJsonObject); diff --git a/Source/PubnubLibrary/Private/PubnubSubsystem.cpp b/Source/PubnubLibrary/Private/PubnubSubsystem.cpp index 85872cc..8495f9a 100644 --- a/Source/PubnubLibrary/Private/PubnubSubsystem.cpp +++ b/Source/PubnubLibrary/Private/PubnubSubsystem.cpp @@ -1743,7 +1743,7 @@ void UPubnubSubsystem::GetAllUUIDMetadata_DATA_priv(FOnGetAllUUIDMetadataRespons TArray UsersData; FString PageNext; FString PagePrev; - UPubnubJsonUtilities::FOnGetAllUUIDMetadataJsonToData(JsonResponse, Status, UsersData, PageNext, PagePrev); + UPubnubJsonUtilities::GetAllUUIDMetadataJsonToData(JsonResponse, Status, UsersData, PageNext, PagePrev); //Broadcast bound delegate with parsed response OnGetAllUUIDMetadataResponse.ExecuteIfBound(Status, UsersData, PageNext, PagePrev); @@ -1808,7 +1808,7 @@ void UPubnubSubsystem::GetUUIDMetadata_DATA_priv(FString UUIDMetadataID, FOnGetU //Parse Json response into data int Status; FPubnubUserData UserData; - UPubnubJsonUtilities::FOnGetUUIDMetadataJsonToData(JsonResponse, Status, UserData); + UPubnubJsonUtilities::GetUUIDMetadataJsonToData(JsonResponse, Status, UserData); //Broadcast bound delegate with parsed response OnGetUUIDMetadataResponse.ExecuteIfBound(Status, UserData); @@ -1883,7 +1883,7 @@ void UPubnubSubsystem::GetAllChannelMetadata_DATA_priv(FOnGetAllChannelMetadataR TArray ChannelsData; FString PageNext; FString PagePrev; - UPubnubJsonUtilities::FOnGetAllChannelMetadataJsonToData(JsonResponse, Status, ChannelsData, PageNext, PagePrev); + UPubnubJsonUtilities::GetAllChannelMetadataJsonToData(JsonResponse, Status, ChannelsData, PageNext, PagePrev); //Broadcast bound delegate with parsed response OnGetAllChannelMetadataResponse.ExecuteIfBound(Status, ChannelsData, PageNext, PagePrev); @@ -1948,7 +1948,7 @@ void UPubnubSubsystem::GetChannelMetadata_DATA_priv(FString ChannelMetadataID, F //Parse Json response into data int Status; FPubnubChannelData ChannelData; - UPubnubJsonUtilities::FOnGetChannelMetadataJsonToData(JsonResponse, Status, ChannelData); + UPubnubJsonUtilities::GetChannelMetadataJsonToData(JsonResponse, Status, ChannelData); //Broadcast bound delegate with parsed response OnGetChannelMetadataResponse.ExecuteIfBound(Status, ChannelData); @@ -2247,7 +2247,7 @@ void UPubnubSubsystem::GetMessageActions_DATA_priv(FString ChannelName, FString //Parse Json response into data int Status; TArray MessageActions; - UPubnubJsonUtilities::FOnGetMessageActionsJsonToData(JsonResponse, Status, MessageActions); + UPubnubJsonUtilities::GetMessageActionsJsonToData(JsonResponse, Status, MessageActions); //Broadcast bound delegate with parsed response OnGetMessageActionsResponse.ExecuteIfBound(Status, MessageActions); diff --git a/Source/PubnubLibrary/Public/FunctionLibraries/PubnubJsonUtilities.h b/Source/PubnubLibrary/Public/FunctionLibraries/PubnubJsonUtilities.h index 74bf5f6..b8d30e4 100644 --- a/Source/PubnubLibrary/Public/FunctionLibraries/PubnubJsonUtilities.h +++ b/Source/PubnubLibrary/Public/FunctionLibraries/PubnubJsonUtilities.h @@ -37,19 +37,19 @@ class PUBNUBLIBRARY_API UPubnubJsonUtilities : public UBlueprintFunctionLibrary static void FetchHistoryJsonToData(FString ResponseJson, bool &Error, int &Status, FString &ErrorMessage, TArray &Messages); UFUNCTION(BlueprintCallable, BlueprintPure, Category="Pubnub|Json Utilities") - static void FOnGetAllUUIDMetadataJsonToData(FString ResponseJson, int &Status, TArray &UsersData, FString &PageNext, FString &PagePrev); + static void GetAllUUIDMetadataJsonToData(FString ResponseJson, int &Status, TArray &UsersData, FString &PageNext, FString &PagePrev); UFUNCTION(BlueprintCallable, BlueprintPure, Category="Pubnub|Json Utilities") - static void FOnGetUUIDMetadataJsonToData(FString ResponseJson, int &Status, FPubnubUserData &UserData); + static void GetUUIDMetadataJsonToData(FString ResponseJson, int &Status, FPubnubUserData &UserData); UFUNCTION(BlueprintCallable, BlueprintPure, Category="Pubnub|Json Utilities") - static void FOnGetAllChannelMetadataJsonToData(FString ResponseJson, int &Status, TArray &ChannelsData, FString &PageNext, FString &PagePrev); + static void GetAllChannelMetadataJsonToData(FString ResponseJson, int &Status, TArray &ChannelsData, FString &PageNext, FString &PagePrev); UFUNCTION(BlueprintCallable, BlueprintPure, Category="Pubnub|Json Utilities") - static void FOnGetChannelMetadataJsonToData(FString ResponseJson, int &Status, FPubnubChannelData &ChannelData); + static void GetChannelMetadataJsonToData(FString ResponseJson, int &Status, FPubnubChannelData &ChannelData); UFUNCTION(BlueprintCallable, BlueprintPure, Category="Pubnub|Json Utilities") - static void FOnGetMessageActionsJsonToData(FString ResponseJson, int &Status, TArray &MessageActions); + static void GetMessageActionsJsonToData(FString ResponseJson, int &Status, TArray &MessageActions); UFUNCTION(BlueprintCallable, BlueprintPure, Category="Pubnub|Json Utilities") static FPubnubUserData GetUserDataFromJson(FString ResponseJson);