diff options
| author |  Noldor | 2008-04-13 17:47:27 +0000 |
|---|---|---|
| committer | Noldor | 2008-04-13 17:47:27 +0000 |
| commit | a1a2f81e9e131adc82330d0e20f02e00e3e12a25 (patch) | |
| tree | 3af827abfd7194365637d5a3277a118913d8e3d8 /src/modules/dcc/utils.cpp | |
| parent | quick fix (diff) | |
| download | KVIrc-a1a2f81e9e131adc82330d0e20f02e00e3e12a25.tar.gz KVIrc-a1a2f81e9e131adc82330d0e20f02e00e3e12a25.tar.bz2 KVIrc-a1a2f81e9e131adc82330d0e20f02e00e3e12a25.zip | |
removed QT3 QString stuff (wip). Need test.
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1476 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/dcc/utils.cpp')
| -rw-r--r-- | src/modules/dcc/utils.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/modules/dcc/utils.cpp b/src/modules/dcc/utils.cpp index 84c9af0c2..acec18073 100644 --- a/src/modules/dcc/utils.cpp +++ b/src/modules/dcc/utils.cpp @@ -43,7 +43,7 @@ bool dcc_module_get_listen_ip_address(KviCommand *c,KviConsole * pConsole,QStrin KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).stripWhiteSpace(); if(!KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).isEmpty()) { - if(kvi_isValidStringIp(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).utf8().data())) + if(kvi_isValidStringIp(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data())) { if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface),"0.0.0.0")) { @@ -51,7 +51,7 @@ bool dcc_module_get_listen_ip_address(KviCommand *c,KviConsole * pConsole,QStrin if(!kvi_getLocalHostAddress(szListenIp)) { if(c)c->warning(__tr2qs_ctx("Can't retrieve a suitable local IPV4 address","dcc"), - KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).utf8().data()); + KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data()); return false; } } else { @@ -60,16 +60,16 @@ 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).utf8().data())) + if(kvi_isValidStringIp_V6(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data())) { szListenIp = KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface); } else { #endif - if(!kvi_getInterfaceAddress(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).utf8().data(),szListenIp)) + if(!kvi_getInterfaceAddress(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data(),szListenIp)) { KVI_OPTION_BOOL(KviOption_boolDccListenOnSpecifiedInterfaceByDefault) = false; if(c)c->warning(__tr2qs_ctx("Can't listen on default interface '%s': fix it in the options dialog, disabling the option (so the next dcc will work)","dcc"), - KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).utf8().data()); + KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data()); return false; } #ifdef COMPILE_IPV6_SUPPORT @@ -111,7 +111,7 @@ bool dcc_kvs_get_listen_ip_address(KviKvsModuleCommandCall *c,KviConsole * pCons KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).stripWhiteSpace(); if(!KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).isEmpty()) { - if(kvi_isValidStringIp(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).utf8().data())) + if(kvi_isValidStringIp(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data())) { if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface),"0.0.0.0")) { @@ -119,7 +119,7 @@ bool dcc_kvs_get_listen_ip_address(KviKvsModuleCommandCall *c,KviConsole * pCons if(!kvi_getLocalHostAddress(szListenIp)) { if(c)c->warning(__tr2qs_ctx("Can't retrieve a suitable local IPV4 address","dcc"), - KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).utf8().data()); + KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data()); return false; } } else { @@ -128,16 +128,16 @@ 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).utf8().data())) + if(kvi_isValidStringIp_V6(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data())) { szListenIp = KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface); } else { #endif - if(!kvi_getInterfaceAddress(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).utf8().data(),szListenIp)) + if(!kvi_getInterfaceAddress(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data(),szListenIp)) { KVI_OPTION_BOOL(KviOption_boolDccListenOnSpecifiedInterfaceByDefault) = false; if(c)c->warning(__tr2qs_ctx("Can't listen on default interface '%s': fix it in the options dialog, disabling the option (so the next dcc will work)","dcc"), - KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).utf8().data()); + KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data()); return false; } #ifdef COMPILE_IPV6_SUPPORT |