core defaults to safer umask

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

diff --git a/src/common/syncableobject.h b/src/common/syncableobject.h
index 201c002..28e1472 100644 (file)
--- a/src/common/syncableobject.h
+++ b/src/common/syncableobject.h
@@ -28,15 +28,36 @@
 
 #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);
-
-  void synchronize(SignalProxy *proxy);
+  ~SyncableObject();
 
   //! Stores the object's state into a QVariantMap.
   /** The default implementation takes dynamic properties as well as getters that have
@@ -69,7 +90,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);
@@ -77,22 +98,20 @@ protected:
 signals:
   void initDone();
   void updatedRemotely();
-  void updated(const QVariantMap &properties);
-  void updateRequested(const QVariantMap &properties);
-  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;
-};
-
-#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))
 
+  friend class SignalProxy;
+};
 
 #endif