diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-10-03 11:18:42 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-10-03 10:53:26 -0700 |
| commit | 5bc6f5d36c491b305f66a03c8400666ccda0b044 (patch) | |
| tree | 05dc2aadb40aaede4501b393677e506d04d72aec /qt-models | |
| parent | 90ca6353167071af57028975dc650cd027605372 (diff) | |
| download | subsurface-5bc6f5d36c491b305f66a03c8400666ccda0b044.tar.gz | |
cleanup: make device code more consistent with core
We keep track of device, i.e. distinct dive computers with id in the core.
The corresponding code stuck out like a sore thumb. Firstly, because it
is C++. But more importantly, because it used inconsistent nameing conventions.
Notably it defined a "DiveComputerNode" when this is something very different
from "struct dive_computer", the latter being the dive-computer related
data of a single dive.
Since the whole thing is defined in "device.h" and the function to create
such an entry is called "create_device_node", call the structure "device".
Use snake_case for consistency with the other core structures.
Moreover, call the collection of devices "device_table" in analogy
with "dive_table", etc.
Overall, this should make the core code more consistent style-wise.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'qt-models')
| -rw-r--r-- | qt-models/divecomputermodel.cpp | 10 | ||||
| -rw-r--r-- | qt-models/divecomputermodel.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/qt-models/divecomputermodel.cpp b/qt-models/divecomputermodel.cpp index 22426f361..7c562c35c 100644 --- a/qt-models/divecomputermodel.cpp +++ b/qt-models/divecomputermodel.cpp @@ -4,7 +4,7 @@ #include "core/divelist.h" DiveComputerModel::DiveComputerModel(QObject *parent) : CleanerTableModel(parent), - dcs(dcList.dcs) + dcs(device_table.devices) { setHeaderDataStrings(QStringList() << "" << tr("Model") << tr("Device ID") << tr("Nickname")); } @@ -13,7 +13,7 @@ QVariant DiveComputerModel::data(const QModelIndex &index, int role) const { if (index.row() < 0 || index.row() >= dcs.size()) return QVariant(); - const DiveComputerNode &node = dcs[index.row()]; + const device &node = dcs[index.row()]; if (role == Qt::DisplayRole || role == Qt::EditRole) { switch (index.column()) { @@ -58,7 +58,7 @@ bool DiveComputerModel::setData(const QModelIndex &index, const QVariant &value, if (index.row() < 0 || index.row() >= dcs.size()) return false; - DiveComputerNode &node = dcs[index.row()]; + device &node = dcs[index.row()]; node.nickName = value.toString(); emit dataChanged(index, index); return true; @@ -75,7 +75,7 @@ void DiveComputerModel::remove(const QModelIndex &index) void DiveComputerModel::keepWorkingList() { - if (dcList.dcs != dcs) + if (device_table.devices != dcs) mark_divelist_changed(true); - dcList.dcs = dcs; + device_table.devices = dcs; } diff --git a/qt-models/divecomputermodel.h b/qt-models/divecomputermodel.h index 8c2373695..ab352513c 100644 --- a/qt-models/divecomputermodel.h +++ b/qt-models/divecomputermodel.h @@ -26,7 +26,7 @@ slots: void remove(const QModelIndex &index); private: - QVector<DiveComputerNode> dcs; + QVector<device> dcs; }; #endif |