Removed legacy unused icon manager and related classes

Signed-off-by: Chris Galvan <[email protected]>

Code/Editor/Commands/CommandManager.cpp

@@ -15,7 +15,6 @@
 
 // Editor
 #include "QtViewPaneManager.h"
-#include "Include/IIconManager.h"
 
 // AzToolsFramework
 #include <AzToolsFramework/PythonTerminal/ScriptTermDialog.h>
@@ -182,11 +181,6 @@ bool CEditorCommandManager::AttachUIInfo(const char* fullCmdName, const CCommand
 
     m_uiCommands.insert(UICommandTable::value_type(pCommand->m_uiInfo.commandId, pCommand));
 
-    if (uiInfo.iconFilename.empty() == false)
-    {
-        GetIEditor()->GetIconManager()->RegisterCommandIcon(uiInfo.iconFilename.c_str(), pCommand->m_uiInfo.commandId);
-    }
-
     return true;
 }
 

Code/Editor/EditorViewportWidget.cpp

@@ -218,7 +218,6 @@ EditorViewportWidget::EditorViewportWidget(const QString& name, QWidget* parent)
 
     GetIEditor()->RegisterNotifyListener(this);
 
-    m_displayContext.pIconManager = GetIEditor()->GetIconManager();
     GetIEditor()->GetUndoManager()->AddListener(this);
 
     // The renderer requires something, so don't allow us to shrink to absolutely nothing

Code/Editor/GameExporter.cpp

@@ -83,7 +83,6 @@ CGameExporter::~CGameExporter()
 bool CGameExporter::Export(unsigned int flags, [[maybe_unused]] EEndian eExportEndian, const char* subdirectory)
 {
     CAutoDocNotReady autoDocNotReady;
-    CObjectManagerLevelIsExporting levelIsExportingFlag;
     QWaitCursor waitCursor;
 
     IEditor* pEditor = GetIEditor();

Code/Editor/IEditor.h

@@ -37,7 +37,6 @@ class CSelectionGroup;
 class CAnimationContext;
 class CTrackViewSequenceManager;
 class CGameEngine;
-struct IIconManager;
 class CToolBoxManager;
 class CClassFactory;
 class CMusicManager;
@@ -481,8 +480,6 @@ struct IEditor
     //! Get access to object manager.
     virtual struct IObjectManager* GetObjectManager() = 0;
     virtual CSettingsManager* GetSettingsManager() = 0;
-    //! Returns IconManager.
-    virtual IIconManager* GetIconManager() = 0;
     //! Get Music Manager.
     virtual CMusicManager* GetMusicManager() = 0;
     virtual float GetTerrainElevation(float x, float y) = 0;

Code/Editor/IEditorImpl.cpp

@@ -38,7 +38,6 @@
 #include "CryEdit.h"
 #include "Dialogs/ErrorsDlg.h"
 #include "PluginManager.h"
-#include "IconManager.h"
 #include "ViewManager.h"
 #include "DisplaySettings.h"
 #include "KeyboardCustomizationSettings.h"
@@ -99,7 +98,6 @@ CEditorImpl::CEditorImpl()
     , m_bUpdates(true)
     , m_bTerrainAxisIgnoreObjects(false)
     , m_pDisplaySettings(nullptr)
-    , m_pIconManager(nullptr)
     , m_bSelectionLocked(true)
     , m_pGameEngine(nullptr)
     , m_pAnimationContext(nullptr)
@@ -143,7 +141,6 @@ CEditorImpl::CEditorImpl()
 
     m_pObjectManager = new CObjectManager;
     m_pViewManager = new CViewManager;
-    m_pIconManager = new CIconManager;
     m_pUndoManager = new CUndoManager;
     m_pToolBoxManager = new CToolBoxManager;
     m_pSequenceManager = new CTrackViewSequenceManager;
@@ -267,7 +264,6 @@ CEditorImpl::~CEditorImpl()
     m_bExiting = true; // Can't save level after this point (while Crash)
     SAFE_RELEASE(m_pSourceControl);
 
-    SAFE_DELETE(m_pIconManager)
     SAFE_DELETE(m_pViewManager)
     SAFE_DELETE(m_pObjectManager) // relies on prefab manager
 
@@ -723,11 +719,6 @@ void CEditorImpl::ResetViews()
     m_pDisplaySettings->SetRenderFlags(m_pDisplaySettings->GetRenderFlags());
 }
 
-IIconManager* CEditorImpl::GetIconManager()
-{
-    return m_pIconManager;
-}
-
 IEditorFileMonitor* CEditorImpl::GetFileMonitor()
 {
     return m_pEditorFileMonitor.get();

Code/Editor/IEditorImpl.h

@@ -38,7 +38,6 @@ class CUndoManager;
 class CGameEngine;
 class CExportManager;
 class CErrorsDlg;
-class CIconManager;
 class CTrackViewSequenceManager;
 class CEditorFileMonitor;
 class AzAssetWindow;
@@ -154,7 +153,6 @@ public:
     CMusicManager* GetMusicManager() override { return m_pMusicManager; };
 
     IEditorFileMonitor* GetFileMonitor() override;
-    IIconManager* GetIconManager() override;
     float GetTerrainElevation(float x, float y) override;
     Editor::EditorQtApplication* GetEditorQtApplication() override { return m_QtApplication; }
     const QColor& GetColorByName(const QString& name) override;
@@ -316,7 +314,6 @@ protected:
     SFileVersion m_productVersion;
     CXmlTemplateRegistry m_templateRegistry;
     CDisplaySettings* m_pDisplaySettings;
-    CIconManager* m_pIconManager;
     QString m_primaryCDFolder;
     QString m_userFolder;
     bool m_bSelectionLocked;

Code/Editor/IconManager.cpp

@@ -1,225 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "IconManager.h"
-
-#include <AzCore/Interface/Interface.h>
-
-// AzToolsFramework
-#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
-
-// Editor
-#include "Settings.h"
-#include "Util/Image.h"
-#include "Util/ImageUtil.h"
-
-#define HELPER_MATERIAL "Objects/Helper"
-
-namespace
-{
-    const char* g_IconNames[eIcon_COUNT] =
-    {
-        "Icons/ScaleWarning.png",
-        "Icons/RotationWarning.png",
-    };
-};
-
-//////////////////////////////////////////////////////////////////////////
-CIconManager::CIconManager()
-{
-    ZeroStruct(m_icons);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CIconManager::~CIconManager()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CIconManager::Init()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CIconManager::Done()
-{
-    Reset();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CIconManager::Reset()
-{
-    // Do not unload objects. but clears them.
-    for (int i = 0; i < eIcon_COUNT; i++)
-    {
-        m_icons[i] = 0;
-    }
-
-    // Free icon bitmaps.
-    for (IconsMap::iterator it = m_iconBitmapsMap.begin(); it != m_iconBitmapsMap.end(); ++it)
-    {
-        delete it->second;
-    }
-    m_iconBitmapsMap.clear();
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CIconManager::GetIconTexture(const char* iconName)
-{
-    int id = 0;
-    if (m_textures.Find(iconName, id))
-    {
-        return id;
-    }
-
-    if ((!iconName) || (iconName[0] == 0))
-    {
-        return 0;
-    }
-
-    return id;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CIconManager::GetIconTexture(EIcon icon)
-{
-    assert(icon >= 0 && icon < eIcon_COUNT);
-    if (m_icons[icon])
-    {
-        return m_icons[icon];
-    }
-
-    m_icons[icon] = GetIconTexture(g_IconNames[icon]);
-    return m_icons[icon];
-}
-
-//////////////////////////////////////////////////////////////////////////
-QImage* CIconManager::GetIconBitmap(const char* filename, bool& bHaveAlpha, uint32 effects /*=0*/)
-{
-    QImage* pBitmap = nullptr;
-
-    QString iconFilename = filename;
-
-    if (Path::GetPath(iconFilename).isEmpty())
-    {
-        QString iconsPath;
-        if (!gSettings.searchPaths[EDITOR_PATH_UI_ICONS].empty())
-        {
-            iconsPath = gSettings.searchPaths[EDITOR_PATH_UI_ICONS][0];
-        }
-        iconFilename = Path::Make(iconsPath, iconFilename);
-    }
-
-    if (Path::GetExt(iconFilename).isEmpty())
-    {
-        // By default add .bmp extension to the filename without extension.
-        pBitmap = GetIconBitmap((iconFilename + ".png").toUtf8().data(), bHaveAlpha);
-        if (!pBitmap)
-        {
-            pBitmap = GetIconBitmap((iconFilename + ".bmp").toUtf8().data(), bHaveAlpha);
-        }
-        return pBitmap;
-    }
-
-    bool bAlphaBitmap = false;
-    QPixmap pm(iconFilename);
-    bAlphaBitmap = pm.hasAlpha();
-
-    bHaveAlpha = (bAlphaBitmap == true);
-    if (!pm.isNull())
-    {
-        pBitmap = new QImage;
-        *pBitmap = pm.toImage();
-        m_iconBitmapsMap[filename] = pBitmap;
-
-        // apply image effects
-        if (bAlphaBitmap)
-        {
-            const DWORD dataSize = pm.width() * pm.height() * 4;
-            BYTE* pImage = pBitmap->bits();
-
-              if (effects & eIconEffect_ColorEnabled)
-            {
-                for (DWORD i = 0; i < dataSize; i += 4)
-                {
-                    pImage[i + 0] = (BYTE)((DWORD)pImage[i + 0] * 109 / 255);
-                    pImage[i + 1] = (BYTE)((DWORD)pImage[i + 1] * 97 / 255);
-                    pImage[i + 2] = (BYTE)((DWORD)pImage[i + 2] * 89 / 255);
-                }
-            }
-
-            if (effects & eIconEffect_ColorDisabled)
-            {
-                for (DWORD i = 0; i < dataSize; i += 4)
-                {
-                    pImage[i + 0] = (BYTE)((DWORD)pImage[i + 0] * 168 / 255);
-                    pImage[i + 1] = (BYTE)((DWORD)pImage[i + 1] * 164 / 255);
-                    pImage[i + 2] = (BYTE)((DWORD)pImage[i + 2] * 162 / 255);
-                }
-            }
-
-            if (effects & eIconEffect_Dim)
-            {
-                for (DWORD i = 0; i < dataSize; i += 4)
-                {
-                    pImage[i + 0] /= 2;
-                    pImage[i + 1] /= 2;
-                    pImage[i + 2] /= 2;
-                }
-            }
-
-            if (effects & eIconEffect_HalfAlpha)
-            {
-                for (DWORD i = 0; i < dataSize; i += 4)
-                {
-                    pImage[i + 3] /= 2;
-                }
-            }
-
-            if (effects & eIconEffect_TintGreen)
-            {
-                for (DWORD i = 0; i < dataSize; i += 4)
-                {
-                    pImage[i + 0] /= 2;
-                    pImage[i + 2] /= 2;
-                }
-            }
-
-            if (effects & eIconEffect_TintRed)
-            {
-                for (DWORD i = 0; i < dataSize; i += 4)
-                {
-                    pImage[i + 0] /= 2;
-                    pImage[i + 1] /= 2;
-                }
-            }
-
-            if (effects & eIconEffect_TintYellow)
-            {
-                for (DWORD i = 0; i < dataSize; i += 4)
-                {
-                    pImage[i + 0] /= 2;
-                }
-            }
-
-            // alpha premultiply
-            for (DWORD i = 0; i < dataSize; i += 4)
-            {
-                pImage[i + 0] = ((DWORD)pImage[i + 0] * (DWORD)pImage[i + 3]) / 255;
-                pImage[i + 1] = ((DWORD)pImage[i + 1] * (DWORD)pImage[i + 3]) / 255;
-                pImage[i + 2] = ((DWORD)pImage[i + 2] * (DWORD)pImage[i + 3]) / 255;
-            }
-        }
-
-        return pBitmap;
-    }
-    return nullptr;
-}

Code/Editor/IconManager.h

@@ -1,64 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Manages Textures used by Icon.
-#pragma once
-
-#include "Include/IIconManager.h"   // for IIconManager
-#include "IEditor.h"                // for IDocListener
-
-/*!
- *  CIconManager contains map of icon names to icon textures,
- *  Ensuring that only one instance of texture for specified icon will be allocated.
- *  Also release textures when editor exit.
- *
- */
-class CIconManager
-    : public IIconManager
-    , public IDocListener
-{
-public:
-    // Construction
-    CIconManager();
-    ~CIconManager() override;
-
-    void Init();
-    void Done();
-
-    // Unload all loaded resources.
-    void Reset();
-
-    // Operations
-    virtual int GetIconTexture(EIcon icon);
-    virtual int GetIconTexture(const char* iconName);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Icon bitmaps.
-    //////////////////////////////////////////////////////////////////////////
-    virtual QImage* GetIconBitmap(const char* filename, bool& bHaveAlpha, uint32 effects = 0);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Implementation of IDocListener.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void OnNewDocument() { Reset(); };
-    virtual void OnLoadDocument() { Reset(); };
-    virtual void OnCloseDocument() { Reset(); };
-    //////////////////////////////////////////////////////////////////////////
-
-private:
-    StdMap<QString, int> m_textures;
-
-    int m_icons[eIcon_COUNT];
-
-    //////////////////////////////////////////////////////////////////////////
-    // Icons bitmaps.
-    //////////////////////////////////////////////////////////////////////////
-    typedef std::map<QString, QImage*> IconsMap;
-    IconsMap m_iconBitmapsMap;
-};

Code/Editor/Include/IFileUtil.h

@@ -201,8 +201,6 @@ struct IFileUtil
     // THIS FUNCTION IS NOT DESIGNED FOR MULTI-THREADED USAGE
     virtual ECopyTreeResult MoveTree(const QString& strSourceDirectory, const QString& strTargetDirectory, bool boRecurse = true, bool boConfirmOverwrite = false) = 0;
 
-    virtual void GatherAssetFilenamesFromLevel(std::set<QString>& rOutFilenames, bool bMakeLowerCase = false, bool bMakeUnixPath = false) = 0;
-
     // Get file attributes include source control attributes if available
     virtual uint32 GetAttributes(const char* filename, bool bUseSourceControl = true) = 0;
 

Code/Editor/Include/IIconManager.h

@@ -1,60 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-struct IMaterial;
-class CBitmap;
-
-class QImage;
-
-// Note: values are used as array indices
-enum EStatObject
-{
-    eStatObject_Arrow = 0,
-    eStatObject_Axis,
-    eStatObject_Sphere,
-    eStatObject_Anchor,
-    eStatObject_Entrance,
-    eStatObject_HidePoint,
-    eStatObject_HidePointSecondary,
-    eStatObject_ReinforcementSpot,
-
-    eStatObject_COUNT
-};
-
-// Note: values are used as array indices
-enum EIcon
-{
-    eIcon_ScaleWarning = 0,
-    eIcon_RotationWarning,
-
-    eIcon_COUNT
-};
-
-// Note: image effects to apply to image
-enum EIconEffect
-{
-    eIconEffect_Dim = 1 << 0,
-    eIconEffect_HalfAlpha = 1 << 1,
-    eIconEffect_TintRed = 1 << 2,
-    eIconEffect_TintGreen = 1 << 3,
-    eIconEffect_TintYellow = 1 << 4,
-    eIconEffect_ColorEnabled = 1 << 5,
-    eIconEffect_ColorDisabled = 1 << 6,
-};
-
-struct IIconManager
-{
-    virtual ~IIconManager() = default;
-    virtual int GetIconTexture(EIcon icon) = 0;
-    virtual int GetIconTexture(const char* iconName) = 0;
-    virtual QImage* GetIconBitmap(const char* filename, bool& haveAlpha, uint32 effects = 0) = 0;
-    // Register an Icon for the specific command
-    virtual void RegisterCommandIcon([[maybe_unused]] const char* filename, [[maybe_unused]] int nCommandId) {}
-};

Code/Editor/Lib/Tests/IEditorMock.h

@@ -83,7 +83,6 @@ public:
     MOCK_METHOD0(IsSelectionLocked, bool());
     MOCK_METHOD0(GetObjectManager, struct IObjectManager* ());
     MOCK_METHOD0(GetSettingsManager, CSettingsManager* ());
-    MOCK_METHOD0(GetIconManager, IIconManager* ());
     MOCK_METHOD0(GetMusicManager, CMusicManager* ());
     MOCK_METHOD2(GetTerrainElevation, float(float , float ));
     MOCK_METHOD0(GetVegetationMap, class CVegetationMap* ());

Code/Editor/Lib/Tests/test_AzAssetBrowserRequestHandler.cpp

@@ -116,7 +116,6 @@ namespace UnitTest
     {
     public:
         MOCK_METHOD1(BrowseForAssets, void(AzToolsFramework::AssetBrowser::AssetSelectionModel& /*selection*/));
-        MOCK_METHOD1(GetIconTextureIdFromEntityIconPath, int(const AZStd::string&));
         MOCK_METHOD2(CreateNewEntityAtPosition, AZ::EntityId (const AZ::Vector3&, AZ::EntityId));
     };
 

Code/Editor/Objects/BaseObject.cpp

@@ -26,7 +26,6 @@
 #include "DisplaySettings.h"
 #include "Undo/Undo.h"
 #include "UsedResources.h"
-#include "Include/IIconManager.h"
 #include "Objects/SelectionGroup.h"
 #include "Objects/ObjectManager.h"
 #include "ViewManager.h"
@@ -414,7 +413,6 @@ bool CBaseObject::Init([[maybe_unused]] IEditor* ie, CBaseObject* prev, [[maybe_
         OnSetValues();
     }
 
-    m_nTextureIcon = m_classDesc->GetTextureIconId();
     if (m_classDesc->RenderTextureOnTop())
     {
         SetFlags(OBJFLAG_SHOW_ICONONTOP);

Code/Editor/Objects/ClassDesc.cpp

@@ -1,30 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "ClassDesc.h"
-
-// Editor
-#include "IconManager.h"
-
-int CObjectClassDesc::GetTextureIconId()
-{
-    if (!m_nTextureIcon)
-    {
-        QString pTexName = GetTextureIcon();
-
-        if (!pTexName.isEmpty())
-        {
-            m_nTextureIcon = GetIEditor()->GetIconManager()->GetIconTexture(pTexName.toUtf8().data());
-        }
-    }
-
-    return m_nTextureIcon;
-}

Code/Editor/Objects/ClassDesc.h

@@ -53,7 +53,6 @@ public:
     //! Ex. Object with creation order 200 will be created after any object with order 100.
     virtual int GameCreationOrder() { return 100; };
     virtual QString GetTextureIcon() { return QString(); };
-    int GetTextureIconId();
     virtual bool RenderTextureOnTop() const { return false; }
 
     virtual QString GetToolClassName() { return "EditTool.ObjectCreate"; }

Code/Editor/Objects/DisplayContext.h

@@ -29,7 +29,6 @@
 struct IDisplayViewport;
 struct IRenderer;
 struct IRenderAuxGeom;
-struct IIconManager;
 class CDisplaySettings;
 class QPoint;
 
@@ -64,7 +63,6 @@ struct SANDBOX_API DisplayContext
     CDisplaySettings* settings;
     IDisplayViewport* view;
     IRenderAuxGeom* pRenderAuxGeom;
-    IIconManager* pIconManager;
     AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
     AABB    box;    // Bounding box of volume that need to be repainted.
     AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING

Code/Editor/Objects/DisplayContextShared.inl

@@ -11,7 +11,6 @@
 #include "DisplayContext.h"
 #include "IRenderAuxGeom.h"
 #include "IEditor.h"
-#include "Include/IIconManager.h"
 #include "Include/IDisplayViewport.h"
 #include <Editor/Util/EditorUtils.h>
 
@@ -28,7 +27,6 @@ DisplayContext::DisplayContext()
     view = 0;
     flags = 0;
     settings = 0;
-    pIconManager = 0;
     m_renderState = 0;
 
     m_currentMatrix = 0;

Code/Editor/Objects/ObjectManager.h

@@ -13,7 +13,6 @@
 #include "IObjectManager.h"
 #include "BaseObject.h"
 #include "SelectionGroup.h"
-#include "ObjectManagerEventBus.h"
 
 #include <AzCore/std/containers/map.h>
 #include <AzCore/std/smart_ptr/unique_ptr.h>
@@ -29,23 +28,6 @@ class CWaitProgress;
 
 enum class ImageRotationDegrees;
 
-//////////////////////////////////////////////////////////////////////////
-// Helper class to signal when we are exporting a level to game
-//////////////////////////////////////////////////////////////////////////
-class CObjectManagerLevelIsExporting
-{
-public:
-    CObjectManagerLevelIsExporting()
-    {
-        AZ::ObjectManagerEventBus::Broadcast(&AZ::ObjectManagerEventBus::Events::OnExportingStarting);
-    }
-
-    ~CObjectManagerLevelIsExporting()
-    {
-        AZ::ObjectManagerEventBus::Broadcast(&AZ::ObjectManagerEventBus::Events::OnExportingFinished);
-    }
-};
-
 /*!
  *  CObjectManager is a singleton object that
  *  manages global set of objects in level.

Code/Editor/Objects/ObjectManagerEventBus.h

@@ -1,36 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef CRYINCLUDE_EDITOR_OBJECTS_OBJECTMANAGER_BUS_H
-#define CRYINCLUDE_EDITOR_OBJECTS_OBJECTMANAGER_BUS_H
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-
-//////////////////////////////////////////////////////////////////////////
-// EBus to handle object manager events
-//////////////////////////////////////////////////////////////////////////
-namespace AZ
-{
-    class ObjectManagerEvents
-        : public AZ::EBusTraits
-    {
-    public:
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
-
-        virtual ~ObjectManagerEvents() = default;
-
-        virtual void OnExportingStarting() {}
-        virtual void OnExportingFinished() {}
-    };
-
-    using ObjectManagerEventBus = AZ::EBus<ObjectManagerEvents>;
-}
-
-#endif // CRYINCLUDE_EDITOR_OBJECTS_OBJECTMANAGER_BUS_H

Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp

@@ -10,7 +10,6 @@
 
 
 #include "Settings.h"
-#include "IIconManager.h"
 #include "Include/IObjectManager.h"
 #include "Objects/SelectionGroup.h"
 
@@ -65,7 +64,6 @@ CComponentEntityObject::~CComponentEntityObject()
 bool CComponentEntityObject::Init(IEditor* ie, CBaseObject* copyFrom, const QString& file)
 {
     SetColor(RGB(0, 255, 0));
-    SetTextureIcon(GetClassDesc()->GetTextureIconId());
 
     // Sandbox does not serialize this object with others in the layer.
     SetFlags(OBJFLAG_DONT_SAVE);
@@ -775,9 +773,6 @@ void CComponentEntityObject::SetupEntityIcon()
         if (!m_icon.empty())
         {
             m_hasIcon = true;
-
-            // ToDo: Get from Atom?
-            // int textureId = GetIEditor()->GetIconManager()->GetIconTexture(m_icon.c_str());
             m_iconTexture = nullptr;
         }
     }

Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp

@@ -84,7 +84,6 @@
 #include <Editor/CryEditDoc.h>
 #include <Editor/GameEngine.h>
 #include <Editor/DisplaySettings.h>
-#include <Editor/IconManager.h>
 #include <Editor/Settings.h>
 #include <Editor/QtViewPaneManager.h>
 #include <Editor/EditorViewportSettings.h>
@@ -1183,11 +1182,6 @@ AZ::Vector3 SandboxIntegrationManager::GetWorldPositionAtViewportCenter()
     return AZ::Vector3::CreateZero();
 }
 
-int SandboxIntegrationManager::GetIconTextureIdFromEntityIconPath(const AZStd::string& entityIconPath)
-{
-    return GetIEditor()->GetIconManager()->GetIconTexture(entityIconPath.c_str());
-}
-
 void SandboxIntegrationManager::ClearRedoStack()
 {
     // We have two separate undo systems that are assumed to be kept in sync,

Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h

@@ -167,7 +167,6 @@ private:
     AZ::Vector3 GetWorldPositionAtViewportCenter() override;
     void InstantiateSliceFromAssetId(const AZ::Data::AssetId& assetId) override;
     void ClearRedoStack() override;
-    int GetIconTextureIdFromEntityIconPath(const AZStd::string& entityIconPath) override;
     //////////////////////////////////////////////////////////////////////////
 
     //////////////////////////////////////////////////////////////////////////

Code/Editor/Util/FileUtil.cpp

@@ -1955,40 +1955,6 @@ void CFileUtil::PopulateQMenu(QWidget* caller, QMenu* menu, AZStd::string_view f
     }
 }
 
-void CFileUtil::GatherAssetFilenamesFromLevel(std::set<QString>& rOutFilenames, bool bMakeLowerCase, bool bMakeUnixPath)
-{
-    rOutFilenames.clear();
-    CBaseObjectsArray objArr;
-    CUsedResources usedRes;
-
-    GetIEditor()->GetObjectManager()->GetObjects(objArr);
-
-    for (size_t i = 0, iCount = objArr.size(); i < iCount; ++i)
-    {
-        CBaseObject* pObj = objArr[i];
-
-        usedRes.files.clear();
-        pObj->GatherUsedResources(usedRes);
-
-        for (CUsedResources::TResourceFiles::iterator iter = usedRes.files.begin(); iter != usedRes.files.end(); ++iter)
-        {
-            QString tmpStr = (*iter);
-
-            if (bMakeLowerCase)
-            {
-                tmpStr = tmpStr.toLower();
-            }
-
-            if (bMakeUnixPath)
-            {
-                tmpStr = Path::ToUnixPath(tmpStr);
-            }
-
-            rOutFilenames.insert(tmpStr);
-        }
-    }
-}
-
 uint32 CFileUtil::GetAttributes(const char* filename, bool bUseSourceControl /*= true*/)
 {
     using namespace AzToolsFramework;

Code/Editor/Util/FileUtil.h

@@ -127,8 +127,6 @@ public:
 
     static void PopulateQMenu(QWidget* caller, QMenu* menu, AZStd::string_view fullGamePath);
 
-    static void GatherAssetFilenamesFromLevel(std::set<QString>& rOutFilenames, bool bMakeLowerCase = false, bool bMakeUnixPath = false);
-
     // Get file attributes include source control attributes if available
     static uint32 GetAttributes(const char* filename, bool bUseSourceControl = true);
 

Code/Editor/Util/FileUtil_impl.cpp

@@ -150,11 +150,6 @@ IFileUtil::ECopyTreeResult CFileUtil_impl::MoveTree(const QString& strSourceDire
     return CFileUtil::MoveTree(strSourceDirectory, strTargetDirectory, boRecurse, boConfirmOverwrite);
 }
 
-void CFileUtil_impl::GatherAssetFilenamesFromLevel(std::set<QString>& rOutFilenames, bool bMakeLowerCase, bool bMakeUnixPath)
-{
-    CFileUtil::GatherAssetFilenamesFromLevel(rOutFilenames, bMakeLowerCase, bMakeUnixPath);
-}
-
 uint32 CFileUtil_impl::GetAttributes(const char* filename, bool bUseSourceControl)
 {
     return CFileUtil::GetAttributes(filename, bUseSourceControl);

Code/Editor/Util/FileUtil_impl.h

@@ -115,8 +115,6 @@ public:
     // THIS FUNCTION IS NOT DESIGNED FOR MULTI-THREADED USAGE
     ECopyTreeResult MoveTree(const QString& strSourceDirectory, const QString& strTargetDirectory, bool boRecurse = true, bool boConfirmOverwrite = false) override;
 
-    void GatherAssetFilenamesFromLevel(std::set<QString>& rOutFilenames, bool bMakeLowerCase = false, bool bMakeUnixPath = false) override;
-
     // Get file attributes include source control attributes if available
     uint32 GetAttributes(const char* filename, bool bUseSourceControl = true) override;
 

Code/Editor/editor_lib_files.cmake

@@ -277,7 +277,6 @@ set(FILES
     Include/IDisplayViewport.h
     Include/IEditorClassFactory.h
     Include/IExportManager.h
-    Include/IIconManager.h
     Include/ILogFile.h
     Include/IKeyTimeSet.h
     Include/IObjectManager.h
@@ -440,7 +439,6 @@ set(FILES
     LevelIndependentFileMan.h
     LogFileImpl.cpp
     LogFileImpl.h
-    Objects/ClassDesc.cpp
     Objects/ClassDesc.h
     Objects/DisplayContextShared.inl
     Objects/SelectionGroup.cpp
@@ -513,8 +511,6 @@ set(FILES
     DisplaySettingsPythonFuncs.cpp
     ErrorReport.cpp
     ErrorReport.h
-    IconManager.cpp
-    IconManager.h
     ProcessInfo.h
     TrackView/AtomOutputFrameCapture.cpp
     TrackView/AtomOutputFrameCapture.h

Code/Framework/AzToolsFramework/AzToolsFramework/API/ToolsApplicationAPI.h

@@ -875,10 +875,6 @@ namespace AzToolsFramework
 
         /// Clears current redo stack
         virtual void ClearRedoStack() {}
-        
-        /// Return the icon texture id (from internal IconManager) for a given entity icon path.
-        /// This can be passed to DrawTextureLabel to draw an entity icon.
-        virtual int GetIconTextureIdFromEntityIconPath(const AZStd::string& entityIconPath) = 0;
     };
 
     using EditorRequestBus = AZ::EBus<EditorRequests>;

Code/Framework/AzToolsFramework/Tests/EntityIdQLabelTests.cpp

@@ -61,7 +61,6 @@ namespace UnitTest
         }
 
         void BrowseForAssets(AssetBrowser::AssetSelectionModel& /*selection*/) override {}
-        int GetIconTextureIdFromEntityIconPath(const AZStd::string& entityIconPath) override { AZ_UNUSED(entityIconPath);  return 0; }
 
         void GoToSelectedEntitiesInViewports() override 
         {

Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.h

@@ -157,10 +157,6 @@ namespace UnitTest
         void BrowseForAssets([[maybe_unused]] AzToolsFramework::AssetBrowser::AssetSelectionModel& selection) override
         {
         }
-        int GetIconTextureIdFromEntityIconPath([[maybe_unused]] const AZStd::string& entityIconPath) override
-        {
-            return 0;
-        }
         //! @}
 
         // Prefab interfaces

Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityTestFramework.h

@@ -136,7 +136,6 @@ namespace UnitTest
         */
         void CreateEditorRepresentation(AZ::Entity* entity) override;
         void BrowseForAssets(AzToolsFramework::AssetBrowser::AssetSelectionModel& selection) override { AZ_UNUSED(selection); }
-        int GetIconTextureIdFromEntityIconPath(const AZStd::string& entityIconPath) override { AZ_UNUSED(entityIconPath);  return 0; }
 
         /*
         * AssetSystemRequestBus

Code/Framework/AzToolsFramework/Tests/UI/EntityPropertyEditorTests.cpp

@@ -236,7 +236,6 @@ namespace UnitTest
 
         // These are required by implementing the EditorRequestBus
         void BrowseForAssets(AssetBrowser::AssetSelectionModel& /*selection*/) override {}
-        int GetIconTextureIdFromEntityIconPath([[maybe_unused]] const AZStd::string& entityIconPath) override { return 0; }
 
     public:
         EntityPropertyEditor* m_levelEditor;