mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup: fold core/divecomputer.cpp into core/device.c

Browse source 
core/device.h was declaring a number of functions that were related
to divecomputers (dcs): creating a fake dc for manually entered dives
and registering / accessing dc nicknames. On could argue whether
these should be lumped together, but it is what it is.

However, part of that was implemented in C++/Qt code in a separate
core/divecomputer.cpp file. Some function therein where only
accessible to C++ and declared in core/divecomputer.h.

All in all, a big mess. Let's simply combine the files and
conditionally compile the C++-only functions depending on
the __cplusplus define.

Yes, that means turning device.c into device.cpp. A brave soul
might turn the C++/Qt code into C code if they whish later on.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-09-13 19:08:41 +02:00 • committed by Dirk Hohndel
parent fcdb48779b
commit a01ab81713
8 changed files with 200 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

2
qt-models/divecomputermodel.h
View file

@ -3,7 +3,7 @@
#define DIVECOMPUTERMODEL_H
#include "qt-models/cleanertablemodel.h"
#include "core/divecomputer.h"
#include "core/device.h"
class DiveComputerModel : public CleanerTableModel {
Q_OBJECT