refs #437, remove convertFromCVariant

This commit is contained in:
Klaus Basan
2015-05-31 01:31:09 +02:00
parent dc918dfaba
commit e04ada3a7c
38 changed files with 51 additions and 185 deletions

View File

@@ -225,11 +225,7 @@ namespace BlackMisc
void CAircraft::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
{
if (index.isMyself())
{
this->convertFromCVariant(variant);
return;
}
if (index.isMyself()) { (*this) = variant.to<CAircraft>(); return; }
ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{

View File

@@ -108,12 +108,7 @@ namespace BlackMisc
void CAircraftIcaoCode::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
{
if (index.isMyself())
{
this->convertFromCVariant(variant);
return;
}
if (index.isMyself()) { (*this) = variant.to<CAircraftIcaoCode>(); return; }
ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{

View File

@@ -96,12 +96,7 @@ namespace BlackMisc
void CAircraftIcaoData::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
{
if (index.isMyself())
{
this->convertFromCVariant(variant);
return;
}
if (index.isMyself()) { (*this) = variant.to<CAircraftIcaoData>(); return; }
ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{

View File

@@ -75,12 +75,7 @@ namespace BlackMisc
void CAircraftLights::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
{
if (index.isMyself())
{
this->convertFromCVariant(variant);
return;
}
if (index.isMyself()) { (*this) = variant.to<CAircraftLights>(); return; }
ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{

View File

@@ -61,11 +61,7 @@ namespace BlackMisc
void CAircraftParts::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
{
if (index.isMyself())
{
this->convertFromCVariant(variant);
return;
}
if (index.isMyself()) { (*this) = variant.to<CAircraftParts>(); return; }
if (ITimestampBased::canHandleIndex(index))
{
ITimestampBased::setPropertyByIndex(variant, index);
@@ -76,7 +72,7 @@ namespace BlackMisc
switch (i)
{
case IndexEngines:
this->m_engines = variant.to<decltype(this->m_engines)>();
this->m_engines = variant.to < decltype(this->m_engines) > ();
break;
case IndexFlapsPercentage:
this->m_flapsPercentage = variant.toInt();

View File

@@ -81,11 +81,7 @@ namespace BlackMisc
void CAircraftSituation::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
{
if (index.isMyself())
{
this->convertFromCVariant(variant);
return;
}
if (index.isMyself()) { (*this) = variant.to<CAircraftSituation>(); return; }
if (ITimestampBased::canHandleIndex(index))
{
ITimestampBased::setPropertyByIndex(variant, index);

View File

@@ -58,12 +58,7 @@ namespace BlackMisc
void CAirlineIcaoCode::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
{
if (index.isMyself())
{
this->convertFromCVariant(variant);
return;
}
if (index.isMyself()) { (*this) = variant.to<CAirlineIcaoCode>(); return; }
ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{

View File

@@ -78,11 +78,7 @@ namespace BlackMisc
void CAirport::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
{
if (index.isMyself())
{
this->convertFromCVariant(variant);
return;
}
if (index.isMyself()) { (*this) = variant.to<CAirport>(); return; }
ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{

View File

@@ -377,7 +377,7 @@ namespace BlackMisc
void CAtcStation::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
{
if (index.isMyself()) { this->convertFromCVariant(variant); return; }
if (index.isMyself()) { (*this) = variant.to<CAtcStation>(); return; }
ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{

View File

@@ -147,11 +147,7 @@ namespace BlackMisc
void CCallsign::setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index)
{
if (index.isMyself())
{
this->convertFromCVariant(variant);
return;
}
if (index.isMyself()) { (*this) = variant.to<CCallsign>(); return; }
ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{

View File

@@ -128,11 +128,7 @@ namespace BlackMisc
template <class AVIO>
void CModulator<AVIO>::setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index)
{
if (index.isMyself())
{
this->convertFromCVariant(variant);
return;
}
if (index.isMyself()) { Q_ASSERT_X(false, Q_FUNC_INFO, "Wrong index to base template"); return; }
ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{

View File

@@ -171,11 +171,7 @@ namespace BlackMisc
void CTransponder::setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index)
{
if (index.isMyself())
{
this->convertFromCVariant(variant);
return;
}
if (index.isMyself()) { (*this) = variant.to<CTransponder>(); return; }
ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{