From 21c02b195f9e5ee39b6e9d90aa8a41a69a50a7dd Mon Sep 17 00:00:00 2001
From: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
Date: Fri, 5 Nov 2021 17:24:08 -0700
Subject: [PATCH] Update signals/slots to match upstream changes

Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
---
 Code/Tools/ProjectManager/Source/DownloadController.cpp     | 6 +++---
 Code/Tools/ProjectManager/Source/DownloadController.h       | 2 +-
 .../Source/GemCatalog/GemCatalogHeaderWidget.cpp            | 2 +-
 .../ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp   | 2 +-
 .../ProjectManager/Source/GemCatalog/GemCatalogScreen.h     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Code/Tools/ProjectManager/Source/DownloadController.cpp b/Code/Tools/ProjectManager/Source/DownloadController.cpp
index a8eecffd78..d30e1bbc7c 100644
--- a/Code/Tools/ProjectManager/Source/DownloadController.cpp
+++ b/Code/Tools/ProjectManager/Source/DownloadController.cpp
@@ -82,13 +82,13 @@ namespace O3DE::ProjectManager
             succeeded = false;
         }
 
-        const QString gemName = m_gemNames[0];
+        QString gemName = m_gemNames.front();
         m_gemNames.erase(m_gemNames.begin());
-        emit Done(succeeded, gemName);
+        emit Done(gemName, succeeded);
 
         if (!m_gemNames.empty())
         {
-            emit StartGemDownload(m_gemNames[0]);
+            emit StartGemDownload(m_gemNames.front());
         }
         else
         {
diff --git a/Code/Tools/ProjectManager/Source/DownloadController.h b/Code/Tools/ProjectManager/Source/DownloadController.h
index 8afe8ef029..5b2d230379 100644
--- a/Code/Tools/ProjectManager/Source/DownloadController.h
+++ b/Code/Tools/ProjectManager/Source/DownloadController.h
@@ -58,7 +58,7 @@ namespace O3DE::ProjectManager
 
     signals:
         void StartGemDownload(const QString& gemName);
-        void Done(bool success, const QString& gemName);
+        void Done(const QString& gemName, bool success = true);
         void GemDownloadProgress(int percentage);
 
     private:
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp
index 0db2b088c1..71d5086fff 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp
@@ -261,7 +261,7 @@ namespace O3DE::ProjectManager
             }
         };
 
-        auto downloadEnded = [=](bool /*success*/, const QString& /*gemName*/)
+        auto downloadEnded = [=](const QString& /*gemName*/, bool /*success*/)
         {
             update(0); // update the list to remove the gem that has finished
         };
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
index b0e4fa73e1..79935ed235 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
@@ -459,7 +459,7 @@ namespace O3DE::ProjectManager
         emit ChangeScreenRequest(ProjectManagerScreen::GemRepos);
     }
 
-    void GemCatalogScreen::OnGemDownloadResult(bool succeeded, const QString& gemName)
+    void GemCatalogScreen::OnGemDownloadResult(const QString& gemName, bool succeeded)
     {
         if (succeeded)
         {
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h
index 6acf43b3eb..da6d2efa7b 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h
@@ -49,7 +49,7 @@ namespace O3DE::ProjectManager
         void OnGemStatusChanged(const QString& gemName, uint32_t numChangedDependencies);
         void OnAddGemClicked();
         void SelectGem(const QString& gemName);
-        void OnGemDownloadResult(bool succeeded, const QString& gemName);
+        void OnGemDownloadResult(const QString& gemName, bool succeeded = true);
         void Refresh();
 
     protected: