X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsyncableobject.h;h=28e14720e4ea15f3067e3fb04ada16770facc813;hp=1eb8ed488e8b5d334dc58e2cf4f5ba9886838998;hb=20b5edb626156df8c472df8250b5f2faaf37835e;hpb=1ed8c48b0e7d309e1a92c905a19fcb7128b73d3d

diff --git a/src/common/syncableobject.h b/src/common/syncableobject.h
index 1eb8ed48..28e14720 100644
--- a/src/common/syncableobject.h
+++ b/src/common/syncableobject.h
@@ -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  *
@@ -18,20 +18,46 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _SYNCABLEOBJECT_H_
-#define _SYNCABLEOBJECT_H_
+#ifndef SYNCABLEOBJECT_H
+#define SYNCABLEOBJECT_H
 
 #include <QDataStream>
 #include <QMetaType>
 #include <QObject>
 #include <QVariantMap>
 
+#include "signalproxy.h"
+
+
+
+#define SYNCABLE_OBJECT static const int _classNameOffset__;
+#define INIT_SYNCABLE_OBJECT(x) const int x ::_classNameOffset__ = QByteArray(staticMetaObject.className()).length() + 2;
+
+#ifdef Q_WS_WIN
+#    define SYNC(...) sync_call__(SignalProxy::Server, (__FUNCTION__ + _classNameOffset__), __VA_ARGS__);
+#    define REQUEST(...) sync_call__(SignalProxy::Client, (__FUNCTION__ + _classNameOffset__) , __VA_ARGS__);
+#else
+#    define SYNC(...) sync_call__(SignalProxy::Server, __func__, __VA_ARGS__);
+#    define REQUEST(...) sync_call__(SignalProxy::Client, __func__, __VA_ARGS__);
+#endif //Q_WS_WIN
+
+#define SYNC_OTHER(x, ...) sync_call__(SignalProxy::Server, #x, __VA_ARGS__);
+#define REQUEST_OTHER(x, ...) sync_call__(SignalProxy::Client, #x, __VA_ARGS__);
+
+
+#define ARG(x) const_cast<void *>(reinterpret_cast<const void*>(&x))
+#define NO_ARG 0
+
+
 class SyncableObject : public QObject {
+  SYNCABLE_OBJECT
   Q_OBJECT
 
 public:
   SyncableObject(QObject *parent = 0);
+  SyncableObject(const QString &objectName, QObject *parent = 0);
   SyncableObject(const SyncableObject &other, QObject *parent = 0);
+  ~SyncableObject();
 
   //! Stores the object's state into a QVariantMap.
   /** The default implementation takes dynamic properties as well as getters that have
@@ -45,30 +71,47 @@ public:
    *  \return The object's state in a QVariantMap
    */
   virtual QVariantMap toVariantMap();
-  
+
   //! Initialize the object's state from a given QVariantMap.
   /** \see toVariantMap() for important information concerning this method.
    */
-  virtual void fromVariantMap(const QVariantMap &map);
+  virtual void fromVariantMap(const QVariantMap &properties);
 
   virtual bool isInitialized() const;
 
+  virtual const QMetaObject *syncMetaObject() const { return metaObject(); };
+
+  inline void setAllowClientUpdates(bool allow) { _allowClientUpdates = allow; }
+  inline bool allowClientUpdates() const { return _allowClientUpdates; }
+
 public slots:
   virtual void setInitialized();
+  void requestUpdate(const QVariantMap &properties);
+  virtual void update(const QVariantMap &properties);
 
 protected:
+  void sync_call__(SignalProxy::ProxyMode modeType, const char *funcname, ...) const;
+
   void renameObject(const QString &newName);
-  
+  SyncableObject &operator=(const SyncableObject &other);
+
 signals:
   void initDone();
   void updatedRemotely();
-  void objectRenamed(QString newName, QString oldName);
+  void updated();
 
 private:
+  void synchronize(SignalProxy *proxy);
+  void stopSynchronize(SignalProxy *proxy);
+
   bool setInitValue(const QString &property, const QVariant &value);
-  
+
   bool _initialized;
+  bool _allowClientUpdates;
+
+  QList<SignalProxy *> _signalProxies;
 
+  friend class SignalProxy;
 };
 
 #endif