From 90a8d472b0dec74b07e93058f33bb6c3d9da4584 Mon Sep 17 00:00:00 2001 From: ImmutableJeffrey Date: Fri, 31 Jan 2025 08:09:35 +1000 Subject: [PATCH] fix: inconsistent naming for for on ramp widget (#3555) --- .../ImmutableMarketplaceOnRampWidget.cpp} | 16 ++++++++-------- .../ImmutableMarketplaceOnRampWidget.h} | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) rename Source/ImmutableMarketplace/Private/{OnRampWebBrowserWidget.cpp => OnRamp/ImmutableMarketplaceOnRampWidget.cpp} (76%) rename Source/ImmutableMarketplace/Public/{OnRampWebBrowserWidget.h => OnRamp/ImmutableMarketplaceOnRampWidget.h} (89%) diff --git a/Source/ImmutableMarketplace/Private/OnRampWebBrowserWidget.cpp b/Source/ImmutableMarketplace/Private/OnRamp/ImmutableMarketplaceOnRampWidget.cpp similarity index 76% rename from Source/ImmutableMarketplace/Private/OnRampWebBrowserWidget.cpp rename to Source/ImmutableMarketplace/Private/OnRamp/ImmutableMarketplaceOnRampWidget.cpp index 47a6d83..a2063ec 100644 --- a/Source/ImmutableMarketplace/Private/OnRampWebBrowserWidget.cpp +++ b/Source/ImmutableMarketplace/Private/OnRamp/ImmutableMarketplaceOnRampWidget.cpp @@ -1,4 +1,4 @@ -#include "OnRampWebBrowserWidget.h" +#include "OnRamp/ImmutableMarketplaceOnRampWidget.h" #include "PlatformHttp.h" @@ -14,7 +14,7 @@ DEFINE_LOG_CATEGORY(LogImmutableOnRampWidget); -UOnRampWidget::UOnRampWidget(const FObjectInitializer& ObjectInitializer) : Super(ObjectInitializer) +UImmutableMarketplaceOnRampWidget::UImmutableMarketplaceOnRampWidget(const FObjectInitializer& ObjectInitializer) : Super(ObjectInitializer) { QueryParams.DefaultCryptoCurrency = TEXT("IMX"); QueryParams.DefaultFiatAmount = TEXT("50"); @@ -22,12 +22,12 @@ UOnRampWidget::UOnRampWidget(const FObjectInitializer& ObjectInitializer) : Supe QueryParams.CryptoCurrencyList = TEXT("imx,eth,usdc"); } -bool UOnRampWidget::IsReady() const +bool UImmutableMarketplaceOnRampWidget::IsReady() const { return bIsReady; } -void UOnRampWidget::Load(const FString& WalletAddress, const FString& Email) +void UImmutableMarketplaceOnRampWidget::Load(const FString& WalletAddress, const FString& Email) { if (!WebBrowserWidget.IsValid()) { @@ -36,14 +36,14 @@ void UOnRampWidget::Load(const FString& WalletAddress, const FString& Email) const FString OnRampLink = UImmutableMarketplaceLinkFactory::GenerateOnRampLink(Environment, Email, WalletAddress, QueryParams, ExtraQueryParams); - CallAndRegister_OnWhenReady(UOnRampWidget::FOnWhenReady::FDelegate::CreateWeakLambda(this, [this, OnRampLink]() + CallAndRegister_OnWhenReady(UImmutableMarketplaceOnRampWidget::FOnWhenReady::FDelegate::CreateWeakLambda(this, [this, OnRampLink]() { WebBrowserWidget->LoadURL(OnRampLink); OnWhenReady.RemoveAll(this); })); } -FDelegateHandle UOnRampWidget::CallAndRegister_OnWhenReady(FOnWhenReady::FDelegate Delegate) +FDelegateHandle UImmutableMarketplaceOnRampWidget::CallAndRegister_OnWhenReady(FOnWhenReady::FDelegate Delegate) { if (bIsReady) { @@ -53,7 +53,7 @@ FDelegateHandle UOnRampWidget::CallAndRegister_OnWhenReady(FOnWhenReady::FDelega return OnWhenReady.Add(Delegate); } -TSharedRef UOnRampWidget::RebuildWidget() +TSharedRef UImmutableMarketplaceOnRampWidget::RebuildWidget() { if (IsDesignTime()) { @@ -85,7 +85,7 @@ TSharedRef UOnRampWidget::RebuildWidget() } } -void UOnRampWidget::HandleOnUrlChanged(const FText& Text) +void UImmutableMarketplaceOnRampWidget::HandleOnUrlChanged(const FText& Text) { if (Text.EqualToCaseIgnored(FText::FromString(InitialURL))) { diff --git a/Source/ImmutableMarketplace/Public/OnRampWebBrowserWidget.h b/Source/ImmutableMarketplace/Public/OnRamp/ImmutableMarketplaceOnRampWidget.h similarity index 89% rename from Source/ImmutableMarketplace/Public/OnRampWebBrowserWidget.h rename to Source/ImmutableMarketplace/Public/OnRamp/ImmutableMarketplaceOnRampWidget.h index 717529a..267ef5b 100644 --- a/Source/ImmutableMarketplace/Public/OnRampWebBrowserWidget.h +++ b/Source/ImmutableMarketplace/Public/OnRamp/ImmutableMarketplaceOnRampWidget.h @@ -5,7 +5,7 @@ #include "ImmutableEnums.h" #include "OnRamp/ImmutableOnRampQueryParams.h" -#include "OnRampWebBrowserWidget.generated.h" +#include "ImmutableMarketplaceOnRampWidget.generated.h" DECLARE_LOG_CATEGORY_EXTERN(LogImmutableOnRampWidget, Log, All); @@ -21,7 +21,7 @@ class SBluWebBrowser; * A custom web browser widget for Immutable On Ramp funds transactions. */ UCLASS() -class IMMUTABLEMARKETPLACE_API UOnRampWidget : public UWidget +class IMMUTABLEMARKETPLACE_API UImmutableMarketplaceOnRampWidget : public UWidget { GENERATED_BODY() @@ -29,7 +29,7 @@ class IMMUTABLEMARKETPLACE_API UOnRampWidget : public UWidget DECLARE_MULTICAST_DELEGATE(FOnWhenReady); public: - UOnRampWidget(const FObjectInitializer& ObjectInitializer = FObjectInitializer::Get()); + UImmutableMarketplaceOnRampWidget(const FObjectInitializer& ObjectInitializer = FObjectInitializer::Get()); /** * Check if the web browser widget is ready to be loaded.