Enables override/virtual warnings

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-15 14:11:17 -07:00
parent c50f3b2638 9cba144e39
commit bbe437819b
501 changed files with 3326 additions and 2777 deletions
@@ -17,7 +17,7 @@ namespace AzToolsFramework
        : public EditorEntityAPI
    {
    public:
-        ~EditorEntityManager();
+        virtual ~EditorEntityManager();

        void Start();

@@ -37,7 +37,7 @@ namespace AzToolsFramework
        ToolsApplication(int* argc = nullptr, char*** argv = nullptr);
        ~ToolsApplication();

-        void Stop();
+        void Stop() override;
        void CreateReflectionManager() override;
        void Reflect(AZ::ReflectContext* context) override;

@@ -97,6 +97,7 @@ namespace AzToolsFramework::AssetUtils
    struct EnabledPlatformsVisitor
        : AZ::SettingsRegistryInterface::Visitor
    {
+        using AZ::SettingsRegistryInterface::Visitor::Visit;
        void Visit(AZStd::string_view path, AZStd::string_view valueName, AZ::SettingsRegistryInterface::Type, AZStd::string_view value) override;

        AZStd::vector<AZStd::string> m_enabledPlatforms;
@@ -34,7 +34,7 @@ namespace AzToolsFramework

        static PreemptiveUndoCache* Get();
        PreemptiveUndoCache();
-        ~PreemptiveUndoCache();
+        virtual ~PreemptiveUndoCache();

        void RegisterToUndoCacheInterface();

@@ -65,7 +65,7 @@ namespace AzToolsFramework
                /**
                * Called right before we start reading from the instance pointed by classPtr.
                */
-                void OnReadBegin(void* classPtr)
+                void OnReadBegin(void* classPtr) override
                {
                    EditorEntitySortComponent* component = reinterpret_cast<EditorEntitySortComponent*>(classPtr);
                    component->PrepareSave();
@@ -31,7 +31,7 @@ namespace AzToolsFramework

            void AppendEntityAliasToPatchPaths(PrefabDom& providedPatch, const AZ::EntityId& entityId) override;

-            InstanceOptionalReference GetTopMostInstanceInHierarchy(AZ::EntityId entityId);
+            InstanceOptionalReference GetTopMostInstanceInHierarchy(AZ::EntityId entityId) override;

            bool PatchTemplate(PrefabDomValue& providedPatch, TemplateId templateId, InstanceOptionalReference instanceToExclude = AZStd::nullopt) override;

@@ -32,6 +32,8 @@ namespace AzToolsFramework
        public:
            AZ_CLASS_ALLOCATOR(PrefabUndoCache, AZ::SystemAllocator, 0);

+            virtual ~PrefabUndoCache() = default;
+
            void Initialize();
            void Destroy();

@@ -76,10 +76,10 @@ namespace AzToolsFramework
        void ResetContext() override;
        void GetRequiredComponentTypes(AZ::ComponentTypeList& required) override;
        bool IsSliceMetadataEntity(const AZ::EntityId entityId) override;
-        AZ::Entity* GetMetadataEntity(const AZ::EntityId entityId);
+        AZ::Entity* GetMetadataEntity(const AZ::EntityId entityId) override;
        AZ::EntityId GetMetadataEntityIdFromEditorEntity(const AZ::EntityId editorEntityId) override;
        AZ::EntityId GetMetadataEntityIdFromSliceAddress(const AZ::SliceComponent::SliceInstanceAddress& address) override;
-        void AddMetadataEntityToContext(const AZ::SliceComponent::SliceInstanceAddress& /*sliceAddress*/, AZ::Entity& entity);
+        void AddMetadataEntityToContext(const AZ::SliceComponent::SliceInstanceAddress& /*sliceAddress*/, AZ::Entity& entity) override;
        //////////////////////////////////////////////////////////////////////////


@@ -61,7 +61,7 @@ namespace AzToolsFramework
                /** 
                 * Called right before we start reading from the instance pointed by classPtr.
                 */
-                void OnReadBegin(void* classPtr)
+                void OnReadBegin(void* classPtr) override
                {
                    EditorInspectorComponent* component = reinterpret_cast<EditorInspectorComponent*>(classPtr);
                    component->PrepareSave();
@@ -37,7 +37,7 @@ namespace AzToolsFramework
            // AZ::NonUniformScaleRequestBus::Handler ...
            AZ::Vector3 GetScale() const override;
            void SetScale(const AZ::Vector3& scale) override;
-            void RegisterScaleChangedEvent(AZ::NonUniformScaleChangedEvent::Handler& handler);
+            void RegisterScaleChangedEvent(AZ::NonUniformScaleChangedEvent::Handler& handler) override;

        private:
            static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent);
@@ -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;

@@ -300,13 +300,13 @@ namespace AzToolsFramework
            bool editorEvent(QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index) override;
            void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;

-            QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const;
+            QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const override;

-            void setEditorData(QWidget* editor, const QModelIndex& index) const;
-            void setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const;
+            void setEditorData(QWidget* editor, const QModelIndex& index) const override;
+            void setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const override;

            QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override;
-            void updateEditorGeometry(QWidget* editor, const QStyleOptionViewItem& option, const QModelIndex& index) const;
+            void updateEditorGeometry(QWidget* editor, const QStyleOptionViewItem& option, const QModelIndex& index) const override;

            QWidget* pOwnerWidget;
            QLabel* m_painterLabel;
@@ -62,11 +62,11 @@ namespace AzToolsFramework

            //////////////////////////////////////////////////////////////////////////
            // TraceMessagesBus
-            virtual bool OnAssert(const char* message);
-            virtual bool OnException(const char* message);
-            virtual bool OnError(const char* window, const char* message);
-            virtual bool OnWarning(const char* window, const char* message);
-            virtual bool OnPrintf(const char* window, const char* message);
+            bool OnAssert(const char* message) override;
+            bool OnException(const char* message) override;
+            bool OnError(const char* window, const char* message) override;
+            bool OnWarning(const char* window, const char* message) override;
+            bool OnPrintf(const char* window, const char* message) override;
            //////////////////////////////////////////////////////////////////////////

            /// Log a message received from the TraceMessageBus
@@ -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<int, QVariant> itemData(const QModelIndex& index) const;
+        QMap<int, QVariant> 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;
@@ -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);
@@ -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;
@@ -55,12 +55,12 @@ namespace AzToolsFramework
        // GUI is a pointer to the GUI used to editor your property (the one you created in CreateGUI)
        // and instance is a the actual value (PropertyType).
        // you may not cache the pointer to anything.
-        virtual void WriteGUIValuesIntoProperty(size_t index, WidgetType* GUI, PropertyType& instance, InstanceDataNode* node) = 0;
+        void WriteGUIValuesIntoProperty(size_t index, WidgetType* GUI, PropertyType& instance, InstanceDataNode* node) override = 0;

        // this will get called in order to initialize your gui.  It will be called once for each instance.
        // for example if you have multiple objects selected, index will go from 0 to however many there are.
        // you may not cache the pointer to anything.
-        virtual bool ReadValuesIntoGUI(size_t index, WidgetType* GUI, const PropertyType& instance, InstanceDataNode* node) = 0;
+        bool ReadValuesIntoGUI(size_t index, WidgetType* GUI, const PropertyType& instance, InstanceDataNode* node) override = 0;

        // this will be called in order to initialize or refresh your gui.  Your class will be fed one attribute at a time
        // you may override this to interpret the attributes as you wish - use attrValue->Read<int>() for example, to interpret it as an int.
@@ -87,19 +87,19 @@ namespace AzToolsFramework
        // and cause the next row to tab to your last button, when the user hits shift+tab on the next row.
        // if your widget is a single widget or has a single focus proxy there is no need to override.
        // you may not cache the pointer to anything.
-        virtual QWidget* GetFirstInTabOrder(WidgetType* widget) { return widget; }
-        virtual QWidget* GetLastInTabOrder(WidgetType* widget) { return widget; }
+        QWidget* GetFirstInTabOrder(WidgetType* widget) override { return widget; }
+        QWidget* GetLastInTabOrder(WidgetType* widget) override { return widget; }

        // implement this function in order to set your internal tab order between child controls.
        // just call a series of QWidget::setTabOrder
        // you may not cache the pointer to anything.
-        virtual void UpdateWidgetInternalTabbing(WidgetType* /*widget*/) { }
+        void UpdateWidgetInternalTabbing(WidgetType* /*widget*/) override {}

        // you must implement CreateGUI:
        // create an instance of the GUI that is used to edit this property type.
        // the QWidget pointer you return also serves as a handle for accessing data.  This means that in order to trigger
        // a write, you need to call RequestWrite(...) on that same widget handle you return.
-        virtual QWidget* CreateGUI(QWidget *pParent) override = 0;
+        QWidget* CreateGUI(QWidget *pParent) override = 0;

        // you MAY override this if you wish to pool your widgets or reuse them.  The default implementation simply calls delete.
        //virtual QWidget* DestroyGUI(QWidget* object) override;
@@ -129,24 +129,24 @@ namespace AzToolsFramework
            return false;
        }

-        virtual QWidget* GetFirstInTabOrder(WidgetType* widget) { return widget; }
-        virtual QWidget* GetLastInTabOrder(WidgetType* widget) { return widget; }
-        virtual void UpdateWidgetInternalTabbing(WidgetType* /*widget*/) { }
+        QWidget* GetFirstInTabOrder(WidgetType* widget) override { return widget; }
+        QWidget* GetLastInTabOrder(WidgetType* widget) override { return widget; }
+        void UpdateWidgetInternalTabbing(WidgetType* /*widget*/) override {}

-        virtual QWidget* CreateGUI(QWidget *pParent) override = 0;
+        QWidget* CreateGUI(QWidget *pParent) override = 0;
    protected:
-        virtual bool HandlesType(const AZ::Uuid& id) const override
+        bool HandlesType(const AZ::Uuid& id) const override
        {
            (void)id;
            return true;
        }

-        virtual const AZ::Uuid& GetHandledType() const override
+        const AZ::Uuid& GetHandledType() const override
        {
            return nullUuid;
        }

-        virtual void WriteGUIValuesIntoProperty_Internal(QWidget* widget, InstanceDataNode* node) override
+        void WriteGUIValuesIntoProperty_Internal(QWidget* widget, InstanceDataNode* node) override
        {
            for (size_t i = 0; i < node->GetNumInstances(); ++i)
            {
@@ -154,13 +154,13 @@ namespace AzToolsFramework
            }
        }

-        virtual void WriteGUIValuesIntoTempProperty_Internal(QWidget* widget, void* tempValue, const AZ::Uuid& propertyType, AZ::SerializeContext* serializeContext) override
+        void WriteGUIValuesIntoTempProperty_Internal(QWidget* widget, void* tempValue, const AZ::Uuid& propertyType, AZ::SerializeContext* serializeContext) override
        {
            (void)serializeContext;
            WriteGUIValuesIntoProperty(0, reinterpret_cast<WidgetType*>(widget), tempValue, propertyType);
        }

-        virtual void ReadValuesIntoGUI_Internal(QWidget* widget, InstanceDataNode* node) override
+        void ReadValuesIntoGUI_Internal(QWidget* widget, InstanceDataNode* node) override
        {
            AZ_PROFILE_FUNCTION(AzToolsFramework);

@@ -34,11 +34,11 @@ namespace AzToolsFramework

            //////////////////////////////////////////////////////////////////////////
            // AZ::Component
-            virtual void Init();
-            virtual void Activate();
-            virtual void Deactivate();
+            void Init() override;
+            void Activate() override;
+            void Deactivate() override;

-            virtual PropertyHandlerBase* ResolvePropertyHandler(AZ::u32 handlerName, const AZ::Uuid& handlerType) override;
+            PropertyHandlerBase* ResolvePropertyHandler(AZ::u32 handlerName, const AZ::Uuid& handlerType) override;

            //////////////////////////////////////////////////////////////////////////
        private:
@@ -57,8 +57,8 @@ namespace AzToolsFramework

            //////////////////////////////////////////////////////////////////////////
            // PropertyTypeRegistrationMessages::Bus::Handler
-            virtual void RegisterPropertyType(PropertyHandlerBase* pHandler) override;
-            virtual void UnregisterPropertyType(PropertyHandlerBase* pHandler) override;
+            void RegisterPropertyType(PropertyHandlerBase* pHandler) override;
+            void UnregisterPropertyType(PropertyHandlerBase* pHandler) override;
            //////////////////////////////////////////////////////////////////////////

            typedef AZStd::unordered_multimap<AZ::u32, PropertyHandlerBase*> HandlerMap;
@@ -235,7 +235,7 @@ namespace AzToolsFramework
        void PopulateFieldTreeRemovedEntities();

        /// Event filter for key presses.
-        bool eventFilter(QObject* target, QEvent *event);
+        bool eventFilter(QObject* target, QEvent *event) override;

        /// Conduct the push operation for all selected fields.
        bool PushSelectedFields();
@@ -40,7 +40,7 @@ namespace AzToolsFramework::ViewportUi
        void RegisterSwitcherEventHandler(SwitcherId switcherId, AZ::Event<ButtonId>::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<ClusterId>& clusterGroup, bool visible) override;
        const TextFieldId CreateTextField(
@@ -50,7 +50,7 @@ namespace Benchmark
        SetupPrefabSystem();
    }

-    void BM_Prefab::SetUp(::benchmark::State & state)
+    void BM_Prefab::internalSetUp(const benchmark::State& state)
    {
        AZ::Debug::TraceMessageBus::Handler::BusConnect();

@@ -59,7 +59,7 @@ namespace Benchmark
        SetupPrefabSystem();
    }

-    void BM_Prefab::TearDown(::benchmark::State & state)
+    void BM_Prefab::internalTearDown(const benchmark::State& state)
    {
        m_paths = {};

@@ -24,12 +24,27 @@ namespace Benchmark
        : public UnitTest::AllocatorsBenchmarkFixture
        , public UnitTest::TraceBusRedirector
    {
-    protected:
-        using ::benchmark::Fixture::SetUp;
-        using ::benchmark::Fixture::TearDown;
+        void internalSetUp(const benchmark::State& state);
+        void internalTearDown(const benchmark::State& state);

-        void SetUp(::benchmark::State& state) override;
-        void TearDown(::benchmark::State& state) override;
+    protected:
+        void SetUp(const benchmark::State& state) override
+        {
+            internalSetUp(state);
+        }
+        void SetUp(benchmark::State& state) override
+        {
+            internalSetUp(state);
+        }
+
+        void TearDown(const benchmark::State& state) override
+        {
+            internalTearDown(state);
+        }
+        void TearDown(benchmark::State& state) override
+        {
+            internalTearDown(state);
+        }

        AZ::Entity* CreateEntity(
            const char* entityName,
@@ -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