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 --- core/divecomputer.h | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 core/divecomputer.h (limited to 'core/divecomputer.h') diff --git a/core/divecomputer.h b/core/divecomputer.h deleted file mode 100644 index c92d56558..000000000 --- a/core/divecomputer.h +++ /dev/null @@ -1,35 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#ifndef DIVECOMPUTER_H -#define DIVECOMPUTER_H - -#include -#include -#include - -class DiveComputerNode { -public: - bool operator==(const DiveComputerNode &a) const; - bool operator!=(const DiveComputerNode &a) const; - bool operator<(const DiveComputerNode &a) const; - void showchanges(const QString &n, const QString &s, const QString &f) const; - QString model; - uint32_t deviceId; - QString serialNumber; - QString firmware; - QString nickName; -}; - -class DiveComputerList { -public: - const DiveComputerNode *getExact(const QString &m, uint32_t d); - const DiveComputerNode *get(const QString &m); - void addDC(QString m, uint32_t d, QString n = QString(), QString s = QString(), QString f = QString()); - - // Keep the dive computers in a vector sorted by (model, deviceId) - QVector dcs; -}; - -QString get_dc_nickname(const struct divecomputer *dc); -extern DiveComputerList dcList; - -#endif -- cgit v1.2.3-70-g09d2