summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/yahoo/libkyahoo
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 13:17:02 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 13:17:02 -0600
commit4816c4a735e1704c433dbe42155bf3887180d8ea (patch)
tree868b82f46bee5214e7b8251e79ce56d4c1453c9a /kopete/protocols/yahoo/libkyahoo
parentf21aaec952493cb5688c73de6e82a569ddbd7fb2 (diff)
downloadtdenetwork-4816c4a735e1704c433dbe42155bf3887180d8ea.tar.gz
tdenetwork-4816c4a735e1704c433dbe42155bf3887180d8ea.zip
Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4
Diffstat (limited to 'kopete/protocols/yahoo/libkyahoo')
-rw-r--r--kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp8
-rw-r--r--kopete/protocols/yahoo/libkyahoo/modifyyabtask.h4
-rw-r--r--kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp6
-rw-r--r--kopete/protocols/yahoo/libkyahoo/sendpicturetask.h4
-rw-r--r--kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp4
-rw-r--r--kopete/protocols/yahoo/libkyahoo/yahoobytestream.h4
6 files changed, 15 insertions, 15 deletions
diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
index 543d0b5d..cd77498e 100644
--- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
@@ -45,7 +45,7 @@ ModifyYABTask::~ModifyYABTask()
void ModifyYABTask::onGo()
{
kdDebug(YAHOO_RAW_DEBUG) ;
- m_socket = new KBufferedSocket( "address.yahoo.com", TQString::number(80) );
+ m_socket = new TDEBufferedSocket( "address.yahoo.com", TQString::number(80) );
connect( m_socket, TQT_SIGNAL( connected( const KResolverEntry& ) ), this, TQT_SLOT( connectSucceeded() ) );
connect( m_socket, TQT_SIGNAL( gotError(int) ), this, TQT_SLOT( connectFailed(int) ) );
@@ -91,13 +91,13 @@ 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() )->TDESocketBase::errorString()), Client::Error );
+ TQString( "%1 - %2").arg(i).arg(static_cast<const TDEBufferedSocket*>( sender() )->TDESocketBase::errorString()), Client::Error );
}
void ModifyYABTask::connectSucceeded()
{
kdDebug(YAHOO_RAW_DEBUG) ;
- KBufferedSocket* socket = const_cast<KBufferedSocket*>( static_cast<const KBufferedSocket*>( sender() ) );
+ TDEBufferedSocket* socket = const_cast<TDEBufferedSocket*>( static_cast<const TDEBufferedSocket*>( sender() ) );
TQString header = TQString::fromLatin1("POST /yab/us?v=XM&prog=ymsgr&.intl=us&sync=1&tags=short&noclear=1& HTTP/1.1\r\n"
"Cookie: Y=%1; T=%2; C=%3 ;B=fckeert1kk1nl&b=2\r\n"
@@ -128,7 +128,7 @@ void ModifyYABTask::connectSucceeded()
void ModifyYABTask::slotRead()
{
- KBufferedSocket* socket = const_cast<KBufferedSocket*>( static_cast<const KBufferedSocket*>( sender() ) );
+ TDEBufferedSocket* socket = const_cast<TDEBufferedSocket*>( static_cast<const TDEBufferedSocket*>( sender() ) );
TQByteArray ar( socket->bytesAvailable() );
socket->readBlock( ar.data (), ar.size () );
TQString data( ar );
diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h
index 3f1da297..bb646a55 100644
--- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h
+++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h
@@ -26,7 +26,7 @@ namespace TDEIO {
class TransferJob;
}
namespace KNetwork {
- class KBufferedSocket;
+ class TDEBufferedSocket;
}
/**
@@ -54,7 +54,7 @@ private slots:
void slotRead();
private:
TDEIO::TransferJob *m_transferJob;
- KNetwork::KBufferedSocket *m_socket;
+ KNetwork::TDEBufferedSocket *m_socket;
TQString m_postData;
TQString m_data;
Action m_action;
diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
index 8c61daa7..a5f8f821 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
@@ -64,7 +64,7 @@ void SendPictureTask::onGo()
void SendPictureTask::initiateUpload()
{
kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
- m_socket = new KBufferedSocket( "filetransfer.msg.yahoo.com", TQString::number(80) );
+ m_socket = new TDEBufferedSocket( "filetransfer.msg.yahoo.com", TQString::number(80) );
connect( m_socket, TQT_SIGNAL( connected( const KResolverEntry& ) ), this, TQT_SLOT( connectSucceeded() ) );
connect( m_socket, TQT_SIGNAL( gotError(int) ), this, TQT_SLOT( connectFailed(int) ) );
connect( m_socket, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( readResult() ) );
@@ -74,9 +74,9 @@ void SendPictureTask::initiateUpload()
void SendPictureTask::connectFailed( int i)
{
- kdDebug(YAHOO_RAW_DEBUG) << i << ": " << static_cast<const KBufferedSocket*>( sender() )->TDESocketBase::errorString() << endl;
+ kdDebug(YAHOO_RAW_DEBUG) << i << ": " << static_cast<const TDEBufferedSocket*>( sender() )->TDESocketBase::errorString() << endl;
- client()->notifyError(i18n("The picture was not successfully uploaded"), TQString("%1 - %2").arg(i).arg(static_cast<const KBufferedSocket*>( sender() )->TDESocketBase::errorString()), Client::Error );
+ client()->notifyError(i18n("The picture was not successfully uploaded"), TQString("%1 - %2").arg(i).arg(static_cast<const TDEBufferedSocket*>( sender() )->TDESocketBase::errorString()), Client::Error );
setError();
}
diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h
index 6a985665..2e16797f 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h
+++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h
@@ -26,7 +26,7 @@ namespace TDEIO {
class TransferJob;
}
namespace KNetwork {
- class KBufferedSocket;
+ class TDEBufferedSocket;
}
/**
@@ -72,7 +72,7 @@ private:
TQString m_url;
int m_transmitted;
TQFile *m_file;
- KNetwork::KBufferedSocket *m_socket;
+ KNetwork::TDEBufferedSocket *m_socket;
};
#endif
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp
index e1f5fd8c..c895bf5a 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp
@@ -30,7 +30,7 @@ KNetworkByteStream::KNetworkByteStream( TQObject *parent )
// reset close tracking flag
mClosing = false;
- mSocket = new KNetwork::KBufferedSocket;
+ mSocket = new KNetwork::TDEBufferedSocket;
// make sure we get a signal whenever there's data to be read
mSocket->enableRead( true );
@@ -76,7 +76,7 @@ int KNetworkByteStream::tryWrite ()
return writeData.size();
}
-KNetwork::KBufferedSocket *KNetworkByteStream::socket() const
+KNetwork::TDEBufferedSocket *KNetworkByteStream::socket() const
{
return mSocket;
}
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h
index f4ff3061..692c88be 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h
+++ b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h
@@ -43,7 +43,7 @@ public:
virtual bool isOpen () const;
virtual void close ();
- KNetwork::KBufferedSocket *socket () const;
+ KNetwork::TDEBufferedSocket *socket () const;
signals:
void connected ();
@@ -59,7 +59,7 @@ private slots:
void slotError ( int );
private:
- KNetwork::KBufferedSocket *mSocket;
+ KNetwork::TDEBufferedSocket *mSocket;
bool mClosing;
};