summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt/themesinstallwindow.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt/themesinstallwindow.cpp')
-rw-r--r--rbutil/rbutilqt/themesinstallwindow.cpp14
1 files changed, 2 insertions, 12 deletions
diff --git a/rbutil/rbutilqt/themesinstallwindow.cpp b/rbutil/rbutilqt/themesinstallwindow.cpp
index 935c703193..cb06b47b1f 100644
--- a/rbutil/rbutilqt/themesinstallwindow.cpp
+++ b/rbutil/rbutilqt/themesinstallwindow.cpp
@@ -62,16 +62,6 @@ void ThemesInstallWindow::downloadInfo()
getter = new HttpGet(this);
RockboxInfo installInfo
= RockboxInfo(RbSettings::value(RbSettings::Mountpoint).toString());
- QString revision;
- QString release;
- // installInfo.version() holds either the revision (as r<revision>-<date>)
- // or the release version number.
- if(installInfo.version().startsWith("r")) {
- revision = installInfo.version().remove("r").replace(QRegExp("-.+$"), "");
- }
- else {
- release = installInfo.version();
- }
themesInfo.open();
qDebug() << "[Themes] downloading info to" << themesInfo.fileName();
@@ -80,8 +70,8 @@ void ThemesInstallWindow::downloadInfo()
QString infoUrl = SystemInfo::value(SystemInfo::ThemesInfoUrl).toString();
infoUrl.replace("%TARGET%",
SystemInfo::value(SystemInfo::CurConfigureModel).toString());
- infoUrl.replace("%REVISION%", revision);
- infoUrl.replace("%RELEASE%", release);
+ infoUrl.replace("%REVISION%", installInfo.revision());
+ infoUrl.replace("%RELEASE%", installInfo.release());
infoUrl.replace("%RBUTILVER%", VERSION);
QUrl url = QUrl(infoUrl);
qDebug() << "[Themes] Info URL:" << url << "Query:" << url.queryItems();