From 285fa8acbceebf5dc87c5c3befe42a2917a3b844 Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Wed, 11 Mar 2020 11:30:51 +0100 Subject: Grammar: replaces 'indexes' by 'indices' Grammar-nazi ran git grep -l 'indexes' | xargs sed -i '' -e 's/indexes/indices/g' to prevent future wincing when reading the source code. Unfortunatly, Qt itself is infected as in QModelIndexList QItemSelection::indexes() const Signed-off-by: Robert C. Helling --- desktop-widgets/tab-widgets/TabDivePhotos.cpp | 20 ++++++++++---------- desktop-widgets/tab-widgets/TabDiveSite.cpp | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'desktop-widgets/tab-widgets') diff --git a/desktop-widgets/tab-widgets/TabDivePhotos.cpp b/desktop-widgets/tab-widgets/TabDivePhotos.cpp index 775308e3b..921511de4 100644 --- a/desktop-widgets/tab-widgets/TabDivePhotos.cpp +++ b/desktop-widgets/tab-widgets/TabDivePhotos.cpp @@ -69,11 +69,11 @@ QVector TabDivePhotos::getSelectedFilenames() const QVector selectedPhotos; if (!ui->photosView->selectionModel()->hasSelection()) return selectedPhotos; - QModelIndexList indexes = ui->photosView->selectionModel()->selectedRows(); - if (indexes.count() == 0) - indexes = ui->photosView->selectionModel()->selectedIndexes(); - selectedPhotos.reserve(indexes.count()); - for (const auto &photo: indexes) { + QModelIndexList indices = ui->photosView->selectionModel()->selectedRows(); + if (indices.count() == 0) + indices = ui->photosView->selectionModel()->selectedIndexes(); + selectedPhotos.reserve(indices.count()); + for (const auto &photo: indices) { if (photo.isValid()) { QString fileUrl = photo.data(Qt::DisplayPropertyRole).toString(); if (!fileUrl.isEmpty()) @@ -114,11 +114,11 @@ void TabDivePhotos::saveSubtitles() QVector selectedPhotos; if (!ui->photosView->selectionModel()->hasSelection()) return; - QModelIndexList indexes = ui->photosView->selectionModel()->selectedRows(); - if (indexes.count() == 0) - indexes = ui->photosView->selectionModel()->selectedIndexes(); - selectedPhotos.reserve(indexes.count()); - for (const auto &photo: indexes) { + QModelIndexList indices = ui->photosView->selectionModel()->selectedRows(); + if (indices.count() == 0) + indices = ui->photosView->selectionModel()->selectedIndexes(); + selectedPhotos.reserve(indices.count()); + for (const auto &photo: indices) { if (photo.isValid()) { QString fileUrl = photo.data(Qt::DisplayPropertyRole).toString(); if (!fileUrl.isEmpty()) { diff --git a/desktop-widgets/tab-widgets/TabDiveSite.cpp b/desktop-widgets/tab-widgets/TabDiveSite.cpp index 0059c1051..87bed8f92 100644 --- a/desktop-widgets/tab-widgets/TabDiveSite.cpp +++ b/desktop-widgets/tab-widgets/TabDiveSite.cpp @@ -107,10 +107,10 @@ void TabDiveSite::on_filterText_textChanged(const QString &text) QVector TabDiveSite::selectedDiveSites() { - const QModelIndexList indexes = ui.diveSites->view()->selectionModel()->selectedRows(); + const QModelIndexList indices = ui.diveSites->view()->selectionModel()->selectedRows(); QVector sites; - sites.reserve(indexes.size()); - for (const QModelIndex &idx: indexes) { + sites.reserve(indices.size()); + for (const QModelIndex &idx: indices) { struct dive_site *ds = model.getDiveSite(idx); sites.append(ds); } -- cgit v1.2.3-70-g09d2