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

14 files changed, 89 insertions, 89 deletions

diff --git a/kioslaves/imap4/imap4.cc b/kioslaves/imap4/imap4.cc
index e17808a0d..6654bb3dd 100644
--- a/kioslaves/imap4/imap4.cc
+++ b/kioslaves/imap4/imap4.cc
@@ -96,7 +96,7 @@ extern "C" {
 #define IMAP_PROTOCOL "imap"
 #define IMAP_SSL_PROTOCOL "imaps"
 
-using namespace KIO;
+using namespace TDEIO;
 
 extern "C"
 {
@@ -768,14 +768,14 @@ void
 IMAP4Protocol::setSubURL (const KURL & _url)
 {
   kdDebug(7116) << "IMAP4::setSubURL - " << _url.prettyURL() << endl;
-  KIO::TCPSlaveBase::setSubURL (_url);
+  TDEIO::TCPSlaveBase::setSubURL (_url);
 }
 
 void
 IMAP4Protocol::put (const KURL & _url, int, bool, bool)
 {
   kdDebug(7116) << "IMAP4::put - " << _url.prettyURL() << endl;
-//  KIO::TCPSlaveBase::put(_url,permissions,overwrite,resume);
+//  TDEIO::TCPSlaveBase::put(_url,permissions,overwrite,resume);
   TQString aBox, aSequence, aLType, aSection, aValidity, aDelimiter, aInfo;
   enum IMAP_TYPE aType =
     parseURL (_url, aBox, aSection, aLType, aSequence, aValidity, aDelimiter, aInfo);
@@ -1823,7 +1823,7 @@ void
 IMAP4Protocol::dispatch (int command, const TQByteArray & data)
 {
   kdDebug(7116) << "IMAP4::dispatch - command=" << command << endl;
-  KIO::TCPSlaveBase::dispatch (command, data);
+  TDEIO::TCPSlaveBase::dispatch (command, data);
 }
 
 void
@@ -1884,7 +1884,7 @@ IMAP4Protocol::stat (const KURL & _url)
       if (found)
         error(ERR_COULD_NOT_STAT, aBox);
       else
-        error(KIO::ERR_DOES_NOT_EXIST, aBox);
+        error(TDEIO::ERR_DOES_NOT_EXIST, aBox);
       return;
     }
     if ((aSection == "UIDNEXT" && geStatus().uidNextAvailable())
@@ -2126,7 +2126,7 @@ bool IMAP4Protocol::makeLogin ()
 
     kdDebug(7116) << "IMAP4::makeLogin - attempting login" << endl;
 
-    KIO::AuthInfo authInfo;
+    TDEIO::AuthInfo authInfo;
     authInfo.username = myUser;
     authInfo.password = myPass;
     authInfo.prompt = i18n ("Username and password for your IMAP account:");
@@ -2143,21 +2143,21 @@ bool IMAP4Protocol::makeLogin ()
         }
       }
       if (!clientLogin (myUser, myPass, resultInfo))
-        error(KIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to login. Probably the "
+        error(TDEIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to login. Probably the "
         "password is wrong.\nThe server %1 replied:\n%2").arg(myHost).arg(resultInfo));
     }
     else
     {
 #ifdef HAVE_LIBSASL2
       if (!clientAuthenticate (this, authInfo, myHost, myAuth, mySSL, resultInfo))
-        error(KIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to authenticate via %1.\n"
+        error(TDEIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to authenticate via %1.\n"
 	"The server %2 replied:\n%3").arg(myAuth).arg(myHost).arg(resultInfo));
       else {
         myUser = authInfo.username;
         myPass = authInfo.password;
       }
 #else
-      error(KIO::ERR_COULD_NOT_LOGIN, i18n("SASL authentication is not compiled into kio_imap4."));
+      error(TDEIO::ERR_COULD_NOT_LOGIN, i18n("SASL authentication is not compiled into kio_imap4."));
 #endif
     }
     if ( hasCapability("NAMESPACE") )
@@ -2326,7 +2326,7 @@ IMAP4Protocol::doListEntry (const TQString & encodedUrl, int stretch, imapCache
     atom.m_str = myUser;
     entry.append (atom);
 
-    atom.m_uds = KIO::UDS_ACCESS;
+    atom.m_uds = TDEIO::UDS_ACCESS;
     atom.m_long = (withFlags) ? cache->getFlags() : S_IRUSR | S_IXUSR | S_IWUSR;
     entry.append (atom);
 
@@ -2704,7 +2704,7 @@ IMAP4Protocol::assureBox (const TQString & aBox, bool readonly)
           error(ERR_SLAVE_DEFINED, i18n("Unable to open folder %1. The server replied: %2").arg(aBox).arg(cmdInfo));
         }
       } else {
-        error(KIO::ERR_DOES_NOT_EXIST, aBox);
+        error(TDEIO::ERR_DOES_NOT_EXIST, aBox);
       }
       return false;
     }
@@ -2726,7 +2726,7 @@ IMAP4Protocol::assureBox (const TQString & aBox, bool readonly)
   // if it is the mode we want
   if (!getSelected().readWrite() && !readonly)
   {
-    error(KIO::ERR_CANNOT_OPEN_FOR_WRITING, aBox);
+    error(TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, aBox);
     return false;
   }
 
diff --git a/kioslaves/imap4/imap4.h b/kioslaves/imap4/imap4.h
index d03f8c0c8..164cf8556 100644
--- a/kioslaves/imap4/imap4.h
+++ b/kioslaves/imap4/imap4.h
@@ -45,7 +45,7 @@ enum IMAP_TYPE
 
 /** @brief IOSlave derived class */
 class IMAP4Protocol:public
-  KIO::TCPSlaveBase,
+  TDEIO::TCPSlaveBase,
   public
   imapParser,
   public
@@ -194,7 +194,7 @@ private:
   TQByteArray outputCache;
   TQBuffer outputBuffer;
   TQ_ULONG outputBufferIndex;
-  KIO::filesize_t mProcessedSize;
+  TDEIO::filesize_t mProcessedSize;
 
   char readBuffer[IMAP_BUFFER];
   ssize_t readBufferLen;
diff --git a/kioslaves/imap4/imapparser.cc b/kioslaves/imap4/imapparser.cc
index d7ad8697e..8cb06e318 100644
--- a/kioslaves/imap4/imapparser.cc
+++ b/kioslaves/imap4/imapparser.cc
@@ -169,7 +169,7 @@ imapParser::clientLogin (const TQString & aUser, const TQString & aPass,
 }
 
 #ifdef HAVE_LIBSASL2
-static bool sasl_interact( KIO::SlaveBase *slave, KIO::AuthInfo &ai, void *in )
+static bool sasl_interact( TDEIO::SlaveBase *slave, TDEIO::AuthInfo &ai, void *in )
 {
   kdDebug(7116) << "sasl_interact" << endl;
   sasl_interact_t *interact = ( sasl_interact_t * ) in;
@@ -215,7 +215,7 @@ static bool sasl_interact( KIO::SlaveBase *slave, KIO::AuthInfo &ai, void *in )
 #endif
 
 bool
-imapParser::clientAuthenticate ( KIO::SlaveBase *slave, KIO::AuthInfo &ai,
+imapParser::clientAuthenticate ( TDEIO::SlaveBase *slave, TDEIO::AuthInfo &ai,
   const TQString & aFTQDN, const TQString & aAuth, bool isSSL, TQString & resultInfo)
 {
   bool retVal = false;
diff --git a/kioslaves/imap4/imapparser.h b/kioslaves/imap4/imapparser.h
index d24e9c813..7c498b09d 100644
--- a/kioslaves/imap4/imapparser.h
+++ b/kioslaves/imap4/imapparser.h
@@ -248,7 +248,7 @@ public:
    * @param resultInfo The resultinfo from the command
    * @return success or failure
    */
-  bool clientAuthenticate (KIO::SlaveBase *slave, KIO::AuthInfo &ai, const TQString & aFTQDN,
+  bool clientAuthenticate (TDEIO::SlaveBase *slave, TDEIO::AuthInfo &ai, const TQString & aFTQDN,
     const TQString & aAuth, bool isSSL, TQString & resultInfo);
 
   /**
diff --git a/kioslaves/mbox/mbox.cc b/kioslaves/mbox/mbox.cc
index 3d56c09ff..0c4fca815 100644
--- a/kioslaves/mbox/mbox.cc
+++ b/kioslaves/mbox/mbox.cc
@@ -59,7 +59,7 @@ int kdemain( int argc, char * argv[] )
 }
 
 MBoxProtocol::MBoxProtocol( const TQCString& arg1, const TQCString& arg2 )
-	: KIO::SlaveBase( "mbox2", arg1, arg2 ),
+	: TDEIO::SlaveBase( "mbox2", arg1, arg2 ),
 	m_errorState( true )
 {
 	
@@ -79,7 +79,7 @@ void MBoxProtocol::get( const KURL& url )
 
 	if( info.type() == UrlInfo::invalid && !m_errorState )
 	{
-		error( KIO::ERR_DOES_NOT_EXIST, info.url() );
+		error( TDEIO::ERR_DOES_NOT_EXIST, info.url() );
 		return;
 	}
 	
@@ -106,7 +106,7 @@ void MBoxProtocol::listDir( const KURL& url )
 {
 	m_errorState = false;
 	
-	KIO::UDSEntry entry;
+	TDEIO::UDSEntry entry;
 	UrlInfo info( url, UrlInfo::directory );
 	ReadMBox mbox( &info, this, hasMetaData( "onlynew" ), hasMetaData( "savetime" ) );
 
@@ -115,7 +115,7 @@ void MBoxProtocol::listDir( const KURL& url )
 	
 	if( info.type() != UrlInfo::directory )
 	{
-		error( KIO::ERR_DOES_NOT_EXIST, info.url() );
+		error( TDEIO::ERR_DOES_NOT_EXIST, info.url() );
 		return;
 	}
 	
@@ -126,7 +126,7 @@ void MBoxProtocol::listDir( const KURL& url )
 			listEntry( entry, false );
 	}
 
-	listEntry( KIO::UDSEntry(), true );
+	listEntry( TDEIO::UDSEntry(), true );
 	finished();
 }
 
@@ -135,7 +135,7 @@ void MBoxProtocol::stat( const KURL& url )
 	UrlInfo info( url );
 	if( info.type() == UrlInfo::invalid )
 	{
-		error( KIO::ERR_DOES_NOT_EXIST, url.path() );
+		error( TDEIO::ERR_DOES_NOT_EXIST, url.path() );
 		return;
 	} else
 	{
@@ -154,7 +154,7 @@ void MBoxProtocol::mimetype( const KURL& url )
 		return;
 	
 	if( info.type() == UrlInfo::invalid )
-		error( KIO::ERR_DOES_NOT_EXIST, i18n( "Invalid URL" ) );
+		error( TDEIO::ERR_DOES_NOT_EXIST, i18n( "Invalid URL" ) );
 	else
 		mimeType( info.mimetype() );
 	finished();
diff --git a/kioslaves/mbox/mbox.h b/kioslaves/mbox/mbox.h
index 6d207ab3c..159c4213e 100644
--- a/kioslaves/mbox/mbox.h
+++ b/kioslaves/mbox/mbox.h
@@ -28,11 +28,11 @@ class KURL;
  * This class is the main class and implements all function
  * which can be called through the user.
  */
-class MBoxProtocol : public KIO::SlaveBase
+class MBoxProtocol : public TDEIO::SlaveBase
 {
 public:
 	/**
-	 * Constructor, for the parameters,  See KIO::SlaveBase
+	 * Constructor, for the parameters,  See TDEIO::SlaveBase
 	 */
 	MBoxProtocol( const TQCString&, const TQCString& );
 	/**
diff --git a/kioslaves/mbox/readmbox.cc b/kioslaves/mbox/readmbox.cc
index 280bb4615..3125fd747 100644
--- a/kioslaves/mbox/readmbox.cc
+++ b/kioslaves/mbox/readmbox.cc
@@ -53,14 +53,14 @@ ReadMBox::ReadMBox( const UrlInfo* info, MBoxProtocol* parent, bool onlynew, boo
 	
 {
 	if( m_info->type() == UrlInfo::invalid )
-		m_mbox->emitError( KIO::ERR_DOES_NOT_EXIST, info->url() );
+		m_mbox->emitError( TDEIO::ERR_DOES_NOT_EXIST, info->url() );
 		
 	if( !open( savetime ) )
-		m_mbox->emitError( KIO::ERR_CANNOT_OPEN_FOR_READING, info->url() );
+		m_mbox->emitError( TDEIO::ERR_CANNOT_OPEN_FOR_READING, info->url() );
 
 	if( m_info->type() == UrlInfo::message )
 		if( !searchMessage( m_info->id() ) )
-			m_mbox->emitError( KIO::ERR_DOES_NOT_EXIST, info->url() );
+			m_mbox->emitError( TDEIO::ERR_DOES_NOT_EXIST, info->url() );
 }
 
 ReadMBox::~ReadMBox()
diff --git a/kioslaves/mbox/stat.cc b/kioslaves/mbox/stat.cc
index 00285b149..c5d9a3bdf 100644
--- a/kioslaves/mbox/stat.cc
+++ b/kioslaves/mbox/stat.cc
@@ -26,20 +26,20 @@
 
 #include <sys/stat.h>
 
-KIO::UDSEntry Stat::stat( const UrlInfo& info )
+TDEIO::UDSEntry Stat::stat( const UrlInfo& info )
 {
 	if( info.type() == UrlInfo::message )
 		return Stat::statMessage( info );
 	else if( info.type() == UrlInfo::directory )
 		return Stat::statDirectory( info );
 	else
-		return KIO::UDSEntry();
+		return TDEIO::UDSEntry();
 }
 
-KIO::UDSEntry Stat::stat( ReadMBox& mbox, const UrlInfo& info )
+TDEIO::UDSEntry Stat::stat( ReadMBox& mbox, const UrlInfo& info )
 {
 	kdDebug() << "Stat::stat()" << endl;
-	KIO::UDSEntry entry;
+	TDEIO::UDSEntry entry;
 	TQString url;
 	
 	if( info.type() == UrlInfo::invalid )
@@ -47,54 +47,54 @@ KIO::UDSEntry Stat::stat( ReadMBox& mbox, const UrlInfo& info )
 	else if( info.type() == UrlInfo::message )
 		mbox.searchMessage( info.id() );
 
-	Stat::addAtom( entry, KIO::UDS_FILE_TYPE, S_IFREG );
-        Stat::addAtom( entry, KIO::UDS_MIME_TYPE, "message/rfc822" );
+	Stat::addAtom( entry, TDEIO::UDS_FILE_TYPE, S_IFREG );
+        Stat::addAtom( entry, TDEIO::UDS_MIME_TYPE, "message/rfc822" );
 		        
 	url = TQString( "mbox:%1/%2" ).arg( info.filename(), mbox.currentID() );
-	Stat::addAtom( entry, KIO::UDS_URL, url );
+	Stat::addAtom( entry, TDEIO::UDS_URL, url );
 	if( mbox.currentID().isEmpty() )
-		Stat::addAtom( entry, KIO::UDS_NAME, "foobar" );
+		Stat::addAtom( entry, TDEIO::UDS_NAME, "foobar" );
 	else
-	        Stat::addAtom( entry, KIO::UDS_NAME, mbox.currentID() );
+	        Stat::addAtom( entry, TDEIO::UDS_NAME, mbox.currentID() );
 	
 
-	Stat::addAtom( entry, KIO::UDS_SIZE, mbox.skipMessage() );
+	Stat::addAtom( entry, TDEIO::UDS_SIZE, mbox.skipMessage() );
 
 	return entry;
 }
 
-KIO::UDSEntry Stat::statDirectory( const UrlInfo& info )
+TDEIO::UDSEntry Stat::statDirectory( const UrlInfo& info )
 {
 	kdDebug() << "statDirectory()" << endl;
-	KIO::UDSEntry entry;
+	TDEIO::UDSEntry entry;
 
 	//Specific things for a directory
-	Stat::addAtom( entry, KIO::UDS_FILE_TYPE, S_IFDIR );
-	Stat::addAtom( entry, KIO::UDS_NAME, info.filename() );
+	Stat::addAtom( entry, TDEIO::UDS_FILE_TYPE, S_IFDIR );
+	Stat::addAtom( entry, TDEIO::UDS_NAME, info.filename() );
 
 	return entry;
 }
 
-KIO::UDSEntry Stat::statMessage( const UrlInfo& info )
+TDEIO::UDSEntry Stat::statMessage( const UrlInfo& info )
 {
 	kdDebug() << "statMessage( " << info.url()  << " )" << endl;
-	KIO::UDSEntry entry;
+	TDEIO::UDSEntry entry;
 	TQString url = TQString( "mbox:%1" ).arg( info.url() );
 
 	//Specific things for a message
-	Stat::addAtom( entry, KIO::UDS_FILE_TYPE, S_IFREG );
-	Stat::addAtom( entry, KIO::UDS_MIME_TYPE, "message/rfc822" );
+	Stat::addAtom( entry, TDEIO::UDS_FILE_TYPE, S_IFREG );
+	Stat::addAtom( entry, TDEIO::UDS_MIME_TYPE, "message/rfc822" );
 	
-	Stat::addAtom( entry, KIO::UDS_URL, url );
+	Stat::addAtom( entry, TDEIO::UDS_URL, url );
 	url = url.right( url.length() - url.findRev( "/" ) - 1 );
-	Stat::addAtom( entry, KIO::UDS_NAME, url );
+	Stat::addAtom( entry, TDEIO::UDS_NAME, url );
 
 	return entry;
 }
 
-void Stat::addAtom( KIO::UDSEntry& entry, unsigned int uds, const TQString& str )
+void Stat::addAtom( TDEIO::UDSEntry& entry, unsigned int uds, const TQString& str )
 {
-	KIO::UDSAtom atom;
+	TDEIO::UDSAtom atom;
 	atom.m_uds = uds;
 	atom.m_str = str;
 	atom.m_long = 0;
@@ -103,9 +103,9 @@ void Stat::addAtom( KIO::UDSEntry& entry, unsigned int uds, const TQString& str
 }
 
 
-void Stat::addAtom( KIO::UDSEntry& entry, unsigned int uds, long lng )
+void Stat::addAtom( TDEIO::UDSEntry& entry, unsigned int uds, long lng )
 {
-	KIO::UDSAtom atom;
+	TDEIO::UDSAtom atom;
 	atom.m_uds = uds;
 	atom.m_str = TQString();
 	atom.m_long = lng;
diff --git a/kioslaves/mbox/stat.h b/kioslaves/mbox/stat.h
index 3efbcaf64..8ce593cc0 100644
--- a/kioslaves/mbox/stat.h
+++ b/kioslaves/mbox/stat.h
@@ -50,7 +50,7 @@ public:
 	 * @param info The file information
 	 * @return The information of the file as destribed in UrlInfo.
 	 */
-	static KIO::UDSEntry stat( const UrlInfo& info );
+	static TDEIO::UDSEntry stat( const UrlInfo& info );
 	/**
 	 * This function gives information with a given ReadMBox and UrlInfo.
 	 * Through this, it is possible to ask the stats of the next message,
@@ -59,24 +59,24 @@ public:
 	 * @param info The url information.
 	 * @return The requesteds information.
 	 */
-	static KIO::UDSEntry stat( ReadMBox& mbox, const UrlInfo& info );
+	static TDEIO::UDSEntry stat( ReadMBox& mbox, const UrlInfo& info );
 	
 	/**
 	 * This function gets the stats of a given mbox-file in an UDSEntry.
 	 * @param info The location of the mbox-file.
 	 * @return A list of Atoms.
 	 */
-	static KIO::UDSEntry statDirectory( const UrlInfo& info );
+	static TDEIO::UDSEntry statDirectory( const UrlInfo& info );
 
 	/**
 	 * This function gets the stats of a geven mbox-message in a UDSEntry.
 	 * @param info The url of the mbox-message.
 	 * @return Information shipped in an UDSEntry.
 	 */
-	static KIO::UDSEntry statMessage( const UrlInfo& info );
+	static TDEIO::UDSEntry statMessage( const UrlInfo& info );
 private:
-	static void addAtom( KIO::UDSEntry& entry, unsigned int key, const TQString& value );
-	static void addAtom( KIO::UDSEntry& entry, unsigned int key, const long value );
+	static void addAtom( TDEIO::UDSEntry& entry, unsigned int key, const TQString& value );
+	static void addAtom( TDEIO::UDSEntry& entry, unsigned int key, const long value );
 };
 
 #endif
diff --git a/kioslaves/opengroupware/opengroupware.cpp b/kioslaves/opengroupware/opengroupware.cpp
index 70ffd7dcc..b4c19b711 100644
--- a/kioslaves/opengroupware/opengroupware.cpp
+++ b/kioslaves/opengroupware/opengroupware.cpp
@@ -193,9 +193,9 @@ void OpenGroupware::getCalendar( const KURL &_url )
   kdDebug(7000) << "getCalendar: " << url.prettyURL() << endl;
 
   // FIXME do progress handling
-  mListEventsJob = KIO::davPropFind( url, props, "0", false );
-  connect( mListEventsJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotGetCalendarListingResult( KIO::Job * ) ) );
+  mListEventsJob = TDEIO::davPropFind( url, props, "0", false );
+  connect( mListEventsJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotGetCalendarListingResult( TDEIO::Job * ) ) );
 }
 
 void OpenGroupware::getAddressbook( const KURL &url )
@@ -205,7 +205,7 @@ void OpenGroupware::getAddressbook( const KURL &url )
 
 void OpenGroupware::errorMessage( const TQString &msg )
 {
-  error( KIO::ERR_SLAVE_DEFINED, msg );
+  error( TDEIO::ERR_SLAVE_DEFINED, msg );
 }
 
 void OpenGroupware::debugMessage( const TQString &msg )
@@ -218,7 +218,7 @@ void OpenGroupware::debugMessage( const TQString &msg )
 }
 
 
-void OpenGroupware::slotGetCalendarListingResult( KIO::Job *job )
+void OpenGroupware::slotGetCalendarListingResult( TDEIO::Job *job )
 {
   
   kdDebug(7000) << k_funcinfo << endl;
@@ -242,7 +242,7 @@ void OpenGroupware::slotGetCalendarListingResult( KIO::Job *job )
 }
 
 
-void OpenGroupware::slotGetCalendarResult( KIO::Job *job )
+void OpenGroupware::slotGetCalendarResult( TDEIO::Job *job )
 {
   Q_UNUSED( job );
 }
diff --git a/kioslaves/opengroupware/opengroupware.h b/kioslaves/opengroupware/opengroupware.h
index 075af372a..da104c8cf 100644
--- a/kioslaves/opengroupware/opengroupware.h
+++ b/kioslaves/opengroupware/opengroupware.h
@@ -24,13 +24,13 @@
 
 #include <tqobject.h>
 
-namespace KIO {
+namespace TDEIO {
   class Job;
   class DavJob;
 }
 
 
-class OpenGroupware : public TQObject, public KIO::SlaveBase
+class OpenGroupware : public TQObject, public TDEIO::SlaveBase
 {
     Q_OBJECT
   
@@ -48,10 +48,10 @@ class OpenGroupware : public TQObject, public KIO::SlaveBase
     void getCalendar( const KURL &url );
     void getAddressbook( const KURL &url );
   protected slots:
-    void slotGetCalendarListingResult( KIO::Job* );
-    void slotGetCalendarResult( KIO::Job* );
+    void slotGetCalendarListingResult( TDEIO::Job* );
+    void slotGetCalendarResult( TDEIO::Job* );
   private:
-    KIO::DavJob *mListEventsJob;
+    TDEIO::DavJob *mListEventsJob;
 };
 
 #endif
diff --git a/kioslaves/sieve/configure.in.in b/kioslaves/sieve/configure.in.in
index a722cfebb..ffc1b4b7e 100644
--- a/kioslaves/sieve/configure.in.in
+++ b/kioslaves/sieve/configure.in.in
@@ -4,7 +4,7 @@ AC_ARG_ENABLE(broken-timsieved-workaround,
                 [versions <= 1.1.0 of the timsieved (part of the Cyrus
 		IMAP suite) do not interpret the HAVESPACE command of
 		the sieve protocol. This option makes the sieve
-		KIO::Slave simply omit that command.])],
+		TDEIO::Slave simply omit that command.])],
 [case "${enableval}" in
       yes) AC_MSG_RESULT(yes)
 	   need_broken_timsieved_support="yes" ;;
@@ -14,5 +14,5 @@ esac],[AC_MSG_RESULT(no)])
 
 if test "$need_broken_timsieved_support" = "yes"; then
    AC_SUBST(HAVE_BROKEN_TIMSIEVED)
-   AC_DEFINE(HAVE_BROKEN_TIMSIEVED,1,[Define if the sieve KIO::Slave must be able to talk to timsieved <= 1.1.0])
+   AC_DEFINE(HAVE_BROKEN_TIMSIEVED,1,[Define if the sieve TDEIO::Slave must be able to talk to timsieved <= 1.1.0])
 fi
diff --git a/kioslaves/sieve/sieve.cpp b/kioslaves/sieve/sieve.cpp
index 4e95c5a16..9d373c2ad 100644
--- a/kioslaves/sieve/sieve.cpp
+++ b/kioslaves/sieve/sieve.cpp
@@ -77,7 +77,7 @@ static sasl_callback_t callbacks[] = {
 
 static const unsigned int SIEVE_DEFAULT_RECIEVE_BUFFER = 512;
 
-using namespace KIO;
+using namespace TDEIO;
 extern "C"
 {
 	KDE_EXPORT int kdemain(int argc, char **argv)
@@ -441,7 +441,7 @@ void kio_sieveProtocol::disconnect(bool forcibly)
 
 		// This crashes under certain conditions as described in
 		// http://intevation.de/roundup/kolab/issue2442
-		// Fixing KIO::TCPSlaveBase::atEnd() for !fd would also work but 3.x is on life support.
+		// Fixing TDEIO::TCPSlaveBase::atEnd() for !fd would also work but 3.x is on life support.
 		//if (!operationSuccessful())
 		//	ksDebug() << "Server did not logout cleanly." << endl;
 	}
@@ -745,7 +745,7 @@ void kio_sieveProtocol::get(const KURL& url)
 		do {
 		  // wait for data...
 		  if ( !waitForResponse( 600 ) ) {
-		    error( KIO::ERR_SERVER_TIMEOUT, m_sServer );
+		    error( TDEIO::ERR_SERVER_TIMEOUT, m_sServer );
 		    disconnect( true );
 		    return;
 		  }
@@ -757,7 +757,7 @@ void kio_sieveProtocol::get(const KURL& url)
 		  ssize_t this_recv_len = read( dat.data(), dat.size() );
 
 		  if ( this_recv_len < 1 && !isConnectionValid() ) {
-		    error( KIO::ERR_CONNECTION_BROKEN, m_sServer );
+		    error( TDEIO::ERR_CONNECTION_BROKEN, m_sServer );
 		    disconnect( true );
 		    return;
 		  }
@@ -856,15 +856,15 @@ void kio_sieveProtocol::stat(const KURL& url)
 
 	if (filename.isEmpty()) {
 		UDSAtom atom;
-		atom.m_uds = KIO::UDS_NAME;
+		atom.m_uds = TDEIO::UDS_NAME;
 		atom.m_str = "/";
 		entry.append(atom);
 
-		atom.m_uds = KIO::UDS_FILE_TYPE;
+		atom.m_uds = TDEIO::UDS_FILE_TYPE;
 		atom.m_long = S_IFDIR;
 		entry.append(atom);
 
-		atom.m_uds = KIO::UDS_ACCESS;
+		atom.m_uds = TDEIO::UDS_ACCESS;
 		atom.m_long = 0700;
 		entry.append(atom);
 
@@ -885,22 +885,22 @@ void kio_sieveProtocol::stat(const KURL& url)
 					entry.clear();
 
 					UDSAtom atom;
-					atom.m_uds = KIO::UDS_NAME;
+					atom.m_uds = TDEIO::UDS_NAME;
 					atom.m_str = TQString::fromUtf8(r.getKey());
 					entry.append(atom);
 
-					atom.m_uds = KIO::UDS_FILE_TYPE;
+					atom.m_uds = TDEIO::UDS_FILE_TYPE;
 					atom.m_long = S_IFREG;
 					entry.append(atom);
 
-					atom.m_uds = KIO::UDS_ACCESS;
+					atom.m_uds = TDEIO::UDS_ACCESS;
 					if ( r.getExtra() == "ACTIVE" )
 					  atom.m_long = 0700; // mark exec'able
 					else
 					  atom.m_long = 0600;
 					entry.append(atom);
 
-					atom.m_uds = KIO::UDS_MIME_TYPE;
+					atom.m_uds = TDEIO::UDS_MIME_TYPE;
 					atom.m_str = "application/sieve";
 					entry.append(atom);
 
@@ -937,22 +937,22 @@ void kio_sieveProtocol::listDir(const KURL& url)
 			entry.clear();
 
 			UDSAtom atom;
-			atom.m_uds = KIO::UDS_NAME;
+			atom.m_uds = TDEIO::UDS_NAME;
 			atom.m_str = TQString::fromUtf8(r.getKey());
 			entry.append(atom);
 
-			atom.m_uds = KIO::UDS_FILE_TYPE;
+			atom.m_uds = TDEIO::UDS_FILE_TYPE;
 			atom.m_long = S_IFREG;
 			entry.append(atom);
 
-			atom.m_uds = KIO::UDS_ACCESS;
+			atom.m_uds = TDEIO::UDS_ACCESS;
 			if ( r.getExtra() == "ACTIVE" )
 			  atom.m_long = 0700; // mark exec'able
 			else
 			  atom.m_long = 0600;
 			entry.append(atom);
 
-			atom.m_uds = KIO::UDS_MIME_TYPE;
+			atom.m_uds = TDEIO::UDS_MIME_TYPE;
 			atom.m_str = "application/sieve";
 			entry.append(atom);
 
diff --git a/kioslaves/sieve/sieve.h b/kioslaves/sieve/sieve.h
index d435892ec..2168da723 100644
--- a/kioslaves/sieve/sieve.h
+++ b/kioslaves/sieve/sieve.h
@@ -58,7 +58,7 @@ protected:
 	TQCString	extra;
 };
 
-class kio_sieveProtocol : public KIO::TCPSlaveBase
+class kio_sieveProtocol : public TDEIO::TCPSlaveBase
 {
 
 public:
@@ -104,7 +104,7 @@ protected:
 	int operationResult();
 
 	bool parseCapabilities(bool requestCapabilities = false);
-  bool saslInteract( void *in, KIO::AuthInfo &ai );
+  bool saslInteract( void *in, TDEIO::AuthInfo &ai );
 
 	// IOSlave global data
 	uint				m_connMode;