X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsyncableobject.cpp;h=ec34708a53980785efb57c1c4472495714bbf8d4;hp=ebe6ca0e17e713e0d49cabc6a44ffcb6d02d73cb;hb=0324c701d9cc8c656e6188b4e102e19e05c98201;hpb=f7eb3911860f30e6bccce3c77d03fc25e87d7f93 diff --git a/src/common/syncableobject.cpp b/src/common/syncableobject.cpp index ebe6ca0e..ec34708a 100644 --- a/src/common/syncableobject.cpp +++ b/src/common/syncableobject.cpp @@ -34,6 +34,14 @@ SyncableObject::SyncableObject(QObject *parent) { } +SyncableObject::SyncableObject(const QString &objectName, QObject *parent) + : QObject(parent), + _initialized(false), + _allowClientUpdates(false) +{ + setObjectName(objectName); +} + SyncableObject::SyncableObject(const SyncableObject &other, QObject *parent) : QObject(parent), _initialized(other._initialized), @@ -44,7 +52,7 @@ SyncableObject::SyncableObject(const SyncableObject &other, QObject *parent) SyncableObject &SyncableObject::operator=(const SyncableObject &other) { if(this == &other) return *this; - + _initialized = other._initialized; _allowClientUpdates = other._allowClientUpdates; return *this; @@ -92,7 +100,6 @@ QVariantMap SyncableObject::toVariantMap() { QMetaObject::invokeMethod(this, methodname.toAscii(), genericvalue); properties[SignalProxy::methodBaseName(method)] = value; - // qDebug() << ">>> SYNC:" << methodBaseName(method) << value; } // properties["Payload"] = QByteArray(10000000, 'a'); // for testing purposes return properties; @@ -110,7 +117,7 @@ void SyncableObject::fromVariantMap(const QVariantMap &properties) { iterator++; continue; } - + int propertyIndex = meta->indexOfProperty(propName.toAscii()); if(propertyIndex == -1 || !meta->property(propertyIndex).isWritable())