diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:36:20 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:36:20 -0600 |
commit | f21aaec952493cb5688c73de6e82a569ddbd7fb2 (patch) | |
tree | 78ccb5117063da3e08e3277e11054b912a9f2ae7 /kopete/protocols/msn/outgoingtransfer.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/outgoingtransfer.cpp')
-rw-r--r-- | kopete/protocols/msn/outgoingtransfer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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, |