From 4a50badb57efd7725fa540ea7bb13f1e334cb83c Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Mon, 5 Oct 2020 10:12:12 +0200 Subject: cleanup: use std::vector in struct device_table Since we converted from QString to std::string, let's also use std::vector instead of QVector. We don't need COW semantics and all the rigmarole. Let's try to keep Qt data structures out of the core. Signed-off-by: Berthold Stoeger --- core/device.cpp | 4 ++-- core/device.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'core') diff --git a/core/device.cpp b/core/device.cpp index 39b3bc61b..21a53e2f6 100644 --- a/core/device.cpp +++ b/core/device.cpp @@ -213,7 +213,7 @@ bool device::operator<(const device &a) const return std::tie(deviceId, model) < std::tie(a.deviceId, a.model); } -static const device *getDCExact(const QVector &dcs, const divecomputer *dc) +static const device *getDCExact(const std::vector &dcs, const divecomputer *dc) { auto it = std::lower_bound(dcs.begin(), dcs.end(), device{dc->model, dc->deviceid, {}, {}, {}}); return it != dcs.end() && it->model == dc->model && it->deviceId == dc->deviceid ? &*it : NULL; @@ -258,7 +258,7 @@ void device::showchanges(const std::string &n, const std::string &s, const std:: qDebug("new firmware version %s for DC model %s deviceId 0x%x", f.c_str(), model.c_str(), deviceId); } -static void addDC(QVector &dcs, const std::string &m, uint32_t d, const std::string &n, const std::string &s, const std::string &f) +static void addDC(std::vector &dcs, const std::string &m, uint32_t d, const std::string &n, const std::string &s, const std::string &f) { if (m.empty() || d == 0) return; diff --git a/core/device.h b/core/device.h index 90d67bb5e..28ad696bb 100644 --- a/core/device.h +++ b/core/device.h @@ -26,7 +26,7 @@ const char *get_dc_nickname(const struct divecomputer *dc); #ifdef __cplusplus #include -#include +#include struct device { bool operator==(const device &a) const; bool operator!=(const device &a) const; @@ -41,7 +41,7 @@ struct device { struct device_table { // Keep the dive computers in a vector sorted by (model, deviceId) - QVector devices; + std::vector devices; }; extern struct device_table device_table; -- cgit v1.2.3-70-g09d2