diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-12-15 16:10:08 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-12-17 13:03:56 -0800 |
| commit | 1037c15b98bf9e2e4734e9e6ee2d5c6387f131a9 (patch) | |
| tree | 0b9c8800f405893c18e8ea74242ddc3b6e8dae21 /core | |
| parent | cc5ebd741486c3231b50974959de2f5d842b8fa5 (diff) | |
| download | subsurface-1037c15b98bf9e2e4734e9e6ee2d5c6387f131a9.tar.gz | |
mobile: remove DiveObjectHelper code
When editing a dive, a DiveObjectHelper of the unmodified dive
was created to compare the edited with the old values. Since
the DiveObjectHelper is used here only as a pointless wrapper
around the formatting functions, call these functions directly.
However, note that the code is in principle wrong since the
change to the mobile-models, which do not use the DiveObjectHelper.
The real fix would be to reload the data from the model to prevent
going out-of-sync with respect to the formatting routines!
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core')
| -rw-r--r-- | core/string-format.cpp | 7 | ||||
| -rw-r--r-- | core/string-format.h | 1 | ||||
| -rw-r--r-- | core/subsurface-qt/diveobjecthelper.h | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/core/string-format.cpp b/core/string-format.cpp index 9de145b7a..5652a15bf 100644 --- a/core/string-format.cpp +++ b/core/string-format.cpp @@ -250,3 +250,10 @@ QString formatDiveTime(const dive *d) QDateTime localTime = timestampToDateTime(d->when); return localTime.time().toString(prefs.time_format); } + +QString formatDiveDateTime(const dive *d) +{ + QDateTime localTime = timestampToDateTime(d->when); + return QStringLiteral("%1 %2").arg(localTime.date().toString(prefs.date_format_short), + localTime.time().toString(prefs.time_format)); +} diff --git a/core/string-format.h b/core/string-format.h index 12f36bd11..54a40b890 100644 --- a/core/string-format.h +++ b/core/string-format.h @@ -24,5 +24,6 @@ QString formatDiveDuration(const dive *d); QString formatDiveGPS(const dive *d); QString formatDiveDate(const dive *d); QString formatDiveTime(const dive *d); +QString formatDiveDateTime(const dive *d); #endif diff --git a/core/subsurface-qt/diveobjecthelper.h b/core/subsurface-qt/diveobjecthelper.h index 30dee6bf7..8b328673f 100644 --- a/core/subsurface-qt/diveobjecthelper.h +++ b/core/subsurface-qt/diveobjecthelper.h @@ -96,6 +96,4 @@ public: QString waterType; }; -Q_DECLARE_METATYPE(DiveObjectHelper) - #endif |