From 2eed9c0b9b56a507cfeb6f387176f675643dd436 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Wed, 7 Oct 2015 19:34:02 -0300 Subject: Move the algorithm to divesite.cpp file This shouldn't be on the maintab.cpp, this file is already too convoluted. [Dirk Hohndel: slightly refactored this commit and the next one to make the code actually work and make the split across the two commits more reasonable] Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- qt-ui/maintab.cpp | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) (limited to 'qt-ui/maintab.cpp') diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index d4483273e..49af15677 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -487,29 +487,8 @@ void MainTab::updateDiveInfo(bool clear) } if (ds) { - // construct the location tags - QString locationTag; - if (ds->taxonomy.nr) { - locationTag = "(tags: "; - QString connector = ""; - for (int i = 0; i < 3; i++) { - if (prefs.geocoding.category[i] == TC_NONE) - continue; - for (int j = 0; j < TC_NR_CATEGORIES; j++) { - if (ds->taxonomy.category[j].category == prefs.geocoding.category[i]) { - QString tag = ds->taxonomy.category[j].value; - if (!tag.isEmpty()) { - locationTag += connector + tag; - connector = " / "; - } - break; - } - } - } - locationTag += ")"; - } ui.location->setCurrentDiveSiteUuid(ds->uuid); - ui.locationTags->setText(locationTag); + ui.locationTags->setText(constructLocationTags(ds->uuid)); } else { ui.location->clear(); clear_dive_site(&displayed_dive_site); -- cgit v1.2.3-70-g09d2