summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/msn/msnsocket.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-25 13:17:02 -0600
committerTimothy Pearson <[email protected]>2013-01-25 13:17:02 -0600
commit4816c4a735e1704c433dbe42155bf3887180d8ea (patch)
tree868b82f46bee5214e7b8251e79ce56d4c1453c9a /kopete/protocols/msn/msnsocket.cpp
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/msn/msnsocket.cpp')
-rw-r--r--kopete/protocols/msn/msnsocket.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp
index f93af5c0..2496006b 100644
--- a/kopete/protocols/msn/msnsocket.cpp
+++ b/kopete/protocols/msn/msnsocket.cpp
@@ -101,9 +101,9 @@ void MSNSocket::connect( const TQString &server, uint port )
m_port = port;
if(!m_useHttp)
- m_socket = new KBufferedSocket( server, TQString::number(port) );
+ m_socket = new TDEBufferedSocket( server, TQString::number(port) );
else {
- m_socket = new KBufferedSocket( m_gateway, "80" );
+ m_socket = new TDEBufferedSocket( m_gateway, "80" );
}
m_socket->enableRead( true );
@@ -918,7 +918,7 @@ bool MSNSocket::accept( TDEServerSocket *server )
return false;
}
- m_socket = static_cast<KBufferedSocket*>(server->accept());
+ m_socket = static_cast<TDEBufferedSocket*>(server->accept());
if ( !m_socket )
{