projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rework of the TreeModel. This should finaliy *knock on wood* inconsitency issues.
[quassel.git]
/
src
/
common
/
ircuser.h
diff --git
a/src/common/ircuser.h
b/src/common/ircuser.h
index
33dd143
..
45be422
100644
(file)
--- a/
src/common/ircuser.h
+++ b/
src/common/ircuser.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
7 by the Quassel IRC Team
*
+ * Copyright (C) 2005-0
8 by the Quassel Project
*
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-26,11
+26,13
@@
#include <QStringList>
#include <QVariantMap>
#include <QStringList>
#include <QVariantMap>
+#include "syncableobject.h"
+
class SignalProxy;
class SignalProxy;
-class Network
Info
;
+class Network;
class IrcChannel;
class IrcChannel;
-class IrcUser : public
Q
Object {
+class IrcUser : public
Syncable
Object {
Q_OBJECT
Q_PROPERTY(QString user READ user WRITE setUser STORED false)
Q_OBJECT
Q_PROPERTY(QString user READ user WRITE setUser STORED false)
@@
-41,15
+43,14
@@
class IrcUser : public QObject {
// Q_PROPERTY(QStringList usermodes READ usermodes WRITE setUsermodes)
public:
// Q_PROPERTY(QStringList usermodes READ usermodes WRITE setUsermodes)
public:
- IrcUser(const QString &hostmask, Network
Info *networkInfo
);
+ IrcUser(const QString &hostmask, Network
*network
);
virtual ~IrcUser();
virtual ~IrcUser();
- bool initialized() const;
-
QString user() const;
QString host() const;
QString nick() const;
QString hostmask() const;
QString user() const;
QString host() const;
QString nick() const;
QString hostmask() const;
+ Network *network() const;
QString userModes() const;
QString userModes() const;
@@
-85,8
+86,6
@@
public slots:
// init seters
void initSetChannels(const QStringList channels);
// init seters
void initSetChannels(const QStringList channels);
- void setInitialized();
-
signals:
void userSet(QString user);
void hostSet(QString host);
signals:
void userSet(QString user);
void hostSet(QString host);
@@
-106,8
+105,6
@@
signals:
// void setUsermodes(const QSet<QString> &usermodes);
// QSet<QString> usermodes() const;
// void setUsermodes(const QSet<QString> &usermodes);
// QSet<QString> usermodes() const;
- void initDone();
-
private slots:
void updateObjectName();
void channelDestroyed();
private slots:
void updateObjectName();
void channelDestroyed();
@@
-131,7
+128,7
@@
private:
QSet<IrcChannel *> _channels;
QString _userModes;
QSet<IrcChannel *> _channels;
QString _userModes;
- Network
Info *networkInfo
;
+ Network
*_network
;
QTextCodec *_codecForEncoding;
QTextCodec *_codecForDecoding;
QTextCodec *_codecForEncoding;
QTextCodec *_codecForDecoding;