summaryrefslogtreecommitdiffstats
path: root/subsurface-core/taxonomy.c
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2016-04-04 22:02:03 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2016-04-04 22:33:58 -0700
commit7be962bfc2879a72c32ff67518731347dcdff6de (patch)
treed05bf7ab234a448ee37a15b608e2b939f2285d07 /subsurface-core/taxonomy.c
parent2d760a7bff71c46c5aeba37c40d236ea16eefea2 (diff)
downloadsubsurface-7be962bfc2879a72c32ff67518731347dcdff6de.tar.gz
Move subsurface-core to core and qt-mobile to mobile-widgets
Having subsurface-core as a directory name really messes with autocomplete and is obviously redundant. Simmilarly, qt-mobile caused an autocomplete conflict and also was inconsistent with the desktop-widget name for the directory containing the "other" UI. And while cleaning up the resulting change in the path name for include files, I decided to clean up those even more to make them consistent overall. This could have been handled in more commits, but since this requires a make clean before the build, it seemed more sensible to do it all in one. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'subsurface-core/taxonomy.c')
-rw-r--r--subsurface-core/taxonomy.c48
1 files changed, 0 insertions, 48 deletions
diff --git a/subsurface-core/taxonomy.c b/subsurface-core/taxonomy.c
deleted file mode 100644
index 670d85ad0..000000000
--- a/subsurface-core/taxonomy.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "taxonomy.h"
-#include "gettext.h"
-#include <stdlib.h>
-
-char *taxonomy_category_names[TC_NR_CATEGORIES] = {
- QT_TRANSLATE_NOOP("getTextFromC", "None"),
- QT_TRANSLATE_NOOP("getTextFromC", "Ocean"),
- QT_TRANSLATE_NOOP("getTextFromC", "Country"),
- QT_TRANSLATE_NOOP("getTextFromC", "State"),
- QT_TRANSLATE_NOOP("getTextFromC", "County"),
- QT_TRANSLATE_NOOP("getTextFromC", "Town"),
- QT_TRANSLATE_NOOP("getTextFromC", "City")
-};
-
-// these are the names for geoname.org
-char *taxonomy_api_names[TC_NR_CATEGORIES] = {
- "none",
- "name",
- "countryName",
- "adminName1",
- "adminName2",
- "toponymName",
- "adminName3"
-};
-
-struct taxonomy *alloc_taxonomy()
-{
- return calloc(TC_NR_CATEGORIES, sizeof(struct taxonomy));
-}
-
-void free_taxonomy(struct taxonomy_data *t)
-{
- if (t) {
- for (int i = 0; i < t->nr; i++)
- free((void *)t->category[i].value);
- free(t->category);
- t->category = NULL;
- t->nr = 0;
- }
-}
-
-int taxonomy_index_for_category(struct taxonomy_data *t, enum taxonomy_category cat)
-{
- for (int i = 0; i < t->nr; i++)
- if (t->category[i].category == cat)
- return i;
- return -1;
-}