mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: remove redundant prototypes from dive.h

Browse source 
A few of these prototypes were already in import-csv.h.
Put them in an 'extern "C" { ... }' block.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-09-28 12:09:18 +02:00 committed by Dirk Hohndel
parent 2e6df623bb
commit 3137fbe973
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/dive.h
View file

@ -506,10 +506,6 @@ extern int parse_divinglog_buffer(sqlite3 *handle, const char *url, const char *
extern int parse_dlf_buffer(unsigned char *buffer, size_t size, struct dive_table *table);
extern int parse_file(const char *filename, struct dive_table *table);
extern int parse_csv_file(const char *filename, char **params, int pnr, const char *csvtemplate);
extern int parse_seabear_log(const char *filename);
extern int parse_txt_file(const char *filename, const char *csv);
extern int parse_manual_file(const char *filename, char **params, int pnr);
extern int save_dives(const char *filename);
extern int save_dives_logic(const char *filename, bool select_only, bool anonymize);
extern int save_dive(FILE *f, struct dive *dive, bool anonymize);

8
core/import-csv.h
View file

@ -17,6 +17,10 @@ enum csv_format {
#define MAXCOLDIGITS 10
#ifdef __cplusplus
extern "C" {
#endif
int parse_csv_file(const char *filename, char **params, int pnr, const char *csvtemplate);
int try_to_open_csv(struct memblock *mem, enum csv_format type);
int parse_txt_file(const char *filename, const char *csv);
@ -24,4 +28,8 @@ int parse_txt_file(const char *filename, const char *csv);
int parse_seabear_log(const char *filename);
int parse_manual_file(const char *filename, char **params, int pnr);
#ifdef __cplusplus
}
#endif
#endif // IMPORTCSV_H

1
desktop-widgets/mainwindow.cpp
View file

@ -23,6 +23,7 @@
#include "core/gettextfromc.h"
#include "core/git-access.h"
#include "core/isocialnetworkintegration.h"
#include "core/import-csv.h"
#include "core/planner.h"
#include "core/pluginmanager.h"
#include "core/qthelper.h"

1
tests/testparse.cpp
View file

@ -3,6 +3,7 @@
#include "core/dive.h"
#include "core/divelist.h"
#include "core/file.h"
#include "core/import-csv.h"
#include "core/parse.h"
#include "core/qthelper.h"
#include "core/subsurface-string.h"