cleaning&tidying:) and user-contributed patch for bitrate grabbing from amarok

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2192 17fca916-40b9-46aa-a4ea-0a15b648b75c

5 files changed, 21 insertions, 18 deletions

diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 533a3456f..d68a69eb9 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -216,7 +216,7 @@ void KviDccChat::connectionInProgress()
 
 			//FIXME: #warning "OPTION FOR SENDING 127.0.0.1 and so on (not an unsigned number)"
 			struct in_addr a;
-			if(kvi_stringIpToBinaryIp(ip.ptr(),&a))ip.setNum(htonl(a.s_addr));
+			if(KviNetUtils::stringIpToBinaryIp(ip.ptr(),&a))ip.setNum(htonl(a.s_addr));
 
 			QString szReq = QString("PRIVMSG %1 :%2DCC %3 chat %4 %5").arg(m_pDescriptor->szNick).arg((char)0x01).arg(m_pDescriptor->szType).arg(ip.ptr()).arg(port);
 
diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp
index 628889e45..693c77434 100644
--- a/src/modules/dcc/marshal.cpp
+++ b/src/modules/dcc/marshal.cpp
@@ -121,10 +121,10 @@ int KviDccMarshal::dccListen(const QString &ip,const QString &port,bool bUseTime
 void KviDccMarshal::doListen()
 {
 	// Check the address type
-	if(!kvi_isValidStringIp(m_szIp.toUtf8().data()))
+	if(!KviNetUtils::isValidStringIp(m_szIp))
 	{
 #ifdef COMPILE_IPV6_SUPPORT
-		if(!kvi_isValidStringIp_V6(m_szIp.toUtf8().data()))
+		if(!KviNetUtils::isValidStringIp_V6(m_szIp))
 		{
 			emit error(KviError_invalidIpAddress);
 			return;
@@ -295,10 +295,10 @@ int KviDccMarshal::dccConnect(const char * ip,const char * port,bool bUseTimeout
 void KviDccMarshal::doConnect()
 {
 	// Check the address type
-	if(!kvi_isValidStringIp(m_szIp.toUtf8().data()))
+	if(!KviNetUtils::isValidStringIp(m_szIp))
 	{
 #ifdef COMPILE_IPV6_SUPPORT
-		if(!kvi_isValidStringIp_V6(m_szIp.toUtf8().data()))
+		if(!KviNetUtils::isValidStringIp_V6(m_szIp))
 		{
 			emit error(KviError_invalidIpAddress);
 			return;
@@ -445,12 +445,12 @@ void KviDccMarshal::snActivated(int)
 			if(m_bIPv6)
 			{
 				m_szSecondaryPort.setNum(ntohs(((struct sockaddr_in6 *)addr)->sin6_port));
-				if(!kvi_binaryIpToStringIp_V6(((struct sockaddr_in6 *)addr)->sin6_addr,m_szSecondaryIp))
+				if(!KviNetUtils::binaryIpToStringIp_V6(((struct sockaddr_in6 *)addr)->sin6_addr,m_szSecondaryIp))
 					m_szSecondaryIp = "localhost";
 			} else {
 #endif
 				m_szSecondaryPort.setNum(ntohs(((struct sockaddr_in *)addr)->sin_port));
-				if(!kvi_binaryIpToStringIp(((struct sockaddr_in *)addr)->sin_addr,m_szSecondaryIp))
+				if(!KviNetUtils::binaryIpToStringIp(((struct sockaddr_in *)addr)->sin_addr,m_szSecondaryIp))
 					m_szSecondaryIp = "localhost";
 #ifdef COMPILE_IPV6_SUPPORT
 			}
@@ -468,12 +468,12 @@ void KviDccMarshal::snActivated(int)
 			if(m_bIPv6)
 			{
 				m_szSecondaryPort.setNum(ntohs(((struct sockaddr_in6 *)addr)->sin6_port));
-				if(!kvi_binaryIpToStringIp_V6(((struct sockaddr_in6 *)addr)->sin6_addr,m_szSecondaryIp))
+				if(!KviNetUtils::binaryIpToStringIp_V6(((struct sockaddr_in6 *)addr)->sin6_addr,m_szSecondaryIp))
 					m_szSecondaryIp = __tr2qs_ctx("unknown","dcc");
 			} else {
 #endif
 				m_szSecondaryPort.setNum(ntohs(((struct sockaddr_in *)addr)->sin_port));
-				if(!kvi_binaryIpToStringIp(((struct sockaddr_in *)addr)->sin_addr,m_szSecondaryIp))
+				if(!KviNetUtils::binaryIpToStringIp(((struct sockaddr_in *)addr)->sin_addr,m_szSecondaryIp))
 					m_szSecondaryIp = __tr2qs_ctx("unknown","dcc");
 #ifdef COMPILE_IPV6_SUPPORT
 			}
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index dc31a8045..830c8884d 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -167,7 +167,7 @@ static bool dcc_module_normalize_target_data(KviDccRequest * dcc,KviStr &ipaddr,
 	{
 		addr.s_addr = htonl((unsigned long)ipaddr.toULong());
 		QString tmp;
-		if(!kvi_binaryIpToStringIp(addr,tmp))
+		if(!KviNetUtils::binaryIpToStringIp(addr,tmp))
 		{
 			if(!dcc->ctcpMsg->msg->haltOutput())
 			{
@@ -179,11 +179,12 @@ static bool dcc_module_normalize_target_data(KviDccRequest * dcc,KviStr &ipaddr,
 		}
 		ipaddr = tmp;
 	} else {
-		if(!kvi_stringIpToBinaryIp(ipaddr,&addr))
+		//FIXME: KviStr -> QString
+		if(!KviNetUtils::stringIpToBinaryIp(QString(ipaddr),&addr))
 		{
 #ifdef COMPILE_IPV6_SUPPORT
 			struct in6_addr addr6;
-			if(kvi_stringIpToBinaryIp_V6(ipaddr,&addr6))
+			if(KviNetUtils::stringIpToBinaryIp_V6(QString(ipaddr),&addr6))
 			{
 				dcc->bIPv6 = true;
 				return true; // IPV6 address.
diff --git a/src/modules/dcc/utils.cpp b/src/modules/dcc/utils.cpp
index bf57e8102..6fe529834 100644
--- a/src/modules/dcc/utils.cpp
+++ b/src/modules/dcc/utils.cpp
@@ -111,7 +111,7 @@ bool dcc_kvs_get_listen_ip_address(KviKvsModuleCommandCall *c,KviConsole * pCons
 		KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).trimmed();
 		if(!KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).isEmpty())
 		{
-			if(kvi_isValidStringIp(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data()))
+			if(KviNetUtils::isValidStringIp(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data()))
 			{
 				if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface),"0.0.0.0"))
 				{
@@ -128,7 +128,7 @@ bool dcc_kvs_get_listen_ip_address(KviKvsModuleCommandCall *c,KviConsole * pCons
 				return true;
 			}
 #ifdef COMPILE_IPV6_SUPPORT
-			if(kvi_isValidStringIp_V6(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data()))
+			if(KviNetUtils::isValidStringIp_V6(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data()))
 			{
 				szListenIp = KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface);
 			} else {
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index a8d6116cb..58f0815ae 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -752,16 +752,18 @@ void KviDccVoice::connectionInProgress()
 
 		if(m_pDescriptor->bSendRequest)
 		{
-			KviStr ip     = !m_pDescriptor->szFakeIp.isEmpty() ? m_pDescriptor->szFakeIp : m_pDescriptor->szListenIp;
+			QString ip     = !m_pDescriptor->szFakeIp.isEmpty() ? m_pDescriptor->szFakeIp : m_pDescriptor->szListenIp;
 			KviStr port   = !m_pDescriptor->szFakePort.isEmpty() ? m_pDescriptor->szFakePort : m_pMarshal->localPort();
 //#warning "OPTION FOR SENDING 127.0.0.1 and so on (not an unsigned nuumber)"
 			struct in_addr a;
-			if(kvi_stringIpToBinaryIp(ip.ptr(),&a))ip.setNum(htonl(a.s_addr));
+			if(KviNetUtils::stringIpToBinaryIp(ip,&a)) {
+				ip.setNum(htonl(a.s_addr));
+			}
 
-			m_pDescriptor->console()->connection()->sendFmtData("PRIVMSG %s :%cDCC VOICE %s %s %s %d%c",
+			m_pDescriptor->console()->connection()->sendFmtData("PRIVMSG %s :%cDCC VOICE %s %Q %s %d%c",
 					m_pDescriptor->console()->connection()->encodeText(m_pDescriptor->szNick).data(),
 					0x01,m_pDescriptor->szCodec.ptr(),
-					ip.ptr(),port.ptr(),m_pDescriptor->iSampleRate,0x01);
+					&ip,port.ptr(),m_pDescriptor->iSampleRate,0x01);
 			output(KVI_OUT_DCCMSG,__tr2qs_ctx("Sent DCC VOICE (%s) request to %Q, waiting for the remote client to connect...","dcc"),
 					m_pDescriptor->szCodec.ptr(),&(m_pDescriptor->szNick));
 		} else output(KVI_OUT_DCCMSG,__tr2qs_ctx("DCC VOICE request not sent: awaiting manual connections","dcc"));