Preparation for 2.2.0.

This commit is contained in:
Martin Rotter 2015-02-09 15:47:06 +01:00
parent 867124ffd8
commit b2ae361173
3 changed files with 1 additions and 17 deletions

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<releases> <releases>
<release version="2.1.0" type="feature"> <release version="2.1.0">
<url platform="x86" os="Windows">https://bitbucket.org/skunkos/rssguard/downloads/rssguard-2.1.0-win32.exe</url> <url platform="x86" os="Windows">https://bitbucket.org/skunkos/rssguard/downloads/rssguard-2.1.0-win32.exe</url>
</release> </release>
</releases> </releases>

View File

@ -224,7 +224,6 @@ UpdateInfo SystemFactory::parseUpdatesFile(const QByteArray &updates_file, const
if (releases.size() == 1) { if (releases.size() == 1) {
QDomElement rel_elem = releases.at(0).toElement(); QDomElement rel_elem = releases.at(0).toElement();
QString type = rel_elem.attributes().namedItem("type").toAttr().value();
update.m_availableVersion = rel_elem.attributes().namedItem("version").toAttr().value(); update.m_availableVersion = rel_elem.attributes().namedItem("version").toAttr().value();
update.m_changes = changelog; update.m_changes = changelog;
@ -242,13 +241,6 @@ UpdateInfo SystemFactory::parseUpdatesFile(const QByteArray &updates_file, const
update.m_urls.insert(url.m_os, update.m_urls.insert(url.m_os,
url); url);
} }
if (type == "maintenance") {
update.m_type = UpdateInfo::Maintenance;
}
else {
update.m_type = UpdateInfo::Evolution;
}
} }
else { else {
update.m_availableVersion = QString(); update.m_availableVersion = QString();

View File

@ -36,19 +36,11 @@ class UpdateUrl {
class UpdateInfo { class UpdateInfo {
public: public:
enum UpdateType {
// Corresponding enum to "maintenace" from UPDATES file.
Maintenance,
// Corresponding enum to "evolution" from UPDATES file.
Evolution
};
explicit UpdateInfo() : m_availableVersion(QString()), m_changes(QString()) { explicit UpdateInfo() : m_availableVersion(QString()), m_changes(QString()) {
} }
QString m_availableVersion; QString m_availableVersion;
QString m_changes; QString m_changes;
UpdateType m_type;
QHash<QString, UpdateUrl> m_urls; QHash<QString, UpdateUrl> m_urls;
}; };