From 4b1504a9775247489a056fbd95a494e787037bd6 Mon Sep 17 00:00:00 2001 From: andrey Date: Wed, 21 Oct 2020 20:12:48 +0300 Subject: [PATCH] update to pip 2.14 --- libs/piqt/piqt.cpp | 2 +- libs/piqt/piqt.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/piqt/piqt.cpp b/libs/piqt/piqt.cpp index 574cf1c..5e84b3c 100644 --- a/libs/piqt/piqt.cpp +++ b/libs/piqt/piqt.cpp @@ -136,6 +136,6 @@ const QGeoCoordinate PI2QGeoPosition(const PIGeoPosition & v) { const PIGeoPosition Q2PIGeoPosition(const QGeoCoordinate & v) { - return PIGeoPosition(createVectorT3d(v.latitude(), v.longitude(), v.altitude()), PIGeoPosition::Geodetic); + return PIGeoPosition(PIMathVectorT3d({v.latitude(), v.longitude(), v.altitude()}), PIGeoPosition::Geodetic); } #endif diff --git a/libs/piqt/piqt.h b/libs/piqt/piqt.h index 03887eb..71e6493 100644 --- a/libs/piqt/piqt.h +++ b/libs/piqt/piqt.h @@ -58,8 +58,8 @@ inline const PIByteArray Q2PIByteArray(const QByteArray & v) {return PIByteArray inline const QPointF PI2QVector2(const PIMathVectorT2d & v) {return QPointF(v[0], v[1]);} inline const QVector3D PI2QVector3(const PIMathVectorT3d & v) {return QVector3D(v[0], v[1], v[2]);} -inline const PIMathVectorT2d Q2PIVector2(const QPointF & v) {return createVectorT2d(double(v.x()), double(v.y()));} -inline const PIMathVectorT3d Q2PIVector3(const QVector3D & v) {return createVectorT3d(double(v.x()), double(v.y()), double(v.z()));} +inline const PIMathVectorT2d Q2PIVector2(const QPointF & v) {return PIMathVectorT2d({double(v.x()), double(v.y())});} +inline const PIMathVectorT3d Q2PIVector3(const QVector3D & v) {return PIMathVectorT3d({double(v.x()), double(v.y()), double(v.z())});} inline const QPointF PI2QPoint(const PIPointd & v) {return QPointF(v.x, v.y);} inline const PIPointd Q2PIPoint(const QPointF & v) {return PIPointd(v.x(), v.y());}