diff options
Diffstat (limited to 'src/kvilib/net')
| -rw-r--r-- | src/kvilib/net/kvi_http.cpp | 18 | ||||
| -rw-r--r-- | src/kvilib/net/kvi_ssl.cpp | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/kvilib/net/kvi_http.cpp b/src/kvilib/net/kvi_http.cpp index 07a69658..9986530a 100644 --- a/src/kvilib/net/kvi_http.cpp +++ b/src/kvilib/net/kvi_http.cpp @@ -348,13 +348,13 @@ bool KviHttpRequest::event(TQEvent *e) void KviHttpRequest::emitLines(KviDataBuffer * pDataBuffer) { - int idx = pDataBuffer->tqfind((const unsigned char *)"\n",1); + int idx = pDataBuffer->find((const unsigned char *)"\n",1); while(idx != -1) { KviStr tmp((const char *)(m_pBuffer->data()),idx); tmp.stripRight('\r'); pDataBuffer->remove(idx + 1); - idx = pDataBuffer->tqfind((const unsigned char *)"\n",1); + idx = pDataBuffer->find((const unsigned char *)"\n",1); emit data(tmp); } } @@ -531,12 +531,12 @@ bool KviHttpRequest::processHeader(KviStr &szHeader) KviStr szName = s->left(idx); s->cutLeft(idx + 1); s->stripWhiteSpace(); - hdr.tqreplace(szName.ptr(),new KviStr(*s)); + hdr.replace(szName.ptr(),new KviStr(*s)); //debug("FOUND HEADER (%s)=(%s)",szName.ptr(),s->ptr()); } } - KviStr * size = hdr.tqfind("Content-length"); + KviStr * size = hdr.find("Content-length"); if(size) { bool bOk; @@ -544,13 +544,13 @@ bool KviHttpRequest::processHeader(KviStr &szHeader) if(!bOk)m_uTotalSize = 0; } - KviStr * contentEncoding = hdr.tqfind("Content-encoding"); + KviStr * contentEncoding = hdr.find("Content-encoding"); if(contentEncoding) { m_bGzip = contentEncoding->equalsCI("gzip"); } - KviStr * transferEncoding = hdr.tqfind("Transfer-Encoding"); + KviStr * transferEncoding = hdr.find("Transfer-Encoding"); if(transferEncoding) { if(kvi_strEqualCI(transferEncoding->ptr(),"chunked")) @@ -651,7 +651,7 @@ void KviHttpRequest::processData(KviDataBuffer * data) // time to process the header m_pBuffer->append(*data); - int idx = m_pBuffer->tqfind((const unsigned char *)"\r\n\r\n",4); + int idx = m_pBuffer->find((const unsigned char *)"\r\n\r\n",4); if(idx == -1) { // header not complete @@ -721,7 +721,7 @@ void KviHttpRequest::processData(KviDataBuffer * data) // we're processing data in m_pBuffer here if(m_bChunkedTransferEncoding) { - // The transfer encoding is chunked: the buffer tqcontains + // The transfer encoding is chunked: the buffer contains // chunks of data with an initial header composed // of a hexadecimal length, an optional bullshit and a single CRLF // The transfer terminates when we read a last chunk of size 0 @@ -776,7 +776,7 @@ void KviHttpRequest::processData(KviDataBuffer * data) // We're looking for the beginning of a chunk now. // Note that we might be at the end of a previous chunk that has a CRLF terminator // we need to skip it. - int crlf = m_pBuffer->tqfind((const unsigned char *)"\r\n",2); + int crlf = m_pBuffer->find((const unsigned char *)"\r\n",2); if(crlf != -1) { if(crlf == 0) diff --git a/src/kvilib/net/kvi_ssl.cpp b/src/kvilib/net/kvi_ssl.cpp index b6cb2c21..586f7fb4 100644 --- a/src/kvilib/net/kvi_ssl.cpp +++ b/src/kvilib/net/kvi_ssl.cpp @@ -564,7 +564,7 @@ void KviSSLCertificate::splitX509String(KviPointerHashTable<const char *,KviStr> arr[i]->cutLeft(idx + 1); if(szTok.hasData() && arr[i]->hasData()) { - dict->tqreplace(szTok.ptr(),new KviStr(arr[i]->ptr())); + dict->replace(szTok.ptr(),new KviStr(arr[i]->ptr())); } } } @@ -577,7 +577,7 @@ void KviSSLCertificate::splitX509String(KviPointerHashTable<const char *,KviStr> const char * KviSSLCertificate::dictEntry(KviPointerHashTable<const char *,KviStr> * dict,const char * entry) { - KviStr * t = dict->tqfind(entry); + KviStr * t = dict->find(entry); if(!t)return __tr("Unknown"); return t->ptr(); } |