diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-17 14:38:20 -0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-09-18 14:01:05 -0700 |
| commit | 09ded17e1cae66e1aef95cbe5c3b86dd196c9be9 (patch) | |
| tree | 61d49c229e07d24c2ec8f47cb2afd82445e77859 /divecomputer.h | |
| parent | ca6f2c238aec0fd9dc0b12fad2df4028cf097fbb (diff) | |
| download | subsurface-09ded17e1cae66e1aef95cbe5c3b86dd196c9be9.tar.gz | |
Fix divecomputer nickname handling
Don't overwrite existing data.
[Dirk Hohndel: rewrote this a litte, but the logic is the same]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'divecomputer.h')
| -rw-r--r-- | divecomputer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/divecomputer.h b/divecomputer.h index 81399c47d..98d12ab8b 100644 --- a/divecomputer.h +++ b/divecomputer.h @@ -12,6 +12,7 @@ public: bool operator==(const DiveComputerNode &a) const; bool operator!=(const DiveComputerNode &a) const; bool changesValues(const DiveComputerNode &b) const; + void showchanges(const QString &n, const QString &s, const QString &f) const; QString model; uint32_t deviceId; QString serialNumber; @@ -25,7 +26,7 @@ public: ~DiveComputerList(); const DiveComputerNode *getExact(const QString &m, uint32_t d); const DiveComputerNode *get(const QString &m); - void addDC(const QString &m, uint32_t d, const QString &n = QString(), const QString &s = QString(), const QString &f = QString()); + void addDC(QString m, uint32_t d, QString n = QString(), QString s = QString(), QString f = QString()); DiveComputerNode matchDC(const QString &m, uint32_t d); DiveComputerNode matchModel(const QString &m); QMultiMap<QString, DiveComputerNode> dcMap; |