X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fircuser.cpp;h=c3c2d0cd5927c84482ec7355036a8cb24077a055;hb=28f1a9d9d96645757691cdea19500aefce4bcdac;hp=99f2ae31d025f7d5b5f94cf6758d42574212fc5b;hpb=e2e5327ccade6baf433598b1b25dfe99cb360028;p=quassel.git

diff --git a/src/common/ircuser.cpp b/src/common/ircuser.cpp
index 99f2ae31..c3c2d0cd 100644
--- a/src/common/ircuser.cpp
+++ b/src/common/ircuser.cpp
@@ -28,8 +28,7 @@
 #include <QTextCodec>
 #include <QDebug>
 
-IrcUser::IrcUser(const QString &hostmask, Network *network)
-  : SyncableObject(network),
+IrcUser::IrcUser(const QString &hostmask, Network *network) : SyncableObject(network),
     _initialized(false),
     _nick(nickFromMask(hostmask)),
     _user(userFromMask(hostmask)),
@@ -49,10 +48,6 @@ IrcUser::IrcUser(const QString &hostmask, Network *network)
 }
 
 IrcUser::~IrcUser() {
-  QList<IrcChannel *> channels = _channels.toList();
-  foreach(IrcChannel *channel, channels) {
-    partChannel(channel);
-  }
 }
 
 // ====================
@@ -149,7 +144,7 @@ QString IrcUser::decodeString(const QByteArray &text) const {
   return ::decodeString(text, codecForDecoding());
 }
 
-QByteArray IrcUser::encodeString(const QString string) const {
+QByteArray IrcUser::encodeString(const QString &string) const {
   if(codecForEncoding()) {
     return codecForEncoding()->fromUnicode(string);
   }
@@ -284,10 +279,8 @@ void IrcUser::partChannel(const QString &channelname) {
 void IrcUser::channelDestroyed() {
   // private slot!
   IrcChannel *channel = static_cast<IrcChannel*>(sender());
-  Q_ASSERT(channel);
   if(_channels.contains(channel)) {
     _channels.remove(channel);
-    disconnect(channel, 0, this, 0);
   }
 }