diff --git a/YACReaderLibrary/db/reading_list_model.cpp b/YACReaderLibrary/db/reading_list_model.cpp index c43193b9..6defb5de 100644 --- a/YACReaderLibrary/db/reading_list_model.cpp +++ b/YACReaderLibrary/db/reading_list_model.cpp @@ -596,21 +596,29 @@ void ReadingListModel::setupReadingListsData(QSqlQuery &sqlquery, ReadingListIte { items.insert(parent->getId(),parent); + QSqlRecord record = sqlquery.record(); + + int name = record.indexOf("name"); + int id = record.indexOf("id"); + int finished = record.indexOf("finished"); + int completed = record.indexOf("completed"); + int ordering = record.indexOf("ordering"); + int parentId = record.indexOf("parentId"); + while (sqlquery.next()) { - QSqlRecord record = sqlquery.record(); ReadingListItem * rli = new ReadingListItem(QList() - << record.value("name") - << record.value("id") - << record.value("finished") - << record.value("completed") - << record.value("ordering")); + << sqlquery.value(name) + << sqlquery.value(id) + << sqlquery.value(finished) + << sqlquery.value(completed) + << sqlquery.value(ordering)); ReadingListItem * currentParent; - if(record.value("parentId").isNull()) + if(sqlquery.value(parentId).isNull()) currentParent = rootItem; else - currentParent = items.value(record.value("parentId").toULongLong()); + currentParent = items.value(sqlquery.value(parentId).toULongLong()); currentParent->appendChild(rli); @@ -620,14 +628,19 @@ void ReadingListModel::setupReadingListsData(QSqlQuery &sqlquery, ReadingListIte QList ReadingListModel::setupSpecialLists(QSqlDatabase & db) { - QList list; + QList list; QSqlQuery selectQuery("SELECT * FROM default_reading_list ORDER BY id,name",db); + + QSqlRecord record = selectQuery.record(); + + int name = record.indexOf("name"); + int id = record.indexOf("id"); + while(selectQuery.next()) { - QSqlRecord record = selectQuery.record(); list << new SpecialListItem(QList() - << record.value("name") - << record.value("id")); + << selectQuery.value(name) + << selectQuery.value(id)); } //Reading after Favorites, Why? Because I want to :P @@ -638,14 +651,21 @@ QList ReadingListModel::setupSpecialLists(QSqlDatabase & db) void ReadingListModel::setupLabels(QSqlDatabase & db) { - QSqlQuery selectQuery("SELECT * FROM label ORDER BY ordering,name",db); //TODO add some kind of + QSqlQuery selectQuery("SELECT * FROM label ORDER BY ordering,name",db); + + QSqlRecord record = selectQuery.record(); + + int name = record.indexOf("name"); + int color = record.indexOf("color"); + int id = record.indexOf("id"); + int ordering = record.indexOf("ordering"); + while(selectQuery.next()) { - QSqlRecord record = selectQuery.record(); addLabelIntoList(new LabelItem(QList() - << record.value("name") - << record.value("color") - << record.value("id") - << record.value("ordering"))); + << selectQuery.value(name) + << selectQuery.value(color) + << selectQuery.value(id) + << selectQuery.value(ordering))); } //TEST