piqt const remove
This commit is contained in:
@@ -8,25 +8,25 @@
|
||||
#endif
|
||||
|
||||
|
||||
const QAD::Enum PI2QADEnum(const PIVariantTypes::Enum & el) {
|
||||
QAD::Enum PI2QADEnum(const PIVariantTypes::Enum & el) {
|
||||
QAD::Enum ret;
|
||||
piForeachC(PIVariantTypes::Enumerator & e, el.enum_list)
|
||||
for (const auto & e: el.enum_list)
|
||||
ret << QAD::Enumerator(e.value, PI2QString(e.name));
|
||||
ret.selectValue(el.selectedValue());
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
const PIVariantTypes::Enum QAD2PIEnum(const QAD::Enum & el) {
|
||||
PIVariantTypes::Enum QAD2PIEnum(const QAD::Enum & el) {
|
||||
PIVariantTypes::Enum ret;
|
||||
foreach(const QAD::Enumerator & e, el.enum_list)
|
||||
for (const auto & e: el.enum_list)
|
||||
ret << PIVariantTypes::Enumerator(e.value, Q2PIString(e.name));
|
||||
ret.selectValue(el.selectedValue());
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
const QVariant PI2QVariant(const PIVariant & v) {
|
||||
QVariant PI2QVariant(const PIVariant & v) {
|
||||
switch (v.type()) {
|
||||
case PIVariant::pivBool: return QVariant(v.toBool());
|
||||
case PIVariant::pivChar:
|
||||
@@ -63,7 +63,7 @@ const QVariant PI2QVariant(const PIVariant & v) {
|
||||
}
|
||||
|
||||
|
||||
const PIVariant Q2PIVariant(const QVariant & v) {
|
||||
PIVariant Q2PIVariant(const QVariant & v) {
|
||||
#if QT_VERSION_MAJOR <= 5
|
||||
switch (v.type()) {
|
||||
#else
|
||||
@@ -184,7 +184,7 @@ const PIVariant Q2PIVariant(const QVariant & v) {
|
||||
}
|
||||
|
||||
|
||||
const PIVariantTypes::IODevice QAD2PIIODevice(const QAD::IODevice & v) {
|
||||
PIVariantTypes::IODevice QAD2PIIODevice(const QAD::IODevice & v) {
|
||||
PIVariantTypes::IODevice d;
|
||||
d.set(Q2PIPropertyStorage(v.props));
|
||||
d.prefix = Q2PIString(v.prefix);
|
||||
@@ -194,33 +194,33 @@ const PIVariantTypes::IODevice QAD2PIIODevice(const QAD::IODevice & v) {
|
||||
}
|
||||
|
||||
|
||||
const QAD::IODevice PI2QADIODevice(const PIVariantTypes::IODevice & v) {
|
||||
QAD::IODevice PI2QADIODevice(const PIVariantTypes::IODevice & v) {
|
||||
return QAD::IODevice(PI2QString(v.prefix), PI2QPropertyStorage(v.get()), v.mode, v.options);
|
||||
}
|
||||
|
||||
|
||||
const QAD::File PI2QADFile(const PIVariantTypes::File & v) {
|
||||
QAD::File PI2QADFile(const PIVariantTypes::File & v) {
|
||||
return QAD::File(PI2QString(v.file), PI2QString(v.filter), v.is_abs, v.is_save);
|
||||
}
|
||||
|
||||
|
||||
const QAD::Dir PI2QADDir(const PIVariantTypes::Dir & v) {
|
||||
QAD::Dir PI2QADDir(const PIVariantTypes::Dir & v) {
|
||||
return QAD::Dir(PI2QString(v.dir), v.is_abs);
|
||||
}
|
||||
|
||||
|
||||
const PIVariantTypes::File QAD2PIFile(const QAD::File & v) {
|
||||
PIVariantTypes::File QAD2PIFile(const QAD::File & v) {
|
||||
return PIVariantTypes::File(Q2PIString(v.file), Q2PIString(v.filter), v.is_abs, v.is_save);
|
||||
}
|
||||
|
||||
|
||||
const PIVariantTypes::Dir QAD2PIDir(const QAD::Dir & v) {
|
||||
PIVariantTypes::Dir QAD2PIDir(const QAD::Dir & v) {
|
||||
return PIVariantTypes::Dir(Q2PIString(v.dir), v.is_abs);
|
||||
}
|
||||
|
||||
|
||||
#ifdef PIQT_HAS_GEOPOSITION
|
||||
const QGeoCoordinate PI2QGeoPosition(const PIGeoPosition & v) {
|
||||
QGeoCoordinate PI2QGeoPosition(const PIGeoPosition & v) {
|
||||
PIGeoPosition p(v);
|
||||
p.transformTo(PIGeoPosition::Cartesian);
|
||||
p.setEllipsoidModel(PIEllipsoidModel::WGS84Ellipsoid());
|
||||
@@ -229,7 +229,7 @@ const QGeoCoordinate PI2QGeoPosition(const PIGeoPosition & v) {
|
||||
}
|
||||
|
||||
|
||||
const PIGeoPosition Q2PIGeoPosition(const QGeoCoordinate & v) {
|
||||
PIGeoPosition Q2PIGeoPosition(const QGeoCoordinate & v) {
|
||||
return PIGeoPosition(PIMathVectorT3d({v.latitude(), v.longitude(), v.altitude()}), PIGeoPosition::Geodetic);
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user