mirror of
https://github.com/YACReader/yacreader
synced 2026-04-12 15:49:53 -04:00
Fix all compilation issues after enabling QT_DISABLE_DEPRECATED_UP_TO
This commit is contained in:
@ -436,7 +436,8 @@ QList<ComicDB> DBHelper::getReadingListFullContent(qulonglong libraryId, qulongl
|
||||
while (subfolders.next())
|
||||
ids << subfolders.value(0).toULongLong();
|
||||
|
||||
foreach (qulonglong id, ids) {
|
||||
const auto &subfolderIds = ids;
|
||||
for (const auto id : subfolderIds) {
|
||||
QSqlQuery selectQuery(db);
|
||||
|
||||
QString params;
|
||||
@ -546,7 +547,7 @@ void DBHelper::deleteComicsFromFavorites(const QList<ComicDB> &comicsList, QSqlD
|
||||
|
||||
QSqlQuery query(db);
|
||||
query.prepare("DELETE FROM comic_default_reading_list WHERE comic_id = :comic_id AND default_reading_list_id = 1");
|
||||
foreach (ComicDB comic, comicsList) {
|
||||
for (const auto &comic : comicsList) {
|
||||
query.bindValue(":comic_id", comic.id);
|
||||
query.exec();
|
||||
}
|
||||
@ -578,7 +579,7 @@ void DBHelper::deleteComicsFromLabel(const QList<ComicDB> &comicsList, qulonglon
|
||||
|
||||
QSqlQuery query(db);
|
||||
query.prepare("DELETE FROM comic_label WHERE comic_id = :comic_id AND label_id = :label_id");
|
||||
foreach (ComicDB comic, comicsList) {
|
||||
for (const auto &comic : comicsList) {
|
||||
query.bindValue(":comic_id", comic.id);
|
||||
query.bindValue(":label_id", labelId);
|
||||
query.exec();
|
||||
@ -598,7 +599,7 @@ void DBHelper::deleteComicsFromReadingList(const QList<ComicDB> &comicsList, qul
|
||||
|
||||
QSqlQuery query(db);
|
||||
query.prepare("DELETE FROM comic_reading_list WHERE comic_id = :comic_id AND reading_list_id = :reading_list_id");
|
||||
foreach (ComicDB comic, comicsList) {
|
||||
for (const auto &comic : comicsList) {
|
||||
query.bindValue(":comic_id", comic.id);
|
||||
query.bindValue(":reading_list_id", readingListId);
|
||||
query.exec();
|
||||
@ -1086,7 +1087,8 @@ QMap<qulonglong, QList<ComicDB>> DBHelper::updateFromRemoteClient(const QMap<qul
|
||||
{
|
||||
QMap<qulonglong, QList<ComicDB>> moreRecentComics;
|
||||
|
||||
foreach (qulonglong libraryId, comics.keys()) {
|
||||
const auto libraryIds = comics.keys();
|
||||
for (const auto libraryId : libraryIds) {
|
||||
QList<ComicDB> libraryMoreRecentComics;
|
||||
|
||||
QString libraryPath = DBHelper::getLibraries().getPath(libraryId);
|
||||
@ -1108,7 +1110,8 @@ QMap<qulonglong, QList<ComicDB>> DBHelper::updateFromRemoteClient(const QMap<qul
|
||||
"lastTimeImageFiltersSet = :lastTimeImageFiltersSet "
|
||||
" WHERE id = :id ");
|
||||
|
||||
foreach (ComicInfo comicInfo, comics[libraryId]) {
|
||||
const auto &comicInfos = comics.constFind(libraryId).value();
|
||||
for (const auto &comicInfo : comicInfos) {
|
||||
bool found;
|
||||
// TODO: sanitize this -> comicInfo.id contains comic id
|
||||
ComicDB comic = DBHelper::loadComic(comicInfo.id, db, found);
|
||||
@ -1193,11 +1196,10 @@ QMap<qulonglong, QList<ComicDB>> DBHelper::updateFromRemoteClient(const QMap<qul
|
||||
|
||||
void DBHelper::updateFromRemoteClientWithHash(const QList<ComicInfo> &comics)
|
||||
{
|
||||
YACReaderLibraries libraries = DBHelper::getLibraries();
|
||||
const YACReaderLibraries libraries = DBHelper::getLibraries();
|
||||
const QStringList names = libraries.getNames();
|
||||
|
||||
QStringList names = libraries.getNames();
|
||||
|
||||
foreach (QString name, names) {
|
||||
for (const auto &name : names) {
|
||||
QString libraryPath = DBHelper::getLibraries().getPath(libraries.getId(name));
|
||||
QString connectionName = "";
|
||||
{
|
||||
@ -1214,7 +1216,7 @@ void DBHelper::updateFromRemoteClientWithHash(const QList<ComicInfo> &comics)
|
||||
"rating = :rating"
|
||||
" WHERE id = :id ");
|
||||
|
||||
foreach (ComicInfo comicInfo, comics) {
|
||||
for (const auto &comicInfo : comics) {
|
||||
ComicInfo info = loadComicInfo(comicInfo.hash, db);
|
||||
|
||||
if (!info.existOnDb) {
|
||||
@ -1285,7 +1287,8 @@ void DBHelper::reasignOrderToSublists(QList<qulonglong> ids, QSqlDatabase &db)
|
||||
"WHERE id = :id");
|
||||
db.transaction();
|
||||
int order = 0;
|
||||
foreach (qulonglong id, ids) {
|
||||
const auto &readingListIds = ids;
|
||||
for (const auto id : readingListIds) {
|
||||
updateOrdering.bindValue(":ordering", order++);
|
||||
updateOrdering.bindValue(":id", id);
|
||||
updateOrdering.exec();
|
||||
@ -1302,7 +1305,8 @@ void DBHelper::reasignOrderToComicsInFavorites(QList<qulonglong> comicIds, QSqlD
|
||||
"WHERE comic_id = :comic_id AND default_reading_list_id = 1");
|
||||
db.transaction();
|
||||
int order = 0;
|
||||
foreach (qulonglong id, comicIds) {
|
||||
const auto &favoriteComicIds = comicIds;
|
||||
for (const auto id : favoriteComicIds) {
|
||||
updateOrdering.bindValue(":ordering", order++);
|
||||
updateOrdering.bindValue(":comic_id", id);
|
||||
updateOrdering.exec();
|
||||
@ -1319,7 +1323,8 @@ void DBHelper::reasignOrderToComicsInLabel(qulonglong labelId, QList<qulonglong>
|
||||
"WHERE comic_id = :comic_id AND label_id = :label_id");
|
||||
db.transaction();
|
||||
int order = 0;
|
||||
foreach (qulonglong id, comicIds) {
|
||||
const auto &labelComicIds = comicIds;
|
||||
for (const auto id : labelComicIds) {
|
||||
updateOrdering.bindValue(":ordering", order++);
|
||||
updateOrdering.bindValue(":comic_id", id);
|
||||
updateOrdering.bindValue(":label_id", labelId);
|
||||
@ -1337,7 +1342,8 @@ void DBHelper::reasignOrderToComicsInReadingList(qulonglong readingListId, QList
|
||||
"WHERE comic_id = :comic_id AND reading_list_id = :reading_list_id");
|
||||
db.transaction();
|
||||
int order = 0;
|
||||
foreach (qulonglong id, comicIds) {
|
||||
const auto &readingListComicIds = comicIds;
|
||||
for (const auto id : readingListComicIds) {
|
||||
updateOrdering.bindValue(":ordering", order++);
|
||||
updateOrdering.bindValue(":comic_id", id);
|
||||
updateOrdering.bindValue(":reading_list_id", readingListId);
|
||||
@ -1355,7 +1361,8 @@ void DBHelper::updateComicsInfo(QList<ComicDB> &comics, const QString &databaseP
|
||||
QSqlDatabase db = DataBaseManagement::loadDatabase(databasePath);
|
||||
db.open();
|
||||
db.transaction();
|
||||
foreach (ComicDB comic, comics) {
|
||||
const auto &comicsRef = comics;
|
||||
for (auto comic : comicsRef) {
|
||||
DBHelper::update(&(comic.info), db);
|
||||
}
|
||||
db.commit();
|
||||
@ -1487,7 +1494,7 @@ void DBHelper::insertComicsInFavorites(const QList<ComicDB> &comicsList, QSqlDat
|
||||
query.prepare("INSERT INTO comic_default_reading_list (default_reading_list_id, comic_id, ordering) "
|
||||
"VALUES (1, :comic_id, :ordering)");
|
||||
|
||||
foreach (ComicDB comic, comicsList) {
|
||||
for (const auto &comic : comicsList) {
|
||||
query.bindValue(":comic_id", comic.id);
|
||||
query.bindValue(":ordering", numComics++);
|
||||
query.exec();
|
||||
@ -1511,7 +1518,7 @@ void DBHelper::insertComicsInLabel(const QList<ComicDB> &comicsList, qulonglong
|
||||
query.prepare("INSERT INTO comic_label (label_id, comic_id, ordering) "
|
||||
"VALUES (:label_id, :comic_id, :ordering)");
|
||||
|
||||
foreach (ComicDB comic, comicsList) {
|
||||
for (const auto &comic : comicsList) {
|
||||
query.bindValue(":label_id", labelId);
|
||||
query.bindValue(":comic_id", comic.id);
|
||||
query.bindValue(":ordering", numComics++);
|
||||
@ -1536,7 +1543,7 @@ void DBHelper::insertComicsInReadingList(const QList<ComicDB> &comicsList, qulon
|
||||
query.prepare("INSERT INTO comic_reading_list (reading_list_id, comic_id, ordering) "
|
||||
"VALUES (:reading_list_id, :comic_id, :ordering)");
|
||||
|
||||
foreach (ComicDB comic, comicsList) {
|
||||
for (const auto &comic : comicsList) {
|
||||
query.bindValue(":reading_list_id", readingListId);
|
||||
query.bindValue(":comic_id", comic.id);
|
||||
query.bindValue(":ordering", numComics++);
|
||||
|
||||
Reference in New Issue
Block a user