Modernization pass (IWYU).

Author: gmpreussner

Source/TextAsset/Private/TextAssetModule.cpp

@@ -1,9 +1,7 @@
 // Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
 
-#include "CoreMinimal.h"
-#include "ModuleInterface.h"
-#include "ModuleManager.h"
-#include "TextAsset.h"
+#include "Modules/ModuleInterface.h"
+#include "Modules/ModuleManager.h"
 
 
 /**

Source/TextAsset/Public/TextAsset.h

@@ -2,9 +2,10 @@
 
 #pragma once
 
-#include "CoreMinimal.h"
+#include "Internationalization/Text.h"
 #include "UObject/Object.h"
 #include "UObject/ObjectMacros.h"
+
 #include "TextAsset.generated.h"
 
 

Source/TextAssetEditor/Private/AssetTools/TextAssetActions.cpp

@@ -4,9 +4,10 @@
 
 #include "Framework/MultiBox/MultiBoxBuilder.h"
 #include "TextAsset.h"
-#include "TextAssetEditorToolkit.h"
 #include "Styling/SlateStyle.h"
 
+#include "TextAssetEditorToolkit.h"
+
 
 #define LOCTEXT_NAMESPACE "AssetTypeActions"
 

Source/TextAssetEditor/Private/AssetTools/TextAssetActions.h

@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include "CoreMinimal.h"
 #include "AssetTypeActions_Base.h"
+#include "Templates/SharedPointer.h"
 
 class ISlateStyle;
 

Source/TextAssetEditor/Private/Factories/TextAssetFactory.cpp

@@ -2,6 +2,7 @@
 
 #include "TextAssetFactory.h"
 
+#include "Containers/UnrealString.h"
 #include "TextAsset.h"
 #include "Misc/FileHelper.h"
 

Source/TextAssetEditor/Private/Factories/TextAssetFactoryNew.cpp

@@ -1,6 +1,7 @@
 // Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
 
 #include "TextAssetFactoryNew.h"
+
 #include "TextAsset.h"
 
 

Source/TextAssetEditor/Private/Styles/TextAssetEditorStyle.h

@@ -2,7 +2,6 @@
 
 #pragma once
 
-#include "CoreMinimal.h"
 #include "IPluginManager.h"
 #include "Brushes/SlateImageBrush.h"
 #include "Styling/SlateStyle.h"

Source/TextAssetEditor/Private/TextAssetEditorModule.cpp

@@ -1,9 +1,13 @@
 // Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
 
-#include "AssetEditorToolkit.h"
-#include "ModuleInterface.h"
-#include "TextAssetActions.h"
-#include "TextAssetEditorStyle.h"
+#include "Containers/Array.h"
+#include "Modules/ModuleInterface.h"
+#include "Modules/ModuleManager.h"
+#include "Templates/SharedPointer.h"
+#include "Toolkits/AssetEditorToolkit.h"
+
+#include "AssetTools/TextAssetActions.h"
+#include "Styles/TextAssetEditorStyle.h"
 
 
 #define LOCTEXT_NAMESPACE "FTextAssetEditorModule"

Source/TextAssetEditor/Private/Toolkits/TextAssetEditorToolkit.cpp

@@ -7,6 +7,7 @@
 #include "EditorStyleSet.h"
 #include "STextAssetEditor.h"
 #include "TextAsset.h"
+#include "UObject/NameTypes.h"
 #include "Widgets/Docking/SDockTab.h"
 
 #define LOCTEXT_NAMESPACE "FTextAssetEditorToolkit"
@@ -17,8 +18,11 @@ DEFINE_LOG_CATEGORY_STATIC(LogTextAssetEditor, Log, All);
 /* Local constants
  *****************************************************************************/
 
-static const FName TextAssetEditorAppIdentifier("TextAssetEditorApp");
-static const FName TextEditorTabId("TextEditor");
+namespace TextAssetEditor
+{
+	static const FName AppIdentifier("TextAssetEditorApp");
+	static const FName TabId("TextEditor");
+}
 
 
 /* FTextAssetEditorToolkit structors
@@ -72,7 +76,7 @@ void FTextAssetEditorToolkit::Initialize(UTextAsset* InTextAsset, const EToolkit
 						->Split
 						(
 							FTabManager::NewStack()
-								->AddTab(TextEditorTabId, ETabState::OpenedTab)
+								->AddTab(TextAssetEditor::TabId, ETabState::OpenedTab)
 								->SetHideTabWell(true)
 								->SetSizeCoefficient(0.9f)
 						)
@@ -82,7 +86,7 @@ void FTextAssetEditorToolkit::Initialize(UTextAsset* InTextAsset, const EToolkit
 	FAssetEditorToolkit::InitAssetEditor(
 		InMode,
 		InToolkitHost,
-		TextAssetEditorAppIdentifier,
+		TextAssetEditor::AppIdentifier,
 		Layout,
 		true /*bCreateDefaultStandaloneMenu*/,
 		true /*bCreateDefaultToolbar*/,
@@ -109,7 +113,7 @@ void FTextAssetEditorToolkit::RegisterTabSpawners(const TSharedRef<class FTabMan
 
 	FAssetEditorToolkit::RegisterTabSpawners(InTabManager);
 
-	InTabManager->RegisterTabSpawner(TextEditorTabId, FOnSpawnTab::CreateSP(this, &FTextAssetEditorToolkit::HandleTabManagerSpawnTab, TextEditorTabId))
+	InTabManager->RegisterTabSpawner(TextAssetEditor::TabId, FOnSpawnTab::CreateSP(this, &FTextAssetEditorToolkit::HandleTabManagerSpawnTab, TextAssetEditor::TabId))
 		.SetDisplayName(LOCTEXT("TextEditorTabName", "Text Editor"))
 		.SetGroup(WorkspaceMenuCategoryRef)
 		.SetIcon(FSlateIcon(FEditorStyle::GetStyleSetName(), "LevelEditor.Tabs.Viewports"));
@@ -120,7 +124,7 @@ void FTextAssetEditorToolkit::UnregisterTabSpawners(const TSharedRef<class FTabM
 {
 	FAssetEditorToolkit::UnregisterTabSpawners(InTabManager);
 
-	InTabManager->UnregisterTabSpawner(TextEditorTabId);
+	InTabManager->UnregisterTabSpawner(TextAssetEditor::TabId);
 }
 
 
@@ -180,7 +184,7 @@ TSharedRef<SDockTab> FTextAssetEditorToolkit::HandleTabManagerSpawnTab(const FSp
 {
 	TSharedPtr<SWidget> TabWidget = SNullWidget::NullWidget;
 
-	if (TabIdentifier == TextEditorTabId)
+	if (TabIdentifier == TextAssetEditor::TabId)
 	{
 		TabWidget = SNew(STextAssetEditor, TextAsset, Style);
 	}

Source/TextAssetEditor/Private/Toolkits/TextAssetEditorToolkit.h

@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include "CoreMinimal.h"
 #include "EditorUndoClient.h"
+#include "Templates/SharedPointer.h"
 #include "Toolkits/AssetEditorToolkit.h"
 #include "UObject/GCObject.h"