flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-02 23:25:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #77 toIcon returns a simple enum instead of a full object

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-10-26 22:55:10 +00:00
parent 59bbac9a1f
commit b1185eb541
61 changed files with 157 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blackmisc/variant.cpp
View File

@@ -508,20 +508,18 @@ namespace BlackMisc
}
}
CIcon CVariant::toIcon() const
CIcons::IconIndex CVariant::toIcon() const
{
auto *meta = getValueObjectMetaInfo();
if (! meta) { return {}; }
try
{
CIcon result;
meta->toIcon(data(), result);
return result;
return static_cast<CIcons::IconIndex>(meta->toIcon(data()));
}
catch (const Private::CVariantException &ex)
{
CLogMessage(this).debug() << ex.what();
return {};
return CIcons::StandardIconError16;
}
}
@@ -531,7 +529,7 @@ namespace BlackMisc
if (m_v.type() == QVariant::Image) { return QPixmap::fromImage(m_v.value<QImage>()); }
if (m_v.type() == QVariant::Icon) { return iconToPixmap(m_v.value<QIcon>()); }
return toIcon().toPixmap();
return CIcon(toIcon()).toPixmap();
}
bool CVariant::matches(const CVariant &value) const