Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4

1 files changed, 4 insertions, 4 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 );