X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.cpp;h=1aa907d83509761c3599e4b82a12377a092da14c;hb=84cd3561e97167ffb98ecab0fd2b884ba1d13ada;hp=d18f7130be79f30e87d4b0157029250fc0f58b78;hpb=208ccb6d91ebb3c26a67c35c11411ba3ab27708a;p=quassel.git

diff --git a/src/common/network.cpp b/src/common/network.cpp
index d18f7130..1aa907d8 100644
--- a/src/common/network.cpp
+++ b/src/common/network.cpp
@@ -288,20 +288,6 @@ void Network::removeChansAndUsers()
     QList<IrcChannel *> channels = ircChannels();
     _ircChannels.clear();
 
-    foreach(IrcChannel *channel, channels) {
-        proxy()->detachObject(channel);
-        disconnect(channel, 0, this, 0);
-    }
-    foreach(IrcUser *user, users) {
-        proxy()->detachObject(user);
-        disconnect(user, 0, this, 0);
-    }
-
-    // the second loop is needed because quit can have sideffects
-    foreach(IrcUser *user, users) {
-        user->quit();
-    }
-
     qDeleteAll(users);
     qDeleteAll(channels);
 }
@@ -469,7 +455,7 @@ QByteArray Network::encodeString(const QString &string) const
     if (_defaultCodecForEncoding) {
         return _defaultCodecForEncoding->fromUnicode(string);
     }
-    return string.toAscii();
+    return string.toLatin1();
 }
 
 
@@ -490,7 +476,7 @@ QByteArray Network::encodeServerString(const QString &string) const
     if (_defaultCodecForServer) {
         return _defaultCodecForServer->fromUnicode(string);
     }
-    return string.toAscii();
+    return string.toLatin1();
 }