Remove some code duplication

Signed-off-by: AMZN-Phil <pconroy@amazon.com>
monroegm-disable-blank-issue-2
AMZN-Phil 4 years ago
parent 07c142b975
commit 18cf128854

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

@ -46,4 +46,9 @@ namespace O3DE::ProjectManager
AZ_Warning("ProjectManager", saved, "Unable to save Project Manager registry file to path: %s", o3deUserPath.c_str()); 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);
}
} }

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

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

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

Loading…
Cancel
Save