summaryrefslogtreecommitdiffstats
path: root/kioslaves
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-13 15:08:46 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-06-03 04:25:15 +0200
commit987ff38c027b50b35edfc8ec7761d8230738b717 (patch)
tree900d4f19c04a3ac06ede552fed894455ae4fe927 /kioslaves
parentebf706e3c980d84886f04344bc94c080a38bc4cd (diff)
downloadtdepim-987ff38c027b50b35edfc8ec7761d8230738b717.tar.gz
tdepim-987ff38c027b50b35edfc8ec7761d8230738b717.zip
Fix inadvertent TQt changes
This closes Bug 752 (cherry picked from commit d497b1b0373d758ede3d877ab68c8d7c8ab29062)
Diffstat (limited to 'kioslaves')
-rw-r--r--kioslaves/imap4/imap4.cc12
-rw-r--r--kioslaves/imap4/imapcommand.cc2
-rw-r--r--kioslaves/imap4/imapcommand.h4
-rw-r--r--kioslaves/imap4/imapparser.cc6
-rw-r--r--kioslaves/imap4/imapparser.h4
-rw-r--r--kioslaves/sieve/sieve.cpp8
-rw-r--r--kioslaves/sieve/sieve.h2
7 files changed, 19 insertions, 19 deletions
diff --git a/kioslaves/imap4/imap4.cc b/kioslaves/imap4/imap4.cc
index d9407b84..05469be3 100644
--- a/kioslaves/imap4/imap4.cc
+++ b/kioslaves/imap4/imap4.cc
@@ -1493,7 +1493,7 @@ IMAP4Protocol::specialACLCommand( int command, TQDataStream& stream )
}
// Returning information to the application from a special() command isn't easy.
// I'm reusing the infoMessage trick seen above (for capabilities), but this
- // limits me to a string instead of a stringlist. Using DTQUOTE as separator,
+ // limits me to a string instead of a stringlist. Using DQUOTE as separator,
// because it's forbidden in userids by rfc3501
kdDebug(7116) << getResults() << endl;
infoMessage(getResults().join( "\"" ));
@@ -1718,7 +1718,7 @@ IMAP4Protocol::specialQuotaCommand( int command, TQDataStream& stream )
parseURL (_url, aBox, aSection, aLType, aSequence, aValidity, aDelimiter, aInfo);
switch( command ) {
- case 'R': // GETQUOTAROOT
+ case 'R': // GEQUOTAROOT
{
kdDebug(7116) << "QUOTAROOT " << aBox << endl;
imapCommand *cmd = doCommand(imapCommand::clientGetQuotaroot( aBox ) );
@@ -1734,15 +1734,15 @@ IMAP4Protocol::specialQuotaCommand( int command, TQDataStream& stream )
finished();
break;
}
- case 'G': // GETQUOTA
+ case 'G': // GEQUOTA
{
- kdDebug(7116) << "GETQUOTA command" << endl;
+ kdDebug(7116) << "GEQUOTA command" << endl;
kdWarning(7116) << "UNIMPLEMENTED" << endl;
break;
}
- case 'S': // SETQUOTA
+ case 'S': // SEQUOTA
{
- kdDebug(7116) << "SETQUOTA command" << endl;
+ kdDebug(7116) << "SEQUOTA command" << endl;
kdWarning(7116) << "UNIMPLEMENTED" << endl;
break;
}
diff --git a/kioslaves/imap4/imapcommand.cc b/kioslaves/imap4/imapcommand.cc
index 4b9faadf..4c2ac2d1 100644
--- a/kioslaves/imap4/imapcommand.cc
+++ b/kioslaves/imap4/imapcommand.cc
@@ -397,7 +397,7 @@ imapCommand *
imapCommand::clientGetQuotaroot( const TQString& box )
{
TQString parameter = TQString("\"") + rfcDecoder::toIMAP (box) + '"';
- return new imapCommand ("GETQUOTAROOT", parameter);
+ return new imapCommand ("GEQUOTAROOT", parameter);
}
imapCommand *
diff --git a/kioslaves/imap4/imapcommand.h b/kioslaves/imap4/imapcommand.h
index 9e283442..4c955202 100644
--- a/kioslaves/imap4/imapcommand.h
+++ b/kioslaves/imap4/imapcommand.h
@@ -365,9 +365,9 @@ public:
static imapCommand *clientNamespace ();
/**
- * @brief Create a GETQUOTAROOT command
+ * @brief Create a GEQUOTAROOT command
* @param box mailbox name
- * @return a GETQUOTAROOT imapCommand
+ * @return a GEQUOTAROOT imapCommand
*/
static imapCommand *clientGetQuotaroot ( const TQString& box );
diff --git a/kioslaves/imap4/imapparser.cc b/kioslaves/imap4/imapparser.cc
index 67406862..6ba434a4 100644
--- a/kioslaves/imap4/imapparser.cc
+++ b/kioslaves/imap4/imapparser.cc
@@ -128,8 +128,8 @@ imapParser::sendCommand (imapCommand * aCmd)
|| command == "MYRIGHTS"
|| command == "GETANNOTATION"
|| command == "NAMESPACE"
- || command == "GETQUOTAROOT"
- || command == "GETQUOTA"
+ || command == "GEQUOTAROOT"
+ || command == "GEQUOTA"
|| command == "X-GET-OTHER-USERS"
|| command == "X-GET-DELEGATES"
|| command == "X-GET-OUT-OF-OFFICE")
@@ -457,7 +457,7 @@ imapParser::parseUntagged (parseString & result)
parseAnnotation (result);
}
break;
- case 'Q': // TQUOTA or TQUOTAROOT
+ case 'Q': // QUOTA or QUOTAROOT
if ( what.size() > 5 && tqstrncmp(what, "QUOTAROOT", what.size()) == 0)
{
parseQuotaRoot( result );
diff --git a/kioslaves/imap4/imapparser.h b/kioslaves/imap4/imapparser.h
index 2cf9b393..61e8a439 100644
--- a/kioslaves/imap4/imapparser.h
+++ b/kioslaves/imap4/imapparser.h
@@ -290,9 +290,9 @@ public:
void parseAnnotation (parseString & result);
/** @brief parse a NAMESPACE line */
void parseNamespace (parseString & result);
- /** @brief parse a TQUOTAROOT line */
+ /** @brief parse a QUOTAROOT line */
void parseQuotaRoot (parseString & result);
- /** @brief parse a TQUOTA line */
+ /** @brief parse a QUOTA line */
void parseQuota (parseString & result);
/** @brief parse a custom command line */
void parseCustom (parseString & result);
diff --git a/kioslaves/sieve/sieve.cpp b/kioslaves/sieve/sieve.cpp
index 631ca5c9..91689565 100644
--- a/kioslaves/sieve/sieve.cpp
+++ b/kioslaves/sieve/sieve.cpp
@@ -151,7 +151,7 @@ const TQCString& kio_sieveResponse::getExtra() const
/* ---------------------------------------------------------------------------------- */
void kio_sieveResponse::setQuantity(const uint& newTQty)
{
- rType = TQUANTITY;
+ rType = QUANTITY;
quantity = newTQty;
}
@@ -661,7 +661,7 @@ void kio_sieveProtocol::put(const KURL& url, int /*permissions*/, bool /*overwri
// send the extra message off for re-processing
receiveData(false, &extra);
- if (r.getType() == kio_sieveResponse::TQUANTITY) {
+ if (r.getType() == kio_sieveResponse::QUANTITY) {
// length of the error message
uint len = r.getQuantity();
@@ -736,7 +736,7 @@ void kio_sieveProtocol::get(const KURL& url)
if (!sendData("GETSCRIPT \"" + filename.utf8() + "\""))
return;
- if (receiveData() && r.getType() == kio_sieveResponse::TQUANTITY) {
+ if (receiveData() && r.getType() == kio_sieveResponse::QUANTITY) {
// determine script size
ssize_t total_len = r.getQuantity();
totalSize( total_len );
@@ -1105,7 +1105,7 @@ bool kio_sieveProtocol::authenticate()
ksDebug() << "Challenge len " << r.getQuantity() << endl;
- if (r.getType() != kio_sieveResponse::TQUANTITY) {
+ if (r.getType() != kio_sieveResponse::QUANTITY) {
sasl_dispose( &conn );
error(ERR_SLAVE_DEFINED,
i18n("A protocol error occurred during authentication.\n"
diff --git a/kioslaves/sieve/sieve.h b/kioslaves/sieve/sieve.h
index 4a22cbe1..d435892e 100644
--- a/kioslaves/sieve/sieve.h
+++ b/kioslaves/sieve/sieve.h
@@ -30,7 +30,7 @@ class KURL;
class kio_sieveResponse
{
public:
- enum responses { NONE, KEY_VAL_PAIR, ACTION, TQUANTITY };
+ enum responses { NONE, KEY_VAL_PAIR, ACTION, QUANTITY };
kio_sieveResponse();