diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-10-05 10:12:12 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-10-16 14:26:37 -0700 |
| commit | 4a50badb57efd7725fa540ea7bb13f1e334cb83c (patch) | |
| tree | 9e3a9214f4d5510dca8e212bbaa2e7f6e7b3bf5e /core | |
| parent | fd8bd9d5c717799313c4decaa85796ba68449f8a (diff) | |
| download | subsurface-4a50badb57efd7725fa540ea7bb13f1e334cb83c.tar.gz | |
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 <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core')
| -rw-r--r-- | core/device.cpp | 4 | ||||
| -rw-r--r-- | core/device.h | 4 |
2 files changed, 4 insertions, 4 deletions
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<device> &dcs, const divecomputer *dc) +static const device *getDCExact(const std::vector<device> &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<device> &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<device> &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 <string> -#include <QVector> +#include <vector> 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<device> devices; + std::vector<device> devices; }; extern struct device_table device_table; |