tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use QMetaObject for introspecting a QObject

Browse source 
It will be faster and will provide better error messages.

REVIEW: 123214
This commit is contained in:
Aleix Pol 2015-04-01 23:38:32 +02:00
parent 80d77fa9b6
commit 9ab7e2356e
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/networkpackage.cpp
View file

@ -111,18 +111,16 @@ void qvariant2qobject(const QVariantMap& variant, QObject* object)
{ {
for ( QVariantMap::const_iterator iter = variant.begin(); iter != variant.end(); ++iter ) for ( QVariantMap::const_iterator iter = variant.begin(); iter != variant.end(); ++iter )
{ {
QVariant property = object->property( iter.key().toLatin1() ); const int propertyIndex = object->metaObject()->indexOfProperty(iter.key().toLatin1());
Q_ASSERT( property.isValid() ); if (propertyIndex < 0) {
if ( property.isValid() ) qCWarning(KDECONNECT_CORE) << "missing property" << object << iter.key();
{ continue;
QVariant value = iter.value();
if ( value.canConvert( property.type() ) )
{
value.convert( property.type() );
object->setProperty( iter.key().toLatin1(), value );
} else if ( QString( QLatin1String("QVariant") ).compare( QLatin1String( property.typeName() ) ) == 0) {
object->setProperty( iter.key().toLatin1(), value );
} }
QMetaProperty property = object->metaObject()->property(propertyIndex);
bool ret = property.write(object, *iter);
if (!ret) {
qCWarning(KDECONNECT_CORE) << "couldn't set" << object << "->" << property.name() << '=' << *iter;
} }
} }
} }