Remove FocusModeFramework nested namespace

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
monroegm-disable-blank-issue-2
Danilo Aimini 5 years ago
parent 368c325613
commit 1dd58511c1

@ -107,7 +107,7 @@ namespace AzToolsFramework
AZ_Assert(m_editorEntityUiInterface != nullptr,
"EntityOutlinerListModel requires a EditorEntityUiInterface instance on Initialize.");
m_focusModeInterface = AZ::Interface<FocusModeFramework::FocusModeInterface>::Get();
m_focusModeInterface = AZ::Interface<FocusModeInterface>::Get();
AZ_Assert(
m_focusModeInterface != nullptr,
"EntityOutlinerListModel requires a FocusModeInterface instance on Initialize.");

@ -35,12 +35,8 @@
namespace AzToolsFramework
{
namespace FocusModeFramework
{
class FocusModeInterface;
}
class EditorEntityUiInterface;
class FocusModeInterface;
namespace EntityOutliner
{
@ -279,7 +275,7 @@ namespace AzToolsFramework
QVariant GetEntityTooltip(const AZ::EntityId& id) const;
EditorEntityUiInterface* m_editorEntityUiInterface = nullptr;
FocusModeFramework::FocusModeInterface* m_focusModeInterface = nullptr;
FocusModeInterface* m_focusModeInterface = nullptr;
};
class EntityOutlinerCheckBox

@ -116,7 +116,7 @@ namespace AzToolsFramework
EditorHelpers::EditorHelpers(const EditorVisibleEntityDataCache* entityDataCache)
: m_entityDataCache(entityDataCache)
{
m_focusModeInterface = AZ::Interface<FocusModeFramework::FocusModeInterface>::Get();
m_focusModeInterface = AZ::Interface<FocusModeInterface>::Get();
AZ_Assert(
m_focusModeInterface,
"EditorHelpers - "

@ -22,11 +22,7 @@ namespace AzFramework
namespace AzToolsFramework
{
class EditorVisibleEntityDataCache;
namespace FocusModeFramework
{
class FocusModeInterface;
}
class FocusModeInterface;
namespace ViewportInteraction
{
@ -64,6 +60,6 @@ namespace AzToolsFramework
private:
const EditorVisibleEntityDataCache* m_entityDataCache = nullptr; //!< Entity Data queried by the EditorHelpers.
FocusModeFramework::FocusModeInterface* m_focusModeInterface = nullptr;
FocusModeInterface* m_focusModeInterface = nullptr;
};
} // namespace AzToolsFramework

Loading…
Cancel
Save