mirror of
https://github.com/YACReader/yacreader
synced 2025-06-04 01:28:55 -04:00
fixed DBHelper::getSortedComicsFromParent
This commit is contained in:
parent
98a3bc1684
commit
ef53174255
@ -407,7 +407,7 @@ QList<ComicDB> DBHelper::getSortedComicsFromParent(qulonglong parentId, QSqlData
|
|||||||
currentItem.info = DBHelper::loadComicInfo(record.value(4).toString(),db);
|
currentItem.info = DBHelper::loadComicInfo(record.value(4).toString(),db);
|
||||||
int lessThan = 0;
|
int lessThan = 0;
|
||||||
if(list.isEmpty())
|
if(list.isEmpty())
|
||||||
list.append(currentItem);
|
list.append(currentItem);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ComicDB last = static_cast<ComicDB>(list.back());
|
ComicDB last = static_cast<ComicDB>(list.back());
|
||||||
@ -418,10 +418,10 @@ QList<ComicDB> DBHelper::getSortedComicsFromParent(qulonglong parentId, QSqlData
|
|||||||
int max = (std::numeric_limits<int>::max)();
|
int max = (std::numeric_limits<int>::max)();
|
||||||
numberLast = numberCurrent = max; //TODO change by std limit
|
numberLast = numberCurrent = max; //TODO change by std limit
|
||||||
|
|
||||||
if(last.info.number!=NULL)
|
if(!last.info.number.isNull())
|
||||||
numberLast = last.info.number.toInt();
|
numberLast = last.info.number.toInt();
|
||||||
|
|
||||||
if(currentItem.info.number!=NULL)
|
if(!currentItem.info.number.isNull())
|
||||||
numberCurrent = currentItem.info.number.toInt();
|
numberCurrent = currentItem.info.number.toInt();
|
||||||
|
|
||||||
QList<ComicDB>::iterator i;
|
QList<ComicDB>::iterator i;
|
||||||
@ -435,7 +435,7 @@ QList<ComicDB> DBHelper::getSortedComicsFromParent(qulonglong parentId, QSqlData
|
|||||||
i--;
|
i--;
|
||||||
numberLast = max;
|
numberLast = max;
|
||||||
|
|
||||||
if((*i).info.number != NULL)
|
if(!(*i).info.number.isNull())
|
||||||
numberLast = (*i).info.number.toInt();
|
numberLast = (*i).info.number.toInt();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -444,10 +444,10 @@ QList<ComicDB> DBHelper::getSortedComicsFromParent(qulonglong parentId, QSqlData
|
|||||||
while ((lessThan = naturalSortLessThanCI(nameCurrent,nameLast)) && i != list.begin() && numberLast == max)
|
while ((lessThan = naturalSortLessThanCI(nameCurrent,nameLast)) && i != list.begin() && numberLast == max)
|
||||||
{
|
{
|
||||||
i--;
|
i--;
|
||||||
nameLast = (*i).name;
|
nameLast = (*i).name;
|
||||||
numberLast = max;
|
numberLast = max;
|
||||||
|
|
||||||
if((*i).info.number != NULL)
|
if(!(*i).info.number.isNull())
|
||||||
numberLast = (*i).info.number.toInt();
|
numberLast = (*i).info.number.toInt();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user