Bladeren bron

Remove some code duplication

Signed-off-by: AMZN-Phil <[email protected]>
AMZN-Phil 3 jaren geleden
bovenliggende
commit
18cf128854

+ 2 - 4
Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp

@@ -17,8 +17,6 @@
 #include <QDesktopServices>
 #include <QUrl>
 
-
-
 namespace O3DE::ProjectManager
 {
     ProjectBuilderController::ProjectBuilderController(const ProjectInfo& projectInfo, ProjectButton* projectButton, QWidget* parent)
@@ -35,7 +33,7 @@ namespace O3DE::ProjectManager
         if (settingsRegistry)
         {
             // Remove key here in case Project Manager crashing while building that causes HandleResults to not be called
-            QString settingsKey = QString("%1/Projects/%2/BuiltSuccesfully").arg(ProjectManagerKeyPrefix).arg(m_projectInfo.m_projectName);
+            QString settingsKey = GetProjectBuiltSuccessfullyKey(m_projectInfo.m_projectName);
             settingsRegistry->Remove(settingsKey.toStdString().c_str());
             SaveProjectManagerSettings();
         }
@@ -93,7 +91,7 @@ namespace O3DE::ProjectManager
 
     void ProjectBuilderController::HandleResults(const QString& result)
     {
-        QString settingsKey = QString("%1/Projects/%2/BuiltSuccesfully").arg(ProjectManagerKeyPrefix).arg(m_projectInfo.m_projectName);
+        QString settingsKey = GetProjectBuiltSuccessfullyKey(m_projectInfo.m_projectName);
 
         if (!result.isEmpty())
         {

+ 5 - 0
Code/Tools/ProjectManager/Source/ProjectManagerSettings.cpp

@@ -46,4 +46,9 @@ namespace O3DE::ProjectManager
 
         AZ_Warning("ProjectManager", saved, "Unable to save Project Manager registry file to path: %s", o3deUserPath.c_str());
     }
+
+    QString GetProjectBuiltSuccessfullyKey(const QString& projectName)
+    {
+        return QString("%1/Projects/%2/BuiltSuccessfully").arg(ProjectManagerKeyPrefix).arg(projectName);
+    }
 }

+ 5 - 0
Code/Tools/ProjectManager/Source/ProjectManagerSettings.h

@@ -8,9 +8,14 @@
 
 #pragma once
 
+#if !defined(Q_MOC_RUN)
+#include <QString>
+#endif
+
 namespace O3DE::ProjectManager
 {
     static constexpr char ProjectManagerKeyPrefix[] = "/O3DE/ProjectManager";
 
     void SaveProjectManagerSettings();
+    QString GetProjectBuiltSuccessfullyKey(const QString& projectName);
 }

+ 1 - 2
Code/Tools/ProjectManager/Source/ProjectsScreen.cpp

@@ -295,8 +295,7 @@ namespace O3DE::ProjectManager
                     bool projectBuiltSuccessfully = false;
                     if (settingsRegistry)
                     {
-                        QString settingsKey =
-                            QString("%1/Projects/%2/BuiltSuccesfully").arg(ProjectManagerKeyPrefix).arg(project.m_projectName);
+                        QString settingsKey = GetProjectBuiltSuccessfullyKey(project.m_projectName);
                         settingsRegistry->Get(projectBuiltSuccessfully, settingsKey.toStdString().c_str());
                     }
                     if (!projectBuiltSuccessfully)

+ 2 - 4
Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp

@@ -286,10 +286,8 @@ namespace O3DE::ProjectManager
             if (newProjectSettings.m_projectName != m_projectInfo.m_projectName)
             {
                 // update reg key
-                QString oldSettingsKey =
-                    QString("%1/Projects/%2/BuiltSuccesfully").arg(ProjectManagerKeyPrefix).arg(m_projectInfo.m_projectName);
-                QString newSettingsKey =
-                    QString("%1/Projects/%2/BuiltSuccesfully").arg(ProjectManagerKeyPrefix).arg(newProjectSettings.m_projectName);
+                QString oldSettingsKey = GetProjectBuiltSuccessfullyKey(m_projectInfo.m_projectName);
+                QString newSettingsKey = GetProjectBuiltSuccessfullyKey(newProjectSettings.m_projectName);
 
                 auto settingsRegistry = AZ::SettingsRegistry::Get();
                 bool projectBuiltSuccessfully = false;