From 6eff13c1b9d284fad598bc4ad92826db29723926 Mon Sep 17 00:00:00 2001
From: Szymon Tomasz Stefanek
Date: Mon, 28 Apr 2008 01:31:42 +0000
Subject: A huge progress in KDE4 port, kvirc and several modules now compile.
 Linking problems solved. Added an option to pick up a random IP address for
 round-robin IRC servers. Some code cleanup all around...

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1608 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/modules/dcc/marshal.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/modules/dcc/marshal.cpp')

diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp
index c67d3d010..06a947583 100644
--- a/src/modules/dcc/marshal.cpp
+++ b/src/modules/dcc/marshal.cpp
@@ -135,10 +135,10 @@ void KviDccMarshal::doListen()
 	}
 
 	// Check the address type
-	if(!kvi_isValidStringIp(m_szIp))
+	if(!kvi_isValidStringIp(m_szIp.toUtf8().data()))
 	{
 #ifdef COMPILE_IPV6_SUPPORT
-		if(!kvi_isValidStringIp_V6(m_szIp))
+		if(!kvi_isValidStringIp_V6(m_szIp.toUtf8().data()))
 		{
 			emit error(KviError_invalidIpAddress);
 			return;
@@ -182,9 +182,9 @@ void KviDccMarshal::doListen()
 	if((!KVI_OPTION_BOOL(KviOption_boolUserDefinedPortRange)) || (m_uPort != 0))
 	{
 #ifdef COMPILE_IPV6_SUPPORT
-		KviSockaddr sa(m_szIp,m_uPort,m_bIpV6);
+		KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,m_bIpV6);
 #else
-		KviSockaddr sa(m_szIp,m_uPort,false);
+		KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,false);
 #endif
 
 		if(!sa.socketAddress())
@@ -207,9 +207,9 @@ void KviDccMarshal::doListen()
 		bool bBindSuccess;
 		do {
 #ifdef COMPILE_IPV6_SUPPORT
-			KviSockaddr sa(m_szIp,m_uPort,m_bIpV6);
+			KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,m_bIpV6);
 #else
-			KviSockaddr sa(m_szIp,m_uPort,false);
+			KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,false);
 #endif
 			if(!sa.socketAddress())
 			{
@@ -323,10 +323,10 @@ void KviDccMarshal::doConnect()
 	}
 
 	// Check the address type
-	if(!kvi_isValidStringIp(m_szIp))
+	if(!kvi_isValidStringIp(m_szIp.toUtf8().data()))
 	{
 #ifdef COMPILE_IPV6_SUPPORT
-		if(!kvi_isValidStringIp_V6(m_szIp))
+		if(!kvi_isValidStringIp_V6(m_szIp.toUtf8().data()))
 		{
 			emit error(KviError_invalidIpAddress);
 			return;
@@ -372,9 +372,9 @@ void KviDccMarshal::doConnect()
 	// fill the sockaddr structure
 
 #ifdef COMPILE_IPV6_SUPPORT
-	KviSockaddr sa(m_szIp,m_uPort,m_bIpV6);
+	KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,m_bIpV6);
 #else
-	KviSockaddr sa(m_szIp,m_uPort,false);
+	KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,false);
 #endif
 
 	if(!sa.socketAddress())
-- 
cgit v1.3.1-10-gc9f91