X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsyncableobject.cpp;h=248ccc9f45bf58fc05d81101aa6b9ab91fe13fa3;hp=781dd15109e5123d63cf70df0440d0a8ce429913;hb=0679f0aa992e4d0d0aab2ebe08e17544150fbc55;hpb=57d44eafac4d353d1523e93cc7613debc1826e94 diff --git a/src/common/syncableobject.cpp b/src/common/syncableobject.cpp index 781dd151..248ccc9f 100644 --- a/src/common/syncableobject.cpp +++ b/src/common/syncableobject.cpp @@ -27,13 +27,27 @@ #include "signalproxy.h" #include "util.h" -SyncableObject::SyncableObject(QObject *parent) : QObject(parent) { - _initialized = false; +SyncableObject::SyncableObject(QObject *parent) + : QObject(parent), + _initialized(false), + _allowClientUpdates(false) +{ } -SyncableObject::SyncableObject(const SyncableObject &other, QObject *parent) : QObject(parent) { - _initialized = other._initialized; +SyncableObject::SyncableObject(const SyncableObject &other, QObject *parent) + : QObject(parent), + _initialized(other._initialized), + _allowClientUpdates(other._allowClientUpdates) +{ +} +SyncableObject &SyncableObject::operator=(const SyncableObject &other) { + if(this == &other) + return *this; + + _initialized = other._initialized; + _allowClientUpdates = other._allowClientUpdates; + return *this; } bool SyncableObject::isInitialized() const { @@ -51,9 +65,14 @@ QVariantMap SyncableObject::toVariantMap() { const QMetaObject* meta = metaObject(); // we collect data from properties + QMetaProperty prop; + QString propName; for(int i = 0; i < meta->propertyCount(); i++) { - QMetaProperty prop = meta->property(i); - properties[QString(prop.name())] = prop.read(this); + prop = meta->property(i); + propName = QString(prop.name()); + if(propName == "objectName") + continue; + properties[propName] = prop.read(this); } // ...as well as methods, which have names starting with "init" @@ -84,14 +103,20 @@ void SyncableObject::fromVariantMap(const QVariantMap &properties) { const QMetaObject *meta = metaObject(); QVariantMap::const_iterator iterator = properties.constBegin(); + QString propName; while(iterator != properties.constEnd()) { - QString name = iterator.key(); - int propertyIndex = meta->indexOfProperty(name.toAscii()); + propName = iterator.key(); + if(propName == "objectName") { + iterator++; + continue; + } + + int propertyIndex = meta->indexOfProperty(propName.toAscii()); if(propertyIndex == -1 || !meta->property(propertyIndex).isWritable()) - setInitValue(name, iterator.value()); + setInitValue(propName, iterator.value()); else - setProperty(name.toAscii(), iterator.value()); + setProperty(propName.toAscii(), iterator.value()); // qDebug() << "<<< SYNC:" << name << iterator.value(); iterator++; } @@ -111,3 +136,15 @@ void SyncableObject::renameObject(const QString &newName) { emit objectRenamed(newName, oldName); } } + +void SyncableObject::update(const QVariantMap &properties) { + fromVariantMap(properties); + emit updated(properties); +} + +void SyncableObject::requestUpdate(const QVariantMap &properties) { + if(allowClientUpdates()) { + update(properties); + } + emit updateRequested(properties); +}