projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Yet another protocol break (I warned you...).
[quassel.git]
/
src
/
common
/
ircchannel.h
diff --git
a/src/common/ircchannel.h
b/src/common/ircchannel.h
index
2bf5f64
..
26340ce
100644
(file)
--- a/
src/common/ircchannel.h
+++ b/
src/common/ircchannel.h
@@
-37,6
+37,7
@@
class IrcChannel : public SyncableObject {
Q_PROPERTY(QString name READ name STORED false)
Q_PROPERTY(QString topic READ topic WRITE setTopic STORED false)
Q_PROPERTY(QString name READ name STORED false)
Q_PROPERTY(QString topic READ topic WRITE setTopic STORED false)
+ Q_PROPERTY(QString password READ password WRITE setPassword STORED false)
public:
IrcChannel(const QString &channelname, Network *network);
public:
IrcChannel(const QString &channelname, Network *network);
@@
-45,16
+46,17
@@
public:
bool isKnownUser(IrcUser *ircuser) const;
bool isValidChannelUserMode(const QString &mode) const;
bool isKnownUser(IrcUser *ircuser) const;
bool isValidChannelUserMode(const QString &mode) const;
- QString name() const;
- QString topic() const;
+ inline QString name() const { return _name; }
+ inline QString topic() const { return _topic; }
+ inline QString password() const { return _password; }
- QList<IrcUser *> ircUsers() const;
+ inline QList<IrcUser *> ircUsers() const { return _userModes.keys(); }
QString userModes(IrcUser *ircuser) const;
QString userModes(const QString &nick) const;
QString userModes(IrcUser *ircuser) const;
QString userModes(const QString &nick) const;
- QTextCodec *codecForEncoding() const;
- QTextCodec *codecForDecoding() const;
+ inline QTextCodec *codecForEncoding() const { return _codecForEncoding; }
+ inline QTextCodec *codecForDecoding() const { return _codecForDecoding; }
void setCodecForEncoding(const QString &codecName);
void setCodecForEncoding(QTextCodec *codec);
void setCodecForDecoding(const QString &codecName);
void setCodecForEncoding(const QString &codecName);
void setCodecForEncoding(QTextCodec *codec);
void setCodecForDecoding(const QString &codecName);
@@
-65,9
+67,12
@@
public:
public slots:
void setTopic(const QString &topic);
public slots:
void setTopic(const QString &topic);
+ void setPassword(const QString &password);
- void join(IrcUser *ircuser);
- void join(const QString &nick);
+ void joinIrcUsers(const QList<IrcUser *> &users, const QStringList &modes);
+ void joinIrcUsers(const QStringList &nicks, const QStringList &modes);
+ void joinIrcUsers(IrcUser *ircuser);
+ void joinIrcUsers(const QString &nick);
void part(IrcUser *ircuser);
void part(const QString &nick);
void part(IrcUser *ircuser);
void part(const QString &nick);
@@
-88,7
+93,8
@@
public slots:
void initSetUserModes(const QVariantMap &usermodes);
signals:
void initSetUserModes(const QVariantMap &usermodes);
signals:
- void topicSet(QString topic);
+ void topicSet(const QString &topic);
+ void passwordSet(const QString &password);
void userModesSet(QString nick, QString modes);
//void userModesSet(IrcUser *ircuser, QString modes);
void userModeAdded(QString nick, QString mode);
void userModesSet(QString nick, QString modes);
//void userModesSet(IrcUser *ircuser, QString modes);
void userModeAdded(QString nick, QString mode);
@@
-96,7
+102,8
@@
signals:
void userModeRemoved(QString nick, QString mode);
//void userModeRemoved(IrcUser *ircuser, QString mode);
void userModeRemoved(QString nick, QString mode);
//void userModeRemoved(IrcUser *ircuser, QString mode);
- void ircUserJoined(IrcUser *ircuser);
+ void ircUsersJoined(QList<IrcUser *> ircusers);
+ void ircUsersJoined(QStringList nicks, QStringList modes);
void ircUserParted(IrcUser *ircuser);
void ircUserNickSet(IrcUser *ircuser, QString nick);
void ircUserModeAdded(IrcUser *ircuser, QString mode);
void ircUserParted(IrcUser *ircuser);
void ircUserNickSet(IrcUser *ircuser, QString nick);
void ircUserModeAdded(IrcUser *ircuser, QString mode);
@@
-111,6
+118,7
@@
private:
bool _initialized;
QString _name;
QString _topic;
bool _initialized;
QString _name;
QString _topic;
+ QString _password;
QHash<IrcUser *, QString> _userModes;
QHash<IrcUser *, QString> _userModes;