Repair upgrade notification after bad automatic merge

Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-09-30 14:59:11 -07:00
parent 619948231a
commit 2185505302
5 changed files with 0 additions and 20 deletions
@@ -223,7 +223,6 @@ namespace ScriptCanvasEditor
        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;

        virtual void OnUpgradeStart() {}
-        virtual void OnUpgradeComplete() {}
        virtual void OnUpgradeCancelled() {}

        virtual void OnGraphUpgradeComplete(AZ::Data::Asset<AZ::Data::AssetData>&, bool skipped = false) { (void)skipped; }
@@ -104,10 +104,6 @@ namespace ScriptCanvasEditor
        {
            DisconnectLambdas();
        }
-        void OnUpgradeComplete() override
-        {
-            ConnectLambdas();
-        }

        // Asset Node Support
        void OnRowsInserted(const QModelIndex& parentIndex, int first, int last);
@@ -386,15 +386,6 @@ namespace ScriptCanvasEditor
            AzFramework::AssetCatalogEventBus::Handler::BusDisconnect();
        }

-        void ScriptCanvasRootPaletteTreeItem::OnUpgradeComplete()
-        {
-            ConnectLambdas();
-
-            AzFramework::AssetCatalogEventBus::Handler::BusConnect();
-
-            TraverseTree();
-        }
-
        void ScriptCanvasRootPaletteTreeItem::OnUpgradeCancelled()
        {
            if (!AzFramework::AssetCatalogEventBus::Handler::BusIsConnected())
@@ -92,7 +92,6 @@ namespace ScriptCanvasEditor

            // UpgradeNotifications::Bus
            void OnUpgradeStart() override;
-            void OnUpgradeComplete() override;
            void OnUpgradeCancelled() override;
            ////

@@ -117,11 +117,6 @@ namespace ScriptCanvasEditor
        {
            AzToolsFramework::AssetBrowser::AssetBrowserComponentNotificationBus::Handler::BusDisconnect();
        }
-        
-        void OnUpgradeComplete() override
-        {
-            AzToolsFramework::AssetBrowser::AssetBrowserComponentNotificationBus::Handler::BusConnect();
-        }
    };

    class OnSaveToast