summaryrefslogtreecommitdiffstats
path: root/taxonomy.c
diff options
context:
space:
mode:
authorGravatar Tomaz Canabrava <tomaz.canabrava@intel.com>2015-09-02 20:52:34 -0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-10-30 10:36:48 -0700
commit4c0156e3d51b389db8eccc3fa3da4b8f248f9b13 (patch)
tree966868d29150fdba13a5a56fb4305bc432ec7a72 /taxonomy.c
parenta0798214231c652ac6142228f5ddfc4b65c921f8 (diff)
downloadsubsurface-4c0156e3d51b389db8eccc3fa3da4b8f248f9b13.tar.gz
Move all core-functionality to subsurface-core
And adapt a new CMakeLists.txt file for it. On the way I've also found out that we where double-compilling a few files. I've also set the subsurface-core as a include_path but that was just to reduce the noise on this commit, since I plan to remove it from the include path to make it obligatory to specify something like include "subsurface-core/dive.h" for the header files. Since the app is growing quite a bit we ended up having a few different files with almost same name that did similar things, I want to kill that (for instance Dive.h, dive.h, PrintDive.h and such). Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'taxonomy.c')
-rw-r--r--taxonomy.c48
1 files changed, 0 insertions, 48 deletions
diff --git a/taxonomy.c b/taxonomy.c
deleted file mode 100644
index 670d85ad0..000000000
--- a/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;
-}