summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorGravatar Robert C. Helling <helling@atdotde.de>2020-03-11 11:30:51 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-03-11 08:26:30 -0700
commit285fa8acbceebf5dc87c5c3befe42a2917a3b844 (patch)
tree142efc52856b5f4bded40867a917800c241ebfb6 /core
parentcb28158b9abe10f08142f12f11ddbb5d23686fd5 (diff)
downloadsubsurface-285fa8acbceebf5dc87c5c3befe42a2917a3b844.tar.gz
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>
Diffstat (limited to 'core')
-rw-r--r--core/dive.c14
-rw-r--r--core/profile.c4
-rw-r--r--core/save-xml.c2
3 files changed, 10 insertions, 10 deletions
diff --git a/core/dive.c b/core/dive.c
index 71b1038ec..ffdf91ae3 100644
--- a/core/dive.c
+++ b/core/dive.c
@@ -43,10 +43,10 @@ const char *divemode_text[] = {"OC", "CCR", "PSCR", "Freedive"};
* We try to keep the same sensor index for the same sensor, so that even
* if the dive computer doesn't give pressure information for every sample,
* we don't move pressure information around between the different sensor
- * indexes.
+ * indices.
*
* The "prepare_sample()" function will always copy the sensor indices
- * from the previous sample, so the indexes are pre-populated (but the
+ * from the previous sample, so the indices are pre-populated (but the
* pressures obviously are not)
*/
void add_sample_pressure(struct sample *sample, int sensor, int mbar)
@@ -83,7 +83,7 @@ void add_sample_pressure(struct sample *sample, int sensor, int mbar)
* "o2pressure" that is fixed to the Oxygen sensor for a CCR dive.
*
* For more complex pressure data, we have to use explicit
- * cylinder indexes for each sample.
+ * cylinder indices for each sample.
*
* This function returns a negative number for "no legacy mode",
* or a non-negative number that indicates the o2 sensor index.
@@ -2049,11 +2049,11 @@ static void dc_cylinder_renumber(struct dive *dive, struct divecomputer *dc, con
int i;
struct event *ev;
- /* Remap or delete the sensor indexes */
+ /* Remap or delete the sensor indices */
for (i = 0; i < dc->samples; i++)
sample_renumber(dc->sample + i, i, mapping);
- /* Remap the gas change indexes */
+ /* Remap the gas change indices */
for (ev = dc->events; ev; ev = ev->next)
event_renumber(ev, mapping);
@@ -2063,8 +2063,8 @@ static void dc_cylinder_renumber(struct dive *dive, struct divecomputer *dc, con
}
/*
- * If the cylinder indexes change (due to merging dives or deleting
- * cylinders in the middle), we need to change the indexes in the
+ * If the cylinder indices change (due to merging dives or deleting
+ * cylinders in the middle), we need to change the indices in the
* dive computer data for this dive.
*
* Also note that we assume that the initial cylinder is cylinder 0,
diff --git a/core/profile.c b/core/profile.c
index b79236151..88b48d1cd 100644
--- a/core/profile.c
+++ b/core/profile.c
@@ -217,7 +217,7 @@ static void analyze_plot_info_minmax(struct plot_info *pi, int entry_index)
p--;
}
- // indexes to the min/max entries
+ // indices to the min/max entries
min = max = entry_index;
/* Then go forward until we hit an entry past the time */
@@ -314,7 +314,7 @@ struct plot_info *analyze_plot_info(struct plot_info *pi)
* we return that. If it doesn't, we return the best
* match based on the gasmix.
*
- * Some dive computers give cylinder indexes, some
+ * Some dive computers give cylinder indices, some
* give just the gas mix.
*/
int get_cylinder_index(const struct dive *dive, const struct event *ev)
diff --git a/core/save-xml.c b/core/save-xml.c
index 3dde176bd..53d7a3af6 100644
--- a/core/save-xml.c
+++ b/core/save-xml.c
@@ -408,7 +408,7 @@ static void save_samples(struct membuffer *b, struct dive *dive, struct divecomp
struct sample *s;
struct sample dummy = { .bearing.degrees = -1, .ndl.seconds = -1 };
- /* Set up default pressure sensor indexes */
+ /* Set up default pressure sensor indices */
o2sensor = legacy_format_o2pressures(dive, dc);
if (o2sensor >= 0) {
dummy.sensor[0] = !o2sensor;