diff options
Diffstat (limited to 'rbutil/rbutilqt/gui/selectiveinstallwidget.cpp')
-rw-r--r-- | rbutil/rbutilqt/gui/selectiveinstallwidget.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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) | |||
82 | m_mountpoint = RbSettings::value(RbSettings::Mountpoint).toString(); | 82 | m_mountpoint = RbSettings::value(RbSettings::Mountpoint).toString(); |
83 | m_target = RbSettings::value(RbSettings::CurrentPlatform).toString(); | 83 | m_target = RbSettings::value(RbSettings::CurrentPlatform).toString(); |
84 | m_blmethod = SystemInfo::platformValue( | 84 | m_blmethod = SystemInfo::platformValue( |
85 | SystemInfo::CurBootloaderMethod, m_target).toString(); | 85 | SystemInfo::BootloaderMethod, m_target).toString(); |
86 | 86 | ||
87 | if(m_logger != NULL) { | 87 | if(m_logger != NULL) { |
88 | delete m_logger; | 88 | delete m_logger; |
@@ -237,7 +237,7 @@ void SelectiveInstallWidget::installBootloader(void) | |||
237 | // create installer | 237 | // create installer |
238 | BootloaderInstallBase *bl = | 238 | BootloaderInstallBase *bl = |
239 | BootloaderInstallHelper::createBootloaderInstaller(this, | 239 | BootloaderInstallHelper::createBootloaderInstaller(this, |
240 | SystemInfo::platformValue(SystemInfo::CurBootloaderMethod).toString()); | 240 | SystemInfo::platformValue(SystemInfo::BootloaderMethod).toString()); |
241 | if(bl == NULL) { | 241 | if(bl == NULL) { |
242 | m_logger->addItem(tr("No install method known."), LOGERROR); | 242 | m_logger->addItem(tr("No install method known."), LOGERROR); |
243 | m_logger->setFinished(); | 243 | m_logger->setFinished(); |
@@ -254,7 +254,7 @@ void SelectiveInstallWidget::installBootloader(void) | |||
254 | connect(m_logger, SIGNAL(aborted()), bl, SLOT(progressAborted())); | 254 | connect(m_logger, SIGNAL(aborted()), bl, SLOT(progressAborted())); |
255 | 255 | ||
256 | // set bootloader filename. Do this now as installed() needs it. | 256 | // set bootloader filename. Do this now as installed() needs it. |
257 | QStringList blfile = SystemInfo::platformValue(SystemInfo::CurBootloaderFile).toStringList(); | 257 | QStringList blfile = SystemInfo::platformValue(SystemInfo::BootloaderFile).toStringList(); |
258 | QStringList blfilepath; | 258 | QStringList blfilepath; |
259 | for(int a = 0; a < blfile.size(); a++) { | 259 | for(int a = 0; a < blfile.size(); a++) { |
260 | blfilepath.append(RbSettings::value(RbSettings::Mountpoint).toString() | 260 | blfilepath.append(RbSettings::value(RbSettings::Mountpoint).toString() |
@@ -262,7 +262,7 @@ void SelectiveInstallWidget::installBootloader(void) | |||
262 | } | 262 | } |
263 | bl->setBlFile(blfilepath); | 263 | bl->setBlFile(blfilepath); |
264 | QUrl url(SystemInfo::value(SystemInfo::BootloaderUrl).toString() | 264 | QUrl url(SystemInfo::value(SystemInfo::BootloaderUrl).toString() |
265 | + SystemInfo::platformValue(SystemInfo::CurBootloaderName).toString()); | 265 | + SystemInfo::platformValue(SystemInfo::BootloaderName).toString()); |
266 | bl->setBlUrl(url); | 266 | bl->setBlUrl(url); |
267 | bl->setLogfile(RbSettings::value(RbSettings::Mountpoint).toString() | 267 | bl->setLogfile(RbSettings::value(RbSettings::Mountpoint).toString() |
268 | + "/.rockbox/rbutil.log"); | 268 | + "/.rockbox/rbutil.log"); |
@@ -282,7 +282,7 @@ void SelectiveInstallWidget::installBootloader(void) | |||
282 | else if(bl->installed() == BootloaderInstallBase::BootloaderOther | 282 | else if(bl->installed() == BootloaderInstallBase::BootloaderOther |
283 | && bl->capabilities() & BootloaderInstallBase::Backup) | 283 | && bl->capabilities() & BootloaderInstallBase::Backup) |
284 | { | 284 | { |
285 | QString targetFolder = SystemInfo::platformValue(SystemInfo::CurPlatformName).toString() | 285 | QString targetFolder = SystemInfo::platformValue(SystemInfo::PlatformName).toString() |
286 | + " Firmware Backup"; | 286 | + " Firmware Backup"; |
287 | // remove invalid character(s) | 287 | // remove invalid character(s) |
288 | targetFolder.remove(QRegExp("[:/]")); | 288 | targetFolder.remove(QRegExp("[:/]")); |
@@ -319,7 +319,7 @@ void SelectiveInstallWidget::installBootloader(void) | |||
319 | // open dialog to browse to of file | 319 | // open dialog to browse to of file |
320 | QString offile; | 320 | QString offile; |
321 | QString filter | 321 | QString filter |
322 | = SystemInfo::platformValue(SystemInfo::CurBootloaderFilter).toString(); | 322 | = SystemInfo::platformValue(SystemInfo::BootloaderFilter).toString(); |
323 | if(!filter.isEmpty()) { | 323 | if(!filter.isEmpty()) { |
324 | filter = tr("Bootloader files (%1)").arg(filter) + ";;"; | 324 | filter = tr("Bootloader files (%1)").arg(filter) + ";;"; |
325 | } | 325 | } |