X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fircchannel.cpp;h=e6c809f0cb43b5912ad76b5419739f2471edaa24;hb=0d53027b95e4bd9ca369bd909c17cf13612f7dd5;hp=12f70c235c5c12d8bf617be25c515a25953fe554;hpb=fd7c2c4a41b5bb9cffcfe7a8f86a28ab7f38ac27;p=quassel.git diff --git a/src/common/ircchannel.cpp b/src/common/ircchannel.cpp index 12f70c23..e6c809f0 100644 --- a/src/common/ircchannel.cpp +++ b/src/common/ircchannel.cpp @@ -40,7 +40,7 @@ IrcChannel::IrcChannel(const QString &channelname, Network *network) _topic(QString()), network(network) { - setObjectName(QString::number(network->networkId()) + "/" + channelname); + setObjectName(QString::number(network->networkId().toInt()) + "/" + channelname); } IrcChannel::~IrcChannel() { @@ -73,10 +73,6 @@ bool IrcChannel::isValidChannelUserMode(const QString &mode) const { return isvalid; } -bool IrcChannel::initialized() const { - return _initialized; -} - QString IrcChannel::name() const { return _name; } @@ -169,6 +165,8 @@ void IrcChannel::part(IrcUser *ircuser) { // if you wonder why there is no counterpart to ircUserParted: // the joines are propagted by the ircuser. the signal ircUserParted is only for convenience emit ircUserParted(ircuser); + if(network->isMe(ircuser)) + deleteLater(); } } @@ -256,8 +254,3 @@ void IrcChannel::ircUserNickSet(QString nick) { emit ircUserNickSet(ircUser, nick); } -void IrcChannel::setInitialized() { - _initialized = true; - emit initDone(); -} -