len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-16 16:42:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

rbutil: Convert ServerInfo to singleton.

Browse source 
Change-Id: I29d94eb6bae084754e5e3f337c41de8354ba123c
This commit is contained in:
Dominik Riebeling 2020-11-19 19:54:25 +01:00
parent f8fb4274ee
commit f608de723c
7 changed files with 45 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

16
rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
View file

@ -69,7 +69,7 @@ void SelectiveInstallWidget::selectedVersionChanged(int index)
if(current == "development")
ui.selectedDescription->setText(tr("The development version is "
"updated on every code change. Last update was on %1").arg(
ServerInfo::platformValue(ServerInfo::BleedingDate).toString()));
ServerInfo::instance()->platformValue(ServerInfo::BleedingDate).toString()));
if(current == "rc")
ui.selectedDescription->setText(tr("This will eventually become the "
"next Rockbox version. Install it to help testing."));
@ -91,11 +91,11 @@ void SelectiveInstallWidget::updateVersion(void)
// re-populate all version items
m_versions.clear();
m_versions.insert("release", ServerInfo::platformValue(ServerInfo::CurReleaseVersion).toString());
m_versions.insert("release", ServerInfo::instance()->platformValue(ServerInfo::CurReleaseVersion).toString());
// Don't populate RC or development selections if target has been retired.
if (ServerInfo::platformValue(ServerInfo::CurStatus).toInt() != STATUS_RETIRED) {
m_versions.insert("development", ServerInfo::platformValue(ServerInfo::BleedingRevision).toString());
m_versions.insert("rc", ServerInfo::platformValue(ServerInfo::RelCandidateVersion).toString());
if (ServerInfo::instance()->platformValue(ServerInfo::CurStatus).toInt() != STATUS_RETIRED) {
m_versions.insert("development", ServerInfo::instance()->platformValue(ServerInfo::BleedingRevision).toString());
m_versions.insert("rc", ServerInfo::instance()->platformValue(ServerInfo::RelCandidateVersion).toString());
}
ui.selectedVersion->clear();
@ -385,11 +385,11 @@ void SelectiveInstallWidget::installRockbox(void)
RbSettings::setValue(RbSettings::Build, selected);
RbSettings::sync();
if(selected == "release") url = ServerInfo::platformValue(
if(selected == "release") url = ServerInfo::instance()->platformValue(
ServerInfo::CurReleaseUrl, m_target).toString();
else if(selected == "development") url = ServerInfo::platformValue(
else if(selected == "development") url = ServerInfo::instance()->platformValue(
ServerInfo::CurDevelUrl, m_target).toString();
else if(selected == "rc") url = ServerInfo::platformValue(
else if(selected == "rc") url = ServerInfo::instance()->platformValue(
ServerInfo::RelCandidateUrl, m_target).toString();
//! install build