summaryrefslogtreecommitdiffstats
path: root/knode/knnntpclient.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'knode/knnntpclient.cpp')
-rw-r--r--knode/knnntpclient.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/knode/knnntpclient.cpp b/knode/knnntpclient.cpp
index a6b1e566c..b81f13485 100644
--- a/knode/knnntpclient.cpp
+++ b/knode/knnntpclient.cpp
@@ -336,7 +336,7 @@ void KNNntpClient::doFetchNewHeaders()
sendSignal(TSdownloadNew);
errorPrefix=i18n("No new articles could be retrieved for\n%1/%2.\nThe following error occurred:\n")
- .arg(account.server()).arg(target->groupname());
+ .tqarg(account.server()).tqarg(target->groupname());
cmd="GROUP ";
cmd+=target->groupname().utf8();
@@ -401,7 +401,7 @@ void KNNntpClient::doFetchNewHeaders()
if ( sendCommand( cmd, rep ) && rep == 215 ) {
TQStrList tmp;
if (getMsg(tmp)) {
- for(TQCString s = tmp.first(); s; s = tmp.next()) {
+ for(TQCString s = tmp.first(); !s.isNull(); s = tmp.next()) {
s = s.stripWhiteSpace();
// remove the mandatory xover header
if (s == "Subject:" || s == "From:" || s == "Date:" || s == "Message-ID:"
@@ -482,7 +482,7 @@ void KNNntpClient::doFetchArticle()
job->setErrorString( errorPrefix + getCurrentLine() +
i18n("<br><br>The article you requested is not available on your news server."
"<br>You could try to get it from <a href=\"http://groups.google.com/groups?selm=%1\">groups.google.com</a>.")
- .arg( msgId ) );
+ .tqarg( msgId ) );
}
return;
}
@@ -523,7 +523,7 @@ void KNNntpClient::doPostArticle()
if (art->messageID(false)==0) { // article has no message ID => search for a ID in the response
TQCString s = getCurrentLine();
- int start = s.findRev(TQRegExp("<[^\\s]*@[^\\s]*>"));
+ int start = s.tqfindRev(TQRegExp("<[^\\s]*@[^\\s]*>"));
if (start != -1) { // post response includes a recommended id
int end = s.tqfind('>',start);
art->messageID()->from7BitString(s.mid(start,end-start+1));
@@ -638,7 +638,7 @@ bool KNNntpClient::openConnection()
#ifndef NDEBUG
qDebug("knode: Authorization failed");
#endif
- job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").arg(getCurrentLine()));
+ job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").tqarg(getCurrentLine()));
job->setAuthError(true);
closeConnection();
return false;
@@ -695,7 +695,7 @@ bool KNNntpClient::sendCommand(const TQCString &cmd, int &rep)
//qDebug("knode: Password required");
if (!account.pass().length()) {
- job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").arg(getCurrentLine()));
+ job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").tqarg(getCurrentLine()));
job->setAuthError(true);
closeConnection();
return false;
@@ -716,7 +716,7 @@ bool KNNntpClient::sendCommand(const TQCString &cmd, int &rep)
if (!KNProtocolClient::sendCommand(cmd,rep)) // retry the original command
return false;
} else {
- job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").arg(getCurrentLine()));
+ job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").tqarg(getCurrentLine()));
job->setAuthError(true);
closeConnection();
return false;
@@ -729,7 +729,7 @@ bool KNNntpClient::sendCommand(const TQCString &cmd, int &rep)
void KNNntpClient::handleErrors()
{
if (errorPrefix.isEmpty())
- job->setErrorString(i18n("An error occurred:\n%1").arg(getCurrentLine()));
+ job->setErrorString(i18n("An error occurred:\n%1").tqarg(getCurrentLine()));
else
job->setErrorString(errorPrefix + getCurrentLine());