Cleanup: Unify qthelper.h and qthelperfromc.h

Since all qt-helpers are defined in qthelper.cpp, there seems to be
no reason to have two include files. By unifying the two files,
duplication and inconsistencies are removed. The C++-only part is
simply compiled away with #ifdefs.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-02-24 23:28:13 +01:00 committed by Lubomir I. Ivanov
parent e2a6b96db8
commit cd5e17cf79
19 changed files with 65 additions and 73 deletions

View file

@ -17,7 +17,7 @@
#include "libdivecomputer/parser.h"
#include "libdivecomputer/version.h"
#include "membuffer.h"
#include "qthelperfromc.h"
#include "qthelper.h"
//#define DEBUG_GAS 1
@ -30,8 +30,6 @@ unsigned int dc_number = 0;
static struct plot_data *last_pi_entry_new = NULL;
void populate_pressure_information(struct dive *, struct divecomputer *, struct plot_info *, int);
extern bool in_planner();
#ifdef DEBUG_PI
/* debugging tool - not normally used */
static void dump_pi(struct plot_info *pi)