diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkApplication.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkApplication.h index bcd9d23203..99235c420c 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkApplication.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkApplication.h @@ -63,23 +63,23 @@ namespace LegacyFramework // ------------------------------------------------------------------ // implementation of FrameworkApplicationMessages::Handler - virtual bool IsRunningInGUIMode() { return m_desc.m_enableGUI; } - virtual bool RequiresGameProject() { return m_desc.m_enableProjectManager; } - virtual bool ShouldRunAssetProcessor() { return m_desc.m_shouldRunAssetProcessor; } - virtual void* GetMainModule(); - virtual const char* GetApplicationName(); - virtual const char* GetApplicationModule(); - virtual const char* GetApplicationDirectory(); - virtual const AzFramework::CommandLine* GetCommandLineParser(); - virtual void TeardownApplicationComponent(); - virtual void RunAssetProcessor() override; + bool IsRunningInGUIMode() override { return m_desc.m_enableGUI; } + bool RequiresGameProject() override { return m_desc.m_enableProjectManager; } + bool ShouldRunAssetProcessor() override { return m_desc.m_shouldRunAssetProcessor; } + void* GetMainModule() override; + const char* GetApplicationName() override; + const char* GetApplicationModule() override; + const char* GetApplicationDirectory() override; + const AzFramework::CommandLine* GetCommandLineParser() override; + void TeardownApplicationComponent() override; + void RunAssetProcessor() override; // ------------------------------------------------------------------ void SetSettingsRegistrySpecializations(AZ::SettingsRegistryInterface::Specializations& specializations) override; // ------------------------------------------------------------------ // implementation of CoreMessageBus::Handler - virtual void OnProjectSet(const char* /*pathToProject*/); + void OnProjectSet(const char* /*pathToProject*/) override; // ------------------------------------------------------------------ // This is called during the bootstrap and makes all the components we should have for SYSTEM minimal functionality. @@ -114,17 +114,17 @@ namespace LegacyFramework * ComponentApplication::RegisterCoreComponents and then register the application * specific core components. */ - virtual void RegisterCoreComponents(); + void RegisterCoreComponents() override; AZ::Entity* m_ptrSystemEntity; - virtual int GetDesiredExitCode() override { return m_desiredExitCode; } - virtual void SetDesiredExitCode(int code) override { m_desiredExitCode = code; } - virtual bool GetAbortRequested() override { return m_abortRequested; } - virtual void SetAbortRequested() override { m_abortRequested = true; } - virtual AZStd::string GetApplicationGlobalStoragePath() override; - virtual bool IsPrimary() override { return m_isPrimary; } + int GetDesiredExitCode() override { return m_desiredExitCode; } + void SetDesiredExitCode(int code) override { m_desiredExitCode = code; } + bool GetAbortRequested() override { return m_abortRequested; } + void SetAbortRequested() override { m_abortRequested = true; } + AZStd::string GetApplicationGlobalStoragePath() override; + bool IsPrimary() override { return m_isPrimary; } - virtual bool IsAppConfigWritable() override; + bool IsAppConfigWritable() override; AZ::Entity* m_applicationEntity; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.hxx index a6ac859971..25e4276dd4 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.hxx +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.hxx @@ -230,7 +230,7 @@ namespace AzToolsFramework bool DropMimeDataAssets(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent); bool CanDropMimeDataAssets(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) const; - QMap itemData(const QModelIndex& index) const; + QMap itemData(const QModelIndex& index) const override; QVariant dataForAll(const QModelIndex& index, int role) const; QVariant dataForName(const QModelIndex& index, int role) const; QVariant dataForVisibility(const QModelIndex& index, int role) const; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx index 3ff69f80e0..83b275b81a 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx @@ -139,8 +139,8 @@ namespace AzToolsFramework EntityPropertyEditor(QWidget* pParent = NULL, Qt::WindowFlags flags = Qt::WindowFlags(), bool isLevelEntityEditor = false); virtual ~EntityPropertyEditor(); - virtual void BeforeUndoRedo(); - virtual void AfterUndoRedo(); + void BeforeUndoRedo() override; + void AfterUndoRedo() override; static void Reflect(AZ::ReflectContext* context); @@ -249,8 +249,8 @@ namespace AzToolsFramework bool IsEntitySelected(const AZ::EntityId& id) const; bool IsSingleEntitySelected(const AZ::EntityId& id) const; - virtual void GotSceneSourceControlStatus(AzToolsFramework::SourceControlFileInfo& fileInfo); - virtual void PerformActionsBasedOnSceneStatus(bool sceneIsNew, bool readOnly); + void GotSceneSourceControlStatus(AzToolsFramework::SourceControlFileInfo& fileInfo) override; + void PerformActionsBasedOnSceneStatus(bool sceneIsNew, bool readOnly) override; // enable/disable editor void EnableEditor(bool enabled); diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/MultiLineTextEditHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/MultiLineTextEditHandler.h index 88a3d89f9f..c4a8980d29 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/MultiLineTextEditHandler.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/MultiLineTextEditHandler.h @@ -41,7 +41,7 @@ namespace AzToolsFramework QWidget* CreateGUI(QWidget* parent) override; AZ::u32 GetHandlerName() const override; - bool AutoDelete() const; + bool AutoDelete() const override; void ConsumeAttribute(GrowTextEdit* widget, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override; void WriteGUIValuesIntoProperty(size_t index, GrowTextEdit* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h index 6d3ccd45bd..f5529eec15 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h @@ -130,8 +130,8 @@ namespace AzToolsFramework } QWidget* GetFirstInTabOrder(WidgetType* widget) override { return widget; } - virtual QWidget* GetLastInTabOrder(WidgetType* widget) { return widget; } - virtual void UpdateWidgetInternalTabbing(WidgetType* /*widget*/) { } + QWidget* GetLastInTabOrder(WidgetType* widget) override { return widget; } + void UpdateWidgetInternalTabbing(WidgetType* /*widget*/) override {} QWidget* CreateGUI(QWidget *pParent) override = 0; protected: diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h index 137ee7b2c0..c5ecf7aee6 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h @@ -40,7 +40,7 @@ namespace AzToolsFramework::ViewportUi void RegisterSwitcherEventHandler(SwitcherId switcherId, AZ::Event::Handler& handler) override; void RemoveCluster(ClusterId clusterId) override; void RemoveSwitcher(SwitcherId switcherId) override; - void SetClusterVisible(ClusterId clusterId, bool visible); + void SetClusterVisible(ClusterId clusterId, bool visible) override; void SetSwitcherVisible(SwitcherId switcherId, bool visible); void SetClusterGroupVisible(const AZStd::vector& clusterGroup, bool visible) override; const TextFieldId CreateTextField( diff --git a/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityTestFramework.h b/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityTestFramework.h index 64dd8636a7..93e86374db 100644 --- a/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityTestFramework.h +++ b/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityTestFramework.h @@ -137,7 +137,7 @@ 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; } - bool DisplayHelpersVisible() { return false; } + bool DisplayHelpersVisible() override { return false; } /* * AssetSystemRequestBus