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>
This commit is contained in:
Tomaz Canabrava 2015-09-02 20:52:34 -03:00 committed by Dirk Hohndel
parent a079821423
commit 4c0156e3d5
105 changed files with 102 additions and 78 deletions

View file

@ -0,0 +1,41 @@
#ifndef TAXONOMY_H
#define TAXONOMY_H
#ifdef __cplusplus
extern "C" {
#endif
enum taxonomy_category {
TC_NONE,
TC_OCEAN,
TC_COUNTRY,
TC_ADMIN_L1,
TC_ADMIN_L2,
TC_LOCALNAME,
TC_ADMIN_L3,
TC_NR_CATEGORIES
};
extern char *taxonomy_category_names[TC_NR_CATEGORIES];
extern char *taxonomy_api_names[TC_NR_CATEGORIES];
struct taxonomy {
int category; /* the category for this tag: ocean, country, admin_l1, admin_l2, localname, etc */
const char *value; /* the value returned, parsed, or manually entered for that category */
enum { GEOCODED, PARSED, MANUAL, COPIED } origin;
};
/* the data block contains 3 taxonomy structures - unused ones have a tag value of NONE */
struct taxonomy_data {
int nr;
struct taxonomy *category;
};
struct taxonomy *alloc_taxonomy();
void free_taxonomy(struct taxonomy_data *t);
int taxonomy_index_for_category(struct taxonomy_data *t, enum taxonomy_category cat);
#ifdef __cplusplus
}
#endif
#endif // TAXONOMY_H