diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-09-06 13:48:52 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-09-06 12:59:54 -0700 |
| commit | ee2f4664705e139e90b28351f4d76a3e5fbab12d (patch) | |
| tree | d2c35484cba4578c6d9d34af6f3c87e4a1b69116 /desktop-widgets | |
| parent | 1f1fd78f785e68d2dad8f9de8e9d313c8e91d485 (diff) | |
| download | subsurface-ee2f4664705e139e90b28351f4d76a3e5fbab12d.tar.gz | |
cleanup: use taxonomy_get_value() instead of taxonomy_get_index()
Instead of getting the index and using that to access values, use
the taxonomy_get_value() helper function. Two places are affected:
1) reverse geo-lookup
2) location filter delegate
The behavior of reverse geo-lookup is changed slightly: now an
empty string is likewise recognized as missing "TC_ADMIN_L3".
Before, only a missing category was interpreted as such.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets')
| -rw-r--r-- | desktop-widgets/modeldelegates.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/desktop-widgets/modeldelegates.cpp b/desktop-widgets/modeldelegates.cpp index 093a25a43..94162fd8f 100644 --- a/desktop-widgets/modeldelegates.cpp +++ b/desktop-widgets/modeldelegates.cpp @@ -404,12 +404,12 @@ void LocationFilterDelegate::paint(QPainter *painter, const QStyleOptionViewItem for (int i = 0; i < 3; i++) { if (prefs.geocoding.category[i] == TC_NONE) continue; - int idx = taxonomy_index_for_category(&ds->taxonomy, prefs.geocoding.category[i]); - if (idx == -1) + const char *value = taxonomy_get_value(&ds->taxonomy, prefs.geocoding.category[i]); + if (empty_string(value)) continue; if(!bottomText.isEmpty()) bottomText += " / "; - bottomText += QString(ds->taxonomy.category[idx].value); + bottomText += QString(value); } if (bottomText.isEmpty()) |