From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 14 Apr 2011 20:16:30 +0000 Subject: Enable kdepim compilation under Qt4 This will likely break Qt3 compilation temporarily, which is an unintended side effect. A third and final kdepim commit will repair Qt3 compilation shortly. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kioslaves/imap4/imap4.cc | 82 +++++++++++++++++++++--------------------- kioslaves/imap4/imapparser.cc | 4 +-- kioslaves/imap4/imapparser.h | 8 ++--- kioslaves/imap4/mailheader.cc | 10 +++--- kioslaves/imap4/mimehdrline.cc | 4 +-- kioslaves/imap4/mimeheader.cc | 2 +- kioslaves/imap4/mimeio.cc | 2 +- kioslaves/imap4/rfcdecoder.cc | 10 +++--- 8 files changed, 61 insertions(+), 61 deletions(-) (limited to 'kioslaves/imap4') diff --git a/kioslaves/imap4/imap4.cc b/kioslaves/imap4/imap4.cc index 29ab5980a..b04b5b60a 100644 --- a/kioslaves/imap4/imap4.cc +++ b/kioslaves/imap4/imap4.cc @@ -610,9 +610,9 @@ IMAP4Protocol::listDir (const KURL & _url) } if ( !selectInfo.alert().isNull() ) { if ( !myBox.isEmpty() ) { - warning( i18n( "Message from %1 while processing '%2': %3" ).arg( myHost, myBox, selectInfo.alert() ) ); + warning( i18n( "Message from %1 while processing '%2': %3" ).tqarg( myHost, myBox, selectInfo.alert() ) ); } else { - warning( i18n( "Message from %1: %2" ).arg( myHost, selectInfo.alert() ) ); + warning( i18n( "Message from %1: %2" ).tqarg( myHost, TQString(selectInfo.alert()) ) ); } selectInfo.setAlert( 0 ); } @@ -934,7 +934,7 @@ IMAP4Protocol::mkdir (const KURL & _url, int) if ( ask && messageBox(QuestionYesNo, i18n("The following folder will be created on the server: %1 " - "What do you want to store in this folder?").arg( aBox ), + "What do you want to store in this folder?").tqarg( aBox ), i18n("Create Folder"), i18n("&Messages"), i18n("&Subfolders")) == KMessageBox::No ) { @@ -979,7 +979,7 @@ IMAP4Protocol::copy (const KURL & src, const KURL & dest, int, bool overwrite) { KURL testDir = dest; - TQString subDir = dBox.right (dBox.length () - dBox.findRev ('/')); + TQString subDir = dBox.right (dBox.length () - dBox.tqfindRev ('/')); TQString topDir = dBox.left (sub); testDir.setPath ("/" + topDir); dType = @@ -1272,8 +1272,8 @@ IMAP4Protocol::special (const TQByteArray & aData) completeQueue.removeRef (cmd); error(ERR_SLAVE_DEFINED, i18n("Unsubscribe of folder %1 " "failed. The server returned: %2") - .arg(_url.prettyURL()) - .arg(cmd->resultInfo())); + .tqarg(_url.prettyURL()) + .tqarg(cmd->resultInfo())); return; } completeQueue.removeRef (cmd); @@ -1293,8 +1293,8 @@ IMAP4Protocol::special (const TQByteArray & aData) completeQueue.removeRef (cmd); error(ERR_SLAVE_DEFINED, i18n("Subscribe of folder %1 " "failed. The server returned: %2") - .arg(_url.prettyURL()) - .arg(cmd->resultInfo())); + .tqarg(_url.prettyURL()) + .tqarg(cmd->resultInfo())); return; } completeQueue.removeRef (cmd); @@ -1361,7 +1361,7 @@ IMAP4Protocol::special (const TQByteArray & aData) { completeQueue.removeRef (cmd); error(ERR_COULD_NOT_WRITE, i18n("Changing the flags of message %1 " - "failed.").arg(_url.prettyURL())); + "failed.").tqarg(_url.prettyURL())); return; } completeQueue.removeRef (cmd); @@ -1373,7 +1373,7 @@ IMAP4Protocol::special (const TQByteArray & aData) { completeQueue.removeRef (cmd); error(ERR_COULD_NOT_WRITE, i18n("Changing the flags of message %1 " - "failed.").arg(_url.prettyURL())); + "failed.").tqarg(_url.prettyURL())); return; } completeQueue.removeRef (cmd); @@ -1404,7 +1404,7 @@ IMAP4Protocol::special (const TQByteArray & aData) { completeQueue.removeRef (cmd); error(ERR_COULD_NOT_WRITE, i18n("Changing the flags of message %1 " - "failed.").arg(_url.prettyURL())); + "failed.").tqarg(_url.prettyURL())); return; } completeQueue.removeRef (cmd); @@ -1451,9 +1451,9 @@ IMAP4Protocol::specialACLCommand( int command, TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Setting the Access Control List on folder %1 " "for user %2 failed. The server returned: %3") - .arg(_url.prettyURL()) - .arg(user) - .arg(cmd->resultInfo())); + .tqarg(_url.prettyURL()) + .tqarg(user) + .tqarg(cmd->resultInfo())); return; } completeQueue.removeRef (cmd); @@ -1470,9 +1470,9 @@ IMAP4Protocol::specialACLCommand( int command, TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Deleting the Access Control List on folder %1 " "for user %2 failed. The server returned: %3") - .arg(_url.prettyURL()) - .arg(user) - .arg(cmd->resultInfo())); + .tqarg(_url.prettyURL()) + .tqarg(user) + .tqarg(cmd->resultInfo())); return; } completeQueue.removeRef (cmd); @@ -1487,8 +1487,8 @@ IMAP4Protocol::specialACLCommand( int command, TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Retrieving the Access Control List on folder %1 " "failed. The server returned: %2") - .arg(_url.prettyURL()) - .arg(cmd->resultInfo())); + .tqarg(_url.prettyURL()) + .tqarg(cmd->resultInfo())); return; } // Returning information to the application from a special() command isn't easy. @@ -1514,8 +1514,8 @@ IMAP4Protocol::specialACLCommand( int command, TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Retrieving the Access Control List on folder %1 " "failed. The server returned: %2") - .arg(_url.prettyURL()) - .arg(cmd->resultInfo())); + .tqarg(_url.prettyURL()) + .tqarg(cmd->resultInfo())); return; } TQStringList lst = getResults(); @@ -1548,8 +1548,8 @@ IMAP4Protocol::specialSearchCommand( TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Searching of folder %1 " "failed. The server returned: %2") - .arg(aBox) - .arg(cmd->resultInfo())); + .tqarg(aBox) + .tqarg(cmd->resultInfo())); return; } completeQueue.removeRef(cmd); @@ -1582,9 +1582,9 @@ IMAP4Protocol::specialCustomCommand( TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Custom command %1:%2 " "failed. The server returned: %3") - .arg(command) - .arg(arguments) - .arg(cmd->resultInfo())); + .tqarg(command) + .tqarg(arguments) + .tqarg(cmd->resultInfo())); return; } completeQueue.removeRef(cmd); @@ -1665,9 +1665,9 @@ IMAP4Protocol::specialAnnotateMoreCommand( int command, TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Setting the annotation %1 on folder %2 " " failed. The server returned: %3") - .arg(entry) - .arg(_url.prettyURL()) - .arg(cmd->resultInfo())); + .tqarg(entry) + .tqarg(_url.prettyURL()) + .tqarg(cmd->resultInfo())); return; } completeQueue.removeRef (cmd); @@ -1689,9 +1689,9 @@ IMAP4Protocol::specialAnnotateMoreCommand( int command, TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Retrieving the annotation %1 on folder %2 " "failed. The server returned: %3") - .arg(entry) - .arg(_url.prettyURL()) - .arg(cmd->resultInfo())); + .tqarg(entry) + .tqarg(_url.prettyURL()) + .tqarg(cmd->resultInfo())); return; } // Returning information to the application from a special() command isn't easy. @@ -1726,8 +1726,8 @@ IMAP4Protocol::specialQuotaCommand( int command, TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Retrieving the quota root information on folder %1 " "failed. The server returned: %2") - .arg(_url.prettyURL()) - .arg(cmd->resultInfo())); + .tqarg(_url.prettyURL()) + .tqarg(cmd->resultInfo())); return; } infoMessage(getResults().join( "\r" )); @@ -1816,7 +1816,7 @@ IMAP4Protocol::slave_status () { bool connected = (getState() != ISTATE_NO) && isConnectionValid(); kdDebug(7116) << "IMAP4::slave_status " << connected << endl; - slavetqStatus ( connected ? myHost : TQString(), connected ); + slaveStatus ( connected ? myHost : TQString(), connected ); } void @@ -2051,7 +2051,7 @@ bool IMAP4Protocol::makeLogin () { error(ERR_COULD_NOT_LOGIN, i18n("The server %1 supports neither " "IMAP4 nor IMAP4rev1.\nIt identified itself with: %2") - .arg(myHost).arg(greeting)); + .tqarg(myHost).tqarg(greeting)); closeConnection(); return false; } @@ -2102,7 +2102,7 @@ bool IMAP4Protocol::makeLogin () else { if (!hasCapability (TQString ("AUTH=") + myAuth)) { error (ERR_COULD_NOT_LOGIN, i18n("The authentication method %1 is not " - "supported by the server.").arg(myAuth)); + "supported by the server.").tqarg(myAuth)); closeConnection(); return false; } @@ -2144,14 +2144,14 @@ bool IMAP4Protocol::makeLogin () } if (!clientLogin (myUser, myPass, resultInfo)) error(KIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to login. Probably the " - "password is wrong.\nThe server %1 replied:\n%2").arg(myHost).arg(resultInfo)); + "password is wrong.\nThe server %1 replied:\n%2").tqarg(myHost).tqarg(resultInfo)); } else { #ifdef HAVE_LIBSASL2 if (!clientAuthenticate (this, authInfo, myHost, myAuth, mySSL, resultInfo)) error(KIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to authenticate via %1.\n" - "The server %2 replied:\n%3").arg(myAuth).arg(myHost).arg(resultInfo)); + "The server %2 replied:\n%3").tqarg(myAuth).tqarg(myHost).tqarg(resultInfo)); else { myUser = authInfo.username; myPass = authInfo.password; @@ -2574,7 +2574,7 @@ IMAP4Protocol::parseURL (const KURL & _url, TQString & _box, // we try to reconstruct it from the URL if (!_box.isEmpty()) { - int start = _url.path().findRev(_box); + int start = _url.path().tqfindRev(_box); if (start != -1) _hierarchyDelimiter = _url.path().mid(start-1, start); kdDebug(7116) << "IMAP4::parseURL - reconstructed delimiter:" << _hierarchyDelimiter @@ -2701,7 +2701,7 @@ IMAP4Protocol::assureBox (const TQString & aBox, bool readonly) // not allowed to enter this folder error(ERR_ACCESS_DENIED, cmdInfo); } else { - error(ERR_SLAVE_DEFINED, i18n("Unable to open folder %1. The server replied: %2").arg(aBox).arg(cmdInfo)); + error(ERR_SLAVE_DEFINED, i18n("Unable to open folder %1. The server replied: %2").tqarg(aBox).tqarg(cmdInfo)); } } else { error(KIO::ERR_DOES_NOT_EXIST, aBox); diff --git a/kioslaves/imap4/imapparser.cc b/kioslaves/imap4/imapparser.cc index 573665260..aa3916ff3 100644 --- a/kioslaves/imap4/imapparser.cc +++ b/kioslaves/imap4/imapparser.cc @@ -1407,7 +1407,7 @@ void imapParser::parseBody (parseString & inWords) { TQCString references = parseLiteralC(inWords, true); int start = references.tqfind ('<'); - int end = references.findRev ('>'); + int end = references.tqfindRev ('>'); if (start < end) references = references.mid (start, end - start + 1); envelope->setReferences(references.simplifyWhiteSpace()); @@ -1871,7 +1871,7 @@ imapParser::parseURL (const KURL & _url, TQString & _box, TQString & _section, int pt = temp.tqfind ('/'); if (pt > 0) { - if (temp.findRev ('"', pt) == -1 || temp.tqfind('"', pt) == -1) + if (temp.tqfindRev ('"', pt) == -1 || temp.tqfind('"', pt) == -1) { // if we have non-quoted '/' separator we'll just nuke it temp.truncate(pt); diff --git a/kioslaves/imap4/imapparser.h b/kioslaves/imap4/imapparser.h index 0552baf83..260f4b79f 100644 --- a/kioslaves/imap4/imapparser.h +++ b/kioslaves/imap4/imapparser.h @@ -69,23 +69,23 @@ public: void takeLeft(TQCString& dest, uint len) const { dest.resize(len + 1); - qmemmove(dest.data(), data.data() + pos, len); + tqmemmove(dest.data(), data.data() + pos, len); } // Warning: does not check for going past end of "data" void takeLeftNoResize(TQCString& dest, uint len) const { - qmemmove(dest.data(), data.data() + pos, len); + tqmemmove(dest.data(), data.data() + pos, len); } // Warning: does not check for going past end of "data" void takeMid(TQCString& dest, uint start, uint len) const { dest.resize(len + 1); - qmemmove(dest.data(), data.data() + pos + start, len); + tqmemmove(dest.data(), data.data() + pos + start, len); } // Warning: does not check for going past end of "data" void takeMidNoResize(TQCString& dest, uint start, uint len) const { - qmemmove(dest.data(), data.data() + pos + start, len); + tqmemmove(dest.data(), data.data() + pos + start, len); } void clear() { diff --git a/kioslaves/imap4/mailheader.cc b/kioslaves/imap4/mailheader.cc index 285bd325a..76e03ace9 100644 --- a/kioslaves/imap4/mailheader.cc +++ b/kioslaves/imap4/mailheader.cc @@ -37,7 +37,7 @@ mailHeader::addHdrLine (mimeHdrLine * inLine) mimeHdrLine *addLine = new mimeHdrLine (inLine); const TQCString label(addLine->getLabel()); - const TQCString value(addLine->getValue()); + TQCString value(addLine->getValue()); if (!qstricmp (label, "Return-Path")) { returnpathAdr.parseAddress (value.data ()); @@ -76,8 +76,8 @@ mailHeader::addHdrLine (mimeHdrLine * inLine) goto out; } if (!qstricmp (label.data (), "Message-ID")) { - int start = value.findRev ('<'); - int end = value.findRev ('>'); + int start = value.tqfindRev ('<'); + int end = value.tqfindRev ('>'); if (start < end) messageID = value.mid (start, end - start + 1); else { @@ -87,8 +87,8 @@ mailHeader::addHdrLine (mimeHdrLine * inLine) goto out; } if (!qstricmp (label.data (), "In-Reply-To")) { - int start = value.findRev ('<'); - int end = value.findRev ('>'); + int start = value.tqfindRev ('<'); + int end = value.tqfindRev ('>'); if (start < end) inReplyTo = value.mid (start, end - start + 1); goto out; diff --git a/kioslaves/imap4/mimehdrline.cc b/kioslaves/imap4/mimehdrline.cc index 56c9b2d74..4158e59d5 100644 --- a/kioslaves/imap4/mimehdrline.cc +++ b/kioslaves/imap4/mimehdrline.cc @@ -494,9 +494,9 @@ mimeHdrLine::truncateLine(TQCString aLine, unsigned int truncate) validStart += 2; } while (len > truncate) { - cutHere = aLine.findRev(' ', truncate); + cutHere = aLine.tqfindRev(' ', truncate); if (cutHere < 1 || cutHere < validStart) { - cutHere = aLine.findRev('\t', truncate); + cutHere = aLine.tqfindRev('\t', truncate); if (cutHere < 1) { cutHere = aLine.tqfind(' ', 1); if (cutHere < 1) { diff --git a/kioslaves/imap4/mimeheader.cc b/kioslaves/imap4/mimeheader.cc index c14fbb705..d32f7eaca 100644 --- a/kioslaves/imap4/mimeheader.cc +++ b/kioslaves/imap4/mimeheader.cc @@ -84,7 +84,7 @@ mimeHeader::addHdrLine (mimeHdrLine * aHdrLine) else { int skip; - char *aCStr = addLine->getValue ().data (); + const char *aCStr = addLine->getValue ().data (); TQDict < TQString > *aList = 0; skip = mimeHdrLine::parseSeparator (';', aCStr); diff --git a/kioslaves/imap4/mimeio.cc b/kioslaves/imap4/mimeio.cc index 971cd0a9c..9325df130 100644 --- a/kioslaves/imap4/mimeio.cc +++ b/kioslaves/imap4/mimeio.cc @@ -68,7 +68,7 @@ mimeIO::outputMimeLine (const TQCString & inLine) TQCString aLine = inLine; int len = inLine.length(); - int theLF = aLine.findRev ('\n'); + int theLF = aLine.tqfindRev ('\n'); if (theLF == len - 1 && theLF != -1) { //we have a trailing LF, now check for CR diff --git a/kioslaves/imap4/rfcdecoder.cc b/kioslaves/imap4/rfcdecoder.cc index 46500fad0..426911d0e 100644 --- a/kioslaves/imap4/rfcdecoder.cc +++ b/kioslaves/imap4/rfcdecoder.cc @@ -371,7 +371,7 @@ rfcDecoder::decodeRFC2047String (const TQString & _str, TQString & charset, else { charset = TQCString (beg, i - 1); // -2 + 1 for the zero - int pt = charset.findRev('*'); + int pt = charset.tqfindRev('*'); if (pt != -1) { // save language for later usage @@ -634,7 +634,7 @@ rfcDecoder::decodeRFC2231String (const TQString & _str) if (p < 0) return _str; - int l = _str.findRev ('\''); + int l = _str.tqfindRev ('\''); //second is language if (p >= l) @@ -653,13 +653,13 @@ rfcDecoder::decodeRFC2231String (const TQString & _str) { if (st.at (p) == 37) { - ch = st.at (p + 1).latin1 () - 48; + ch = st.tqat (p + 1).latin1 () - 48; if (ch > 16) ch -= 7; - ch2 = st.at (p + 2).latin1 () - 48; + ch2 = st.tqat (p + 2).latin1 () - 48; if (ch2 > 16) ch2 -= 7; - st.at (p) = ch * 16 + ch2; + st.tqat (p) = ch * 16 + ch2; st.remove (p + 1, 2); } p++; -- cgit v1.2.1