summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-18 23:43:22 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-18 23:43:22 +0000
commitbd4d40e62f0ade42fbc594c1c87dfc93dfab8c99 (patch)
tree0846110ee822a57b2b7d9f08422282b03f0504b5
parent3bbd9f8c37af59661292e14ec82088ffb09195e2 (diff)
downloadtdepim-bd4d40e62f0ade42fbc594c1c87dfc93dfab8c99.tar.gz
tdepim-bd4d40e62f0ade42fbc594c1c87dfc93dfab8c99.zip
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
-rw-r--r--kioslaves/imap4/imap4.cc6
-rw-r--r--kioslaves/imap4/imapparser.cc8
-rw-r--r--kmail/templateparser.cpp4
-rw-r--r--knode/knprotocolclient.cpp2
-rw-r--r--libkcal/versit/vobject.h4
-rw-r--r--mimelib/nntp.cpp2
-rw-r--r--mimelib/pop.cpp2
7 files changed, 14 insertions, 14 deletions
diff --git a/kioslaves/imap4/imap4.cc b/kioslaves/imap4/imap4.cc
index 12cf93e19..6e9b1f3ee 100644
--- a/kioslaves/imap4/imap4.cc
+++ b/kioslaves/imap4/imap4.cc
@@ -1330,10 +1330,10 @@ IMAP4Protocol::special (const TQByteArray & aData)
// quota
int cmd;
stream >> cmd;
- if ( hasCapability( "TQUOTA" ) ) {
+ if ( hasCapability( "QUOTA" ) ) {
specialQuotaCommand( cmd, stream );
} else {
- error( ERR_UNSUPPORTED_ACTION, "TQUOTA" );
+ error( ERR_UNSUPPORTED_ACTION, "QUOTA" );
}
break;
}
@@ -1720,7 +1720,7 @@ IMAP4Protocol::specialQuotaCommand( int command, TQDataStream& stream )
switch( command ) {
case 'R': // GETQUOTAROOT
{
- kdDebug(7116) << "TQUOTAROOT " << aBox << endl;
+ kdDebug(7116) << "QUOTAROOT " << aBox << endl;
imapCommand *cmd = doCommand(imapCommand::clientGetQuotaroot( aBox ) );
if (cmd->result () != "OK")
{
diff --git a/kioslaves/imap4/imapparser.cc b/kioslaves/imap4/imapparser.cc
index 3e16e262d..4b8086ffc 100644
--- a/kioslaves/imap4/imapparser.cc
+++ b/kioslaves/imap4/imapparser.cc
@@ -458,11 +458,11 @@ imapParser::parseUntagged (parseString & result)
}
break;
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 );
}
- else if (tqstrncmp(what, "TQUOTA", what.size()) == 0)
+ else if (tqstrncmp(what, "QUOTA", what.size()) == 0)
{
parseQuota( result );
}
@@ -752,7 +752,7 @@ void imapParser::parseAnnotation (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_resource ::= atom SP number SP number
TQCString root = parseOneWordC( result );
@@ -777,7 +777,7 @@ void imapParser::parseQuota (parseString & result)
void imapParser::parseQuotaRoot (parseString & result)
{
// quotaroot_response
- // ::= "TQUOTAROOT" SP astring *(SP astring)
+ // ::= "QUOTAROOT" SP astring *(SP astring)
parseOneWordC (result); // skip mailbox name
skipWS (result);
if ( result.isEmpty() )
diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp
index d5a8d3753..8dce59d4e 100644
--- a/kmail/templateparser.cpp
+++ b/kmail/templateparser.cpp
@@ -320,9 +320,9 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
body.append( quote );
}
- } else if ( cmd.startsWith( "TQHEADERS" ) ) {
+ } else if ( cmd.startsWith( "QHEADERS" ) ) {
kdDebug() << "Command: TQHEADERS" << endl;
- i += strlen( "TQHEADERS" );
+ i += strlen( "QHEADERS" );
if ( mOrigMsg ) {
TQString quote = mOrigMsg->asQuotedString( "", mQuoteString,
mOrigMsg->headerAsSendableString(),
diff --git a/knode/knprotocolclient.cpp b/knode/knprotocolclient.cpp
index c1b52a77f..dd0db677a 100644
--- a/knode/knprotocolclient.cpp
+++ b/knode/knprotocolclient.cpp
@@ -235,7 +235,7 @@ void KNProtocolClient::closeConnection()
int ret = KSocks::self()->select(FD_SETSIZE, NULL, &fdsW, NULL, &tv);
if (ret > 0) { // we can write...
- TQCString cmd = "TQUIT\r\n";
+ TQCString cmd = "QUIT\r\n";
int todo = cmd.length();
KSocks::self()->write(tcpSocket,&cmd.data()[0],todo);
}
diff --git a/libkcal/versit/vobject.h b/libkcal/versit/vobject.h
index 835a4b133..e456c8815 100644
--- a/libkcal/versit/vobject.h
+++ b/libkcal/versit/vobject.h
@@ -207,8 +207,8 @@ extern "C" {
#define VCPSProp "PS"
#define VCPublicKeyProp "KEY"
#define VCTQPProp "QP"
-#define VCQuickTimeProp "TQTIME"
-#define VCQuotedPrintableProp "TQUOTED-PRINTABLE"
+#define VCQuickTimeProp "QTIME"
+#define VCQuotedPrintableProp "QUOTED-PRINTABLE"
#define VCRDateProp "RDATE"
#define VCRegionProp "R"
#define VCRelatedToProp "RELATED-TO"
diff --git a/mimelib/nntp.cpp b/mimelib/nntp.cpp
index b6b20917f..0dd9e7768 100644
--- a/mimelib/nntp.cpp
+++ b/mimelib/nntp.cpp
@@ -467,7 +467,7 @@ int DwNntpClient::Quit()
mReplyCode = 0;
mStatusResponse = mTextResponse = "";
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;)
int bufferLen = strlen(mSendBuffer);
int numSent = PSend(mSendBuffer, bufferLen);
diff --git a/mimelib/pop.cpp b/mimelib/pop.cpp
index 88f9b6540..bec5d60b6 100644
--- a/mimelib/pop.cpp
+++ b/mimelib/pop.cpp
@@ -143,7 +143,7 @@ int DwPopClient::Quit()
mStatusCode = 0;
mSingleLineResponse = mMultiLineResponse = "";
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;)
int bufferLen = strlen(mSendBuffer);
int numSent = PSend(mSendBuffer, bufferLen);