root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-02-21 10:10:49 +01:00
Code Issues Projects Releases Activity

Fixed Qt4 build

Browse Source
This commit is contained in:
Martin Tůma 2019-11-08 01:04:17 +01:00
parent 3632ed8816
commit d292b5f533
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/data/gpiparser.cpp
View File

@ -7,7 +7,9 @@
#include <QBuffer> #include <QBuffer>
#include <QImageReader> #include <QImageReader>
#include <QCryptographicHash> #include <QCryptographicHash>
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#include <QTemporaryDir> #include <QTemporaryDir>
#endif // QT_VERSION >= 5
#include "gpiparser.h" #include "gpiparser.h"
@ -110,13 +112,6 @@ qint64 CryptDevice::readData(char *data, qint64 maxSize)
return ts; return ts;
} }
static const QTemporaryDir &tempDir()
{
static QTemporaryDir dir;
return dir;
}
static inline double toWGS(qint32 v) static inline double toWGS(qint32 v)
{ {
return (double)(((double)v / (double)(1U<<31)) * (double)180); return (double)(((double)v / (double)(1U<<31)) * (double)180);
@ -330,6 +325,13 @@ static quint32 readContact(QDataStream &stream, QTextCodec *codec,
return rs + rh.size; return rs + rh.size;
} }
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
static const QTemporaryDir &tempDir()
{
static QTemporaryDir dir;
return dir;
}
static quint32 readImageInfo(QDataStream &stream, Waypoint &waypoint, static quint32 readImageInfo(QDataStream &stream, Waypoint &waypoint,
const QString &fileName, int &imgId) const QString &fileName, int &imgId)
{ {
@ -362,6 +364,7 @@ static quint32 readImageInfo(QDataStream &stream, Waypoint &waypoint,
return rs + rh.size; return rs + rh.size;
} }
#endif // QT_VERSION >= 5
static quint32 readPOI(QDataStream &stream, QTextCodec *codec, static quint32 readPOI(QDataStream &stream, QTextCodec *codec,
QVector<Waypoint> &waypoints, const QString &fileName, int &imgId) QVector<Waypoint> &waypoints, const QString &fileName, int &imgId)
@ -391,9 +394,11 @@ static quint32 readPOI(QDataStream &stream, QTextCodec *codec,
case 12: case 12:
ds += readContact(stream, codec, waypoints.last()); ds += readContact(stream, codec, waypoints.last());
break; break;
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
case 13: case 13:
ds += readImageInfo(stream, waypoints.last(), fileName, imgId); ds += readImageInfo(stream, waypoints.last(), fileName, imgId);
break; break;
#endif // QT_VERSION >= 5
case 14: case 14:
ds += readNotes(stream, codec, waypoints.last()); ds += readNotes(stream, codec, waypoints.last());
break; break;