projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop Quassel from doing stupid things when a nick changes capitalization (only).
[quassel.git]
/
src
/
common
/
ircuser.h
diff --git
a/src/common/ircuser.h
b/src/common/ircuser.h
index
cba3d03
..
e933fb6
100644
(file)
--- a/
src/common/ircuser.h
+++ b/
src/common/ircuser.h
@@
-63,9
+63,11
@@
public slots:
void updateHostmask(const QString &mask);
void setUserModes(const QString &modes);
void updateHostmask(const QString &mask);
void setUserModes(const QString &modes);
-
- void joinChannel(const QString &channel);
- void partChannel(const QString &channel);
+
+ void joinChannel(IrcChannel *channel);
+ void joinChannel(const QString &channelname);
+ void partChannel(IrcChannel *channel);
+ void partChannel(const QString &channelname);
void addUserMode(const QString &mode);
void removeUserMode(const QString &mode);
void addUserMode(const QString &mode);
void removeUserMode(const QString &mode);
@@
-81,7
+83,6
@@
signals:
void nickSet(QString newnick);
void hostmaskUpdated(QString mask);
void nickSet(QString newnick);
void hostmaskUpdated(QString mask);
- void channelsSet(QStringList channels);
void userModesSet(QString modes);
void channelJoined(QString channel);
void userModesSet(QString modes);
void channelJoined(QString channel);
@@
-99,6
+100,7
@@
signals:
private slots:
void updateObjectName();
private slots:
void updateObjectName();
+ void channelDestroyed();
private:
inline bool operator==(const IrcUser &ircuser2) {
private:
inline bool operator==(const IrcUser &ircuser2) {
@@
-115,7
+117,8
@@
private:
QString _user;
QString _host;
QString _user;
QString _host;
- QSet<QString> _channels;
+ // QSet<QString> _channels;
+ QSet<IrcChannel *> _channels;
QString _userModes;
NetworkInfo *networkInfo;
QString _userModes;
NetworkInfo *networkInfo;