From b2ae3611731da37562869172495c03eb8e18c643 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 9 Feb 2015 15:47:06 +0100 Subject: [PATCH] Preparation for 2.2.0. --- resources/text/UPDATES | 2 +- src/miscellaneous/systemfactory.cpp | 8 -------- src/miscellaneous/systemfactory.h | 8 -------- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/resources/text/UPDATES b/resources/text/UPDATES index cf25011d1..ec4a8745c 100644 --- a/resources/text/UPDATES +++ b/resources/text/UPDATES @@ -1,6 +1,6 @@ - + https://bitbucket.org/skunkos/rssguard/downloads/rssguard-2.1.0-win32.exe \ No newline at end of file diff --git a/src/miscellaneous/systemfactory.cpp b/src/miscellaneous/systemfactory.cpp index adc241a32..23f75fc2b 100755 --- a/src/miscellaneous/systemfactory.cpp +++ b/src/miscellaneous/systemfactory.cpp @@ -224,7 +224,6 @@ UpdateInfo SystemFactory::parseUpdatesFile(const QByteArray &updates_file, const if (releases.size() == 1) { 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_changes = changelog; @@ -242,13 +241,6 @@ UpdateInfo SystemFactory::parseUpdatesFile(const QByteArray &updates_file, const update.m_urls.insert(url.m_os, url); } - - if (type == "maintenance") { - update.m_type = UpdateInfo::Maintenance; - } - else { - update.m_type = UpdateInfo::Evolution; - } } else { update.m_availableVersion = QString(); diff --git a/src/miscellaneous/systemfactory.h b/src/miscellaneous/systemfactory.h index f24341033..efbc88d29 100644 --- a/src/miscellaneous/systemfactory.h +++ b/src/miscellaneous/systemfactory.h @@ -36,19 +36,11 @@ class UpdateUrl { class UpdateInfo { 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()) { } QString m_availableVersion; QString m_changes; - UpdateType m_type; QHash m_urls; };