diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-08-20 07:31:04 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-08-21 08:48:22 -0700 |
| commit | fe3021b88a414b6963891a65b738f52bc41e36a8 (patch) | |
| tree | 390d1dc9e2fb95171a43b14932a82ea1200578c0 /core | |
| parent | efc1b4f31ac64d4815d1ab49d9da90dd37c7f3b8 (diff) | |
| download | subsurface-fe3021b88a414b6963891a65b738f52bc41e36a8.tar.gz | |
cleanup: consistently use get_cylinder() accessor
get_cylinder(d, i) is more readable than d->cylinders.cylinders[i].
Moreover, it does bound checking and is more flexible with respect to
changing the core data structures. Most places already used this accessor,
but some still accessed the cylinders directly.
This patch unifies the accesses by consistently switching to get_cylinder().
The affected code is in C++ and accesses the cylinder as reference or
object, whereas the get_cylinder() function is C and returns a pointer.
This results in funky looking "*get_cylinder(d, i)" expressions.
Arguably still better than the original.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core')
| -rw-r--r-- | core/fulltext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/fulltext.cpp b/core/fulltext.cpp index 2e27d8524..9dc6d826c 100644 --- a/core/fulltext.cpp +++ b/core/fulltext.cpp @@ -127,7 +127,7 @@ static std::vector<QString> getWords(const dive *d) for (const tag_entry *tag = d->tag_list; tag; tag = tag->next) tokenize(QString(tag->tag->name), res); for (int i = 0; i < d->cylinders.nr; ++i) { - const cylinder_t &cyl = d->cylinders.cylinders[i]; + const cylinder_t &cyl = *get_cylinder(d, i); tokenize(QString(cyl.type.description), res); } for (int i = 0; i < d->weightsystems.nr; ++i) { |