[Refactoring[ v1.4 ready

ashe23 · Jul 4, 2021 · 9b4b945 · 9b4b945
1 parent 4dd8b07
commit 9b4b945
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 22 deletions.
diff --git a/ProjectCleaner.uplugin b/ProjectCleaner.uplugin
@@ -10,15 +10,16 @@
 	"DocsURL": "https://github.com/ashe23/ProjectCleaner",
 	"MarketplaceURL": "",
 	"SupportURL": "",
+	"EngineVersion": "4.26.0",
 	"CanContainContent": false,
+	"EnabledByDefault" : true,
 	"IsBetaVersion": false,
 	"IsExperimentalVersion": false,
-	"Installed": false,
 	"Modules": [
 		{
 			"Name": "ProjectCleaner",
 			"Type": "Editor",
-			"LoadingPhase": "Default",
+			"LoadingPhase": "PostDefault",
 			"WhitelistPlatforms": [ "Win64", "Win32"]
 		}
 	]

diff --git a/Source/ProjectCleaner/Private/ProjectCleaner.cpp b/Source/ProjectCleaner/Private/ProjectCleaner.cpp
@@ -5,7 +5,6 @@
 #include "UI/ProjectCleanerCommands.h"
 #include "UI/ProjectCleanerNotificationManager.h"
 #include "UI/ProjectCleanerMainUI.h"
-#include "Core/ProjectCleanerUtility.h"
 // Engine Headers
 #include "ToolMenus.h"
 #include "AssetRegistryModule.h"

diff --git a/Source/ProjectCleaner/Private/UI/ProjectCleanerExcludeOptionsUI.cpp b/Source/ProjectCleaner/Private/UI/ProjectCleanerExcludeOptionsUI.cpp
@@ -3,7 +3,6 @@
 #include "UI/ProjectCleanerExcludeOptionsUI.h"
 #include "UI/ProjectCleanerStyle.h"
 #include "StructsContainer.h"
-#include "ClassViewerModule.h"
 
 #define LOCTEXT_NAMESPACE "FProjectCleanerModule"
 

diff --git a/Source/ProjectCleaner/Private/UI/ProjectCleanerExcludedAssetsUI.cpp b/Source/ProjectCleaner/Private/UI/ProjectCleanerExcludedAssetsUI.cpp
@@ -97,8 +97,7 @@ void SProjectCleanerExcludedAssetsUI::UpdateUI()
 	Config.bAllowDragging = false;	
 	Config.AssetShowWarningText = FText::FromName("No assets");
 	Config.GetCurrentSelectionDelegates.Add(&GetCurrentSelectionDelegate);
-	Config.OnAssetDoubleClicked = FOnAssetDoubleClicked::CreateRaw(
-		this,
+	Config.OnAssetDoubleClicked = FOnAssetDoubleClicked::CreateStatic(
 		&SProjectCleanerExcludedAssetsUI::OnAssetDblClicked
 	);
 	Config.OnGetAssetContextMenu = FOnGetAssetContextMenu::CreateRaw(
@@ -230,7 +229,7 @@ void SProjectCleanerExcludedAssetsUI::UpdateUI()
 	];
 }
 
-TSharedPtr<SWidget> SProjectCleanerExcludedAssetsUI::OnGetAssetContextMenu(const TArray<FAssetData>& SelectedAssets)
+TSharedPtr<SWidget> SProjectCleanerExcludedAssetsUI::OnGetAssetContextMenu(const TArray<FAssetData>& SelectedAssets) const
 {
 	FMenuBuilder MenuBuilder{true, Commands};
 	MenuBuilder.BeginSection(
@@ -246,7 +245,7 @@ TSharedPtr<SWidget> SProjectCleanerExcludedAssetsUI::OnGetAssetContextMenu(const
 	return MenuBuilder.MakeWidget();
 }
 
-void SProjectCleanerExcludedAssetsUI::OnAssetDblClicked(const FAssetData& AssetData) const
+void SProjectCleanerExcludedAssetsUI::OnAssetDblClicked(const FAssetData& AssetData)
 {
 	TArray<FName> AssetNames;
 	AssetNames.Add(AssetData.ObjectPath);

diff --git a/Source/ProjectCleaner/Private/UI/ProjectCleanerUnusedAssetsBrowserUI.cpp b/Source/ProjectCleaner/Private/UI/ProjectCleanerUnusedAssetsBrowserUI.cpp
@@ -125,8 +125,7 @@ void SProjectCleanerUnusedAssetsBrowserUI::UpdateUI()
 	AssetPickerConfig.bCanShowRealTimeThumbnails = false;
 	AssetPickerConfig.AssetShowWarningText = FText::FromName("No assets");
 	AssetPickerConfig.GetCurrentSelectionDelegates.Add(&GetCurrentSelectionDelegate);
-	AssetPickerConfig.OnAssetDoubleClicked = FOnAssetDoubleClicked::CreateRaw(
-		this,
+	AssetPickerConfig.OnAssetDoubleClicked = FOnAssetDoubleClicked::CreateStatic(
 		&SProjectCleanerUnusedAssetsBrowserUI::OnAssetDblClicked
 	);
 	AssetPickerConfig.OnGetAssetContextMenu = FOnGetAssetContextMenu::CreateRaw(
@@ -186,7 +185,7 @@ void SProjectCleanerUnusedAssetsBrowserUI::UpdateUI()
 	];
 }
 
-TSharedPtr<SWidget> SProjectCleanerUnusedAssetsBrowserUI::OnGetAssetContextMenu(const TArray<FAssetData>& SelectedAssets)
+TSharedPtr<SWidget> SProjectCleanerUnusedAssetsBrowserUI::OnGetAssetContextMenu(const TArray<FAssetData>& SelectedAssets) const
 {
 	FMenuBuilder MenuBuilder{true, Commands};
 	MenuBuilder.BeginSection(
@@ -203,7 +202,7 @@ TSharedPtr<SWidget> SProjectCleanerUnusedAssetsBrowserUI::OnGetAssetContextMenu(
 	return MenuBuilder.MakeWidget();
 }
 
-void SProjectCleanerUnusedAssetsBrowserUI::OnAssetDblClicked(const FAssetData& AssetData) const
+void SProjectCleanerUnusedAssetsBrowserUI::OnAssetDblClicked(const FAssetData& AssetData)
 {
 	TArray<FName> AssetNames;
 	AssetNames.Add(AssetData.ObjectPath);

diff --git a/Source/ProjectCleaner/ProjectCleaner.Build.cs b/Source/ProjectCleaner/ProjectCleaner.Build.cs
@@ -1,7 +1,5 @@
-// Copyright 1998-2019 Epic Games, Inc. All Rights Reserved.
+// Copyright 2021. Ashot Barkhudaryan. All Rights Reserved.
 
-using System;
-using System.IO;
 using UnrealBuildTool;
 
 public class ProjectCleaner : ModuleRules
@@ -50,8 +48,6 @@ public ProjectCleaner(ReadOnlyTargetRules Target) : base(Target)
 				"UnrealEd",
 				"ToolMenus",
 				"AssetTools",
-				"GraphEditor",
-				"ClassViewer"
 			}
 		);
 

diff --git a/Source/ProjectCleaner/Public/UI/ProjectCleanerExcludedAssetsUI.h b/Source/ProjectCleaner/Public/UI/ProjectCleanerExcludedAssetsUI.h
@@ -31,8 +31,8 @@ class SProjectCleanerExcludedAssetsUI : public SCompoundWidget
 	void SetLinkedAssets(const TArray<FAssetData>& Assets);
 	void SetCleanerConfigs(UCleanerConfigs* Configs);
 	void UpdateUI();
-	TSharedPtr<SWidget> OnGetAssetContextMenu(const TArray<FAssetData>& SelectedAssets);
-	void OnAssetDblClicked(const FAssetData& AssetData) const;
+	TSharedPtr<SWidget> OnGetAssetContextMenu(const TArray<FAssetData>& SelectedAssets) const;
+	static void OnAssetDblClicked(const FAssetData& AssetData);
 	void FindInContentBrowser() const;
 	bool IsAnythingSelected() const;
 	void IncludeAssets() const;

diff --git a/Source/ProjectCleaner/Public/UI/ProjectCleanerNotificationManager.h b/Source/ProjectCleaner/Public/UI/ProjectCleanerNotificationManager.h
@@ -2,7 +2,6 @@
 
 #pragma once
 
-#include "StructsContainer.h"
 // Engine Headers
 #include "Widgets/Notifications/SNotificationList.h"
 #include "CoreMinimal.h"

diff --git a/Source/ProjectCleaner/Public/UI/ProjectCleanerUnusedAssetsBrowserUI.h b/Source/ProjectCleaner/Public/UI/ProjectCleanerUnusedAssetsBrowserUI.h
@@ -31,8 +31,8 @@ class SProjectCleanerUnusedAssetsBrowserUI : public SCompoundWidget
 	FOnUserExcludedAssets OnUserExcludedAssets;
 private:
 	void UpdateUI();
-	TSharedPtr<SWidget> OnGetAssetContextMenu(const TArray<FAssetData>& SelectedAssets);
-	void OnAssetDblClicked(const FAssetData& AssetData) const;
+	TSharedPtr<SWidget> OnGetAssetContextMenu(const TArray<FAssetData>& SelectedAssets) const;
+	static void OnAssetDblClicked(const FAssetData& AssetData);
 	void FindInContentBrowser() const;
 	bool IsAnythingSelected() const;
 	void DeleteAsset() const;