diff options
author | Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-05-22 18:53:25 +0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2020-05-22 12:31:06 -0700 |
commit | 8f80129bac29227a03c35940af9d197ef0fa6398 (patch) | |
tree | 40cd682efb11880af5410aab700dcd9d8bacbe72 /core/gpslocation.cpp | |
parent | e33e420ef3e5139015504ef49215721e99850f2b (diff) | |
download | subsurface-8f80129bac29227a03c35940af9d197ef0fa6398.tar.gz |
cleanup: create common QDateTime -> timestamp conversion function
In analogy to the timestamp -> QDateTime conversion, create a
common function.
1) For symmetry with the opposite conversion.
2) To remove numerous inconsistencies.
3) To remove use of the deprecated QDateTime::toTime_t() function.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/gpslocation.cpp')
-rw-r--r-- | core/gpslocation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/gpslocation.cpp b/core/gpslocation.cpp index ebd5b1950..cc11fa15e 100644 --- a/core/gpslocation.cpp +++ b/core/gpslocation.cpp @@ -169,7 +169,7 @@ void GpsLocation::newPosition(QGeoPositionInfo pos) // if we are waiting for a position update or // if we have no record stored or if at least the configured minimum // time has passed or we moved at least the configured minimum distance - int64_t delta = (int64_t)pos.timestamp().toTime_t() + gettimezoneoffset() - lastTime; + int64_t delta = dateTimeToTimestamp(pos.timestamp()) + gettimezoneoffset() - lastTime; if (!nr || waitingForPosition || delta > prefs.time_threshold || lastCoord.distanceTo(pos.coordinate()) > prefs.distance_threshold) { QString msg = QStringLiteral("received new position %1 after delta %2 threshold %3 (now %4 last %5)"); @@ -177,7 +177,7 @@ void GpsLocation::newPosition(QGeoPositionInfo pos) waitingForPosition = false; acquiredPosition(); gpsTracker gt; - gt.when = pos.timestamp().toTime_t(); + gt.when = dateTimeToTimestamp(pos.timestamp()); gt.when += gettimezoneoffset(gt.when); gt.location = create_location(pos.coordinate().latitude(), pos.coordinate().longitude()); addFixToStorage(gt); |