From 17e2ed52dbf8fac39a04331da02b9572e9e2e304 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:35:40 -0600 Subject: Rename additional global TQt functions --- knode/knarticlecollection.cpp | 6 +++--- knode/kngroup.cpp | 12 +++++------ knode/knnntpclient.cpp | 48 +++++++++++++++++++++---------------------- knode/knprotocolclient.cpp | 22 ++++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) (limited to 'knode') diff --git a/knode/knarticlecollection.cpp b/knode/knarticlecollection.cpp index cbb4779b..d39d4d83 100644 --- a/knode/knarticlecollection.cpp +++ b/knode/knarticlecollection.cpp @@ -254,7 +254,7 @@ int KNArticleVector::indexForId(int id) return mid; else { #ifndef NDEBUG - qDebug("knode: KNArticleVector::indexForId() : id=%d not found", id); + tqDebug("knode: KNArticleVector::indexForId() : id=%d not found", id); #endif return -1; } @@ -288,13 +288,13 @@ int KNArticleVector::indexForMsgId(const TQCString &id) if(found) { /*#ifndef NDEBUG - qDebug("KNArticleVector::indexForMsgID() : msgID=%s found after %d compares", id.data(), cnt); + tqDebug("KNArticleVector::indexForMsgID() : msgID=%s found after %d compares", id.data(), cnt); #endif*/ return mid; } else { /*#ifndef NDEBUG - qDebug("knode: KNArticleVector::indexForMsgID() : msgID=%s not found", id.data()); + tqDebug("knode: KNArticleVector::indexForMsgID() : msgID=%s not found", id.data()); #endif*/ return -1; } diff --git a/knode/kngroup.cpp b/knode/kngroup.cpp index c42aab07..087eb737 100644 --- a/knode/kngroup.cpp +++ b/knode/kngroup.cpp @@ -692,7 +692,7 @@ void KNGroup::buildThreads(int cnt, KNProtocolClient *client) // this method is called from the nntp-thread!!! #ifndef NDEBUG - qDebug("knode: KNGroup::buildThreads() : start = %d end = %d",start,end); + tqDebug("knode: KNGroup::buildThreads() : start = %d end = %d",start,end); #endif //resort old hdrs @@ -705,7 +705,7 @@ void KNGroup::buildThreads(int cnt, KNProtocolClient *client) if(ref) { // this method is called from the nntp-thread!!! #ifndef NDEBUG - qDebug("knode: %d: old %d new %d",art->id(), oldRef, art->idRef()); + tqDebug("knode: %d: old %d new %d",art->id(), oldRef, art->idRef()); #endif resortCnt++; art->setChanged(true); @@ -826,7 +826,7 @@ void KNGroup::buildThreads(int cnt, KNProtocolClient *client) if(isLoop) { // this method is called from the nntp-thread!!! #ifndef NDEBUG - qDebug("knode: Sorting : loop in %d",startId); + tqDebug("knode: Sorting : loop in %d",startId); #endif art=at(idx); art->setIdRef(0); @@ -859,9 +859,9 @@ void KNGroup::buildThreads(int cnt, KNProtocolClient *client) // this method is called from the nntp-thread!!! #ifndef NDEBUG - qDebug("knode: Sorting : %d headers resorted", resortCnt); - qDebug("knode: Sorting : %d references of %d found", foundCnt, refCnt); - qDebug("knode: Sorting : %d references of %d sorted by subject", bySubCnt, refCnt); + tqDebug("knode: Sorting : %d headers resorted", resortCnt); + tqDebug("knode: Sorting : %d references of %d found", foundCnt, refCnt); + tqDebug("knode: Sorting : %d references of %d sorted by subject", bySubCnt, refCnt); #endif } diff --git a/knode/knnntpclient.cpp b/knode/knnntpclient.cpp index efc3b18c..8cedae08 100644 --- a/knode/knnntpclient.cpp +++ b/knode/knnntpclient.cpp @@ -61,7 +61,7 @@ void KNNntpClient::processJob() break; default: #ifndef NDEBUG - qDebug("knode: KNNntpClient::processJob(): mismatched job"); + tqDebug("knode: KNNntpClient::processJob(): mismatched job"); #endif break; } @@ -108,7 +108,7 @@ void KNNntpClient::doFetchGroups() s = strchr(line,' '); if(!s) { #ifndef NDEBUG - qDebug("knode: retrieved broken group-line - ignoring"); + tqDebug("knode: retrieved broken group-line - ignoring"); #endif } else { s[0] = 0; // cut string @@ -175,7 +175,7 @@ void KNNntpClient::doFetchGroups() while (*s != '\0' && *s != '\t' && *s != ' ') s++; if (*s == '\0') { #ifndef NDEBUG - qDebug("knode: retrieved broken group-description - ignoring"); + tqDebug("knode: retrieved broken group-description - ignoring"); #endif } else { s[0] = 0; // terminate groupname @@ -244,7 +244,7 @@ void KNNntpClient::doCheckNewGroups() s = strchr(line,' '); if(!s) { #ifndef NDEBUG - qDebug("knode: retrieved broken group-line - ignoring"); + tqDebug("knode: retrieved broken group-line - ignoring"); #endif } else { s[0] = 0; // cut string @@ -297,7 +297,7 @@ void KNNntpClient::doCheckNewGroups() while (*s !=- '\0' && *s != '\t' && *s != ' ') s++; if (*s == '\0') { #ifndef NDEBUG - qDebug("knode: retrieved broken group-description - ignoring"); + tqDebug("knode: retrieved broken group-description - ignoring"); #endif } else { while (*s == ' ' || *s == '\t') s++; // go on to the description @@ -378,17 +378,17 @@ void KNNntpClient::doFetchNewHeaders() oldlast=target->lastNr(); toFetch=last-oldlast; - //qDebug("knode: last %d oldlast %d toFetch %d\n",last,oldlast,toFetch); + //tqDebug("knode: last %d oldlast %d toFetch %d\n",last,oldlast,toFetch); if(toFetch<=0) { - //qDebug("knode: No new Articles in group\n"); + //tqDebug("knode: No new Articles in group\n"); target->setLastNr(last); // don't get stuck when the article numbers wrap return; } if(toFetch>target->maxFetch()) { toFetch=target->maxFetch(); - //qDebug("knode: Fetching only %d articles\n",toFetch); + //tqDebug("knode: Fetching only %d articles\n",toFetch); } progressValue = 100; @@ -413,7 +413,7 @@ void KNNntpClient::doFetchNewHeaders() } } - //qDebug("knode: KNNntpClient::doFetchNewHeaders() : xover %d-%d", last-toFetch+1, last); + //tqDebug("knode: KNNntpClient::doFetchNewHeaders() : xover %d-%d", last-toFetch+1, last); cmd.sprintf("xover %d-%d",last-toFetch+1,last); if (!sendCommand(cmd,rep)) return; @@ -512,7 +512,7 @@ void KNNntpClient::doPostArticle() if (rep==223) { // 223 n article retrieved - request text separately #ifndef NDEBUG - qDebug("knode: STAT successful, we have probably already sent this article."); + tqDebug("knode: STAT successful, we have probably already sent this article."); #endif return; // the article is already on the server, lets put it silently into the send folder } @@ -529,7 +529,7 @@ void KNNntpClient::doPostArticle() art->messageID()->from7BitString(s.mid(start,end-start+1)); art->assemble(); #ifndef NDEBUG - qDebug("knode: using the message-id recommended by the server: %s",s.mid(start,end-start+1).data()); + tqDebug("knode: using the message-id recommended by the server: %s",s.mid(start,end-start+1).data()); #endif } } @@ -595,7 +595,7 @@ bool KNNntpClient::openConnection() if (rep==500) { #ifndef NDEBUG - qDebug("knode: \"MODE READER\" command not recognized."); + tqDebug("knode: \"MODE READER\" command not recognized."); #endif } else if ( ( rep < 200 ) || ( rep > 299 ) ) { // RFC977: 2xx - Command ok @@ -607,7 +607,7 @@ bool KNNntpClient::openConnection() // logon now, some newsserver send a incomplete group list otherwise if (account.needsLogon() && !account.user().isEmpty()) { - //qDebug("knode: user: %s",account.user().latin1()); + //tqDebug("knode: user: %s",account.user().latin1()); TQCString command = "AUTHINFO USER "; command += account.user().local8Bit(); @@ -615,7 +615,7 @@ bool KNNntpClient::openConnection() return false; if (rep==381) { // 381 PASS required - //qDebug("knode: Password required"); + //tqDebug("knode: Password required"); if (!account.pass().length()) { job->setErrorString(i18n("Authentication failed.\nCheck your username and password.")); @@ -623,7 +623,7 @@ bool KNNntpClient::openConnection() return false; } - //qDebug("knode: pass: %s",account.pass().latin1()); + //tqDebug("knode: pass: %s",account.pass().latin1()); command = "AUTHINFO PASS "; command += account.pass().local8Bit(); @@ -632,11 +632,11 @@ bool KNNntpClient::openConnection() if (rep==281) { // 281 authorization success #ifndef NDEBUG - qDebug("knode: Authorization successful"); + tqDebug("knode: Authorization successful"); #endif } else { #ifndef NDEBUG - qDebug("knode: Authorization failed"); + tqDebug("knode: Authorization failed"); #endif job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").arg(getCurrentLine())); job->setAuthError(true); @@ -646,12 +646,12 @@ bool KNNntpClient::openConnection() } else { if (rep==281) { // 281 authorization success #ifndef NDEBUG - qDebug("knode: Authorization successful"); + tqDebug("knode: Authorization successful"); #endif } else { if ((rep==482)||(rep==500)) { //482 Authentication rejected #ifndef NDEBUG - qDebug("knode: Authorization failed"); // we don't care, the server can refuse the info + tqDebug("knode: Authorization failed"); // we don't care, the server can refuse the info #endif } else { handleErrors(); @@ -675,7 +675,7 @@ bool KNNntpClient::sendCommand(const TQCString &cmd, int &rep) return false; if (rep==480) { // 480 requesting authorization - //qDebug("knode: Authorization requested"); + //tqDebug("knode: Authorization requested"); if (!account.user().length()) { job->setErrorString(i18n("Authentication failed.\nCheck your username and password.")); @@ -684,7 +684,7 @@ bool KNNntpClient::sendCommand(const TQCString &cmd, int &rep) return false; } - //qDebug("knode: user: %s",account.user().data()); + //tqDebug("knode: user: %s",account.user().data()); TQCString command = "AUTHINFO USER "; command += account.user().local8Bit(); @@ -692,7 +692,7 @@ bool KNNntpClient::sendCommand(const TQCString &cmd, int &rep) return false; if (rep==381) { // 381 PASS required - //qDebug("knode: Password required"); + //tqDebug("knode: Password required"); if (!account.pass().length()) { job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").arg(getCurrentLine())); @@ -701,7 +701,7 @@ bool KNNntpClient::sendCommand(const TQCString &cmd, int &rep) return false; } - //qDebug("knode: pass: %s",account.pass().data()); + //tqDebug("knode: pass: %s",account.pass().data()); command = "AUTHINFO PASS "; command += account.pass().local8Bit(); @@ -711,7 +711,7 @@ bool KNNntpClient::sendCommand(const TQCString &cmd, int &rep) if (rep==281) { // 281 authorization success #ifndef NDEBUG - qDebug("knode: Authorization successful"); + tqDebug("knode: Authorization successful"); #endif if (!KNProtocolClient::sendCommand(cmd,rep)) // retry the original command return false; diff --git a/knode/knprotocolclient.cpp b/knode/knprotocolclient.cpp index dc1a299f..8289d02e 100644 --- a/knode/knprotocolclient.cpp +++ b/knode/knprotocolclient.cpp @@ -57,9 +57,9 @@ KNProtocolClient::~KNProtocolClient() void KNProtocolClient::run() { if (0!=pthread_setcancelstate(PTHREAD_CANCEL_ENABLE,NULL)) - qWarning("pthread_setcancelstate failed!"); + tqWarning("pthread_setcancelstate failed!"); if (0!= pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS,NULL)) - qWarning("pthread_setcanceltype failed!"); + tqWarning("pthread_setcanceltype failed!"); signal(SIGPIPE,SIG_IGN); // ignore sigpipe waitForWork(); @@ -112,13 +112,13 @@ void KNProtocolClient::waitForWork() // if select() returns early because of a signal if (selectRet == 0) { #ifndef NDEBUG - qDebug("knode: KNProtocolClient::waitForWork(): hold time elapsed, closing connection."); + tqDebug("knode: KNProtocolClient::waitForWork(): hold time elapsed, closing connection."); #endif closeConnection(); // nothing happend... } else { if (((selectRet > 0)&&(!FD_ISSET(fdPipeIn,&fdsR)))||(selectRet == -1)) { #ifndef NDEBUG - qDebug("knode: KNProtocolClient::waitForWork(): connection broken, closing it"); + tqDebug("knode: KNProtocolClient::waitForWork(): connection broken, closing it"); #endif closeSocket(); } @@ -139,7 +139,7 @@ void KNProtocolClient::waitForWork() sendSignal(TSjobStarted); if (job) { - // qDebug("knode: KNProtocolClient::waitForWork(): got job"); + // tqDebug("knode: KNProtocolClient::waitForWork(): got job"); if (job->net()&&!(account == *job->account())) { // server changed account = *job->account(); @@ -185,7 +185,7 @@ bool KNProtocolClient::openConnection() sendSignal(TSconnect); #ifndef NDEBUG - qDebug("knode: KNProtocolClient::openConnection(): opening connection"); + tqDebug("knode: KNProtocolClient::openConnection(): opening connection"); #endif if (account.server().isEmpty()) { @@ -225,7 +225,7 @@ void KNProtocolClient::closeConnection() timeval tv; #ifndef NDEBUG - qDebug("knode: KNProtocolClient::closeConnection(): closing connection"); + tqDebug("knode: KNProtocolClient::closeConnection(): closing connection"); #endif FD_ZERO(&fdsW); @@ -335,7 +335,7 @@ bool KNProtocolClient::getNextLine() thisLine = input; inputEnd = input+div-1; #ifndef NDEBUG - qDebug("knode: KNProtocolClient::getNextLine(): input buffer enlarged"); + tqDebug("knode: KNProtocolClient::getNextLine(): input buffer enlarged"); #endif } if (!waitForRead()) @@ -443,7 +443,7 @@ void KNProtocolClient::handleErrors() void KNProtocolClient::sendSignal(threadSignal s) { int signal=(int)s; - // qDebug("knode: KNProtcolClient::sendSignal() : sending signal to main thread"); + // tqDebug("knode: KNProtcolClient::sendSignal() : sending signal to main thread"); write(fdPipeOut, &signal, sizeof(int)); } @@ -485,7 +485,7 @@ bool KNProtocolClient::waitForRead() if (ret > 0) { if (FD_ISSET(fdPipeIn,&fdsR)) { // stop signal #ifndef NDEBUG - qDebug("knode: KNProtocolClient::waitForRead(): got stop signal"); + tqDebug("knode: KNProtocolClient::waitForRead(): got stop signal"); #endif closeConnection(); return false; @@ -547,7 +547,7 @@ bool KNProtocolClient::waitForWrite() if (ret > 0) { if (FD_ISSET(fdPipeIn,&fdsR)) { // stop signal #ifndef NDEBUG - qDebug("knode: KNProtocolClient::waitForWrite(): got stop signal"); + tqDebug("knode: KNProtocolClient::waitForWrite(): got stop signal"); #endif closeConnection(); return false; -- cgit v1.2.3