From 8c55ce62b9e65533619870d1e5b72612a1a16406 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sat, 16 Apr 2022 14:13:59 +0200 Subject: rbutil: Move bootloader file check to base class. Avoid constructing the bootloader file path in the caller. Pass filename list and mountpoint separately so it can directly fall back to the mountpoint. Change some functions to use references instead of creating temporary objects. Change-Id: I09c9d755553a32de3d02a42a8ce1fcb94f831b2a --- utils/rbutilqt/rbutilqt.cpp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'utils/rbutilqt/rbutilqt.cpp') diff --git a/utils/rbutilqt/rbutilqt.cpp b/utils/rbutilqt/rbutilqt.cpp index f3b12c63af..f5872f268e 100644 --- a/utils/rbutilqt/rbutilqt.cpp +++ b/utils/rbutilqt/rbutilqt.cpp @@ -507,18 +507,9 @@ void RbUtilQt::uninstallBootloader(void) logger->setFinished(); return; } - QStringList blfile = PlayerBuildInfo::instance()->value(PlayerBuildInfo::BootloaderFile).toStringList(); - QStringList blfilepath; - for(int a = 0; a < blfile.size(); a++) { - blfilepath.append(RbSettings::value(RbSettings::Mountpoint).toString() - + blfile.at(a)); - } - // on devices without a bootloader file we use the mointpoint. The - // installer will use that to determine the correct device. - if(blfile.isEmpty()) { - blfilepath.append(RbSettings::value(RbSettings::Mountpoint).toString()); - } - bl->setBlFile(blfilepath); + QStringList blfile = PlayerBuildInfo::instance()->value( + PlayerBuildInfo::BootloaderFile).toStringList(); + bl->setBlFile(RbSettings::value(RbSettings::Mountpoint).toString(), blfile); bl->setLogfile(RbSettings::value(RbSettings::Mountpoint).toString() + "/.rockbox/rbutil.log"); -- cgit v1.2.3