Fix a number of strings in Trinity that were incorrectly converted to TQ* from Q*

This fixes the Kopete MSN protocol among other things


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1254372 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 3bbd9f8c37
commit bd4d40e62f

@ -1330,10 +1330,10 @@ IMAP4Protocol::special (const TQByteArray & aData)
// quota // quota
int cmd; int cmd;
stream >> cmd; stream >> cmd;
if ( hasCapability( "TQUOTA" ) ) { if ( hasCapability( "QUOTA" ) ) {
specialQuotaCommand( cmd, stream ); specialQuotaCommand( cmd, stream );
} else { } else {
error( ERR_UNSUPPORTED_ACTION, "TQUOTA" ); error( ERR_UNSUPPORTED_ACTION, "QUOTA" );
} }
break; break;
} }
@ -1720,7 +1720,7 @@ IMAP4Protocol::specialQuotaCommand( int command, TQDataStream& stream )
switch( command ) { switch( command ) {
case 'R': // GETQUOTAROOT case 'R': // GETQUOTAROOT
{ {
kdDebug(7116) << "TQUOTAROOT " << aBox << endl; kdDebug(7116) << "QUOTAROOT " << aBox << endl;
imapCommand *cmd = doCommand(imapCommand::clientGetQuotaroot( aBox ) ); imapCommand *cmd = doCommand(imapCommand::clientGetQuotaroot( aBox ) );
if (cmd->result () != "OK") if (cmd->result () != "OK")
{ {

@ -458,11 +458,11 @@ imapParser::parseUntagged (parseString & result)
} }
break; break;
case 'Q': // TQUOTA or TQUOTAROOT case 'Q': // TQUOTA or TQUOTAROOT
if ( what.size() > 5 && tqstrncmp(what, "TQUOTAROOT", what.size()) == 0) if ( what.size() > 5 && tqstrncmp(what, "QUOTAROOT", what.size()) == 0)
{ {
parseQuotaRoot( result ); parseQuotaRoot( result );
} }
else if (tqstrncmp(what, "TQUOTA", what.size()) == 0) else if (tqstrncmp(what, "QUOTA", what.size()) == 0)
{ {
parseQuota( result ); parseQuota( result );
} }
@ -752,7 +752,7 @@ void imapParser::parseAnnotation (parseString & result)
void imapParser::parseQuota (parseString & result) void imapParser::parseQuota (parseString & result)
{ {
// quota_response ::= "TQUOTA" SP astring SP quota_list // quota_response ::= "QUOTA" SP astring SP quota_list
// quota_list ::= "(" #quota_resource ")" // quota_list ::= "(" #quota_resource ")"
// quota_resource ::= atom SP number SP number // quota_resource ::= atom SP number SP number
TQCString root = parseOneWordC( result ); TQCString root = parseOneWordC( result );
@ -777,7 +777,7 @@ void imapParser::parseQuota (parseString & result)
void imapParser::parseQuotaRoot (parseString & result) void imapParser::parseQuotaRoot (parseString & result)
{ {
// quotaroot_response // quotaroot_response
// ::= "TQUOTAROOT" SP astring *(SP astring) // ::= "QUOTAROOT" SP astring *(SP astring)
parseOneWordC (result); // skip mailbox name parseOneWordC (result); // skip mailbox name
skipWS (result); skipWS (result);
if ( result.isEmpty() ) if ( result.isEmpty() )

@ -320,9 +320,9 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
body.append( quote ); body.append( quote );
} }
} else if ( cmd.startsWith( "TQHEADERS" ) ) { } else if ( cmd.startsWith( "QHEADERS" ) ) {
kdDebug() << "Command: TQHEADERS" << endl; kdDebug() << "Command: TQHEADERS" << endl;
i += strlen( "TQHEADERS" ); i += strlen( "QHEADERS" );
if ( mOrigMsg ) { if ( mOrigMsg ) {
TQString quote = mOrigMsg->asQuotedString( "", mQuoteString, TQString quote = mOrigMsg->asQuotedString( "", mQuoteString,
mOrigMsg->headerAsSendableString(), mOrigMsg->headerAsSendableString(),

@ -235,7 +235,7 @@ void KNProtocolClient::closeConnection()
int ret = KSocks::self()->select(FD_SETSIZE, NULL, &fdsW, NULL, &tv); int ret = KSocks::self()->select(FD_SETSIZE, NULL, &fdsW, NULL, &tv);
if (ret > 0) { // we can write... if (ret > 0) { // we can write...
TQCString cmd = "TQUIT\r\n"; TQCString cmd = "QUIT\r\n";
int todo = cmd.length(); int todo = cmd.length();
KSocks::self()->write(tcpSocket,&cmd.data()[0],todo); KSocks::self()->write(tcpSocket,&cmd.data()[0],todo);
} }

@ -207,8 +207,8 @@ extern "C" {
#define VCPSProp "PS" #define VCPSProp "PS"
#define VCPublicKeyProp "KEY" #define VCPublicKeyProp "KEY"
#define VCTQPProp "QP" #define VCTQPProp "QP"
#define VCQuickTimeProp "TQTIME" #define VCQuickTimeProp "QTIME"
#define VCQuotedPrintableProp "TQUOTED-PRINTABLE" #define VCQuotedPrintableProp "QUOTED-PRINTABLE"
#define VCRDateProp "RDATE" #define VCRDateProp "RDATE"
#define VCRegionProp "R" #define VCRegionProp "R"
#define VCRelatedToProp "RELATED-TO" #define VCRelatedToProp "RELATED-TO"

@ -467,7 +467,7 @@ int DwNntpClient::Quit()
mReplyCode = 0; mReplyCode = 0;
mStatusResponse = mTextResponse = ""; mStatusResponse = mTextResponse = "";
mLastCommand = kCmdQuit; mLastCommand = kCmdQuit;
strlcpy(mSendBuffer, "TQUIT\r\n", SEND_BUFFER_SIZE); strlcpy(mSendBuffer, "QUIT\r\n", SEND_BUFFER_SIZE);
DBG_NNTP_STMT(cout << "C: " << mSendBuffer << flush;) DBG_NNTP_STMT(cout << "C: " << mSendBuffer << flush;)
int bufferLen = strlen(mSendBuffer); int bufferLen = strlen(mSendBuffer);
int numSent = PSend(mSendBuffer, bufferLen); int numSent = PSend(mSendBuffer, bufferLen);

@ -143,7 +143,7 @@ int DwPopClient::Quit()
mStatusCode = 0; mStatusCode = 0;
mSingleLineResponse = mMultiLineResponse = ""; mSingleLineResponse = mMultiLineResponse = "";
mLastCommand = kCmdQuit; mLastCommand = kCmdQuit;
strlcpy(mSendBuffer, "TQUIT\r\n", SEND_BUFFER_SIZE); strlcpy(mSendBuffer, "QUIT\r\n", SEND_BUFFER_SIZE);
DBG_POP_STMT(cout << "C: " << mSendBuffer << flush;) DBG_POP_STMT(cout << "C: " << mSendBuffer << flush;)
int bufferLen = strlen(mSendBuffer); int bufferLen = strlen(mSendBuffer);
int numSent = PSend(mSendBuffer, bufferLen); int numSent = PSend(mSendBuffer, bufferLen);

Loading…
Cancel
Save