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

2 files changed, 17 insertions, 17 deletions

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