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

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

View File

@@ -36,7 +36,7 @@ namespace BlackMisc
CVariant CAircraftMapping::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
{
if (index.isMyself()) { return this->toCVariant(); }
if (index.isMyself()) { return CVariant::from(*this); }
ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{

View File

@@ -70,12 +70,12 @@ namespace BlackMisc
CVariant CClient::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
{
if (index.isMyself()) { return this->toCVariant(); }
if (index.isMyself()) { return CVariant::from(*this); }
ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexCapabilities:
return this->m_capabilities.toCVariant();
return CVariant::fromValue(this->m_capabilities);
case IndexCapabilitiesString:
return CVariant(this->getCapabilitiesAsString());
case IndexCallsign:
@@ -91,7 +91,7 @@ namespace BlackMisc
case IndexVoiceCapabilitiesPixmap:
return CVariant::from(this->m_voiceCapabilities.toPixmap());
case IndexVoiceCapabilitiesIcon:
return this->m_voiceCapabilities.toIcon().toCVariant();
return CVariant::fromValue(this->m_voiceCapabilities.toIcon());
case IndexVoiceCapabilitiesString:
return CVariant(this->m_voiceCapabilities.toQString(true));
default:

View File

@@ -47,7 +47,7 @@ namespace BlackMisc
CVariant CServer::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
{
if (index.isMyself()) { return this->toCVariant(); }
if (index.isMyself()) { return CVariant::from(*this); }
ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{

View File

@@ -186,7 +186,7 @@ namespace BlackMisc
CVariant CTextMessage::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
{
if (index.isMyself()) { return this->toCVariant(); }
if (index.isMyself()) { return CVariant::from(*this); }
if (ITimestampBased::canHandleIndex(index)) { return ITimestampBased::propertyByIndex(index); }
ColumnIndex i = index.frontCasted<ColumnIndex>();

View File

@@ -193,7 +193,7 @@ namespace BlackMisc
CVariant CUser::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
{
if (index.isMyself()) { return this->toCVariant(); }
if (index.isMyself()) { return CVariant::from(*this); }
ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{