Updates for 4.15.

gmpreussner · gmpreussner · commit c8b3d8469c3c · 2016-12-17T12:21:13.000-05:00
diff --git a/Source/TextAsset/Private/TextAssetModule.cpp b/Source/TextAsset/Private/TextAssetModule.cpp
@@ -1,7 +1,8 @@
 // Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
 
-#include "TextAssetPCH.h"
+#include "CoreMinimal.h"
 #include "ModuleInterface.h"
+#include "ModuleManager.h"
 #include "TextAsset.h"
 
 
diff --git a/Source/TextAsset/Private/TextAssetPCH.h b/Source/TextAsset/Private/TextAssetPCH.h
diff --git a/Source/TextAsset/Public/TextAsset.h b/Source/TextAsset/Public/TextAsset.h
@@ -2,6 +2,9 @@
 
 #pragma once
 
+#include "CoreMinimal.h"
+#include "UObject/Object.h"
+#include "UObject/ObjectMacros.h"
 #include "TextAsset.generated.h"
 
 
diff --git a/Source/TextAssetEditor/Private/AssetTools/TextAssetActions.cpp b/Source/TextAssetEditor/Private/AssetTools/TextAssetActions.cpp
@@ -1,8 +1,10 @@
 // Copyright 2015 Headcrash Industries LLC. All Rights Reserved.
 
-#include "TextAssetEditorPrivatePCH.h"
 #include "TextAssetActions.h"
+
+#include "TextAsset.h"
 #include "TextAssetEditorToolkit.h"
+#include "Styling/SlateStyle.h"
 
 
 #define LOCTEXT_NAMESPACE "AssetTypeActions"
@@ -91,7 +93,7 @@ bool FTextAssetActions::HasActions(const TArray<UObject*>& InObjects) const
 }
 
 
-void FTextAssetActions::OpenAssetEditor(const TArray<UObject*>& InObjects, TSharedPtr<class IToolkitHost> EditWithinLevelEditor)
+void FTextAssetActions::OpenAssetEditor(const TArray<UObject*>& InObjects, TSharedPtr<IToolkitHost> EditWithinLevelEditor)
 {
 	EToolkitMode::Type Mode = EditWithinLevelEditor.IsValid()
 		? EToolkitMode::WorldCentric
diff --git a/Source/TextAssetEditor/Private/AssetTools/TextAssetActions.h b/Source/TextAssetEditor/Private/AssetTools/TextAssetActions.h
@@ -2,8 +2,11 @@
 
 #pragma once
 
+#include "CoreMinimal.h"
 #include "AssetTypeActions_Base.h"
 
+class ISlateStyle;
+
 
 /**
  * Implements an action for UTextAsset assets.
@@ -31,7 +34,7 @@ class FTextAssetActions
 	virtual UClass* GetSupportedClass() const override;
 	virtual FColor GetTypeColor() const override;
 	virtual bool HasActions(const TArray<UObject*>& InObjects) const override;
-	virtual void OpenAssetEditor(const TArray<UObject*>& InObjects, TSharedPtr<class IToolkitHost> EditWithinLevelEditor = TSharedPtr<IToolkitHost>()) override;
+	virtual void OpenAssetEditor(const TArray<UObject*>& InObjects, TSharedPtr<IToolkitHost> EditWithinLevelEditor = TSharedPtr<IToolkitHost>()) override;
 
 private:
 
diff --git a/Source/TextAssetEditor/Private/Factories/TextAssetFactory.cpp b/Source/TextAssetEditor/Private/Factories/TextAssetFactory.cpp
@@ -1,8 +1,10 @@
 // Copyright 2015 Headcrash Industries LLC. All Rights Reserved.
 
-#include "TextAssetEditorPrivatePCH.h"
 #include "TextAssetFactory.h"
 
+#include "TextAsset.h"
+#include "Misc/FileHelper.h"
+
 
 /* UTextAssetFactory structors
  *****************************************************************************/
diff --git a/Source/TextAssetEditor/Private/Factories/TextAssetFactory.h b/Source/TextAssetEditor/Private/Factories/TextAssetFactory.h
@@ -3,6 +3,8 @@
 #pragma once
 
 #include "Factories/Factory.h"
+#include "UObject/ObjectMacros.h"
+
 #include "TextAssetFactory.generated.h"
 
 
@@ -17,7 +19,7 @@ class UTextAssetFactory
 
 public:
 
-	// UFactory Interface
+	//~ UFactory Interface
 
 	virtual UObject* FactoryCreateBinary(UClass* Class, UObject* InParent, FName Name, EObjectFlags Flags, UObject* Context, const TCHAR* Type, const uint8*& Buffer, const uint8* BufferEnd, FFeedbackContext* Warn) override;
 };
diff --git a/Source/TextAssetEditor/Private/Factories/TextAssetFactoryNew.cpp b/Source/TextAssetEditor/Private/Factories/TextAssetFactoryNew.cpp
@@ -1,7 +1,7 @@
 // Copyright 2015 Headcrash Industries LLC. All Rights Reserved.
 
-#include "TextAssetEditorPrivatePCH.h"
 #include "TextAssetFactoryNew.h"
+#include "TextAsset.h"
 
 
 /* UTextAssetFactoryNew structors
diff --git a/Source/TextAssetEditor/Private/Factories/TextAssetFactoryNew.h b/Source/TextAssetEditor/Private/Factories/TextAssetFactoryNew.h
@@ -3,6 +3,8 @@
 #pragma once
 
 #include "Factories/Factory.h"
+#include "UObject/ObjectMacros.h"
+
 #include "TextAssetFactoryNew.generated.h"
 
 
@@ -17,7 +19,7 @@ class UTextAssetFactoryNew
 
 public:
 
-	// UFactory Interface
+	//~ UFactory Interface
 
 	virtual UObject* FactoryCreateNew(UClass* InClass, UObject* InParent, FName InName, EObjectFlags Flags, UObject* Context, FFeedbackContext* Warn) override;
 	virtual bool ShouldShowInNewMenu() const override;
diff --git a/Source/TextAssetEditor/Private/Styles/TextAssetEditorStyle.h b/Source/TextAssetEditor/Private/Styles/TextAssetEditorStyle.h
@@ -2,7 +2,11 @@
 
 #pragma once
 
+#include "CoreMinimal.h"
 #include "IPluginManager.h"
+#include "Brushes/SlateImageBrush.h"
+#include "Styling/SlateStyle.h"
+#include "Styling/SlateStyleRegistry.h"
 
 #define IMAGE_BRUSH(RelativePath, ...) FSlateImageBrush(RootToContentDir(RelativePath, TEXT(".png")), __VA_ARGS__)
 #define BOX_BRUSH(RelativePath, ...) FSlateBoxBrush(RootToContentDir(RelativePath, TEXT(".png")), __VA_ARGS__)
diff --git a/Source/TextAssetEditor/Private/TextAssetEditorModule.cpp b/Source/TextAssetEditor/Private/TextAssetEditorModule.cpp
@@ -1,6 +1,5 @@
 // Copyright 2015 Headcrash Industries LLC. All Rights Reserved.
 
-#include "TextAssetEditorPrivatePCH.h"
 #include "AssetEditorToolkit.h"
 #include "ModuleInterface.h"
 #include "TextAssetActions.h"
@@ -20,7 +19,7 @@ class FTextAssetEditorModule
 {
 public:
 
-	// IHasMenuExtensibility interface
+	//~ IHasMenuExtensibility interface
 
 	virtual TSharedPtr<FExtensibilityManager> GetMenuExtensibilityManager() override
 	{
@@ -29,7 +28,7 @@ class FTextAssetEditorModule
 
 public:
 
-	// IHasToolBarExtensibility interface
+	//~ IHasToolBarExtensibility interface
 
 	virtual TSharedPtr<FExtensibilityManager> GetToolBarExtensibilityManager() override
 	{
@@ -38,7 +37,7 @@ class FTextAssetEditorModule
 
 public:
 
-	// IModuleInterface interface
+	//~ IModuleInterface interface
 
 	virtual void StartupModule() override
 	{
diff --git a/Source/TextAssetEditor/Private/TextAssetEditorPrivatePCH.h b/Source/TextAssetEditor/Private/TextAssetEditorPrivatePCH.h
diff --git a/Source/TextAssetEditor/Private/Toolkits/TextAssetEditorToolkit.cpp b/Source/TextAssetEditor/Private/Toolkits/TextAssetEditorToolkit.cpp
@@ -1,9 +1,11 @@
 // Copyright 2015 Headcrash Industries LLC. All Rights Reserved.
 
-#include "TextAssetEditorPrivatePCH.h"
-#include "STextAssetEditor.h"
 #include "TextAssetEditorToolkit.h"
 
+#include "Editor.h"
+#include "EditorReimportHandler.h"
+#include "STextAssetEditor.h"
+#include "TextAsset.h"
 
 #define LOCTEXT_NAMESPACE "FTextAssetEditorToolkit"
 
diff --git a/Source/TextAssetEditor/Private/Toolkits/TextAssetEditorToolkit.h b/Source/TextAssetEditor/Private/Toolkits/TextAssetEditorToolkit.h
@@ -2,8 +2,16 @@
 
 #pragma once
 
-#include "Toolkits/AssetEditorToolkit.h"
+#include "CoreMinimal.h"
 #include "EditorUndoClient.h"
+#include "Toolkits/AssetEditorToolkit.h"
+#include "UObject/GCObject.h"
+
+class FSpawnTabArgs;
+class ISlateStyle;
+class IToolkitHost;
+class SDockTab;
+class UTextAsset;
 
 
 /**
@@ -35,19 +43,19 @@ class FTextAssetEditorToolkit
 	 * @param InMode The mode to create the toolkit in.
 	 * @param InToolkitHost The toolkit host.
 	 */
-	void Initialize(UTextAsset* InTextAsset, const EToolkitMode::Type InMode, const TSharedPtr<class IToolkitHost>& InToolkitHost);
+	void Initialize(UTextAsset* InTextAsset, const EToolkitMode::Type InMode, const TSharedPtr<IToolkitHost>& InToolkitHost);
 
 public:
 
-	// FAssetEditorToolkit interface
+	//~ FAssetEditorToolkit interface
 
 	virtual FString GetDocumentationLink() const override;
 	virtual void RegisterTabSpawners(const TSharedRef<class FTabManager>& TabManager) override;
 	virtual void UnregisterTabSpawners(const TSharedRef<class FTabManager>& TabManager) override;
 
 public:
 
-	// IToolkit interface
+	//~ IToolkit interface
 
 	virtual FText GetBaseToolkitName() const override;
 	virtual FName GetToolkitFName() const override;
@@ -56,13 +64,13 @@ class FTextAssetEditorToolkit
 
 public:
 
-	// FGCObject interface
+	//~ FGCObject interface
 
 	virtual void AddReferencedObjects(FReferenceCollector& Collector) override;
 	
 protected:
 
-	// FEditorUndoClient interface
+	//~ FEditorUndoClient interface
 
 	virtual void PostUndo(bool bSuccess) override;
 	virtual void PostRedo(bool bSuccess) override;
diff --git a/Source/TextAssetEditor/Private/Widgets/STextAssetEditor.cpp b/Source/TextAssetEditor/Private/Widgets/STextAssetEditor.cpp
@@ -1,7 +1,9 @@
 // Copyright 2015 Headcrash Industries LLC. All Rights Reserved.
 
-#include "TextAssetEditorPrivatePCH.h"
 #include "STextAssetEditor.h"
+#include "TextAsset.h"
+#include "Widgets/SBoxPanel.h"
+#include "Widgets/Input/SMultiLineEditableTextBox.h"
 
 
 #define LOCTEXT_NAMESPACE "STextAssetEditor"
diff --git a/Source/TextAssetEditor/Private/Widgets/STextAssetEditor.h b/Source/TextAssetEditor/Private/Widgets/STextAssetEditor.h
@@ -2,6 +2,13 @@
 
 #pragma once
 
+#include "CoreMinimal.h"
+#include "Widgets/SCompoundWidget.h"
+#include "Widgets/Input/SMultiLineEditableTextBox.h"
+
+class ISlateStyle;
+class UTextAsset;
+
 
 /**
  * Implements the UTextAsset asset editor widget.
diff --git a/Source/TextAssetEditor/TextAssetEditor.Build.cs b/Source/TextAssetEditor/TextAssetEditor.Build.cs
@@ -20,7 +20,8 @@ public TextAssetEditor(TargetInfo Target)
 				"TextAssetEditor/Private/AssetTools",
 				"TextAssetEditor/Private/Factories",
 				"TextAssetEditor/Private/Styles",
-				"TextAssetEditor/Private/Widgets",
+                "TextAssetEditor/Private/Toolkits",
+                "TextAssetEditor/Private/Widgets",
 			}
 		);
 
diff --git a/TextAsset.uplugin b/TextAsset.uplugin
@@ -1,7 +1,8 @@
 {
 	"FileVersion" : 3,
-	"Version" : 1,
-	"VersionName" : "1.0",
+	"Version" : 4,
+	"VersionName" : "4.0",
+	"EngineVersion" : "4.15.0",
 	"FriendlyName" : "Text Asset",
 	"Description" : "Adds an editable text content asset for personal notes.",
 	"Category" : "Editor",
