From 0a80cfd57d271dd44221467efb426675fa470356 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 28 Jun 2011 18:31:12 +0000 Subject: TQt4 port kvirc This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1238719 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/kvilib/net/kvi_dns.cpp | 58 +++++----- src/kvilib/net/kvi_dns.h | 41 +++---- src/kvilib/net/kvi_http.cpp | 154 ++++++++++++------------- src/kvilib/net/kvi_http.h | 59 +++++----- src/kvilib/net/kvi_netutils.cpp | 56 ++++----- src/kvilib/net/kvi_netutils.h | 28 ++--- src/kvilib/net/kvi_socket.h | 2 +- src/kvilib/net/kvi_ssl.cpp | 6 +- src/kvilib/net/kvi_url.cpp | 2 +- src/kvilib/net/kvi_url.h | 2 +- src/kvilib/net/moc_kvi_dns.cpp | 114 +++++++++--------- src/kvilib/net/moc_kvi_http.cpp | 250 ++++++++++++++++++++-------------------- 12 files changed, 387 insertions(+), 385 deletions(-) (limited to 'src/kvilib/net') diff --git a/src/kvilib/net/kvi_dns.cpp b/src/kvilib/net/kvi_dns.cpp index faa2e12..285c45e 100644 --- a/src/kvilib/net/kvi_dns.cpp +++ b/src/kvilib/net/kvi_dns.cpp @@ -60,9 +60,9 @@ KviDnsResult::KviDnsResult() { m_iError = KviError_success; - m_pHostnameList = new KviPointerList; + m_pHostnameList = new KviPointerList; m_pHostnameList->setAutoDelete(true); - m_pIpAddressList = new KviPointerList; + m_pIpAddressList = new KviPointerList; m_pIpAddressList->setAutoDelete(true); } @@ -73,15 +73,15 @@ KviDnsResult::~KviDnsResult() delete m_pIpAddressList; } -void KviDnsResult::appendHostname(const QString &host) +void KviDnsResult::appendHostname(const TQString &host) { - m_pHostnameList->append(new QString(host)); + m_pHostnameList->append(new TQString(host)); } -void KviDnsResult::appendAddress(const QString &addr) +void KviDnsResult::appendAddress(const TQString &addr) { - m_pIpAddressList->append(new QString(addr)); + m_pIpAddressList->append(new TQString(addr)); } @@ -197,22 +197,22 @@ void KviDnsThread::run() } } else { dns->appendHostname(pHostEntry->h_name); - QString szIp; + TQString szIp; KviNetUtils::binaryIpToStringIp(* ((struct in_addr*)(pHostEntry->h_addr)),szIp); dns->appendAddress(szIp); int idx = 1; while(pHostEntry->h_addr_list[idx]) { - QString tmp; + TQString tmp; KviNetUtils::binaryIpToStringIp(* ((struct in_addr*)(pHostEntry->h_addr_list[idx])),tmp); if(tmp.hasData())dns->appendAddress(tmp); ++idx; } if(pHostEntry->h_aliases[0]) { - dns->appendHostname(QString::fromUtf8(pHostEntry->h_aliases[0])); - if(pHostEntry->h_aliases[1])dns->appendHostname(QString::fromUtf8(pHostEntry->h_aliases[1])); + dns->appendHostname(TQString::fromUtf8(pHostEntry->h_aliases[0])); + if(pHostEntry->h_aliases[1])dns->appendHostname(TQString::fromUtf8(pHostEntry->h_aliases[1])); } } @@ -293,12 +293,12 @@ void KviDnsThread::run() hints.ai_addr = 0; hints.ai_next = 0; - retVal = getaddrinfo(KviQString::toUtf8(m_szQuery).data(),0,&hints,&pRet); + retVal = getaddrinfo(KviTQString::toUtf8(m_szQuery).data(),0,&hints,&pRet); if(retVal != 0)dns->setError(translateDnsError(retVal)); else { - dns->appendHostname(pRet->ai_canonname ? QString::fromUtf8(pRet->ai_canonname) : m_szQuery); - QString szIp; + dns->appendHostname(pRet->ai_canonname ? TQString::fromUtf8(pRet->ai_canonname) : m_szQuery); + TQString szIp; #ifdef COMPILE_IPV6_SUPPORT if(pRet->ai_family == PF_INET6)KviNetUtils::binaryIpToStringIp_V6(((sockaddr_in6 *)(pRet->ai_addr))->sin6_addr,szIp); else { @@ -312,7 +312,7 @@ void KviDnsThread::run() pNext = pRet->ai_next; while(pNext) { - QString tmp; + TQString tmp; #ifdef COMPILE_IPV6_SUPPORT if(pNext->ai_family == PF_INET6)KviNetUtils::binaryIpToStringIp_V6(((sockaddr_in6 *)(pNext->ai_addr))->sin6_addr,tmp); else { @@ -326,7 +326,7 @@ void KviDnsThread::run() if(pNext->ai_canonname) { // FIXME: only of not equal to other names ? - dns->appendHostname(QString::fromUtf8(pNext->ai_canonname)); + dns->appendHostname(TQString::fromUtf8(pNext->ai_canonname)); } pNext = pNext->ai_next; @@ -350,7 +350,7 @@ void KviDnsThread::run() KviDns::KviDns() -: QObject() +: TQObject() { m_pSlaveThread = new KviDnsThread(this); m_pDnsResult = new KviDnsResult(); @@ -372,10 +372,10 @@ bool KviDns::isRunning() const return (m_state == Busy); }; -bool KviDns::lookup(const QString &query,QueryType type) +bool KviDns::lookup(const TQString &query,QueryType type) { if(m_state == Busy)return false; - m_pSlaveThread->setQuery(KviQString::trimmed(query),type); + m_pSlaveThread->setQuery(KviTQString::trimmed(query),type); bool bStarted = m_pSlaveThread->start(); m_state = bStarted ? Busy : Failure; return bStarted; @@ -393,12 +393,12 @@ KviDnsResult * KviDns::result() return m_pDnsResult; } -KviPointerList * KviDns::hostnameList() +KviPointerList * KviDns::hostnameList() { return result()->hostnameList(); } -KviPointerList * KviDns::ipAddressList() +KviPointerList * KviDns::ipAddressList() { return result()->ipAddressList(); } @@ -413,26 +413,26 @@ int KviDns::ipAddressCount() return result()->ipAddressList()->count(); } -const QString & KviDns::firstHostname() +const TQString & KviDns::firstHostname() { - QString * pStr = result()->hostnameList()->first(); + TQString * pStr = result()->hostnameList()->first(); if(pStr)return *pStr; - return KviQString::empty; + return KviTQString::empty; } -const QString & KviDns::firstIpAddress() +const TQString & KviDns::firstIpAddress() { - QString * pStr = result()->ipAddressList()->first(); + TQString * pStr = result()->ipAddressList()->first(); if(pStr)return *pStr; - return KviQString::empty; + return KviTQString::empty; } -const QString & KviDns::query() +const TQString & KviDns::query() { return result()->query(); } -bool KviDns::event(QEvent *e) +bool KviDns::event(TQEvent *e) { if(e->type() == KVI_THREAD_EVENT) { @@ -445,6 +445,6 @@ bool KviDns::event(QEvent *e) return true; } // else ops... unknown thread event ? } - return QObject::event(e); + return TQObject::event(e); } diff --git a/src/kvilib/net/kvi_dns.h b/src/kvilib/net/kvi_dns.h index 3f423c2..70dbf8c 100644 --- a/src/kvilib/net/kvi_dns.h +++ b/src/kvilib/net/kvi_dns.h @@ -44,29 +44,30 @@ public: ~KviDnsResult(); protected: int m_iError; - KviPointerList * m_pHostnameList; - KviPointerList * m_pIpAddressList; - QString m_szQuery; + KviPointerList * m_pHostnameList; + KviPointerList * m_pIpAddressList; + TQString m_szQuery; public: int error(){ return m_iError; }; // never store nor delete these pointers! // (these are NEVER 0) - KviPointerList * hostnameList(){ return m_pHostnameList; }; - KviPointerList * ipAddressList(){ return m_pIpAddressList; }; - const QString &query(){ return m_szQuery; }; + KviPointerList * hostnameList(){ return m_pHostnameList; }; + KviPointerList * ipAddressList(){ return m_pIpAddressList; }; + const TQString &query(){ return m_szQuery; }; protected: void setError(int iError){ m_iError = iError; }; - void setQuery(const QString &query){ m_szQuery = query; }; - void appendHostname(const QString &host); - void appendAddress(const QString &addr); + void setQuery(const TQString &query){ m_szQuery = query; }; + void appendHostname(const TQString &host); + void appendAddress(const TQString &addr); }; -class KVILIB_API KviDns : public QObject, public KviHeapObject +class KVILIB_API KviDns : public TQObject, public KviHeapObject { Q_OBJECT - Q_PROPERTY(bool blockingDelete READ isRunning) + TQ_OBJECT + TQ_PROPERTY(bool blockingDelete READ isRunning) public: KviDns(); ~KviDns(); @@ -85,27 +86,27 @@ public: // // Lookup start - bool lookup(const QString &szQuery,QueryType type); + bool lookup(const TQString &szQuery,QueryType type); // Current object state State state(){ return m_state; }; // Results (return always non null-data..but valid results only if state() == Success or Failure) int error(); - const QString & firstHostname(); - const QString & firstIpAddress(); + const TQString & firstHostname(); + const TQString & firstIpAddress(); int hostnameCount(); int ipAddressCount(); - KviPointerList * hostnameList(); - KviPointerList * ipAddressList(); - const QString & query(); + KviPointerList * hostnameList(); + KviPointerList * ipAddressList(); + const TQString & query(); bool isRunning() const; // Auxiliary data store void setAuxData(void * pAuxData){ m_pAuxData = pAuxData; }; void * releaseAuxData(){ void * pData = m_pAuxData; m_pAuxData = 0; return pData; }; protected: - virtual bool event(QEvent *e); + virtual bool event(TQEvent *e); private: KviDnsResult * result(); signals: @@ -127,11 +128,11 @@ protected: KviDnsThread(KviDns * pDns); ~KviDnsThread(); protected: - QString m_szQuery; + TQString m_szQuery; KviDns::QueryType m_queryType; KviDns * m_pParentDns; public: - void setQuery(const QString &query,KviDns::QueryType type){ m_szQuery = query; m_queryType = type; }; + void setQuery(const TQString &query,KviDns::QueryType type){ m_szQuery = query; m_queryType = type; }; protected: virtual void run(); int translateDnsError(int iErr); diff --git a/src/kvilib/net/kvi_http.cpp b/src/kvilib/net/kvi_http.cpp index 2e94abb..07a6965 100644 --- a/src/kvilib/net/kvi_http.cpp +++ b/src/kvilib/net/kvi_http.cpp @@ -25,8 +25,8 @@ #define __KVILIB__ -#include -#include +#include +#include //#include #include "kvi_http.h" @@ -46,7 +46,7 @@ #define KVI_HTTP_REQUEST_THREAD_EVENT_REQUESTSENT (KVI_THREAD_USER_EVENT_BASE + 0xCAFF) KviHttpRequest::KviHttpRequest() -: QObject() +: TQObject() { m_pDns = 0; m_pThread = 0; @@ -55,24 +55,24 @@ KviHttpRequest::KviHttpRequest() m_bHeaderProcessed = false; m_pBuffer = new KviDataBuffer(); - resetStatus(); + resettqStatus(); resetData(); } KviHttpRequest::~KviHttpRequest() { - resetInternalStatus(); + resetInternaltqStatus(); delete m_pBuffer; } void KviHttpRequest::abort() { - resetInternalStatus(); + resetInternaltqStatus(); m_szLastError = __tr2qs("Aborted"); emit terminated(false); } -void KviHttpRequest::resetInternalStatus() +void KviHttpRequest::resetInternaltqStatus() { if(m_pThread)delete m_pThread; if(m_pDns)delete m_pDns; @@ -91,7 +91,7 @@ void KviHttpRequest::resetInternalStatus() KviThreadManager::killPendingEvents(this); } -void KviHttpRequest::resetStatus() +void KviHttpRequest::resettqStatus() { m_szLastError = __tr2qs("No request"); m_uTotalSize = 0; @@ -114,12 +114,12 @@ void KviHttpRequest::resetData() void KviHttpRequest::reset() { - resetStatus(); + resettqStatus(); resetData(); - resetInternalStatus(); + resetInternaltqStatus(); } -bool KviHttpRequest::get(const KviUrl &u,ProcessingType p,const QString &szFileName) +bool KviHttpRequest::get(const KviUrl &u,ProcessingType p,const TQString &szFileName) { reset(); setUrl(u); @@ -131,8 +131,8 @@ bool KviHttpRequest::get(const KviUrl &u,ProcessingType p,const QString &szFileN bool KviHttpRequest::start() { // ensure that the file is closed - resetInternalStatus(); - resetStatus(); + resetInternaltqStatus(); + resettqStatus(); if(m_eProcessingType == StoreToFile) { @@ -148,7 +148,7 @@ bool KviHttpRequest::start() if(KviFile::exists(m_szFileName)) { // we check it - QFileInfo fi(m_szFileName); + TQFileInfo fi(m_szFileName); m_uContentOffset = fi.size(); } } @@ -156,22 +156,22 @@ bool KviHttpRequest::start() if(m_url.host().isEmpty()) { - resetInternalStatus(); + resetInternaltqStatus(); m_szLastError = __tr2qs("Invalid URL: Missing hostname"); return false; } if((!kvi_strEqualCI(m_url.protocol().ptr(),"http")) && (!kvi_strEqualCI(m_url.protocol().ptr(),"https"))) { - resetInternalStatus(); - m_szLastError=__tr2qs("Unsupported protocol %1").arg(m_url.protocol().ptr()); + resetInternaltqStatus(); + m_szLastError=__tr2qs("Unsupported protocol %1").tqarg(m_url.protocol().ptr()); return false; } if(kvi_isValidStringIp(m_url.host().ptr())) { m_szIp = m_url.host(); - QTimer::singleShot(10,this,SLOT(haveServerIp())); + TQTimer::singleShot(10,this,TQT_SLOT(haveServerIp())); return true; } @@ -181,20 +181,20 @@ bool KviHttpRequest::start() bool KviHttpRequest::startDnsLookup() { m_pDns = new KviDns(); - connect(m_pDns,SIGNAL(lookupDone(KviDns *)),this,SLOT(dnsLookupDone(KviDns *))); + connect(m_pDns,TQT_SIGNAL(lookupDone(KviDns *)),this,TQT_SLOT(dnsLookupDone(KviDns *))); if(!m_pDns->lookup(m_url.host().ptr(),KviDns::IpV4)) { - resetInternalStatus(); + resetInternaltqStatus(); m_szLastError = __tr2qs("Unable to start the DNS lookup"); return false; } - QString tmp; - KviQString::sprintf(tmp,__tr2qs("Looking up host %s"),m_url.host().ptr()); + TQString tmp; + KviTQString::sprintf(tmp,__tr2qs("Looking up host %s"),m_url.host().ptr()); emit status(tmp); // FIXME - emit resolvingHost(QString(m_url.host().ptr())); + emit resolvingHost(TQString(m_url.host().ptr())); return true; } @@ -206,13 +206,13 @@ void KviHttpRequest::dnsLookupDone(KviDns *d) m_szIp = d->firstIpAddress(); delete m_pDns; m_pDns = 0; - QString tmp; - KviQString::sprintf(tmp,__tr2qs("Host %s resolved to %Q"),m_url.host().ptr(),&m_szIp); + TQString tmp; + KviTQString::sprintf(tmp,__tr2qs("Host %s resolved to %Q"),m_url.host().ptr(),&m_szIp); emit status(tmp); haveServerIp(); } else { int iErr = d->error(); - resetInternalStatus(); + resetInternaltqStatus(); m_szLastError = KviError::getDescription(iErr); emit terminated(false); } @@ -223,8 +223,8 @@ void KviHttpRequest::haveServerIp() unsigned short uPort = m_url.port(); if(uPort == 0)uPort = 80; - QString tmp; - KviQString::sprintf(tmp,"%Q:%u",&m_szIp,uPort); + TQString tmp; + KviTQString::sprintf(tmp,"%Q:%u",&m_szIp,uPort); emit contactingHost(tmp); if(m_pThread)delete m_pThread; @@ -242,17 +242,17 @@ void KviHttpRequest::haveServerIp() if(!m_pThread->start()) { - resetInternalStatus(); + resetInternaltqStatus(); m_szLastError = __tr2qs("Unable to start the request slave thread"); emit terminated(false); return; } - KviQString::sprintf(tmp,__tr2qs("Contacting host %Q on port %u"),&m_szIp,uPort); + KviTQString::sprintf(tmp,__tr2qs("Contacting host %Q on port %u"),&m_szIp,uPort); emit status(tmp); } -bool KviHttpRequest::event(QEvent *e) +bool KviHttpRequest::event(TQEvent *e) { if(e->type() == KVI_THREAD_EVENT) { @@ -273,11 +273,11 @@ bool KviHttpRequest::event(QEvent *e) break; case KVI_HTTP_REQUEST_THREAD_EVENT_REQUESTSENT: { - QString * req = ((KviThreadDataEvent *)e)->getData(); + TQString * req = ((KviThreadDataEvent *)e)->getData(); #ifdef COMPILE_USE_QT4 - QStringList sl = req->split("\r\n"); + TQStringList sl = req->split("\r\n"); #else - QStringList sl = QStringList::split("\r\n",*req); + TQStringList sl = TQStringList::split("\r\n",*req); #endif emit requestSent(sl); delete req; @@ -318,7 +318,7 @@ bool KviHttpRequest::event(QEvent *e) // nothing... just make gcc happy break; } - resetInternalStatus(); + resetInternaltqStatus(); m_szLastError = __tr2qs("Success"); emit terminated(true); return true; @@ -328,7 +328,7 @@ bool KviHttpRequest::event(QEvent *e) KviStr * err = ((KviThreadDataEvent *)e)->getData(); m_szLastError = __tr2qs_no_xgettext(err->ptr()); delete err; - resetInternalStatus(); + resetInternaltqStatus(); emit terminated(false); return true; } @@ -343,24 +343,24 @@ bool KviHttpRequest::event(QEvent *e) break; } } - return QObject::event(e); + return TQObject::event(e); } void KviHttpRequest::emitLines(KviDataBuffer * pDataBuffer) { - int idx = pDataBuffer->find((const unsigned char *)"\n",1); + int idx = pDataBuffer->tqfind((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->find((const unsigned char *)"\n",1); + idx = pDataBuffer->tqfind((const unsigned char *)"\n",1); emit data(tmp); } } // header += "Accept: "; -// QString acceptHeader = metaData("accept"); +// TQString acceptHeader = metaData("accept"); // if (!acceptHeader.isEmpty()) // header += acceptHeader; // else @@ -406,26 +406,26 @@ bool KviHttpRequest::openFile() case RenameIncoming: { int i=0; - QString tmp = m_szFileName; + TQString tmp = m_szFileName; do { i++; - m_szFileName = tmp + QString(".kvirnm-%1").arg(i); + m_szFileName = tmp + TQString(".kvirnm-%1").tqarg(i); } while(KviFile::exists(m_szFileName)); } break; case RenameExisting: { int i=0; - QString tmp; + TQString tmp; do { i++; - tmp = m_szFileName + QString(".kvirnm-%1").arg(i); + tmp = m_szFileName + TQString(".kvirnm-%1").tqarg(i); } while(KviFile::exists(tmp)); - QDir d; + TQDir d; if(!d.rename(m_szFileName,tmp)) { // fail :( - resetInternalStatus(); + resetInternaltqStatus(); m_szLastError = __tr2qs("Failed to rename the existing file, please rename manually and retry"); emit terminated(false); return false; @@ -443,8 +443,8 @@ bool KviHttpRequest::openFile() if(!m_pFile->openForWriting(bAppend)) { - resetInternalStatus(); - KviQString::sprintf(m_szLastError,__tr2qs("Can't open file \"%Q\" for writing"),&m_szFileName); + resetInternaltqStatus(); + KviTQString::sprintf(m_szLastError,__tr2qs("Can't open file \"%Q\" for writing"),&m_szFileName); emit terminated(false); return false; } @@ -473,7 +473,7 @@ bool KviHttpRequest::processHeader(KviStr &szHeader) bool bValid = false; - unsigned int uStatus = 0; + unsigned int utqStatus = 0; // check the response value if(kvi_strEqualCSN(szResponse.ptr(),"HTTP",4)) @@ -486,24 +486,24 @@ bool KviHttpRequest::processHeader(KviStr &szHeader) if(idx != -1)szNumber = szR.left(idx); else szNumber = szR; bool bOk; - uStatus = szNumber.toUInt(&bOk); + utqStatus = szNumber.toUInt(&bOk); if(bOk)bValid = true; } if(!bValid) { // the response is invalid ? - resetInternalStatus(); - m_szLastError=__tr2qs("Invalid HTTP response: %s").arg(szResponse.ptr()); + resetInternaltqStatus(); + m_szLastError=__tr2qs("Invalid HTTP response: %s").tqarg(szResponse.ptr()); emit terminated(false); return false; } - QString tmp; - KviQString::sprintf(tmp,__tr2qs("Received HTTP response: %s"),szResponse.ptr()); + TQString tmp; + KviTQString::sprintf(tmp,__tr2qs("Received HTTP response: %s"),szResponse.ptr()); emit status(tmp); - emit receivedResponse(QString(szResponse.ptr())); + emit receivedResponse(TQString(szResponse.ptr())); KviPointerList hlist; hlist.setAutoDelete(true); @@ -531,12 +531,12 @@ bool KviHttpRequest::processHeader(KviStr &szHeader) KviStr szName = s->left(idx); s->cutLeft(idx + 1); s->stripWhiteSpace(); - hdr.replace(szName.ptr(),new KviStr(*s)); + hdr.tqreplace(szName.ptr(),new KviStr(*s)); //debug("FOUND HEADER (%s)=(%s)",szName.ptr(),s->ptr()); } } - KviStr * size = hdr.find("Content-length"); + KviStr * size = hdr.tqfind("Content-length"); if(size) { bool bOk; @@ -544,13 +544,13 @@ bool KviHttpRequest::processHeader(KviStr &szHeader) if(!bOk)m_uTotalSize = 0; } - KviStr * contentEncoding = hdr.find("Content-encoding"); + KviStr * contentEncoding = hdr.tqfind("Content-encoding"); if(contentEncoding) { m_bGzip = contentEncoding->equalsCI("gzip"); } - KviStr * transferEncoding = hdr.find("Transfer-Encoding"); + KviStr * transferEncoding = hdr.tqfind("Transfer-Encoding"); if(transferEncoding) { if(kvi_strEqualCI(transferEncoding->ptr(),"chunked")) @@ -608,14 +608,14 @@ bool KviHttpRequest::processHeader(KviStr &szHeader) // case 504: // Gateway timeout // case 505: // HTTP Version not supported - if((uStatus != 200) && (uStatus != 206)) + if((utqStatus != 200) && (utqStatus != 206)) { // this is not "OK" and not "Partial content" // Error , redirect or something confusing if(m_eProcessingType != HeadersOnly) { // this is an error then - resetInternalStatus(); + resetInternaltqStatus(); m_szLastError = szResponse.ptr(); emit terminated(false); return false; @@ -624,7 +624,7 @@ bool KviHttpRequest::processHeader(KviStr &szHeader) if((m_uMaxContentLength > 0) && (m_uTotalSize > ((unsigned int)m_uMaxContentLength))) { - resetInternalStatus(); + resetInternaltqStatus(); m_szLastError=__tr2qs("Stream exceeding maximum length"); emit terminated(false); return false; @@ -651,13 +651,13 @@ void KviHttpRequest::processData(KviDataBuffer * data) // time to process the header m_pBuffer->append(*data); - int idx = m_pBuffer->find((const unsigned char *)"\r\n\r\n",4); + int idx = m_pBuffer->tqfind((const unsigned char *)"\r\n\r\n",4); if(idx == -1) { // header not complete if(m_pBuffer->size() > 4096) { - resetInternalStatus(); + resetInternaltqStatus(); m_szLastError = __tr2qs("Header too long: exceeded 4096 bytes"); emit terminated(false); } @@ -706,7 +706,7 @@ void KviHttpRequest::processData(KviDataBuffer * data) if(((m_uTotalSize > 0) && (m_uReceivedSize > m_uTotalSize)) || ((m_uMaxContentLength > 0) && (m_uReceivedSize > m_uMaxContentLength))) { - resetInternalStatus(); + resetInternaltqStatus(); m_szLastError=__tr2qs("Stream exceeded expected length"); emit terminated(false); } @@ -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 contains + // The transfer encoding is chunked: the buffer tqcontains // 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->find((const unsigned char *)"\r\n",2); + int crlf = m_pBuffer->tqfind((const unsigned char *)"\r\n",2); if(crlf != -1) { if(crlf == 0) @@ -789,12 +789,12 @@ void KviHttpRequest::processData(KviDataBuffer * data) KviStr szHeader((const char *)(m_pBuffer->data()),crlf); szHeader.cutFromFirst(' '); // now szHeader should contain a hexadecimal chunk length... (why the hell it is hex and not decimal ????) - QString szHexHeader = szHeader.ptr(); + TQString szHexHeader = szHeader.ptr(); bool bOk; m_uRemainingChunkSize = szHexHeader.toLong(&bOk,16); if(!bOk) { - resetInternalStatus(); + resetInternaltqStatus(); m_szLastError = __tr2qs("Protocol error: invalid chunk size"); emit terminated(false); return; @@ -814,7 +814,7 @@ void KviHttpRequest::processData(KviDataBuffer * data) // chunk header not complete if(m_pBuffer->size() > 4096) { - resetInternalStatus(); + resetInternaltqStatus(); m_szLastError = __tr2qs("Chunk header too long: exceeded 4096 bytes"); emit terminated(false); return; @@ -848,7 +848,7 @@ check_stream_length: if(((m_uTotalSize > 0) && (m_uReceivedSize > m_uTotalSize)) || ((m_uMaxContentLength > 0) && (m_uReceivedSize > m_uMaxContentLength))) { - resetInternalStatus(); + resetInternaltqStatus(); m_szLastError=__tr2qs("Stream exceeded expected length"); emit terminated(false); } @@ -872,13 +872,13 @@ check_stream_length: KviHttpRequestThread::KviHttpRequestThread( KviHttpRequest * r, - const QString &szHost, - const QString &szIp, + const TQString &szHost, + const TQString &szIp, unsigned short uPort, - const QString & szPath, + const TQString & szPath, unsigned int uContentOffset, RequestMethod m, - const QString &szPostData, + const TQString &szPostData, bool bUseSSL ) : KviSensitiveThread() { @@ -1403,7 +1403,7 @@ void KviHttpRequestThread::runInternal() "Connection: Close\r\n" \ "User-Agent: KVIrc-http-slave/1.0.0\r\n" \ "Accept: */*\r\n", - szMethod.ptr(),KviQString::toUtf8(m_szPath).data(),KviQString::toUtf8(m_szHost).data()); + szMethod.ptr(),KviTQString::toUtf8(m_szPath).data(),KviTQString::toUtf8(m_szHost).data()); if(m_uContentOffset > 0) szRequest.append(KviStr::Format,"Range: bytes=%u-\r\n",m_uContentOffset); @@ -1430,7 +1430,7 @@ void KviHttpRequestThread::runInternal() if(!sendBuffer(szRequest.ptr(),szRequest.len(),60))return; // now loop reading data - postEvent(m_pRequest,new KviThreadDataEvent(KVI_HTTP_REQUEST_THREAD_EVENT_REQUESTSENT,new QString(szRequest))); + postEvent(m_pRequest,new KviThreadDataEvent(KVI_HTTP_REQUEST_THREAD_EVENT_REQUESTSENT,new TQString(szRequest))); for(;;) { diff --git a/src/kvilib/net/kvi_http.h b/src/kvilib/net/kvi_http.h index 1bd6a9d..de4457d 100644 --- a/src/kvilib/net/kvi_http.h +++ b/src/kvilib/net/kvi_http.h @@ -33,10 +33,10 @@ #include "kvi_inttypes.h" #include "kvi_url.h" -#include +#include #include "kvi_pointerhashtable.h" #include "kvi_file.h" -#include +#include class KviDns; class KviSSL; @@ -45,12 +45,13 @@ class KviHttpRequestThread; // // This class implements a HTTP protocol client. // It's able to send GET, POST and HEAD requests, -// download stuff to a file or to a qt SLOT(). +// download stuff to a file or to a qt TQT_SLOT(). // -class KVILIB_API KviHttpRequest : public QObject, public KviHeapObject +class KVILIB_API KviHttpRequest : public TQObject, public KviHeapObject { Q_OBJECT + TQ_OBJECT public: enum ProcessingType { @@ -73,19 +74,19 @@ public: protected: // data KviUrl m_url; - QString m_szFileName; + TQString m_szFileName; ProcessingType m_eProcessingType; ExistingFileAction m_eExistingFileAction; void * m_pPrivateData; unsigned int m_uMaxContentLength; unsigned int m_uContentOffset; - QString m_szPostData; + TQString m_szPostData; // status - QString m_szLastError; + TQString m_szLastError; unsigned int m_uTotalSize; unsigned int m_uReceivedSize; // internal status - QString m_szIp; + TQString m_szIp; KviDns * m_pDns; KviHttpRequestThread * m_pThread; KviDataBuffer * m_pBuffer; @@ -97,15 +98,15 @@ protected: KviFile * m_pFile; protected: bool startDnsLookup(); - virtual bool event(QEvent *e); + virtual bool event(TQEvent *e); void processData(KviDataBuffer * data); bool processHeader(KviStr &szHeader); bool openFile(); void emitLines(KviDataBuffer * pDataBuffer); - void resetStatus(); + void resettqStatus(); void resetData(); - void resetInternalStatus(); + void resetInternaltqStatus(); protected slots: void dnsLookupDone(KviDns *d); void haveServerIp(); @@ -113,7 +114,7 @@ public: const KviUrl & url(){ return m_url; }; ProcessingType processingType(){ return m_eProcessingType; }; ExistingFileAction existingFileAction(){ return m_eExistingFileAction; }; - const QString &fileName(){ return m_szFileName; }; + const TQString &fileName(){ return m_szFileName; }; void * privateData(){ return m_pPrivateData; }; unsigned int maxContentLength(){ return m_uMaxContentLength; }; unsigned int contentOffset(){ return m_uContentOffset; }; @@ -122,11 +123,11 @@ public: void reset(); - void setPostData(const QString &szPostData){ m_szPostData = szPostData; }; + void setPostData(const TQString &szPostData){ m_szPostData = szPostData; }; void setUrl(const KviUrl &u){ m_url = u; }; void setProcessingType(ProcessingType t){ m_eProcessingType = t; }; void setExistingFileAction(ExistingFileAction a){ m_eExistingFileAction = a; }; - void setFileName(const QString &szFileName){ m_szFileName = szFileName; }; + void setFileName(const TQString &szFileName){ m_szFileName = szFileName; }; void setPrivateData(void * ptr){ m_pPrivateData = ptr; }; void setMaxContentLength(int uMaxContentLength){ m_uMaxContentLength = uMaxContentLength; }; //0 means unlimited // this will work regardless of ExistingFileAction : even if the file doesn't exist @@ -135,25 +136,25 @@ public: bool start(); // this is a shortcut for reset()+setUrl()+setProcessingType()+setFileName()+start() - bool get(const KviUrl &u,ProcessingType p = WholeFile,const QString &szFileName = QString::null); + bool get(const KviUrl &u,ProcessingType p = WholeFile,const TQString &szFileName = TQString()); - const QString & lastError(){ return m_szLastError; }; + const TQString & lastError(){ return m_szLastError; }; void abort(); signals: - void resolvingHost(const QString &hostname); - void contactingHost(const QString &ipandport); + void resolvingHost(const TQString &hostname); + void contactingHost(const TQString &ipandport); void connectionEstabilished(); - void receivedResponse(const QString &response); + void receivedResponse(const TQString &response); void terminated(bool bSuccess); - void status(const QString &message); + void status(const TQString &message); void data(const KviStr &data); void binaryData(const KviDataBuffer &data); void header(KviPointerHashTable * hdr); - void requestSent(const QStringList &request); + void requestSent(const TQStringList &request); }; @@ -164,13 +165,13 @@ public: enum RequestMethod { Post, Get , Head }; protected: KviHttpRequestThread(KviHttpRequest * r, - const QString &szHost, - const QString &szIp, + const TQString &szHost, + const TQString &szIp, unsigned short uPort, - const QString &szPath, + const TQString &szPath, unsigned int uContentOffset, RequestMethod m, - const QString &szPostData = QString::null, + const TQString &szPostData = TQString(), bool bUseSSL = false); public: @@ -178,12 +179,12 @@ public: protected: KviHttpRequest * m_pRequest; - QString m_szHost; - QString m_szIp; - QString m_szPath; + TQString m_szHost; + TQString m_szIp; + TQString m_szPath; unsigned int m_uContentOffset; RequestMethod m_eRequestMethod; - QString m_szPostData; + TQString m_szPostData; unsigned short m_uPort; kvi_socket_t m_sock; diff --git a/src/kvilib/net/kvi_netutils.cpp b/src/kvilib/net/kvi_netutils.cpp index 0cdb8b0..3ff5d9b 100644 --- a/src/kvilib/net/kvi_netutils.cpp +++ b/src/kvilib/net/kvi_netutils.cpp @@ -61,7 +61,7 @@ #include "kvi_netutils.h" #include "kvi_memmove.h" -#include +#include #ifndef COMPILE_ON_WINDOWS @@ -318,7 +318,7 @@ bool kvi_stringIpToBinaryIp(const char *szIp,struct in_addr *address) -bool kvi_binaryIpToStringIp(struct in_addr in,QString &szBuffer) +bool kvi_binaryIpToStringIp(struct in_addr in,TQString &szBuffer) { @@ -346,7 +346,7 @@ bool kvi_binaryIpToStringIp(struct in_addr in,QString &szBuffer) -bool kvi_binaryIpToStringIp(struct in_addr in,QString &szBuffer) +bool kvi_binaryIpToStringIp(struct in_addr in,TQString &szBuffer) { @@ -886,7 +886,7 @@ bool kvi_isValidStringIp_V6(const char *szIp) -bool kvi_binaryIpToStringIp_V6(struct in6_addr in,QString &szBuffer) +bool kvi_binaryIpToStringIp_V6(struct in6_addr in,TQString &szBuffer) { @@ -952,12 +952,12 @@ namespace KviNetUtils { - bool stringIpToBinaryIp(const QString &szStringIp,struct in_addr * address) + bool stringIpToBinaryIp(const TQString &szStringIp,struct in_addr * address) { #ifndef HAVE_INET_ATON - QString szAddr = szStringIp.simplifyWhiteSpace(); - Q_UINT32 iAddr=0; - QStringList ipv4 = QStringList::split(".", szAddr, FALSE); + TQString szAddr = szStringIp.simplifyWhiteSpace(); + TQ_UINT32 iAddr=0; + TQStringList ipv4 = TQStringList::split(".", szAddr, FALSE); if (ipv4.count() == 4) { int i = 0; bool ok = TRUE; @@ -978,12 +978,12 @@ namespace KviNetUtils return FALSE; #else //HAVE_INET_ATON if(szStringIp.isEmpty())return false; - return (inet_aton(KviQString::toUtf8(szStringIp).data(),address) != 0); + return (inet_aton(KviTQString::toUtf8(szStringIp).data(),address) != 0); #endif //HAVE_INET_ATON } - bool isValidStringIp(const QString &szIp) + bool isValidStringIp(const TQString &szIp) { @@ -1001,17 +1001,17 @@ namespace KviNetUtils #ifdef COMPILE_IPV6_SUPPORT - bool stringIpToBinaryIp_V6(const QString &szStringIp,struct in6_addr * address) + bool stringIpToBinaryIp_V6(const TQString &szStringIp,struct in6_addr * address) { - return (inet_pton(AF_INET6,KviQString::toUtf8(szStringIp).data(),(void *)address) == 1); + return (inet_pton(AF_INET6,KviTQString::toUtf8(szStringIp).data(),(void *)address) == 1); } - bool isValidStringIp_V6(const QString &szIp) + bool isValidStringIp_V6(const TQString &szIp) { @@ -1023,7 +1023,7 @@ namespace KviNetUtils } - bool binaryIpToStringIp_V6(struct in6_addr in,QString &szBuffer) + bool binaryIpToStringIp_V6(struct in6_addr in,TQString &szBuffer) { char buf[46]; bool bRet = inet_ntop(AF_INET6,(void *)&in,buf,46); @@ -1036,7 +1036,7 @@ namespace KviNetUtils - bool binaryIpToStringIp(struct in_addr in,QString &szBuffer) + bool binaryIpToStringIp(struct in_addr in,TQString &szBuffer) { @@ -1052,7 +1052,7 @@ namespace KviNetUtils - bool isRoutableIpString(const QString &szIpString) + bool isRoutableIpString(const TQString &szIpString) { @@ -1100,7 +1100,7 @@ namespace KviNetUtils - bool getInterfaceAddress(const QString &szInterfaceName,QString &szBuffer) + bool getInterfaceAddress(const TQString &szInterfaceName,TQString &szBuffer) { @@ -1118,7 +1118,7 @@ namespace KviNetUtils - kvi_memmove(ifr.ifr_name,KviQString::toUtf8(szInterfaceName).data(),len + 1); + kvi_memmove(ifr.ifr_name,KviTQString::toUtf8(szInterfaceName).data(),len + 1); @@ -1158,7 +1158,7 @@ namespace KviNetUtils - void formatNetworkBandwidthString(QString &szBuffer,unsigned int uBytesPerSec) + void formatNetworkBandwidthString(TQString &szBuffer,unsigned int uBytesPerSec) { @@ -1170,7 +1170,7 @@ namespace KviNetUtils unsigned int uRem = ((uBytesPerSec % (1024 * 1024)) * 100) / (1024 * 1024); - KviQString::sprintf(szBuffer,"%u.%u%u MB/s",uMB,uRem / 10,uRem % 10); + KviTQString::sprintf(szBuffer,"%u.%u%u MB/s",uMB,uRem / 10,uRem % 10); return; @@ -1184,13 +1184,13 @@ namespace KviNetUtils unsigned int uRem = ((uBytesPerSec % 1024) * 100) / 1024; - KviQString::sprintf(szBuffer,"%u.%u%u KB/s",uKB,uRem / 10,uRem % 10); + KviTQString::sprintf(szBuffer,"%u.%u%u KB/s",uKB,uRem / 10,uRem % 10); return; } - KviQString::sprintf(szBuffer,"%u B/s",uBytesPerSec); + KviTQString::sprintf(szBuffer,"%u B/s",uBytesPerSec); } @@ -1202,15 +1202,15 @@ namespace KviNetUtils -bool kvi_getInterfaceAddress(const char * ifname,QString &buffer) +bool kvi_getInterfaceAddress(const char * ifname,TQString &buffer) { debug("kvi_getInterfaceAddress is deprecated: use KviNetUtils::getInterfaceAddress"); - QString szRet; + TQString szRet; - bool bRes = KviNetUtils::getInterfaceAddress(QString(ifname),szRet); + bool bRes = KviNetUtils::getInterfaceAddress(TQString(ifname),szRet); buffer = szRet; @@ -1268,7 +1268,7 @@ bool kvi_isRoutableIp(const char * ipaddr) -bool kvi_getLocalHostAddress(QString &buffer) +bool kvi_getLocalHostAddress(TQString &buffer) { @@ -1282,7 +1282,7 @@ bool kvi_getLocalHostAddress(QString &buffer) if(!h)return false; - QString tmp; + TQString tmp; int i=0; @@ -1466,7 +1466,7 @@ kvi_u32_t KviSockaddr::port() -bool KviSockaddr::getStringAddress(QString &szBuffer) +bool KviSockaddr::getStringAddress(TQString &szBuffer) { diff --git a/src/kvilib/net/kvi_netutils.h b/src/kvilib/net/kvi_netutils.h index b43326f..99e4bff 100644 --- a/src/kvilib/net/kvi_netutils.h +++ b/src/kvilib/net/kvi_netutils.h @@ -49,12 +49,12 @@ KVILIB_API extern bool kvi_isValidStringIp(const char * szIp); KVILIB_API extern bool kvi_stringIpToBinaryIp(const char * szIp,struct in_addr * address); -KVILIB_API extern bool kvi_binaryIpToStringIp(struct in_addr in,QString &szBuffer); +KVILIB_API extern bool kvi_binaryIpToStringIp(struct in_addr in,TQString &szBuffer); #ifdef COMPILE_IPV6_SUPPORT KVILIB_API extern bool kvi_isValidStringIp_V6(const char * szIp); KVILIB_API extern bool kvi_stringIpToBinaryIp_V6(const char * szIp,struct in6_addr * address); - KVILIB_API extern bool kvi_binaryIpToStringIp_V6(struct in6_addr in,QString &szBuffer); + KVILIB_API extern bool kvi_binaryIpToStringIp_V6(struct in6_addr in,TQString &szBuffer); #endif class KVILIB_API KviSockaddr @@ -70,34 +70,34 @@ public: size_t addressLength(); int addressFamily(); bool isIpV6(); - bool getStringAddress(QString &szBuffer); + bool getStringAddress(TQString &szBuffer); kvi_u32_t port(); }; KVILIB_API extern bool kvi_select(int fd,bool * bCanRead,bool * bCanWrite,int iUSecs = 0); -KVILIB_API extern bool kvi_getInterfaceAddress(const char * ifname,QString &buffer); +KVILIB_API extern bool kvi_getInterfaceAddress(const char * ifname,TQString &buffer); // Warning : NOT THREAD SAFE! -KVILIB_API extern bool kvi_getLocalHostAddress(QString &buffer); +KVILIB_API extern bool kvi_getLocalHostAddress(TQString &buffer); KVILIB_API extern bool kvi_isRoutableIp(const char * ipaddr); KVILIB_API extern bool kvi_isRoutableIpString(const char * ipstring); namespace KviNetUtils { - KVILIB_API bool stringIpToBinaryIp(const QString &szStringIp,struct in_addr * address); - KVILIB_API bool isValidStringIp(const QString &szStringIp); - KVILIB_API bool binaryIpToStringIp(struct in_addr in,QString &szBuffer); - KVILIB_API bool getInterfaceAddress(const QString &szInterfaceName,QString &szBuffer); + KVILIB_API bool stringIpToBinaryIp(const TQString &szStringIp,struct in_addr * address); + KVILIB_API bool isValidStringIp(const TQString &szStringIp); + KVILIB_API bool binaryIpToStringIp(struct in_addr in,TQString &szBuffer); + KVILIB_API bool getInterfaceAddress(const TQString &szInterfaceName,TQString &szBuffer); #ifdef COMPILE_IPV6_SUPPORT - KVILIB_API bool isValidStringIp_V6(const QString &szStringIp); - KVILIB_API bool stringIpToBinaryIp_V6(const QString &szStringIp,struct in6_addr * address); - KVILIB_API bool binaryIpToStringIp_V6(struct in6_addr in,QString &szBuffer); + KVILIB_API bool isValidStringIp_V6(const TQString &szStringIp); + KVILIB_API bool stringIpToBinaryIp_V6(const TQString &szStringIp,struct in6_addr * address); + KVILIB_API bool binaryIpToStringIp_V6(struct in6_addr in,TQString &szBuffer); #endif KVILIB_API bool isRoutableIp(const char * ipaddr); - KVILIB_API bool isRoutableIpString(const QString &szIpString); - KVILIB_API void formatNetworkBandwidthString(QString &szBuffer,unsigned int uBytesPerSec); + KVILIB_API bool isRoutableIpString(const TQString &szIpString); + KVILIB_API void formatNetworkBandwidthString(TQString &szBuffer,unsigned int uBytesPerSec); }; diff --git a/src/kvilib/net/kvi_socket.h b/src/kvilib/net/kvi_socket.h index 47d5151..66c336d 100644 --- a/src/kvilib/net/kvi_socket.h +++ b/src/kvilib/net/kvi_socket.h @@ -62,7 +62,7 @@ #ifndef MSG_NOSIGNAL // At least solaris seems to not have it - #define MSG_NOSIGNAL 0 + #define MSG_NOTQT_SIGNAL 0 #endif //#include "kvi_socketcalls.h" diff --git a/src/kvilib/net/kvi_ssl.cpp b/src/kvilib/net/kvi_ssl.cpp index 6748e06..b6cb2c2 100644 --- a/src/kvilib/net/kvi_ssl.cpp +++ b/src/kvilib/net/kvi_ssl.cpp @@ -326,7 +326,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 REQYESTED: %s",p->ptr()); +// debug("PASS RETQYESTED: %s",p->ptr()); return len; } @@ -564,7 +564,7 @@ void KviSSLCertificate::splitX509String(KviPointerHashTable arr[i]->cutLeft(idx + 1); if(szTok.hasData() && arr[i]->hasData()) { - dict->replace(szTok.ptr(),new KviStr(arr[i]->ptr())); + dict->tqreplace(szTok.ptr(),new KviStr(arr[i]->ptr())); } } } @@ -577,7 +577,7 @@ void KviSSLCertificate::splitX509String(KviPointerHashTable const char * KviSSLCertificate::dictEntry(KviPointerHashTable * dict,const char * entry) { - KviStr * t = dict->find(entry); + KviStr * t = dict->tqfind(entry); if(!t)return __tr("Unknown"); return t->ptr(); } diff --git a/src/kvilib/net/kvi_url.cpp b/src/kvilib/net/kvi_url.cpp index f980729..41a6e55 100644 --- a/src/kvilib/net/kvi_url.cpp +++ b/src/kvilib/net/kvi_url.cpp @@ -41,7 +41,7 @@ KviUrl::KviUrl(const char * szUrl) parse(); } -KviUrl::KviUrl(const QString &szUrl) +KviUrl::KviUrl(const TQString &szUrl) { m_szUrl = szUrl; parse(); diff --git a/src/kvilib/net/kvi_url.h b/src/kvilib/net/kvi_url.h index 89adeb9..ab37b1b 100644 --- a/src/kvilib/net/kvi_url.h +++ b/src/kvilib/net/kvi_url.h @@ -31,7 +31,7 @@ class KVILIB_API KviUrl : public KviHeapObject public: KviUrl(); KviUrl(const char * szUrl); - KviUrl(const QString &szUrl); + KviUrl(const TQString &szUrl); KviUrl(const KviUrl &u); ~KviUrl(); protected: diff --git a/src/kvilib/net/moc_kvi_dns.cpp b/src/kvilib/net/moc_kvi_dns.cpp index 5b8857a..cb25e6c 100644 --- a/src/kvilib/net/moc_kvi_dns.cpp +++ b/src/kvilib/net/moc_kvi_dns.cpp @@ -2,136 +2,136 @@ ** KviDns meta object code from reading C++ file 'kvi_dns.h' ** ** Created: Sun Mar 23 20:56:20 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_dns.h" -#include -#include +#include +#include -#include -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif -#include +#include const char *KviDns::className() const { return "KviDns"; } -QMetaObject *KviDns::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviDns( "KviDns", &KviDns::staticMetaObject ); +TQMetaObject *KviDns::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviDns( "KviDns", &KviDns::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviDns::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviDns::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviDns", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviDns", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviDns::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviDns::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviDns", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviDns", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviDns::staticMetaObject() +TQMetaObject* KviDns::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QObject::staticMetaObject(); - static const QUParameter param_signal_0[] = { - { 0, &static_QUType_ptr, "KviDns", QUParameter::In } + TQMetaObject* tqparentObject = TQObject::staticMetaObject(); + static const TQUParameter param_signal_0[] = { + { 0, &static_TQUType_ptr, "KviDns", TQUParameter::In } }; - static const QUMethod signal_0 = {"lookupDone", 1, param_signal_0 }; - static const QMetaData signal_tbl[] = { - { "lookupDone(KviDns*)", &signal_0, QMetaData::Private } + static const TQUMethod signal_0 = {"lookupDone", 1, param_signal_0 }; + static const TQMetaData signal_tbl[] = { + { "lookupDone(KviDns*)", &signal_0, TQMetaData::Private } }; -#ifndef QT_NO_PROPERTIES - static const QMetaProperty props_tbl[1] = { +#ifndef TQT_NO_PROPERTIES + static const TQMetaProperty props_tbl[1] = { { "bool","blockingDelete", 0x12000001, &KviDns::metaObj, 0, -1 } }; -#endif // QT_NO_PROPERTIES - metaObj = QMetaObject::new_metaobject( - "KviDns", parentObject, +#endif // TQT_NO_PROPERTIES + metaObj = TQMetaObject::new_metaobject( + "KviDns", tqparentObject, 0, 0, signal_tbl, 1, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES props_tbl, 1, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviDns.setMetaObject( metaObj ); return metaObj; } -void* KviDns::qt_cast( const char* clname ) +void* KviDns::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviDns" ) ) return this; if ( !qstrcmp( clname, "KviHeapObject" ) ) return (KviHeapObject*)this; - return QObject::qt_cast( clname ); + return TQObject::tqqt_cast( clname ); } -#include -#include +#include +#include -// SIGNAL lookupDone +// TQT_SIGNAL lookupDone void KviDns::lookupDone( KviDns* t0 ) { if ( signalsBlocked() ) return; - QConnectionList *clist = receivers( staticMetaObject()->signalOffset() + 0 ); + TQConnectionList *clist = tqreceivers( staticMetaObject()->signalOffset() + 0 ); if ( !clist ) return; - QUObject o[2]; - static_QUType_ptr.set(o+1,t0); + TQUObject o[2]; + static_TQUType_ptr.set(o+1,t0); activate_signal( clist, o ); } -bool KviDns::qt_invoke( int _id, QUObject* _o ) +bool KviDns::qt_invoke( int _id, TQUObject* _o ) { - return QObject::qt_invoke(_id,_o); + return TQObject::qt_invoke(_id,_o); } -bool KviDns::qt_emit( int _id, QUObject* _o ) +bool KviDns::qt_emit( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->signalOffset() ) { - case 0: lookupDone((KviDns*)static_QUType_ptr.get(_o+1)); break; + case 0: lookupDone((KviDns*)static_TQUType_ptr.get(_o+1)); break; default: - return QObject::qt_emit(_id,_o); + return TQObject::qt_emit(_id,_o); } return TRUE; } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviDns::qt_property( int id, int f, QVariant* v) +bool KviDns::qt_property( int id, int f, TQVariant* v) { switch ( id - staticMetaObject()->propertyOffset() ) { case 0: switch( f ) { - case 1: *v = QVariant( this->isRunning(), 0 ); break; + case 1: *v = TQVariant( this->isRunning(), 0 ); break; case 3: case 4: case 5: break; default: return FALSE; } break; default: - return QObject::qt_property( id, f, v ); + return TQObject::qt_property( id, f, v ); } return TRUE; } -bool KviDns::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviDns::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvilib/net/moc_kvi_http.cpp b/src/kvilib/net/moc_kvi_http.cpp index 7ea9b59..632ce59 100644 --- a/src/kvilib/net/moc_kvi_http.cpp +++ b/src/kvilib/net/moc_kvi_http.cpp @@ -2,21 +2,21 @@ ** KviHttpRequest meta object code from reading C++ file 'kvi_http.h' ** ** Created: Sun Mar 23 20:56:22 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_http.h" -#include -#include +#include +#include -#include -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviHttpRequest::className() const @@ -24,240 +24,240 @@ const char *KviHttpRequest::className() const return "KviHttpRequest"; } -QMetaObject *KviHttpRequest::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviHttpRequest( "KviHttpRequest", &KviHttpRequest::staticMetaObject ); +TQMetaObject *KviHttpRequest::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviHttpRequest( "KviHttpRequest", &KviHttpRequest::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviHttpRequest::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviHttpRequest::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviHttpRequest", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviHttpRequest", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviHttpRequest::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviHttpRequest::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviHttpRequest", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviHttpRequest", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviHttpRequest::staticMetaObject() +TQMetaObject* KviHttpRequest::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QObject::staticMetaObject(); - static const QUParameter param_slot_0[] = { - { "d", &static_QUType_ptr, "KviDns", QUParameter::In } + TQMetaObject* tqparentObject = TQObject::staticMetaObject(); + static const TQUParameter param_slot_0[] = { + { "d", &static_TQUType_ptr, "KviDns", TQUParameter::In } }; - static const QUMethod slot_0 = {"dnsLookupDone", 1, param_slot_0 }; - static const QUMethod slot_1 = {"haveServerIp", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "dnsLookupDone(KviDns*)", &slot_0, QMetaData::Protected }, - { "haveServerIp()", &slot_1, QMetaData::Protected } + static const TQUMethod slot_0 = {"dnsLookupDone", 1, param_slot_0 }; + static const TQUMethod slot_1 = {"haveServerIp", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "dnsLookupDone(KviDns*)", &slot_0, TQMetaData::Protected }, + { "haveServerIp()", &slot_1, TQMetaData::Protected } }; - static const QUParameter param_signal_0[] = { - { "hostname", &static_QUType_QString, 0, QUParameter::In } + static const TQUParameter param_signal_0[] = { + { "hostname", &static_TQUType_TQString, 0, TQUParameter::In } }; - static const QUMethod signal_0 = {"resolvingHost", 1, param_signal_0 }; - static const QUParameter param_signal_1[] = { - { "ipandport", &static_QUType_QString, 0, QUParameter::In } + static const TQUMethod signal_0 = {"resolvingHost", 1, param_signal_0 }; + static const TQUParameter param_signal_1[] = { + { "ipandport", &static_TQUType_TQString, 0, TQUParameter::In } }; - static const QUMethod signal_1 = {"contactingHost", 1, param_signal_1 }; - static const QUMethod signal_2 = {"connectionEstabilished", 0, 0 }; - static const QUParameter param_signal_3[] = { - { "response", &static_QUType_QString, 0, QUParameter::In } + static const TQUMethod signal_1 = {"contactingHost", 1, param_signal_1 }; + static const TQUMethod signal_2 = {"connectionEstabilished", 0, 0 }; + static const TQUParameter param_signal_3[] = { + { "response", &static_TQUType_TQString, 0, TQUParameter::In } }; - static const QUMethod signal_3 = {"receivedResponse", 1, param_signal_3 }; - static const QUParameter param_signal_4[] = { - { "bSuccess", &static_QUType_bool, 0, QUParameter::In } + static const TQUMethod signal_3 = {"receivedResponse", 1, param_signal_3 }; + static const TQUParameter param_signal_4[] = { + { "bSuccess", &static_TQUType_bool, 0, TQUParameter::In } }; - static const QUMethod signal_4 = {"terminated", 1, param_signal_4 }; - static const QUParameter param_signal_5[] = { - { "message", &static_QUType_QString, 0, QUParameter::In } + static const TQUMethod signal_4 = {"terminated", 1, param_signal_4 }; + static const TQUParameter param_signal_5[] = { + { "message", &static_TQUType_TQString, 0, TQUParameter::In } }; - static const QUMethod signal_5 = {"status", 1, param_signal_5 }; - static const QUParameter param_signal_6[] = { - { "data", &static_QUType_ptr, "KviStr", QUParameter::In } + static const TQUMethod signal_5 = {"status", 1, param_signal_5 }; + static const TQUParameter param_signal_6[] = { + { "data", &static_TQUType_ptr, "KviStr", TQUParameter::In } }; - static const QUMethod signal_6 = {"data", 1, param_signal_6 }; - static const QUParameter param_signal_7[] = { - { "data", &static_QUType_ptr, "KviDataBuffer", QUParameter::In } + static const TQUMethod signal_6 = {"data", 1, param_signal_6 }; + static const TQUParameter param_signal_7[] = { + { "data", &static_TQUType_ptr, "KviDataBuffer", TQUParameter::In } }; - static const QUMethod signal_7 = {"binaryData", 1, param_signal_7 }; - static const QUParameter param_signal_8[] = { - { "hdr", &static_QUType_ptr, "KviPointerHashTable", QUParameter::In } + static const TQUMethod signal_7 = {"binaryData", 1, param_signal_7 }; + static const TQUParameter param_signal_8[] = { + { "hdr", &static_TQUType_ptr, "KviPointerHashTable", TQUParameter::In } }; - static const QUMethod signal_8 = {"header", 1, param_signal_8 }; - static const QUParameter param_signal_9[] = { - { "request", &static_QUType_varptr, "\x04", QUParameter::In } + static const TQUMethod signal_8 = {"header", 1, param_signal_8 }; + static const TQUParameter param_signal_9[] = { + { "request", &static_TQUType_varptr, "\x04", TQUParameter::In } }; - static const QUMethod signal_9 = {"requestSent", 1, param_signal_9 }; - static const QMetaData signal_tbl[] = { - { "resolvingHost(const QString&)", &signal_0, QMetaData::Public }, - { "contactingHost(const QString&)", &signal_1, QMetaData::Public }, - { "connectionEstabilished()", &signal_2, QMetaData::Public }, - { "receivedResponse(const QString&)", &signal_3, QMetaData::Public }, - { "terminated(bool)", &signal_4, QMetaData::Public }, - { "status(const QString&)", &signal_5, QMetaData::Public }, - { "data(const KviStr&)", &signal_6, QMetaData::Public }, - { "binaryData(const KviDataBuffer&)", &signal_7, QMetaData::Public }, - { "header(KviPointerHashTable*)", &signal_8, QMetaData::Public }, - { "requestSent(const QStringList&)", &signal_9, QMetaData::Public } + static const TQUMethod signal_9 = {"requestSent", 1, param_signal_9 }; + static const TQMetaData signal_tbl[] = { + { "resolvingHost(const TQString&)", &signal_0, TQMetaData::Public }, + { "contactingHost(const TQString&)", &signal_1, TQMetaData::Public }, + { "connectionEstabilished()", &signal_2, TQMetaData::Public }, + { "receivedResponse(const TQString&)", &signal_3, TQMetaData::Public }, + { "terminated(bool)", &signal_4, TQMetaData::Public }, + { "status(const TQString&)", &signal_5, TQMetaData::Public }, + { "data(const KviStr&)", &signal_6, TQMetaData::Public }, + { "binaryData(const KviDataBuffer&)", &signal_7, TQMetaData::Public }, + { "header(KviPointerHashTable*)", &signal_8, TQMetaData::Public }, + { "requestSent(const TQStringList&)", &signal_9, TQMetaData::Public } }; - metaObj = QMetaObject::new_metaobject( - "KviHttpRequest", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviHttpRequest", tqparentObject, slot_tbl, 2, signal_tbl, 10, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviHttpRequest.setMetaObject( metaObj ); return metaObj; } -void* KviHttpRequest::qt_cast( const char* clname ) +void* KviHttpRequest::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviHttpRequest" ) ) return this; if ( !qstrcmp( clname, "KviHeapObject" ) ) return (KviHeapObject*)this; - return QObject::qt_cast( clname ); + return TQObject::tqqt_cast( clname ); } -// SIGNAL resolvingHost -void KviHttpRequest::resolvingHost( const QString& t0 ) +// TQT_SIGNAL resolvingHost +void KviHttpRequest::resolvingHost( const TQString& t0 ) { activate_signal( staticMetaObject()->signalOffset() + 0, t0 ); } -// SIGNAL contactingHost -void KviHttpRequest::contactingHost( const QString& t0 ) +// TQT_SIGNAL contactingHost +void KviHttpRequest::contactingHost( const TQString& t0 ) { activate_signal( staticMetaObject()->signalOffset() + 1, t0 ); } -// SIGNAL connectionEstabilished +// TQT_SIGNAL connectionEstabilished void KviHttpRequest::connectionEstabilished() { activate_signal( staticMetaObject()->signalOffset() + 2 ); } -// SIGNAL receivedResponse -void KviHttpRequest::receivedResponse( const QString& t0 ) +// TQT_SIGNAL receivedResponse +void KviHttpRequest::receivedResponse( const TQString& t0 ) { activate_signal( staticMetaObject()->signalOffset() + 3, t0 ); } -// SIGNAL terminated +// TQT_SIGNAL terminated void KviHttpRequest::terminated( bool t0 ) { activate_signal_bool( staticMetaObject()->signalOffset() + 4, t0 ); } -// SIGNAL status -void KviHttpRequest::status( const QString& t0 ) +// TQT_SIGNAL status +void KviHttpRequest::status( const TQString& t0 ) { activate_signal( staticMetaObject()->signalOffset() + 5, t0 ); } -#include -#include +#include +#include -// SIGNAL data +// TQT_SIGNAL data void KviHttpRequest::data( const KviStr& t0 ) { if ( signalsBlocked() ) return; - QConnectionList *clist = receivers( staticMetaObject()->signalOffset() + 6 ); + TQConnectionList *clist = tqreceivers( staticMetaObject()->signalOffset() + 6 ); if ( !clist ) return; - QUObject o[2]; - static_QUType_ptr.set(o+1,&t0); + TQUObject o[2]; + static_TQUType_ptr.set(o+1,&t0); activate_signal( clist, o ); } -// SIGNAL binaryData +// TQT_SIGNAL binaryData void KviHttpRequest::binaryData( const KviDataBuffer& t0 ) { if ( signalsBlocked() ) return; - QConnectionList *clist = receivers( staticMetaObject()->signalOffset() + 7 ); + TQConnectionList *clist = tqreceivers( staticMetaObject()->signalOffset() + 7 ); if ( !clist ) return; - QUObject o[2]; - static_QUType_ptr.set(o+1,&t0); + TQUObject o[2]; + static_TQUType_ptr.set(o+1,&t0); activate_signal( clist, o ); } -// SIGNAL header +// TQT_SIGNAL header void KviHttpRequest::header( KviPointerHashTable* t0 ) { if ( signalsBlocked() ) return; - QConnectionList *clist = receivers( staticMetaObject()->signalOffset() + 8 ); + TQConnectionList *clist = tqreceivers( staticMetaObject()->signalOffset() + 8 ); if ( !clist ) return; - QUObject o[2]; - static_QUType_ptr.set(o+1,t0); + TQUObject o[2]; + static_TQUType_ptr.set(o+1,t0); activate_signal( clist, o ); } -// SIGNAL requestSent -void KviHttpRequest::requestSent( const QStringList& t0 ) +// TQT_SIGNAL requestSent +void KviHttpRequest::requestSent( const TQStringList& t0 ) { if ( signalsBlocked() ) return; - QConnectionList *clist = receivers( staticMetaObject()->signalOffset() + 9 ); + TQConnectionList *clist = tqreceivers( staticMetaObject()->signalOffset() + 9 ); if ( !clist ) return; - QUObject o[2]; - static_QUType_varptr.set(o+1,&t0); + TQUObject o[2]; + static_TQUType_varptr.set(o+1,&t0); activate_signal( clist, o ); } -bool KviHttpRequest::qt_invoke( int _id, QUObject* _o ) +bool KviHttpRequest::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { - case 0: dnsLookupDone((KviDns*)static_QUType_ptr.get(_o+1)); break; + case 0: dnsLookupDone((KviDns*)static_TQUType_ptr.get(_o+1)); break; case 1: haveServerIp(); break; default: - return QObject::qt_invoke( _id, _o ); + return TQObject::qt_invoke( _id, _o ); } return TRUE; } -bool KviHttpRequest::qt_emit( int _id, QUObject* _o ) +bool KviHttpRequest::qt_emit( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->signalOffset() ) { - case 0: resolvingHost((const QString&)static_QUType_QString.get(_o+1)); break; - case 1: contactingHost((const QString&)static_QUType_QString.get(_o+1)); break; + case 0: resolvingHost((const TQString&)static_TQUType_TQString.get(_o+1)); break; + case 1: contactingHost((const TQString&)static_TQUType_TQString.get(_o+1)); break; case 2: connectionEstabilished(); break; - case 3: receivedResponse((const QString&)static_QUType_QString.get(_o+1)); break; - case 4: terminated((bool)static_QUType_bool.get(_o+1)); break; - case 5: status((const QString&)static_QUType_QString.get(_o+1)); break; - case 6: data((const KviStr&)*((const KviStr*)static_QUType_ptr.get(_o+1))); break; - case 7: binaryData((const KviDataBuffer&)*((const KviDataBuffer*)static_QUType_ptr.get(_o+1))); break; - case 8: header((KviPointerHashTable*)static_QUType_ptr.get(_o+1)); break; - case 9: requestSent((const QStringList&)*((const QStringList*)static_QUType_ptr.get(_o+1))); break; + case 3: receivedResponse((const TQString&)static_TQUType_TQString.get(_o+1)); break; + case 4: terminated((bool)static_TQUType_bool.get(_o+1)); break; + case 5: status((const TQString&)static_TQUType_TQString.get(_o+1)); break; + case 6: data((const KviStr&)*((const KviStr*)static_TQUType_ptr.get(_o+1))); break; + case 7: binaryData((const KviDataBuffer&)*((const KviDataBuffer*)static_TQUType_ptr.get(_o+1))); break; + case 8: header((KviPointerHashTable*)static_TQUType_ptr.get(_o+1)); break; + case 9: requestSent((const TQStringList&)*((const TQStringList*)static_TQUType_ptr.get(_o+1))); break; default: - return QObject::qt_emit(_id,_o); + return TQObject::qt_emit(_id,_o); } return TRUE; } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviHttpRequest::qt_property( int id, int f, QVariant* v) +bool KviHttpRequest::qt_property( int id, int f, TQVariant* v) { - return QObject::qt_property( id, f, v); + return TQObject::qt_property( id, f, v); } -bool KviHttpRequest::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviHttpRequest::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES -- cgit v1.2.3