projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replaced Client::fakeInput() with Client::userInpt() (now static but no longer a...
[quassel.git]
/
src
/
common
/
ircuser.h
diff --git
a/src/common/ircuser.h
b/src/common/ircuser.h
index
41c1792
..
45be422
100644
(file)
--- a/
src/common/ircuser.h
+++ b/
src/common/ircuser.h
@@
-29,7
+29,7
@@
#include "syncableobject.h"
class SignalProxy;
#include "syncableobject.h"
class SignalProxy;
-class Network
Info
;
+class Network;
class IrcChannel;
class IrcUser : public SyncableObject {
class IrcChannel;
class IrcUser : public SyncableObject {
@@
-43,15
+43,14
@@
class IrcUser : public SyncableObject {
// 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;
@@
-87,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);
@@
-108,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();
@@
-133,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;