added SignalProxy::isSecure() to determine if all connections are secure (ssl encrypt...

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

diff --git a/src/common/syncableobject.h b/src/common/syncableobject.h
index 61915cb..dfe3887 100644 (file)
--- a/src/common/syncableobject.h
+++ b/src/common/syncableobject.h
@@ -18,8 +18,8 @@
  *   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>
@@ -31,6 +31,7 @@ class SyncableObject : public QObject {
 
 public:
   SyncableObject(QObject *parent = 0);
+  SyncableObject(const QString &objectName, QObject *parent = 0);
   SyncableObject(const SyncableObject &other, QObject *parent = 0);
 
   //! Stores the object's state into a QVariantMap.
@@ -45,7 +46,7 @@ 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.
    */
@@ -61,10 +62,11 @@ public:
 public slots:
   virtual void setInitialized();
   void requestUpdate(const QVariantMap &properties);
-  void update(const QVariantMap &properties);
+  virtual void update(const QVariantMap &properties);
 
 protected:
   void renameObject(const QString &newName);
+  SyncableObject &operator=(const SyncableObject &other);
 
 signals:
   void initDone();
@@ -75,7 +77,7 @@ signals:
 
 private:
   bool setInitValue(const QString &property, const QVariant &value);
-  
+
   bool _initialized;
   bool _allowClientUpdates;