merge system component

Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>

Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.h

@@ -86,7 +86,7 @@ namespace ScriptCanvasEditor
         void UpdateFileState(AZ::Data::AssetId assetId, Tracker::ScriptCanvasFileState state) override;
 
         AssetTrackerRequests::AssetList GetUnsavedAssets() override;
-        AssetTrackerRequests::AssetList GetAssets();
+        AssetTrackerRequests::AssetList GetAssets() override;
         AssetTrackerRequests::AssetList GetAssetsIf(AZStd::function<bool(ScriptCanvasMemoryAsset::pointer asset)> pred = []() { return true; }) override;
 
         AZ::EntityId GetSceneEntityIdFromEditorEntityId(AZ::Data::AssetId assetId, AZ::EntityId editorEntityId) override;

Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasTraceUtilities.h

@@ -128,15 +128,15 @@ namespace ScriptCanvasEditor
             }
         }
 
-        bool OnPreAssert(const char*, int, const char*, const char*) { return suppressPreAssert; }
-        bool OnAssert(const char*) { return suppressAssert; }
-        bool OnException(const char*) { return suppressException; }
-        bool OnPreError(const char*, const char*, int, const char*, const char*) { return suppressPreError; }
-        bool OnError(const char*, const char*) { return suppressError; }
-        bool OnPreWarning(const char*, const char*, int, const char*, const char*) { return suppressPreWarning; }
-        bool OnWarning(const char*, const char*) { return suppressWarning; }
-        bool OnPrintf(const char*, const char*) { return suppressPrintf; }
-        bool OnOutput(const char*, const char*) { return suppressAllOutput; }
+        bool OnPreAssert(const char*, int, const char*, const char*) override { return suppressPreAssert; }
+        bool OnAssert(const char*) override { return suppressAssert; }
+        bool OnException(const char*) override { return suppressException; }
+        bool OnPreError(const char*, const char*, int, const char*, const char*) override { return suppressPreError; }
+        bool OnError(const char*, const char*) override { return suppressError; }
+        bool OnPreWarning(const char*, const char*, int, const char*, const char*) override { return suppressPreWarning; }
+        bool OnWarning(const char*, const char*) override { return suppressWarning; }
+        bool OnPrintf(const char*, const char*) override { return suppressPrintf; }
+        bool OnOutput(const char*, const char*) override { return suppressAllOutput; }
 
         void SuppressPreAssert(bool suppress) override { suppressPreAssert = suppress; }
         void SuppressAssert(bool suppress)override { suppressAssert = suppress; }

Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicSlotComponent.h

@@ -33,9 +33,9 @@ namespace ScriptCanvasEditor
         ~DynamicSlotComponent() override = default;
         
         // AZ::Component
-        void Init();
-        void Activate();
-        void Deactivate();
+        void Init() override;
+        void Activate() override;
+        void Deactivate() override;
         ////
 
         // GraphCanvas::SceneMemberNotificationBus

Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/MappingComponent.h

@@ -31,8 +31,8 @@ namespace ScriptCanvasEditor
         SceneMemberMappingComponent(const AZ::EntityId& sourceId);
         ~SceneMemberMappingComponent() = default;
 
-        void Activate();
-        void Deactivate();
+        void Activate() override;
+        void Deactivate() override;
 
         // SceneMemberMappingConfigurationRequestBus
         void ConfigureMapping(const AZ::EntityId& scriptCanvasMemberId) override;
@@ -68,8 +68,8 @@ namespace ScriptCanvasEditor
         SlotMappingComponent(const AZ::EntityId& sourceId);
         ~SlotMappingComponent() = default;
         
-        void Activate();
-        void Deactivate();
+        void Activate() override;
+        void Deactivate() override;
         
         // GraphCanvas::NodeNotificationBus
         void OnAddedToScene(const AZ::EntityId&) override;

Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/NodeDescriptorComponent.h

@@ -33,9 +33,9 @@ namespace ScriptCanvasEditor
         ~NodeDescriptorComponent() override = default;
 
         // Component
-        void Init();
-        void Activate();
-        void Deactivate();
+        void Init() override;
+        void Activate() override;
+        void Deactivate() override;
         ////
 
         // NodeDescriptorBus::Handler

Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverEventNodeDescriptorComponent.h

@@ -74,7 +74,7 @@ namespace ScriptCanvasEditor
         ////
 
         // ScriptEventReceiveNodeDescriptorNotifications
-        void OnScriptEventReloaded(const AZ::Data::Asset<ScriptEvents::ScriptEventsAsset>& asset);
+        void OnScriptEventReloaded(const AZ::Data::Asset<ScriptEvents::ScriptEventsAsset>& asset) override;
         ////
 
     protected:

Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/VariableNodeDescriptorComponent.h

@@ -52,7 +52,7 @@ namespace ScriptCanvasEditor
         ////
 
         // VariableNodeDescriptorBus
-        ScriptCanvas::VariableId GetVariableId() const;
+        ScriptCanvas::VariableId GetVariableId() const override;
         ////
         
     protected:

Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasColorDataInterface.h

@@ -131,7 +131,7 @@ namespace ScriptCanvasEditor
             return "vectorized";
         }
         
-        virtual AZStd::string GetElementStyle(int index) const
+        AZStd::string GetElementStyle(int index) const override
         {
             return AZStd::string::format("vector_%i", index);
         }

Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasVariableDataInterface.h

@@ -88,12 +88,12 @@ namespace ScriptCanvasEditor
         ////
 
         // GeneralEditorNotifications
-        void OnUndoRedoBegin()
+        void OnUndoRedoBegin() override
         {
             ScriptCanvas::GraphVariableManagerNotificationBus::Handler::BusDisconnect();
         }
 
-        void OnUndoRedoEnd()
+        void OnUndoRedoEnd() override
         {
             FinalizeActivation();
         }
@@ -250,7 +250,7 @@ namespace ScriptCanvasEditor
         }
 
         // SystemTickBus
-        void OnSystemTick()
+        void OnSystemTick() override
         {
             AZ::SystemTickBus::Handler::BusDisconnect();
             AssignIndex(m_variableTypeModel.GetDefaultIndex());
@@ -440,7 +440,7 @@ namespace ScriptCanvasEditor
         }
 
         // SystemTickBus
-        void OnSystemTick()
+        void OnSystemTick() override
         {
             AZ::SystemTickBus::Handler::BusDisconnect();
             AssignIndex(m_variableTypeModel.GetDefaultIndex());
@@ -449,7 +449,7 @@ namespace ScriptCanvasEditor
         ////
 
         // NodeNotificationBus
-        void OnSlotDisplayTypeChanged(const ScriptCanvas::SlotId& slotId, [[maybe_unused]] const ScriptCanvas::Data::Type& slotType)
+        void OnSlotDisplayTypeChanged(const ScriptCanvas::SlotId& slotId, [[maybe_unused]] const ScriptCanvas::Data::Type& slotType) override
         {
             if (slotId == GetSlotId())
             {
@@ -482,7 +482,7 @@ namespace ScriptCanvasEditor
         ////
 
         // EndpointNotificationBus
-        void OnEndpointReferenceChanged(const ScriptCanvas::VariableId& variableId)
+        void OnEndpointReferenceChanged(const ScriptCanvas::VariableId& variableId) override
         {
             ScriptCanvas::VariableNotificationBus::Handler::BusDisconnect();
             ScriptCanvas::VariableNotificationBus::Handler::BusConnect(ScriptCanvas::GraphScopedVariableId(GetScriptCanvasId(), variableId));
@@ -490,7 +490,7 @@ namespace ScriptCanvasEditor
             SignalValueChanged();
         }
 
-        void OnSlotRecreated()
+        void OnSlotRecreated() override
         {
             ScriptCanvas::Slot* slot = GetSlot();
 

Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasVectorDataInterface.h

@@ -103,7 +103,7 @@ namespace ScriptCanvasEditor
             return "???";
         }
 
-        AZStd::string GetStyle() const
+        AZStd::string GetStyle() const override
         {
             return "vectorized";
         }

Gems/ScriptCanvas/Code/Editor/GraphCanvas/PropertyInterfaces/ScriptCanvasEnumComboBoxPropertyDataInterface.h

@@ -50,7 +50,7 @@ namespace ScriptCanvasEditor
             return m_comboBoxModel.GetIndexForValue(dataValue);
         }
 
-        QString GetDisplayString() const
+        QString GetDisplayString() const override
         {
             int32_t dataValue = GetValue();
             return m_comboBoxModel.GetNameForValue(dataValue);

Gems/ScriptCanvas/Code/Editor/GraphCanvas/PropertyInterfaces/ScriptCanvasPropertyDataInterface.h

@@ -177,7 +177,7 @@ namespace ScriptCanvasEditor
             return m_comboBoxModel.GetIndexForValue(dataValue);
         }
 
-        QString GetDisplayString() const
+        QString GetDisplayString() const override
         {
             DataType dataValue = this->GetValue();
             return m_comboBoxModel.GetNameForValue(dataValue);

Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAsset.h

@@ -81,8 +81,8 @@ namespace ScriptCanvasEditor
         ScriptCanvas::Graph* GetScriptCanvasGraph() const;
         using Description = ScriptCanvasAssetDescription;
 
-        ScriptCanvas::ScriptCanvasData& GetScriptCanvasData();
-        const ScriptCanvas::ScriptCanvasData& GetScriptCanvasData() const;
+        ScriptCanvas::ScriptCanvasData& GetScriptCanvasData() override;
+        const ScriptCanvas::ScriptCanvasData& GetScriptCanvasData() const override;
 
     };
 }

Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorGraph.h

@@ -248,8 +248,8 @@ namespace ScriptCanvasEditor
 
         GraphCanvas::GraphId GetGraphCanvasGraphId() const override;
 
-        AZStd::unordered_map< AZ::EntityId, GraphCanvas::EntitySaveDataContainer* > GetGraphCanvasSaveData();
-        void UpdateGraphCanvasSaveData(const AZStd::unordered_map< AZ::EntityId, GraphCanvas::EntitySaveDataContainer* >& saveData);
+        AZStd::unordered_map< AZ::EntityId, GraphCanvas::EntitySaveDataContainer* > GetGraphCanvasSaveData() override;
+        void UpdateGraphCanvasSaveData(const AZStd::unordered_map< AZ::EntityId, GraphCanvas::EntitySaveDataContainer* >& saveData) override;
 
         NodeIdPair CreateCustomNode(const AZ::Uuid& typeId, const AZ::Vector2& position) override;
 
@@ -325,7 +325,7 @@ namespace ScriptCanvasEditor
         }
 
     protected:
-        void PostRestore(const UndoData& restoredData);
+        void PostRestore(const UndoData& restoredData) override;
 
         void UnregisterToast(const GraphCanvas::ToastId& toastId);
 

Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/GraphUpgrade.h

@@ -82,7 +82,7 @@ namespace ScriptCanvasEditor
 
         StateMachine* GetStateMachine() override { return m_stateMachine; }
 
-        virtual int GetStateId() const { return Traits::StateID(); }
+        int GetStateId() const override { return Traits::StateID(); }
 
         static int StateID() { return Traits::StateID(); }
 

Gems/ScriptCanvas/Code/Editor/Settings.h

@@ -40,7 +40,7 @@ namespace ScriptCanvasEditor
             ScriptCanvasConstructPresets();
             ~ScriptCanvasConstructPresets() override = default;
 
-            void InitializeConstructType(GraphCanvas::ConstructType constructType);            
+            void InitializeConstructType(GraphCanvas::ConstructType constructType) override;
         };
 
         class EditorWorkspace

Gems/ScriptCanvas/Code/Editor/Static/Include/ScriptCanvas/View/EditCtrls/GenericLineEditCtrl.h

@@ -59,7 +59,7 @@ namespace ScriptCanvasEditor
         void onChildLineEditValueChange(const QString& value);
 
     protected:
-        virtual void focusInEvent(QFocusEvent* e);
+        void focusInEvent(QFocusEvent* e) override;
 
     private:
         QLineEdit* m_pLineEdit;

Gems/ScriptCanvas/Code/Editor/SystemComponent.h

@@ -60,7 +60,7 @@ namespace ScriptCanvasEditor
         ////////////////////////////////////////////////////////////////////////
         // SystemRequestBus::Handler...
         void AddAsyncJob(AZStd::function<void()>&& jobFunc) override;
-        void GetEditorCreatableTypes(AZStd::unordered_set<ScriptCanvas::Data::Type>& outCreatableTypes);
+        void GetEditorCreatableTypes(AZStd::unordered_set<ScriptCanvas::Data::Type>& outCreatableTypes) override;
         void CreateEditorComponentsOnEntity(AZ::Entity* entity, const AZ::Data::AssetType& assetType) override;
         ////////////////////////////////////////////////////////////////////////
 
@@ -97,6 +97,7 @@ namespace ScriptCanvasEditor
         ////////////////////////////////////////////////////////////////////////
 
         ////////////////////////////////////////////////////////////////////////
+        void ClearGraphsThatNeedUpgrade()
 
     private:
         SystemComponent(const SystemComponent&) = delete;

Gems/ScriptCanvas/Code/Editor/View/Widgets/CanvasWidget.h

@@ -61,7 +61,7 @@ namespace ScriptCanvasEditor
 
         protected:
 
-            void resizeEvent(QResizeEvent *ev);
+            void resizeEvent(QResizeEvent *ev) override;
 
             void OnClicked();
 

Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetDataAggregator.h

@@ -27,15 +27,15 @@ namespace ScriptCanvasEditor
         bool IsCapturingData() const override { return false; }
         
     protected:
-        void Visit(ScriptCanvas::AnnotateNodeSignal&);
-        void Visit(ScriptCanvas::ExecutionThreadEnd&);
-        void Visit(ScriptCanvas::ExecutionThreadBeginning&);
-        void Visit(ScriptCanvas::GraphActivation&);
-        void Visit(ScriptCanvas::GraphDeactivation&);
-        void Visit(ScriptCanvas::NodeStateChange&);
-        void Visit(ScriptCanvas::InputSignal&);
-        void Visit(ScriptCanvas::OutputSignal&);
-        void Visit(ScriptCanvas::VariableChange&);
+        void Visit(ScriptCanvas::AnnotateNodeSignal&) override;
+        void Visit(ScriptCanvas::ExecutionThreadEnd&) override;
+        void Visit(ScriptCanvas::ExecutionThreadBeginning&) override;
+        void Visit(ScriptCanvas::GraphActivation&) override;
+        void Visit(ScriptCanvas::GraphDeactivation&) override;
+        void Visit(ScriptCanvas::NodeStateChange&) override;
+        void Visit(ScriptCanvas::InputSignal&) override;
+        void Visit(ScriptCanvas::OutputSignal&) override;
+        void Visit(ScriptCanvas::VariableChange&) override;
 
     private:
     

Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingDataAggregator.h

@@ -38,8 +38,8 @@ namespace ScriptCanvasEditor
         void OnCurrentTargetChanged() override;
         ////
 
-        bool CanCaptureData() const;
-        bool IsCapturingData() const;
+        bool CanCaptureData() const override;
+        bool IsCapturingData() const override;
 
         void StartCaptureData();
         void StopCaptureData();

Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingWindowSession.h

@@ -97,8 +97,8 @@ namespace ScriptCanvasEditor
         ////
 
         // AzToolsFramework::EditorEntityContextNotificationBus::Handler
-        void OnStartPlayInEditorBegin();
-        void OnStopPlayInEditor();
+        void OnStartPlayInEditorBegin() override;
+        void OnStopPlayInEditor() override;
         ////
 
         // ScriptCavnas::Debugger::ServiceNotificationsBus

Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingDataAggregator.h

@@ -88,7 +88,7 @@ namespace ScriptCanvasEditor
         AZ::NamedEntityId FindNamedEntityId(const AZ::EntityId& entityId) override;
         ////
 
-        virtual bool IsCapturingData() const = 0;
+        bool IsCapturingData() const override = 0;
         virtual bool CanCaptureData() const = 0;
         
         // Should be bus methods, but don't want to copy data

Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowTreeItems.h

@@ -115,7 +115,7 @@ namespace ScriptCanvasEditor
 
     protected:
 
-        bool OnMatchesFilter([[maybe_unused]] const DebugLogFilter& treeFilter) { return true; }
+        bool OnMatchesFilter([[maybe_unused]] const DebugLogFilter& treeFilter) override { return true; }
 
         UpdatePolicy m_updatePolicy;
         QTimer m_additionTimer;

Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/FunctionNodePaletteTreeItemTypes.h

@@ -59,8 +59,8 @@ namespace ScriptCanvasEditor
         FunctionPaletteTreeItem(const char* name, const ScriptCanvas::Grammar::FunctionSourceId& sourceId, AZ::Data::Asset<AZ::Data::AssetData> asset);
         ~FunctionPaletteTreeItem() = default;
 
-        GraphCanvas::GraphCanvasMimeEvent* CreateMimeEvent() const;
-        QVariant OnData(const QModelIndex& index, int role) const;
+        GraphCanvas::GraphCanvasMimeEvent* CreateMimeEvent() const override;
+        QVariant OnData(const QModelIndex& index, int role) const override;
 
         ScriptCanvas::Grammar::FunctionSourceId GetFunctionSourceId() const;
         AZ::Data::AssetId GetSourceAssetId() const;

Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp

@@ -1322,7 +1322,7 @@ namespace ScriptCanvasEditor
 
             if (seperator == AZStd::string_view::npos)
             {
-                categoryTrail = nullptr;
+                categoryTrail = {};
             }
             else
             {

Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/ScriptEventsNodePaletteTreeItemTypes.h

@@ -232,8 +232,8 @@ namespace ScriptCanvasEditor
         ScriptEventsEventNodePaletteTreeItem(const AZ::Data::AssetId& m_assetId, const ScriptEvents::Method& methodDefinition, const ScriptCanvas::EBusEventId& eventId);
         ~ScriptEventsEventNodePaletteTreeItem() = default;
 
-        GraphCanvas::GraphCanvasMimeEvent* CreateMimeEvent() const;
-        QVariant OnData(const QModelIndex& index, int role) const;
+        GraphCanvas::GraphCanvasMimeEvent* CreateMimeEvent() const override;
+        QVariant OnData(const QModelIndex& index, int role) const override;
 
         ScriptCanvas::EBusBusId GetBusIdentifier() const;
         ScriptCanvas::EBusEventId GetEventIdentifier() const;

Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/SpecializedNodePaletteTreeItemTypes.h

@@ -25,7 +25,7 @@ namespace ScriptCanvasEditor
         CreateCommentNodeMimeEvent() = default;
         ~CreateCommentNodeMimeEvent() = default;
 
-        NodeIdPair ConstructNode(const AZ::EntityId& sceneId, const AZ::Vector2& scenePosition);
+        NodeIdPair ConstructNode(const AZ::EntityId& sceneId, const AZ::Vector2& scenePosition) override;
         bool ExecuteEvent(const AZ::Vector2& mousePosition, AZ::Vector2& sceneDropPosition, const AZ::EntityId& sceneId) override;
     };
 
@@ -54,7 +54,7 @@ namespace ScriptCanvasEditor
         CreateNodeGroupMimeEvent() = default;
         ~CreateNodeGroupMimeEvent() = default;
 
-        NodeIdPair ConstructNode(const GraphCanvas::GraphId& sceneId, const AZ::Vector2& scenePosition);
+        NodeIdPair ConstructNode(const GraphCanvas::GraphId& sceneId, const AZ::Vector2& scenePosition) override;
         bool ExecuteEvent(const AZ::Vector2& mousePosition, AZ::Vector2& sceneDropPosition, const GraphCanvas::GraphId& sceneId) override;
     };
 

Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.h

@@ -160,7 +160,7 @@ namespace ScriptCanvasEditor
         ////
 
         // GraphCanvas::SceneNotifications
-        void OnSelectionChanged();
+        void OnSelectionChanged() override;
         ////
 
         void ApplyPreferenceSort();

Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.h

@@ -271,7 +271,7 @@ namespace ScriptCanvasEditor
     private:
         // UIRequestBus
         QMainWindow* GetMainWindow() override { return qobject_cast<QMainWindow*>(this); }
-        void OpenValidationPanel();
+        void OpenValidationPanel() override;
         //
 
         // Undo Handlers
@@ -298,9 +298,9 @@ namespace ScriptCanvasEditor
         bool ContainsGraph(const GraphCanvas::GraphId& graphId) const override;
         bool CloseGraph(const GraphCanvas::GraphId& graphId) override;
 
-        void CustomizeConnectionEntity(AZ::Entity* connectionEntity);
+        void CustomizeConnectionEntity(AZ::Entity* connectionEntity) override;
 
-        void ShowAssetPresetsMenu(GraphCanvas::ConstructType constructType);
+        void ShowAssetPresetsMenu(GraphCanvas::ConstructType constructType) override;
 
         GraphCanvas::ContextMenuAction::SceneReaction ShowSceneContextMenuWithGroup(const QPoint& screenPoint, const QPointF& scenePoint, AZ::EntityId groupTarget) override;
 
@@ -326,8 +326,8 @@ namespace ScriptCanvasEditor
         ////
 
         //! ScriptCanvas::BatchOperationsNotificationBus
-        void OnCommandStarted(AZ::Crc32 commandTag);
-        void OnCommandFinished(AZ::Crc32 commandTag);        
+        void OnCommandStarted(AZ::Crc32 commandTag) override;
+        void OnCommandFinished(AZ::Crc32 commandTag) override;
 
         // File menu
         void OnFileNew();
@@ -426,7 +426,7 @@ namespace ScriptCanvasEditor
         QVariant GetTabData(const AZ::Data::AssetId& assetId);
 
         //! GeneralRequestBus
-        AZ::Outcome<int, AZStd::string> OpenScriptCanvasAssetId(const AZ::Data::AssetId& assetId);
+        AZ::Outcome<int, AZStd::string> OpenScriptCanvasAssetId(const AZ::Data::AssetId& assetId) override;
         AZ::Outcome<int, AZStd::string> OpenScriptCanvasAsset(AZ::Data::AssetId scriptCanvasAssetId, int tabIndex = -1) override;
         AZ::Outcome<int, AZStd::string> OpenScriptCanvasAsset(const ScriptCanvasMemoryAsset& scriptCanvasAsset, int tabIndex = -1);
         int CloseScriptCanvasAsset(const AZ::Data::AssetId& assetId) override;
@@ -496,7 +496,7 @@ namespace ScriptCanvasEditor
         float GetEdgePanningScrollSpeed() const override;        
 
         GraphCanvas::EditorConstructPresets* GetConstructPresets() const override;
-        const GraphCanvas::ConstructTypePresetBucket* GetConstructTypePresetBucket(GraphCanvas::ConstructType constructType) const;
+        const GraphCanvas::ConstructTypePresetBucket* GetConstructTypePresetBucket(GraphCanvas::ConstructType constructType) const override;
 
         GraphCanvas::Styling::ConnectionCurveType GetConnectionCurveType() const override;
         GraphCanvas::Styling::ConnectionCurveType GetDataConnectionCurveType() const override;

Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.h

@@ -61,7 +61,10 @@ namespace ScriptCanvasEditor
         bool IsInSubMenu() const override;
         AZStd::string GetSubMenuPath() const override;
 
+        using GraphCanvas::SceneContextMenuAction::RefreshAction;
         void RefreshAction(const GraphCanvas::GraphId& graphId, const AZ::EntityId& targetId) override;
+
+        using GraphCanvas::SceneContextMenuAction::TriggerAction;
         GraphCanvas::ContextMenuAction::SceneReaction TriggerAction(const GraphCanvas::GraphId& graphId, const AZ::Vector2& scenePos) override;
     };
 
@@ -77,7 +80,10 @@ namespace ScriptCanvasEditor
 
         GraphCanvas::ActionGroupId GetActionGroupId() const override;
 
+        using GraphCanvas::ContextMenuAction::RefreshAction;
         void RefreshAction(const GraphCanvas::GraphId& graphId, const AZ::EntityId& targetId) override;
+
+        using GraphCanvas::ContextMenuAction::TriggerAction;
         GraphCanvas::ContextMenuAction::SceneReaction TriggerAction(const GraphCanvas::GraphId& graphId, const AZ::Vector2& scenePos) override;
 
     private:
@@ -110,7 +116,10 @@ namespace ScriptCanvasEditor
 
         GraphCanvas::ActionGroupId GetActionGroupId() const override;
 
+        using SlotManipulationMenuAction::RefreshAction;
         void RefreshAction(const GraphCanvas::GraphId& graphId, const AZ::EntityId& targetId) override;
+
+        using SlotManipulationMenuAction::TriggerAction;
         GraphCanvas::ContextMenuAction::SceneReaction TriggerAction(const GraphCanvas::GraphId& graphId, const AZ::Vector2& scenePos) override;
 
     private:
@@ -127,7 +136,10 @@ namespace ScriptCanvasEditor
         ExposeSlotMenuAction(QObject* parent);
         virtual ~ExposeSlotMenuAction() = default;
 
+        using GraphCanvas::SlotContextMenuAction::RefreshAction;
         void RefreshAction(const GraphCanvas::GraphId& graphId, const AZ::EntityId& targetId) override;
+
+        using GraphCanvas::SlotContextMenuAction::TriggerAction;
         GraphCanvas::ContextMenuAction::SceneReaction TriggerAction(const GraphCanvas::GraphId& graphId, const AZ::Vector2& scenePos) override;
 
     protected:
@@ -145,7 +157,10 @@ namespace ScriptCanvasEditor
         virtual ~SetDataSlotTypeMenuAction() = default;
         static bool IsSupportedSlotType(const AZ::EntityId& slotId);
 
+        using GraphCanvas::SlotContextMenuAction::RefreshAction;
         void RefreshAction(const GraphCanvas::GraphId& graphId, const AZ::EntityId& targetId) override;
+
+        using GraphCanvas::SlotContextMenuAction::TriggerAction;
         GraphCanvas::ContextMenuAction::SceneReaction TriggerAction(const GraphCanvas::GraphId& graphId, const AZ::Vector2& scenePos) override;
 
     private:
@@ -164,7 +179,10 @@ namespace ScriptCanvasEditor
 
         CreateAzEventHandlerSlotMenuAction(QObject* parent);
 
+        using GraphCanvas::SlotContextMenuAction::RefreshAction;
         void RefreshAction(const GraphCanvas::GraphId& graphId, const AZ::EntityId& targetId) override;
+
+        using GraphCanvas::SlotContextMenuAction::TriggerAction;
         GraphCanvas::ContextMenuAction::SceneReaction TriggerAction(const GraphCanvas::GraphId& graphId, const AZ::Vector2& scenePos) override;
 
         static const AZ::BehaviorMethod* FindBehaviorMethodWithAzEventReturn(const GraphCanvas::GraphId& graphId, AZ::EntityId targetId);
@@ -239,7 +257,10 @@ namespace ScriptCanvasEditor
         RenameFunctionDefinitionNodeAction(NodeDescriptorComponent* descriptor, QObject* parent);
         virtual ~RenameFunctionDefinitionNodeAction() = default;
 
+        using GraphCanvas::NodeContextMenuAction::RefreshAction;
         void RefreshAction(const GraphCanvas::GraphId& graphId, const AZ::EntityId& targetId) override;
+
+        using GraphCanvas::NodeContextMenuAction::TriggerAction;
         GraphCanvas::ContextMenuAction::SceneReaction TriggerAction(const GraphCanvas::GraphId& graphId, const AZ::Vector2& scenePos) override;
 
         NodeDescriptorComponent* m_descriptor;