aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/dcc/requests.cpp
diff options
context:
space:
mode:
authorGravatar Alexey Uzhva2008-08-05 15:28:59 +0000
committerGravatar Alexey Uzhva2008-08-05 15:28:59 +0000
commitda0d212df45f3c15fad4a38573923a949bee4a9c (patch)
tree6c17c5c6de15b59375136e75fe54218372c312d6 /src/modules/dcc/requests.cpp
parentquick compilation fix (diff)
downloadKVIrc-da0d212df45f3c15fad4a38573923a949bee4a9c.tar.gz
KVIrc-da0d212df45f3c15fad4a38573923a949bee4a9c.tar.bz2
KVIrc-da0d212df45f3c15fad4a38573923a949bee4a9c.zip
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
Diffstat (limited to 'src/modules/dcc/requests.cpp')
-rw-r--r--src/modules/dcc/requests.cpp7
1 files changed, 4 insertions, 3 deletions
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.