diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-02-19 12:06:44 +0100 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-02-19 14:12:22 +0100 |
| commit | a56f4425c6095073bb4e3c9f3970fd3a68b73f4c (patch) | |
| tree | 892384a957c6c411fbba0960e20452c7f9bc9961 | |
| parent | f81100efd2b0f0281e8c78f195720ad8fa61dde1 (diff) | |
| download | rockbox-a56f4425c6095073bb4e3c9f3970fd3a68b73f4c.tar.gz rockbox-a56f4425c6095073bb4e3c9f3970fd3a68b73f4c.zip | |
Allow overriding filename for rockbox-info.txt.
This allows testing the class by using temporary files without the need of
constructing a special path.
Change-Id: Id5ccd37f05219f246b9bf9f8a26ec81342654f89
| -rw-r--r-- | rbutil/rbutilqt/base/rockboxinfo.cpp | 6 | ||||
| -rw-r--r-- | rbutil/rbutilqt/base/rockboxinfo.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/rbutil/rbutilqt/base/rockboxinfo.cpp b/rbutil/rbutilqt/base/rockboxinfo.cpp index b595bbea8a..2f56a291c5 100644 --- a/rbutil/rbutilqt/base/rockboxinfo.cpp +++ b/rbutil/rbutilqt/base/rockboxinfo.cpp | |||
| @@ -21,10 +21,10 @@ | |||
| 21 | #include <QtCore> | 21 | #include <QtCore> |
| 22 | #include <QDebug> | 22 | #include <QDebug> |
| 23 | 23 | ||
| 24 | RockboxInfo::RockboxInfo(QString mountpoint) | 24 | RockboxInfo::RockboxInfo(QString mountpoint, QString fname) |
| 25 | { | 25 | { |
| 26 | qDebug() << "[RockboxInfo] trying to find rockbox-info at" << mountpoint; | 26 | qDebug() << "[RockboxInfo] Getting version info from rockbox-info.txt"; |
| 27 | QFile file(mountpoint + "/.rockbox/rockbox-info.txt"); | 27 | QFile file(mountpoint + "/" + fname); |
| 28 | m_success = false; | 28 | m_success = false; |
| 29 | if(!file.exists()) | 29 | if(!file.exists()) |
| 30 | return; | 30 | return; |
diff --git a/rbutil/rbutilqt/base/rockboxinfo.h b/rbutil/rbutilqt/base/rockboxinfo.h index 6a22163ddf..9ea6e2011f 100644 --- a/rbutil/rbutilqt/base/rockboxinfo.h +++ b/rbutil/rbutilqt/base/rockboxinfo.h | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | class RockboxInfo | 27 | class RockboxInfo |
| 28 | { | 28 | { |
| 29 | public: | 29 | public: |
| 30 | RockboxInfo(QString mountpoint); | 30 | RockboxInfo(QString mountpoint, QString fname = "/.rockbox/rockbox-info.txt"); |
| 31 | 31 | ||
| 32 | QString version() {return m_version;} | 32 | QString version() {return m_version;} |
| 33 | QString features(){return m_features;} | 33 | QString features(){return m_features;} |