From ef531742558a41df12f0ea85e241d690ffe6ccf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Sun, 15 Jun 2014 20:58:38 +0200 Subject: [PATCH] fixed DBHelper::getSortedComicsFromParent --- YACReaderLibrary/db_helper.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/YACReaderLibrary/db_helper.cpp b/YACReaderLibrary/db_helper.cpp index b35e9612..2ae1dc45 100644 --- a/YACReaderLibrary/db_helper.cpp +++ b/YACReaderLibrary/db_helper.cpp @@ -407,7 +407,7 @@ QList DBHelper::getSortedComicsFromParent(qulonglong parentId, QSqlData currentItem.info = DBHelper::loadComicInfo(record.value(4).toString(),db); int lessThan = 0; if(list.isEmpty()) - list.append(currentItem); + list.append(currentItem); else { ComicDB last = static_cast(list.back()); @@ -418,10 +418,10 @@ QList DBHelper::getSortedComicsFromParent(qulonglong parentId, QSqlData int max = (std::numeric_limits::max)(); numberLast = numberCurrent = max; //TODO change by std limit - if(last.info.number!=NULL) + if(!last.info.number.isNull()) numberLast = last.info.number.toInt(); - if(currentItem.info.number!=NULL) + if(!currentItem.info.number.isNull()) numberCurrent = currentItem.info.number.toInt(); QList::iterator i; @@ -435,7 +435,7 @@ QList DBHelper::getSortedComicsFromParent(qulonglong parentId, QSqlData i--; numberLast = max; - if((*i).info.number != NULL) + if(!(*i).info.number.isNull()) numberLast = (*i).info.number.toInt(); } } @@ -444,10 +444,10 @@ QList DBHelper::getSortedComicsFromParent(qulonglong parentId, QSqlData while ((lessThan = naturalSortLessThanCI(nameCurrent,nameLast)) && i != list.begin() && numberLast == max) { i--; - nameLast = (*i).name; + nameLast = (*i).name; numberLast = max; - if((*i).info.number != NULL) + if(!(*i).info.number.isNull()) numberLast = (*i).info.number.toInt(); }