X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fidentity.h;h=6345046201f7f35f607aafa3df6340c39b83e7e7;hp=829094ac568f70b8d9a684a0dda8bb070aa5dcc5;hb=20b5edb626156df8c472df8250b5f2faaf37835e;hpb=4c83963b1d77f4c2dbae606876be0eee59f53dae

diff --git a/src/common/identity.h b/src/common/identity.h
index 829094ac..63450462 100644
--- a/src/common/identity.h
+++ b/src/common/identity.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -31,6 +31,7 @@
 #include "syncableobject.h"
 
 class Identity : public SyncableObject {
+  SYNCABLE_OBJECT
   Q_OBJECT
 
   Q_PROPERTY(IdentityId identityId READ id WRITE setId STORED false)
@@ -106,28 +107,28 @@ public slots:
   void setPartReason(const QString &reason);
   void setQuitReason(const QString &reason);
 
-  void update(const Identity &other);
+  void copyFrom(const Identity &other);
 
 signals:
   void idSet(IdentityId id);
-  void identityNameSet(const QString &name);
-  void realNameSet(const QString &realName);
+//   void identityNameSet(const QString &name);
+//   void realNameSet(const QString &realName);
   void nicksSet(const QStringList &nicks);
-  void awayNickSet(const QString &awayNick);
-  void awayNickEnabledSet(bool);
-  void awayReasonSet(const QString &awayReason);
-  void awayReasonEnabledSet(bool);
-  void autoAwayEnabledSet(bool);
-  void autoAwayTimeSet(int);
-  void autoAwayReasonSet(const QString &);
-  void autoAwayReasonEnabledSet(bool);
-  void detachAwayEnabledSet(bool);
-  void detachAwayReasonSet(const QString &);
-  void detachAwayReasonEnabledSet(bool);
-  void identSet(const QString &);
-  void kickReasonSet(const QString &);
-  void partReasonSet(const QString &);
-  void quitReasonSet(const QString &);
+//   void awayNickSet(const QString &awayNick);
+//   void awayNickEnabledSet(bool);
+//   void awayReasonSet(const QString &awayReason);
+//   void awayReasonEnabledSet(bool);
+//   void autoAwayEnabledSet(bool);
+//   void autoAwayTimeSet(int);
+//   void autoAwayReasonSet(const QString &);
+//   void autoAwayReasonEnabledSet(bool);
+//   void detachAwayEnabledSet(bool);
+//   void detachAwayReasonSet(const QString &);
+//   void detachAwayReasonEnabledSet(bool);
+//   void identSet(const QString &);
+//   void kickReasonSet(const QString &);
+//   void partReasonSet(const QString &);
+//   void quitReasonSet(const QString &);
 
 private:
   IdentityId _identityId;
@@ -147,6 +148,8 @@ private:
   QString _ident, _kickReason, _partReason, _quitReason;
 
   void init();
+  QString defaultNick();
+  QString defaultRealName();
 
   friend QDataStream &operator>>(QDataStream &in, Identity &identity);
 };
@@ -161,6 +164,7 @@ Q_DECLARE_METATYPE(Identity)
 #include <QSslCertificate>
 
 class CertManager : public SyncableObject {
+  SYNCABLE_OBJECT
   Q_OBJECT
   Q_PROPERTY(QByteArray sslKey READ sslKeyPem WRITE setSslKey STORED false)
   Q_PROPERTY(QByteArray sslCert READ sslCertPem WRITE setSslCert STORED false)
@@ -175,12 +179,8 @@ public:
   inline QByteArray sslCertPem() const { return sslCert().toPem(); }
 
 public slots:
-  inline virtual void setSslKey(const QByteArray &encoded) { emit sslKeySet(encoded); }
-  inline virtual void setSslCert(const QByteArray &encoded) { emit sslCertSet(encoded); }
-
-signals:
-  void sslKeySet(const QByteArray &);
-  void sslCertSet(const QByteArray &);
+  inline virtual void setSslKey(const QByteArray &encoded) { SYNC(ARG(encoded)) }
+  inline virtual void setSslCert(const QByteArray &encoded) { SYNC(ARG(encoded)) }
 };
 
 #endif // HAVE_SSL