diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:36:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:36:20 -0600 |
| commit | f21aaec952493cb5688c73de6e82a569ddbd7fb2 (patch) | |
| tree | 78ccb5117063da3e08e3277e11054b912a9f2ae7 /kopete/protocols/msn/msnsocket.cpp | |
| parent | c48e769eb275917717e2b55eb869f7e559293ac8 (diff) | |
| download | tdenetwork-f21aaec952493cb5688c73de6e82a569ddbd7fb2.tar.gz tdenetwork-f21aaec952493cb5688c73de6e82a569ddbd7fb2.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kopete/protocols/msn/msnsocket.cpp')
| -rw-r--r-- | kopete/protocols/msn/msnsocket.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp index e098e27b..f93af5c0 100644 --- a/kopete/protocols/msn/msnsocket.cpp +++ b/kopete/protocols/msn/msnsocket.cpp @@ -175,17 +175,17 @@ void MSNSocket::setOnlineStatus( MSNSocket::OnlineStatus status ) void MSNSocket::slotSocketError( int error ) { - kdWarning( 14140 ) << k_funcinfo << "Error: " << error << " (" << m_socket->KSocketBase::errorString() << ")" << endl; + kdWarning( 14140 ) << k_funcinfo << "Error: " << error << " (" << m_socket->TDESocketBase::errorString() << ")" << endl; - if(!KSocketBase::isFatalError(error)) + if(!TDESocketBase::isFatalError(error)) return; //we only care about fatal error TQString errormsg = i18n( "There was an error while connecting to the MSN server.\nError message:\n" ); - if ( error == KSocketBase::LookupFailure ) + if ( error == TDESocketBase::LookupFailure ) errormsg += i18n( "Unable to lookup %1" ).arg( m_socket->peerResolver().nodeName() ); else - errormsg += m_socket->KSocketBase::errorString() ; + errormsg += m_socket->TDESocketBase::errorString() ; //delete m_socket; m_socket->deleteLater(); @@ -910,7 +910,7 @@ bool MSNSocket::useHttpMethod() const return m_useHttp; } -bool MSNSocket::accept( KServerSocket *server ) +bool MSNSocket::accept( TDEServerSocket *server ) { if ( m_socket ) { @@ -952,7 +952,7 @@ TQString MSNSocket::getLocalIP() if ( !m_socket ) return TQString(); - const KSocketAddress address = m_socket->localAddress(); + const TDESocketAddress address = m_socket->localAddress(); TQString ip = address.nodeName(); |