2
0
Эх сурвалжийг харах

Gems/GraphCanvas

Signed-off-by: Esteban Papp <[email protected]>
Esteban Papp 4 жил өмнө
parent
commit
fa1d1bd2fc
41 өөрчлөгдсөн 90 нэмэгдсэн , 90 устгасан
  1. 5 5
      Gems/GraphCanvas/Code/Include/GraphCanvas/Widgets/RootGraphicsItem.h
  2. 1 1
      Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorVisualComponent.h
  3. 1 1
      Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionLayerControllerComponent.h
  4. 1 1
      Gems/GraphCanvas/Code/Source/Components/GeometryComponent.h
  5. 1 1
      Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/StringNodePropertyDisplay.h
  6. 1 1
      Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/VectorNodePropertyDisplay.h
  7. 1 1
      Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeFrameComponent.h
  8. 4 4
      Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeLayoutComponent.h
  9. 1 1
      Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeTextComponent.h
  10. 1 1
      Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentTextGraphicsWidget.h
  11. 1 1
      Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeFrameComponent.h
  12. 2 2
      Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralSlotLayoutComponent.h
  13. 2 2
      Gems/GraphCanvas/Code/Source/Components/Nodes/Group/CollapsedNodeGroupComponent.h
  14. 5 5
      Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupFrameComponent.h
  15. 4 4
      Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupLayoutComponent.h
  16. 1 1
      Gems/GraphCanvas/Code/Source/Components/Nodes/NodeComponent.h
  17. 3 3
      Gems/GraphCanvas/Code/Source/Components/Nodes/Wrapper/WrapperNodeLayoutComponent.h
  18. 3 3
      Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotComponent.h
  19. 1 1
      Gems/GraphCanvas/Code/Source/Components/Slots/Default/DefaultSlotLayoutComponent.h
  20. 4 4
      Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotLayoutComponent.h
  21. 3 3
      Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotComponent.h
  22. 4 4
      Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotLayoutComponent.h
  23. 4 4
      Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotComponent.h
  24. 1 1
      Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotLayoutComponent.h
  25. 1 1
      Gems/GraphCanvas/Code/Source/Components/Slots/SlotComponent.h
  26. 4 4
      Gems/GraphCanvas/Code/Source/Components/Slots/SlotLayoutComponent.h
  27. 2 2
      Gems/GraphCanvas/Code/Source/Components/Slots/SlotLayoutItem.h
  28. 2 2
      Gems/GraphCanvas/Code/Source/Widgets/NodePropertyDisplayWidget.h
  29. 4 4
      Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/GraphCanvasPropertyBus.h
  30. 2 2
      Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/GlowOutlineGraphicsItem.h
  31. 1 1
      Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/SelectorImplementations.h
  32. 4 4
      Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/Style.cpp
  33. 1 1
      Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/SceneMemberComponentSaveData.h
  34. 2 2
      Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/StateControllers/PrioritizedStateController.h
  35. 2 2
      Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/StateControllers/StackStateController.h
  36. 1 1
      Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/Bookmarks/BookmarkDockWidget.h
  37. 2 2
      Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/Bookmarks/BookmarkTableModel.h
  38. 2 2
      Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ComboBox/ComboBoxItemModels.h
  39. 2 2
      Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasGraphicsView/GraphCanvasGraphicsView.h
  40. 2 2
      Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/IconDecoratedNodePaletteTreeItem.h
  41. 1 1
      Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.h

+ 5 - 5
Gems/GraphCanvas/Code/Include/GraphCanvas/Widgets/RootGraphicsItem.h

@@ -163,14 +163,14 @@ namespace GraphCanvas
         }
 
         // StateController<RootGraphicsItemDisplayState>
-        void OnStateChanged([[maybe_unused]] const RootGraphicsItemDisplayState& displayState)
+        void OnStateChanged([[maybe_unused]] const RootGraphicsItemDisplayState& displayState) override
         {
             UpdateActualDisplayState();
         }
         ////
 
         // TickBus
-        void OnTick(float delta, AZ::ScriptTimePoint)
+        void OnTick(float delta, AZ::ScriptTimePoint) override
         {
             m_currentAnimationTime += delta;
 
@@ -191,7 +191,7 @@ namespace GraphCanvas
         ////
 
         // RootGraphicsItemRequestBus
-        void AnimatePositionTo(const QPointF& scenePoint, const AZStd::chrono::milliseconds& duration)
+        void AnimatePositionTo(const QPointF& scenePoint, const AZStd::chrono::milliseconds& duration) override
         {
             if (!IsAnimating())
             {
@@ -231,7 +231,7 @@ namespace GraphCanvas
             GeometryRequestBus::Event(GetEntityId(), &GeometryRequests::SetAnimationTarget, m_targetPoint);
         }
 
-        void CancelAnimation()
+        void CancelAnimation() override
         {
             m_currentAnimationTime = m_animationDuration;
             CleanUpAnimation();
@@ -315,7 +315,7 @@ namespace GraphCanvas
             }
         }
 
-        RootGraphicsItemEnabledState GetEnabledState() const
+        RootGraphicsItemEnabledState GetEnabledState() const override
         {
             return m_enabledState;
         }

+ 1 - 1
Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorVisualComponent.h

@@ -57,7 +57,7 @@ namespace GraphCanvas
         ////
 
         // StyleNotificationBus
-        void OnStyleChanged();
+        void OnStyleChanged() override;
         ////
 
         // GeometryNotificationBus

+ 1 - 1
Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionLayerControllerComponent.h

@@ -39,7 +39,7 @@ namespace GraphCanvas
         ////
 
         // LayerControllerNotificationBus
-        void OnOffsetsChanged(int selectionOffset, int groupOffset);
+        void OnOffsetsChanged(int selectionOffset, int groupOffset) override;
         ////
 
     private:

+ 1 - 1
Gems/GraphCanvas/Code/Source/Components/GeometryComponent.h

@@ -69,7 +69,7 @@ namespace GraphCanvas
 
         void SetIsPositionAnimating(bool animating) override;
 
-        void SetAnimationTarget(const AZ::Vector2& targetPoint);
+        void SetAnimationTarget(const AZ::Vector2& targetPoint) override;
         ////
 
         // VisualNotificationBus

+ 1 - 1
Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/StringNodePropertyDisplay.h

@@ -81,7 +81,7 @@ namespace GraphCanvas
         ////
 
         // AZ::SystemTickBus::Handler
-        void OnSystemTick();
+        void OnSystemTick() override;
         ////
 
     private:

+ 1 - 1
Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/VectorNodePropertyDisplay.h

@@ -95,7 +95,7 @@ namespace GraphCanvas
         ////
 
         // DataSlotNotifications
-        void OnDragDropStateStateChanged(const DragDropState& dragState);
+        void OnDragDropStateStateChanged(const DragDropState& dragState) override;
         ////
     
     private:

+ 1 - 1
Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeFrameComponent.h

@@ -65,7 +65,7 @@ namespace GraphCanvas
         ////
 
         // NodeNotifications
-        void OnNodeActivated();
+        void OnNodeActivated() override;
         ////
 
     private:

+ 4 - 4
Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeLayoutComponent.h

@@ -50,9 +50,9 @@ namespace GraphCanvas
             required.push_back(AZ_CRC("GraphCanvas_StyledGraphicItemService", 0xeae4cdf4));
         }
 
-        void Init();
-        void Activate();
-        void Deactivate();
+        void Init() override;
+        void Activate() override;
+        void Deactivate() override;
         ////
 
         // EntityBus
@@ -64,7 +64,7 @@ namespace GraphCanvas
         ////
 
         // NodeNotification
-        void OnNodeActivated();
+        void OnNodeActivated() override;
         ////
 
     protected:

+ 1 - 1
Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeTextComponent.h

@@ -82,7 +82,7 @@ namespace GraphCanvas
         ////
 
         // NodeNotification
-        void OnAddedToScene(const AZ::EntityId&);
+        void OnAddedToScene(const AZ::EntityId&) override;
         ////
 
         // CommentRequestBus

+ 1 - 1
Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentTextGraphicsWidget.h

@@ -163,7 +163,7 @@ namespace GraphCanvas
         void SubmitValue();
         void UpdateSizePolicies();
         
-        bool sceneEventFilter(QGraphicsItem*, QEvent* event);
+        bool sceneEventFilter(QGraphicsItem*, QEvent* event) override;
 
         const AZ::EntityId& GetEntityId() const { return m_entityId; }
         void SetupProxyWidget();

+ 1 - 1
Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeFrameComponent.h

@@ -68,7 +68,7 @@ namespace GraphCanvas
         ////
 
         // NodeNotifications
-        void OnNodeActivated();
+        void OnNodeActivated() override;
 
         void OnNodeWrapped(const AZ::EntityId& wrappingNode) override;
         void OnNodeUnwrapped(const AZ::EntityId& wrappingNode) override;

+ 2 - 2
Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralSlotLayoutComponent.h

@@ -158,7 +158,7 @@ namespace GraphCanvas
         ////
 
         // SceneMemberNotificationBus
-        void OnSceneSet(const AZ::EntityId& sceneId);
+        void OnSceneSet(const AZ::EntityId& sceneId) override;
         ////
 
         // SlotLayoutRequestBus
@@ -168,7 +168,7 @@ namespace GraphCanvas
 
         bool IsSlotGroupVisible(SlotGroup group) const override;
         void SetSlotGroupVisible(SlotGroup group, bool visible) override;
-        void ClearSlotGroup(SlotGroup group);
+        void ClearSlotGroup(SlotGroup group) override;
         ////
 
         // StyleNotificationBus

+ 2 - 2
Gems/GraphCanvas/Code/Source/Components/Nodes/Group/CollapsedNodeGroupComponent.h

@@ -94,7 +94,7 @@ namespace GraphCanvas
         ////
 
         // GeometryNotifications
-        void OnBoundsChanged();
+        void OnBoundsChanged() override;
         void OnPositionChanged(const AZ::EntityId& targetEntity, const AZ::Vector2& position) override;
         ////
 
@@ -117,7 +117,7 @@ namespace GraphCanvas
 
         AZ::EntityId GetSourceGroup() const override;
 
-        AZStd::vector< Endpoint > GetRedirectedEndpoints() const;
+        AZStd::vector< Endpoint > GetRedirectedEndpoints() const override;
         void ForceEndpointRedirection(const AZStd::vector< Endpoint >& endpoints) override;
         ////
 

+ 5 - 5
Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupFrameComponent.h

@@ -239,7 +239,7 @@ namespace GraphCanvas
         ////
 
         // SystemTickBus
-        void OnSystemTick();
+        void OnSystemTick() override;
         ////
 
         // VisualNotificationBus
@@ -446,13 +446,13 @@ namespace GraphCanvas
         ////
 
         // CommentNotificationBus
-        void OnEditBegin();
-        void OnEditEnd();
+        void OnEditBegin() override;
+        void OnEditEnd() override;
 
         void OnCommentSizeChanged(const QSizeF& oldSize, const QSizeF& newSize) override;
 
-        void OnCommentFontReloadBegin();
-        void OnCommentFontReloadEnd();
+        void OnCommentFontReloadBegin() override;
+        void OnCommentFontReloadEnd() override;
         ////
 
         // QGraphicsItem

+ 4 - 4
Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupLayoutComponent.h

@@ -61,13 +61,13 @@ namespace GraphCanvas
         ////
 
         // AZ::Component
-        void Init();
-        void Activate();
-        void Deactivate();
+        void Init() override;
+        void Activate() override;
+        void Deactivate() override;
         ////
 
         // NodeNotification
-        void OnNodeActivated();
+        void OnNodeActivated() override;
         ////
 
         void UpdateLayoutParameters();

+ 1 - 1
Gems/GraphCanvas/Code/Source/Components/Nodes/NodeComponent.h

@@ -109,7 +109,7 @@ namespace GraphCanvas
         void SetTranslationKeyedTooltip(const TranslationKeyedString& tooltip) override;
         const AZStd::string GetTooltip() const override { return m_configuration.GetTooltip(); }
 
-        void SetShowInOutliner(bool showInOutliner) { m_configuration.SetShowInOutliner(showInOutliner); }
+        void SetShowInOutliner(bool showInOutliner) override { m_configuration.SetShowInOutliner(showInOutliner); }
         bool ShowInOutliner() const override { return m_configuration.GetShowInOutliner(); }
 
         void AddSlot(const AZ::EntityId& slotId) override;

+ 3 - 3
Gems/GraphCanvas/Code/Source/Components/Nodes/Wrapper/WrapperNodeLayoutComponent.h

@@ -155,9 +155,9 @@ namespace GraphCanvas
             required.push_back(AZ_CRC("GraphCanvas_StyledGraphicItemService", 0xeae4cdf4));
         }
 
-        void Init();
-        void Activate();
-        void Deactivate();
+        void Init() override;
+        void Activate() override;
+        void Deactivate() override;
         ////
         
         // WrapperNodeRequestBus

+ 3 - 3
Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotComponent.h

@@ -29,9 +29,9 @@ namespace GraphCanvas
         ~DataSlotComponent();
         
         // Component
-        void Init();
-        void Activate();
-        void Deactivate();
+        void Init() override;
+        void Activate() override;
+        void Deactivate() override;
         ////
 
         // SlotRequestBus

+ 1 - 1
Gems/GraphCanvas/Code/Source/Components/Slots/Default/DefaultSlotLayoutComponent.h

@@ -43,7 +43,7 @@ namespace GraphCanvas
         ////
 
         // StyleNotificationBus
-        void OnStyleChanged();
+        void OnStyleChanged() override;
         ////        
 
     private:

+ 4 - 4
Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotLayoutComponent.h

@@ -51,7 +51,7 @@ namespace GraphCanvas
         ////
 
         // StyleNotificationBus
-        void OnStyleChanged();
+        void OnStyleChanged() override;
         ////
 
     private:
@@ -88,9 +88,9 @@ namespace GraphCanvas
         ExecutionSlotLayoutComponent();
         ~ExecutionSlotLayoutComponent() override = default;
 
-        void Init();
-        void Activate();
-        void Deactivate();
+        void Init() override;
+        void Activate() override;
+        void Deactivate() override;
 
     private:
         ExecutionSlotLayout* m_layout;

+ 3 - 3
Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotComponent.h

@@ -40,9 +40,9 @@ namespace GraphCanvas
         ~ExtenderSlotComponent();
         
         // Component
-        void Init();
-        void Activate();
-        void Deactivate();
+        void Init() override;
+        void Activate() override;
+        void Deactivate() override;
         ////
 
         // SceneMemberNotifications

+ 4 - 4
Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotLayoutComponent.h

@@ -53,7 +53,7 @@ namespace GraphCanvas
         ////
 
         // StyleNotificationBus
-        void OnStyleChanged();
+        void OnStyleChanged() override;
         ////
 
     private:
@@ -82,9 +82,9 @@ namespace GraphCanvas
         ExtenderSlotLayoutComponent();
         ~ExtenderSlotLayoutComponent() override = default;
 
-        void Init();
-        void Activate();
-        void Deactivate();
+        void Init() override;
+        void Activate() override;
+        void Deactivate() override;
 
     private:
         

+ 4 - 4
Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotComponent.h

@@ -27,9 +27,9 @@ namespace GraphCanvas
         ~PropertySlotComponent();
         
         // Component
-        void Init();
-        void Activate();
-        void Deactivate();
+        void Init() override;
+        void Activate() override;
+        void Deactivate() override;
         ////
 
         // Slot RequestBus
@@ -38,7 +38,7 @@ namespace GraphCanvas
         ////
 
         // PropertySlotBus
-        const AZ::Crc32& GetPropertyId() const;
+        const AZ::Crc32& GetPropertyId() const override;
         ////
 
     private:

+ 1 - 1
Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotLayoutComponent.h

@@ -49,7 +49,7 @@ namespace GraphCanvas
         // SlotNotificationBus
         void OnRegisteredToNode(const AZ::EntityId& nodeId) override;
         
-        void OnTooltipChanged(const TranslationKeyedString& tooltip);
+        void OnTooltipChanged(const TranslationKeyedString& tooltip) override;
         ////
         
         // StyleNotificationBus

+ 1 - 1
Gems/GraphCanvas/Code/Source/Components/Slots/SlotComponent.h

@@ -72,7 +72,7 @@ namespace GraphCanvas
         const AZ::EntityId& GetNode() const override;
         void SetNode(const AZ::EntityId&) override;
 
-        Endpoint GetEndpoint() const;
+        Endpoint GetEndpoint() const override;
 
         const AZStd::string GetName() const  override { return m_slotConfiguration.m_name.GetDisplayString(); }
         void SetName(const AZStd::string& name) override;

+ 4 - 4
Gems/GraphCanvas/Code/Source/Components/Slots/SlotLayoutComponent.h

@@ -52,16 +52,16 @@ namespace GraphCanvas
             required.push_back(AZ_CRC("GraphCanvas_SlotService", 0x701eaf6b));
         }
 
-        void Init();
-        void Activate();
-        void Deactivate();
+        void Init() override;
+        void Activate() override;
+        void Deactivate() override;
         ////
         
         // VisualRequestBus
         QGraphicsItem* AsGraphicsItem() override;
         QGraphicsLayoutItem* AsGraphicsLayoutItem() override;
 
-        bool Contains(const AZ::Vector2& position) const;
+        bool Contains(const AZ::Vector2& position) const override;
         void SetVisible(bool visible) override;
         bool IsVisible() const override;
         ////

+ 2 - 2
Gems/GraphCanvas/Code/Source/Components/Slots/SlotLayoutItem.h

@@ -38,7 +38,7 @@ namespace GraphCanvas
 
     protected:
         // QGraphicsItem  
-        void mousePressEvent(QGraphicsSceneMouseEvent* event)
+        void mousePressEvent(QGraphicsSceneMouseEvent* event) override
         {
             bool result = false;
             VisualNotificationBus::EventResult(result, GetEntityId(), &VisualNotifications::OnMousePress, GetEntityId(), event);
@@ -48,7 +48,7 @@ namespace GraphCanvas
             }
         }
 
-        void mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
+        void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) override
         {
             bool result = false;
             VisualNotificationBus::EventResult(result, GetEntityId(), &VisualNotifications::OnMouseRelease, GetEntityId(), event);

+ 2 - 2
Gems/GraphCanvas/Code/Source/Widgets/NodePropertyDisplayWidget.h

@@ -45,7 +45,7 @@ namespace GraphCanvas
         ////
 
         // RootGraphicsItemNotificationBus
-        void OnDisplayStateChanged(RootGraphicsItemDisplayState oldState, RootGraphicsItemDisplayState newState);
+        void OnDisplayStateChanged(RootGraphicsItemDisplayState oldState, RootGraphicsItemDisplayState newState) override;
         ////
         
         // NodePropertiesRequestBus
@@ -56,7 +56,7 @@ namespace GraphCanvas
         ////
         
         // NodePropertyRequestBus
-        void SetDisabled(bool disabled);
+        void SetDisabled(bool disabled) override;
         
         void SetNodePropertyDisplay(NodePropertyDisplay* nodePropertyDisplay) override;
         NodePropertyDisplay* GetNodePropertyDisplay() const override;

+ 4 - 4
Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/GraphCanvasPropertyBus.h

@@ -57,12 +57,12 @@ namespace GraphCanvas
             GraphCanvasPropertyBus::MultiHandler::BusDisconnect();
         }
 
-        void AddBusId(const AZ::EntityId& busId) override final
+        void AddBusId(const AZ::EntityId& busId) final
         {
             GraphCanvasPropertyBus::MultiHandler::BusConnect(busId);
         }
 
-        void RemoveBusId(const AZ::EntityId& busId) override final
+        void RemoveBusId(const AZ::EntityId& busId) final
         {
             GraphCanvasPropertyBus::MultiHandler::BusDisconnect(busId);
         }
@@ -86,12 +86,12 @@ namespace GraphCanvas
 
         void Init() override {};
 
-        void Activate()
+        void Activate() override
         {
             GraphCanvasPropertyBusHandler::OnActivate(GetEntityId());
         }
 
-        void Deactivate()
+        void Deactivate() override
         {
             GraphCanvasPropertyBusHandler::OnDeactivate();
         }

+ 2 - 2
Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/GlowOutlineGraphicsItem.h

@@ -77,7 +77,7 @@ namespace GraphCanvas
         ////
 
         // SystemTick
-        void OnSystemTick();
+        void OnSystemTick() override;
         ////
 
         // TickBus
@@ -86,7 +86,7 @@ namespace GraphCanvas
 
         // GeometryNotificationBus::Handler
         void OnPositionChanged(const AZ::EntityId& /*targetEntity*/, const AZ::Vector2& /*position*/) override;
-        void OnBoundsChanged();
+        void OnBoundsChanged() override;
         ////
 
         // ViewNotificationBus

+ 1 - 1
Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/SelectorImplementations.h

@@ -37,7 +37,7 @@ namespace GraphCanvas
                 return 0;
             }
 
-            bool Matches([[maybe_unused]] const AZ::EntityId& object) const
+            bool Matches([[maybe_unused]] const AZ::EntityId& object) const override
             {
                 return false;
             }

+ 4 - 4
Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/Style.cpp

@@ -129,7 +129,7 @@ namespace
         : public AZ::SerializeContext::IDataSerializer
     {
         /// Store the class data into a binary buffer
-        virtual size_t Save(const void* classPtr, AZ::IO::GenericStream& stream, bool isDataBigEndian /*= false*/)
+        size_t Save(const void* classPtr, AZ::IO::GenericStream& stream, bool isDataBigEndian /*= false*/) override
         {
             auto variant = reinterpret_cast<const QVariant*>(classPtr);
 
@@ -142,7 +142,7 @@ namespace
         }
 
         /// Convert binary data to text
-        virtual size_t DataToText(AZ::IO::GenericStream& in, AZ::IO::GenericStream& out, bool isDataBigEndian /*= false*/)
+        size_t DataToText(AZ::IO::GenericStream& in, AZ::IO::GenericStream& out, bool isDataBigEndian /*= false*/) override
         {
             (void)isDataBigEndian;
 
@@ -152,7 +152,7 @@ namespace
         }
 
         /// Convert text data to binary, to support loading old version formats. We must respect text version if the text->binary format has changed!
-        virtual size_t TextToData(const char* text, unsigned int textVersion, AZ::IO::GenericStream& stream, bool isDataBigEndian = false)
+        size_t TextToData(const char* text, unsigned int textVersion, AZ::IO::GenericStream& stream, bool isDataBigEndian = false) override
         {
             (void)textVersion;
             (void)isDataBigEndian;
@@ -164,7 +164,7 @@ namespace
         }
 
         /// Load the class data from a stream.
-        virtual bool Load(void* classPtr, AZ::IO::GenericStream& in, unsigned int, bool isDataBigEndian = false)
+        bool Load(void* classPtr, AZ::IO::GenericStream& in, unsigned int, bool isDataBigEndian = false) override
         {
             QByteArray buffer = ReadAll(in);
             QDataStream qtStream(&buffer, QIODevice::ReadOnly);

+ 1 - 1
Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/SceneMemberComponentSaveData.h

@@ -43,7 +43,7 @@ namespace GraphCanvas
         }
 
         // SceneMemberNotificationBus::Handler
-        void OnSceneSet(const AZ::EntityId& graphId)
+        void OnSceneSet(const AZ::EntityId& graphId) override
         {
             const AZ::EntityId* ownerId = SceneMemberNotificationBus::GetCurrentBusId();
 

+ 2 - 2
Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/StateControllers/PrioritizedStateController.h

@@ -45,7 +45,7 @@ namespace GraphCanvas
             m_valueSet.clear();
         }
 
-        bool HasState() const
+        bool HasState() const override
         {
             return !m_valueSet.empty();
         }
@@ -85,7 +85,7 @@ namespace GraphCanvas
             return releasedValue;
         }
 
-        const T& GetCalculatedState() const
+        const T& GetCalculatedState() const override
         {
             auto valueIter = m_valueSet.begin();
             return (*valueIter);

+ 2 - 2
Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/StateControllers/StackStateController.h

@@ -43,7 +43,7 @@ namespace GraphCanvas
             m_states.clear();
         }
 
-        bool HasState() const
+        bool HasState() const override
         {
             return !m_states.empty();
         }
@@ -79,7 +79,7 @@ namespace GraphCanvas
             return releasedValue;
         }
 
-        const T& GetCalculatedState() const
+        const T& GetCalculatedState() const override
         {
             return m_states.back().second;
         }

+ 1 - 1
Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/Bookmarks/BookmarkDockWidget.h

@@ -57,7 +57,7 @@ namespace GraphCanvas
         ////
 
         // GraphCanvas::SceneNotifications
-        void OnSelectionChanged();
+        void OnSelectionChanged() override;
         ////
 
     public Q_SLOTS:

+ 2 - 2
Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/Bookmarks/BookmarkTableModel.h

@@ -79,7 +79,7 @@ namespace GraphCanvas
 
         // QAbstractTableModel
         int rowCount(const QModelIndex& parent = QModelIndex()) const override;
-        int columnCount(const QModelIndex& index = QModelIndex()) const;
+        int columnCount(const QModelIndex& index = QModelIndex()) const override;
         QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
         bool setData(const QModelIndex &index, const QVariant &value, int role) override;
         QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
@@ -125,7 +125,7 @@ namespace GraphCanvas
         BookmarkTableSortProxyModel(BookmarkTableSourceModel* sourceModel);
         ~BookmarkTableSortProxyModel() override = default;
 
-        bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const;
+        bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const override;
 
         void SetFilter(const QString& filter);
         void ClearFilter();

+ 2 - 2
Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ComboBox/ComboBoxItemModels.h

@@ -415,7 +415,7 @@ namespace GraphCanvas
             return index(nextRow, GetSortColumn());
         }
 
-        void OnDropDownAboutToShow()
+        void OnDropDownAboutToShow() override
         {
             beginResetModel();
             setSourceModel(m_modelInterface->GetDropDownItemModel());
@@ -424,7 +424,7 @@ namespace GraphCanvas
             invalidate();
         }
 
-        void OnDropDownHidden()
+        void OnDropDownHidden() override
         {
             beginResetModel();
             setSourceModel(nullptr);

+ 2 - 2
Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasGraphicsView/GraphCanvasGraphicsView.h

@@ -129,7 +129,7 @@ namespace GraphCanvas
         ToastId ShowToastAtCursor(const ToastConfiguration& toastConfiguration) override;
         ToastId ShowToastAtPoint(const QPoint& screenPosition, const QPointF& anchorPoint, const ToastConfiguration& toastConfiguration) override;
 
-        bool IsShowing() const;
+        bool IsShowing() const override;
         ////
 
         // TickBus
@@ -159,7 +159,7 @@ namespace GraphCanvas
 
         void wheelEvent(QWheelEvent* event) override;
 
-        void focusOutEvent(QFocusEvent* event);
+        void focusOutEvent(QFocusEvent* event) override;
 
         void resizeEvent(QResizeEvent* event) override;
         void moveEvent(QMoveEvent* event) override;

+ 2 - 2
Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/IconDecoratedNodePaletteTreeItem.h

@@ -27,8 +27,8 @@ namespace GraphCanvas
 
         void AddIconColorPalette(const AZStd::string& colorPalette);
         
-        void OnStylesUnloaded();
-        void OnStylesLoaded();
+        void OnStylesUnloaded() override;
+        void OnStylesLoaded() override;
             
     protected:
 

+ 1 - 1
Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.h

@@ -95,7 +95,7 @@ namespace GraphCanvas
         const EditorId& GetEditorId() const;
 
         // Child Overrides
-        virtual bool LessThan(const GraphCanvasTreeItem* graphItem) const;
+        bool LessThan(const GraphCanvasTreeItem* graphItem) const override;
         virtual QVariant OnData(const QModelIndex& index, int role) const;
         virtual Qt::ItemFlags OnFlags() const;