From 77f490a853954a868df0b8478670740e477687a3 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Fri, 5 Sep 2014 07:11:02 +0200 Subject: [PATCH] Moved to version 2.0.0.1. --- CMakeLists.txt | 4 ++-- resources/text/CHANGELOG | 17 +++++++++++++++++ src/core/feedsmodelrootitem.cpp | 4 ++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 97635846d..d067d4119 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,8 +71,8 @@ project(rssguard) set(APP_NAME "RSS Guard") set(APP_LOW_NAME "rssguard") -set(APP_VERSION "2.0.0.0") -set(FILE_VERSION "0,0,0,0") +set(APP_VERSION "2.0.0.1") +set(FILE_VERSION "2,0,0,1") set(APP_AUTHOR "Martin Rotter") set(APP_URL "http://bitbucket.org/skunkos/rssguard") set(APP_URL_ISSUES "http://bitbucket.org/skunkos/rssguard/issues") diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG index 376a23d1e..c87286aaa 100644 --- a/resources/text/CHANGELOG +++ b/resources/text/CHANGELOG @@ -1,4 +1,21 @@ +

2.0.0.1

+ +Fixed: + + +Added: + + +Changed: + + + +

2.0.0.0

Fixed: diff --git a/src/core/feedsmodelrootitem.cpp b/src/core/feedsmodelrootitem.cpp index a41ee819c..6189e2922 100755 --- a/src/core/feedsmodelrootitem.cpp +++ b/src/core/feedsmodelrootitem.cpp @@ -83,8 +83,8 @@ bool FeedsModelRootItem::removeChild(FeedsModelRootItem *child) { FeedsModelRootItem *FeedsModelRootItem::child(FeedsModelRootItem::Kind kind_of_child, const QString &identifier) { foreach (FeedsModelRootItem *child, childItems()) { if (child->kind() == kind_of_child) { - if (kind_of_child == Category && static_cast(child)->title() == identifier || - kind_of_child == Feed && static_cast(child)->url() == identifier) { + if ((kind_of_child == Category && static_cast(child)->title() == identifier) || + (kind_of_child == Feed && static_cast(child)->url() == identifier)) { return child; } }