From: APTX Date: Sat, 7 Feb 2026 08:05:43 +0000 (+0900) Subject: Fix some clazy warnings X-Git-Url: https://gitweb.aptx.org/?a=commitdiff_plain;h=9c3075f4e0e936213d2e670f3b3f671568643cb2;p=localmylist.git Fix some clazy warnings --- diff --git a/CMakeLists.txt b/CMakeLists.txt index f12f33b..ab9a3cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,6 +24,7 @@ set(QT_PACKAGE "Qt6") set(QtScript_COMPONENT "") set(QT_MIN_VERSION "6.10.0") +# Held back due to QSqlQuery add_compile_definitions("QT_DISABLE_DEPRECATED_UP_TO=QT_VERSION_CHECK(6, 1, 0)") add_subdirectory(localmylist) diff --git a/localmylist-management/tabs/dynamicmodeltab.cpp b/localmylist-management/tabs/dynamicmodeltab.cpp index c7629e4..9ff9512 100644 --- a/localmylist-management/tabs/dynamicmodeltab.cpp +++ b/localmylist-management/tabs/dynamicmodeltab.cpp @@ -194,7 +194,6 @@ void DynamicModelTab::on_myListView_renameFilesRequested(const QModelIndex &inde if (!node->id()) return; - QString path; QSqlQuery q(MyList::instance()->database()->connection()); QChar typeLetter; diff --git a/localmylist-management/tabs/pendingrequesttab.cpp b/localmylist-management/tabs/pendingrequesttab.cpp index 0de5bb6..81c80d5 100644 --- a/localmylist-management/tabs/pendingrequesttab.cpp +++ b/localmylist-management/tabs/pendingrequesttab.cpp @@ -74,15 +74,14 @@ void PendingRequestTab::clearSelection() void PendingRequestTab::resetFailCount() { - QList requests = selectionToPendingRequestList(); + const auto &requests = selectionToPendingRequestList(); if (!requests.count()) return; { LocalMyList::RaiiTransaction t(LocalMyList::instance()->database()); - for (const LocalMyList::PendingRequest &request : - std::as_const(requests)) + for (const LocalMyList::PendingRequest &request : requests) { LocalMyList::instance()->database()->resetPendingRequest(request); } @@ -94,9 +93,10 @@ void PendingRequestTab::resetFailCount() QList PendingRequestTab::selectionToPendingRequestList() { QList ret; - QModelIndexList selection = ui->view->selectionModel()->selectedRows(); + const QModelIndexList selection = + ui->view->selectionModel()->selectedRows(); - for (const QModelIndex &idx : std::as_const(selection)) + for (const QModelIndex &idx : selection) { LocalMyList::PendingRequest pr; pr.aid = idx.data().toInt(); diff --git a/localmylist/mylist.cpp b/localmylist/mylist.cpp index ef13cf1..521e3f7 100644 --- a/localmylist/mylist.cpp +++ b/localmylist/mylist.cpp @@ -409,7 +409,7 @@ QString MyList::mapPathFromSource(const QString &path, int sourceHost) if (!ret.endsWith(QChar('/'))) ret.append(QChar('/')); - ret.append(path.mid(prefix.length())); + ret.append(QStringView{path}.mid(prefix.length())); return ret; } @@ -433,7 +433,7 @@ QString MyList::mapPathToSource(const QString &path, int *sourceHost) if (!ret.endsWith(QChar('/'))) ret.append(QChar('/')); - ret.append(path.mid(prefix.length())); + ret.append(QStringView{path}.mid(prefix.length())); if (sourceHost) *sourceHost = pm.sourceHost;