From be1be797b24acb5d78ad55502dd9bd7306482c0d Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sat, 14 Nov 2020 16:33:48 +0100 Subject: rbutil: Rework player configuration. Rename config entries and remove now unnecessary default value handling. Change-Id: I5c60ef9769fc01f45f45290dafffb80c1962e674 --- rbutil/rbutilqt/base/autodetection.cpp | 2 +- rbutil/rbutilqt/base/bootloaderinstalls5l.cpp | 2 +- rbutil/rbutilqt/base/rbsettings.cpp | 2 +- rbutil/rbutilqt/base/serverinfo.cpp | 4 +- rbutil/rbutilqt/base/serverinfo.h | 2 - rbutil/rbutilqt/base/systeminfo.cpp | 72 +++++++++++++------------- rbutil/rbutilqt/base/systeminfo.h | 24 ++++----- rbutil/rbutilqt/base/talkgenerator.cpp | 2 +- rbutil/rbutilqt/base/utils.cpp | 6 +-- rbutil/rbutilqt/configure.cpp | 22 ++++---- rbutil/rbutilqt/gui/manualwidget.cpp | 4 +- rbutil/rbutilqt/gui/selectiveinstallwidget.cpp | 12 ++--- rbutil/rbutilqt/rbutilqt.cpp | 16 +++--- rbutil/rbutilqt/themesinstallwindow.cpp | 2 +- 14 files changed, 84 insertions(+), 88 deletions(-) (limited to 'rbutil') diff --git a/rbutil/rbutilqt/base/autodetection.cpp b/rbutil/rbutilqt/base/autodetection.cpp index 7c69b3a59b..8c800607c3 100644 --- a/rbutil/rbutilqt/base/autodetection.cpp +++ b/rbutil/rbutilqt/base/autodetection.cpp @@ -108,7 +108,7 @@ void Autodetection::detectUsb() LOG_WARNING() << "[USB] detected problem with player" << d.device; } QString idstring = QString("%1").arg(attached.at(i), 8, 16, QChar('0')); - if(!SystemInfo::platformValue(SystemInfo::CurName, idstring).toString().isEmpty()) { + if(!SystemInfo::platformValue(SystemInfo::Name, idstring).toString().isEmpty()) { struct Detected d; d.status = PlayerIncompatible; d.device = idstring; diff --git a/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp b/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp index bd7ed6492d..013abb2f5e 100644 --- a/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp @@ -409,7 +409,7 @@ BootloaderInstallBase::BootloaderType BootloaderInstallS5l::installed(void) + "/.rockbox/rbutil.log"; QSettings s(logfile, QSettings::IniFormat, this); QString section = SystemInfo::platformValue( - SystemInfo::CurBootloaderName).toString().section('/', -1); + SystemInfo::BootloaderName).toString().section('/', -1); rbblInstalled = s.contains("Bootloader/" + section); if (rbblInstalled) { diff --git a/rbutil/rbutilqt/base/rbsettings.cpp b/rbutil/rbutilqt/base/rbsettings.cpp index 4167a8659c..512341b84c 100644 --- a/rbutil/rbutilqt/base/rbsettings.cpp +++ b/rbutil/rbutilqt/base/rbsettings.cpp @@ -194,7 +194,7 @@ QString RbSettings::constructSettingPath(QString path, QString substitute) } else { path.replace(":tts:", userSettings->value("tts").toString()); - path.replace(":encoder:", SystemInfo::platformValue(SystemInfo::CurEncoder, platform).toString()); + path.replace(":encoder:", SystemInfo::platformValue(SystemInfo::Encoder, platform).toString()); } path.replace(":platform:", platform); } diff --git a/rbutil/rbutilqt/base/serverinfo.cpp b/rbutil/rbutilqt/base/serverinfo.cpp index 505689847d..5a0719f375 100644 --- a/rbutil/rbutilqt/base/serverinfo.cpp +++ b/rbutil/rbutilqt/base/serverinfo.cpp @@ -136,9 +136,9 @@ void ServerInfo::readBuildInfo(QString file) QString manualZipUrl = manualBaseUrl; QString buildservermodel = SystemInfo::platformValue( - SystemInfo::CurBuildserverModel, platforms.at(i)).toString(); + SystemInfo::BuildserverModel, platforms.at(i)).toString(); QString modelman = SystemInfo::platformValue( - SystemInfo::CurManual, platforms.at(i)).toString(); + SystemInfo::Manual, platforms.at(i)).toString(); QString manualBaseName = "rockbox-"; if(modelman.isEmpty()) manualBaseName += buildservermodel; diff --git a/rbutil/rbutilqt/base/serverinfo.h b/rbutil/rbutilqt/base/serverinfo.h index b12a437c34..7588521b09 100644 --- a/rbutil/rbutilqt/base/serverinfo.h +++ b/rbutil/rbutilqt/base/serverinfo.h @@ -49,8 +49,6 @@ class ServerInfo : public QObject static QVariant platformValue(enum ServerInfos setting, QString platform = ""); private: - //! set a server info value - static void setValue(enum ServerInfos setting, QVariant value); //! set a value for a server info for a named platform. static void setPlatformValue(enum ServerInfos setting, QString platform, QVariant value); //! you shouldnt call this, its a fully static class diff --git a/rbutil/rbutilqt/base/systeminfo.cpp b/rbutil/rbutilqt/base/systeminfo.cpp index c9e29a8325..d14c3f5436 100644 --- a/rbutil/rbutilqt/base/systeminfo.cpp +++ b/rbutil/rbutilqt/base/systeminfo.cpp @@ -26,29 +26,28 @@ const static struct { SystemInfo::SystemInfos info; const char* name; - const char* def; } SystemInfosList[] = { - { SystemInfo::ManualUrl, "manual_url", "" }, - { SystemInfo::BleedingUrl, "bleeding_url", "" }, - { SystemInfo::BootloaderUrl, "bootloader_url", "" }, - { SystemInfo::BootloaderInfoUrl, "bootloader_info_url", "" }, - { SystemInfo::ReleaseFontUrl, "release_font_url", "" }, - { SystemInfo::DailyFontUrl, "daily_font_url", "" }, - { SystemInfo::DailyVoiceUrl, "daily_voice_url", "" }, - { SystemInfo::ReleaseVoiceUrl, "release_voice_url", "" }, - { SystemInfo::DoomUrl, "doom_url", "" }, - { SystemInfo::Duke3DUrl, "duke3d_url", "" }, - { SystemInfo::PuzzFontsUrl, "puzzfonts_url", "" }, - { SystemInfo::QuakeUrl, "quake_url", "" }, - { SystemInfo::Wolf3DUrl, "wolf3d_url", "" }, - { SystemInfo::XWorldUrl, "xworld_url", "" }, - { SystemInfo::ReleaseUrl, "release_url", "" }, - { SystemInfo::DailyUrl, "daily_url", "" }, - { SystemInfo::BuildInfoUrl, "build_info_url", "" }, - { SystemInfo::GenlangUrl, "genlang_url", "" }, - { SystemInfo::ThemesUrl, "themes_url", "" }, - { SystemInfo::ThemesInfoUrl, "themes_info_url", "" }, - { SystemInfo::RbutilUrl, "rbutil_url", "" }, + { SystemInfo::ManualUrl, "manual_url" }, + { SystemInfo::BleedingUrl, "bleeding_url" }, + { SystemInfo::BootloaderUrl, "bootloader_url" }, + { SystemInfo::BootloaderInfoUrl, "bootloader_info_url" }, + { SystemInfo::ReleaseFontUrl, "release_font_url" }, + { SystemInfo::DailyFontUrl, "daily_font_url" }, + { SystemInfo::DailyVoiceUrl, "daily_voice_url" }, + { SystemInfo::ReleaseVoiceUrl, "release_voice_url" }, + { SystemInfo::DoomUrl, "doom_url" }, + { SystemInfo::Duke3DUrl, "duke3d_url" }, + { SystemInfo::PuzzFontsUrl, "puzzfonts_url" }, + { SystemInfo::QuakeUrl, "quake_url" }, + { SystemInfo::Wolf3DUrl, "wolf3d_url" }, + { SystemInfo::XWorldUrl, "xworld_url" }, + { SystemInfo::ReleaseUrl, "release_url" }, + { SystemInfo::DailyUrl, "daily_url" }, + { SystemInfo::BuildInfoUrl, "build_info_url" }, + { SystemInfo::GenlangUrl, "genlang_url" }, + { SystemInfo::ThemesUrl, "themes_url" }, + { SystemInfo::ThemesInfoUrl, "themes_info_url" }, + { SystemInfo::RbutilUrl, "rbutil_url" }, }; const static struct { @@ -56,18 +55,18 @@ const static struct { const char* name; const char* def; } PlatformInfosList[] = { - { SystemInfo::CurPlatformName, ":platform:/name", "" }, - { SystemInfo::CurManual, ":platform:/manualname","rockbox-:platform:" }, - { SystemInfo::CurBootloaderMethod, ":platform:/bootloadermethod", "none" }, - { SystemInfo::CurBootloaderName, ":platform:/bootloadername", "" }, - { SystemInfo::CurBootloaderFile, ":platform:/bootloaderfile", "" }, - { SystemInfo::CurBootloaderFilter, ":platform:/bootloaderfilter", "" }, - { SystemInfo::CurEncoder, ":platform:/encoder", "" }, - { SystemInfo::CurBrand, ":platform:/brand", "" }, - { SystemInfo::CurName, ":platform:/name", "" }, - { SystemInfo::CurBuildserverModel, ":platform:/buildserver_modelname", "" }, - { SystemInfo::CurConfigureModel, ":platform:/configure_modelname", "" }, - { SystemInfo::CurPlayerPicture, ":platform:/playerpic", "" }, + { SystemInfo::PlatformName, ":platform:/name", "" }, + { SystemInfo::Manual, ":platform:/manualname","rockbox-:platform:" }, + { SystemInfo::BootloaderMethod, ":platform:/bootloadermethod", "none" }, + { SystemInfo::BootloaderName, ":platform:/bootloadername", "" }, + { SystemInfo::BootloaderFile, ":platform:/bootloaderfile", "" }, + { SystemInfo::BootloaderFilter, ":platform:/bootloaderfilter", "" }, + { SystemInfo::Encoder, ":platform:/encoder", "" }, + { SystemInfo::Brand, ":platform:/brand", "" }, + { SystemInfo::Name, ":platform:/name", "" }, + { SystemInfo::BuildserverModel, ":platform:/buildserver_modelname", "" }, + { SystemInfo::ConfigureModel, ":platform:/configure_modelname", "" }, + { SystemInfo::PlayerPicture, ":platform:/playerpic", "" }, }; //! pointer to setting object to NULL @@ -93,9 +92,8 @@ QVariant SystemInfo::value(enum SystemInfos info) while(SystemInfosList[i].info != info) i++; QString s = SystemInfosList[i].name; - QString d = SystemInfosList[i].def; - LOG_INFO() << "GET:" << s << systemInfos->value(s, d).toString(); - return systemInfos->value(s, d); + LOG_INFO() << "GET:" << s << systemInfos->value(s).toString(); + return systemInfos->value(s); } QVariant SystemInfo::platformValue(enum PlatformInfo info, QString platform) diff --git a/rbutil/rbutilqt/base/systeminfo.h b/rbutil/rbutilqt/base/systeminfo.h index b5380f1af5..52b50ec4d7 100644 --- a/rbutil/rbutilqt/base/systeminfo.h +++ b/rbutil/rbutilqt/base/systeminfo.h @@ -60,18 +60,18 @@ class SystemInfo : public QObject }; enum PlatformInfo { - CurPlatformName, - CurManual, - CurBootloaderMethod, - CurBootloaderName, - CurBootloaderFile, - CurBootloaderFilter, - CurEncoder, - CurBrand, - CurName, - CurBuildserverModel, - CurConfigureModel, - CurPlayerPicture, + PlatformName, + Manual, + BootloaderMethod, + BootloaderName, + BootloaderFile, + BootloaderFilter, + Encoder, + Brand, + Name, + BuildserverModel, + ConfigureModel, + PlayerPicture, }; enum PlatformType { diff --git a/rbutil/rbutilqt/base/talkgenerator.cpp b/rbutil/rbutilqt/base/talkgenerator.cpp index ee57686037..951bf0e804 100644 --- a/rbutil/rbutilqt/base/talkgenerator.cpp +++ b/rbutil/rbutilqt/base/talkgenerator.cpp @@ -57,7 +57,7 @@ TalkGenerator::Status TalkGenerator::process(QList* list,int wavtrimt // Encoder emit logItem(tr("Starting Encoder Engine"),LOGINFO); m_enc = EncoderBase::getEncoder( - this, SystemInfo::platformValue(SystemInfo::CurEncoder).toString()); + this, SystemInfo::platformValue(SystemInfo::Encoder).toString()); if(!m_enc->start()) { emit logItem(tr("Init of Encoder engine failed"),LOGERROR); diff --git a/rbutil/rbutilqt/base/utils.cpp b/rbutil/rbutilqt/base/utils.cpp index a3a3e98fcc..60b55068e1 100644 --- a/rbutil/rbutilqt/base/utils.cpp +++ b/rbutil/rbutilqt/base/utils.cpp @@ -381,12 +381,12 @@ QString Utils::checkEnvironment(bool permission) RockboxInfo rbinfo(RbSettings::value(RbSettings::Mountpoint).toString()); QString installed = rbinfo.target(); if(!installed.isEmpty() && installed != - SystemInfo::platformValue(SystemInfo::CurConfigureModel).toString()) + SystemInfo::platformValue(SystemInfo::ConfigureModel).toString()) { text += tr("
  • Target mismatch detected.
    " "Installed target: %1
    Selected target: %2.
    • ") - .arg(SystemInfo::platformValue(SystemInfo::CurPlatformName, installed).toString(), - SystemInfo::platformValue(SystemInfo::CurPlatformName).toString()); + .arg(SystemInfo::platformValue(SystemInfo::PlatformName, installed).toString(), + SystemInfo::platformValue(SystemInfo::PlatformName).toString()); } if(!text.isEmpty()) diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp index 182001e3b8..d18f438801 100644 --- a/rbutil/rbutilqt/configure.cpp +++ b/rbutil/rbutilqt/configure.cpp @@ -356,7 +356,7 @@ void Config::setDevices() for(int it = 0; it < platformList.size(); it++) { QString curbrand = SystemInfo::platformValue( - SystemInfo::CurBrand, platformList.at(it)).toString(); + SystemInfo::Brand, platformList.at(it)).toString(); manuf.insert(curbrand, platformList.at(it)); } @@ -385,7 +385,7 @@ void Config::setDevices() continue; // construct display name QString curname = SystemInfo::platformValue( - SystemInfo::CurName, platformList.at(it)).toString() + + SystemInfo::Name, platformList.at(it)).toString() + " (" +ServerInfo::platformValue( ServerInfo::CurStatus, platformList.at(it)).toString() +")"; LOG_INFO() << "add supported device:" << brands.at(c) << curname; @@ -472,9 +472,9 @@ void Config::updateEncState() QString devname = ui.treeDevices->selectedItems().at(0)->data(0, Qt::UserRole).toString(); QString encoder = SystemInfo::platformValue( - SystemInfo::CurEncoder, devname).toString(); + SystemInfo::Encoder, devname).toString(); ui.encoderName->setText(EncoderBase::getEncoderName(SystemInfo::platformValue( - SystemInfo::CurEncoder, devname).toString())); + SystemInfo::Encoder, devname).toString())); EncoderBase* enc = EncoderBase::getEncoder(this,encoder); @@ -743,7 +743,7 @@ void Config::autodetect() } msg += QString("
  • %1
    • ").arg(tr("%1 at %2").arg( SystemInfo::platformValue( - SystemInfo::CurPlatformName, detected.at(i).device).toString(), + SystemInfo::PlatformName, detected.at(i).device).toString(), QDir::toNativeSeparators(mp))); } msg += ""; @@ -769,21 +769,21 @@ void Config::autodetect() msg += tr("Detected an unsupported player:\n%1\n" "Sorry, Rockbox doesn't run on your player.") .arg(SystemInfo::platformValue( - SystemInfo::CurName, detected.at(0).device).toString()); + SystemInfo::Name, detected.at(0).device).toString()); break; case Autodetection::PlayerMtpMode: msg = tr("%1 in MTP mode found!\n" "You need to change your player to MSC mode for installation. ") .arg(SystemInfo::platformValue( - SystemInfo::CurName, detected.at(0).device).toString()); + SystemInfo::Name, detected.at(0).device).toString()); break; case Autodetection::PlayerWrongFilesystem: if(SystemInfo::platformValue( - SystemInfo::CurBootloaderMethod, detected.at(0).device) == "ipod") { + SystemInfo::BootloaderMethod, detected.at(0).device) == "ipod") { msg = tr("%1 \"MacPod\" found!\n" "Rockbox needs a FAT formatted Ipod (so-called \"WinPod\") " "to run. ").arg(SystemInfo::platformValue( - SystemInfo::CurName, detected.at(0).device).toString()); + SystemInfo::Name, detected.at(0).device).toString()); } else { msg = tr("The player contains an incompatible filesystem.\n" @@ -963,9 +963,9 @@ void Config::configEnc() QString devname = ui.treeDevices->selectedItems().at(0)->data(0, Qt::UserRole).toString(); QString encoder = SystemInfo::platformValue( - SystemInfo::CurEncoder, devname).toString(); + SystemInfo::Encoder, devname).toString(); ui.encoderName->setText(EncoderBase::getEncoderName(SystemInfo::platformValue( - SystemInfo::CurEncoder, devname).toString())); + SystemInfo::Encoder, devname).toString())); EncoderBase* enc = EncoderBase::getEncoder(this,encoder); diff --git a/rbutil/rbutilqt/gui/manualwidget.cpp b/rbutil/rbutilqt/gui/manualwidget.cpp index 23adc3cf46..063facf3a1 100644 --- a/rbutil/rbutilqt/gui/manualwidget.cpp +++ b/rbutil/rbutilqt/gui/manualwidget.cpp @@ -65,9 +65,9 @@ void ManualWidget::downloadManual(void) QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) { return; } - QString manual = SystemInfo::platformValue(SystemInfo::CurManual).toString(); + QString manual = SystemInfo::platformValue(SystemInfo::Manual).toString(); if(manual.isEmpty()) { - manual = "rockbox-" + SystemInfo::platformValue(SystemInfo::CurBuildserverModel).toString(); + manual = "rockbox-" + SystemInfo::platformValue(SystemInfo::BuildserverModel).toString(); } ProgressLoggerGui* logger = new ProgressLoggerGui(this); diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp index 5baf774fc3..065a139436 100644 --- a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp +++ b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp @@ -82,7 +82,7 @@ void SelectiveInstallWidget::updateVersion(void) m_mountpoint = RbSettings::value(RbSettings::Mountpoint).toString(); m_target = RbSettings::value(RbSettings::CurrentPlatform).toString(); m_blmethod = SystemInfo::platformValue( - SystemInfo::CurBootloaderMethod, m_target).toString(); + SystemInfo::BootloaderMethod, m_target).toString(); if(m_logger != NULL) { delete m_logger; @@ -237,7 +237,7 @@ void SelectiveInstallWidget::installBootloader(void) // create installer BootloaderInstallBase *bl = BootloaderInstallHelper::createBootloaderInstaller(this, - SystemInfo::platformValue(SystemInfo::CurBootloaderMethod).toString()); + SystemInfo::platformValue(SystemInfo::BootloaderMethod).toString()); if(bl == NULL) { m_logger->addItem(tr("No install method known."), LOGERROR); m_logger->setFinished(); @@ -254,7 +254,7 @@ void SelectiveInstallWidget::installBootloader(void) connect(m_logger, SIGNAL(aborted()), bl, SLOT(progressAborted())); // set bootloader filename. Do this now as installed() needs it. - QStringList blfile = SystemInfo::platformValue(SystemInfo::CurBootloaderFile).toStringList(); + QStringList blfile = SystemInfo::platformValue(SystemInfo::BootloaderFile).toStringList(); QStringList blfilepath; for(int a = 0; a < blfile.size(); a++) { blfilepath.append(RbSettings::value(RbSettings::Mountpoint).toString() @@ -262,7 +262,7 @@ void SelectiveInstallWidget::installBootloader(void) } bl->setBlFile(blfilepath); QUrl url(SystemInfo::value(SystemInfo::BootloaderUrl).toString() - + SystemInfo::platformValue(SystemInfo::CurBootloaderName).toString()); + + SystemInfo::platformValue(SystemInfo::BootloaderName).toString()); bl->setBlUrl(url); bl->setLogfile(RbSettings::value(RbSettings::Mountpoint).toString() + "/.rockbox/rbutil.log"); @@ -282,7 +282,7 @@ void SelectiveInstallWidget::installBootloader(void) else if(bl->installed() == BootloaderInstallBase::BootloaderOther && bl->capabilities() & BootloaderInstallBase::Backup) { - QString targetFolder = SystemInfo::platformValue(SystemInfo::CurPlatformName).toString() + QString targetFolder = SystemInfo::platformValue(SystemInfo::PlatformName).toString() + " Firmware Backup"; // remove invalid character(s) targetFolder.remove(QRegExp("[:/]")); @@ -319,7 +319,7 @@ void SelectiveInstallWidget::installBootloader(void) // open dialog to browse to of file QString offile; QString filter - = SystemInfo::platformValue(SystemInfo::CurBootloaderFilter).toString(); + = SystemInfo::platformValue(SystemInfo::BootloaderFilter).toString(); if(!filter.isEmpty()) { filter = tr("Bootloader files (%1)").arg(filter) + ";;"; } diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 6f8bfb37af..ae28ee4e70 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp @@ -390,11 +390,11 @@ void RbUtilQt::updateDevice() /* Enable bootloader installation, if possible */ bool bootloaderInstallable = - SystemInfo::platformValue(SystemInfo::CurBootloaderMethod) != "none"; + SystemInfo::platformValue(SystemInfo::BootloaderMethod) != "none"; /* Enable bootloader uninstallation, if possible */ bool bootloaderUninstallable = bootloaderInstallable && - SystemInfo::platformValue(SystemInfo::CurBootloaderMethod) != "fwpatcher"; + SystemInfo::platformValue(SystemInfo::BootloaderMethod) != "fwpatcher"; ui.labelRemoveBootloader->setEnabled(bootloaderUninstallable); ui.buttonRemoveBootloader->setEnabled(bootloaderUninstallable); ui.actionRemove_bootloader->setEnabled(bootloaderUninstallable); @@ -405,9 +405,9 @@ void RbUtilQt::updateDevice() ui.menuA_ctions->setEnabled(configurationValid); // displayed device info - QString brand = SystemInfo::platformValue(SystemInfo::CurBrand).toString(); + QString brand = SystemInfo::platformValue(SystemInfo::Brand).toString(); QString name - = QString("%1 (%2)").arg(SystemInfo::platformValue(SystemInfo::CurName).toString(), + = QString("%1 (%2)").arg(SystemInfo::platformValue(SystemInfo::Name).toString(), ServerInfo::platformValue(ServerInfo::CurStatus).toString()); ui.labelDevice->setText(QString("%1 %2").arg(brand, name)); @@ -423,7 +423,7 @@ void RbUtilQt::updateDevice() } QPixmap pm; - QString m = SystemInfo::platformValue(SystemInfo::CurPlayerPicture).toString(); + QString m = SystemInfo::platformValue(SystemInfo::PlayerPicture).toString(); pm.load(":/icons/players/" + m + "-small.png"); pm = pm.scaledToHeight(QFontMetrics(QApplication::font()).height() * 3); ui.labelPlayerPic->setPixmap(pm); @@ -491,7 +491,7 @@ void RbUtilQt::installVoice() QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) return; - QString model = SystemInfo::platformValue(SystemInfo::CurBuildserverModel).toString(); + QString model = SystemInfo::platformValue(SystemInfo::BuildserverModel).toString(); // replace placeholder in voice url voiceurl.replace("%MODEL%", model); voiceurl.replace("%RELVERSION%", relversion); @@ -560,14 +560,14 @@ void RbUtilQt::uninstallBootloader(void) // create installer BootloaderInstallBase *bl = BootloaderInstallHelper::createBootloaderInstaller(this, - SystemInfo::platformValue(SystemInfo::CurBootloaderMethod).toString()); + SystemInfo::platformValue(SystemInfo::BootloaderMethod).toString()); if(bl == NULL) { logger->addItem(tr("No uninstall method for this target known."), LOGERROR); logger->setFinished(); return; } - QStringList blfile = SystemInfo::platformValue(SystemInfo::CurBootloaderFile).toStringList(); + QStringList blfile = SystemInfo::platformValue(SystemInfo::BootloaderFile).toStringList(); QStringList blfilepath; for(int a = 0; a < blfile.size(); a++) { blfilepath.append(RbSettings::value(RbSettings::Mountpoint).toString() diff --git a/rbutil/rbutilqt/themesinstallwindow.cpp b/rbutil/rbutilqt/themesinstallwindow.cpp index 1377607438..6ad7c9bcae 100644 --- a/rbutil/rbutilqt/themesinstallwindow.cpp +++ b/rbutil/rbutilqt/themesinstallwindow.cpp @@ -86,7 +86,7 @@ void ThemesInstallWindow::downloadInfo() QString infoUrl = SystemInfo::value(SystemInfo::ThemesInfoUrl).toString(); infoUrl.replace("%TARGET%", - SystemInfo::platformValue(SystemInfo::CurConfigureModel).toString()); + SystemInfo::platformValue(SystemInfo::ConfigureModel).toString()); infoUrl.replace("%REVISION%", installInfo.revision()); infoUrl.replace("%RELEASE%", installInfo.release()); infoUrl.replace("%RBUTILVER%", VERSION); -- cgit v1.2.3