Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

1 files changed, 9 insertions, 9 deletions

diff --git a/konversation/src/server.cpp b/konversation/src/server.cpp
index e4fed1c..8fcdc53 100644
--- a/konversation/src/server.cpp
+++ b/konversation/src/server.cpp
@@ -535,7 +535,7 @@ void Server::lookupFinished()
         // inform user about the error
         getStatusView()->appendServerMessage(i18n("Error"),i18n("Server %1 not found: %2")
             .arg(getConnectionSettings().server().host())
-            .arg(m_socket->KSocketBase::errorString(m_socket->error())));
+            .arg(m_socket->TDESocketBase::errorString(m_socket->error())));
 
         m_socket->resetStatus();
 
@@ -608,7 +608,7 @@ void Server::broken(int state)
 
         TQString error = i18n("Connection to Server %1 lost: %2.")
             .arg(getConnectionSettings().server().host())
-            .arg(KNetwork::KSocketBase::errorString((KNetwork::KSocketBase::SocketError)state));
+            .arg(KNetwork::TDESocketBase::errorString((KNetwork::TDESocketBase::SocketError)state));
 
         getStatusView()->appendServerMessage(i18n("Error"), error);
 
@@ -908,7 +908,7 @@ void Server::incoming()
     {
         getStatusView()->appendServerMessage(i18n("Error"),
             i18n("There was an error reading the data from the server: %1").
-            arg(m_socket->KSocketBase::errorString()));
+            arg(m_socket->TDESocketBase::errorString()));
 
         broken(m_socket->error());
         return;
@@ -1711,7 +1711,7 @@ void Server::addDccGet(const TQString &sourceNick, const TQStringList &dccArgume
                                   i18n( "%1 offers to send you \"%2\" (%3)..." )
                                   .arg( newDcc->getPartnerNick(),
                                         showfile,
-                                        ( newDcc->getFileSize() == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( newDcc->getFileSize() ) ) );
+                                        ( newDcc->getFileSize() == 0 ) ? i18n( "unknown size" ) : TDEIO::convertSize( newDcc->getFileSize() ) ) );
 
         if(Preferences::dccAutoGet())
             newDcc->start();
@@ -1742,7 +1742,7 @@ void Server::dccSendRequest(const TQString &partner, const TQString &fileName, c
                               i18n( "Asking %1 to accept upload of \"%2\" (%3)..." )
                               .arg( partner,
                                     showfile,
-                                    ( size == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( size ) ) );
+                                    ( size == 0 ) ? i18n( "unknown size" ) : TDEIO::convertSize( size ) ) );
 }
 
 void Server::dccPassiveSendRequest(const TQString& recipient,const TQString& fileName,const TQString& address,unsigned long size,const TQString& token)
@@ -1751,7 +1751,7 @@ void Server::dccPassiveSendRequest(const TQString& recipient,const TQString& fil
     queue(result.toServer);
 }
 
-void Server::dccResumeGetRequest(const TQString &sender, const TQString &fileName, const TQString &port, KIO::filesize_t startAt)
+void Server::dccResumeGetRequest(const TQString &sender, const TQString &fileName, const TQString &port, TDEIO::filesize_t startAt)
 {
     Konversation::OutputFilterResult result;
 
@@ -1820,7 +1820,7 @@ void Server::resumeDccGetTransfer(const TQString &sourceNick, const TQStringList
                                   .arg( showfile,
                                         sourceNick,
                                         TQString::number( dccTransfer->getProgress() ),
-                                        ( dccTransfer->getFileSize() == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( dccTransfer->getFileSize() ) ) );
+                                        ( dccTransfer->getFileSize() == 0 ) ? i18n( "unknown size" ) : TDEIO::convertSize( dccTransfer->getFileSize() ) ) );
     }
     else
     {
@@ -1855,7 +1855,7 @@ void Server::resumeDccSendTransfer(const TQString &sourceNick, const TQStringLis
                                   .arg( showfile,
                                         sourceNick,
                                         TQString::number(dccTransfer->getProgress()),
-                                        ( dccTransfer->getFileSize() == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( dccTransfer->getFileSize() ) ) );
+                                        ( dccTransfer->getFileSize() == 0 ) ? i18n( "unknown size" ) : TDEIO::convertSize( dccTransfer->getFileSize() ) ) );
 
         // FIXME: this operation should be done by DccTransferManager
         Konversation::OutputFilterResult result = getOutputFilter()->acceptResumeRequest( sourceNick, fileName, ownPort, position );
@@ -1934,7 +1934,7 @@ void Server::dccStatusChanged(DccTransfer *item, int newStatus, int oldStatus)
             appendMessageToFrontmost( i18n( "DCC" ),
                                         i18n( "%1 = file name, %2 = file size, %3 = nickname of sender", "Downloading \"%1\" (%2) from %3...")
                                         .arg( showfile,
-                                            ( item->getFileSize() == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( item->getFileSize() ),
+                                            ( item->getFileSize() == 0 ) ? i18n( "unknown size" ) : TDEIO::convertSize( item->getFileSize() ),
                                             item->getPartnerNick() ) );
         }
     }