From kde-commits Fri Jan 30 11:16:51 2009 From: Laurent Montel Date: Fri, 30 Jan 2009 11:16:51 +0000 To: kde-commits Subject: branches/work/konvi-kde4/src/irc Message-Id: <1233314211.969494.26025.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=123331428110679 SVN commit 918611 by mlaurent: Fix signal/slot M +4 -4 server.cpp M +2 -2 server.h --- branches/work/konvi-kde4/src/irc/server.cpp #918610:918611 @@ -648,7 +648,7 @@ // Some servers don't include the userhost in RPL_WELCOME, so we // need to use RPL_USERHOST to get ahold of our IP later on if (!ownHost.isEmpty()) - KNetwork::KResolver::resolveAsync(this,SLOT(gotOwnResolvedHostByWelcome(KResolverResults)),ownHost,"0"); + KNetwork::KResolver::resolveAsync(this,SLOT(gotOwnResolvedHostByWelcome(KNetwork::KResolverResults)),ownHost,"0"); updateConnectionState(Konversation::SSConnected); @@ -697,7 +697,7 @@ m_keyMap[recipient] = key; } -void Server::gotOwnResolvedHostByWelcome(KResolverResults res) +void Server::gotOwnResolvedHostByWelcome(KNetwork::KResolverResults res) { if (res.error() == KResolver::NoError && !res.isEmpty()) m_ownIpByWelcome = res.first().address().nodeName(); @@ -2725,7 +2725,7 @@ { QString myhost = hostmask.section('@', 1); // Use async lookup else you will be blocking GUI badly - KNetwork::KResolver::resolveAsync(this,SLOT(gotOwnResolvedHostByUserhost(KResolverResults)),myhost,"0"); + KNetwork::KResolver::resolveAsync(this,SLOT(gotOwnResolvedHostByUserhost(KNetwork::KResolverResults)),myhost,"0"); } NickInfoPtr nickInfo = getNickInfo(nick); if (nickInfo) @@ -2737,7 +2737,7 @@ } } -void Server::gotOwnResolvedHostByUserhost(KResolverResults res) +void Server::gotOwnResolvedHostByUserhost(KNetwork::KResolverResults res) { if ( res.error() == KResolver::NoError && !res.isEmpty() ) m_ownIpByUserhost = res.first().address().nodeName(); --- branches/work/konvi-kde4/src/irc/server.h #918610:918611 @@ -515,8 +515,8 @@ void endOfWho(const QString& target); void invitation(const QString& nick,const QString& channel); void sendToAllChannelsAndQueries(const QString& text); - void gotOwnResolvedHostByWelcome(KResolverResults res); - void gotOwnResolvedHostByUserhost(KResolverResults res); + void gotOwnResolvedHostByWelcome(KNetwork::KResolverResults res); + void gotOwnResolvedHostByUserhost(KNetwork::KResolverResults res); /// Send a PING to the server so we can meassure the lag void sendPing();