X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsyncableobject.cpp;h=b66626d66d1e2da0955f29c3b07aa6e3a06dc4f8;hp=5bf68044a8cdd3e1e190cb7c29cce5c281c49f33;hb=62b7bed21f011037a34d7a4ea797d79fbdeff687;hpb=b797e5f581b10a517c30f78cb53f813af741e261

diff --git a/src/common/syncableobject.cpp b/src/common/syncableobject.cpp
index 5bf68044..b66626d6 100644
--- a/src/common/syncableobject.cpp
+++ b/src/common/syncableobject.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,18 +20,61 @@
 
 #include <QMetaProperty>
 
+#include <QDebug>
+
 #include "syncableobject.h"
 
 #include "signalproxy.h"
 #include "util.h"
 
-SyncableObject::SyncableObject(QObject *parent) : QObject(parent) {
+INIT_SYNCABLE_OBJECT(SyncableObject)
+SyncableObject::SyncableObject(QObject *parent)
+  : QObject(parent),
+    _initialized(false),
+    _allowClientUpdates(false)
+{
+}
+
+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() {
+  QList<SignalProxy *>::iterator proxyIter = _signalProxies.begin();
+  while(proxyIter != _signalProxies.end()) {
+    SignalProxy *proxy = (*proxyIter);
+    proxyIter = _signalProxies.erase(proxyIter);
+    proxy->stopSynchronize(this);
+  }
 }
 
-SyncableObject::SyncableObject(const SyncableObject &other, QObject *parent) : QObject(parent) {
-  Q_UNUSED(other);
+SyncableObject &SyncableObject::operator=(const SyncableObject &other) {
+  if(this == &other)
+    return *this;
 
+  _initialized = other._initialized;
+  _allowClientUpdates = other._allowClientUpdates;
+  return *this;
+}
+
+bool SyncableObject::isInitialized() const {
+  return _initialized;
+}
+
+void SyncableObject::setInitialized() {
+  _initialized = true;
+  emit initDone();
 }
 
 QVariantMap SyncableObject::toVariantMap() {
@@ -40,24 +83,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"))
+    QString methodname(SignalProxy::ExtendedMetaObject::methodName(method));
+    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[SignalProxy::ExtendedMetaObject::methodBaseName(method)] = value;
   }
   // properties["Payload"] = QByteArray(10000000, 'a');  // for testing purposes
   return properties;
@@ -68,14 +120,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++;
   }
@@ -88,15 +146,50 @@ bool SyncableObject::setInitValue(const QString &property, const QVariant &value
   return QMetaObject::invokeMethod(this, handlername.toAscii(), param);
 }
 
-#include <QDebug>
-QDataStream &operator<<(QDataStream &out, SyncableObject object) {
-  out << object.toVariantMap();
-  return out;
+void SyncableObject::renameObject(const QString &newName) {
+  const QString oldName = objectName();
+  if(oldName != newName) {
+    setObjectName(newName);
+    foreach(SignalProxy *proxy, _signalProxies) {
+      proxy->renameObject(this, newName, oldName);
+    }
+  }
+}
+
+void SyncableObject::update(const QVariantMap &properties) {
+  fromVariantMap(properties);
+  SYNC(ARG(properties))
+  emit updated();
+}
+
+void SyncableObject::requestUpdate(const QVariantMap &properties) {
+  if(allowClientUpdates()) {
+    update(properties);
+  }
+  REQUEST(ARG(properties))
+}
+
+void SyncableObject::sync_call__(SignalProxy::ProxyMode modeType, const char *funcname, ...) const {
+  //qDebug() << Q_FUNC_INFO << modeType << funcname;
+  foreach(SignalProxy *proxy, _signalProxies) {
+    va_list ap;
+    va_start(ap, funcname);
+    proxy->sync_call__(this, modeType, funcname, ap);
+    va_end(ap);
+  }
 }
 
-QDataStream &operator>>(QDataStream &in, SyncableObject &object) {
-  QVariantMap map;
-  in >> map;
-  object.fromVariantMap(map);
-  return in;
+void SyncableObject::synchronize(SignalProxy *proxy) {
+  if(_signalProxies.contains(proxy))
+    return;
+  _signalProxies << proxy;
+}
+
+void SyncableObject::stopSynchronize(SignalProxy *proxy) {
+  for(int i = 0; i < _signalProxies.count(); i++) {
+    if(_signalProxies[i] == proxy) {
+      _signalProxies.removeAt(i);
+      break;
+    }
+  }
 }