Skip to content

fix wrongly named getter #1354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jamiras merged 2 commits into from
Sep 20, 2026
Merged

fix wrongly named getter #1354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
445f347
fix wrongly named getter
Jamiras Sep 14, 2026
d333ec0
Merge branch 'master' into refactor/asset_get_name
Jamiras Sep 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/devkit/data/models/AchievementModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ void AchievementModel::SyncIDToRuntime() const

void AchievementModel::SyncTitleToRuntime()
{
m_sTitleBuffer = ra::util::String::Narrow(GetTitle());
m_sTitleBuffer = ra::util::String::Narrow(GetName());
m_pAchievementInfo->public_.title = m_sTitleBuffer.c_str();
}

Expand Down
2 changes: 1 addition & 1 deletion src/devkit/data/models/AssetModelBase.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public:
/// <summary>
/// Gets the name to display.
/// </summary>
const std::wstring& GetTitle() const { return GetValue(NameProperty); }
const std::wstring& GetName() const { return GetValue(NameProperty); }

/// <summary>
/// Sets the name to display.
Expand Down
2 changes: 1 addition & 1 deletion src/devkit/data/models/LeaderboardModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ void LeaderboardModel::SyncIDToRuntime() const

void LeaderboardModel::SyncTitleToRuntime()
{
m_sTitleBuffer = ra::util::String::Narrow(GetTitle());
m_sTitleBuffer = ra::util::String::Narrow(GetName());
m_pLeaderboardInfo->public_.title = m_sTitleBuffer.c_str();
}

Expand Down
4 changes: 2 additions & 2 deletions src/services/AchievementRuntime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1570,7 +1570,7 @@ static void HandleServerError(const rc_client_server_error_t& pServerError)
if (pAchievement != nullptr)
{
vmPopup->SetDescription(
ra::util::String::Printf(L"%s (%u)", pAchievement->GetTitle(), pAchievement->GetPoints()));
ra::util::String::Printf(L"%s (%u)", pAchievement->GetName(), pAchievement->GetPoints()));
vmPopup->SetImage(ra::ui::ImageType::Badge, ra::util::String::Narrow(pAchievement->GetBadge()));
}
else
Expand All @@ -1595,7 +1595,7 @@ static void HandleServerError(const rc_client_server_error_t& pServerError)
const auto& pGameContext = ra::services::ServiceLocator::Get<ra::data::context::GameContext>();
const auto* pLeaderboard = pGameContext.Assets().FindLeaderboard(nLeaderboardId);
std::wstring sLeaderboardName = (pLeaderboard != nullptr) ?
pLeaderboard->GetTitle() : ra::util::String::Printf(L"Leaderboard %u", nLeaderboardId);
pLeaderboard->GetName() : ra::util::String::Printf(L"Leaderboard %u", nLeaderboardId);
const auto sErrorMessage = pServerError.error_message ?
ra::util::String::Widen(pServerError.error_message) : L"Error submitting leaderboard entry";

Expand Down
2 changes: 1 addition & 1 deletion src/services/AchievementRuntimeExports.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1086,7 +1086,7 @@ const ra::data::models::AchievementModel* CheckForPauseOnTrigger(const rc_client
if (vmAchievement->IsPauseOnTrigger())
{
auto& pFrameEventQueue = ra::services::ServiceLocator::GetMutable<ra::services::FrameEventQueue>();
pFrameEventQueue.QueuePauseOnTrigger(vmAchievement->GetTitle());
pFrameEventQueue.QueuePauseOnTrigger(vmAchievement->GetName());
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/ui/viewmodels/AssetEditorViewModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ void AssetEditorViewModel::LoadAsset(ra::data::models::AssetModelBase* pAsset, b
{
pAsset->AddNotifyTarget(*this);

SetName(pAsset->GetTitle());
SetName(pAsset->GetName());
SetDescription(pAsset->GetDescription());
SetState(pAsset->GetState());
SetCategory(pAsset->GetCategory());
Expand Down
24 changes: 12 additions & 12 deletions src/ui/viewmodels/AssetListViewModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ void AssetListViewModel::AddOrRemoveFilteredItem(gsl::index nAssetIndex)

void AssetListViewModel::SyncAsset(AssetSummaryViewModel& vmSummary, const ra::data::models::AssetModelBase& pAsset)
{
vmSummary.SetLabel(pAsset.GetTitle());
vmSummary.SetLabel(pAsset.GetName());
vmSummary.SetType(pAsset.GetType());
vmSummary.SetCategory(pAsset.GetCategory());
vmSummary.SetChanges(pAsset.GetChanges());
Expand Down Expand Up @@ -1368,26 +1368,26 @@ void AssetListViewModel::ValidateAchievementForPublish(std::wstring& sError, con
{
const std::wstring sTriggerError = ValidateTriggerLogic(pAchievement.GetTrigger());
if (!sTriggerError.empty())
sError.append(ra::util::String::Printf(L"\n* %s: %s", pAchievement.GetTitle(), sTriggerError));
sError.append(ra::util::String::Printf(L"\n* %s: %s", pAchievement.GetName(), sTriggerError));
}

void AssetListViewModel::ValidateLeaderboardForPublish(std::wstring& sError, const ra::data::models::LeaderboardModel& pLeaderboard) const
{
std::wstring sTriggerError = ValidateTriggerLogic(pLeaderboard.GetStartTrigger());
if (!sTriggerError.empty())
sError.append(ra::util::String::Printf(L"\n* %s: %s: %s", pLeaderboard.GetTitle(), L"Start", sTriggerError));
sError.append(ra::util::String::Printf(L"\n* %s: %s: %s", pLeaderboard.GetName(), L"Start", sTriggerError));

sTriggerError = ValidateTriggerLogic(pLeaderboard.GetSubmitTrigger());
if (!sTriggerError.empty())
sError.append(ra::util::String::Printf(L"\n* %s: %s: %s", pLeaderboard.GetTitle(), L"Submit", sTriggerError));
sError.append(ra::util::String::Printf(L"\n* %s: %s: %s", pLeaderboard.GetName(), L"Submit", sTriggerError));

sTriggerError = ValidateTriggerLogic(pLeaderboard.GetCancelTrigger());
if (!sTriggerError.empty())
sError.append(ra::util::String::Printf(L"\n* %s: %s: %s", pLeaderboard.GetTitle(), L"Cancel", sTriggerError));
sError.append(ra::util::String::Printf(L"\n* %s: %s: %s", pLeaderboard.GetName(), L"Cancel", sTriggerError));

const std::wstring sValueError = ValidateValueLogic(pLeaderboard.GetValueDefinition());
if (!sValueError.empty())
sError.append(ra::util::String::Printf(L"\n* %s: %s: %s", pLeaderboard.GetTitle(), L"Value", sValueError));
sError.append(ra::util::String::Printf(L"\n* %s: %s: %s", pLeaderboard.GetName(), L"Value", sValueError));
}


Expand Down Expand Up @@ -1415,13 +1415,13 @@ bool AssetListViewModel::ValidateAssetsForPublish(std::vector<ra::data::models::
if (pLeaderboard != nullptr)
{
if (pLeaderboard->GetStartTrigger().empty())
sError.append(ra::util::String::Printf(L"\n* %s: No Start condition", pLeaderboard->GetTitle()));
sError.append(ra::util::String::Printf(L"\n* %s: No Start condition", pLeaderboard->GetName()));
if (pLeaderboard->GetCancelTrigger().empty())
sError.append(ra::util::String::Printf(L"\n* %s: No Cancel condition", pLeaderboard->GetTitle()));
sError.append(ra::util::String::Printf(L"\n* %s: No Cancel condition", pLeaderboard->GetName()));
if (pLeaderboard->GetSubmitTrigger().empty())
sError.append(ra::util::String::Printf(L"\n* %s: No Submit condition", pLeaderboard->GetTitle()));
sError.append(ra::util::String::Printf(L"\n* %s: No Submit condition", pLeaderboard->GetName()));
if (pLeaderboard->GetValueDefinition().empty())
sError.append(ra::util::String::Printf(L"\n* %s: No Value definition", pLeaderboard->GetTitle()));
sError.append(ra::util::String::Printf(L"\n* %s: No Value definition", pLeaderboard->GetName()));

ValidateLeaderboardForPublish(sError, *pLeaderboard);
}
Expand Down Expand Up @@ -1941,7 +1941,7 @@ void AssetListViewModel::CloneSelected()
pAchievement->CreateServerCheckpoint();
pAchievement->CreateLocalCheckpoint();

pAchievement->SetName(pSourceAchievement->GetTitle() + L" (copy)");
pAchievement->SetName(pSourceAchievement->GetName() + L" (copy)");
pAchievement->SetDescription(pSourceAchievement->GetDescription());
pAchievement->SetBadge(pSourceAchievement->GetBadge());
pAchievement->SetPoints(pSourceAchievement->GetPoints());
Expand All @@ -1967,7 +1967,7 @@ void AssetListViewModel::CloneSelected()
pLeaderboard->CreateServerCheckpoint();
pLeaderboard->CreateLocalCheckpoint();

pLeaderboard->SetName(pSourceLeaderboard->GetTitle() + L" (copy)");
pLeaderboard->SetName(pSourceLeaderboard->GetName() + L" (copy)");
pLeaderboard->SetDescription(pSourceLeaderboard->GetDescription());
pLeaderboard->SetStartTrigger(pSourceLeaderboard->GetStartTrigger());
pLeaderboard->SetSubmitTrigger(pSourceLeaderboard->GetSubmitTrigger());
Expand Down
10 changes: 5 additions & 5 deletions src/ui/viewmodels/AssetUploadViewModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ void AssetUploadViewModel::UploadAchievement(ra::data::models::AchievementModel&

ra::api::UpdateAchievement::Request request;
request.GameId = pGameContext.GetGameId(pAchievement.GetSubsetID());
request.Title = pAchievement.GetTitle();
request.Title = pAchievement.GetName();
request.Description = pAchievement.GetDescription();
request.Trigger = pAchievement.GetTrigger();
request.Points = pAchievement.GetPoints();
Expand Down Expand Up @@ -329,7 +329,7 @@ void AssetUploadViewModel::UploadAchievement(ra::data::models::AchievementModel&
if (response.ErrorMessage == "Invalid state")
{
// generic API failure. Try to guess what went wrong
if (pAchievement.GetTitle().empty())
if (pAchievement.GetName().empty())
pScan.sErrorMessage = "Title is required";
else if (pAchievement.GetDescription().empty())
pScan.sErrorMessage = "Description is required";
Expand All @@ -349,7 +349,7 @@ void AssetUploadViewModel::UploadLeaderboard(ra::data::models::LeaderboardModel&

ra::api::UpdateLeaderboard::Request request;
request.GameId = pGameContext.GetGameId(pLeaderboard.GetSubsetID());
request.Title = pLeaderboard.GetTitle();
request.Title = pLeaderboard.GetName();
request.Description = pLeaderboard.GetDescription();
request.StartTrigger = pLeaderboard.GetStartTrigger();
request.SubmitTrigger = pLeaderboard.GetSubmitTrigger();
Expand Down Expand Up @@ -393,7 +393,7 @@ void AssetUploadViewModel::UploadLeaderboard(ra::data::models::LeaderboardModel&
if (response.ErrorMessage == "Invalid state")
{
// generic API failure. Try to guess what went wrong
if (pLeaderboard.GetTitle().empty())
if (pLeaderboard.GetName().empty())
pScan.sErrorMessage = "Title is required";
else if (pLeaderboard.GetDescription().empty())
pScan.sErrorMessage = "Description is required";
Expand Down Expand Up @@ -684,7 +684,7 @@ void AssetUploadViewModel::ShowResults() const

default:
sMessage.append(ra::util::String::Printf(L"\n* %s: %s",
pItem.pAsset->GetTitle(),
pItem.pAsset->GetName(),
pItem.sErrorMessage));
break;
}
Expand Down
2 changes: 1 addition & 1 deletion src/ui/viewmodels/BrokenAchievementsViewModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ bool BrokenAchievementsViewModel::InitializeAchievements()
{
auto& vmAchievement = m_vAchievements.Add();
vmAchievement.SetId(pAchievement->GetID());
vmAchievement.SetLabel(pAchievement->GetTitle());
vmAchievement.SetLabel(pAchievement->GetName());
vmAchievement.SetDescription(pAchievement->GetDescription());
vmAchievement.SetAchieved(!pAchievement->IsActive());
}
Expand Down
4 changes: 2 additions & 2 deletions src/ui/viewmodels/TriggerViewModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,9 +987,9 @@ void TriggerViewModel::Summarize()
TriggerSummaryViewModel vmSummary;

if (m_vGroups.Count() == 1)
vmSummary.SetWindowTitle(L"Trigger Summary - " + pAssetEditor.GetAsset()->GetTitle());
vmSummary.SetWindowTitle(L"Trigger Summary - " + pAssetEditor.GetAsset()->GetName());
else
vmSummary.SetWindowTitle(pGroup->GetLabel() + L" Summary - " + pAssetEditor.GetAsset()->GetTitle());
vmSummary.SetWindowTitle(pGroup->GetLabel() + L" Summary - " + pAssetEditor.GetAsset()->GetName());

vmSummary.InitializeFrom(*pCondSet);
vmSummary.AddHeaders();
Expand Down
Loading
Loading