added SignalProxy::isSecure() to determine if all connections are secure (ssl encrypt...

[quassel.git] / src / common / syncableobject.cpp

diff --git a/src/common/syncableobject.cpp b/src/common/syncableobject.cpp
index ee871b8..ec34708 100644 (file)
--- a/src/common/syncableobject.cpp
+++ b/src/common/syncableobject.cpp
@@ -20,18 +20,42 @@
 
 #include <QMetaProperty>
 
+#include <QDebug>
+
 #include "syncableobject.h"
 
 #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 QString &objectName, QObject *parent)
+  : QObject(parent),
+    _initialized(false),
+    _allowClientUpdates(false)
+{
+  setObjectName(objectName);
+}
+
+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 {
@@ -49,24 +73,33 @@ 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"
   for(int i = 0; i < meta->methodCount(); i++) {
     QMetaMethod method = meta->method(i);
     QString methodname(::methodName(method));
-    if(!methodname.startsWith("init") || methodname.startsWith("initSet"))
+    if(!methodname.startsWith("init") || methodname.startsWith("initSet") || methodname.startsWith("initDone"))
       continue;
 
-    QVariant value = QVariant(QVariant::nameToType(method.typeName()));
+    QVariant::Type variantType = QVariant::nameToType(method.typeName());
+    if(variantType == QVariant::Invalid && !QByteArray(method.typeName()).isEmpty()) {
+      qWarning() << "SyncableObject::toVariantMap(): cannot fetch init data for:" << this << method.signature() << "- Returntype is unknown to Qt's MetaSystem:" << QByteArray(method.typeName());
+      continue;
+    }
+    QVariant value = QVariant(variantType);
     QGenericReturnArgument genericvalue = QGenericReturnArgument(method.typeName(), &value);
     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;
@@ -77,14 +110,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++;
   }
@@ -104,3 +143,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);
+}