Some small tidy ups

This commit is contained in:
Iain Benson
2018-11-24 10:27:09 +00:00
committed by Luis Ángel San Martín
parent 673ee1f067
commit 30529dca43
3 changed files with 18 additions and 30 deletions

View File

@ -701,39 +701,37 @@ void FolderModelProxy::setupFilteredModelData()
switch (modifier) {
case YACReader::NoModifiers:
queryString += "AND f.id <> 1 ORDER BY f.parentId,f.name";
queryString += " AND f.id <> 1 ORDER BY f.parentId,f.name";
break;
case YACReader::OnlyRead:
queryString += "AND f.id <> 1 AND ci.read = 1 ORDER BY f.parentId,f.name";
queryString += " AND f.id <> 1 AND ci.read = 1 ORDER BY f.parentId,f.name";
break;
case YACReader::OnlyUnread:
queryString += "AND f.id <> 1 AND ci.read = 0 ORDER BY f.parentId,f.name";
queryString += " AND f.id <> 1 AND ci.read = 0 ORDER BY f.parentId,f.name";
break;
default:
queryString += "AND f.id <> 1 ORDER BY f.parentId,f.name";
queryString += " AND f.id <> 1 ORDER BY f.parentId,f.name";
QLOG_ERROR() << "not implemented";
break;
selectQuery.prepare(queryString.c_str());
result.bindValues(selectQuery);
}
selectQuery.prepare(QString(queryString.c_str()));
result.bindValues(selectQuery);
} catch (const std::exception &e) {
QLOG_ERROR() << "Unable to parse query: " << e.what();
}
selectQuery.exec();
QLOG_DEBUG() << selectQuery.lastError() << "--";
setupFilteredModelData(selectQuery, rootItem);
}
selectQuery.exec();
QLOG_DEBUG() << selectQuery.lastError() << "--";
QSqlDatabase::removeDatabase(db.connectionName());
setupFilteredModelData(selectQuery, rootItem);
connectionName = db.connectionName();
endResetModel();
}
QSqlDatabase::removeDatabase(connectionName);
endResetModel();
}
void FolderModelProxy::clear()