mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
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 <helling@atdotde.de>
This commit is contained in:
parent
cb28158b9a
commit
285fa8acbc
26 changed files with 88 additions and 88 deletions
|
@ -199,11 +199,11 @@ void DiveListView::reset()
|
|||
}
|
||||
|
||||
// If items were selected, inform the selection model
|
||||
void DiveListView::diveSelectionChanged(const QVector<QModelIndex> &indexes)
|
||||
void DiveListView::diveSelectionChanged(const QVector<QModelIndex> &indices)
|
||||
{
|
||||
clearSelection();
|
||||
QItemSelectionModel *s = selectionModel();
|
||||
for (const QModelIndex &index: indexes) {
|
||||
for (const QModelIndex &index: indices) {
|
||||
s->select(index, QItemSelectionModel::Rows | QItemSelectionModel::Select);
|
||||
|
||||
// If an item of a not-yet expanded trip is selected, expand the trip.
|
||||
|
@ -420,7 +420,7 @@ void DiveListView::sortIndicatorChanged(int i, Qt::SortOrder order)
|
|||
if (currentLayout == newLayout) {
|
||||
sortByColumn(i, order);
|
||||
} else {
|
||||
// clear the model, repopulate with new indexes.
|
||||
// clear the model, repopulate with new indices.
|
||||
std::vector<int> expandedRows;
|
||||
if(currentLayout == DiveTripModelBase::TREE)
|
||||
expandedRows = backupExpandedRows();
|
||||
|
|
|
@ -60,7 +60,7 @@ slots:
|
|||
void shiftTimes();
|
||||
void loadImages();
|
||||
void loadWebImages();
|
||||
void diveSelectionChanged(const QVector<QModelIndex> &indexes);
|
||||
void diveSelectionChanged(const QVector<QModelIndex> &indices);
|
||||
void currentDiveChanged(QModelIndex index);
|
||||
void tripChanged(dive_trip *trip, TripField);
|
||||
private:
|
||||
|
|
|
@ -362,7 +362,7 @@ DiveLogImportDialog::DiveLogImportDialog(QStringList fn, QWidget *parent) : QDia
|
|||
hw = "";
|
||||
txtLog = false;
|
||||
|
||||
/* Add indexes of XSLTs requiring special handling to the list */
|
||||
/* Add indices of XSLTs requiring special handling to the list */
|
||||
specialCSV << SENSUS;
|
||||
specialCSV << SUBSURFACE;
|
||||
specialCSV << DL7;
|
||||
|
|
|
@ -69,11 +69,11 @@ QVector<QString> TabDivePhotos::getSelectedFilenames() const
|
|||
QVector<QString> 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<QString> 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()) {
|
||||
|
|
|
@ -107,10 +107,10 @@ void TabDiveSite::on_filterText_textChanged(const QString &text)
|
|||
|
||||
QVector<dive_site *> TabDiveSite::selectedDiveSites()
|
||||
{
|
||||
const QModelIndexList indexes = ui.diveSites->view()->selectionModel()->selectedRows();
|
||||
const QModelIndexList indices = ui.diveSites->view()->selectionModel()->selectedRows();
|
||||
QVector<dive_site *> 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);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue