Skip to content

Commit 7b813c1

Browse files
ImmutableJeffrey09923554971
authored andcommitted
chore: fix compile errors (#3662)
1 parent 2d593ad commit 7b813c1

File tree

11 files changed

+47
-32
lines changed

11 files changed

+47
-32
lines changed

Source/Immutable/Private/Immutable/Actions/ImtblBlueprintAsyncAction.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
#include "Immutable/Actions/ImtblBlueprintAsyncAction.h"
44

5+
#include "Engine/GameInstance.h"
6+
#include "Engine/World.h"
7+
58
UImmutableSubsystem* UImtblBlueprintAsyncAction::GetSubsystem() const
69
{
710
if (!WorldContextObject || !WorldContextObject->GetWorld())

Source/Immutable/Private/Immutable/ImmutableSubsystem.cpp

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
#include "Immutable/ImmutableSubsystem.h"
44

55
#include "Blueprint/UserWidget.h"
6+
#include "Engine/GameViewportClient.h"
7+
68
#include "Immutable/ImmutablePassport.h"
9+
#include "Immutable/ImtblJSConnector.h"
710
#include "Immutable/Misc/ImtblLogging.h"
811
#include "ImtblBlui.h"
912
#include "ImtblBrowserUserWidget.h"
10-
#include "Immutable/ImtblJSConnector.h"
11-
1213

1314
void UImmutableSubsystem::Initialize(FSubsystemCollectionBase& Collection)
1415
{
@@ -35,16 +36,16 @@ void UImmutableSubsystem::Initialize(FSubsystemCollectionBase& Collection)
3536
void UImmutableSubsystem::Deinitialize()
3637
{
3738
IMTBL_LOG_FUNCSIG
38-
39+
3940
BrowserWidget = nullptr;
40-
41+
4142
#if USING_BLUI_CEF
4243
ImtblBlui->ConditionalBeginDestroy();
4344
ImtblBlui = nullptr;
4445
#endif
45-
46+
4647
Passport = nullptr;
47-
48+
4849
#if PLATFORM_ANDROID | PLATFORM_IOS
4950
UGameViewportClient::OnViewportCreated().Remove(EngineInitCompleteHandle);
5051
#else
@@ -164,4 +165,4 @@ void UImmutableSubsystem::OnViewportCreated()
164165
void UImmutableSubsystem::WorldTickStart(UWorld* World, ELevelTick TickType, float DeltaSeconds)
165166
{
166167
ManageBridgeDelegateQueue();
167-
}
168+
}

Source/Immutable/Private/Immutable/ImtblBrowserWidget.cpp

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@
22

33
#include "ImtblBrowserWidget.h"
44

5+
#include "Misc/FileHelper.h"
6+
#include "Widgets/Layout/SBox.h"
7+
#include "Widgets/Text/STextBlock.h"
8+
59
#include "Immutable/Misc/ImtblLogging.h"
610
#include "Immutable/ImtblJSConnector.h"
711
#include "Immutable/ImmutableUtilities.h"
8-
#include "Misc/FileHelper.h"
912
#if USING_BUNDLED_CEF
1013
#include "SWebBrowser.h"
1114
#endif
1215

13-
1416
UImtblBrowserWidget::UImtblBrowserWidget()
1517
{
1618
IMTBL_LOG_FUNCSIG
@@ -71,14 +73,14 @@ void UImtblBrowserWidget::SetBrowserContent()
7173
IMTBL_ERR("Browser widget is not valid")
7274
return;
7375
}
74-
76+
7577
FString JavaScript;
76-
78+
7779
if (FImmutableUtilities::LoadGameBridge(JavaScript))
7880
{
7981
FString IndexHtml = FString("<!doctype html><html lang='en'><head><meta " "charset='utf-8'><title>GameSDK Bridge</title><script>") + JavaScript + FString("</script></head><body><h1>Bridge Running</h1></body></html>");
80-
81-
WebBrowserWidget->LoadString(IndexHtml, TEXT("file:///immutable/index.html"));
82+
83+
WebBrowserWidget->LoadString(IndexHtml, TEXT("file:///immutable/index.html"));
8284
}
8385
#endif
8486
}
@@ -168,4 +170,4 @@ void UImtblBrowserWidget::HandleOnConsoleMessage(const FString& Message, const F
168170
IMTBL_LOG("Browser console message: %s, Source: %s, Line: %d", *Message, *Source, Line);
169171
OnConsoleMessage.Broadcast(Message, Source, Line);
170172
}
171-
#endif
173+
#endif

Source/Immutable/Private/Immutable/ImtblBrowserWidget.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
#pragma once
44

5-
#include "CoreMinimal.h"
5+
#include "Runtime/Launch/Resources/Version.h"
6+
67
#if USING_BUNDLED_CEF
78
#include "IWebBrowserWindow.h"
89
#endif

Source/Immutable/Public/Immutable/ImmutableDataTypes.h

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#pragma once
22

33
#include "JsonObjectConverter.h"
4+
#include "Misc/EngineVersion.h"
5+
46
#include "Immutable/ImtblJSMessages.h"
57
#include "Immutable/ImmutableNames.h"
68

@@ -94,13 +96,13 @@ struct FImmutablePassportInitDeviceFlowData
9496

9597
UPROPERTY()
9698
FString code;
97-
99+
98100
UPROPERTY()
99101
FString deviceCode;
100-
102+
101103
UPROPERTY()
102104
FString url;
103-
105+
104106
UPROPERTY()
105107
float interval = 0;
106108

@@ -111,13 +113,13 @@ USTRUCT()
111113
struct FImtblUserProfile
112114
{
113115
GENERATED_BODY()
114-
116+
115117
UPROPERTY()
116118
FString email;
117-
119+
118120
UPROPERTY()
119121
FString nickname;
120-
122+
121123
UPROPERTY()
122124
FString sub;
123125
};
@@ -156,7 +158,7 @@ struct FImmutablePassportCodeConfirmRequestData
156158

157159
UPROPERTY()
158160
FString deviceCode;
159-
161+
160162
UPROPERTY()
161163
float interval = 5;
162164

@@ -220,7 +222,6 @@ struct FNftTransferDetails
220222
FString tokenAddress;
221223
};
222224

223-
224225
USTRUCT(BlueprintType, meta = (HasNativeBreak = "/Script/Immutable.ImmutableBlueprintLibrary.BreakFZkEvmTransactionReceiptLog"))
225226
struct IMMUTABLE_API FZkEvmTransactionReceiptLog
226227
{
@@ -301,4 +302,4 @@ struct IMMUTABLE_API FZkEvmTransactionReceipt
301302

302303
UPROPERTY()
303304
FString type;
304-
};
305+
};

Source/Immutable/Public/Immutable/ImmutableSettings.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#pragma once
22

3-
#include "Engine/DeveloperSettings.h"
43
#include "ApplicationConfig.h"
4+
#include "Engine/DeveloperSettings.h"
5+
#include "Templates/SubclassOf.h"
56

67
#include "ImmutableSettings.generated.h"
78

8-
99
/**
1010
* Immutable developer settings is a configuration class for the Immutable plugin.
1111
* This class contains settings that can be adjusted to control the behavior
@@ -22,5 +22,4 @@ class IMMUTABLE_API UImmutableSettings : public UDeveloperSettings
2222
/// which will be used as the default configuration for the application.
2323
UPROPERTY(Config, EditAnywhere, BlueprintReadOnly, Category = "General")
2424
TSubclassOf<UApplicationConfig> DefaultApplicationConfig;
25-
26-
};
25+
};

Source/Immutable/Public/Immutable/ImmutableSubsystem.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22

33
#pragma once
44

5-
#include "ImmutablePassport.h"
5+
#include "Engine/EngineBaseTypes.h"
6+
#include "Runtime/Launch/Resources/Version.h"
67
#include "Subsystems/GameInstanceSubsystem.h"
8+
9+
#include "ImmutablePassport.h"
710
// clang-format off
811
#include "ImmutableSubsystem.generated.h"
912
// clang-format on
@@ -67,6 +70,4 @@ class IMMUTABLE_API UImmutableSubsystem : public UGameInstanceSubsystem
6770
#if PLATFORM_ANDROID | PLATFORM_IOS
6871
FDelegateHandle EngineInitCompleteHandle;
6972
#endif
70-
71-
72-
};
73+
};

Source/ImmutableCore/Public/ImmutableCore.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#pragma once
22

3+
#include "Modules/ModuleManager.h"
4+
35
class FImmutableCoreModule : public IModuleInterface
46
{
57
public:

Source/ImmutableCore/Public/ImmutableEnums.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#pragma once
22

3+
#include "Misc/EnumRange.h"
4+
35
#include "ImmutableEnums.generated.h"
46

57
UENUM(BlueprintType)

Source/ImmutableMarketplace/Private/OnRamp/ImmutableMarketplaceOnRampWidget.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#include "OnRamp/ImmutableMarketplaceOnRampWidget.h"
22

33
#include "PlatformHttp.h"
4+
#include "Widgets/Layout/SBox.h"
5+
#include "Widgets/Text/STextBlock.h"
46

57
#include "ImmutableMarketplaceLinkFactory.h"
68

0 commit comments

Comments
 (0)