From 0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:34:45 -0600 Subject: Rename old tq methods that no longer need a unique name --- kioslaves/imap4/imap4.cc | 18 +++++++++--------- kioslaves/imap4/imapcommand.cc | 2 +- kioslaves/imap4/imapcommand.h | 2 +- kioslaves/imap4/imapparser.cc | 18 +++++++++--------- kioslaves/imap4/imapparser.h | 8 ++++---- kioslaves/imap4/mimeheader.cc | 2 +- kioslaves/opengroupware/opengroupware.cpp | 4 ++-- kioslaves/sieve/sieve.cpp | 6 +++--- 8 files changed, 30 insertions(+), 30 deletions(-) (limited to 'kioslaves') diff --git a/kioslaves/imap4/imap4.cc b/kioslaves/imap4/imap4.cc index 6671981e..627f5eea 100644 --- a/kioslaves/imap4/imap4.cc +++ b/kioslaves/imap4/imap4.cc @@ -1863,7 +1863,7 @@ IMAP4Protocol::stat (const KURL & _url) ok = true; else { - imapCommand *cmd = doCommand(imapCommand::clientqStatus(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" && getqStatus().uidNextAvailable()) - || (aSection == "UNSEEN" && getqStatus().unseenAvailable())) + if ((aSection == "UIDNEXT" && geStatus().uidNextAvailable()) + || (aSection == "UNSEEN" && geStatus().unseenAvailable())) { atom.m_uds = UDS_SIZE; atom.m_str = TQString(); - atom.m_long = (aSection == "UIDNEXT") ? getqStatus().uidNext() - : getqStatus().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::clientqStatus (aBox, "UIDVALIDITY")); + doCommand (imapCommand::clienStatus (aBox, "UIDVALIDITY")); completeQueue.removeRef (cmd); - validity = getqStatus ().uidValidity (); + validity = geStatus ().uidValidity (); } validity = 0; // temporary @@ -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::tqcurrentDateTime() ) > 10 ) { + if ( mTimeOfLastNoop.secsTo( TQDateTime::currentDateTime() ) > 10 ) { cmd = doCommand (imapCommand::clientNoop ()); completeQueue.removeRef (cmd); - mTimeOfLastNoop = TQDateTime::tqcurrentDateTime(); + mTimeOfLastNoop = TQDateTime::currentDateTime(); kdDebug(7116) << "IMAP4Protocol::assureBox - noop timer fired" << endl; } } diff --git a/kioslaves/imap4/imapcommand.cc b/kioslaves/imap4/imapcommand.cc index 65a9227d..4b9faadf 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::clientqStatus (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 9ddb3f25..9e283442 100644 --- a/kioslaves/imap4/imapcommand.h +++ b/kioslaves/imap4/imapcommand.h @@ -212,7 +212,7 @@ public: * @param parameters * @return a STATUS imapCommand */ - static imapCommand *clientqStatus (const TQString & path, + static imapCommand *clienStatus (const TQString & path, const TQString & parameters); /** * @brief Create a COPY command diff --git a/kioslaves/imap4/imapparser.cc b/kioslaves/imap4/imapparser.cc index 4b8086ff..328c0e56 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::tqfromLatin1( challenge.data(), challenge.size() ); + firstCommand += TQString::fromLatin1( 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) { - parsetqStatus (result); + parseStatus (result); } break; @@ -845,9 +845,9 @@ void imapParser::parseSearch (parseString & result) } } -void imapParser::parsetqStatus (parseString & inWords) +void imapParser::parseStatus (parseString & inWords) { - lastqStatus = imapInfo (); + lasStatus = imapInfo (); parseLiteralC(inWords); // swallow the box if (inWords.isEmpty() || inWords[0] != '(') @@ -864,15 +864,15 @@ void imapParser::parsetqStatus (parseString & inWords) if (parseOneNumber (inWords, value)) { if (label == "MESSAGES") - lastqStatus.setCount (value); + lasStatus.setCount (value); else if (label == "RECENT") - lastqStatus.setRecent (value); + lasStatus.setRecent (value); else if (label == "UIDVALIDITY") - lastqStatus.setUidValidity (value); + lasStatus.setUidValidity (value); else if (label == "UNSEEN") - lastqStatus.setUnseen (value); + lasStatus.setUnseen (value); else if (label == "UIDNEXT") - lastqStatus.setUidNext (value); + lasStatus.setUidNext (value); } } diff --git a/kioslaves/imap4/imapparser.h b/kioslaves/imap4/imapparser.h index 9902534c..01eabd5e 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 parsetqStatus (parseString & result); + void parseStatus (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 & getqStatus () + const imapInfo & geStatus () { - return lastqStatus; + 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 lastqStatus; + imapInfo lasStatus; /** @brief the results from the capabilities, split at ' ' */ TQStringList imapCapabilities; diff --git a/kioslaves/imap4/mimeheader.cc b/kioslaves/imap4/mimeheader.cc index 048eba7a..39af2c39 100644 --- a/kioslaves/imap4/mimeheader.cc +++ b/kioslaves/imap4/mimeheader.cc @@ -650,7 +650,7 @@ mimeHeader::bodyDecoded () TQByteArray temp; temp = bodyDecodedBinary (); - return TQString::tqfromLatin1 (temp.data (), temp.count ()); + return TQString::fromLatin1 (temp.data (), temp.count ()); } TQByteArray diff --git a/kioslaves/opengroupware/opengroupware.cpp b/kioslaves/opengroupware/opengroupware.cpp index 0032e444..0b1a8a55 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::tqcurrentDate().addDays( -3 ); - TQDate end = TQDate::tqcurrentDate().addDays( 60 ); + TQDate start = TQDate::currentDate().addDays( -3 ); + TQDate end = TQDate::currentDate().addDays( 60 ); fb->setDtStart( start ); fb->setDtEnd( end ); diff --git a/kioslaves/sieve/sieve.cpp b/kioslaves/sieve/sieve.cpp index 0b547fd0..1cec79c5 100644 --- a/kioslaves/sieve/sieve.cpp +++ b/kioslaves/sieve/sieve.cpp @@ -453,7 +453,7 @@ void kio_sieveProtocol::disconnect(bool forcibly) /* ---------------------------------------------------------------------------------- */ /*void kio_sieveProtocol::slave_status() { - slavetqStatus(isConnectionValid() ? m_sServer : "", isConnectionValid()); + slaveStatus(isConnectionValid() ? m_sServer : "", isConnectionValid()); finished(); }*/ @@ -1082,13 +1082,13 @@ bool kio_sieveProtocol::authenticate() ksDebug() << "Preferred authentication method is " << mechusing << "." << endl; - TQString firstCommand = "AUTHENTICATE \"" + TQString::tqfromLatin1( mechusing ) + "\""; + TQString firstCommand = "AUTHENTICATE \"" + TQString::fromLatin1( mechusing ) + "\""; tmp.setRawData( out, outlen ); KCodecs::base64Encode( tmp, challenge ); tmp.resetRawData( out, outlen ); if ( !challenge.isEmpty() ) { firstCommand += " \""; - firstCommand += TQString::tqfromLatin1( challenge.data(), challenge.size() ); + firstCommand += TQString::fromLatin1( challenge.data(), challenge.size() ); firstCommand += "\""; } -- cgit v1.2.3