[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [Konversation] e74091b: Not sure if this fixes cartman's crashes,
From:       Gary Cramblitt <garycramblitt () comcast ! net>
Date:       2010-07-01 13:27:51
Message-ID: 20100701132751.37D77BB56FE () projects ! kde ! org
[Download RAW message or body]

commit e74091b0bb63b0e8949cd1b15b6c1577eb57a939
Author: Gary Cramblitt <garycramblitt@comcast.net>
Date:   Sat Aug 14 03:24:12 2004 +0000

    Not sure if this fixes cartman's crashes, http://nopaste.php.cd/25648, since I \
can't duplicated crash, but doesn't seem to hurt.  
    svn path=/trunk/kdeextragear-2/konversation/; revision=337844

diff --git a/konversation/server.cpp b/konversation/server.cpp
index 99de17b..e116aa6 100644
--- a/konversation/server.cpp
+++ b/konversation/server.cpp
@@ -1867,7 +1867,7 @@ ChannelNickPtr Server::addNickToJoinedChannelsList(const \
QString& channelName, c  ChannelNickPtr channelNick;
   if (!channel->contains(lcNickname))
   { SHOW;
-    channelNick = ChannelNickPtr(new ChannelNick(nickInfo, false, false, false, \
false, false)); +    channelNick = new ChannelNick(nickInfo, false, false, false, \
false, false);  Q_ASSERT(channelNick);
     channel->insert(lcNickname, channelNick);
     doChannelMembersChangedSignal = true;
@@ -1952,7 +1952,7 @@ ChannelNickPtr Server::addNickToUnjoinedChannelsList(const \
QString& channelName,  ChannelNickPtr channelNick;
   if (!channel->contains(lcNickname))
   {
-    channelNick = ChannelNickPtr(new ChannelNick(nickInfo, false, false, false, \
false, false)); +    channelNick = new ChannelNick(nickInfo, false, false, false, \
false, false);  channel->insert(lcNickname, channelNick);
     doChannelMembersChangedSignal = true;
   }
@@ -2160,22 +2160,18 @@ void Server::renameNickInfo(NickInfoPtr nickInfo, const \
QString& newname)  const_cast<ChannelNickMap *>(channel)->insert(lcNewname, member);
     }
     // Rename key in the Online, Offline, and Query lists.
-    NickInfoPtr nickInfo;
     if (nicknamesOnline.contains(lcNickname))
     {
-      nickInfo = nicknamesOnline[lcNickname];
       nicknamesOnline.remove(lcNickname);
       nicknamesOnline.insert(lcNewname, nickInfo);
     }
     if (nicknamesOffline.contains(lcNickname))
     {
-      nickInfo = nicknamesOffline[lcNickname];
       nicknamesOffline.remove(lcNickname);
       nicknamesOffline.insert(lcNewname, nickInfo);
     }
     if (queryNicks.contains(lcNickname))
     {
-      nickInfo = queryNicks[lcNickname];
       queryNicks.remove(lcNickname);
       queryNicks.insert(lcNewname, nickInfo);
     }
diff --git a/konversation/server.h b/konversation/server.h
index 55ef389..68b16d2 100644
--- a/konversation/server.h
+++ b/konversation/server.h
@@ -46,8 +46,6 @@ class ChannelListPanel;
 class ScriptLauncher;
 class LocaleString;
 
-typedef QMap<LocaleString,ChannelNickPtr> ChannelNickMap;
-
 class Server : public QObject
 {
   Q_OBJECT


[prev in list] [next in list] [prev in thread] [next in thread]