diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2026-02-21 11:03:45 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2026-02-22 20:27:14 +0900 |
| commit | dc40ab2b60be916a25f3ab41aa8a51133a0e5d97 (patch) | |
| tree | cf51f154b8fb571fe875e705e22216b00d189d79 /src/modules/objects/class_socket.cpp | |
| parent | 3870c5a99cb72327413318919b4ff5cd69f2baa6 (diff) | |
| download | kvirc-dc40ab2b60be916a25f3ab41aa8a51133a0e5d97.tar.gz kvirc-dc40ab2b60be916a25f3ab41aa8a51133a0e5d97.zip | |
Fix conversion of TQString to const char* (modules)
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 16d42ec4616a84b046cd71f805a009b792a93ec9)
Diffstat (limited to 'src/modules/objects/class_socket.cpp')
| -rw-r--r-- | src/modules/objects/class_socket.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp index edf086b..686a5de 100644 --- a/src/modules/objects/class_socket.cpp +++ b/src/modules/objects/class_socket.cpp @@ -600,18 +600,18 @@ bool KviKvsObject_socket::functionConnect(KviKvsObjectFunctionCall *c) #ifdef COMPILE_IPV6_SUPPORT - if(kvi_isValidStringIp(m_szRemoteIp) || kvi_isValidStringIp_V6(m_szRemoteIp)) + if(kvi_isValidStringIp(m_szRemoteIp.utf8().data()) || kvi_isValidStringIp_V6(m_szRemoteIp.utf8().data())) #else - if(kvi_isValidStringIp(m_szRemoteIp)) + if(kvi_isValidStringIp(m_szRemoteIp.utf8().data())) #endif { tqDebug ("ok connecting"); - tqDebug ("connectinhg on ip %s ",m_szRemoteIp.latin1()); + tqDebug ("connectinhg on ip %s ",m_szRemoteIp.local8Bit().data()); tqDebug ("non so ip"); m_iStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTING; delayedConnect(); } else { - tqDebug ("connectinhg on ip %s port %d",m_szRemoteIp.latin1(),m_uRemotePort); + tqDebug ("connectinhg on ip %s port %ld",m_szRemoteIp.local8Bit().data(),m_uRemotePort); m_iStatus = KVI_SCRIPT_SOCKET_STATUS_DNS; delayedLookupRemoteIp(); } @@ -658,10 +658,10 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c) { // Check the address type - if(kvi_isValidStringIp(m_szLocalIp))bGotIp = true; + if(kvi_isValidStringIp(m_szLocalIp.utf8().data()))bGotIp = true; else { #ifdef COMPILE_IPV6_SUPPORT - if(kvi_isValidStringIp_V6(m_szLocalIp)) + if(kvi_isValidStringIp_V6(m_szLocalIp.utf8().data())) { bGotIp = true; m_bIpV6 = true; @@ -697,9 +697,9 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c) if(!m_szLocalIp.isEmpty()) { #ifdef COMPILE_IPV6_SUPPORT - KviSockaddr sa(m_szLocalIp,m_uLocalPort,m_bIpV6,m_bUdp); + KviSockaddr sa(m_szLocalIp.utf8().data(),m_uLocalPort,m_bIpV6,m_bUdp); #else - KviSockaddr sa(m_szLocalIp,m_uLocalPort,false,m_bUdp); + KviSockaddr sa(m_szLocalIp.utf8().data(),m_uLocalPort,false,m_bUdp); #endif if(!sa.socketAddress()) { @@ -826,7 +826,7 @@ void KviKvsObject_socket::incomingConnection(int) } // else..huh ?... wait for the next notifier call } -void KviKvsObject_socket::acceptConnection(kvi_socket_t s,kvi_u32_t uPort,const char * szIp) +void KviKvsObject_socket::acceptConnection(kvi_socket_t s,kvi_u32_t uPort,const TQString &szIp) { reset(); m_sock = s; @@ -868,7 +868,7 @@ void KviKvsObject_socket::doConnect() m_pDelayTimer = 0; - KviSockaddr sa(m_szRemoteIp,m_uRemotePort,!kvi_isValidStringIp(m_szRemoteIp),m_bUdp); + KviSockaddr sa(m_szRemoteIp.utf8().data(),m_uRemotePort,!kvi_isValidStringIp(m_szRemoteIp.utf8().data()),m_bUdp); if(!sa.socketAddress()) { |