Testing a new concept for the SyncableObjects.

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

diff --git a/src/common/syncableobject.cpp b/src/common/syncableobject.cpp
index 248ccc9..aab2857 100644 (file)
--- 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  *
@@ -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),
@@ -50,6 +58,12 @@ SyncableObject &SyncableObject::operator=(const SyncableObject &other) {
   return *this;
 }
 
+void SyncableObject::synchronize(SignalProxy *proxy) {
+  if(_signalProxies.contains(proxy))
+    return;
+  _signalProxies << proxy;
+}
+
 bool SyncableObject::isInitialized() const {
   return _initialized;
 }
@@ -78,7 +92,7 @@ QVariantMap SyncableObject::toVariantMap() {
   // ...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));
+    QString methodname(SignalProxy::ExtendedMetaObject::methodName(method));
     if(!methodname.startsWith("init") || methodname.startsWith("initSet") || methodname.startsWith("initDone"))
       continue;
 
@@ -91,8 +105,7 @@ QVariantMap SyncableObject::toVariantMap() {
     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;
@@ -148,3 +161,13 @@ void SyncableObject::requestUpdate(const QVariantMap &properties) {
   }
   emit updateRequested(properties);
 }
+
+void SyncableObject::sync_call__(SignalProxy::ProxyMode modeType, const char *funcname, ...) {
+  qDebug() << Q_FUNC_INFO << modeType << funcname;
+  foreach(SignalProxy *proxy, _signalProxies) {
+    va_list ap;
+    va_start(ap, funcname);
+    proxy->syncCall(this, modeType, funcname, ap);
+    va_end(ap);
+  }
+}