flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 20:07:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace occurrences of CVariant::toCVariant() with CVariant::from()

Browse Source
This commit is contained in:
Roland Winklmeier
2015-05-30 00:11:22 +02:00
parent 28d2561a48
commit e4f2c9e88a
49 changed files with 78 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackmisc/pq/physicalquantity.cpp
View File

@@ -345,14 +345,14 @@ namespace BlackMisc
template <class MU, class PQ>
CVariant CPhysicalQuantity<MU, PQ>::propertyByIndex(const CPropertyIndex &index) const
{
if (index.isMyself()) { return this->toCVariant(); }
if (index.isMyself()) { return CVariant::from(*derived()); }
ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexValue:
return CVariant::from(this->m_value);
case IndexUnit:
return this->m_unit.toCVariant();
return CVariant::from(this->m_unit);
case IndexValueRounded0DigitsWithUnit:
return CVariant::from(this->valueRoundedWithUnit(0));
case IndexValueRounded1DigitsWithUnit:

18
src/blackmisc/pq/pqstring.cpp
View File

@@ -49,55 +49,55 @@ namespace BlackMisc
if (CMeasurementUnit::isValidUnitSymbol<CAccelerationUnit>(unit))
{
CAcceleration pq(numberD, CMeasurementUnit::unitFromSymbol<CAccelerationUnit>(unit, false));
return pq.toCVariant();
return CVariant::from(pq);
}
if (CMeasurementUnit::isValidUnitSymbol<CAngleUnit>(unit))
{
CAngle pq(numberD, CMeasurementUnit::unitFromSymbol<CAngleUnit>(unit, false));
return pq.toCVariant();
return CVariant::from(pq);
}
if (CMeasurementUnit::isValidUnitSymbol<CFrequencyUnit>(unit))
{
CFrequency pq(numberD, CMeasurementUnit::unitFromSymbol<CFrequencyUnit>(unit, false));
return pq.toCVariant();
return CVariant::from(pq);
}
if (CMeasurementUnit::isValidUnitSymbol<CLengthUnit>(unit))
{
CLength pq(numberD, CMeasurementUnit::unitFromSymbol<CLengthUnit>(unit, false));
return pq.toCVariant();
return CVariant::from(pq);
}
if (CMeasurementUnit::isValidUnitSymbol<CMassUnit>(unit))
{
CMass pq(numberD, CMeasurementUnit::unitFromSymbol<CMassUnit>(unit, false));
return pq.toCVariant();
return CVariant::from(pq);
}
if (CMeasurementUnit::isValidUnitSymbol<CPressureUnit>(unit))
{
CPressure pq(numberD, CMeasurementUnit::unitFromSymbol<CPressureUnit>(unit, false));
return pq.toCVariant();
return CVariant::from(pq);
}
if (CMeasurementUnit::isValidUnitSymbol<CSpeedUnit>(unit))
{
CSpeed pq(numberD, CMeasurementUnit::unitFromSymbol<CSpeedUnit>(unit, false));
return pq.toCVariant();
return CVariant::from(pq);
}
if (CMeasurementUnit::isValidUnitSymbol<CTimeUnit>(unit))
{
CTime pq(numberD, CMeasurementUnit::unitFromSymbol<CTimeUnit>(unit, false));
return pq.toCVariant();
return CVariant::from(pq);
}
if (CMeasurementUnit::isValidUnitSymbol<CTemperatureUnit>(unit))
{
CTemperature pq(numberD, CMeasurementUnit::unitFromSymbol<CTemperatureUnit>(unit, false));
return pq.toCVariant();
return CVariant::from(pq);
}
return v;
}