From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:50 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12. --- kioslaves/imap4/imap4.cc | 94 +++++++++++++++---------------- kioslaves/imap4/imapcommand.cc | 2 +- kioslaves/imap4/imapcommand.h | 2 +- kioslaves/imap4/imaplist.cc | 4 +- kioslaves/imap4/imapparser.cc | 18 +++--- kioslaves/imap4/imapparser.h | 8 +-- kioslaves/imap4/mailheader.h | 4 +- kioslaves/imap4/mimeheader.cc | 2 +- kioslaves/imap4/rfcdecoder.cc | 8 +-- kioslaves/mbox/readmbox.cc | 4 +- kioslaves/mbox/stat.cc | 4 +- kioslaves/opengroupware/opengroupware.cpp | 4 +- kioslaves/sieve/sieve.cpp | 22 ++++---- 13 files changed, 88 insertions(+), 88 deletions(-) (limited to 'kioslaves') diff --git a/kioslaves/imap4/imap4.cc b/kioslaves/imap4/imap4.cc index 8e15274f2..6671981eb 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, TQString(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 ) { @@ -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" )); @@ -1863,7 +1863,7 @@ IMAP4Protocol::stat (const KURL & _url) ok = true; else { - imapCommand *cmd = doCommand(imapCommand::clienStatus(aBox, aSection)); + imapCommand *cmd = doCommand(imapCommand::clientqStatus(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" && geStatus().uidNextAvailable()) - || (aSection == "UNSEEN" && geStatus().unseenAvailable())) + if ((aSection == "UIDNEXT" && getqStatus().uidNextAvailable()) + || (aSection == "UNSEEN" && getqStatus().unseenAvailable())) { atom.m_uds = UDS_SIZE; atom.m_str = TQString(); - atom.m_long = (aSection == "UIDNEXT") ? geStatus().uidNext() - : geStatus().unseen(); + atom.m_long = (aSection == "UIDNEXT") ? getqStatus().uidNext() + : getqStatus().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::clienStatus (aBox, "UIDVALIDITY")); + doCommand (imapCommand::clientqStatus (aBox, "UIDVALIDITY")); completeQueue.removeRef (cmd); - validity = geStatus ().uidValidity (); + validity = getqStatus ().uidValidity (); } validity = 0; // temporary @@ -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; @@ -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); @@ -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/imapcommand.cc b/kioslaves/imap4/imapcommand.cc index 4b9faadf4..65a9227d0 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::clienStatus (const TQString & path, const TQString & parameters) +imapCommand::clientqStatus (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 9e2834424..9ddb3f252 100644 --- a/kioslaves/imap4/imapcommand.h +++ b/kioslaves/imap4/imapcommand.h @@ -212,7 +212,7 @@ public: * @param parameters * @return a STATUS imapCommand */ - static imapCommand *clienStatus (const TQString & path, + static imapCommand *clientqStatus (const TQString & path, const TQString & parameters); /** * @brief Create a COPY command diff --git a/kioslaves/imap4/imaplist.cc b/kioslaves/imap4/imaplist.cc index 92918d8c1..13309089e 100644 --- a/kioslaves/imap4/imaplist.cc +++ b/kioslaves/imap4/imaplist.cc @@ -124,9 +124,9 @@ void imapList::parseAttributes( parseString & str ) marked_ = true; else if (-1 != attribute.find ("\\unmarked")) unmarked_ = true; - else if (-1 != attribute.find ("\\haschildren")) + else if (-1 != attribute.find ("\\hastqchildren")) hasChildren_ = true; - else if (-1 != attribute.find ("\\hasnochildren")) + else if (-1 != attribute.find ("\\hasnotqchildren")) hasNoChildren_ = true; else kdDebug(7116) << "imapList::imapList: bogus attribute " << attribute << endl; diff --git a/kioslaves/imap4/imapparser.cc b/kioslaves/imap4/imapparser.cc index 328c0e566..4b8086ffc 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())); @@ -443,7 +443,7 @@ imapParser::parseUntagged (parseString & result) } else if (tqstrncmp(what, "STATUS", what.size()) == 0) { - parseStatus (result); + parsetqStatus (result); } break; @@ -845,9 +845,9 @@ void imapParser::parseSearch (parseString & result) } } -void imapParser::parseStatus (parseString & inWords) +void imapParser::parsetqStatus (parseString & inWords) { - lasStatus = imapInfo (); + lastqStatus = 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") - lasStatus.setCount (value); + lastqStatus.setCount (value); else if (label == "RECENT") - lasStatus.setRecent (value); + lastqStatus.setRecent (value); else if (label == "UIDVALIDITY") - lasStatus.setUidValidity (value); + lastqStatus.setUidValidity (value); else if (label == "UNSEEN") - lasStatus.setUnseen (value); + lastqStatus.setUnseen (value); else if (label == "UIDNEXT") - lasStatus.setUidNext (value); + lastqStatus.setUidNext (value); } } diff --git a/kioslaves/imap4/imapparser.h b/kioslaves/imap4/imapparser.h index 01eabd5ec..9902534c3 100644 --- a/kioslaves/imap4/imapparser.h +++ b/kioslaves/imap4/imapparser.h @@ -279,7 +279,7 @@ public: /** @brief parse a SEARCH line */ void parseSearch (parseString & result); /** @brief parse a STATUS line */ - void parseStatus (parseString & result); + void parsetqStatus (parseString & result); /** @brief parse a EXISTS line */ void parseExists (ulong value, parseString & result); /** @brief parse a EXPUNGE line */ @@ -404,9 +404,9 @@ public: }; /** @brief return the last status code */ - const imapInfo & geStatus () + const imapInfo & getqStatus () { - return lasStatus; + return lastqStatus; }; /** return the select info */ const imapInfo & getSelected () @@ -450,7 +450,7 @@ protected: imapInfo selectInfo; /** @brief the results from the last status command */ - imapInfo lasStatus; + imapInfo lastqStatus; /** @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/mimeheader.cc b/kioslaves/imap4/mimeheader.cc index 39af2c397..048eba7a5 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 ()); } TQByteArray diff --git a/kioslaves/imap4/rfcdecoder.cc b/kioslaves/imap4/rfcdecoder.cc index 88cbe2abd..4eeb207d5 100644 --- a/kioslaves/imap4/rfcdecoder.cc +++ b/kioslaves/imap4/rfcdecoder.cc @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include @@ -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++; diff --git a/kioslaves/mbox/readmbox.cc b/kioslaves/mbox/readmbox.cc index f762bf3ed..f2af8716b 100644 --- a/kioslaves/mbox/readmbox.cc +++ b/kioslaves/mbox/readmbox.cc @@ -29,7 +29,7 @@ #include #include #include -#include +#include #ifdef HAVE_SYS_TYPES_H #include @@ -145,7 +145,7 @@ void ReadMBox::rewind() if( !m_stream ) return; //Rewinding not possible - m_stream->device()->reset(); + m_stream->tqdevice()->reset(); m_atend = m_stream->atEnd(); } diff --git a/kioslaves/mbox/stat.cc b/kioslaves/mbox/stat.cc index 00285b149..6d5bf75a6 100644 --- a/kioslaves/mbox/stat.cc +++ b/kioslaves/mbox/stat.cc @@ -50,7 +50,7 @@ KIO::UDSEntry Stat::stat( ReadMBox& mbox, const UrlInfo& info ) Stat::addAtom( entry, KIO::UDS_FILE_TYPE, S_IFREG ); Stat::addAtom( entry, KIO::UDS_MIME_TYPE, "message/rfc822" ); - url = TQString( "mbox:%1/%2" ).arg( info.filename(), mbox.currentID() ); + url = TQString( "mbox:%1/%2" ).tqarg( info.filename(), mbox.currentID() ); Stat::addAtom( entry, KIO::UDS_URL, url ); if( mbox.currentID().isEmpty() ) Stat::addAtom( entry, KIO::UDS_NAME, "foobar" ); @@ -79,7 +79,7 @@ KIO::UDSEntry Stat::statMessage( const UrlInfo& info ) { kdDebug() << "statMessage( " << info.url() << " )" << endl; KIO::UDSEntry entry; - TQString url = TQString( "mbox:%1" ).arg( info.url() ); + TQString url = TQString( "mbox:%1" ).tqarg( info.url() ); //Specific things for a message Stat::addAtom( entry, KIO::UDS_FILE_TYPE, S_IFREG ); diff --git a/kioslaves/opengroupware/opengroupware.cpp b/kioslaves/opengroupware/opengroupware.cpp index 0b1a8a557..0032e4440 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/sieve.cpp b/kioslaves/sieve/sieve.cpp index 4e7e75d30..0b547fd0a 100644 --- a/kioslaves/sieve/sieve.cpp +++ b/kioslaves/sieve/sieve.cpp @@ -340,7 +340,7 @@ bool kio_sieveProtocol::connect(bool useTLSIfAvailable) if (isConnectionValid()) return true; - infoMessage(i18n("Connecting to %1...").arg( m_sServer)); + infoMessage(i18n("Connecting to %1...").tqarg( m_sServer)); if (m_connMode == CONNECTION_ORIENTED && m_shouldBeConnected) { error(ERR_CONNECTION_BROKEN, i18n("The connection to the server was lost.")); @@ -453,7 +453,7 @@ void kio_sieveProtocol::disconnect(bool forcibly) /* ---------------------------------------------------------------------------------- */ /*void kio_sieveProtocol::slave_status() { - slaveStatus(isConnectionValid() ? m_sServer : "", isConnectionValid()); + slavetqStatus(isConnectionValid() ? m_sServer : "", isConnectionValid()); finished(); }*/ @@ -626,7 +626,7 @@ void kio_sieveProtocol::put(const KURL& url, int /*permissions*/, bool /*overwri error(ERR_UNSUPPORTED_PROTOCOL, i18n("A protocol error occurred " "while trying to negotiate script uploading.\n" "The server responded:\n%1") - .arg(r.getAction().right(r.getAction().length() - 3))); + .tqarg(r.getAction().right(r.getAction().length() - 3))); return; } }*/ @@ -672,7 +672,7 @@ void kio_sieveProtocol::put(const KURL& url, int /*permissions*/, bool /*overwri error(ERR_INTERNAL_SERVER, i18n("The script did not upload successfully.\n" "This is probably due to errors in the script.\n" - "The server responded:\n%1").arg(TQString(errmsg))); + "The server responded:\n%1").tqarg(TQString(errmsg))); // clear the rest of the incoming data receiveData(); @@ -680,7 +680,7 @@ void kio_sieveProtocol::put(const KURL& url, int /*permissions*/, bool /*overwri error(ERR_INTERNAL_SERVER, i18n("The script did not upload successfully.\n" "This is probably due to errors in the script.\n" - "The server responded:\n%1").arg(TQString(r.getKey()))); + "The server responded:\n%1").tqarg(TQString(r.getKey()))); } else error(ERR_INTERNAL_SERVER, i18n("The script did not upload successfully.\n" @@ -1016,7 +1016,7 @@ bool kio_sieveProtocol::saslInteract( void *in, AuthInfo &ai ) return true; } -#define SASLERROR error(ERR_COULD_NOT_AUTHENTICATE, i18n("An error occurred during authentication: %1").arg( \ +#define SASLERROR error(ERR_COULD_NOT_AUTHENTICATE, i18n("An error occurred during authentication: %1").tqarg( \ TQString::fromUtf8( sasl_errdetail( conn ) ))); bool kio_sieveProtocol::authenticate() @@ -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 += "\""; } @@ -1109,7 +1109,7 @@ bool kio_sieveProtocol::authenticate() sasl_dispose( &conn ); error(ERR_SLAVE_DEFINED, i18n("A protocol error occurred during authentication.\n" - "Choose a different authentication method to %1.").arg(mechusing)); + "Choose a different authentication method to %1.").tqarg(mechusing)); return false; } @@ -1121,7 +1121,7 @@ bool kio_sieveProtocol::authenticate() sasl_dispose( &conn ); error(ERR_UNSUPPORTED_PROTOCOL, i18n("A protocol error occurred during authentication.\n" - "Choose a different authentication method to %1.").arg(mechusing)); + "Choose a different authentication method to %1.").tqarg(mechusing)); return false; } @@ -1168,7 +1168,7 @@ bool kio_sieveProtocol::authenticate() return true; } else { // Authentication failed. - error(ERR_COULD_NOT_AUTHENTICATE, i18n("Authentication failed.\nMost likely the password is wrong.\nThe server responded:\n%1").arg( TQString(r.getAction()) ) ); + error(ERR_COULD_NOT_AUTHENTICATE, i18n("Authentication failed.\nMost likely the password is wrong.\nThe server responded:\n%1").tqarg( TQString(r.getAction()) ) ); return false; } } -- cgit v1.2.1