projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reworking the wordwrap stuff.
[quassel.git]
/
src
/
common
/
identity.h
diff --git
a/src/common/identity.h
b/src/common/identity.h
index
3db8a28
..
9c961a9
100644
(file)
--- a/
src/common/identity.h
+++ b/
src/common/identity.h
@@
-27,8
+27,9
@@
#include <QStringList>
#include "types.h"
#include <QStringList>
#include "types.h"
+#include "syncableobject.h"
-class Identity : public
Q
Object {
+class Identity : public
Syncable
Object {
Q_OBJECT
Q_PROPERTY(IdentityId identityId READ id WRITE setId STORED false);
Q_OBJECT
Q_PROPERTY(IdentityId identityId READ id WRITE setId STORED false);
@@
-83,9
+84,6
@@
class Identity : public QObject {
QString partReason() const;
QString quitReason() const;
QString partReason() const;
QString quitReason() const;
- bool initialized() const;
- void setInitialized();
-
public slots:
void setId(IdentityId id);
void setIdentityName(const QString &name);
public slots:
void setId(IdentityId id);
void setIdentityName(const QString &name);
@@
-132,10
+130,7
@@
class Identity : public QObject {
void partReasonSet(const QString &);
void quitReasonSet(const QString &);
void partReasonSet(const QString &);
void quitReasonSet(const QString &);
- void updatedRemotely();
-
private:
private:
- bool _initialized;
IdentityId _identityId;
QString _identityName, _realName;
QStringList _nicks;
IdentityId _identityId;
QString _identityName, _realName;
QStringList _nicks;
@@
-158,7
+153,7
@@
class Identity : public QObject {
friend QDataStream &operator>>(QDataStream &in, Identity &identity);
};
friend QDataStream &operator>>(QDataStream &in, Identity &identity);
};
-QDataStream &operator<<(QDataStream &out,
const Identity &
identity);
+QDataStream &operator<<(QDataStream &out,
Identity
identity);
QDataStream &operator>>(QDataStream &in, Identity &identity);
Q_DECLARE_METATYPE(Identity);
QDataStream &operator>>(QDataStream &in, Identity &identity);
Q_DECLARE_METATYPE(Identity);