Skip to content

Commit

Permalink
Fix adaptive/non unity build error
Browse files Browse the repository at this point in the history
 - include header
 - forward declaration
 - #undef LOCTEXT_NAMESPACE

for testing non unity build : UnrealBuildTool.ModuleRules.bUseUnity = false;
  • Loading branch information
empty2fill committed Apr 18, 2022
1 parent 65e0fdd commit 1ccc1de
Showing 45 changed files with 117 additions and 3 deletions.
2 changes: 2 additions & 0 deletions Plugins/Linter/Source/Linter/Private/LintRuleSet.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "LintRuleSet.h"
#include "LintRunner.h"
#include "AnyObject_LinterDummyClass.h"
#include "LinterNamingConvention.h"

#include "AssetRegistryModule.h"
#include "Modules/ModuleManager.h"
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
#include "LintRuleSet.h"
#include "Engine/Blueprint.h"
#include "EdGraphSchema_K2.h"
#include "Kismet2/BlueprintEditorUtils.h"

ULintRule_Blueprint_Vars_ConfigCategories::ULintRule_Blueprint_Vars_ConfigCategories(const FObjectInitializer& ObjectInitializer)
: Super(ObjectInitializer)
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
#include "LintRules/LintRule_IsNamedCorrectly_Base.h"
#include "LintRuleSet.h"
#include "LinterNamingConvention.h"
#include "Engine/Blueprint.h"

ULintRule_IsNamedCorrectly_Base::ULintRule_IsNamedCorrectly_Base(const FObjectInitializer& ObjectInitializer)
: Super(ObjectInitializer)
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
#include "LintRuleSet.h"
#include "LinterNamingConvention.h"
#include "HAL/FileManager.h"
#include "Engine/StaticMesh.h"

ULintRule_StaticMesh_ValidUVs::ULintRule_StaticMesh_ValidUVs(const FObjectInitializer& ObjectInitializer)
: Super(ObjectInitializer)
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
#include "LintRuleSet.h"
#include "LinterNamingConvention.h"
#include "HAL/FileManager.h"
#include "Engine/Texture2D.h"

ULintRule_Texture_Size_NotTooBig::ULintRule_Texture_Size_NotTooBig(const FObjectInitializer& ObjectInitializer)
: Super(ObjectInitializer)
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
#include "LintRuleSet.h"
#include "LinterNamingConvention.h"
#include "HAL/FileManager.h"
#include "Engine/Texture2D.h"

ULintRule_Texture_Size_PowerOfTwo::ULintRule_Texture_Size_PowerOfTwo(const FObjectInitializer& ObjectInitializer)
: Super(ObjectInitializer)
1 change: 1 addition & 0 deletions Plugins/Linter/Source/Linter/Private/LintRunner.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
#include "LintRunner.h"
#include "LintRuleSet.h"

#define LOCTEXT_NAMESPACE "Linter"

2 changes: 2 additions & 0 deletions Plugins/Linter/Source/Linter/Private/LinterCommandlet.cpp
Original file line number Diff line number Diff line change
@@ -14,6 +14,8 @@
#include "Serialization/JsonSerializer.h"
#include "Linter.h"
#include "LintRule.h"
#include "LintRuleSet.h"
#include "LinterSettings.h"

DEFINE_LOG_CATEGORY_STATIC(LinterCommandlet, All, All);

Original file line number Diff line number Diff line change
@@ -12,6 +12,8 @@
#include "Framework/Commands/UIAction.h"
#include "Delegates/IDelegateInstance.h"
#include "TooltipEditor/TooltipTool.h"
#include "Linter.h"
#include "BatchRenameTool/BatchRenameTool.h"

#define LOCTEXT_NAMESPACE "Linter"
DEFINE_LOG_CATEGORY_STATIC(LinterContentBrowserExtensions, Log, All);
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
#include "Templates/SharedPointer.h"
#include "DetailCategoryBuilder.h"
#include "IDetailChildrenBuilder.h"
#include "AnyObject_LinterDummyClass.h"

TSharedRef<IDetailCustomization> FLinterNamingConventionDetails::MakeInstance()
{
9 changes: 9 additions & 0 deletions Plugins/Linter/Source/Linter/Private/UI/LintReport.cpp
Original file line number Diff line number Diff line change
@@ -24,6 +24,15 @@
#include "Misc/FileHelper.h"
#include "Widgets/Input/SComboButton.h"
#include "UI/LintReportRuleDetails.h"
#include "LinterStyle.h"
#include "Linter.h"
#include "Interfaces/IPluginManager.h"
#include "Framework/Application/SlateApplication.h"
#include "Widgets/Input/SButton.h"
#include "EditorStyleSet.h"
#include "Widgets/Images/SImage.h"
#include "Framework/MultiBox/MultiBoxExtender.h"
#include "Framework/MultiBox/MultiBoxBuilder.h"

#define LOCTEXT_NAMESPACE "Linter"

Original file line number Diff line number Diff line change
@@ -19,6 +19,8 @@
#include "UI/LintReportAssetError.h"
#include "LintRule.h"
#include "AssetThumbnail.h"
#include "UI/LintReportAssetErrorList.h"
#include "Widgets/Layout/SBox.h"


#define LOCTEXT_NAMESPACE "LintReport"
@@ -142,3 +144,5 @@ void SLintReportAssetDetails::Construct(const FArguments& Args)
]
];
}

#undef LOCTEXT_NAMESPACE
Original file line number Diff line number Diff line change
@@ -8,6 +8,8 @@
#include "Widgets/Views/SListView.h"
#include "Widgets/Views/STableRow.h"
#include "Widgets/Layout/SBox.h"
#include "Widgets/Images/SImage.h"
#include "LinterStyle.h"

#define LOCTEXT_NAMESPACE "LintReport"

@@ -110,3 +112,5 @@ void SLintReportAssetError::Construct(const FArguments& Args)
];
}

#undef LOCTEXT_NAMESPACE

Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@
#include "Framework/Views/ITypedTableView.h"
#include "UI/LintReportAssetError.h"
#include "LintRule.h"
#include "Widgets/Views/SListView.h"

#define LOCTEXT_NAMESPACE "LintReport"

@@ -41,3 +42,5 @@ void SLintReportAssetErrorList::Construct(const FArguments& Args)
})
];
}

#undef LOCTEXT_NAMESPACE
Original file line number Diff line number Diff line change
@@ -19,6 +19,8 @@
#include "UI/LintReportRuleErrorList.h"
#include "LintRule.h"
#include "AssetThumbnail.h"
#include "Widgets/Layout/SBox.h"
#include "Widgets/Images/SImage.h"



@@ -205,3 +207,5 @@ void SLintReportRuleDetails::Construct(const FArguments& Args)
ThumbnailBox->SetContent(RuleThumbnail->MakeThumbnailWidget());
}
}

#undef LOCTEXT_NAMESPACE
Original file line number Diff line number Diff line change
@@ -8,6 +8,10 @@
#include "Widgets/Views/SListView.h"
#include "Widgets/Views/STableRow.h"
#include "Widgets/Layout/SBox.h"
#include "LinterStyle.h"
#include "ContentBrowserModule.h"
#include "AssetRegistryModule.h"
#include "IContentBrowserSingleton.h"

#define LOCTEXT_NAMESPACE "LintReport"

@@ -57,3 +61,4 @@ void SLintReportRuleError::Construct(const FArguments& Args)
];
}

#undef LOCTEXT_NAMESPACE
Original file line number Diff line number Diff line change
@@ -18,7 +18,10 @@
#include "Widgets/Text/STextBlock.h"
#include "Framework/Views/ITypedTableView.h"
#include "UI/LintReportAssetError.h"
#include "UI/LintReportAssetErrorList.h"
#include "UI/LintReportRuleError.h"
#include "LintRule.h"
#include "Widgets/Views/SListView.h"

#define LOCTEXT_NAMESPACE "LintReport"

@@ -42,3 +45,5 @@ void SLintReportRuleErrorList::Construct(const FArguments& Args)
})
];
}

#undef LOCTEXT_NAMESPACE
11 changes: 11 additions & 0 deletions Plugins/Linter/Source/Linter/Private/UI/LintWizard.cpp
Original file line number Diff line number Diff line change
@@ -19,13 +19,22 @@
#include "FileHelpers.h"
#include "Logging/MessageLog.h"
#include "Logging/TokenizedMessage.h"
#include "ContentBrowserModule.h"
#include "DesktopPlatformModule.h"
#include "AssetToolsModule.h"
#include "Framework/Docking/TabManager.h"
#include "Widgets/Input/SComboBox.h"
#include "Widgets/Docking/SDockTab.h"
#include "Misc/App.h"
#include "Engine/World.h"

#include "LinterStyle.h"
#include "LintRuleSet.h"
#include "LinterSettings.h"
#include "UI/SAssetLinkWidget.h"


#define LOCTEXT_NAMESPACE "LinterWizard"

BEGIN_SLATE_FUNCTION_BUILD_OPTIMIZATION
void SLintWizard::Construct(const FArguments& InArgs)
@@ -650,3 +659,5 @@ bool SLintWizard::LoadAssetsIfNeeded(const TArray<FString>& ObjectPaths, TArray<

return true;
}

#undef LOCTEXT_NAMESPACE
5 changes: 5 additions & 0 deletions Plugins/Linter/Source/Linter/Private/UI/SAssetLinkWidget.cpp
Original file line number Diff line number Diff line change
@@ -8,6 +8,11 @@
#include "Widgets/Text/STextBlock.h"
#include "Widgets/Images/SThrobber.h"
#include "Widgets/Text/SRichTextBlock.h"
#include "Widgets/Input/SHyperlink.h"
#include "SlateOptMacros.h"
#include "ContentBrowserModule.h"
#include "AssetRegistryModule.h"
#include "IContentBrowserSingleton.h"

BEGIN_SLATE_FUNCTION_BUILD_OPTIMIZATION
void SAssetLinkWidget::Construct(const FArguments& Args)
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@
#include "Widgets/SCompoundWidget.h"
#include "Widgets/Layout/SUniformGridPanel.h"
#include "Widgets/Layout/SSeparator.h"
#include "AssetData.h"

#define LOCTEXT_NAMESPACE "LinterBatchRenamer"

4 changes: 4 additions & 0 deletions Plugins/Linter/Source/Linter/Public/LintRule.h
Original file line number Diff line number Diff line change
@@ -2,8 +2,12 @@
#pragma once

#include "CoreMinimal.h"
#include "AssetData.h"
#include "Templates/SubclassOf.h"
#include "LintRule.generated.h"

class ULintRule;

UENUM(BlueprintType)
enum class ELintRuleSeverity : uint8
{
1 change: 1 addition & 0 deletions Plugins/Linter/Source/Linter/Public/LintRuleSet.h
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@

#include "CoreMinimal.h"
#include "Misc/ScopedSlowTask.h"
#include "Engine/DataAsset.h"
#include "LintRule.h"

#include "LintRuleSet.generated.h"
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@

#include "CoreMinimal.h"
#include "LintRule.h"
#include "LintRule_Blueprint_Base.h"

#include "LintRule_Blueprint_Compiles.generated.h"

Original file line number Diff line number Diff line change
@@ -3,9 +3,12 @@

#include "CoreMinimal.h"
#include "LintRule.h"
#include "LintRule_Blueprint_Base.h"

#include "LintRule_Blueprint_Funcs_MaxNodes.generated.h"

class UEdGraphNode;

UCLASS(BlueprintType, Blueprintable, Abstract)
class LINTER_API ULintRule_Blueprint_Funcs_MaxNodes : public ULintRule_Blueprint_Base
{
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@

#include "CoreMinimal.h"
#include "LintRule.h"
#include "LintRule_Blueprint_Base.h"

#include "LintRule_Blueprint_Funcs_MustHaveReturn.generated.h"

Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@

#include "CoreMinimal.h"
#include "LintRule.h"
#include "LintRule_Blueprint_Base.h"

#include "LintRule_Blueprint_Funcs_PublicDescriptions.generated.h"

Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@

#include "CoreMinimal.h"
#include "LintRule.h"
#include "LintRule_Blueprint_Base.h"

#include "LintRule_Blueprint_LooseNodes.generated.h"

Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@

#include "CoreMinimal.h"
#include "LintRule.h"
#include "LintRule_Blueprint_Base.h"

#include "LintRule_Blueprint_Vars_ConfigCategories.generated.h"

Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@

#include "CoreMinimal.h"
#include "LintRule.h"
#include "LintRule_Blueprint_Base.h"

#include "LintRule_Blueprint_Vars_EditableMustHaveTooltip.generated.h"

Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@

#include "CoreMinimal.h"
#include "LintRule.h"
#include "LintRule_Blueprint_Base.h"

#include "LintRule_Blueprint_Vars_NoConfigFlag.generated.h"

Original file line number Diff line number Diff line change
@@ -3,9 +3,12 @@

#include "CoreMinimal.h"
#include "LintRule.h"
#include "LintRule_Blueprint_Base.h"

#include "LintRule_Blueprint_Vars_NonAtomic.generated.h"

struct FBPVariableDescription;

UCLASS(BlueprintType, Blueprintable, Abstract)
class LINTER_API ULintRule_Blueprint_Vars_NonAtomic : public ULintRule_Blueprint_Base
{
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@

#include "CoreMinimal.h"
#include "LintRule.h"
#include "LintRule_Blueprint_Base.h"

#include "LintRule_Blueprint_Vars_PluralArrays.generated.h"

Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@

#include "CoreMinimal.h"
#include "LintRule.h"
#include "LintRule_Blueprint_Base.h"

#include "LintRule_Blueprint_Vars_Regex.generated.h"

4 changes: 4 additions & 0 deletions Plugins/Linter/Source/Linter/Public/LintRunner.h
Original file line number Diff line number Diff line change
@@ -7,6 +7,10 @@
#include "AssetData.h"
#include "Linter.h"

class ULintRuleSet;
struct FLintRuleList;
struct FLintRuleViolation;

class FLintRunner : public FRunnable
{

Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@

#pragma once

class FLinterModule;

// Integrate Linter actions into the Content Browser
class FLinterContentBrowserExtensions
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@
#include "Templates/SharedPointer.h"
#include "IDetailCustomization.h"
#include "PropertyHandle.h"
#include "Engine/DataAsset.h"
#include "LinterNamingConvention.generated.h"


4 changes: 4 additions & 0 deletions Plugins/Linter/Source/Linter/Public/UI/LintReport.h
Original file line number Diff line number Diff line change
@@ -7,6 +7,10 @@
#include "LintReportAssetError.h"
#include "LintRule.h"

class STextBlock;
class SComboButton;
class SScrollBox;
struct FLintRuleViolation;

class SLintReport : public SCompoundWidget
{
Loading

0 comments on commit 1ccc1de

Please # to comment.