mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Grammar: replaces 'indexes' by 'indices'

Browse source 
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:
Robert C. Helling 2020-03-11 11:30:51 +01:00 • committed by Dirk Hohndel
parent cb28158b9a
commit 285fa8acbc
26 changed files with 88 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

18
commands/command_edit.cpp
View file

@ -1041,18 +1041,18 @@ EditWeightBase::EditWeightBase(int index, bool currentDiveOnly) :
// For that purpose, we will determine the indices of the same weightsystem.
std::vector<dive *> divesNew;
divesNew.reserve(dives.size());
indexes.reserve(dives.size());
indices.reserve(dives.size());
for (dive *d: dives) {
if (d == current) {
divesNew.push_back(d);
indexes.push_back(index);
indices.push_back(index);
continue;
}
int idx = find_weightsystem_index(d, ws);
if (idx >= 0) {
divesNew.push_back(d);
indexes.push_back(idx);
indices.push_back(idx);
}
}
dives = std::move(divesNew);
@ -1081,16 +1081,16 @@ RemoveWeight::RemoveWeight(int index, bool currentDiveOnly) :
void RemoveWeight::undo()
{
for (size_t i = 0; i < dives.size(); ++i) {
add_to_weightsystem_table(&dives[i]->weightsystems, indexes[i], clone_weightsystem(ws));
emit diveListNotifier.weightAdded(dives[i], indexes[i]);
add_to_weightsystem_table(&dives[i]->weightsystems, indices[i], clone_weightsystem(ws));
emit diveListNotifier.weightAdded(dives[i], indices[i]);
}
}
void RemoveWeight::redo()
{
for (size_t i = 0; i < dives.size(); ++i) {
remove_weightsystem(dives[i], indexes[i]);
emit diveListNotifier.weightRemoved(dives[i], indexes[i]);
remove_weightsystem(dives[i], indices[i]);
emit diveListNotifier.weightRemoved(dives[i], indices[i]);
}
}
@ -1138,8 +1138,8 @@ EditWeight::~EditWeight()
void EditWeight::redo()
{
for (size_t i = 0; i < dives.size(); ++i) {
set_weightsystem(dives[i], indexes[i], new_ws);
emit diveListNotifier.weightEdited(dives[i], indexes[i]);
set_weightsystem(dives[i], indices[i], new_ws);
emit diveListNotifier.weightEdited(dives[i], indices[i]);
}
std::swap(ws, new_ws);
}

2
commands/command_edit.h
View file

@ -353,7 +353,7 @@ protected:
~EditWeightBase();
weightsystem_t ws;
std::vector<int> indexes; // An index for each dive in the dives vector.
std::vector<int> indices; // An index for each dive in the dives vector.
bool workToBeDone() override;
};