X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsyncableobject.h;h=65f575e3734d7b8c0d9f9514ab20c5662017a463;hp=201c002c6b1fcbe947d9199efb82598b15e5fb32;hb=f6b9eeda207d42c99fc3e9085631722cf2ec83dc;hpb=e89cfe68c0b4d117ce79d0d38fcc085de77a3083

diff --git a/src/common/syncableobject.h b/src/common/syncableobject.h
index 201c002c..65f575e3 100644
--- a/src/common/syncableobject.h
+++ b/src/common/syncableobject.h
@@ -36,8 +36,6 @@ public:
   SyncableObject(const QString &objectName, QObject *parent = 0);
   SyncableObject(const SyncableObject &other, QObject *parent = 0);
 
-  void synchronize(SignalProxy *proxy);
-
   //! Stores the object's state into a QVariantMap.
   /** The default implementation takes dynamic properties as well as getters that have
    *  names starting with "init" and stores them in a QVariantMap. Override this method in
@@ -69,7 +67,7 @@ public slots:
   virtual void update(const QVariantMap &properties);
 
 protected:
-  void sync_call__(SignalProxy::ProxyMode modeType, const char *funcname, ...);
+  void sync_call__(SignalProxy::ProxyMode modeType, const char *funcname, ...) const;
 
   void renameObject(const QString &newName);
   SyncableObject &operator=(const SyncableObject &other);
@@ -82,17 +80,33 @@ signals:
   void objectRenamed(QString newName, QString oldName);
 
 private:
+  void synchronize(SignalProxy *proxy);
+
   bool setInitValue(const QString &property, const QVariant &value);
 
   bool _initialized;
   bool _allowClientUpdates;
 
   QList<SignalProxy *> _signalProxies;
+
+  friend class SignalProxy;
 };
 
-#define so_sync(...) sync_call__(SignalProxy::Server, __func__, __VA_ARGS__);
-#define so_request(...) sync_call__(SignalProxy::Client, __func__, __VA_ARGS__);
-#define so_arg_cast(x) const_cast<void *>(reinterpret_cast<const void*>(&x))
+#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 SYNC_OTHER(x, ...) sync_call__(SignalProxy::Server, #x, __VA_ARGS__);
+#    define REQUEST(...) sync_call__(SignalProxy::Client, __func__, __VA_ARGS__);
+#    define REQUEST_OTHER(x, ...) sync_call__(SignalProxy::Client, #x, __VA_ARGS__);
+#endif //Q_WS_WIN
+
 
+#define ARG(x) const_cast<void *>(reinterpret_cast<const void*>(&x))
+#define NO_ARG 0
 
 #endif