From 6c73482d0058804979c511616ad95d643a5143c2 Mon Sep 17 00:00:00 2001 From: Dominik Wenger Date: Sat, 21 Mar 2009 16:30:40 +0000 Subject: rbutil: create a RockboxInfo class so all rockbox-info.txt handling is in one place. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20429 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/rbutilqt/base/detect.cpp | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-) (limited to 'rbutil/rbutilqt/base/detect.cpp') diff --git a/rbutil/rbutilqt/base/detect.cpp b/rbutil/rbutilqt/base/detect.cpp index 1792febc0f..c30a03ba2e 100644 --- a/rbutil/rbutilqt/base/detect.cpp +++ b/rbutil/rbutilqt/base/detect.cpp @@ -58,6 +58,7 @@ #include #endif +#include "utils.h" /** @brief detect permission of user (only Windows at moment). * @return enum userlevel. @@ -352,23 +353,13 @@ QUrl Detect::systemProxy(void) */ QString Detect::installedVersion(QString mountpoint) { - // read rockbox-info.txt - QFile info(mountpoint +"/.rockbox/rockbox-info.txt"); - if(!info.open(QIODevice::ReadOnly)) + RockboxInfo info(mountpoint); + if(!info.open()) { return ""; } - while (!info.atEnd()) { - QString line = info.readLine(); - - if(line.contains("Version:")) - { - return line.remove("Version:").trimmed(); - } - } - info.close(); - return ""; + return info.version(); } @@ -377,24 +368,13 @@ QString Detect::installedVersion(QString mountpoint) */ QString Detect::installedTarget(QString mountpoint) { - // read rockbox-info.txt - QFile info(mountpoint +"/.rockbox/rockbox-info.txt"); - if(!info.open(QIODevice::ReadOnly)) + RockboxInfo info(mountpoint); + if(!info.open()) { return ""; } - while (!info.atEnd()) - { - QString line = info.readLine(); - if(line.contains("Target:")) - { - qDebug() << line; - return line.remove("Target:").trimmed(); - } - } - info.close(); - return ""; + return info.target(); } -- cgit v1.2.3