X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsyncableobject.h;h=61915cbb85bd672d550cb556c0a55be01c0da159;hp=388ed90ac27c1b1c518f443e319d8694a9b1fb24;hb=f2e4609f070221a010eef8be98524c5ce88d228b;hpb=4b600109a862705eaf44e59ca7bddb56b0663732

diff --git a/src/common/syncableobject.h b/src/common/syncableobject.h
index 388ed90a..61915cbb 100644
--- a/src/common/syncableobject.h
+++ b/src/common/syncableobject.h
@@ -49,27 +49,35 @@ public:
   //! 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);
+  void update(const QVariantMap &properties);
 
 protected:
   void renameObject(const QString &newName);
-  
+
 signals:
   void initDone();
   void updatedRemotely();
+  void updated(const QVariantMap &properties);
+  void updateRequested(const QVariantMap &properties);
   void objectRenamed(QString newName, QString oldName);
 
 private:
   bool setInitValue(const QString &property, const QVariant &value);
   
   bool _initialized;
+  bool _allowClientUpdates;
 
 };