Ref T442, directly return image/icon types from CVariant

This commit is contained in:
Klaus Basan
2018-12-04 14:35:34 +01:00
parent 34cb0abdf0
commit d7026dbf42

View File

@@ -9,6 +9,7 @@
//! \cond PRIVATE
#include "blackmisc/imageutils.h"
#include "blackmisc/dictionary.h"
#include "blackmisc/icon.h"
#include "blackmisc/logmessage.h"
@@ -463,6 +464,10 @@ namespace BlackMisc
QPixmap CVariant::toPixmap() const
{
if (m_v.type() == QVariant::Pixmap) { return m_v.value<QPixmap>(); }
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();
}