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

List:       kde-commits
Subject:    branches/work/kde4/kdelibs/kdeprint/management
From:       Wilco Greven <greven () kde ! org>
Date:       2005-05-17 15:47:07
Message-ID: 1116344827.805938.5339.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 415021 by wgreven:

Removed factor 1000 in setTimeout. Ported kmwsocketutil.cpp from 
KExtendedSocket.


 M  +15 -13    branches/work/kde4/kdelibs/kdeprint/management/kmwsocketutil.cpp  
 M  +1 -1      branches/work/kde4/kdelibs/kdeprint/management/networkscanner.cpp  


--- branches/work/kde4/kdelibs/kdeprint/management/kmwsocketutil.cpp #415020:415021
@@ -34,11 +34,15 @@
 
 #include <kapplication.h>
 #include <klocale.h>
-#include <kextsock.h>
 #include <kdebug.h>
+#include <kresolver.h>
+#include <kreverseresolver.h>
+#include <kstreamsocket.h>
 
 #include <unistd.h>
 
+using namespace KNetwork;
+
 QString localRootIP();
 
 //----------------------------------------------------------------------------------------
@@ -140,20 +144,19 @@
 
 bool KMWSocketUtil::checkPrinter(const QString& IPstr, int port, QString* hostname)
 {
-	KExtendedSocket	sock(IPstr, port, KExtendedSocket::inetSocket|KExtendedSocket::streamSocket);
-	bool	result(false);
-	sock.setTimeout(0, timeout_ * 1000);
-	if (sock.connect() == 0)
+	KStreamSocket	sock(IPstr, QString::number(port));
+	sock.setTimeout(timeout_);
+	if (sock.connect())
 	{
 		if (hostname)
 		{
 			QString	portname;
-			KExtendedSocket::resolve((KSocketAddress*)(sock.peerAddress()), *hostname, portname);
+			KReverseResolver::resolve(sock.peerAddress(), *hostname, portname);
 		}
-		result = true;
+		return true;
 	}
-	sock.close();
-	return result;
+	else
+		return false;
 }
 
 bool KMWSocketUtil::scanNetwork(Q3ProgressBar *bar)
@@ -204,11 +207,10 @@
 	buf[0] = '\0';
 	if (!gethostname(buf, sizeof(buf)))
 		buf[sizeof(buf)-1] = '\0';
-	Q3PtrList<KAddressInfo>	infos = KExtendedSocket::lookup(buf, QString::null);
-	infos.setAutoDelete(true);
-	if (infos.count() > 0)
+	KResolverResults    infos = KResolver::resolve(buf, QString::null);
+	if (!infos.error() && infos.count() > 0)
 	{
-		QString	IPstr = infos.first()->address()->nodeName();
+		QString	IPstr = infos.first().address().nodeName();
 		int	p = IPstr.findRev('.');
 		IPstr.truncate(p);
 		return IPstr;
--- branches/work/kde4/kdelibs/kdeprint/management/networkscanner.cpp #415020:415021
@@ -291,7 +291,7 @@
 
 	// not found in SocketInfo list, try to establish connection
 	KStreamSocket sock( host, QString::number(port) );
-	sock.setTimeout( d->timeout * 1000 ); // FIXME: confirm that d->timeout is in seconds
+	sock.setTimeout( d->timeout ); // FIXME: confirm that d->timeout is in seconds
 	return sock.connect();
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]