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

9 files changed, 56 insertions, 56 deletions

diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp
index bb4766e8..0a803927 100644
--- a/kopete/protocols/jabber/jabberaccount.cpp
+++ b/kopete/protocols/jabber/jabberaccount.cpp
@@ -793,50 +793,50 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int
 		case XMPP::ClientStream::ErrConnection:
 			switch(connectorCode)
 			{
- 				case KNetwork::KSocketBase::LookupFailure:
+ 				case KNetwork::TDESocketBase::LookupFailure:
 					errorClass = Kopete::Account::InvalidHost;
 					errorCondition = i18n("Host not found.");
 					break;
-				case KNetwork::KSocketBase::AddressInUse:
+				case KNetwork::TDESocketBase::AddressInUse:
 					errorCondition = i18n("Address is already in use.");
 					break;
-				case KNetwork::KSocketBase::AlreadyCreated:
+				case KNetwork::TDESocketBase::AlreadyCreated:
 					errorCondition = i18n("Cannot recreate the socket.");
 					break;
-				case KNetwork::KSocketBase::AlreadyBound:
+				case KNetwork::TDESocketBase::AlreadyBound:
 					errorCondition = i18n("Cannot bind the socket again.");
 					break;
-				case KNetwork::KSocketBase::AlreadyConnected:
+				case KNetwork::TDESocketBase::AlreadyConnected:
 					errorCondition = i18n("Socket is already connected.");
 					break;
-				case KNetwork::KSocketBase::NotConnected:
+				case KNetwork::TDESocketBase::NotConnected:
 					errorCondition = i18n("Socket is not connected.");
 					break;
-				case KNetwork::KSocketBase::NotBound:
+				case KNetwork::TDESocketBase::NotBound:
 					errorCondition = i18n("Socket is not bound.");
 					break;
-				case KNetwork::KSocketBase::NotCreated:
+				case KNetwork::TDESocketBase::NotCreated:
 					errorCondition = i18n("Socket has not been created.");
 					break;
-				case KNetwork::KSocketBase::WouldBlock:
+				case KNetwork::TDESocketBase::WouldBlock:
 					errorCondition = i18n("Socket operation would block. You should not see this error, please use \"Report Bug\" from the Help menu.");
 					break;
-				case KNetwork::KSocketBase::ConnectionRefused:
+				case KNetwork::TDESocketBase::ConnectionRefused:
 					errorCondition = i18n("Connection refused.");
 					break;
-				case KNetwork::KSocketBase::ConnectionTimedOut:
+				case KNetwork::TDESocketBase::ConnectionTimedOut:
 					errorCondition = i18n("Connection timed out.");
 					break;
-				case KNetwork::KSocketBase::InProgress:
+				case KNetwork::TDESocketBase::InProgress:
 					errorCondition = i18n("Connection attempt already in progress.");
 					break;
-				case KNetwork::KSocketBase::NetFailure:
+				case KNetwork::TDESocketBase::NetFailure:
 					errorCondition = i18n("Network failure.");
 					break;
-				case KNetwork::KSocketBase::NotSupported:
+				case KNetwork::TDESocketBase::NotSupported:
 					errorCondition = i18n("Operation is not supported.");
 					break;
-				case KNetwork::KSocketBase::Timeout:
+				case KNetwork::TDESocketBase::Timeout:
 					errorCondition = i18n("Socket timed out.");
 					break;
 				default:
diff --git a/kopete/protocols/jabber/jabberbasecontact.cpp b/kopete/protocols/jabber/jabberbasecontact.cpp
index 6ed0bcfd..d994487f 100644
--- a/kopete/protocols/jabber/jabberbasecontact.cpp
+++ b/kopete/protocols/jabber/jabberbasecontact.cpp
@@ -646,7 +646,7 @@ void JabberBaseContact::setPropertiesFromVCard ( const XMPP::VCard &vCard )
 		TQString tempPhotoPath = 0;
 		
 		// Downalod photo from URI.
-		if( !KIO::NetAccess::download( vCard.photoURI(), tempPhotoPath, 0) ) 
+		if( !TDEIO::NetAccess::download( vCard.photoURI(), tempPhotoPath, 0) ) 
 		{
 			KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget (), KMessageBox::Sorry, i18n( "Downloading of Jabber contact photo failed!" ) );
 			return;
@@ -656,7 +656,7 @@ void JabberBaseContact::setPropertiesFromVCard ( const XMPP::VCard &vCard )
 
 		contactPhoto = TQImage( tempPhotoPath );
 		
-		KIO::NetAccess::removeTempFile(  tempPhotoPath );
+		TDEIO::NetAccess::removeTempFile(  tempPhotoPath );
 	}
 
 	// Save the image to the disk, then set the property.
diff --git a/kopete/protocols/jabber/jabberconnector.cpp b/kopete/protocols/jabber/jabberconnector.cpp
index f2d74eab..6d43d305 100644
--- a/kopete/protocols/jabber/jabberconnector.cpp
+++ b/kopete/protocols/jabber/jabberconnector.cpp
@@ -27,7 +27,7 @@ JabberConnector::JabberConnector ( TQObject *parent, const char */*name*/ )
 {
 	kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "New Jabber connector." << endl;
 
-	mErrorCode = KNetwork::KSocketBase::NoError;
+	mErrorCode = KNetwork::TDESocketBase::NoError;
 
 	mByteStream = new JabberByteStream ( this );
 
@@ -54,7 +54,7 @@ void JabberConnector::connectToServer ( const TQString &server )
 	 * For XMPP 1.0, we need to enable this!
 	 */
 
-	mErrorCode = KNetwork::KSocketBase::NoError;
+	mErrorCode = KNetwork::TDESocketBase::NoError;
 
 	if ( !mByteStream->connect ( mHost, TQString::number ( mPort ) ) )
 	{
diff --git a/kopete/protocols/jabber/jabberfiletransfer.cpp b/kopete/protocols/jabber/jabberfiletransfer.cpp
index d49d846c..00ecd535 100644
--- a/kopete/protocols/jabber/jabberfiletransfer.cpp
+++ b/kopete/protocols/jabber/jabberfiletransfer.cpp
@@ -90,7 +90,7 @@ JabberFileTransfer::JabberFileTransfer ( JabberAccount *account, JabberBaseConta
 																			  contact->contactId (),
 																			  Kopete::FileTransferInfo::Outgoing );
 
- 	connect ( mKopeteTransfer, TQT_SIGNAL ( result ( KIO::Job * ) ), this, TQT_SLOT ( slotTransferResult () ) );
+ 	connect ( mKopeteTransfer, TQT_SIGNAL ( result ( TDEIO::Job * ) ), this, TQT_SLOT ( slotTransferResult () ) );
 
 	mXMPPTransfer = mAccount->client()->fileTransferManager()->createTransfer ();
 
@@ -182,13 +182,13 @@ void JabberFileTransfer::slotIncomingTransferAccepted ( Kopete::Transfer *transf
 
 	if ( !couldOpen )
 	{
-		transfer->slotError ( KIO::ERR_COULD_NOT_WRITE, fileName );
+		transfer->slotError ( TDEIO::ERR_COULD_NOT_WRITE, fileName );
 
 		deleteLater ();
 	}
 	else
 	{
-		connect ( mKopeteTransfer, TQT_SIGNAL ( result ( KIO::Job * ) ), this, TQT_SLOT ( slotTransferResult () ) );
+		connect ( mKopeteTransfer, TQT_SIGNAL ( result ( TDEIO::Job * ) ), this, TQT_SLOT ( slotTransferResult () ) );
 		connect ( mXMPPTransfer, TQT_SIGNAL ( readyRead ( const TQByteArray& ) ), this, TQT_SLOT ( slotIncomingDataReady ( const TQByteArray & ) ) );
 		connect ( mXMPPTransfer, TQT_SIGNAL ( error ( int ) ), this, TQT_SLOT ( slotTransferError ( int ) ) );
 		mXMPPTransfer->accept ( offset, length );
@@ -211,7 +211,7 @@ void JabberFileTransfer::slotTransferRefused ( const Kopete::FileTransferInfo &t
 void JabberFileTransfer::slotTransferResult ()
 {
 
-	if ( mKopeteTransfer->error () == KIO::ERR_USER_CANCELED )
+	if ( mKopeteTransfer->error () == TDEIO::ERR_USER_CANCELED )
 	{
 		kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Transfer with " << mXMPPTransfer->peer().full () << " has been canceled." << endl;
 		mXMPPTransfer->close ();
@@ -227,31 +227,31 @@ void JabberFileTransfer::slotTransferError ( int errorCode )
 	{
 		case XMPP::FileTransfer::ErrReject:
 			// user rejected the transfer request
-			mKopeteTransfer->slotError ( KIO::ERR_ACCESS_DENIED,
+			mKopeteTransfer->slotError ( TDEIO::ERR_ACCESS_DENIED,
 										 mXMPPTransfer->peer().full () );
 			break;
 
 		case XMPP::FileTransfer::ErrNeg:
 			// unable to negotiate a suitable connection for the file transfer with the user
-			mKopeteTransfer->slotError ( KIO::ERR_COULD_NOT_LOGIN,
+			mKopeteTransfer->slotError ( TDEIO::ERR_COULD_NOT_LOGIN,
 										 mXMPPTransfer->peer().full () );
 			break;
 
 		case XMPP::FileTransfer::ErrConnect:
 			// could not connect to the user
-			mKopeteTransfer->slotError ( KIO::ERR_COULD_NOT_CONNECT,
+			mKopeteTransfer->slotError ( TDEIO::ERR_COULD_NOT_CONNECT,
 										 mXMPPTransfer->peer().full () );
 			break;
 
 		case XMPP::FileTransfer::ErrStream:
 			// data stream was disrupted, probably cancelled
-			mKopeteTransfer->slotError ( KIO::ERR_CONNECTION_BROKEN,
+			mKopeteTransfer->slotError ( TDEIO::ERR_CONNECTION_BROKEN,
 										 mXMPPTransfer->peer().full () );
 			break;
 
 		default:
 			// unknown error
-			mKopeteTransfer->slotError ( KIO::ERR_UNKNOWN,
+			mKopeteTransfer->slotError ( TDEIO::ERR_UNKNOWN,
 										 mXMPPTransfer->peer().full () );
 			break;
 	}
diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.cpp b/kopete/protocols/jabber/kioslave/jabberdisco.cpp
index 2dc7f5ff..311cfafd 100644
--- a/kopete/protocols/jabber/kioslave/jabberdisco.cpp
+++ b/kopete/protocols/jabber/kioslave/jabberdisco.cpp
@@ -33,7 +33,7 @@
 #include "jabberclient.h"
 
 JabberDiscoProtocol::JabberDiscoProtocol ( const TQCString &pool_socket, const TQCString &app_socket )
-	: KIO::SlaveBase ( "kio_jabberdisco", pool_socket, app_socket )
+	: TDEIO::SlaveBase ( "kio_jabberdisco", pool_socket, app_socket )
 {
 	kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Slave launched." << endl;
 
@@ -106,7 +106,7 @@ void JabberDiscoProtocol::openConnection ()
 	{
 		case JabberClient::NoTLS:
 			// no SSL support, at the connecting stage this means the problem is client-side
-			error ( KIO::ERR_UPGRADE_REQUIRED, i18n ( "TLS" ) );
+			error ( TDEIO::ERR_UPGRADE_REQUIRED, i18n ( "TLS" ) );
 			break;
 
 		case JabberClient::Ok:
@@ -184,7 +184,7 @@ void JabberDiscoProtocol::slotHandleTLSWarning ( int validityResult )
 {
 	kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Handling TLS warning..." << endl;
 
-	if ( messageBox ( KIO::SlaveBase::WarningContinueCancel,
+	if ( messageBox ( TDEIO::SlaveBase::WarningContinueCancel,
 					  i18n ( "The server certificate is invalid. Do you want to continue? " ),
 					  i18n ( "Certificate Warning" ) ) == KMessageBox::Continue )
 	{
@@ -207,7 +207,7 @@ void JabberDiscoProtocol::slotClientError ( JabberClient::ErrorCode errorCode )
 	{
 		case JabberClient::NoTLS:
 		default:
-			error ( KIO::ERR_UPGRADE_REQUIRED, i18n ( "TLS" ) );
+			error ( TDEIO::ERR_UPGRADE_REQUIRED, i18n ( "TLS" ) );
 			closeConnection ();
 			break;
 	}
@@ -252,33 +252,33 @@ void JabberDiscoProtocol::slotQueryFinished ()
 
 	if (!task->success ())
 	{
-		error ( KIO::ERR_COULD_NOT_READ, "" );
+		error ( TDEIO::ERR_COULD_NOT_READ, "" );
 		return;
 	}
 
 	XMPP::DiscoList::const_iterator itemsEnd = task->items().end ();
 	for (XMPP::DiscoList::const_iterator it = task->items().begin (); it != itemsEnd; ++it)
 	{
-		KIO::UDSAtom atom;
-		KIO::UDSEntry entry;
+		TDEIO::UDSAtom atom;
+		TDEIO::UDSEntry entry;
 		
-		atom.m_uds = KIO::UDS_NAME;
+		atom.m_uds = TDEIO::UDS_NAME;
 		atom.m_str = (*it).jid().userHost ();
 		entry.prepend ( atom );
 
-		atom.m_uds = KIO::UDS_SIZE;
+		atom.m_uds = TDEIO::UDS_SIZE;
 		atom.m_long = 0;
 		entry.prepend ( atom );
 
-		atom.m_uds = KIO::UDS_LINK_DEST;
+		atom.m_uds = TDEIO::UDS_LINK_DEST;
 		atom.m_str = (*it).name ();
 		entry.prepend ( atom );
 
-		atom.m_uds = KIO::UDS_MIME_TYPE;
+		atom.m_uds = TDEIO::UDS_MIME_TYPE;
 		atom.m_str = "inode/directory";
 		entry.prepend ( atom );
 
-		atom.m_uds = KIO::UDS_SIZE;
+		atom.m_uds = TDEIO::UDS_SIZE;
 		atom.m_long = 0;
 		entry.prepend ( atom );
 
@@ -286,7 +286,7 @@ void JabberDiscoProtocol::slotQueryFinished ()
 
 	}
 
-	listEntry ( KIO::UDSEntry(), true );
+	listEntry ( TDEIO::UDSEntry(), true );
 
 	finished ();
 
@@ -314,7 +314,7 @@ void JabberDiscoProtocol::slotCSError ( int errorCode )
 	{
 		kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Incorrect password, retrying." << endl;
 
-		KIO::AuthInfo authInfo;
+		TDEIO::AuthInfo authInfo;
 		authInfo.username = m_user;
 		authInfo.password = m_password;
 		if ( openPassDlg ( authInfo, i18n ( "The login details are incorrect. Do you want to try again?" ) ) )
@@ -327,13 +327,13 @@ void JabberDiscoProtocol::slotCSError ( int errorCode )
 		else
 		{
 			closeConnection ();
-			error ( KIO::ERR_COULD_NOT_AUTHENTICATE, "" );
+			error ( TDEIO::ERR_COULD_NOT_AUTHENTICATE, "" );
 		}
 	}
 	else
 	{
 		closeConnection ();
-		error ( KIO::ERR_CONNECTION_BROKEN, "" );
+		error ( TDEIO::ERR_CONNECTION_BROKEN, "" );
 	}
 
 }
diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.h b/kopete/protocols/jabber/kioslave/jabberdisco.h
index 9b8f5be0..660ba269 100644
--- a/kopete/protocols/jabber/kioslave/jabberdisco.h
+++ b/kopete/protocols/jabber/kioslave/jabberdisco.h
@@ -33,7 +33,7 @@
 
 class JabberClient;
 
-class JabberDiscoProtocol : public TQObject, public KIO::SlaveBase
+class JabberDiscoProtocol : public TQObject, public TDEIO::SlaveBase
 {
 
 Q_OBJECT
diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
index 7682aee7..2da7740e 100644
--- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
@@ -475,7 +475,7 @@ void dlgJabberVCard::slotSelectPhoto()
 
 	if( !filePath.isLocalFile() ) 
 	{
-		if( !KIO::NetAccess::download( filePath, path, this ) ) 
+		if( !TDEIO::NetAccess::download( filePath, path, this ) ) 
 		{
 			KMessageBox::queuedMessageBox( this, KMessageBox::Sorry, i18n( "Downloading of Jabber contact photo failed!" ) );
 			return;
@@ -536,7 +536,7 @@ void dlgJabberVCard::slotSelectPhoto()
 			"Make sure that you have selected a correct image file</qt>" ) );
 	}
 	if( remoteFile )
-		KIO::NetAccess::removeTempFile( path );
+		TDEIO::NetAccess::removeTempFile( path );
 }
 
 void dlgJabberVCard::slotClearPhoto()
diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.cpp b/kopete/protocols/jabber/ui/jabberchooseserver.cpp
index 63339158..a9a00689 100644
--- a/kopete/protocols/jabber/ui/jabberchooseserver.cpp
+++ b/kopete/protocols/jabber/ui/jabberchooseserver.cpp
@@ -46,10 +46,10 @@ JabberChooseServer::JabberChooseServer ( JabberRegisterAccount *parent, const ch
 	mMainWidget->listServers->setLeftMargin ( 0 );
 
 	// retrieve server list
-	mTransferJob = KIO::get ( "http://www.jabber.org/servers.xml" );
+	mTransferJob = TDEIO::get ( "http://www.jabber.org/servers.xml" );
 
-	connect ( mTransferJob, TQT_SIGNAL ( result ( KIO::Job* ) ), this, TQT_SLOT ( slotTransferResult ( KIO::Job* ) ) );
-	connect ( mTransferJob, TQT_SIGNAL ( data ( KIO::Job*, const TQByteArray& ) ), this, TQT_SLOT ( slotTransferData ( KIO::Job*, const TQByteArray& ) ) );
+	connect ( mTransferJob, TQT_SIGNAL ( result ( TDEIO::Job* ) ), this, TQT_SLOT ( slotTransferResult ( TDEIO::Job* ) ) );
+	connect ( mTransferJob, TQT_SIGNAL ( data ( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT ( slotTransferData ( TDEIO::Job*, const TQByteArray& ) ) );
 
 	connect ( mMainWidget->listServers, TQT_SIGNAL ( pressed ( int, int, int, const TQPoint & ) ), this, TQT_SLOT ( slotSetSelection ( int ) ) );
 	connect ( mMainWidget->listServers, TQT_SIGNAL ( doubleClicked ( int, int, int, const TQPoint & ) ), this, TQT_SLOT ( slotOk () ) );
@@ -90,7 +90,7 @@ void JabberChooseServer::slotSetSelection ( int row )
 
 }
 
-void JabberChooseServer::slotTransferData ( KIO::Job */*job*/, const TQByteArray &data )
+void JabberChooseServer::slotTransferData ( TDEIO::Job */*job*/, const TQByteArray &data )
 {
 
 	unsigned oldSize = xmlServerList.size ();
@@ -103,7 +103,7 @@ void JabberChooseServer::slotTransferData ( KIO::Job */*job*/, const TQByteArray
 
 }
 
-void JabberChooseServer::slotTransferResult ( KIO::Job *job )
+void JabberChooseServer::slotTransferResult ( TDEIO::Job *job )
 {
 
 	if ( job->error () || mTransferJob->isErrorPage () )
diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.h b/kopete/protocols/jabber/ui/jabberchooseserver.h
index 8523a0dc..d6109a33 100644
--- a/kopete/protocols/jabber/ui/jabberchooseserver.h
+++ b/kopete/protocols/jabber/ui/jabberchooseserver.h
@@ -26,7 +26,7 @@
 class JabberRegisterAccount;
 class DlgJabberChooseServer;
 
-namespace KIO
+namespace TDEIO
 {
 	class Job;
 	class TransferJob;
@@ -49,14 +49,14 @@ public:
 private slots:
 	void slotOk ();
 	void slotCancel ();
-	void slotTransferData ( KIO::Job *job, const TQByteArray &data );
-	void slotTransferResult ( KIO::Job *job );
+	void slotTransferData ( TDEIO::Job *job, const TQByteArray &data );
+	void slotTransferResult ( TDEIO::Job *job );
 	void slotSetSelection ( int row );
 
 private:
 	DlgJabberChooseServer *mMainWidget;
 	JabberRegisterAccount *mParentWidget;
-	KIO::TransferJob *mTransferJob;
+	TDEIO::TransferJob *mTransferJob;
 	TQByteArray xmlServerList;
 
 	int mSelectedRow;