summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/yahoo
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:36:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:36:20 -0600
commitf21aaec952493cb5688c73de6e82a569ddbd7fb2 (patch)
tree78ccb5117063da3e08e3277e11054b912a9f2ae7 /kopete/protocols/yahoo
parentc48e769eb275917717e2b55eb869f7e559293ac8 (diff)
downloadtdenetwork-f21aaec952493cb5688c73de6e82a569ddbd7fb2.tar.gz
tdenetwork-f21aaec952493cb5688c73de6e82a569ddbd7fb2.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kopete/protocols/yahoo')
-rw-r--r--kopete/protocols/yahoo/libkyahoo/client.cpp2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/logintask.cpp28
-rw-r--r--kopete/protocols/yahoo/libkyahoo/logintask.h10
-rw-r--r--kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp4
-rw-r--r--kopete/protocols/yahoo/libkyahoo/modifyyabtask.h4
-rw-r--r--kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp26
-rw-r--r--kopete/protocols/yahoo/libkyahoo/receivefiletask.h10
-rw-r--r--kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp6
-rw-r--r--kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp4
-rw-r--r--kopete/protocols/yahoo/libkyahoo/sendpicturetask.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/webcamtask.cpp4
-rw-r--r--kopete/protocols/yahoo/libkyahoo/yabtask.cpp10
-rw-r--r--kopete/protocols/yahoo/libkyahoo/yabtask.h8
-rw-r--r--kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp16
-rw-r--r--kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h8
-rw-r--r--kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp26
-rw-r--r--kopete/protocols/yahoo/libkyahoo/yahoochattask.h10
-rw-r--r--kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp4
-rw-r--r--kopete/protocols/yahoo/yahooaccount.cpp8
-rw-r--r--kopete/protocols/yahoo/yahooaccount.h4
-rw-r--r--kopete/protocols/yahoo/yahooverifyaccount.cpp10
-rw-r--r--kopete/protocols/yahoo/yahooverifyaccount.h4
23 files changed, 105 insertions, 105 deletions
diff --git a/kopete/protocols/yahoo/libkyahoo/client.cpp b/kopete/protocols/yahoo/libkyahoo/client.cpp
index d293f646..2a5967f8 100644
--- a/kopete/protocols/yahoo/libkyahoo/client.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/client.cpp
@@ -231,7 +231,7 @@ void Client::streamError( int error )
if( error == ClientStream::ErrConnection && m_connector ) // Ask Connector in this case
{
d->error = m_connector->errorCode();
- d->errorString = KSocketBase::errorString( (KSocketBase::SocketError)d->error );
+ d->errorString = TDESocketBase::errorString( (TDESocketBase::SocketError)d->error );
}
else if( d->stream )
{
diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.cpp b/kopete/protocols/yahoo/libkyahoo/logintask.cpp
index f6b8a47e..b3c3f297 100644
--- a/kopete/protocols/yahoo/libkyahoo/logintask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/logintask.cpp
@@ -214,20 +214,20 @@ void LoginTask::sendAuthSixteenStage1(const TQString& sn, const TQString& seed)
TQByteArray encodedUrl;
TQString fullUrl = YahooTokenUrl.arg(sn, client()->password(), seed);
KURL tokenUrl(fullUrl);
- KIO::Job* job = KIO::get(tokenUrl, true, false);
- connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
- this, TQT_SLOT(handleAuthSixteenStage1Data(KIO::Job*, const TQByteArray&)));
- connect(job, TQT_SIGNAL(result(KIO::Job*)),
- this, TQT_SLOT(handleAuthSixteenStage1Result(KIO::Job*)));
+ TDEIO::Job* job = TDEIO::get(tokenUrl, true, false);
+ connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+ this, TQT_SLOT(handleAuthSixteenStage1Data(TDEIO::Job*, const TQByteArray&)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job*)),
+ this, TQT_SLOT(handleAuthSixteenStage1Result(TDEIO::Job*)));
}
-void LoginTask::handleAuthSixteenStage1Data(KIO::Job* job, const TQByteArray& data)
+void LoginTask::handleAuthSixteenStage1Data(TDEIO::Job* job, const TQByteArray& data)
{
kdDebug(YAHOO_RAW_DEBUG) << "data:" << data << endl;
m_stage1Data.append(data);
}
-void LoginTask::handleAuthSixteenStage1Result(KIO::Job* job)
+void LoginTask::handleAuthSixteenStage1Result(TDEIO::Job* job)
{
int responseNumber = -1;
TQString token;
@@ -294,20 +294,20 @@ void LoginTask::sendAuthSixteenStage2(const TQString& token)
m_stage2Data = TQString();
TQString fullUrl = YahooLoginUrl.arg(token);
KURL loginUrl(fullUrl);
- KIO::Job* job = KIO::get(loginUrl, true, false);
- connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
- this, TQT_SLOT(handleAuthSixteenStage2Data(KIO::Job*, const TQByteArray&)));
- connect(job, TQT_SIGNAL(result(KIO::Job*)),
- this, TQT_SLOT(handleAuthSixteenStage2Result(KIO::Job*)));
+ TDEIO::Job* job = TDEIO::get(loginUrl, true, false);
+ connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+ this, TQT_SLOT(handleAuthSixteenStage2Data(TDEIO::Job*, const TQByteArray&)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job*)),
+ this, TQT_SLOT(handleAuthSixteenStage2Result(TDEIO::Job*)));
}
-void LoginTask::handleAuthSixteenStage2Data(KIO::Job*, const TQByteArray& data)
+void LoginTask::handleAuthSixteenStage2Data(TDEIO::Job*, const TQByteArray& data)
{
kdDebug(YAHOO_RAW_DEBUG) << "data:" << data << endl;
m_stage2Data.append(data);
}
-void LoginTask::handleAuthSixteenStage2Result(KIO::Job* job)
+void LoginTask::handleAuthSixteenStage2Result(TDEIO::Job* job)
{
TQString crumb;
int responseNumber = -1;
diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.h b/kopete/protocols/yahoo/libkyahoo/logintask.h
index 33ce4db6..46ff5dc9 100644
--- a/kopete/protocols/yahoo/libkyahoo/logintask.h
+++ b/kopete/protocols/yahoo/libkyahoo/logintask.h
@@ -27,7 +27,7 @@
class TQString;
class YMSGTransfer;
-namespace KIO
+namespace TDEIO
{
class Job;
}
@@ -68,10 +68,10 @@ protected:
void sendAuthSixteenStage2(const TQString& token);
void sendAuthSixteenStage3(const TQString& cryptString);
protected slots:
- void handleAuthSixteenStage1Data(KIO::Job*, const TQByteArray& data);
- void handleAuthSixteenStage1Result(KIO::Job*);
- void handleAuthSixteenStage2Data(KIO::Job*, const TQByteArray& data);
- void handleAuthSixteenStage2Result(KIO::Job*);
+ void handleAuthSixteenStage1Data(TDEIO::Job*, const TQByteArray& data);
+ void handleAuthSixteenStage1Result(TDEIO::Job*);
+ void handleAuthSixteenStage2Data(TDEIO::Job*, const TQByteArray& data);
+ void handleAuthSixteenStage2Result(TDEIO::Job*);
signals:
void haveSessionID( uint );
diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
index 4dd00d90..543d0b5d 100644
--- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
@@ -91,7 +91,7 @@ void ModifyYABTask::connectFailed( int i)
{
m_socket->close();
client()->notifyError( i18n( "An error occurred while saving the address book entry." ),
- TQString( "%1 - %2").arg(i).arg(static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString()), Client::Error );
+ TQString( "%1 - %2").arg(i).arg(static_cast<const KBufferedSocket*>( sender() )->TDESocketBase::errorString()), Client::Error );
}
void ModifyYABTask::connectSucceeded()
@@ -118,7 +118,7 @@ void ModifyYABTask::connectSucceeded()
kdDebug(YAHOO_RAW_DEBUG) << "Upload Successful. Waiting for confirmation..." << endl;
else
{
- client()->notifyError( i18n( "An error occurred while saving the address book entry." ), m_socket->KSocketBase::errorString(), Client::Error );
+ client()->notifyError( i18n( "An error occurred while saving the address book entry." ), m_socket->TDESocketBase::errorString(), Client::Error );
setError();
return;
}
diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h
index 4194fcca..3f1da297 100644
--- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h
+++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h
@@ -21,7 +21,7 @@
#include "task.h"
#include "yabentry.h"
-namespace KIO {
+namespace TDEIO {
class Job;
class TransferJob;
}
@@ -53,7 +53,7 @@ private slots:
void connectFailed( int );
void slotRead();
private:
- KIO::TransferJob *m_transferJob;
+ TDEIO::TransferJob *m_transferJob;
KNetwork::KBufferedSocket *m_socket;
TQString m_postData;
TQString m_data;
diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
index ec2e9f5f..4528612b 100644
--- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
@@ -52,14 +52,14 @@ void ReceiveFileTask::onGo()
m_file = new TQFile( m_localUrl.path() );
if( !m_file->open( IO_WriteOnly ) )
{
- emit error( m_transferId, KIO::ERR_CANNOT_OPEN_FOR_WRITING, i18n("Could not open file for writing.") );
+ emit error( m_transferId, TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, i18n("Could not open file for writing.") );
setError();
delete t;
return;
}
- m_transferJob = KIO::get( m_remoteUrl, false, false );
- TQObject::connect( m_transferJob, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotComplete( KIO::Job* ) ) );
- TQObject::connect( m_transferJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray & ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray & ) ) );
+ m_transferJob = TDEIO::get( m_remoteUrl, false, false );
+ TQObject::connect( m_transferJob, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotComplete( TDEIO::Job* ) ) );
+ TQObject::connect( m_transferJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) );
delete t;
break;
case FileTransfer7Accept:
@@ -120,7 +120,7 @@ bool ReceiveFileTask::forMe( const Transfer *transfer ) const
return false;
}
-void ReceiveFileTask::slotData( KIO::Job *job, const TQByteArray& data )
+void ReceiveFileTask::slotData( TDEIO::Job *job, const TQByteArray& data )
{
Q_UNUSED( job );
kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
@@ -130,17 +130,17 @@ void ReceiveFileTask::slotData( KIO::Job *job, const TQByteArray& data )
m_file->writeBlock( data.data() , data.size() );
}
-void ReceiveFileTask::slotComplete( KIO::Job *job )
+void ReceiveFileTask::slotComplete( TDEIO::Job *job )
{
kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
- KIO::TransferJob *transfer = static_cast< KIO::TransferJob * >(job);
+ TDEIO::TransferJob *transfer = static_cast< TDEIO::TransferJob * >(job);
if( m_file )
m_file->close();
if ( job->error () || transfer->isErrorPage () )
{
- emit error( m_transferId, KIO::ERR_ABORTED, i18n("An error occurred while downloading the file.") );
+ emit error( m_transferId, TDEIO::ERR_ABORTED, i18n("An error occurred while downloading the file.") );
setError();
}
else
@@ -171,7 +171,7 @@ void ReceiveFileTask::parseFileTransfer7Info( YMSGTransfer *transfer )
m_file = new TQFile( m_localUrl.path() );
if( !m_file->open( IO_WriteOnly ) )
{
- emit error( m_transferId, KIO::ERR_CANNOT_OPEN_FOR_WRITING, i18n("Could not open file for writing.") );
+ emit error( m_transferId, TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, i18n("Could not open file for writing.") );
setError();
return;
}
@@ -187,17 +187,17 @@ void ReceiveFileTask::parseFileTransfer7Info( YMSGTransfer *transfer )
send( t );
// The server expects a HTTP HEAD command prior to the GET
- m_mimetypeJob = KIO::mimetype(TQString::fromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4")
+ m_mimetypeJob = TDEIO::mimetype(TQString::fromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4")
.arg( TQString(transfer->firstParam( 250 )) ).arg( TQString(transfer->firstParam( 251 )) ).arg(m_userId).arg(client()->userId()), false);
m_mimetypeJob->addMetaData("cookies", "manual");
m_mimetypeJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; C=%3;")
.arg(client()->tCookie()).arg(client()->yCookie()).arg(client()->cCookie()) );
- m_transferJob = KIO::get( TQString::fromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4")
+ m_transferJob = TDEIO::get( TQString::fromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4")
.arg( TQString(transfer->firstParam( 250 )) ).arg( TQString(transfer->firstParam( 251 )) ).arg(m_userId).arg(client()->userId()), false, false );
- TQObject::connect( m_transferJob, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotComplete( KIO::Job* ) ) );
- TQObject::connect( m_transferJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray & ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray & ) ) );
+ TQObject::connect( m_transferJob, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotComplete( TDEIO::Job* ) ) );
+ TQObject::connect( m_transferJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) );
m_transferJob->addMetaData("cookies", "manual");
m_transferJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; path=/; domain=.yahoo.com;")
.arg(client()->tCookie()).arg(client()->yCookie()) );
diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.h b/kopete/protocols/yahoo/libkyahoo/receivefiletask.h
index 63d6db07..22c2a37f 100644
--- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.h
+++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.h
@@ -22,7 +22,7 @@
class TQString;
class TQFile;
-namespace KIO {
+namespace TDEIO {
class Job;
class TransferJob;
class MimetypeJob;
@@ -62,8 +62,8 @@ signals:
void error( unsigned int, int, const TQString & );
private slots:
- void slotData( KIO::Job *job, const TQByteArray &data );
- void slotComplete( KIO::Job *job );
+ void slotData( TDEIO::Job *job, const TQByteArray &data );
+ void slotComplete( TDEIO::Job *job );
void canceled( unsigned int );
private:
@@ -74,8 +74,8 @@ private:
TQString m_fileName;
TQString m_userId;
TQFile *m_file;
- KIO::TransferJob *m_transferJob;
- KIO::MimetypeJob *m_mimetypeJob;
+ TDEIO::TransferJob *m_transferJob;
+ TDEIO::MimetypeJob *m_mimetypeJob;
unsigned int m_transferId;
unsigned int m_transmitted;
Type m_type;
diff --git a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
index 4b5ca8a7..e435f568 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
@@ -186,7 +186,7 @@ void SendFileTask::parseTransferAccept(const Transfer *transfer)
void SendFileTask::connectFailed( int i )
{
- TQString err = KSocketBase::errorString(m_socket->error());
+ TQString err = TDESocketBase::errorString(m_socket->error());
kdDebug(YAHOO_RAW_DEBUG) << i << ": " << err << endl;
emit error( m_transferId, i, err );
setError();
@@ -227,7 +227,7 @@ void SendFileTask::connectSucceeded()
if( !m_socket->writeBlock( buffer, buffer.size() ) )
{
- emit error( m_transferId, m_socket->error(), m_socket->KSocketBase::errorString() );
+ emit error( m_transferId, m_socket->error(), m_socket->TDESocketBase::errorString() );
m_socket->close();
}
else
@@ -255,7 +255,7 @@ void SendFileTask::transmitData()
if( written != read )
{
kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << "Upload Failed!" << endl;
- emit error( m_transferId, m_socket->error(), m_socket->KSocketBase::errorString() );
+ emit error( m_transferId, m_socket->error(), m_socket->TDESocketBase::errorString() );
setError();
return;
}
diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
index 04673c62..8c61daa7 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
@@ -74,9 +74,9 @@ void SendPictureTask::initiateUpload()
void SendPictureTask::connectFailed( int i)
{
- kdDebug(YAHOO_RAW_DEBUG) << i << ": " << static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString() << endl;
+ kdDebug(YAHOO_RAW_DEBUG) << i << ": " << static_cast<const KBufferedSocket*>( sender() )->TDESocketBase::errorString() << endl;
- client()->notifyError(i18n("The picture was not successfully uploaded"), TQString("%1 - %2").arg(i).arg(static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString()), Client::Error );
+ client()->notifyError(i18n("The picture was not successfully uploaded"), TQString("%1 - %2").arg(i).arg(static_cast<const KBufferedSocket*>( sender() )->TDESocketBase::errorString()), Client::Error );
setError();
}
diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h
index dad47858..6a985665 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h
+++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h
@@ -21,7 +21,7 @@
class TQString;
class TQFile;
-namespace KIO {
+namespace TDEIO {
class Job;
class TransferJob;
}
diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
index e90b45f2..8a14b354 100644
--- a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
@@ -195,9 +195,9 @@ void WebcamTask::slotConnectionStage2Established()
void WebcamTask::slotConnectionFailed( int error )
{
KStreamSocket* socket = const_cast<KStreamSocket*>( dynamic_cast<const KStreamSocket*>( sender() ) );
- kdDebug(YAHOO_RAW_DEBUG) << "Webcam connection to the user " << socketMap[socket].sender << " failed. Error " << error << " - " << socket->KSocketBase::errorString() << endl;
+ kdDebug(YAHOO_RAW_DEBUG) << "Webcam connection to the user " << socketMap[socket].sender << " failed. Error " << error << " - " << socket->TDESocketBase::errorString() << endl;
client()->notifyError( i18n("Webcam connection to the user %1 could not be established.\n\nPlease relogin and try again.")
- .arg(socketMap[socket].sender), TQString("%1 - %2").arg(error).arg( socket->KSocketBase::errorString()), Client::Error );
+ .arg(socketMap[socket].sender), TQString("%1 - %2").arg(error).arg( socket->TDESocketBase::errorString()), Client::Error );
socketMap.remove( socket );
socket->deleteLater();
}
diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
index 951f88d8..4eb82cc4 100644
--- a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
@@ -97,21 +97,21 @@ void YABTask::getAllEntries( long lastMerge, long lastRemoteRevision )
TQString url = TQString::fromLatin1("http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us&diffs=1&t=%1&tags=short&rt=%2&prog-ver=%3")
.arg( lastMerge ).arg( lastRemoteRevision ).arg( YMSG_PROGRAM_VERSION_STRING );
- m_transferJob = KIO::get( url , false, false );
+ m_transferJob = TDEIO::get( url , false, false );
m_transferJob->addMetaData("cookies", "manual");
m_transferJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: Y=%1; T=%2; C=%3;")
.arg(client()->yCookie()).arg(client()->tCookie()).arg(client()->cCookie()) );
- connect( m_transferJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray & ) ) );
- connect( m_transferJob, TQT_SIGNAL( result( KIO::Job *) ), this, TQT_SLOT( slotResult( KIO::Job* ) ) );
+ connect( m_transferJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) );
+ connect( m_transferJob, TQT_SIGNAL( result( TDEIO::Job *) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );
}
-void YABTask::slotData( KIO::Job* /*job*/, const TQByteArray &info )
+void YABTask::slotData( TDEIO::Job* /*job*/, const TQByteArray &info )
{
kdDebug(YAHOO_RAW_DEBUG) ;
m_data += info;
}
-void YABTask::slotResult( KIO::Job* job )
+void YABTask::slotResult( TDEIO::Job* job )
{
if( job->error () || m_transferJob->isErrorPage () )
{
diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.h b/kopete/protocols/yahoo/libkyahoo/yabtask.h
index 1194829c..4d5d5659 100644
--- a/kopete/protocols/yahoo/libkyahoo/yabtask.h
+++ b/kopete/protocols/yahoo/libkyahoo/yabtask.h
@@ -23,7 +23,7 @@
class YMSGTransfer;
-namespace KIO {
+namespace TDEIO {
class Job;
class TransferJob;
}
@@ -50,10 +50,10 @@ protected:
virtual bool forMe( const Transfer* transfer ) const;
void parseContactDetails( YMSGTransfer* t );
private slots:
- void slotData( KIO::Job*, const TQByteArray & );
- void slotResult( KIO::Job* );
+ void slotData( TDEIO::Job*, const TQByteArray & );
+ void slotResult( TDEIO::Job* );
private:
- KIO::TransferJob *m_transferJob;
+ TDEIO::TransferJob *m_transferJob;
TQString m_data;
};
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
index 025386f0..b9a270f8 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
@@ -43,14 +43,14 @@ YahooBuddyIconLoader::~YahooBuddyIconLoader()
void YahooBuddyIconLoader::fetchBuddyIcon( const TQString &who, KURL url, int checksum )
{
kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << url << endl;
- KIO::TransferJob *transfer;
+ TDEIO::TransferJob *transfer;
TQString Url = url.url();
TQString ext = Url.left( Url.findRev( "?" ) );
ext = ext.right( ext.length() - ext.findRev( "." ) );
- transfer = KIO::get( url, false, false );
- connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotComplete( KIO::Job* ) ) );
- connect( transfer, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
+ transfer = TDEIO::get( url, false, false );
+ connect( transfer, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotComplete( TDEIO::Job* ) ) );
+ connect( transfer, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
m_jobs[transfer].url = url;
m_jobs[transfer].who = who;
@@ -58,11 +58,11 @@ void YahooBuddyIconLoader::fetchBuddyIcon( const TQString &who, KURL url, int ch
}
-void YahooBuddyIconLoader::slotData( KIO::Job *job, const TQByteArray& data )
+void YahooBuddyIconLoader::slotData( TDEIO::Job *job, const TQByteArray& data )
{
kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
- KIO::TransferJob *transfer = static_cast< KIO::TransferJob * >(job);
+ TDEIO::TransferJob *transfer = static_cast< TDEIO::TransferJob * >(job);
// FIXME need to check
//m_jobs[transfer].icon.append( data );
@@ -71,11 +71,11 @@ void YahooBuddyIconLoader::slotData( KIO::Job *job, const TQByteArray& data )
memcpy( m_jobs[transfer].icon.data() + oldsize, data.data(), data.size() );
}
-void YahooBuddyIconLoader::slotComplete( KIO::Job *job )
+void YahooBuddyIconLoader::slotComplete( TDEIO::Job *job )
{
kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
- KIO::TransferJob *transfer = static_cast< KIO::TransferJob * >(job);
+ TDEIO::TransferJob *transfer = static_cast< TDEIO::TransferJob * >(job);
if ( job->error () || transfer->isErrorPage () )
{
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h
index 7961b393..78bd1248 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h
+++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h
@@ -26,7 +26,7 @@
class KJob;
class Client;
-namespace KIO {
+namespace TDEIO {
class Job;
class TransferJob;
}
@@ -66,11 +66,11 @@ signals:
void fetchedBuddyIcon( const TQString &who, const TQByteArray &icon, int checksum );
private slots:
- void slotData( KIO::Job *job, const TQByteArray &data );
- void slotComplete( KIO::Job *job );
+ void slotData( TDEIO::Job *job, const TQByteArray &data );
+ void slotComplete( TDEIO::Job *job );
private:
- typedef TQMap< KIO::TransferJob *, IconLoadJob > TransferJobMap;
+ typedef TQMap< TDEIO::TransferJob *, IconLoadJob > TransferJobMap;
TransferJobMap m_jobs;
Client *m_client;
};
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp
index 3e2c4a19..e1f5fd8c 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp
@@ -99,7 +99,7 @@ void KNetworkByteStream::slotConnectionClosed()
if ( mClosing )
{
kdDebug( 14181 ) << "..by ourselves!" << endl;
- kdDebug( 14181 ) << "socket error is " << socket()->KSocketBase::errorString() << endl;
+ kdDebug( 14181 ) << "socket error is " << socket()->TDESocketBase::errorString() << endl;
emit connectionClosed ();
}
else
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
index 1c9528ff..3f8650f5 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
@@ -89,49 +89,49 @@ void YahooChatTask::onGo()
void YahooChatTask::getYahooChatCategories()
{
kdDebug(YAHOO_RAW_DEBUG) ;
- KIO::TransferJob *transfer;
+ TDEIO::TransferJob *transfer;
- transfer = KIO::get( KURL("http://insider.msg.yahoo.com/ycontent/?chatcat=0"), false, false );
+ transfer = TDEIO::get( KURL("http://insider.msg.yahoo.com/ycontent/?chatcat=0"), false, false );
transfer->addMetaData( "UserAgent", "Mozilla/4.0 (compatible; MSIE 5.5)");
transfer->addMetaData( "no-cache", "true" );
transfer->addMetaData( "cookies", "manual" );
transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").arg(client()->tCookie(), client()->yCookie()) );
- connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotCategoriesComplete( KIO::Job* ) ) );
- connect( transfer, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
+ connect( transfer, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotCategoriesComplete( TDEIO::Job* ) ) );
+ connect( transfer, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
}
void YahooChatTask::getYahooChatRooms( const Yahoo::ChatCategory &category )
{
kdDebug(YAHOO_RAW_DEBUG) << "Category Id: " << category.id << endl;
- KIO::TransferJob *transfer;
+ TDEIO::TransferJob *transfer;
- transfer = KIO::get( KURL(TQString("http://insider.msg.yahoo.com/ycontent/?chatroom_%1=0").arg( category.id )), false, false );
+ transfer = TDEIO::get( KURL(TQString("http://insider.msg.yahoo.com/ycontent/?chatroom_%1=0").arg( category.id )), false, false );
transfer->addMetaData( "UserAgent", "Mozilla/4.0 (compatible; MSIE 5.5)");
transfer->addMetaData( "no-cache", "true" );
transfer->addMetaData( "cookies", "manual" );
transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").arg(client()->tCookie(), client()->yCookie()) );
- connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotChatRoomsComplete( KIO::Job* ) ) );
- connect( transfer, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
+ connect( transfer, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotChatRoomsComplete( TDEIO::Job* ) ) );
+ connect( transfer, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
m_jobs[ transfer ].category = category;
}
-void YahooChatTask::slotData( KIO::Job *job, const TQByteArray& data)
+void YahooChatTask::slotData( TDEIO::Job *job, const TQByteArray& data)
{
kdDebug(YAHOO_RAW_DEBUG) ;
// FIXME (same)
//m_jobs[job].data.append( data );
}
-void YahooChatTask::slotCategoriesComplete( KIO::Job *job )
+void YahooChatTask::slotCategoriesComplete( TDEIO::Job *job )
{
kdDebug(YAHOO_RAW_DEBUG) ;
- KIO::TransferJob *transfer = static_cast< KIO::TransferJob * >(job);
+ TDEIO::TransferJob *transfer = static_cast< TDEIO::TransferJob * >(job);
if ( job->error () || transfer->isErrorPage () )
{
@@ -147,11 +147,11 @@ void YahooChatTask::slotCategoriesComplete( KIO::Job *job )
m_jobs.remove( transfer );
}
-void YahooChatTask::slotChatRoomsComplete( KIO::Job *job )
+void YahooChatTask::slotChatRoomsComplete( TDEIO::Job *job )
{
kdDebug(YAHOO_RAW_DEBUG) ;
- KIO::TransferJob *transfer = static_cast< KIO::TransferJob * >(job);
+ TDEIO::TransferJob *transfer = static_cast< TDEIO::TransferJob * >(job);
if ( job->error () || transfer->isErrorPage () )
{
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.h b/kopete/protocols/yahoo/libkyahoo/yahoochattask.h
index 2a90016f..d15b9905 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.h
+++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.h
@@ -26,7 +26,7 @@
class TQDomDocument;
class YMSGTransfer;
-namespace KIO {
+namespace TDEIO {
class Job;
}
@@ -76,11 +76,11 @@ private:
void parseLogout( YMSGTransfer * );
private slots:
- void slotData( KIO::Job *, const TQByteArray & );
- void slotCategoriesComplete( KIO::Job * );
- void slotChatRoomsComplete( KIO::Job * );
+ void slotData( TDEIO::Job *, const TQByteArray & );
+ void slotCategoriesComplete( TDEIO::Job * );
+ void slotChatRoomsComplete( TDEIO::Job * );
private:
- TQMap< KIO::Job *, YahooChatJob > m_jobs;
+ TQMap< TDEIO::Job *, YahooChatJob > m_jobs;
TQValueList< Yahoo::ChatRoom > m_pendingJoins;
bool m_loggedIn;
};
diff --git a/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp b/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp
index af485840..48221871 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp
@@ -30,7 +30,7 @@ KNetworkConnector::KNetworkConnector( TQObject *parent )
{
kdDebug( YAHOO_RAW_DEBUG ) << "New KNetwork connector." << endl;
- mErrorCode = KNetwork::KSocketBase::NoError;
+ mErrorCode = KNetwork::TDESocketBase::NoError;
mByteStream = new KNetworkByteStream( this );
@@ -51,7 +51,7 @@ void KNetworkConnector::connectToServer( const TQString &server )
Q_ASSERT( !mHost.isNull() );
Q_ASSERT( mPort );
- mErrorCode = KNetwork::KSocketBase::NoError;
+ mErrorCode = KNetwork::TDESocketBase::NoError;
if ( !mByteStream->connect( mHost, TQString::number (mPort) ) )
{
diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp
index a38feccb..53f7c2b4 100644
--- a/kopete/protocols/yahoo/yahooaccount.cpp
+++ b/kopete/protocols/yahoo/yahooaccount.cpp
@@ -698,7 +698,7 @@ void YahooAccount::sendFile( YahooContact *to, const KURL &url )
url.fileName(), file.size(), to->userId(), Kopete::FileTransferInfo::Outgoing );
m_session->sendFile( transfer->info().transferId(), to->userId(), TQString(), url );
- TQObject::connect( transfer, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotFileTransferResult( KIO::Job * )) );
+ TQObject::connect( transfer, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFileTransferResult( TDEIO::Job * )) );
m_fileTransfers.insert( transfer->info().transferId(), transfer );
}
@@ -1541,7 +1541,7 @@ void YahooAccount::slotReceiveFileAccepted(Kopete::Transfer *transfer, const TQS
m_session->receiveFile( transfer->info().transferId(), transfer->info().contact()->contactId(), transfer->info().internalId(), fileName );
m_fileTransfers.insert( transfer->info().transferId(), transfer );
- TQObject::connect( transfer, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotFileTransferResult( KIO::Job * )) );
+ TQObject::connect( transfer, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFileTransferResult( TDEIO::Job * )) );
if( m_pendingFileTransfers.empty() )
{
@@ -1601,7 +1601,7 @@ void YahooAccount::slotFileTransferError( unsigned int transferId, int error, co
m_fileTransfers.remove( transferId );
}
-void YahooAccount::slotFileTransferResult( KIO::Job *job )
+void YahooAccount::slotFileTransferResult( TDEIO::Job *job )
{
kdDebug(YAHOO_GEN_DEBUG) ;
const Kopete::Transfer *t = dynamic_cast< const Kopete::Transfer * >( job );
@@ -1609,7 +1609,7 @@ void YahooAccount::slotFileTransferResult( KIO::Job *job )
if( !t )
return;
- if( t->error() == KIO::ERR_USER_CANCELED )
+ if( t->error() == TDEIO::ERR_USER_CANCELED )
{
m_session->cancelFileTransfer( t->info().transferId() );
m_fileTransfers.remove( t->info().transferId() );
diff --git a/kopete/protocols/yahoo/yahooaccount.h b/kopete/protocols/yahoo/yahooaccount.h
index 7a127f26..9f8d1d22 100644
--- a/kopete/protocols/yahoo/yahooaccount.h
+++ b/kopete/protocols/yahoo/yahooaccount.h
@@ -57,7 +57,7 @@ class FileTransferInfo;
class Client;
struct YABEntry;
class KJob;
-namespace KIO{
+namespace TDEIO{
class Job;
}
@@ -244,7 +244,7 @@ protected slots:
void slotFileTransferComplete( unsigned int id );
void slotFileTransferError( unsigned int id, int error, const TQString &desc );
void slotFileTransferBytesProcessed( unsigned int id, unsigned int bytes );
- void slotFileTransferResult( KIO::Job * );
+ void slotFileTransferResult( TDEIO::Job * );
void slotError( int level );
private:
diff --git a/kopete/protocols/yahoo/yahooverifyaccount.cpp b/kopete/protocols/yahoo/yahooverifyaccount.cpp
index 7d50e900..14912167 100644
--- a/kopete/protocols/yahoo/yahooverifyaccount.cpp
+++ b/kopete/protocols/yahoo/yahooverifyaccount.cpp
@@ -58,12 +58,12 @@ void YahooVerifyAccount::setUrl( KURL url )
{
mFile = new KTempFile( locateLocal( "tmp", url.fileName() ) );
mFile->setAutoDelete( true );
- KIO::TransferJob *transfer = KIO::get( url, false, false );
- connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotComplete( KIO::Job* ) ) );
- connect( transfer, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
+ TDEIO::TransferJob *transfer = TDEIO::get( url, false, false );
+ connect( transfer, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotComplete( TDEIO::Job* ) ) );
+ connect( transfer, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
}
-void YahooVerifyAccount::slotData( KIO::Job */*job*/, const TQByteArray& data )
+void YahooVerifyAccount::slotData( TDEIO::Job */*job*/, const TQByteArray& data )
{
kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
@@ -71,7 +71,7 @@ void YahooVerifyAccount::slotData( KIO::Job */*job*/, const TQByteArray& data )
mFile->file()->writeBlock( data.data() , data.size() );
}
-void YahooVerifyAccount::slotComplete( KIO::Job */*job*/ )
+void YahooVerifyAccount::slotComplete( TDEIO::Job */*job*/ )
{
kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
diff --git a/kopete/protocols/yahoo/yahooverifyaccount.h b/kopete/protocols/yahoo/yahooverifyaccount.h
index 26dcf320..7eeba87e 100644
--- a/kopete/protocols/yahoo/yahooverifyaccount.h
+++ b/kopete/protocols/yahoo/yahooverifyaccount.h
@@ -48,8 +48,8 @@ protected slots:
virtual void slotClose();
virtual void slotApply();
public slots:
- void slotData( KIO::Job *job, const TQByteArray& data );
- void slotComplete( KIO::Job *job );
+ void slotData( TDEIO::Job *job, const TQByteArray& data );
+ void slotComplete( TDEIO::Job *job );
};
#endif