From f21aaec952493cb5688c73de6e82a569ddbd7fb2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:36:20 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kopete/protocols/msn/outgoingtransfer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kopete/protocols/msn/outgoingtransfer.cpp') diff --git a/kopete/protocols/msn/outgoingtransfer.cpp b/kopete/protocols/msn/outgoingtransfer.cpp index 604df5d1..c2868ad0 100644 --- a/kopete/protocols/msn/outgoingtransfer.cpp +++ b/kopete/protocols/msn/outgoingtransfer.cpp @@ -208,7 +208,7 @@ void OutgoingTransfer::processMessage(const Message& message) if(m_transfer) { // Inform the user of the file transfer cancelation. - m_transfer->slotError(KIO::ERR_ABORTED, i18n("File transfer canceled.")); + m_transfer->slotError(TDEIO::ERR_ABORTED, i18n("File transfer canceled.")); } } // Dispose of this transfer context. @@ -315,7 +315,7 @@ void OutgoingTransfer::processMessage(const Message& message) if(m_transfer) { // Inform the user of the file transfer cancelation. - m_transfer->slotError(KIO::ERR_ABORTED, i18n("File transfer canceled.")); + m_transfer->slotError(TDEIO::ERR_ABORTED, i18n("File transfer canceled.")); } if(m_file && m_file->isOpen()){ @@ -401,7 +401,7 @@ void OutgoingTransfer::slotRead() void OutgoingTransfer::slotSocketError(int) { - kdDebug(14140) << k_funcinfo << m_socket->KSocketBase::errorString() << endl; + kdDebug(14140) << k_funcinfo << m_socket->TDESocketBase::errorString() << endl; // If an error has occurred, try to connect // to another available peer endpoint. // If there are no more available endpoints, -- cgit v1.2.1