diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-07-02 10:21:35 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-07-02 10:22:31 -0700 |
| commit | bc8c54f1eedc550f9cd79abfc69db9934577aac8 (patch) | |
| tree | 569373c575d0c08e3706a8ba79932adaefefa091 /divesitehelpers.cpp | |
| parent | 08f8eb6eb51f2855f98c1b351127691dce837894 (diff) | |
| download | subsurface-bc8c54f1eedc550f9cd79abfc69db9934577aac8.tar.gz | |
Rename enum values for taxonomy
This avoids confusion and namespace collisions.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'divesitehelpers.cpp')
| -rw-r--r-- | divesitehelpers.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/divesitehelpers.cpp b/divesitehelpers.cpp index dae47e013..1f323a537 100644 --- a/divesitehelpers.cpp +++ b/divesitehelpers.cpp @@ -89,7 +89,7 @@ void ReverseGeoLookupThread::run() { if (ds->taxonomy.category == NULL) ds->taxonomy.category = alloc_taxonomy(); // get all the data - OCEAN is special, so start at COUNTRY - for (int j = COUNTRY; j < NR_CATEGORIES; j++) { + for (int j = TC_COUNTRY; j < TC_NR_CATEGORIES; j++) { if (firstData[taxonomy_api_names[j]].isValid()) { ds->taxonomy.category[ri].category = j; ds->taxonomy.category[ri].origin = taxonomy::GEOCODED; @@ -137,7 +137,7 @@ void ReverseGeoLookupThread::run() { if (oceanName["name"].isValid()) { if (ds->taxonomy.category == NULL) ds->taxonomy.category = alloc_taxonomy(); - ds->taxonomy.category[ds->taxonomy.nr].category = OCEAN; + ds->taxonomy.category[ds->taxonomy.nr].category = TC_OCEAN; ds->taxonomy.category[ds->taxonomy.nr].origin = taxonomy::GEOCODED; ds->taxonomy.category[ds->taxonomy.nr].value = copy_string(qPrintable(oceanName["name"].toString())); ds->taxonomy.nr++; |