From 642c6618207ec10f3008e1a6ebd4f00216d73720 Mon Sep 17 00:00:00 2001 From: Max Klenk Date: Sun, 2 Dec 2018 09:09:12 +0100 Subject: [PATCH 1/2] rename EVaJson to StomtEVaJson to avoid naming conflicts --- .../StomtPlugin/Private/StomtJsonObject.cpp | 14 ++++++------- Source/StomtPlugin/Private/StomtJsonValue.cpp | 20 +++++++++---------- Source/StomtPlugin/Public/StomtJsonValue.h | 4 ++-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Source/StomtPlugin/Private/StomtJsonObject.cpp b/Source/StomtPlugin/Private/StomtJsonObject.cpp index 15dfbd9..061f4d4 100644 --- a/Source/StomtPlugin/Private/StomtJsonObject.cpp +++ b/Source/StomtPlugin/Private/StomtJsonObject.cpp @@ -250,30 +250,30 @@ void UStomtRestJsonObject::SetArrayField(const FString& FieldName, const TArray< switch (InVal->GetType()) { - case EVaJson::None: + case StomtEVaJson::None: break; - case EVaJson::Null: + case StomtEVaJson::Null: ValArray.Add(MakeShareable(new FJsonValueNull())); break; - case EVaJson::String: + case StomtEVaJson::String: ValArray.Add(MakeShareable(new FJsonValueString(JsonVal->AsString()))); break; - case EVaJson::Number: + case StomtEVaJson::Number: ValArray.Add(MakeShareable(new FJsonValueNumber(JsonVal->AsNumber()))); break; - case EVaJson::Boolean: + case StomtEVaJson::Boolean: ValArray.Add(MakeShareable(new FJsonValueBoolean(JsonVal->AsBool()))); break; - case EVaJson::Array: + case StomtEVaJson::Array: ValArray.Add(MakeShareable(new FJsonValueArray(JsonVal->AsArray()))); break; - case EVaJson::Object: + case StomtEVaJson::Object: ValArray.Add(MakeShareable(new FJsonValueObject(JsonVal->AsObject()))); break; diff --git a/Source/StomtPlugin/Private/StomtJsonValue.cpp b/Source/StomtPlugin/Private/StomtJsonValue.cpp index 7f3f603..a5bdbbd 100644 --- a/Source/StomtPlugin/Private/StomtJsonValue.cpp +++ b/Source/StomtPlugin/Private/StomtJsonValue.cpp @@ -77,38 +77,38 @@ void UStomtJsonValue::SetRootValue(TSharedPtr& JsonValue) //////////////////////////////////////////////////////////////////////////// //// FJsonValue API -EVaJson::Type UStomtJsonValue::GetType() const +StomtEVaJson::Type UStomtJsonValue::GetType() const { if (!(JsonVal.IsValid())) { - return EVaJson::None; + return StomtEVaJson::None; } switch (JsonVal->Type) { case EJson::None: - return EVaJson::None; + return StomtEVaJson::None; case EJson::Null: - return EVaJson::Null; + return StomtEVaJson::Null; case EJson::String: - return EVaJson::String; + return StomtEVaJson::String; case EJson::Number: - return EVaJson::Number; + return StomtEVaJson::Number; case EJson::Boolean: - return EVaJson::Boolean; + return StomtEVaJson::Boolean; case EJson::Array: - return EVaJson::Array; + return StomtEVaJson::Array; case EJson::Object: - return EVaJson::Object; + return StomtEVaJson::Object; default: - return EVaJson::None; + return StomtEVaJson::None; } } diff --git a/Source/StomtPlugin/Public/StomtJsonValue.h b/Source/StomtPlugin/Public/StomtJsonValue.h index d4a268f..9dd1a86 100644 --- a/Source/StomtPlugin/Public/StomtJsonValue.h +++ b/Source/StomtPlugin/Public/StomtJsonValue.h @@ -8,7 +8,7 @@ * Represents all the types a Json Value can be. */ UENUM(BlueprintType) -namespace EVaJson +namespace StomtEVaJson { enum Type { @@ -64,7 +64,7 @@ class UStomtJsonValue : public UObject /** Get type of Json value (Enum) */ UFUNCTION(BlueprintCallable, Category = "Stomt|Json") - EVaJson::Type GetType() const; + StomtEVaJson::Type GetType() const; /** Get type of Json value (String) */ UFUNCTION(BlueprintCallable, Category = "Stomt|Json") From fc8b3dbef3990da7204778bb040f00c5e5f9c768 Mon Sep 17 00:00:00 2001 From: Max Klenk Date: Sun, 2 Dec 2018 09:35:49 +0100 Subject: [PATCH 2/2] resolve more potential naming conflicts --- Source/StomtPlugin/Private/StomtAPI.cpp | 12 +++++------ .../StomtPlugin/Private/StomtJsonObject.cpp | 14 ++++++------- Source/StomtPlugin/Private/StomtJsonValue.cpp | 20 +++++++++---------- .../StomtPlugin/Private/StomtRestRequest.cpp | 12 +++++------ Source/StomtPlugin/Public/StomtJsonValue.h | 4 ++-- Source/StomtPlugin/Public/StomtRestRequest.h | 12 +++++------ 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Source/StomtPlugin/Private/StomtAPI.cpp b/Source/StomtPlugin/Private/StomtAPI.cpp index ced10a6..e8e2019 100644 --- a/Source/StomtPlugin/Private/StomtAPI.cpp +++ b/Source/StomtPlugin/Private/StomtAPI.cpp @@ -212,7 +212,7 @@ void UStomtAPI::SendStomtLabels(UStomt * stomt) this->Request->ResetRequestData(); UE_LOG(LogTemp, Warning, TEXT("nice1")); - this->Request->SetVerb(ERequestVerb::POST); + this->Request->SetVerb(StomtEnumRequestVerb::POST); this->Request->SetHeader(TEXT("appid"), this->GetAppID() ); this->Request->GetRequestObject()->SetField(TEXT("name"), UStomtJsonValue::ConstructJsonValueString( this, TEXT("newlabeltest") )); @@ -234,7 +234,7 @@ UStomtRestRequest* UStomtAPI::RequestSession(FString Accesstoken) request->OnRequestComplete.AddDynamic(this, &UStomtAPI::OnRequestSessionResponse); request->OnRequestFail.AddDynamic(this, &UStomtAPI::OnARequestFailed); - request->SetVerb(ERequestVerb::GET); + request->SetVerb(StomtEnumRequestVerb::GET); request->SetHeader(TEXT("appid"), this->GetAppID()); request->SetHeader(TEXT("accesstoken"), this->Config->GetAccessToken()); @@ -276,7 +276,7 @@ UStomtRestRequest* UStomtAPI::RequestTargetByAppID() request->OnRequestComplete.AddDynamic(this, &UStomtAPI::OnRequestTargetResponse); request->OnRequestFail.AddDynamic(this, &UStomtAPI::OnARequestFailed); - request->SetVerb(ERequestVerb::GET); + request->SetVerb(StomtEnumRequestVerb::GET); request->SetHeader(TEXT("appid"), this->GetAppID()); request->ProcessURL(this->GetRestURL().Append("/targets/")); @@ -290,7 +290,7 @@ UStomtRestRequest* UStomtAPI::RequestTarget(FString TargetID) request->OnRequestComplete.AddDynamic(this, &UStomtAPI::OnRequestTargetResponse); request->OnRequestFail.AddDynamic(this, &UStomtAPI::OnARequestFailed); - request->SetVerb(ERequestVerb::GET); + request->SetVerb(StomtEnumRequestVerb::GET); request->SetHeader(TEXT("appid"), this->GetAppID()); request->ProcessURL(this->GetRestURL().Append("/targets/").Append(TargetID)); @@ -945,7 +945,7 @@ UStomtRestRequest* UStomtAPI::SetupNewPostRequest() UStomtRestRequest* request = NewObject(); request->OnRequestFail.AddDynamic(this, &UStomtAPI::OnARequestFailed); - request->SetVerb(ERequestVerb::POST); + request->SetVerb(StomtEnumRequestVerb::POST); request->SetHeader(TEXT("appid"), this->GetAppID()); this->AddAccesstokenToRequest(request); @@ -958,7 +958,7 @@ UStomtRestRequest * UStomtAPI::SetupNewDeleteRequest() UStomtRestRequest* request = NewObject(); request->OnRequestFail.AddDynamic(this, &UStomtAPI::OnARequestFailed); - request->SetVerb(ERequestVerb::DEL); + request->SetVerb(StomtEnumRequestVerb::DEL); request->SetHeader(TEXT("appid"), this->GetAppID()); this->AddAccesstokenToRequest(request); diff --git a/Source/StomtPlugin/Private/StomtJsonObject.cpp b/Source/StomtPlugin/Private/StomtJsonObject.cpp index 061f4d4..f73c579 100644 --- a/Source/StomtPlugin/Private/StomtJsonObject.cpp +++ b/Source/StomtPlugin/Private/StomtJsonObject.cpp @@ -250,30 +250,30 @@ void UStomtRestJsonObject::SetArrayField(const FString& FieldName, const TArray< switch (InVal->GetType()) { - case StomtEVaJson::None: + case StomtEnumJson::None: break; - case StomtEVaJson::Null: + case StomtEnumJson::Null: ValArray.Add(MakeShareable(new FJsonValueNull())); break; - case StomtEVaJson::String: + case StomtEnumJson::String: ValArray.Add(MakeShareable(new FJsonValueString(JsonVal->AsString()))); break; - case StomtEVaJson::Number: + case StomtEnumJson::Number: ValArray.Add(MakeShareable(new FJsonValueNumber(JsonVal->AsNumber()))); break; - case StomtEVaJson::Boolean: + case StomtEnumJson::Boolean: ValArray.Add(MakeShareable(new FJsonValueBoolean(JsonVal->AsBool()))); break; - case StomtEVaJson::Array: + case StomtEnumJson::Array: ValArray.Add(MakeShareable(new FJsonValueArray(JsonVal->AsArray()))); break; - case StomtEVaJson::Object: + case StomtEnumJson::Object: ValArray.Add(MakeShareable(new FJsonValueObject(JsonVal->AsObject()))); break; diff --git a/Source/StomtPlugin/Private/StomtJsonValue.cpp b/Source/StomtPlugin/Private/StomtJsonValue.cpp index a5bdbbd..1c676ea 100644 --- a/Source/StomtPlugin/Private/StomtJsonValue.cpp +++ b/Source/StomtPlugin/Private/StomtJsonValue.cpp @@ -77,38 +77,38 @@ void UStomtJsonValue::SetRootValue(TSharedPtr& JsonValue) //////////////////////////////////////////////////////////////////////////// //// FJsonValue API -StomtEVaJson::Type UStomtJsonValue::GetType() const +StomtEnumJson::Type UStomtJsonValue::GetType() const { if (!(JsonVal.IsValid())) { - return StomtEVaJson::None; + return StomtEnumJson::None; } switch (JsonVal->Type) { case EJson::None: - return StomtEVaJson::None; + return StomtEnumJson::None; case EJson::Null: - return StomtEVaJson::Null; + return StomtEnumJson::Null; case EJson::String: - return StomtEVaJson::String; + return StomtEnumJson::String; case EJson::Number: - return StomtEVaJson::Number; + return StomtEnumJson::Number; case EJson::Boolean: - return StomtEVaJson::Boolean; + return StomtEnumJson::Boolean; case EJson::Array: - return StomtEVaJson::Array; + return StomtEnumJson::Array; case EJson::Object: - return StomtEVaJson::Object; + return StomtEnumJson::Object; default: - return StomtEVaJson::None; + return StomtEnumJson::None; } } diff --git a/Source/StomtPlugin/Private/StomtRestRequest.cpp b/Source/StomtPlugin/Private/StomtRestRequest.cpp index 20735d9..de3c1ca 100644 --- a/Source/StomtPlugin/Private/StomtRestRequest.cpp +++ b/Source/StomtPlugin/Private/StomtRestRequest.cpp @@ -27,7 +27,7 @@ UStomtRestRequest * UStomtRestRequest::ConstructRequest() return nullptr; } -void UStomtRestRequest::SetVerb(ERequestVerb::Type Verb) +void UStomtRestRequest::SetVerb(StomtEnumRequestVerb::Type Verb) { this->RequestVerb = Verb; } @@ -117,19 +117,19 @@ void UStomtRestRequest::ProcessRequest(TSharedRef HttpRequest) // Set verb switch (RequestVerb) { - case ERequestVerb::GET: + case StomtEnumRequestVerb::GET: HttpRequest->SetVerb(TEXT("GET")); break; - case ERequestVerb::POST: + case StomtEnumRequestVerb::POST: HttpRequest->SetVerb(TEXT("POST")); break; - case ERequestVerb::PUT: + case StomtEnumRequestVerb::PUT: HttpRequest->SetVerb(TEXT("PUT")); break; - case ERequestVerb::DEL: + case StomtEnumRequestVerb::DEL: HttpRequest->SetVerb(TEXT("DELETE")); break; @@ -268,7 +268,7 @@ void UStomtRestRequest::OnProcessRequestComplete(FHttpRequestPtr Request, FHttpR // Finish the latent action if (ContinueAction) { - FVaRestLatentAction *K = ContinueAction; + StomtLatentAction *K = ContinueAction; ContinueAction = nullptr; K->Call(ResponseJsonObj); diff --git a/Source/StomtPlugin/Public/StomtJsonValue.h b/Source/StomtPlugin/Public/StomtJsonValue.h index 9dd1a86..1a4d19a 100644 --- a/Source/StomtPlugin/Public/StomtJsonValue.h +++ b/Source/StomtPlugin/Public/StomtJsonValue.h @@ -8,7 +8,7 @@ * Represents all the types a Json Value can be. */ UENUM(BlueprintType) -namespace StomtEVaJson +namespace StomtEnumJson { enum Type { @@ -64,7 +64,7 @@ class UStomtJsonValue : public UObject /** Get type of Json value (Enum) */ UFUNCTION(BlueprintCallable, Category = "Stomt|Json") - StomtEVaJson::Type GetType() const; + StomtEnumJson::Type GetType() const; /** Get type of Json value (String) */ UFUNCTION(BlueprintCallable, Category = "Stomt|Json") diff --git a/Source/StomtPlugin/Public/StomtRestRequest.h b/Source/StomtPlugin/Public/StomtRestRequest.h index 4710e73..b5d49c8 100644 --- a/Source/StomtPlugin/Public/StomtRestRequest.h +++ b/Source/StomtPlugin/Public/StomtRestRequest.h @@ -8,7 +8,7 @@ /** * @author Original latent action class by https://github.com/unktomi */ -template class FVaRestLatentAction : public FPendingLatentAction +template class StomtLatentAction : public FPendingLatentAction { public: @@ -25,7 +25,7 @@ template class FVaRestLatentAction : public FPendingLatentAction void Cancel(); - FVaRestLatentAction(FWeakObjectPtr RequestObj, T& ResultParam, const FLatentActionInfo& LatentInfo) : + StomtLatentAction(FWeakObjectPtr RequestObj, T& ResultParam, const FLatentActionInfo& LatentInfo) : Called(false), Request(RequestObj), ExecutionFunction(LatentInfo.ExecutionFunction), @@ -64,7 +64,7 @@ template class FVaRestLatentAction : public FPendingLatentAction /** Verb (GET, PUT, POST) */ UENUM(BlueprintType) -namespace ERequestVerb +namespace StomtEnumRequestVerb { enum Type { @@ -95,7 +95,7 @@ class UStomtRestRequest : public UObject static UStomtRestRequest* ConstructRequest(); /** Set verb to the Request */ - void SetVerb(ERequestVerb::Type Verb); + void SetVerb(StomtEnumRequestVerb::Type Verb); /** Sets header info */ void SetHeader(const FString &HeaderName, const FString &HeaderValue); @@ -206,7 +206,7 @@ class UStomtRestRequest : public UObject FString StaticJsonOutputString; /** Latent action helper */ - FVaRestLatentAction *ContinueAction; + StomtLatentAction *ContinueAction; /** Internal Request data stored as JSON */ UPROPERTY() @@ -217,7 +217,7 @@ class UStomtRestRequest : public UObject UStomtRestJsonObject* ResponseJsonObj; /** Verb for making Request (GET,POST,etc) */ - ERequestVerb::Type RequestVerb; + StomtEnumRequestVerb::Type RequestVerb; /** Mapping of header section to values. Used to generate final header string for Request */ TMap RequestHeaders;