aboutsummaryrefslogtreecommitdiffstats
path: root/subsurface-core/libdivecomputer.h
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/libdivecomputer.h
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/libdivecomputer.h')
-rw-r--r--subsurface-core/libdivecomputer.h72
1 files changed, 0 insertions, 72 deletions
diff --git a/subsurface-core/libdivecomputer.h b/subsurface-core/libdivecomputer.h
deleted file mode 100644
index 99f1c2490..000000000
--- a/subsurface-core/libdivecomputer.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#ifndef LIBDIVECOMPUTER_H
-#define LIBDIVECOMPUTER_H
-
-
-/* libdivecomputer */
-
-#ifdef DC_VERSION /* prevent a warning with wingdi.h */
-#undef DC_VERSION
-#endif
-#ifdef HAVE_LIBDIVECOMPUTER
-#include <libdivecomputer/version.h>
-#endif
-#include <libdivecomputer/device.h>
-#include <libdivecomputer/parser.h>
-
-#include "dive.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct dc_descriptor_t {
- const char *vendor;
- const char *product;
- dc_family_t type;
- unsigned int model;
-};
-
-/* don't forget to include the UI toolkit specific display-XXX.h first
- to get the definition of progressbar_t */
-typedef struct device_data_t
-{
- dc_descriptor_t *descriptor;
- const char *vendor, *product, *devname;
- const char *model;
- uint32_t libdc_firmware, libdc_serial;
- uint32_t deviceid, diveid;
- dc_device_t *device;
- dc_context_t *context;
- struct dive_trip *trip;
- int preexisting;
- bool force_download;
- bool create_new_trip;
- bool libdc_log;
- bool libdc_dump;
- bool bluetooth_mode;
- FILE *libdc_logfile;
- struct dive_table *download_table;
-} device_data_t;
-
-const char *errmsg (dc_status_t rc);
-const char *do_libdivecomputer_import(device_data_t *data);
-const char *do_uemis_import(device_data_t *data);
-dc_status_t libdc_buffer_parser(struct dive *dive, device_data_t *data, unsigned char *buffer, int size);
-void logfunc(dc_context_t *context, dc_loglevel_t loglevel, const char *file, unsigned int line, const char *function, const char *msg, void *userdata);
-
-extern int import_thread_cancelled;
-extern const char *progress_bar_text;
-extern double progress_bar_fraction;
-extern char *logfile_name;
-extern char *dumpfile_name;
-
-#if SSRF_CUSTOM_SERIAL
-extern dc_status_t dc_serial_qt_open(dc_serial_t **out, dc_context_t *context, const char *devaddr);
-extern dc_status_t dc_serial_ftdi_open(dc_serial_t **out, dc_context_t *context);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // LIBDIVECOMPUTER_H