diff options
author | Tomaz Canabrava <tcanabrava@kde.org> | 2013-09-09 05:59:03 -0300 |
---|---|---|
committer | Tomaz Canabrava <tcanabrava@kde.org> | 2013-09-09 05:59:03 -0300 |
commit | 96d1cc570e31396039e4970d2bf75d5f00f1e550 (patch) | |
tree | 526ddda7c6c32d20d4698a4451fa7834ae78a07f /subsurfacestartup.h | |
parent | 6a7256fdd5609b3792b2b0e6a3e85203d0ee8206 (diff) | |
download | subsurface-96d1cc570e31396039e4970d2bf75d5f00f1e550.tar.gz |
Use the same code for command line and gui for file handling.
The Command line execution of Subsurface happened before the
GUI was created, this leaded to various bugs by me(tm) over
time. This patch seems to fix all of those, by reusing the
same code for GUI interaction and CommandLine interaction.
I had to rework how the main.c worked, it used to be C code
calling C++ code, and this is non desirable, since C doesn't
really understand C++.
I Moved all of C-related code to 'subsurfacestartup.c/h' and
created a tiny wrapper to call it, so all of the C code is still
C code, and the new main.cpp calls the mainwindow->loadFiles and
mainWindow->importFiles to get rid of the bugs that happened before.
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Diffstat (limited to 'subsurfacestartup.h')
-rw-r--r-- | subsurfacestartup.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/subsurfacestartup.h b/subsurfacestartup.h new file mode 100644 index 000000000..8a2420345 --- /dev/null +++ b/subsurfacestartup.h @@ -0,0 +1,25 @@ +#ifndef SUBSURFACESTARTUP_H +#define SUBSURFACESTARTUP_H + +#include "dive.h" +#include "divelist.h" +#include "libdivecomputer.h" +#include "version.h" +#include <stdbool.h> + +#ifdef __cplusplus +extern "C" { +#endif + +extern struct preferences prefs; +extern struct preferences default_prefs; +extern bool imported; + +void setup_system_prefs(void); +void parse_argument(const char *arg); + +#ifdef __cplusplus +} +#endif + +#endif |