From a01ab817139be16906c30f89e16a0a3fbbe026cd Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sun, 13 Sep 2020 19:08:41 +0200 Subject: 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 --- qt-models/divecomputermodel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qt-models') 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 -- cgit v1.2.3-70-g09d2