From 716a5de8870d7c02bb4d0aed72f30291b17b763a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:59:01 -0600 Subject: Remove additional unneeded tq method conversions --- kioslaves/imap4/imap4.cc | 76 +++++++++++++++++++++---------------------- kioslaves/imap4/imaplist.cc | 4 +-- kioslaves/imap4/imapparser.cc | 4 +-- kioslaves/imap4/imapparser.h | 2 +- kioslaves/imap4/rfcdecoder.cc | 6 ++-- kioslaves/mbox/readmbox.cc | 2 +- kioslaves/mbox/stat.cc | 4 +-- kioslaves/sieve/sieve.cpp | 16 ++++----- 8 files changed, 57 insertions(+), 57 deletions(-) (limited to 'kioslaves') diff --git a/kioslaves/imap4/imap4.cc b/kioslaves/imap4/imap4.cc index 627f5eea6..8e15274f2 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" ).tqarg( myHost, myBox, selectInfo.alert() ) ); + warning( i18n( "Message from %1 while processing '%2': %3" ).arg( myHost, myBox, selectInfo.alert() ) ); } else { - warning( i18n( "Message from %1: %2" ).tqarg( myHost, TQString(selectInfo.alert()) ) ); + warning( i18n( "Message from %1: %2" ).arg( 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?").tqarg( aBox ), + "What do you want to store in this folder?").arg( 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") - .tqarg(_url.prettyURL()) - .tqarg(cmd->resultInfo())); + .arg(_url.prettyURL()) + .arg(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") - .tqarg(_url.prettyURL()) - .tqarg(cmd->resultInfo())); + .arg(_url.prettyURL()) + .arg(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.").tqarg(_url.prettyURL())); + "failed.").arg(_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.").tqarg(_url.prettyURL())); + "failed.").arg(_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.").tqarg(_url.prettyURL())); + "failed.").arg(_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") - .tqarg(_url.prettyURL()) - .tqarg(user) - .tqarg(cmd->resultInfo())); + .arg(_url.prettyURL()) + .arg(user) + .arg(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") - .tqarg(_url.prettyURL()) - .tqarg(user) - .tqarg(cmd->resultInfo())); + .arg(_url.prettyURL()) + .arg(user) + .arg(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") - .tqarg(_url.prettyURL()) - .tqarg(cmd->resultInfo())); + .arg(_url.prettyURL()) + .arg(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") - .tqarg(_url.prettyURL()) - .tqarg(cmd->resultInfo())); + .arg(_url.prettyURL()) + .arg(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") - .tqarg(aBox) - .tqarg(cmd->resultInfo())); + .arg(aBox) + .arg(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") - .tqarg(command) - .tqarg(arguments) - .tqarg(cmd->resultInfo())); + .arg(command) + .arg(arguments) + .arg(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") - .tqarg(entry) - .tqarg(_url.prettyURL()) - .tqarg(cmd->resultInfo())); + .arg(entry) + .arg(_url.prettyURL()) + .arg(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") - .tqarg(entry) - .tqarg(_url.prettyURL()) - .tqarg(cmd->resultInfo())); + .arg(entry) + .arg(_url.prettyURL()) + .arg(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") - .tqarg(_url.prettyURL()) - .tqarg(cmd->resultInfo())); + .arg(_url.prettyURL()) + .arg(cmd->resultInfo())); return; } infoMessage(getResults().join( "\r" )); @@ -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") - .tqarg(myHost).tqarg(greeting)); + .arg(myHost).arg(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.").tqarg(myAuth)); + "supported by the server.").arg(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").tqarg(myHost).tqarg(resultInfo)); + "password is wrong.\nThe server %1 replied:\n%2").arg(myHost).arg(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").tqarg(myAuth).tqarg(myHost).tqarg(resultInfo)); + "The server %2 replied:\n%3").arg(myAuth).arg(myHost).arg(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").tqarg(aBox).tqarg(cmdInfo)); + error(ERR_SLAVE_DEFINED, i18n("Unable to open folder %1. The server replied: %2").arg(aBox).arg(cmdInfo)); } } else { error(KIO::ERR_DOES_NOT_EXIST, aBox); diff --git a/kioslaves/imap4/imaplist.cc b/kioslaves/imap4/imaplist.cc index 13309089e..92918d8c1 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 ("\\hastqchildren")) + else if (-1 != attribute.find ("\\haschildren")) hasChildren_ = true; - else if (-1 != attribute.find ("\\hasnotqchildren")) + else if (-1 != attribute.find ("\\hasnochildren")) 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..674068628 100644 --- a/kioslaves/imap4/imapparser.cc +++ b/kioslaves/imap4/imapparser.cc @@ -443,7 +443,7 @@ imapParser::parseUntagged (parseString & result) } else if (tqstrncmp(what, "STATUS", what.size()) == 0) { - parseStatus (result); + parsetStatus (result); } break; @@ -845,7 +845,7 @@ void imapParser::parseSearch (parseString & result) } } -void imapParser::parseStatus (parseString & inWords) +void imapParser::parsetStatus (parseString & inWords) { lasStatus = imapInfo (); diff --git a/kioslaves/imap4/imapparser.h b/kioslaves/imap4/imapparser.h index 01eabd5ec..2cf9b3935 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 parsetStatus (parseString & result); /** @brief parse a EXISTS line */ void parseExists (ulong value, parseString & result); /** @brief parse a EXPUNGE line */ diff --git a/kioslaves/imap4/rfcdecoder.cc b/kioslaves/imap4/rfcdecoder.cc index 4eeb207d5..f91e9f8dc 100644 --- a/kioslaves/imap4/rfcdecoder.cc +++ b/kioslaves/imap4/rfcdecoder.cc @@ -653,13 +653,13 @@ rfcDecoder::decodeRFC2231String (const TQString & _str) { if (st.at (p) == 37) { - ch = st.tqat (p + 1).latin1 () - 48; + ch = st.at (p + 1).latin1 () - 48; if (ch > 16) ch -= 7; - ch2 = st.tqat (p + 2).latin1 () - 48; + ch2 = st.at (p + 2).latin1 () - 48; if (ch2 > 16) ch2 -= 7; - st.tqat (p) = ch * 16 + ch2; + st.at (p) = ch * 16 + ch2; st.remove (p + 1, 2); } p++; diff --git a/kioslaves/mbox/readmbox.cc b/kioslaves/mbox/readmbox.cc index f2af8716b..280bb4615 100644 --- a/kioslaves/mbox/readmbox.cc +++ b/kioslaves/mbox/readmbox.cc @@ -145,7 +145,7 @@ void ReadMBox::rewind() if( !m_stream ) return; //Rewinding not possible - m_stream->tqdevice()->reset(); + m_stream->device()->reset(); m_atend = m_stream->atEnd(); } diff --git a/kioslaves/mbox/stat.cc b/kioslaves/mbox/stat.cc index 6d5bf75a6..00285b149 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" ).tqarg( info.filename(), mbox.currentID() ); + url = TQString( "mbox:%1/%2" ).arg( 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" ).tqarg( info.url() ); + TQString url = TQString( "mbox:%1" ).arg( info.url() ); //Specific things for a message Stat::addAtom( entry, KIO::UDS_FILE_TYPE, S_IFREG ); diff --git a/kioslaves/sieve/sieve.cpp b/kioslaves/sieve/sieve.cpp index 1cec79c52..4e7e75d30 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...").tqarg( m_sServer)); + infoMessage(i18n("Connecting to %1...").arg( m_sServer)); if (m_connMode == CONNECTION_ORIENTED && m_shouldBeConnected) { error(ERR_CONNECTION_BROKEN, i18n("The connection to the server was lost.")); @@ -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") - .tqarg(r.getAction().right(r.getAction().length() - 3))); + .arg(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").tqarg(TQString(errmsg))); + "The server responded:\n%1").arg(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").tqarg(TQString(r.getKey()))); + "The server responded:\n%1").arg(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").tqarg( \ +#define SASLERROR error(ERR_COULD_NOT_AUTHENTICATE, i18n("An error occurred during authentication: %1").arg( \ TQString::fromUtf8( sasl_errdetail( conn ) ))); bool kio_sieveProtocol::authenticate() @@ -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.").tqarg(mechusing)); + "Choose a different authentication method to %1.").arg(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.").tqarg(mechusing)); + "Choose a different authentication method to %1.").arg(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").tqarg( TQString(r.getAction()) ) ); + error(ERR_COULD_NOT_AUTHENTICATE, i18n("Authentication failed.\nMost likely the password is wrong.\nThe server responded:\n%1").arg( TQString(r.getAction()) ) ); return false; } } -- cgit v1.2.1