diff options
Diffstat (limited to 'kopete/protocols/yahoo/libkyahoo/logintask.cpp')
| -rw-r--r-- | kopete/protocols/yahoo/libkyahoo/logintask.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.cpp b/kopete/protocols/yahoo/libkyahoo/logintask.cpp index 3c3127b2..439b39f7 100644 --- a/kopete/protocols/yahoo/libkyahoo/logintask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/logintask.cpp @@ -37,7 +37,7 @@ extern "C" #include "libyahoo.h" } -LoginTask::LoginTask(Task* parent) : Task(parent) +LoginTask::LoginTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; mState = InitialState; @@ -209,10 +209,10 @@ void LoginTask::sendAuthSixteenStage1(const TQString& sn, const TQString& seed) { const TQString YahooTokenUrl = "https://login.yahoo.com/config/pwtoken_get?src=ymsgr&ts=&login=%1&passwd=%2&chal=%3"; kdDebug(YAHOO_RAW_DEBUG) << "seed:" << seed << endl; - m_stage1Data= TQString::null; + m_stage1Data= TQString(); /* construct a URL from the seed and request tokens */ TQByteArray encodedUrl; - TQString fullUrl = YahooTokenUrl.arg(sn, client()->password(), seed); + TQString fullUrl = YahooTokenUrl.tqarg(sn, client()->password(), seed); KURL tokenUrl(fullUrl); KIO::Job* job = KIO::get(tokenUrl, true, false); connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), @@ -291,8 +291,8 @@ void LoginTask::sendAuthSixteenStage2(const TQString& token) { const TQString YahooLoginUrl = "https://login.yahoo.com/config/pwtoken_login?src=ymsgr&ts=&token=%1"; kdDebug(YAHOO_RAW_DEBUG) << "token:" << token << endl; - m_stage2Data = TQString::null; - TQString fullUrl = YahooLoginUrl.arg(token); + m_stage2Data = TQString(); + TQString fullUrl = YahooLoginUrl.tqarg(token); KURL loginUrl(fullUrl); KIO::Job* job = KIO::get(loginUrl, true, false); connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), @@ -353,15 +353,15 @@ void LoginTask::sendAuthSixteenStage3(const TQString& cryptString) { kdDebug(YAHOO_RAW_DEBUG) << " with crypt string" << cryptString << endl; - //TQByteArray cryptStringHash = QCryptographicHash::hash( cryptString.toAscii(), - // QCryptographicHash::Md5 ); + //TQByteArray cryptStringHash = TQCryptographicHash::hash( cryptString.toAscii(), + // TQCryptographicHash::Md5 ); //cryptStringHash = cryptStringHash.toBase64(); TQString cryptStringHash = KMD5( cryptString.ascii() ).base64Digest(); - cryptStringHash = cryptStringHash.replace('+', '.'); - cryptStringHash = cryptStringHash.replace('/', '_'); - cryptStringHash = cryptStringHash.replace('=', '-'); + cryptStringHash = cryptStringHash.tqreplace('+', '.'); + cryptStringHash = cryptStringHash.tqreplace('/', '_'); + cryptStringHash = cryptStringHash.tqreplace('=', '-'); YMSGTransfer *t = new YMSGTransfer(Yahoo::ServiceAuthResp, m_stateOnConnect); t->setId( m_sessionID ); @@ -404,7 +404,7 @@ void LoginTask::handleAuthResp(YMSGTransfer *t) mState = InitialState; } -void LoginTask::setStateOnConnect( Yahoo::Status status ) +void LoginTask::setStateOnConnect( Yahoo::tqStatus status ) { m_stateOnConnect = status; } |