diff options
Diffstat (limited to 'rbutil/rbutilqt/base')
-rw-r--r-- | rbutil/rbutilqt/base/rockboxinfo.cpp | 9 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/rockboxinfo.h | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/rbutil/rbutilqt/base/rockboxinfo.cpp b/rbutil/rbutilqt/base/rockboxinfo.cpp index f85c23b669..6bfffc1b23 100644 --- a/rbutil/rbutilqt/base/rockboxinfo.cpp +++ b/rbutil/rbutilqt/base/rockboxinfo.cpp | |||
@@ -41,6 +41,15 @@ RockboxInfo::RockboxInfo(QString mountpoint) | |||
41 | if(line.contains("Version:")) | 41 | if(line.contains("Version:")) |
42 | { | 42 | { |
43 | m_version = line.remove("Version:").trimmed(); | 43 | m_version = line.remove("Version:").trimmed(); |
44 | if(m_version.startsWith("r")) { | ||
45 | m_revision = m_version; | ||
46 | m_revision.remove("r").replace(QRegExp("-.+$"), ""); | ||
47 | m_release = ""; | ||
48 | } | ||
49 | else { | ||
50 | m_release = m_version; | ||
51 | m_revision = ""; | ||
52 | } | ||
44 | } | 53 | } |
45 | else if(line.contains("Target: ")) | 54 | else if(line.contains("Target: ")) |
46 | { | 55 | { |
diff --git a/rbutil/rbutilqt/base/rockboxinfo.h b/rbutil/rbutilqt/base/rockboxinfo.h index 4d704f8f72..906da635a9 100644 --- a/rbutil/rbutilqt/base/rockboxinfo.h +++ b/rbutil/rbutilqt/base/rockboxinfo.h | |||
@@ -36,8 +36,12 @@ public: | |||
36 | QString target() {return m_target;} | 36 | QString target() {return m_target;} |
37 | int ram() { return m_ram; } | 37 | int ram() { return m_ram; } |
38 | bool success() { return m_success; } | 38 | bool success() { return m_success; } |
39 | QString revision(void) { return m_revision; } | ||
40 | QString release(void) { return m_release; } | ||
39 | private: | 41 | private: |
40 | QString m_version; | 42 | QString m_version; |
43 | QString m_revision; | ||
44 | QString m_release; | ||
41 | QString m_features; | 45 | QString m_features; |
42 | QString m_targetid; | 46 | QString m_targetid; |
43 | QString m_target; | 47 | QString m_target; |