From 7cc4356bc2eceb5a66c2263bff44aa472d2ca290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 29 Oct 2018 18:21:41 +0100 Subject: Fix build with a clean TQt namespace. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- src/kvilib/net/kvi_dns.cpp | 2 +- src/kvilib/net/kvi_http.cpp | 6 +++--- src/kvilib/net/kvi_netutils.cpp | 2 +- src/kvilib/net/kvi_ssl.cpp | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/kvilib/net') diff --git a/src/kvilib/net/kvi_dns.cpp b/src/kvilib/net/kvi_dns.cpp index 285c45e3..d537e3fe 100644 --- a/src/kvilib/net/kvi_dns.cpp +++ b/src/kvilib/net/kvi_dns.cpp @@ -363,7 +363,7 @@ KviDns::~KviDns() if(m_pSlaveThread)delete m_pSlaveThread; // will eventually terminate it (but it will also block us!!!) KviThreadManager::killPendingEvents(this); if(m_pDnsResult)delete m_pDnsResult; - if(m_pAuxData)debug("You're leaking memory man! m_pAuxData is non 0!"); + if(m_pAuxData)tqDebug("You're leaking memory man! m_pAuxData is non 0!"); } diff --git a/src/kvilib/net/kvi_http.cpp b/src/kvilib/net/kvi_http.cpp index 9e87d78c..0bcd864b 100644 --- a/src/kvilib/net/kvi_http.cpp +++ b/src/kvilib/net/kvi_http.cpp @@ -532,7 +532,7 @@ bool KviHttpRequest::processHeader(KviStr &szHeader) s->cutLeft(idx + 1); s->stripWhiteSpace(); hdr.replace(szName.ptr(),new KviStr(*s)); - //debug("FOUND HEADER (%s)=(%s)",szName.ptr(),s->ptr()); + //tqDebug("FOUND HEADER (%s)=(%s)",szName.ptr(),s->ptr()); } } @@ -914,7 +914,7 @@ bool KviHttpRequestThread::processInternalEvents() } break; default: - debug("Unrecognized event in http thread"); + tqDebug("Unrecognized event in http thread"); delete e; return false; break; @@ -1425,7 +1425,7 @@ void KviHttpRequestThread::runInternal() szRequest += "\r\n"; } - //debug("SENDING REQUEST:\n%s",szRequest.ptr()); + //tqDebug("SENDING REQUEST:\n%s",szRequest.ptr()); if(!sendBuffer(szRequest.ptr(),szRequest.len(),60))return; diff --git a/src/kvilib/net/kvi_netutils.cpp b/src/kvilib/net/kvi_netutils.cpp index 3ff5d9b0..e4186ea5 100644 --- a/src/kvilib/net/kvi_netutils.cpp +++ b/src/kvilib/net/kvi_netutils.cpp @@ -1206,7 +1206,7 @@ bool kvi_getInterfaceAddress(const char * ifname,TQString &buffer) { - debug("kvi_getInterfaceAddress is deprecated: use KviNetUtils::getInterfaceAddress"); + tqDebug("kvi_getInterfaceAddress is deprecated: use KviNetUtils::getInterfaceAddress"); TQString szRet; diff --git a/src/kvilib/net/kvi_ssl.cpp b/src/kvilib/net/kvi_ssl.cpp index 3404b80b..038e124a 100644 --- a/src/kvilib/net/kvi_ssl.cpp +++ b/src/kvilib/net/kvi_ssl.cpp @@ -199,7 +199,7 @@ static DH * my_get_dh(int keylength) break; default: // What the hell do you want from me ? - debug("OpenSSL is asking for a DH param with keylen %d: no way :D",keylength); + tqDebug("OpenSSL is asking for a DH param with keylen %d: no way :D",keylength); break; } @@ -332,7 +332,7 @@ static int cb(char *buf, int size, int rwflag, void *u) int len = p->len(); if(len >= size)return 0; kvi_memmove(buf,p->ptr(),len + 1); -// debug("PASS REQUESTED: %s",p->ptr()); +// tqDebug("PASS REQUESTED: %s",p->ptr()); return len; } @@ -346,7 +346,7 @@ KviSSL::Result KviSSL::useCertificateFile(const char * cert,const char * pass) FILE * f = fopen(cert,"r"); if(!f)return FileIoError; -// debug("READING CERTIFICATE %s",cert); +// tqDebug("READING CERTIFICATE %s",cert); if(PEM_read_X509(f,&x509,cb,&m_szPass)) { if(!SSL_CTX_use_certificate(m_pSSLCtx,x509)) @@ -372,7 +372,7 @@ KviSSL::Result KviSSL::usePrivateKeyFile(const char * key,const char * pass) FILE * f = fopen(key,"r"); if(!f)return FileIoError; -// debug("READING KEY %s",key); +// tqDebug("READING KEY %s",key); if(PEM_read_PrivateKey(f,&k,cb,&m_szPass)) { if(!SSL_CTX_use_PrivateKey(m_pSSLCtx,k)) -- cgit v1.2.1