root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-23 19:25:54 +01:00
Code Issues Projects Releases Activity

Do not use functions deprecated in Qt 6.8

Browse Source
This commit is contained in:
Martin Tůma 2024-10-16 01:21:28 +02:00
parent 78f2e1f47d
commit 22c7ea7de6
6 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/data/exifparser.cpp
View File

@ -1,4 +1,5 @@
#include <QDataStream>
#include <QTimeZone>
#include "common/tifffile.h"
#include "common/util.h"
#include "exifparser.h"
@ -213,7 +214,7 @@ bool EXIFParser::parseTIFF(QFile *file, QVector<Waypoint> &waypoints)
GPSIFD.value(GPSAltitudeRef)));
wp.setTimestamp(QDateTime(QDate::fromString(text(tiff,
GPSIFD.value(GPSDateStamp)), "yyyy:MM:dd"), time(tiff,
GPSIFD.value(GPSTimeStamp)), Qt::UTC));
GPSIFD.value(GPSTimeStamp)), QTimeZone::utc()));
wp.setDescription(text(tiff, IFD0.value(ImageDescription)).trimmed());
waypoints.append(wp);

9
src/data/fitparser.cpp
View File

@ -1,4 +1,5 @@
#include <QtEndian>
#include <QTimeZone>
#include "GUI/format.h"
#include "fitparser.h"
@ -307,7 +308,7 @@ bool FITParser::parseData(CTX &ctx, const MessageDefinition *def)
switch (field->id) {
case 1:
waypoint.setTimestamp(QDateTime::fromSecsSinceEpoch(
val.toUInt() + 631065600, Qt::UTC));
val.toUInt() + 631065600, QTimeZone::utc()));
break;
case 2:
waypoint.rcoordinates().setLat(
@ -380,7 +381,7 @@ bool FITParser::parseData(CTX &ctx, const MessageDefinition *def)
} else if (def->globalId == RECORD) {
if (ctx.trackpoint.coordinates().isValid()) {
ctx.trackpoint.setTimestamp(QDateTime::fromSecsSinceEpoch(
ctx.timestamp + 631065600, Qt::UTC));
ctx.timestamp + 631065600, QTimeZone::utc()));
ctx.trackpoint.setRatio(ctx.ratio);
ctx.segment.append(ctx.trackpoint);
ctx.trackpoint = Trackpoint();
@ -391,7 +392,7 @@ bool FITParser::parseData(CTX &ctx, const MessageDefinition *def)
} else if (def->globalId == LOCATION) {
if (waypoint.coordinates().isValid()) {
waypoint.setTimestamp(QDateTime::fromSecsSinceEpoch(ctx.timestamp
+ 631065600, Qt::UTC));
+ 631065600, QTimeZone::utc()));
ctx.waypoints.append(waypoint);
}
} else if (def->globalId == LAP && trigger >= 0) {
@ -401,7 +402,7 @@ bool FITParser::parseData(CTX &ctx, const MessageDefinition *def)
else
waypoint.setName("Lap " + QString::number(++ctx.laps));
waypoint.setTimestamp(QDateTime::fromSecsSinceEpoch(ctx.timestamp
+ 631065600, Qt::UTC));
+ 631065600, QTimeZone::utc()));
if (trigger != 7 || ctx.laps > 1)
ctx.waypoints.append(waypoint);
}

3
src/data/igcparser.cpp
View File

@ -1,4 +1,5 @@
#include <cstring>
#include <QTimeZone>
#include "common/util.h"
#include "igcparser.h"
@ -160,7 +161,7 @@ bool IGCParser::readBRecord(CTX &ctx, const char *line, int len,
ctx.time = time;
Trackpoint t(Coordinates(lon, lat));
t.setTimestamp(QDateTime(ctx.date, ctx.time, Qt::UTC));
t.setTimestamp(QDateTime(ctx.date, ctx.time, QTimeZone::utc()));
t.setElevation(ele);
segment.append(t);

8
src/data/nmeaparser.cpp
View File

@ -1,4 +1,5 @@
#include <cstring>
#include <QTimeZone>
#include "common/util.h"
#include "nmeaparser.h"
@ -282,7 +283,8 @@ bool NMEAParser::readRMC(CTX &ctx, const char *line, int len,
if (!date.isNull()) {
if (ctx.date.isNull() && !ctx.time.isNull() && !segment.isEmpty())
segment.last().setTimestamp(QDateTime(date, ctx.time, Qt::UTC));
segment.last().setTimestamp(QDateTime(date, ctx.time,
QTimeZone::utc()));
ctx.date = date;
}
@ -290,7 +292,7 @@ bool NMEAParser::readRMC(CTX &ctx, const char *line, int len,
if (valid && !ctx.GGA && c.isValid()) {
Trackpoint t(c);
if (!ctx.date.isNull() && !time.isNull())
t.setTimestamp(QDateTime(ctx.date, time, Qt::UTC));
t.setTimestamp(QDateTime(ctx.date, time, QTimeZone::utc()));
segment.append(t);
}
@ -363,7 +365,7 @@ bool NMEAParser::readGGA(CTX &ctx, const char *line, int len,
if (c.isValid()) {
Trackpoint t(c);
if (!(ctx.time.isNull() || ctx.date.isNull()))
t.setTimestamp(QDateTime(ctx.date, ctx.time, Qt::UTC));
t.setTimestamp(QDateTime(ctx.date, ctx.time, QTimeZone::utc()));
if (!std::isnan(ele))
t.setElevation(ele - gh);
segment.append(t);

8
src/data/onmoveparsers.cpp
View File

@ -46,7 +46,7 @@ bool OMDParser::readHeaderFile(const QString &omdPath, Header &hdr)
quint8 avgHr = buffer[12];
quint8 maxHr = buffer[13];
QDateTime date(QDate(Y + 2000, M, D), QTime(h, m), Qt::UTC);
QDateTime date(QDate(Y + 2000, M, D), QTime(h, m), QTimeZone::utc());
if (!date.isValid()) {
qWarning("%s: invalid date", qPrintable(path));
return false;
@ -80,7 +80,7 @@ bool OMDParser::readF1(const char *chunk, const Header &hdr, Sequence &seq,
return false;
}
t.setTimestamp(QDateTime(hdr.date.date(),
hdr.date.time().addSecs(sec), Qt::UTC));
hdr.date.time().addSecs(sec), QTimeZone::utc()));
if (hdr.elevation)
t.setElevation(alt);
@ -200,7 +200,7 @@ bool GHPParser::readHeaderFile(const QString &ghpPath, Header &hdr)
quint8 avgHr = buffer[61];
quint8 maxHr = buffer[60];
QDateTime date(QDate(Y + 2000, M, D), QTime(h, m, s), Qt::UTC);
QDateTime date(QDate(Y + 2000, M, D), QTime(h, m, s), QTimeZone::utc());
if (!date.isValid()) {
qWarning("%s: invalid date", qPrintable(path));
return false;
@ -230,7 +230,7 @@ bool GHPParser::readF0(const char *chunk, const Header &hdr, int &time,
return false;
}
t.setTimestamp(QDateTime(hdr.date.date(),
hdr.date.time().addMSecs(time * 100), Qt::UTC));
hdr.date.time().addMSecs(time * 100), QTimeZone::utc()));
t.setSpeed(speed / 360.0);
t.setElevation(alt);
if (hdr.hr)

9
src/data/onmoveparsers.h
View File

@ -1,6 +1,7 @@
#ifndef ONMOVEPARSERS_H
#define ONMOVEPARSERS_H
#include <QTimeZone>
#include "parser.h"
class OMDParser : public Parser
@ -14,8 +15,8 @@ public:
private:
struct Header
{
Header() : date(QDateTime(QDate(1970, 1, 1), QTime(0, 0), Qt::UTC)),
elevation(true), hr(true) {}
Header() : date(QDateTime(QDate(1970, 1, 1), QTime(0, 0),
QTimeZone::utc())), elevation(true), hr(true) {}
QDateTime date;
bool elevation;
@ -50,8 +51,8 @@ public:
private:
struct Header
{
Header() : date(QDateTime(QDate(1970, 1, 1), QTime(0, 0), Qt::UTC)),
hr(true) {}
Header() : date(QDateTime(QDate(1970, 1, 1), QTime(0, 0),
QTimeZone::utc())), hr(true) {}
QDateTime date;
bool hr;