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

Drop NetworkPackage QObject heritage

Browse source 
It was only used for introspection and we can use Q_GADGET for that.
Make the NetworkPackage objects much lighter.

REVIEW: 124166
This commit is contained in:
Aleix Pol 2015-06-24 20:04:33 +02:00
parent 91c23dfdea
commit 83a56c47e9
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/networkpackage.cpp
View file

@ -73,13 +73,14 @@ void NetworkPackage::createIdentityPackage(NetworkPackage* np)
//qCDebug(KDECONNECT_CORE) << "createIdentityPackage" << np->serialize();
}
QVariantMap qobject2qvariant(const QObject* object)
template<class T>
QVariantMap qobject2qvariant(const T* object)
{
QVariantMap map;
auto metaObject = object->metaObject();
for(int i = metaObject->propertyOffset(); i < metaObject->propertyCount(); ++i) {
const char *name = metaObject->property(i).name();
map.insert(QString::fromLatin1(name), object->property(name));
auto metaObject = T::staticMetaObject;
for(int i = metaObject.propertyOffset(); i < metaObject.propertyCount(); ++i) {
QMetaProperty prop = metaObject.property(i);
map.insert(QString::fromLatin1(prop.name()), prop.readOnGadget(object));
}
return map;
@ -115,18 +116,19 @@ QByteArray NetworkPackage::serialize() const
return json;
}
void qvariant2qobject(const QVariantMap& variant, QObject* object)
template <class T>
void qvariant2qobject(const QVariantMap& variant, T* object)
{
for ( QVariantMap::const_iterator iter = variant.begin(); iter != variant.end(); ++iter )
{
const int propertyIndex = object->metaObject()->indexOfProperty(iter.key().toLatin1());
const int propertyIndex = T::staticMetaObject.indexOfProperty(iter.key().toLatin1());
if (propertyIndex < 0) {
qCWarning(KDECONNECT_CORE) << "missing property" << object << iter.key();
continue;
}
QMetaProperty property = object->metaObject()->property(propertyIndex);
bool ret = property.write(object, *iter);
QMetaProperty property = T::staticMetaObject.property(propertyIndex);
bool ret = property.writeOnGadget(object, *iter);
if (!ret) {
qCWarning(KDECONNECT_CORE) << "couldn't set" << object << "->" << property.name() << '=' << *iter;
}

5
core/networkpackage.h
View file

@ -35,10 +35,9 @@
class FileTransferJob;
// TODO: investigate if we can turn into Q_GADGET, drop QObject
class KDECONNECTCORE_EXPORT NetworkPackage : public QObject
class KDECONNECTCORE_EXPORT NetworkPackage
{
Q_OBJECT
Q_GADGET
Q_PROPERTY( QString id READ id WRITE setId )
Q_PROPERTY( QString type READ type WRITE setType )
Q_PROPERTY( QVariantMap body READ body WRITE setBody )