diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-09-13 19:08:41 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-09-13 13:54:59 -0700 |
| commit | a01ab817139be16906c30f89e16a0a3fbbe026cd (patch) | |
| tree | bd77786542d82f0a3f2fccd6079e70f1f4e118f3 /qt-models/divecomputermodel.h | |
| parent | fcdb48779b0e109942ad2261670c6fc9344e2da3 (diff) | |
| download | subsurface-a01ab817139be16906c30f89e16a0a3fbbe026cd.tar.gz | |
cleanup: fold core/divecomputer.cpp into core/device.c
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>
Diffstat (limited to 'qt-models/divecomputermodel.h')
| -rw-r--r-- | qt-models/divecomputermodel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qt-models/divecomputermodel.h b/qt-models/divecomputermodel.h index f1e3a0a38..8c2373695 100644 --- a/qt-models/divecomputermodel.h +++ b/qt-models/divecomputermodel.h @@ -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 |