diff options
| author |  Elvio Basello | 2008-09-27 16:29:29 +0000 |
|---|---|---|
| committer | Elvio Basello | 2008-09-27 16:29:29 +0000 |
| commit | 8e2afb36313bfc0fefe4811cc59b732da4f0ded8 (patch) | |
| tree | ac1f015310e6f8cb6cd5515ac9be565a1c91091f /src/modules | |
| parent | fix for #245 (trunk/4.0 version) (diff) | |
| download | KVIrc-8e2afb36313bfc0fefe4811cc59b732da4f0ded8.tar.gz KVIrc-8e2afb36313bfc0fefe4811cc59b732da4f0ded8.tar.bz2 KVIrc-8e2afb36313bfc0fefe4811cc59b732da4f0ded8.zip | |
added doxygen comments;
renamed function;
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2586 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/dcc/marshal.cpp | 4 | ||||
| -rw-r--r-- | src/modules/dcc/utils.cpp | 4 | ||||
| -rw-r--r-- | src/modules/objects/class_socket.cpp | 4 | ||||
| -rw-r--r-- | src/modules/options/optw_proxy.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp index 4219a86a0..55ad6ecfa 100644 --- a/src/modules/dcc/marshal.cpp +++ b/src/modules/dcc/marshal.cpp @@ -126,7 +126,7 @@ void KviDccMarshal::doListen() if(!KviNetUtils::isValidStringIp(m_szIp)) { #ifdef COMPILE_IPV6_SUPPORT - if(!KviNetUtils::isValidStringIp_V6(m_szIp)) + if(!KviNetUtils::isValidStringIPv6(m_szIp)) { emit error(KviError_invalidIpAddress); return; @@ -300,7 +300,7 @@ void KviDccMarshal::doConnect() if(!KviNetUtils::isValidStringIp(m_szIp)) { #ifdef COMPILE_IPV6_SUPPORT - if(!KviNetUtils::isValidStringIp_V6(m_szIp)) + if(!KviNetUtils::isValidStringIPv6(m_szIp)) { emit error(KviError_invalidIpAddress); return; diff --git a/src/modules/dcc/utils.cpp b/src/modules/dcc/utils.cpp index 888b6d668..6ac655906 100644 --- a/src/modules/dcc/utils.cpp +++ b/src/modules/dcc/utils.cpp @@ -62,7 +62,7 @@ bool dcc_module_get_listen_ip_address(KviCommand *c,KviConsole * pConsole,QStrin return true; } #ifdef COMPILE_IPV6_SUPPORT - if(kvi_isValidStringIp_V6(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data())) + if(kvi_isValidStringIPv6(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data())) { szListenIp = KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface); } else { @@ -130,7 +130,7 @@ bool dcc_kvs_get_listen_ip_address(KviKvsModuleCommandCall *c,KviConsole * pCons return true; } #ifdef COMPILE_IPV6_SUPPORT - if(KviNetUtils::isValidStringIp_V6(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data())) + if(KviNetUtils::isValidStringIPv6(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data())) { szListenIp = KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface); } else { diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp index 333e17d72..5f3856f58 100644 --- a/src/modules/objects/class_socket.cpp +++ b/src/modules/objects/class_socket.cpp @@ -511,7 +511,7 @@ bool KviKvsObject_socket::functionConnect(KviKvsObjectFunctionCall *c) #ifdef COMPILE_IPV6_SUPPORT - if(KviNetUtils::isValidStringIp(m_szRemoteIp) || KviNetUtils::isValidStringIp_V6(m_szRemoteIp)) + if(KviNetUtils::isValidStringIp(m_szRemoteIp) || KviNetUtils::isValidStringIPv6(m_szRemoteIp)) #else if(KviNetUtils::isValidStringIp(m_szRemoteIp)) #endif @@ -572,7 +572,7 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c) if(KviNetUtils::isValidStringIp(m_szLocalIp))bGotIp = true; else { #ifdef COMPILE_IPV6_SUPPORT - if(KviNetUtils::isValidStringIp_V6(m_szLocalIp)) + if(KviNetUtils::isValidStringIPv6(m_szLocalIp)) { bGotIp = true; m_bIPv6 = true; diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp index db6a111fb..5ebbc7979 100644 --- a/src/modules/options/optw_proxy.cpp +++ b/src/modules/options/optw_proxy.cpp @@ -259,7 +259,7 @@ void KviProxyOptionsWidget::saveLastItem() if(m_pIPv6Check->isChecked()) { if((!KviQString::equalCI(tmpAddr,"0:0:0:0:0:0:0:0")) && - KviNetUtils::isValidStringIp_V6(tmpAddr)) + KviNetUtils::isValidStringIPv6(tmpAddr)) { m_pLastEditedItem->m_pProxyData->m_szIp = tmpAddr; } |