summaryrefslogtreecommitdiffstats
path: root/kioslaves
diff options
context:
space:
mode:
Diffstat (limited to 'kioslaves')
-rw-r--r--kioslaves/imap4/imap4.cc32
-rw-r--r--kioslaves/imap4/imap4.h6
-rw-r--r--kioslaves/imap4/imapcommand.cc2
-rw-r--r--kioslaves/imap4/imapcommand.h2
-rw-r--r--kioslaves/imap4/imapinfo.cc22
-rw-r--r--kioslaves/imap4/imapparser.cc72
-rw-r--r--kioslaves/imap4/imapparser.h6
-rw-r--r--kioslaves/imap4/mailheader.h4
-rw-r--r--kioslaves/imap4/mimehdrline.h4
-rw-r--r--kioslaves/imap4/mimeheader.cc2
-rw-r--r--kioslaves/imap4/rfcdecoder.cc4
-rw-r--r--kioslaves/imap4/rfcdecoder.h2
-rw-r--r--kioslaves/mbox/Makefile.am2
-rw-r--r--kioslaves/mbox/readmbox.cc2
-rw-r--r--kioslaves/opengroupware/opengroupware.cpp4
-rw-r--r--kioslaves/sieve/Makefile.am2
-rw-r--r--kioslaves/sieve/sieve.cpp14
17 files changed, 91 insertions, 91 deletions
diff --git a/kioslaves/imap4/imap4.cc b/kioslaves/imap4/imap4.cc
index 2290c6787..b5d1071f1 100644
--- a/kioslaves/imap4/imap4.cc
+++ b/kioslaves/imap4/imap4.cc
@@ -251,7 +251,7 @@ IMAP4Protocol::get (const KURL & _url)
if (aUpper.find ("BODY.PEEK[]") != -1)
{
if (!hasCapability("IMAP4rev1")) // imap4 does not know BODY.PEEK[]
- aSection.replace("BODY.PEEK[]", "RFC822.PEEK");
+ aSection.tqreplace("BODY.PEEK[]", "RFC822.PEEK");
}
aSection.prepend("UID RFC822.SIZE FLAGS ");
}
@@ -309,7 +309,7 @@ IMAP4Protocol::get (const KURL & _url)
{
// get the MIME header and fill getLastHandled()
TQString mySection = aSection;
- mySection.replace("]", ".MIME]");
+ mySection.tqreplace("]", ".MIME]");
cmd = sendCommand (imapCommand::clientFetch (aSequence, mySection));
do
{
@@ -1816,7 +1816,7 @@ IMAP4Protocol::slave_status ()
{
bool connected = (getState() != ISTATE_NO) && isConnectionValid();
kdDebug(7116) << "IMAP4::slave_status " << connected << endl;
- slaveStatus ( connected ? myHost : TQString::null, connected );
+ slavetqStatus ( connected ? myHost : TQString::null, connected );
}
void
@@ -1863,7 +1863,7 @@ IMAP4Protocol::stat (const KURL & _url)
ok = true;
else
{
- imapCommand *cmd = doCommand(imapCommand::clientStatus(aBox, aSection));
+ imapCommand *cmd = doCommand(imapCommand::clienStatus(aBox, aSection));
ok = cmd->result() == "OK";
cmdInfo = cmd->resultInfo();
completeQueue.removeRef(cmd);
@@ -1887,13 +1887,13 @@ IMAP4Protocol::stat (const KURL & _url)
error(KIO::ERR_DOES_NOT_EXIST, aBox);
return;
}
- if ((aSection == "UIDNEXT" && getStatus().uidNextAvailable())
- || (aSection == "UNSEEN" && getStatus().unseenAvailable()))
+ if ((aSection == "UIDNEXT" && geStatus().uidNextAvailable())
+ || (aSection == "UNSEEN" && geStatus().unseenAvailable()))
{
atom.m_uds = UDS_SIZE;
atom.m_str = TQString::null;
- atom.m_long = (aSection == "UIDNEXT") ? getStatus().uidNext()
- : getStatus().unseen();
+ atom.m_long = (aSection == "UIDNEXT") ? geStatus().uidNext()
+ : geStatus().unseen();
entry.append(atom);
}
} else
@@ -1910,9 +1910,9 @@ IMAP4Protocol::stat (const KURL & _url)
// only do this if the box is not selected
// the server might change the validity for new select/examine
imapCommand *cmd =
- doCommand (imapCommand::clientStatus (aBox, "UIDVALIDITY"));
+ doCommand (imapCommand::clienStatus (aBox, "UIDVALIDITY"));
completeQueue.removeRef (cmd);
- validity = getStatus ().uidValidity ();
+ validity = geStatus ().uidValidity ();
}
validity = 0; // temporary
@@ -2108,7 +2108,7 @@ bool IMAP4Protocol::makeLogin ()
}
}
- if ( greeting.contains( TQRegExp( "Cyrus IMAP4 v2.1" ) ) ) {
+ if ( greeting.tqcontains( TQRegExp( "Cyrus IMAP4 v2.1" ) ) ) {
removeCapability( "ANNOTATEMORE" );
}
@@ -2473,7 +2473,7 @@ IMAP4Protocol::parseURL (const KURL & _url, TQString & _box,
// get the delimiter
TQString myNamespace = namespaceForBox( _box );
kdDebug(7116) << "IMAP4::parseURL - namespace=" << myNamespace << endl;
- if ( namespaceToDelimiter.contains(myNamespace) )
+ if ( namespaceToDelimiter.tqcontains(myNamespace) )
{
_hierarchyDelimiter = namespaceToDelimiter[myNamespace];
kdDebug(7116) << "IMAP4::parseURL - delimiter=" << _hierarchyDelimiter << endl;
@@ -2524,7 +2524,7 @@ IMAP4Protocol::parseURL (const KURL & _url, TQString & _box,
}
// if we got no list response for the box see if it's a prefix
if ( retVal == ITYPE_UNKNOWN &&
- namespaceToDelimiter.contains(_box) ) {
+ namespaceToDelimiter.tqcontains(_box) ) {
retVal = ITYPE_DIR;
}
} else {
@@ -2636,7 +2636,7 @@ void IMAP4Protocol::flushOutput(TQString contentEncoding)
else
decoded = outputCache;
- TQString mimetype = KMimeType::findByContent( decoded )->name();
+ TQString mimetype = KMimeType::tqfindByContent( decoded )->name();
kdDebug(7116) << "IMAP4::flushOutput - mimeType " << mimetype << endl;
mimeType(mimetype);
decodeContent = false;
@@ -2715,10 +2715,10 @@ IMAP4Protocol::assureBox (const TQString & aBox, bool readonly)
// Doing this means a server roundtrip and since assureBox is called
// after every mail, we do it with a timeout.
kdDebug(7116) << "IMAP4Protocol::assureBox - reusing box" << endl;
- if ( mTimeOfLastNoop.secsTo( TQDateTime::currentDateTime() ) > 10 ) {
+ if ( mTimeOfLastNoop.secsTo( TQDateTime::tqcurrentDateTime() ) > 10 ) {
cmd = doCommand (imapCommand::clientNoop ());
completeQueue.removeRef (cmd);
- mTimeOfLastNoop = TQDateTime::currentDateTime();
+ mTimeOfLastNoop = TQDateTime::tqcurrentDateTime();
kdDebug(7116) << "IMAP4Protocol::assureBox - noop timer fired" << endl;
}
}
diff --git a/kioslaves/imap4/imap4.h b/kioslaves/imap4/imap4.h
index 9920ecac4..a44b4eb78 100644
--- a/kioslaves/imap4/imap4.h
+++ b/kioslaves/imap4/imap4.h
@@ -37,8 +37,8 @@ enum IMAP_TYPE
{
ITYPE_UNKNOWN, /*< unknown type */
ITYPE_DIR, /*< Object is a directory. i.e. does not contain message, just mailboxes */
- ITYPE_BOX, /*< Object is a mailbox. i.e. contains mails */
- ITYPE_DIR_AND_BOX, /*< Object contains both mails and mailboxes */
+ ITYPE_BOX, /*< Object is a mailbox. i.e. tqcontains mails */
+ ITYPE_DIR_AND_BOX, /*< Object tqcontains both mails and mailboxes */
ITYPE_MSG, /*< Object is a mail */
ITYPE_ATTACH /*< Object is an attachment */
};
@@ -193,7 +193,7 @@ private:
bool relayEnabled, cacheOutput, decodeContent;
TQByteArray outputCache;
TQBuffer outputBuffer;
- Q_ULONG outputBufferIndex;
+ TQ_ULONG outputBufferIndex;
KIO::filesize_t mProcessedSize;
char readBuffer[IMAP_BUFFER];
diff --git a/kioslaves/imap4/imapcommand.cc b/kioslaves/imap4/imapcommand.cc
index ae26f0ab2..979562003 100644
--- a/kioslaves/imap4/imapcommand.cc
+++ b/kioslaves/imap4/imapcommand.cc
@@ -236,7 +236,7 @@ imapCommand::clientAppend (const TQString & box, const TQString & flags,
}
imapCommand *
-imapCommand::clientStatus (const TQString & path, const TQString & parameters)
+imapCommand::clienStatus (const TQString & path, const TQString & parameters)
{
return new imapCommand ("STATUS",
TQString ("\"") + rfcDecoder::toIMAP (path) +
diff --git a/kioslaves/imap4/imapcommand.h b/kioslaves/imap4/imapcommand.h
index f91b93292..4c9552023 100644
--- a/kioslaves/imap4/imapcommand.h
+++ b/kioslaves/imap4/imapcommand.h
@@ -212,7 +212,7 @@ public:
* @param parameters
* @return a STATUS imapCommand
*/
- static imapCommand *clientStatus (const TQString & path,
+ static imapCommand *clienStatus (const TQString & path,
const TQString & parameters);
/**
* @brief Create a COPY command
diff --git a/kioslaves/imap4/imapinfo.cc b/kioslaves/imap4/imapinfo.cc
index 4d1fc805c..c65eca0c7 100644
--- a/kioslaves/imap4/imapinfo.cc
+++ b/kioslaves/imap4/imapinfo.cc
@@ -206,29 +206,29 @@ ulong imapInfo::_flags (const TQCString & inFlags)
if (entry.isEmpty ())
flagsString.clear();
- else if (0 != entry.contains ("\\SEEN"))
+ else if (0 != entry.tqcontains ("\\SEEN"))
flags ^= Seen;
- else if (0 != entry.contains ("\\ANSWERED"))
+ else if (0 != entry.tqcontains ("\\ANSWERED"))
flags ^= Answered;
- else if (0 != entry.contains ("\\FLAGGED"))
+ else if (0 != entry.tqcontains ("\\FLAGGED"))
flags ^= Flagged;
- else if (0 != entry.contains ("\\DELETED"))
+ else if (0 != entry.tqcontains ("\\DELETED"))
flags ^= Deleted;
- else if (0 != entry.contains ("\\DRAFT"))
+ else if (0 != entry.tqcontains ("\\DRAFT"))
flags ^= Draft;
- else if (0 != entry.contains ("\\RECENT"))
+ else if (0 != entry.tqcontains ("\\RECENT"))
flags ^= Recent;
- else if (0 != entry.contains ("\\*"))
+ else if (0 != entry.tqcontains ("\\*"))
flags ^= User;
// non standard kmail falgs
- else if ( entry.contains( "KMAILFORWARDED" ) || entry.contains( "$FORWARDED" ) )
+ else if ( entry.tqcontains( "KMAILFORWARDED" ) || entry.tqcontains( "$FORWARDED" ) )
flags = flags | Forwarded;
- else if ( entry.contains( "KMAILTODO" ) || entry.contains( "$TODO" ) )
+ else if ( entry.tqcontains( "KMAILTODO" ) || entry.tqcontains( "$TODO" ) )
flags = flags | Todo;
- else if ( entry.contains( "KMAILWATCHED" ) || entry.contains( "$WATCHED" ) )
+ else if ( entry.tqcontains( "KMAILWATCHED" ) || entry.tqcontains( "$WATCHED" ) )
flags = flags | Watched;
- else if ( entry.contains( "KMAILIGNORED" ) || entry.contains( "$IGNORED" ) )
+ else if ( entry.tqcontains( "KMAILIGNORED" ) || entry.tqcontains( "$IGNORED" ) )
flags = flags | Ignored;
}
diff --git a/kioslaves/imap4/imapparser.cc b/kioslaves/imap4/imapparser.cc
index e4294bd06..0cd8938eb 100644
--- a/kioslaves/imap4/imapparser.cc
+++ b/kioslaves/imap4/imapparser.cc
@@ -273,7 +273,7 @@ imapParser::clientAuthenticate ( KIO::SlaveBase *slave, KIO::AuthInfo &ai,
TQString firstCommand = aAuth;
if ( !challenge.isEmpty() ) {
firstCommand += " ";
- firstCommand += TQString::fromLatin1( challenge.data(), challenge.size() );
+ firstCommand += TQString::tqfromLatin1( challenge.data(), challenge.size() );
}
cmd = sendCommand (new imapCommand ("AUTHENTICATE", firstCommand.latin1()));
@@ -349,11 +349,11 @@ imapParser::parseUntagged (parseString & result)
{
//the status responses
case 'B': // BAD or BYE
- if (qstrncmp(what, "BAD", what.size()) == 0)
+ if (tqstrncmp(what, "BAD", what.size()) == 0)
{
parseResult (what, result);
}
- else if (qstrncmp(what, "BYE", what.size()) == 0)
+ else if (tqstrncmp(what, "BYE", what.size()) == 0)
{
parseResult (what, result);
if ( sentQueue.count() ) {
@@ -370,7 +370,7 @@ imapParser::parseUntagged (parseString & result)
{
parseResult (what, result);
}
- else if (qstrncmp(what, "NAMESPACE", what.size()) == 0)
+ else if (tqstrncmp(what, "NAMESPACE", what.size()) == 0)
{
parseNamespace (result);
}
@@ -380,20 +380,20 @@ imapParser::parseUntagged (parseString & result)
if (what[1] == 'K' && what.size() == 2)
{
parseResult (what, result);
- } else if (qstrncmp(what, "OTHER-USER", 10) == 0) { // X-GET-OTHER-USER
+ } else if (tqstrncmp(what, "OTHER-USER", 10) == 0) { // X-GET-OTHER-USER
parseOtherUser (result);
- } else if (qstrncmp(what, "OUT-OF-OFFICE", 13) == 0) { // X-GET-OUT-OF-OFFICE
+ } else if (tqstrncmp(what, "OUT-OF-OFFICE", 13) == 0) { // X-GET-OUT-OF-OFFICE
parseOutOfOffice (result);
}
break;
case 'D':
- if (qstrncmp(what, "DELEGATE", 8) == 0) { // X-GET-DELEGATES
+ if (tqstrncmp(what, "DELEGATE", 8) == 0) { // X-GET-DELEGATES
parseDelegate (result);
}
break;
case 'P': // PREAUTH
- if (qstrncmp(what, "PREAUTH", what.size()) == 0)
+ if (tqstrncmp(what, "PREAUTH", what.size()) == 0)
{
parseResult (what, result);
currentState = ISTATE_LOGIN;
@@ -402,67 +402,67 @@ imapParser::parseUntagged (parseString & result)
// parse the other responses
case 'C': // CAPABILITY
- if (qstrncmp(what, "CAPABILITY", what.size()) == 0)
+ if (tqstrncmp(what, "CAPABILITY", what.size()) == 0)
{
parseCapability (result);
}
break;
case 'F': // FLAGS
- if (qstrncmp(what, "FLAGS", what.size()) == 0)
+ if (tqstrncmp(what, "FLAGS", what.size()) == 0)
{
parseFlags (result);
}
break;
case 'L': // LIST or LSUB or LISTRIGHTS
- if (qstrncmp(what, "LIST", what.size()) == 0)
+ if (tqstrncmp(what, "LIST", what.size()) == 0)
{
parseList (result);
}
- else if (qstrncmp(what, "LSUB", what.size()) == 0)
+ else if (tqstrncmp(what, "LSUB", what.size()) == 0)
{
parseLsub (result);
}
- else if (qstrncmp(what, "LISTRIGHTS", what.size()) == 0)
+ else if (tqstrncmp(what, "LISTRIGHTS", what.size()) == 0)
{
parseListRights (result);
}
break;
case 'M': // MYRIGHTS
- if (qstrncmp(what, "MYRIGHTS", what.size()) == 0)
+ if (tqstrncmp(what, "MYRIGHTS", what.size()) == 0)
{
parseMyRights (result);
}
break;
case 'S': // SEARCH or STATUS
- if (qstrncmp(what, "SEARCH", what.size()) == 0)
+ if (tqstrncmp(what, "SEARCH", what.size()) == 0)
{
parseSearch (result);
}
- else if (qstrncmp(what, "STATUS", what.size()) == 0)
+ else if (tqstrncmp(what, "STATUS", what.size()) == 0)
{
parseStatus (result);
}
break;
case 'A': // ACL or ANNOTATION
- if (qstrncmp(what, "ACL", what.size()) == 0)
+ if (tqstrncmp(what, "ACL", what.size()) == 0)
{
parseAcl (result);
}
- else if (qstrncmp(what, "ANNOTATION", what.size()) == 0)
+ else if (tqstrncmp(what, "ANNOTATION", what.size()) == 0)
{
parseAnnotation (result);
}
break;
case 'Q': // QUOTA or QUOTAROOT
- if ( what.size() > 5 && qstrncmp(what, "QUOTAROOT", what.size()) == 0)
+ if ( what.size() > 5 && tqstrncmp(what, "QUOTAROOT", what.size()) == 0)
{
parseQuotaRoot( result );
}
- else if (qstrncmp(what, "QUOTA", what.size()) == 0)
+ else if (tqstrncmp(what, "QUOTA", what.size()) == 0)
{
parseQuota( result );
}
@@ -485,18 +485,18 @@ imapParser::parseUntagged (parseString & result)
switch (what[0])
{
case 'E':
- if (qstrncmp(what, "EXISTS", what.size()) == 0)
+ if (tqstrncmp(what, "EXISTS", what.size()) == 0)
{
parseExists (number, result);
}
- else if (qstrncmp(what, "EXPUNGE", what.size()) == 0)
+ else if (tqstrncmp(what, "EXPUNGE", what.size()) == 0)
{
parseExpunge (number, result);
}
break;
case 'F':
- if (qstrncmp(what, "FETCH", what.size()) == 0)
+ if (tqstrncmp(what, "FETCH", what.size()) == 0)
{
seenUid = TQString::null;
parseFetch (number, result);
@@ -504,7 +504,7 @@ imapParser::parseUntagged (parseString & result)
break;
case 'S':
- if (qstrncmp(what, "STORE", what.size()) == 0) // deprecated store
+ if (tqstrncmp(what, "STORE", what.size()) == 0) // deprecated store
{
seenUid = TQString::null;
parseFetch (number, result);
@@ -512,7 +512,7 @@ imapParser::parseUntagged (parseString & result)
break;
case 'R':
- if (qstrncmp(what, "RECENT", what.size()) == 0)
+ if (tqstrncmp(what, "RECENT", what.size()) == 0)
{
parseRecent (number, result);
}
@@ -626,20 +626,20 @@ imapParser::parseResult (TQByteArray & result, parseString & rest,
{
case 'A':
if (command == "AUTHENTICATE")
- if (qstrncmp(result, "OK", result.size()) == 0)
+ if (tqstrncmp(result, "OK", result.size()) == 0)
currentState = ISTATE_LOGIN;
break;
case 'L':
if (command == "LOGIN")
- if (qstrncmp(result, "OK", result.size()) == 0)
+ if (tqstrncmp(result, "OK", result.size()) == 0)
currentState = ISTATE_LOGIN;
break;
case 'E':
if (command == "EXAMINE")
{
- if (qstrncmp(result, "OK", result.size()) == 0)
+ if (tqstrncmp(result, "OK", result.size()) == 0)
currentState = ISTATE_SELECT;
else
{
@@ -654,7 +654,7 @@ imapParser::parseResult (TQByteArray & result, parseString & rest,
case 'S':
if (command == "SELECT")
{
- if (qstrncmp(result, "OK", result.size()) == 0)
+ if (tqstrncmp(result, "OK", result.size()) == 0)
currentState = ISTATE_SELECT;
else
{
@@ -847,7 +847,7 @@ void imapParser::parseSearch (parseString & result)
void imapParser::parseStatus (parseString & inWords)
{
- lastStatus = imapInfo ();
+ lasStatus = imapInfo ();
parseLiteralC(inWords); // swallow the box
if (inWords.isEmpty() || inWords[0] != '(')
@@ -864,15 +864,15 @@ void imapParser::parseStatus (parseString & inWords)
if (parseOneNumber (inWords, value))
{
if (label == "MESSAGES")
- lastStatus.setCount (value);
+ lasStatus.setCount (value);
else if (label == "RECENT")
- lastStatus.setRecent (value);
+ lasStatus.setRecent (value);
else if (label == "UIDVALIDITY")
- lastStatus.setUidValidity (value);
+ lasStatus.setUidValidity (value);
else if (label == "UNSEEN")
- lastStatus.setUnseen (value);
+ lasStatus.setUnseen (value);
else if (label == "UIDNEXT")
- lastStatus.setUidNext (value);
+ lasStatus.setUidNext (value);
}
}
@@ -1675,7 +1675,7 @@ void imapParser::parseNamespace (parseString & result)
return;
TQString delimEmpty;
- if ( namespaceToDelimiter.contains( TQString::null ) )
+ if ( namespaceToDelimiter.tqcontains( TQString::null ) )
delimEmpty = namespaceToDelimiter[TQString::null];
namespaceToDelimiter.clear();
diff --git a/kioslaves/imap4/imapparser.h b/kioslaves/imap4/imapparser.h
index 2595d094b..d40524d1c 100644
--- a/kioslaves/imap4/imapparser.h
+++ b/kioslaves/imap4/imapparser.h
@@ -404,9 +404,9 @@ public:
};
/** @brief return the last status code */
- const imapInfo & getStatus ()
+ const imapInfo & geStatus ()
{
- return lastStatus;
+ return lasStatus;
};
/** return the select info */
const imapInfo & getSelected ()
@@ -450,7 +450,7 @@ protected:
imapInfo selectInfo;
/** @brief the results from the last status command */
- imapInfo lastStatus;
+ imapInfo lasStatus;
/** @brief the results from the capabilities, split at ' ' */
TQStringList imapCapabilities;
diff --git a/kioslaves/imap4/mailheader.h b/kioslaves/imap4/mailheader.h
index 633d61b78..72ac6e48d 100644
--- a/kioslaves/imap4/mailheader.h
+++ b/kioslaves/imap4/mailheader.h
@@ -94,7 +94,7 @@ public:
}
/**
- * set a unicode subject
+ * set a tqunicode subject
*/
void setSubject (const TQString & _str)
{
@@ -109,7 +109,7 @@ public:
}
/**
- * get the unicode subject
+ * get the tqunicode subject
*/
const TQString getSubject ()
{
diff --git a/kioslaves/imap4/mimehdrline.h b/kioslaves/imap4/mimehdrline.h
index e31c18649..210f5a7c4 100644
--- a/kioslaves/imap4/mimehdrline.h
+++ b/kioslaves/imap4/mimehdrline.h
@@ -52,10 +52,10 @@ and report characters slurped */
static int parseAlphaNum (const char *);
protected: // Protected attributes
- /** contains the Value
+ /** tqcontains the Value
*/
TQCString mimeValue;
- /** contains the Label of the line
+ /** tqcontains the Label of the line
*/
TQCString mimeLabel;
protected: // Protected methods
diff --git a/kioslaves/imap4/mimeheader.cc b/kioslaves/imap4/mimeheader.cc
index 676e0d72f..1d0b7ab9e 100644
--- a/kioslaves/imap4/mimeheader.cc
+++ b/kioslaves/imap4/mimeheader.cc
@@ -650,7 +650,7 @@ mimeHeader::bodyDecoded ()
TQByteArray temp;
temp = bodyDecodedBinary ();
- return TQString::fromLatin1 (temp.data (), temp.count ());
+ return TQString::tqfromLatin1 (temp.data (), temp.count ());
}
QByteArray
diff --git a/kioslaves/imap4/rfcdecoder.cc b/kioslaves/imap4/rfcdecoder.cc
index 0aa237d6b..5470901ed 100644
--- a/kioslaves/imap4/rfcdecoder.cc
+++ b/kioslaves/imap4/rfcdecoder.cc
@@ -154,7 +154,7 @@ TQString rfcDecoder::fromIMAP (const TQString & inSrc)
return TQString::fromUtf8 (dst.data ());
}
-/* replace " with \" and \ with \\ " and \ characters */
+/* tqreplace " with \" and \ with \\ " and \ characters */
TQString rfcDecoder::quoteIMAP(const TQString &src)
{
uint len = src.length();
@@ -311,7 +311,7 @@ rfcDecoder::codecForName (const TQString & _str)
if (_str.isEmpty ())
return NULL;
return TQTextCodec::codecForName (_str.lower ().
- replace ("windows", "cp").latin1 ());
+ tqreplace ("windows", "cp").latin1 ());
}
//-----------------------------------------------------------------------------
diff --git a/kioslaves/imap4/rfcdecoder.h b/kioslaves/imap4/rfcdecoder.h
index 2095b2ed2..50ab948e3 100644
--- a/kioslaves/imap4/rfcdecoder.h
+++ b/kioslaves/imap4/rfcdecoder.h
@@ -44,7 +44,7 @@ public:
/** Convert Unicode path to modified UTF-7 IMAP mailbox
*/
static TQString toIMAP (const TQString & inSrc);
-/** replace " with \" and \ with \\ " and \ characters */
+/** tqreplace " with \" and \ with \\ " and \ characters */
static TQString quoteIMAP (const TQString & src);
/** remove \ from a string
diff --git a/kioslaves/mbox/Makefile.am b/kioslaves/mbox/Makefile.am
index b4840ee72..13e370f44 100644
--- a/kioslaves/mbox/Makefile.am
+++ b/kioslaves/mbox/Makefile.am
@@ -12,7 +12,7 @@ kio_mbox_la_SOURCES = \
readmbox.cc \
stat.cc \
urlinfo.cc
-kio_mbox_la_LIBADD = $(LIB_KIO)
+kio_mbox_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
kio_mbox_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
noinst_HEADERS = \
diff --git a/kioslaves/mbox/readmbox.cc b/kioslaves/mbox/readmbox.cc
index 35b24db45..7cf67e32f 100644
--- a/kioslaves/mbox/readmbox.cc
+++ b/kioslaves/mbox/readmbox.cc
@@ -104,7 +104,7 @@ bool ReadMBox::nextLine()
} else if( m_only_new )
{
if( m_header && m_current_line->left( 7 ) == "Status:" &&
- ! m_current_line->contains( "U" ) && ! m_current_line->contains( "N" ) )
+ ! m_current_line->tqcontains( "U" ) && ! m_current_line->tqcontains( "N" ) )
{
m_status = false;
}
diff --git a/kioslaves/opengroupware/opengroupware.cpp b/kioslaves/opengroupware/opengroupware.cpp
index 55525aff3..ad15b155b 100644
--- a/kioslaves/opengroupware/opengroupware.cpp
+++ b/kioslaves/opengroupware/opengroupware.cpp
@@ -146,8 +146,8 @@ void OpenGroupware::getFreeBusy( const KURL &url )
// FIXME get from server
// FIXME: Read range from configuration or URL parameters.
- TQDate start = TQDate::currentDate().addDays( -3 );
- TQDate end = TQDate::currentDate().addDays( 60 );
+ TQDate start = TQDate::tqcurrentDate().addDays( -3 );
+ TQDate end = TQDate::tqcurrentDate().addDays( 60 );
fb->setDtStart( start );
fb->setDtEnd( end );
diff --git a/kioslaves/sieve/Makefile.am b/kioslaves/sieve/Makefile.am
index 830c8258e..844d3f5c7 100644
--- a/kioslaves/sieve/Makefile.am
+++ b/kioslaves/sieve/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(all_includes)
kde_module_LTLIBRARIES = kio_sieve.la
kio_sieve_la_SOURCES = sieve.cpp
-kio_sieve_la_LIBADD = $(LIB_KIO) $(SASL2_LIBS)
+kio_sieve_la_LIBADD = $(LIB_KIO) $(SASL2_LIBS) $(LIB_QT) $(LIB_KDECORE)
kio_sieve_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = sieve.h
diff --git a/kioslaves/sieve/sieve.cpp b/kioslaves/sieve/sieve.cpp
index bc7811662..6d2f90b8b 100644
--- a/kioslaves/sieve/sieve.cpp
+++ b/kioslaves/sieve/sieve.cpp
@@ -245,14 +245,14 @@ bool kio_sieveProtocol::parseCapabilities(bool requestCapabilities/* = false*/)
ksDebug() << "Looping receive" << endl;
if (r.getType() == kio_sieveResponse::ACTION) {
- if ( r.getAction().contains("ok", false) != -1 ) {
+ if ( r.getAction().tqcontains("ok", false) != -1 ) {
ksDebug() << "Sieve server ready & awaiting authentication." << endl;
break;
} else
ksDebug() << "Unknown action " << r.getAction() << "." << endl;
} else if (r.getKey() == "IMPLEMENTATION") {
- if (r.getVal().contains("sieve", false) != -1) {
+ if (r.getVal().tqcontains("sieve", false) != -1) {
ksDebug() << "Connected to Sieve server: " << r.getVal() << endl;
ret = true;
setMetaData("implementation", r.getVal());
@@ -876,7 +876,7 @@ void kio_sieveProtocol::stat(const KURL& url)
while(receiveData()) {
if (r.getType() == kio_sieveResponse::ACTION) {
- if (r.getAction().contains("OK", false) == 1)
+ if (r.getAction().tqcontains("OK", false) == 1)
// Script list completed
break;
@@ -929,7 +929,7 @@ void kio_sieveProtocol::listDir(const KURL& url)
while(receiveData()) {
if (r.getType() == kio_sieveResponse::ACTION) {
- if (r.getAction().contains("OK", false) == 1)
+ if (r.getAction().tqcontains("OK", false) == 1)
// Script list completed.
break;
@@ -1082,13 +1082,13 @@ bool kio_sieveProtocol::authenticate()
ksDebug() << "Preferred authentication method is " << mechusing << "." << endl;
- TQString firstCommand = "AUTHENTICATE \"" + TQString::fromLatin1( mechusing ) + "\"";
+ TQString firstCommand = "AUTHENTICATE \"" + TQString::tqfromLatin1( mechusing ) + "\"";
tmp.setRawData( out, outlen );
KCodecs::base64Encode( tmp, challenge );
tmp.resetRawData( out, outlen );
if ( !challenge.isEmpty() ) {
firstCommand += " \"";
- firstCommand += TQString::fromLatin1( challenge.data(), challenge.size() );
+ firstCommand += TQString::tqfromLatin1( challenge.data(), challenge.size() );
firstCommand += "\"";
}
@@ -1222,7 +1222,7 @@ bool kio_sieveProtocol::receiveData(bool waitForData, TQCString *reparse)
buffer[SIEVE_DEFAULT_RECIEVE_BUFFER-1] = '\0';
// strip LF/CR
- interpret = TQCString(buffer).left(qstrlen(buffer) - 2);
+ interpret = TQCString(buffer).left(tqstrlen(buffer) - 2);
} else {
interpret = reparse->copy();
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-18 11:40:09 +0000