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

52 files changed, 286 insertions, 286 deletions

diff --git a/korn/accountmanager.cpp b/korn/accountmanager.cpp
index a791c53d4..477bab2ae 100644
--- a/korn/accountmanager.cpp
+++ b/korn/accountmanager.cpp
@@ -51,16 +51,16 @@ AccountManager::~AccountManager()
 	delete _dropInfo;
 }
 	
-void AccountManager::readConfig( KConfig* config, const int index )
+void AccountManager::readConfig( TDEConfig* config, const int index )
 {
-	KConfigGroup *masterGroup = new KConfigGroup( config, TQString( "korn-%1" ).arg( index ) );
+	TDEConfigGroup *masterGroup = new TDEConfigGroup( config, TQString( "korn-%1" ).arg( index ) );
 	TQStringList dcop = masterGroup->readListEntry( "dcop", ',' );
-	KConfigGroup *accountGroup;
+	TDEConfigGroup *accountGroup;
 	int counter = 0;
 		
 	while( config->hasGroup( TQString( "korn-%1-%2" ).arg( index ).arg( counter ) ) )
 	{
-		accountGroup = new KConfigGroup( config, TQString( "korn-%1-%2" ).arg( index ).arg( counter ) );
+		accountGroup = new TDEConfigGroup( config, TQString( "korn-%1-%2" ).arg( index ).arg( counter ) );
 		
 		const Protocol *proto = Protocols::getProto( accountGroup->readEntry( "protocol" ) );
 		if( !proto )
@@ -139,7 +139,7 @@ void AccountManager::readConfig( KConfig* config, const int index )
 	setCount( totalMessages(), hasNewMessages() );
 }
 
-void AccountManager::writeConfig( KConfig* config, const int index )
+void AccountManager::writeConfig( TDEConfig* config, const int index )
 {
 	TQMap< KMailDrop*, Dropinfo* >::Iterator it;
 	for( it = _dropInfo->begin(); it != _dropInfo->end(); ++it )
diff --git a/korn/accountmanager.h b/korn/accountmanager.h
index 5e7a03478..e28a85254 100644
--- a/korn/accountmanager.h
+++ b/korn/accountmanager.h
@@ -26,7 +26,7 @@ class KornSubjectsDlg;
 class KKioDrop;
 class KMailDrop;
 
-class KConfig;
+class TDEConfig;
 
 template< class T > class TQPtrList;
 template< class T, class W > class TQMap;
@@ -55,22 +55,22 @@ public:
 	/**
 	 * This function is used to read the config.
 	 *
-	 * @param config The KConfig instance to the configuration
+	 * @param config The TDEConfig instance to the configuration
 	 * @param index The index of the box. As there are different boxes,
 	 * every box have it's own index. This number is used to get the
 	 * right config-information out of the config parameter.
 	 */
-	virtual void readConfig( KConfig* config, const int index );
+	virtual void readConfig( TDEConfig* config, const int index );
 
 	/**
 	 * This write the configuration into a file. Things that must be right is
 	 * for example the reset number. The configuration isn't saved through this
 	 * method; configurations are saved in the configurations classes.
 	 *
-	 * @param config The KConfig instance to which the configuration is written.
+	 * @param config The TDEConfig instance to which the configuration is written.
 	 * @param index The index of the box.
 	 */
-	virtual void writeConfig( KConfig* config, const int index );
+	virtual void writeConfig( TDEConfig* config, const int index );
 	
 	/**
 	 * This method makes a TQString which can be used for a tooltip.
diff --git a/korn/boxcontainer.cpp b/korn/boxcontainer.cpp
index 934a47c53..5e17c9479 100644
--- a/korn/boxcontainer.cpp
+++ b/korn/boxcontainer.cpp
@@ -36,7 +36,7 @@ BoxContainer::~BoxContainer()
 	delete _items;
 }
 
-void BoxContainer::readConfig( KConfig* config )
+void BoxContainer::readConfig( TDEConfig* config )
 {
 	int counter = 0;
 	while( config->hasGroup( TQString( "korn-%1" ).arg( counter ) ) )
@@ -49,7 +49,7 @@ void BoxContainer::readConfig( KConfig* config )
 	}
 }
 
-void BoxContainer::writeConfig( KConfig *config )
+void BoxContainer::writeConfig( TDEConfig *config )
 {
 	int index = 0;
 	
diff --git a/korn/boxcontainer.h b/korn/boxcontainer.h
index 765d28b18..e5f5a8f4c 100644
--- a/korn/boxcontainer.h
+++ b/korn/boxcontainer.h
@@ -25,7 +25,7 @@ class BoxContainerItem;
 
 template< class T > class TQPtrList;
 
-class KConfig;
+class TDEConfig;
 
 /**
  * This class is the base for all BoxContainers. A BoxContainer is a place
@@ -48,18 +48,18 @@ public:
 	~BoxContainer();
 	
 	/**
-	 * This method reads the config from a certain KConfig instance.
+	 * This method reads the config from a certain TDEConfig instance.
 	 *
-	 * @param config The KConfig-instance to read the config from.
+	 * @param config The TDEConfig-instance to read the config from.
 	 */
-	void readConfig( KConfig* config );
+	void readConfig( TDEConfig* config );
 
 	/**
-	 * This method writes the config to a certain KConfig instance.
+	 * This method writes the config to a certain TDEConfig instance.
 	 *
-	 * @param config The KConfig-instance to write the config to.
+	 * @param config The TDEConfig-instance to write the config to.
 	 */
-	void writeConfig( KConfig *config );
+	void writeConfig( TDEConfig *config );
 	
 	/**
 	 * Shows all childs and itself
diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp
index 60277d1ed..3fea65f3e 100644
--- a/korn/boxcontaineritem.cpp
+++ b/korn/boxcontaineritem.cpp
@@ -78,7 +78,7 @@ BoxContainerItem::~BoxContainerItem()
 	delete _command;
 }
 	
-void BoxContainerItem::readConfig( KConfig* config, const int index )
+void BoxContainerItem::readConfig( TDEConfig* config, const int index )
 {
 	//Read information about how the thing have to look like
 	config->setGroup( TQString( "korn-%1" ).arg( index ) );
diff --git a/korn/boxcontaineritem.h b/korn/boxcontaineritem.h
index f903feb8e..8672e4309 100644
--- a/korn/boxcontaineritem.h
+++ b/korn/boxcontaineritem.h
@@ -25,7 +25,7 @@
 class KornMailSubject;
 
 class KActionCollection;
-class KConfig;
+class TDEConfig;
 class KPopupMenu;
 class TDEProcess;
 
@@ -70,10 +70,10 @@ public:
 	/**
 	 * This function reads the config. It stores the readed values in the class.
 	 * It also sets the DCOPObject-name.
-	 * @param config The KConfigGroup-object which contains the configuration of this box.
+	 * @param config The TDEConfigGroup-object which contains the configuration of this box.
 	 * @param index The index of the box used in the config-file
 	 */
-	virtual void readConfig( KConfig* config, const int index );
+	virtual void readConfig( TDEConfig* config, const int index );
 
 public slots:
 	/**
diff --git a/korn/dcop_proto.cpp b/korn/dcop_proto.cpp
index d1f27a616..41ab8c9d1 100644
--- a/korn/dcop_proto.cpp
+++ b/korn/dcop_proto.cpp
@@ -29,12 +29,12 @@
 #include <tqptrlist.h>
 #include <tqptrvector.h>
 
-KMailDrop* DCOP_Protocol::createMaildrop( KConfigGroup* ) const
+KMailDrop* DCOP_Protocol::createMaildrop( TDEConfigGroup* ) const
 {
 	return new DCOPDrop();
 }
 
-TQMap< TQString, TQString > * DCOP_Protocol::createConfig( KConfigGroup* config, const TQString& ) const
+TQMap< TQString, TQString > * DCOP_Protocol::createConfig( TDEConfigGroup* config, const TQString& ) const
 {
 	TQMap< TQString, TQString > *result = new TQMap< TQString, TQString >;
 
diff --git a/korn/dcop_proto.h b/korn/dcop_proto.h
index a485e08d8..18e01e997 100644
--- a/korn/dcop_proto.h
+++ b/korn/dcop_proto.h
@@ -23,7 +23,7 @@
 #include "protocol.h"
 
 class AccountInput;
-class KConfigGroup;
+class TDEConfigGroup;
 class KIO_Protocol;
 class KMailDrop;
 class Protocol;
@@ -60,19 +60,19 @@ public:
 	 * This function returns a Protocol pointer given a configuration.
 	 * This function always returns itselfs, as the configuration never uses another protocol.
 	 */
-	virtual const Protocol* getProtocol( KConfigGroup* ) const { return this; }
+	virtual const Protocol* getProtocol( TDEConfigGroup* ) const { return this; }
 	/**
 	 * This function creates the maildrop used to count dcop-messages.
 	 * @param config The configuration
 	 */
-	virtual KMailDrop* createMaildrop( KConfigGroup* config ) const;
+	virtual KMailDrop* createMaildrop( TDEConfigGroup* config ) const;
 	/**
 	 * The function converts the information of the configuration file into a mapping.
 	 *
 	 * @param config The configuration instance to be mapped
 	 * @return The keys and values of the configuration in a mapping
 	 */
-	virtual TQMap< TQString, TQString > * createConfig( KConfigGroup* config, const TQString& passwd ) const;
+	virtual TQMap< TQString, TQString > * createConfig( TDEConfigGroup* config, const TQString& passwd ) const;
 	/**
 	 * This return the name of this protocol. It is always "dcop".
 	 * @return The name of this protocol: "dcop"
diff --git a/korn/dcopdrop.cpp b/korn/dcopdrop.cpp
index 407a6ff06..cdeccd6b1 100644
--- a/korn/dcopdrop.cpp
+++ b/korn/dcopdrop.cpp
@@ -67,7 +67,7 @@ bool DCOPDrop::stopMonitor()
 	return true;
 }
 
-bool DCOPDrop::readConfigGroup( const KConfigGroup &cfg )
+bool DCOPDrop::readConfigGroup( const TDEConfigGroup &cfg )
 {
 	return KMailDrop::readConfigGroup( cfg );
 }
@@ -83,7 +83,7 @@ bool DCOPDrop::readConfigGroup( const TQMap< TQString, TQString > &map, const Pr
 	return true;
 }
 
-bool DCOPDrop::writeConfigGroup( KConfigBase& cfg ) const
+bool DCOPDrop::writeConfigGroup( TDEConfigBase& cfg ) const
 {
 	KMailDrop::writeConfigGroup( cfg );
 
diff --git a/korn/dcopdrop.h b/korn/dcopdrop.h
index ed695372f..cd3cd7908 100644
--- a/korn/dcopdrop.h
+++ b/korn/dcopdrop.h
@@ -28,7 +28,7 @@ class DCOPDropInterface;
 class KornMailId;
 class KornMailSubject;
 
-class KConfigBase;
+class TDEConfigBase;
 
 template<class A, class B> class TQMap;
 class TQString;
@@ -97,7 +97,7 @@ public:
 	 * @param config The configuration group which contains the info for this account.
 	 * @return The same value as KMailDrop::readConfigGroup( config ) returns.
 	 */
-	virtual bool readConfigGroup( const KConfigGroup& config );
+	virtual bool readConfigGroup( const TDEConfigGroup& config );
 	/**
 	 * This function also reeds the configurion, but from a mapping.
 	 *
@@ -113,7 +113,7 @@ public:
 	 * @param config The configuration to write true
 	 * @return true if no error occured.
 	 */
-	virtual bool writeConfigGroup( KConfigBase& config ) const;
+	virtual bool writeConfigGroup( TDEConfigBase& config ) const;
 	/**
 	 * This returns the type of the box, in this case allways "dcop".
 	 *
diff --git a/korn/dockeditem.cpp b/korn/dockeditem.cpp
index 9d30717f0..fac1cc479 100644
--- a/korn/dockeditem.cpp
+++ b/korn/dockeditem.cpp
@@ -57,7 +57,7 @@ void DockedItem::showBox()
 	_systemtray->show();
 }
 	
-void DockedItem::readConfig( KConfig* config, const int index )
+void DockedItem::readConfig( TDEConfig* config, const int index )
 {
 	BoxContainerItem::readConfig( config, index );
 	
diff --git a/korn/dockeditem.h b/korn/dockeditem.h
index ddb6b0d79..e375bb97d 100644
--- a/korn/dockeditem.h
+++ b/korn/dockeditem.h
@@ -23,7 +23,7 @@
 
 class SystemTray;
 
-class KConfig;
+class TDEConfig;
 
 class TQPixmap;
 
@@ -58,10 +58,10 @@ public:
 	 * This functions reads the config. It used the parent
 	 * version for the main things, but it is possible to
 	 * add some configurations over here.
-	 * @param config The KConfig-instance which contains the settings of this tray-item.
+	 * @param config The TDEConfig-instance which contains the settings of this tray-item.
 	 * @param index The index of the box in the configuration file
 	 */
-	virtual void readConfig( KConfig* config, const int index );
+	virtual void readConfig( TDEConfig* config, const int index );
 	
 public slots:	
 	/**
diff --git a/korn/imap_proto.h b/korn/imap_proto.h
index 97fb209ad..3310da1b8 100644
--- a/korn/imap_proto.h
+++ b/korn/imap_proto.h
@@ -103,9 +103,9 @@ public:
 	 * In this case, "unseen" is added to the query to only list unlees kurls.
 	 * These function are called in kio_*.cpp
 	 */
-	virtual void recheckKURL    ( KURL &kurl, KIO::MetaData & ) const { kurl.setQuery( "unseen" ); }
-	virtual void readSubjectKURL( KURL &kurl, KIO::MetaData & ) const { kurl.setPath( kurl.path() + ";section=ENVELOPE" ); }
-	virtual void deleteMailConnectKURL( KURL &, KIO::MetaData & metadata ) const { metadata.insert( "expunge", "auto" ); }
+	virtual void recheckKURL    ( KURL &kurl, TDEIO::MetaData & ) const { kurl.setQuery( "unseen" ); }
+	virtual void readSubjectKURL( KURL &kurl, TDEIO::MetaData & ) const { kurl.setPath( kurl.path() + ";section=ENVELOPE" ); }
+	virtual void deleteMailConnectKURL( KURL &, TDEIO::MetaData & metadata ) const { metadata.insert( "expunge", "auto" ); }
 	
 	/**
 	 * This functions gives a list of names of groupboxes which are to be set in the configuration.
diff --git a/korn/keditlistboxman.cpp b/korn/keditlistboxman.cpp
index d3dce86e0..83b402031 100644
--- a/korn/keditlistboxman.cpp
+++ b/korn/keditlistboxman.cpp
@@ -65,7 +65,7 @@ KEditListBoxManager::~KEditListBoxManager()
 	delete _groupName;
 }
 
-void KEditListBoxManager::setConfig( KConfig* config )
+void KEditListBoxManager::setConfig( TDEConfig* config )
 {
 	_config = config;
 	if( _groupName )
diff --git a/korn/keditlistboxman.h b/korn/keditlistboxman.h
index 3c213c3c3..81acca899 100644
--- a/korn/keditlistboxman.h
+++ b/korn/keditlistboxman.h
@@ -21,7 +21,7 @@
 
 #include <keditlistbox.h>
 
-class KConfig;
+class TDEConfig;
 
 class TQString;
 class TQWidget;
@@ -63,10 +63,10 @@ public:
 	
 	
 	/** 
-	 * Set the KConfig object (required before doing something
-	 * @param config The KConfig-object
+	 * Set the TDEConfig object (required before doing something
+	 * @param config The TDEConfig-object
 	 */
-	void setConfig( KConfig* config );
+	void setConfig( TDEConfig* config );
 	/**
 	 * Sets the groupName. groupName should contain at least one %1.
 	 * It is used for makeing groupnames.
@@ -92,7 +92,7 @@ private:
 	 */
 	void readNames();
 private:
-	KConfig *_config; //Stores the KConfig-object
+	TDEConfig *_config; //Stores the TDEConfig-object
 	TQString *_groupName; //Stores the groupName string.
 	TQString *_subGroupName;
 	int _prevCount;
@@ -138,7 +138,7 @@ signals:
 	 * @param index The number of the item.
 	 * this config is already in the right group.
 	 */
-	void setDefaults( const TQString& name, const int index, KConfig* config );
+	void setDefaults( const TQString& name, const int index, TDEConfig* config );
 
 	void elementsSwapped( int, int );
 	void elementDeleted( int );
diff --git a/korn/kio.cpp b/korn/kio.cpp
index a21311980..63a9dc683 100644
--- a/korn/kio.cpp
+++ b/korn/kio.cpp
@@ -90,7 +90,7 @@ KKioDrop::KKioDrop()
 	_mailurls( 0 )
 {
 	_kurl = new KURL;
-	_metadata = new KIO::MetaData;
+	_metadata = new TDEIO::MetaData;
 
 	//Initialising protocol; if no protocol is set before first use, it will use the first protocol
 	_protocol = Protocols::firstProtocol()->getKIOProtocol(); //The first protocol is the default
@@ -112,7 +112,7 @@ KKioDrop::KKioDrop()
 	_mailurls = new TQValueList<FileInfo>;
 }
 
-KKioDrop::KKioDrop( KConfigGroup* )
+KKioDrop::KKioDrop( TDEConfigGroup* )
 	: KPollableDrop(),
 	_kurl( 0 ),
 	_metadata( 0 ),
@@ -128,7 +128,7 @@ KKioDrop::KKioDrop( KConfigGroup* )
 	_mailurls( 0 )
 {
 	_kurl = new KURL;
-	_metadata = new KIO::MetaData;
+	_metadata = new TDEIO::MetaData;
 
 	//Initialising protocol; if no protocol is set before first use, it will use the first protocol
 	_protocol = Protocols::firstProtocol()->getKIOProtocol(); //The first protocol is the default
@@ -154,11 +154,11 @@ KKioDrop::KKioDrop( KConfigGroup* )
 
 void KKioDrop::setKioServer( const TQString & proto, const TQString & server, int port )
 {
-	 //Settings default for last vars; could not inline because KIO::MetaData-object is not defined in header.
-	setKioServer( proto, server, port, KIO::MetaData(), false, true );
+	 //Settings default for last vars; could not inline because TDEIO::MetaData-object is not defined in header.
+	setKioServer( proto, server, port, TDEIO::MetaData(), false, true );
 }
 
-void KKioDrop::setKioServer(const TQString & proto, const TQString & server, int port, const KIO::MetaData metadata, bool ssl,
+void KKioDrop::setKioServer(const TQString & proto, const TQString & server, int port, const TDEIO::MetaData metadata, bool ssl,
 		            bool setProtocol )
 {
 	TQString auth;
@@ -351,7 +351,7 @@ bool KKioDrop::readConfigGroup( const TQMap< TQString, TQString > &map, const Pr
 		_protocol = Protocols::firstProtocol()->getKIOProtocol();
 			
 	val = *map.find( "server" );
-	setKioServer( val2, val, (*map.find( "port" )).toInt(), KIO::MetaData(), *map.find( "ssl" ) == "true", false );
+	setKioServer( val2, val, (*map.find( "port" )).toInt(), TDEIO::MetaData(), *map.find( "ssl" ) == "true", false );
 
 	_kurl->setUser( *map.find( "username" ) );
 	_kurl->setPath( *map.find( "mailbox" ) );
@@ -373,7 +373,7 @@ bool KKioDrop::readConfigGroup( const TQMap< TQString, TQString > &map, const Pr
 	return true;
 }
 
-bool KKioDrop::writeConfigGroup( KConfigBase& cfg ) const
+bool KKioDrop::writeConfigGroup( TDEConfigBase& cfg ) const
 {
 	KPollableDrop::writeConfigGroup( cfg );
 	/*TQString p;
@@ -431,9 +431,9 @@ void KKioDrop::deleteMailsCanceled()
 //Private slots for displaying connection errors
 void KKioDrop::slotConnectionError( int number, const TQString& arg )
 {
-	kdError() << KIO::buildErrorString( number, arg ) << endl;
+	kdError() << TDEIO::buildErrorString( number, arg ) << endl;
 //	if( passivePopup() )
-		emitShowPassivePopup( KIO::buildErrorString( number, arg ) );
+		emitShowPassivePopup( TDEIO::buildErrorString( number, arg ) );
 }
 
 void KKioDrop::slotConnectionWarning( const TQString& msg )
diff --git a/korn/kio.h b/korn/kio.h
index 519dced5f..a2ac796a2 100644
--- a/korn/kio.h
+++ b/korn/kio.h
@@ -34,11 +34,11 @@ class KIO_Protocol;
 class KIO_Subjects;
 class KIO_Read;
 class KIO_Delete;
-class KConfigGroup;
+class TDEConfigGroup;
 class KURL;
 template<class> class TQPtrList;
 template<class> class TQValueList;
-namespace KIO { class Job; class MetaData; class Slave; class TransferJob; }
+namespace TDEIO { class Job; class MetaData; class Slave; class TransferJob; }
 
 /**
  * Polling monitor for IMAP4 maildrops.
@@ -53,7 +53,7 @@ class KKioDrop : public KPollableDrop
   
 private:
 	KURL *_kurl;
-	KIO::MetaData *_metadata;
+	TDEIO::MetaData *_metadata;
 
 	TQString _password;
 	
@@ -104,14 +104,14 @@ public:
 	* KKioDrop Constructor
 	*/
 	KKioDrop();
-	KKioDrop( KConfigGroup* );
+	KKioDrop( TDEConfigGroup* );
 
 	/** 
 	  * Set the server that will be checked for new mail.
 	 */
 	void setKioServer( const TQString & proto, const TQString & server, int port = -1 );
 	void setKioServer( const TQString & proto, const TQString & server, int port,
-	                   const KIO::MetaData metadata, bool ssl, bool setProtocol = true ); //Last argument inits _protocol
+	                   const TDEIO::MetaData metadata, bool ssl, bool setProtocol = true ); //Last argument inits _protocol
 
 	/** Set the account information for the PROTO server. */
 	void setUser( const TQString & user, const TQString & password, const TQString & mailbox, const TQString & auth );
@@ -147,7 +147,7 @@ public:
 	
 	virtual KMailDrop* clone () const ;
 	virtual bool readConfigGroup ( const TQMap< TQString, TQString >& map, const Protocol * protocol );
-	virtual bool writeConfigGroup ( KConfigBase& cfg ) const;
+	virtual bool writeConfigGroup ( TDEConfigBase& cfg ) const;
 	virtual TQString type() const { return TQString::fromUtf8("kio"); }
 	
 	virtual bool synchrone() const { return false; } //class is not synchrone
diff --git a/korn/kio_count.cpp b/korn/kio_count.cpp
index a1f8e825c..bea6bf196 100644
--- a/korn/kio_count.cpp
+++ b/korn/kio_count.cpp
@@ -70,11 +70,11 @@ void KIO_Count::count( KKioDrop *drop )
 	 * these are saved in the class.
 	 */
 	_kurl = new KURL( *_kio->_kurl );
-	_metadata = new KIO::MetaData( *_kio->_metadata );
+	_metadata = new TDEIO::MetaData( *_kio->_metadata );
 	_protocol = _kio->_protocol;
 
 	KURL kurl = *_kurl;
-	KIO::MetaData metadata = *_metadata;
+	TDEIO::MetaData metadata = *_metadata;
 
 	// Serup a connection
 	if( _protocol->connectionBased( ) )
@@ -84,7 +84,7 @@ void KIO_Count::count( KKioDrop *drop )
 		if( kurl.port() == 0 )
 			kurl.setPort( _protocol->defaultPort( _kio->_ssl ) );
 
-		if( ! ( _slave = KIO::Scheduler::getConnectedSlave( kurl, metadata ) ) ) //Forcing reload
+		if( ! ( _slave = TDEIO::Scheduler::getConnectedSlave( kurl, metadata ) ) ) //Forcing reload
 		{
 			kdWarning() << i18n( "Not able to open a kio slave for %1." ).arg( _protocol->configName() ) << endl;
 			_kio->emitShowPassivePopup( i18n( "Not able to open a kio slave for %1." ).arg( _protocol->configName() ) );
@@ -122,17 +122,17 @@ void KIO_Count::count( KKioDrop *drop )
 
 	//Making job to fetch file-list
 	
-	_job = KIO::listDir( kurl, false );
+	_job = TDEIO::listDir( kurl, false );
 	_job->addMetaData( metadata );
 
-	connect( _job, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( result( KIO::Job* ) ) );
-	connect( _job, TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList& ) ),
-	         this, TQT_SLOT( entries( KIO::Job*, const KIO::UDSEntryList& ) ) );
+	connect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( result( TDEIO::Job* ) ) );
+	connect( _job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
+	         this, TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
 
 	if( _protocol->connectionBased() )
-		KIO::Scheduler::assignJobToSlave( _slave, _job );
+		TDEIO::Scheduler::assignJobToSlave( _slave, _job );
 	else
-		KIO::Scheduler::scheduleJob( _job );
+		TDEIO::Scheduler::scheduleJob( _job );
 }
 
 void KIO_Count::stopActiveCount()
@@ -140,16 +140,16 @@ void KIO_Count::stopActiveCount()
 	if( !_new_mailurls )
 		return;
 
-	disconnect( _job, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( result( KIO::Job* ) ) );
-	disconnect( _job, TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList& ) ),
-	            this, TQT_SLOT( entries( KIO::Job*, const KIO::UDSEntryList& ) ) );
+	disconnect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( result( TDEIO::Job* ) ) );
+	disconnect( _job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
+	            this, TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
 
-	KIO::Scheduler::cancelJob( _job );
+	TDEIO::Scheduler::cancelJob( _job );
 
 	if( _slave )
 	{
 		//Slave seems to be disconnected by canceling the last job of the slave
-		//KIO::Scheduler::disconnectSlave( _slave );
+		//TDEIO::Scheduler::disconnectSlave( _slave );
 		_slave = 0;
 	}
 
@@ -163,9 +163,9 @@ void KIO_Count::stopActiveCount()
 void KIO_Count::showPassive( const TQString& id )
 {
 	KURL kurl = *_kio->_kurl;
-	KIO::MetaData metadata = *_kio->_metadata;
+	TDEIO::MetaData metadata = *_kio->_metadata;
 	kurl = id;
-	//KIO::Slave *slave = 0;
+	//TDEIO::Slave *slave = 0;
 
 	_kio->_protocol->readSubjectKURL( kurl, metadata );
 	if( kurl.port() == 0 )
@@ -191,13 +191,13 @@ void KIO_Count::disconnectSlave()
 		return; //Slave doens't exist
 
 	//Disconnect slave
-	KIO::Scheduler::disconnectSlave( _slave );
+	TDEIO::Scheduler::disconnectSlave( _slave );
 	_slave = 0;
 	_protocol = 0;
 }
 
 //This function is called when fetching is over
-void KIO_Count::result( KIO::Job* job )
+void KIO_Count::result( TDEIO::Job* job )
 {
 	//job should be the latest job; elsewise: print an error.
 	if( job != _job )
@@ -213,9 +213,9 @@ void KIO_Count::result( KIO::Job* job )
 		_kio->emitValidChanged();
 	}
 
-	disconnect( job, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( result( KIO::Job* ) ) );
-	disconnect( job, TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList& ) ),
-	            this, TQT_SLOT( entries( KIO::Job*, const KIO::UDSEntryList& ) ) );
+	disconnect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( result( TDEIO::Job* ) ) );
+	disconnect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
+	            this, TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
 
 	disconnectSlave();
 
@@ -240,12 +240,12 @@ void KIO_Count::result( KIO::Job* job )
 }
 
 //An file list is ready; now save it in _kio->_mailurls.
-void KIO_Count::entries( KIO::Job* job, const KIO::UDSEntryList &list )
+void KIO_Count::entries( TDEIO::Job* job, const TDEIO::UDSEntryList &list )
 {
 	TQStringList old_list;
-	KIO::UDSEntryListConstIterator  it1 ;
-	KIO::UDSEntry::ConstIterator it2 ;
-	KIO::MetaData metadata;
+	TDEIO::UDSEntryListConstIterator  it1 ;
+	TDEIO::UDSEntry::ConstIterator it2 ;
+	TDEIO::MetaData metadata;
 	KURL kurl;
 	bool isFile;
 
@@ -269,12 +269,12 @@ void KIO_Count::entries( KIO::Job* job, const KIO::UDSEntryList &list )
 
 		for ( it2 = (*it1).begin() ; it2 != (*it1).end() ; it2++ )
 		{
-			if( (*it2).m_uds == KIO::UDS_FILE_TYPE &&
+			if( (*it2).m_uds == TDEIO::UDS_FILE_TYPE &&
 			    ((long)(*it2).m_long & S_IFREG ) )
 				isFile=true;
-			else if( (*it2).m_uds == KIO::UDS_URL )
+			else if( (*it2).m_uds == TDEIO::UDS_URL )
 				fileinfo.name = (*it2).m_str;
-			else if( (*it2).m_uds == KIO::UDS_NAME )
+			else if( (*it2).m_uds == TDEIO::UDS_NAME )
 			{ //The file kioslave doesn't return UDS_URL.
 				kurl = *_kurl;
 				metadata = *_metadata;
@@ -282,7 +282,7 @@ void KIO_Count::entries( KIO::Job* job, const KIO::UDSEntryList &list )
 				kurl.setPath ( kurl.path() + '/' + (*it2).m_str );
 				fileinfo.name = kurl.url();
 			}
-			else if( (*it2).m_uds == KIO::UDS_SIZE )
+			else if( (*it2).m_uds == TDEIO::UDS_SIZE )
 			{
 				fileinfo.size = (*it2).m_long;
 			}
diff --git a/korn/kio_count.h b/korn/kio_count.h
index 93222a700..9b44e1ca9 100644
--- a/korn/kio_count.h
+++ b/korn/kio_count.h
@@ -35,7 +35,7 @@ class KornMailSubject;
 class SortedMailSubject;
 
 template<class T> class TQValueList;
-namespace KIO { class Job; class ListJob; class MetaData; class Slave; }
+namespace TDEIO { class Job; class ListJob; class MetaData; class Slave; }
 
 class KURL;
 
@@ -57,10 +57,10 @@ public:
 	void stopActiveCount();
 private:
 	KKioDrop *_kio;
-	KIO::ListJob *_job;
-	KIO::Slave *_slave;
+	TDEIO::ListJob *_job;
+	TDEIO::Slave *_slave;
 	KURL *_kurl;
-	KIO::MetaData *_metadata;
+	TDEIO::MetaData *_metadata;
 	const KIO_Protocol *_protocol;
 	bool _valid;
 	TQValueList<KKioDrop::FileInfo> *_new_mailurls; //entries can come with more function calls.
@@ -72,8 +72,8 @@ private:
 	void disconnectSlave();
 	
 private slots:
-	void result( KIO::Job* );
-	void entries( KIO::Job*, const KIO::UDSEntryList &list );
+	void result( TDEIO::Job* );
+	void entries( TDEIO::Job*, const TDEIO::UDSEntryList &list );
 	
 	void addtoPassivePopup( KornMailSubject* );
 	void deleteSingleSubject( KIO_Single_Subject* );
diff --git a/korn/kio_delete.cpp b/korn/kio_delete.cpp
index db27e28d9..17eec2f53 100644
--- a/korn/kio_delete.cpp
+++ b/korn/kio_delete.cpp
@@ -39,7 +39,7 @@ KIO_Delete::KIO_Delete( TQObject * parent, const char * name ) : TQObject( paren
 	_slave( 0 ),
 	_valid( true )
 {
-	_jobs = new TQPtrList< KIO::Job >;
+	_jobs = new TQPtrList< TDEIO::Job >;
 }
 
 KIO_Delete::~KIO_Delete( )
@@ -51,7 +51,7 @@ KIO_Delete::~KIO_Delete( )
 bool KIO_Delete::deleteMails( TQPtrList< const KornMailId > * ids, KKioDrop *drop )
 {
 	KURL kurl = *drop->_kurl;
-	KIO::MetaData metadata = *drop->_metadata;
+	TDEIO::MetaData metadata = *drop->_metadata;
 		
 	_kio = drop;
 	_valid = true;
@@ -93,19 +93,19 @@ void KIO_Delete::disConnect( )
 
 	if( _slave )
 	{
-		KIO::Scheduler::disconnectSlave( _slave );
+		TDEIO::Scheduler::disconnectSlave( _slave );
 		_slave = 0;
 	}
 }
 
-bool KIO_Delete::setupSlave( KURL kurl, KIO::MetaData metadata, const KIO_Protocol *& protocol )
+bool KIO_Delete::setupSlave( KURL kurl, TDEIO::MetaData metadata, const KIO_Protocol *& protocol )
 {
 	protocol->deleteMailConnectKURL( kurl, metadata );
 	
 	if( kurl.port() == 0 )
 		kurl.setPort( protocol->defaultPort( _kio->_ssl ) );
 		
-	if( ! ( _slave = KIO::Scheduler::getConnectedSlave( kurl, metadata ) ) )
+	if( ! ( _slave = TDEIO::Scheduler::getConnectedSlave( kurl, metadata ) ) )
 	{
 		kdWarning() << i18n( "Could not get a connected slave; I cannot delete this way..." ) << endl;
 		_valid = false;
@@ -115,9 +115,9 @@ bool KIO_Delete::setupSlave( KURL kurl, KIO::MetaData metadata, const KIO_Protoc
 	return true;
 }
 
-void KIO_Delete::deleteItem( const KornMailId *item, KURL kurl, KIO::MetaData metadata, const KIO_Protocol *& protocol )
+void KIO_Delete::deleteItem( const KornMailId *item, KURL kurl, TDEIO::MetaData metadata, const KIO_Protocol *& protocol )
 {
-	KIO::Job* job = 0;
+	TDEIO::Job* job = 0;
 
 	kurl = dynamic_cast<const KornStringId*>( item )->getId();
 	
@@ -128,47 +128,47 @@ void KIO_Delete::deleteItem( const KornMailId *item, KURL kurl, KIO::MetaData me
 		
 	if( protocol->deleteFunction() == KIO_Protocol::get )
 	{
-		job = KIO::get( kurl, true, false );
+		job = TDEIO::get( kurl, true, false );
 		
 		if( protocol->connectionBased() )
-			KIO::Scheduler::assignJobToSlave( _slave, dynamic_cast< KIO::SimpleJob* >( job ) );
+			TDEIO::Scheduler::assignJobToSlave( _slave, dynamic_cast< TDEIO::SimpleJob* >( job ) );
 		else
-			KIO::Scheduler::scheduleJob( dynamic_cast< KIO::SimpleJob* >( job ) );
+			TDEIO::Scheduler::scheduleJob( dynamic_cast< TDEIO::SimpleJob* >( job ) );
 	}
 	else if( protocol->deleteFunction() == KIO_Protocol::del )
 	{
-		job = KIO::del( kurl, false, false );
+		job = TDEIO::del( kurl, false, false );
 	}
 	else
 		return; //Unknown deleteFunction
 		
-	connect( job, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotResult( KIO::Job* ) ) );
+	connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );
 		
 	job->addMetaData( metadata );
 	
-	_jobs->append( dynamic_cast< KIO::Job* >( job ) );
+	_jobs->append( dynamic_cast< TDEIO::Job* >( job ) );
 }
 
 /*
  * Some protocols needs to a command to commit protocols.
  */
-void KIO_Delete::commitDelete( KURL kurl, KIO::MetaData metadata, const KIO_Protocol *& protocol )
+void KIO_Delete::commitDelete( KURL kurl, TDEIO::MetaData metadata, const KIO_Protocol *& protocol )
 {
 	protocol->deleteCommitKURL( kurl, metadata );
 	
 	if( kurl.port() == 0 )
 		kurl.setPort( protocol->defaultPort( _kio->_ssl ) );
 	
-	KIO::TransferJob *job = KIO::get( kurl, true, false );
+	TDEIO::TransferJob *job = TDEIO::get( kurl, true, false );
 	job->addMetaData( metadata );
-	connect( job, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotResult( KIO::Job* ) ) );
+	connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );
 	
-	_jobs->append( dynamic_cast< KIO::Job* >( job ) );
+	_jobs->append( dynamic_cast< TDEIO::Job* >( job ) );
 	
 	if( protocol->connectionBased() )
-		KIO::Scheduler::assignJobToSlave( _slave, job );
+		TDEIO::Scheduler::assignJobToSlave( _slave, job );
 	else
-		KIO::Scheduler::scheduleJob( job );
+		TDEIO::Scheduler::scheduleJob( job );
 
 	_total++;
 }
@@ -178,7 +178,7 @@ void KIO_Delete::canceled( )
 	disConnect( );
 }
 
-void KIO_Delete::slotResult( KIO::Job* job )
+void KIO_Delete::slotResult( TDEIO::Job* job )
 {
 	if( job->error() )
 	{
diff --git a/korn/kio_delete.h b/korn/kio_delete.h
index d900d508d..c084a58de 100644
--- a/korn/kio_delete.h
+++ b/korn/kio_delete.h
@@ -30,7 +30,7 @@ class KIO_Protocol;
 class KornMailId;
 
 class KURL;
-namespace KIO { class MetaData; class Job; class Slave; }
+namespace TDEIO { class MetaData; class Job; class Slave; }
 
 template<class T> class TQPtrList;
 
@@ -52,18 +52,18 @@ public slots:
 	//If this slot is called, the whole deletion is canceled.
 	void canceled( );
 private slots:
-	void slotResult( KIO::Job* );
+	void slotResult( TDEIO::Job* );
 	
 private:
 	void disConnect( );
-	bool setupSlave( KURL kurl, KIO::MetaData metadata, const KIO_Protocol *& protocol );
-	void deleteItem( const KornMailId *item, KURL, KIO::MetaData, const KIO_Protocol *&);
-	void commitDelete( KURL, KIO::MetaData, const KIO_Protocol *& );
+	bool setupSlave( KURL kurl, TDEIO::MetaData metadata, const KIO_Protocol *& protocol );
+	void deleteItem( const KornMailId *item, KURL, TDEIO::MetaData, const KIO_Protocol *&);
+	void commitDelete( KURL, TDEIO::MetaData, const KIO_Protocol *& );
 
 	KKioDrop *_kio;
 	unsigned int _total;
-	TQPtrList< KIO::Job > *_jobs;
-	KIO::Slave *_slave;
+	TQPtrList< TDEIO::Job > *_jobs;
+	TDEIO::Slave *_slave;
 	bool _valid;
 };
 
diff --git a/korn/kio_proto.cpp b/korn/kio_proto.cpp
index 8434fe44b..c6d2184df 100644
--- a/korn/kio_proto.cpp
+++ b/korn/kio_proto.cpp
@@ -24,7 +24,7 @@
 
 #include <tqmap.h>
 
-TQMap< TQString, TQString >* KIO_Protocol::createConfig( KConfigGroup * group, const TQString& password ) const
+TQMap< TQString, TQString >* KIO_Protocol::createConfig( TDEConfigGroup * group, const TQString& password ) const
 {
 	TQMap< TQString, TQString > *result = new TQMap< TQString, TQString >;
 
diff --git a/korn/kio_proto.h b/korn/kio_proto.h
index 77a108940..e97b01128 100644
--- a/korn/kio_proto.h
+++ b/korn/kio_proto.h
@@ -54,11 +54,11 @@ public:
 	/**
 	 * This are the implementation of the Protocol-functions
 	 */
-	virtual const Protocol* getProtocol( KConfigGroup* ) const { return this; }
+	virtual const Protocol* getProtocol( TDEConfigGroup* ) const { return this; }
 
-	virtual KMailDrop* createMaildrop( KConfigGroup* config ) const { return new KKioDrop( config ); }
+	virtual KMailDrop* createMaildrop( TDEConfigGroup* config ) const { return new KKioDrop( config ); }
 
-	virtual TQMap< TQString, TQString >* createConfig( KConfigGroup *group, const TQString& password ) const;
+	virtual TQMap< TQString, TQString >* createConfig( TDEConfigGroup *group, const TQString& password ) const;
 
 	/*
 	 * @return: the name of the kio_slave
@@ -104,7 +104,7 @@ public:
 
 	/*
 	 * The next function returns the method of deleting: some protoocols
-	 * like to delete files with KIO::get; other with KIO::del
+	 * like to delete files with TDEIO::get; other with TDEIO::del
 	 */
 	virtual DeleteTypeEnum deleteFunction() const { return del; }
 
@@ -128,15 +128,15 @@ public:
 	 * deleteCommitKURL is the KURL manipulator; the KURL is as in the settings.
 	 * That KURL isn't retouch by deleteMailKURL.
 	 */
-	virtual void recheckConnectKURL( KURL &, KIO::MetaData & ) const { }
-	virtual void recheckKURL     ( KURL &, KIO::MetaData & ) const { };
-	virtual void readSubjectConnectKURL ( KURL & kurl, KIO::MetaData & ) const { kurl.setPath( "" ); }
-	virtual void readSubjectKURL ( KURL &, KIO::MetaData & ) const { } //For editing a kurl (adding extra options)
-	virtual void deleteMailConnectKURL( KURL & kurl, KIO::MetaData & ) const { kurl.setPath( "" ); }
-	virtual void deleteMailKURL  ( KURL &, KIO::MetaData & ) const { }
+	virtual void recheckConnectKURL( KURL &, TDEIO::MetaData & ) const { }
+	virtual void recheckKURL     ( KURL &, TDEIO::MetaData & ) const { };
+	virtual void readSubjectConnectKURL ( KURL & kurl, TDEIO::MetaData & ) const { kurl.setPath( "" ); }
+	virtual void readSubjectKURL ( KURL &, TDEIO::MetaData & ) const { } //For editing a kurl (adding extra options)
+	virtual void deleteMailConnectKURL( KURL & kurl, TDEIO::MetaData & ) const { kurl.setPath( "" ); }
+	virtual void deleteMailKURL  ( KURL &, TDEIO::MetaData & ) const { }
 	virtual bool commitDelete() const { return false; }
-	virtual void deleteCommitKURL( KURL &, KIO::MetaData & ) const { }
-	virtual void readMailKURL    ( KURL &, KIO::MetaData & ) const { }
+	virtual void deleteCommitKURL( KURL &, TDEIO::MetaData & ) const { }
+	virtual void readMailKURL    ( KURL &, TDEIO::MetaData & ) const { }
 
 
 	virtual const KIO_Protocol* getKIOProtocol() const { return this; }
diff --git a/korn/kio_read.cpp b/korn/kio_read.cpp
index b92da304c..0e77e1a71 100644
--- a/korn/kio_read.cpp
+++ b/korn/kio_read.cpp
@@ -51,17 +51,17 @@ void KIO_Read::readMail( const KornMailId *& mailid, KKioDrop* drop )
 {
 	_kio = drop;
 	KURL kurl = *_kio->_kurl;
-	KIO::MetaData metadata = *_kio->_metadata;
+	TDEIO::MetaData metadata = *_kio->_metadata;
 	
 	kurl = dynamic_cast<const KornStringId*>(mailid)->getId( );
 	
 	_kio->_protocol->readMailKURL( kurl, metadata );
 	
-	_job = KIO::get( kurl, false, false );
+	_job = TDEIO::get( kurl, false, false );
 	_job->addMetaData( metadata );
 	
-	connect( _job, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotResult( KIO::Job* ) ) );
-	connect( _job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray & ) ) );
+	connect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );
+	connect( _job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) );
 }
 
 void KIO_Read::canceled( )
@@ -71,7 +71,7 @@ void KIO_Read::canceled( )
 	_job = 0;
 }
 
-void KIO_Read::slotResult( KIO::Job* job )
+void KIO_Read::slotResult( TDEIO::Job* job )
 {
 	if( job != _job )
 		kdWarning() << i18n( "Unknown job returned; I will try if this one will do... " ) << endl;
@@ -85,7 +85,7 @@ void KIO_Read::slotResult( KIO::Job* job )
 	_job = 0;
 }
 
-void KIO_Read::slotData( KIO::Job* job, const TQByteArray & data )
+void KIO_Read::slotData( TDEIO::Job* job, const TQByteArray & data )
 {
 	if( job != _job )
 		kdWarning() << i18n( "Unknown job returned; I will try if this one will do... " ) << endl;
diff --git a/korn/kio_read.h b/korn/kio_read.h
index 41f212da4..3b1ddec8e 100644
--- a/korn/kio_read.h
+++ b/korn/kio_read.h
@@ -27,7 +27,7 @@ class KKioDrop;
 class KornMailId;
 
 class KURL;
-namespace KIO { class MetaData; class Job; }
+namespace TDEIO { class MetaData; class Job; }
 class KIO_Protocol;
 
 class TQString;
@@ -46,7 +46,7 @@ public slots:
 	void canceled();
 private:
 	KKioDrop *_kio;
-	KIO::Job *_job;
+	TDEIO::Job *_job;
 	TQString *_message;
 	
 signals:
@@ -54,8 +54,8 @@ signals:
 	void ready( TQString* );
 	
 private slots:
-	void slotResult( KIO::Job* );
-	void slotData( KIO::Job*, const TQByteArray& );
+	void slotResult( TDEIO::Job* );
+	void slotData( TDEIO::Job*, const TQByteArray& );
 };
 
 #endif //MK_KIO_READ_H
diff --git a/korn/kio_single_subject.cpp b/korn/kio_single_subject.cpp
index 02a6a103d..45ca047fc 100644
--- a/korn/kio_single_subject.cpp
+++ b/korn/kio_single_subject.cpp
@@ -36,12 +36,12 @@
 #include <tqstring.h>
 
 KIO_Single_Subject::KIO_Single_Subject( TQObject * parent, const char * name,
-		    KURL &kurl, KIO::MetaData &metadata, const KIO_Protocol * protocol, KIO::Slave *& slave,
+		    KURL &kurl, TDEIO::MetaData &metadata, const KIO_Protocol * protocol, TDEIO::Slave *& slave,
 		    const TQString &url, const long size ) 
 		: TQObject( parent, name )
 {
 	_kurl = new KURL( kurl );
-	_metadata = new KIO::MetaData( metadata );
+	_metadata = new TDEIO::MetaData( metadata );
 	_protocol = protocol;
 	_name = new TQString( url );
 	_size = size;
@@ -53,26 +53,26 @@ KIO_Single_Subject::KIO_Single_Subject( TQObject * parent, const char * name,
 KIO_Single_Subject::~KIO_Single_Subject( )
 {
 	if( _job )
-		KIO::Scheduler::cancelJob( _job );
+		TDEIO::Scheduler::cancelJob( _job );
 	delete _kurl;
 	delete _metadata;
 	delete _name;
 	delete _message;
 }
 
-void KIO_Single_Subject::init( KIO::Slave *& slave)
+void KIO_Single_Subject::init( TDEIO::Slave *& slave)
 {
-	_job = KIO::get( *_kurl, false, false );
+	_job = TDEIO::get( *_kurl, false, false );
 	_job->addMetaData( *_metadata );
 	
-	connect( _job, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotResult( KIO::Job* ) ) );
-	connect( _job, TQT_SIGNAL( data         (KIO::Job *, const TQByteArray &) ),
-	         this, TQT_SLOT( slotData(KIO::Job *, const TQByteArray &) ) );
+	connect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );
+	connect( _job, TQT_SIGNAL( data         (TDEIO::Job *, const TQByteArray &) ),
+	         this, TQT_SLOT( slotData(TDEIO::Job *, const TQByteArray &) ) );
 	
 	if( _protocol->connectionBased( ) && slave )
-		KIO::Scheduler::assignJobToSlave( slave , _job );
+		TDEIO::Scheduler::assignJobToSlave( slave , _job );
 	else
-		KIO::Scheduler::scheduleJob( _job );
+		TDEIO::Scheduler::scheduleJob( _job );
 		 
 }
 
@@ -122,7 +122,7 @@ void KIO_Single_Subject::parseMail( TQString * message, KornMailSubject *subject
 	subject->setHeader( *message, fullMessage );
 }
 
-void KIO_Single_Subject::slotData( KIO::Job* job, const TQByteArray& data )
+void KIO_Single_Subject::slotData( TDEIO::Job* job, const TQByteArray& data )
 {
 	if( job != _job )
 		kdWarning() << i18n( "Got invalid job; something strange happened?" ) << endl;
@@ -130,8 +130,8 @@ void KIO_Single_Subject::slotData( KIO::Job* job, const TQByteArray& data )
 		_message->append( data );
 }
 
-//KIO::Scheduler::disconnectSlave missing  if connection stops
-void KIO_Single_Subject::slotResult( KIO::Job *job )
+//TDEIO::Scheduler::disconnectSlave missing  if connection stops
+void KIO_Single_Subject::slotResult( TDEIO::Job *job )
 {
 	if( job != _job )
 		kdWarning() << i18n( "Got invalid job; something strange happened?" ) << endl;
diff --git a/korn/kio_single_subject.h b/korn/kio_single_subject.h
index cba3a639a..9aac8baae 100644
--- a/korn/kio_single_subject.h
+++ b/korn/kio_single_subject.h
@@ -27,7 +27,7 @@
 class KornMailSubject;
 
 class KURL;
-namespace KIO { class MetaData; class Job; class TransferJob; class Slave; }
+namespace TDEIO { class MetaData; class Job; class TransferJob; class Slave; }
 class KIO_Protocol;
 
 class TQString;
@@ -36,8 +36,8 @@ class KIO_Single_Subject : public TQObject
 { Q_OBJECT
   
 public:
-	KIO_Single_Subject( TQObject * parent, const char * name, KURL &, KIO::MetaData &, const KIO_Protocol *,
-	                    KIO::Slave *&, const TQString &, const long );
+	KIO_Single_Subject( TQObject * parent, const char * name, KURL &, TDEIO::MetaData &, const KIO_Protocol *,
+	                    TDEIO::Slave *&, const TQString &, const long );
 	~KIO_Single_Subject( );
 	
 	//This functions try's te parse EMail; data, sender names and so on...
@@ -48,15 +48,15 @@ private:
 	TQString *_name;
 	KURL *_kurl;
 	const KIO_Protocol *_protocol;
-	KIO::MetaData *_metadata;
-	KIO::TransferJob* _job;
+	TDEIO::MetaData *_metadata;
+	TDEIO::TransferJob* _job;
 	long _size;
 	
-	void init( KIO::Slave*& );
+	void init( TDEIO::Slave*& );
 	
 private slots:
-	void slotResult( KIO::Job* );
-	void slotData( KIO::Job*, const TQByteArray& );
+	void slotResult( TDEIO::Job* );
+	void slotData( TDEIO::Job*, const TQByteArray& );
 	
 signals:
 	//This signal is emitted if the headers are read and put into a KornMailSubject*
diff --git a/korn/kio_subjects.cpp b/korn/kio_subjects.cpp
index 2de6ac59a..3fda7e4c8 100644
--- a/korn/kio_subjects.cpp
+++ b/korn/kio_subjects.cpp
@@ -39,7 +39,7 @@ KIO_Subjects::KIO_Subjects( TQObject * parent, const char * name )
 {
 	_jobs = new TQPtrList<KIO_Single_Subject>;
 	_kurl = new KURL;
-	_metadata = new KIO::MetaData;
+	_metadata = new TDEIO::MetaData;
 	
 	_jobs->setAutoDelete( true );
 }
@@ -84,11 +84,11 @@ void KIO_Subjects::doReadSubjects( KKioDrop *drop )
 void KIO_Subjects::getConnection( )
 {
 	KURL kurl = *_kurl;
-	KIO::MetaData metadata = *_metadata;
+	TDEIO::MetaData metadata = *_metadata;
 
 	if( _slave )
 	{
-		KIO::Scheduler::disconnectSlave( _slave );
+		TDEIO::Scheduler::disconnectSlave( _slave );
 		_slave = 0;
 	}
 	
@@ -99,7 +99,7 @@ void KIO_Subjects::getConnection( )
 		if( kurl.port() == 0 )
 			kurl.setPort( _protocol->defaultPort( _kio->_ssl ) );
 		
-		if( ! ( _slave = KIO::Scheduler::getConnectedSlave( kurl, metadata ) ) )
+		if( ! ( _slave = TDEIO::Scheduler::getConnectedSlave( kurl, metadata ) ) )
 		{
 			kdWarning() << i18n( "Not able to open a kio-slave for %1." ).arg( _protocol->configName() );
 			_kio->emitShowPassivePopup( i18n( "Not able to open a kio-slave for %1." ).arg( _protocol->configName() ) );
@@ -115,7 +115,7 @@ void KIO_Subjects::getConnection( )
 void KIO_Subjects::startJob( const TQString &name, const long size )
 {
 	KURL kurl = *_kurl;
-	KIO::MetaData metadata = *_metadata;
+	TDEIO::MetaData metadata = *_metadata;
 	KIO_Single_Subject *subject;
 	
 	kurl = name;
@@ -139,7 +139,7 @@ void KIO_Subjects::disConnect( bool result )
 	{
 		if( _slave )
 		{
-			KIO::Scheduler::disconnectSlave( _slave );
+			TDEIO::Scheduler::disconnectSlave( _slave );
 			_slave = 0;
 		}
 		_kio->emitReadSubjectsReady( result );
diff --git a/korn/kio_subjects.h b/korn/kio_subjects.h
index 124c83c40..018369de6 100644
--- a/korn/kio_subjects.h
+++ b/korn/kio_subjects.h
@@ -27,7 +27,7 @@ class KIO_Single_Subject;
 class KIO_Protocol;
 class KornMailSubject;
 
-namespace KIO { class MetaData; class Slave; }
+namespace TDEIO { class MetaData; class Slave; }
 class KURL;
 
 template<class T> class TQPtrList;
@@ -50,10 +50,10 @@ public:
 private:
 	KKioDrop *_kio;
 	KURL *_kurl;
-	KIO::MetaData *_metadata;
+	TDEIO::MetaData *_metadata;
 	const KIO_Protocol *_protocol;
 	TQPtrList<KIO_Single_Subject> *_jobs;
-	KIO::Slave *_slave;
+	TDEIO::Slave *_slave;
 	bool _valid;
 	
 	//Opens a connection.
diff --git a/korn/kmail_proto.cpp b/korn/kmail_proto.cpp
index fb6166c31..8f740c80a 100644
--- a/korn/kmail_proto.cpp
+++ b/korn/kmail_proto.cpp
@@ -51,9 +51,9 @@ KMail_Protocol::~KMail_Protocol()
 {
 }
 
-const Protocol* KMail_Protocol::getProtocol( KConfigGroup* config ) const
+const Protocol* KMail_Protocol::getProtocol( TDEConfigGroup* config ) const
 {
-	KConfig kmailconfig( "kmailrc", true, false );
+	TDEConfig kmailconfig( "kmailrc", true, false );
 	int id;
 	TQString type = getTypeAndConfig( config->readEntry( "kmailname" ), kmailconfig, id );
 
@@ -73,10 +73,10 @@ const Protocol* KMail_Protocol::getProtocol( KConfigGroup* config ) const
 	return 0;
 }
 
-KMailDrop* KMail_Protocol::createMaildrop( KConfigGroup *config ) const
+KMailDrop* KMail_Protocol::createMaildrop( TDEConfigGroup *config ) const
 {
 	int id;
-	KConfig kmailconfig( "kmailrc", true, false );
+	TDEConfig kmailconfig( "kmailrc", true, false );
 	TQString type = getTypeAndConfig( config->readEntry( "kmailname" ), kmailconfig, id );
 
 	if( type == "imap" || type == "cachedimap" || type == "pop" || type == "local" || type == "maildir" )
@@ -86,11 +86,11 @@ KMailDrop* KMail_Protocol::createMaildrop( KConfigGroup *config ) const
 	return 0;
 }
 
-TQMap< TQString, TQString > * KMail_Protocol::createConfig( KConfigGroup* config, const TQString& ) const
+TQMap< TQString, TQString > * KMail_Protocol::createConfig( TDEConfigGroup* config, const TQString& ) const
 {
 	TQMap< TQString, TQString > *result = new TQMap<TQString, TQString>;
 	int id;
-	KConfig kmailconfig( "kmailrc", true, false );
+	TDEConfig kmailconfig( "kmailrc", true, false );
 	//First: find the account in the configuration and get the type and id out of it.
 	TQString type = getTypeAndConfig( config->readEntry( "kmailname" ), kmailconfig, id );
 	TQString metadata;
@@ -184,7 +184,7 @@ void KMail_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObje
 	TQString name;
 	int nummer = kmailFirstGroup - 1;
 	
-	KConfig kmailconfig( "kmailrc", true, false );
+	TDEConfig kmailconfig( "kmailrc", true, false );
 	while( kmailconfig.hasGroup( TQString( kmailGroupName ).arg( ++nummer ) ) )
 	{
 		kmailconfig.setGroup( TQString( kmailGroupName ).arg( nummer ) );
@@ -209,7 +209,7 @@ void KMail_Protocol::writeEntries( TQMap< TQString, TQString >* ) const
 	//The configuartion is read out on the right way
 }
 
-TQString KMail_Protocol::readPassword( bool store, const KConfigBase& config, int id ) const
+TQString KMail_Protocol::readPassword( bool store, const TDEConfigBase& config, int id ) const
 {
 	if( !store )
 		return "";
@@ -217,7 +217,7 @@ TQString KMail_Protocol::readPassword( bool store, const KConfigBase& config, in
 	return KOrnPassword::readKMailPassword( id, config );
 }
 
-TQString KMail_Protocol::getTypeAndConfig( const TQString& kmailname, KConfig &kmailconfig, int &id ) const
+TQString KMail_Protocol::getTypeAndConfig( const TQString& kmailname, TDEConfig &kmailconfig, int &id ) const
 {
 	int nummer = kmailFirstGroup - 1;
 	bool found = false;
diff --git a/korn/kmail_proto.h b/korn/kmail_proto.h
index 72e846d25..c2026baf1 100644
--- a/korn/kmail_proto.h
+++ b/korn/kmail_proto.h
@@ -22,8 +22,8 @@
 
 #include "protocol.h"
 
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /**
  * This class is the comminucation between KOrn and KMail.
@@ -51,14 +51,14 @@ public:
 	 * @param config The configuration group to read the kmailname from.
 	 * @return A pointer to a Protocol (not newly created) or 0 if an error orrured.
 	 */
-	virtual const Protocol* getProtocol( KConfigGroup* config ) const;
+	virtual const Protocol* getProtocol( TDEConfigGroup* config ) const;
 	/**
 	 * This gives a new Maildrop back. The maildrop is responsible to execute the configuration.
 	 * In most cases, it will return a new instance of the KKioDrop Maildrop.
 	 * @param config The configuration group to read the kmailname from.
 	 * @return A new KMailDrop, or a 0 pointer if an error occured.
 	 */
-        virtual KMailDrop* createMaildrop( KConfigGroup* config ) const;
+        virtual KMailDrop* createMaildrop( TDEConfigGroup* config ) const;
 	/**
 	 * This does the real convertion: given a namen of a KMail account (hidden in config),
 	 * it calculates how the configuration whould have looked in KOrn.
@@ -67,7 +67,7 @@ public:
 	 * @param password The password fetched out of the configuration or KWallet.
 	 * @return A mapping containing the configuration if success, and empty mapping otherwise.
 	 */
-        virtual TQMap< TQString, TQString > * createConfig( KConfigGroup* config, const TQString& password ) const;
+        virtual TQMap< TQString, TQString > * createConfig( TDEConfigGroup* config, const TQString& password ) const;
 	/**
 	 * The name of thes protocol
 	 *
@@ -107,8 +107,8 @@ public:
 	virtual void writeEntries( TQMap< TQString, TQString >* config ) const;
 
 private:
-	TQString readPassword( bool store, const KConfigBase &config, int id ) const;
-	TQString getTypeAndConfig( const TQString& kmailname, KConfig &config, int &nummer ) const;
+	TQString readPassword( bool store, const TDEConfigBase &config, int id ) const;
+	TQString getTypeAndConfig( const TQString& kmailname, TDEConfig &config, int &nummer ) const;
 	
 	static const char* kmailGroupName;
 	static const char* kmailKeyName;
diff --git a/korn/kornaccountcfgimpl.cpp b/korn/kornaccountcfgimpl.cpp
index 19c0bb1d6..a68ccefb6 100644
--- a/korn/kornaccountcfgimpl.cpp
+++ b/korn/kornaccountcfgimpl.cpp
@@ -63,7 +63,7 @@ KornAccountCfgImpl::~KornAccountCfgImpl()
 	delete _accountinput;
 }
 
-void KornAccountCfgImpl::readConfig( KConfigGroup *config, TQMap< TQString, TQString > *entries, int boxnr, int accountnr )
+void KornAccountCfgImpl::readConfig( TDEConfigGroup *config, TQMap< TQString, TQString > *entries, int boxnr, int accountnr )
 {
 	AccountInput *input;
 	
diff --git a/korn/kornaccountcfgimpl.h b/korn/kornaccountcfgimpl.h
index 8e2f833e1..0a765dcbd 100644
--- a/korn/kornaccountcfgimpl.h
+++ b/korn/kornaccountcfgimpl.h
@@ -21,7 +21,7 @@
 
 #include "kornaccountcfg.h"
 
-class KConfigGroup;
+class TDEConfigGroup;
 class KURLRequester;
 
 class TQVBoxLayout;
@@ -42,7 +42,7 @@ public:
 	KornAccountCfgImpl( TQWidget * parent = 0, const char * name = 0 );
 	~KornAccountCfgImpl();
 	
-	void readConfig( KConfigGroup *config, TQMap< TQString, TQString > *entries, int boxnr, int accountnr );
+	void readConfig( TDEConfigGroup *config, TQMap< TQString, TQString > *entries, int boxnr, int accountnr );
 	void writeConfig();
 
 public slots:
@@ -55,7 +55,7 @@ private slots:
 	void slotOK();
 	void slotCancel();
 private:
-	KConfigGroup *_config;
+	TDEConfigGroup *_config;
 	int _fields;
 	int _urlfields;
 	int _boxnr, _accountnr;
diff --git a/korn/kornboxcfg.ui b/korn/kornboxcfg.ui
index 863b222a9..53e32d9c6 100644
--- a/korn/kornboxcfg.ui
+++ b/korn/kornboxcfg.ui
@@ -1490,8 +1490,8 @@
         <pixmap>image0</pixmap>
         <signal>activated( const TQString&amp; )</signal>
         <signal>activated( const int )</signal>
-        <signal>setDefaults( const TQString&amp;, KConfig* )</signal>
-        <signal>setDefaults( const TQString&amp;, const int, KConfig* )</signal>
+        <signal>setDefaults( const TQString&amp;, TDEConfig* )</signal>
+        <signal>setDefaults( const TQString&amp;, const int, TDEConfig* )</signal>
     </customwidget>
 </customwidgets>
 <images>
@@ -1556,9 +1556,9 @@
     </connection>
     <connection>
         <sender>elbAccounts</sender>
-        <signal>setDefaults(const TQString&amp;,const int,KConfig*)</signal>
+        <signal>setDefaults(const TQString&amp;,const int,TDEConfig*)</signal>
         <receiver>KornBoxCfg</receiver>
-        <slot>slotSetDefaults(const TQString&amp;,const int,KConfig*)</slot>
+        <slot>slotSetDefaults(const TQString&amp;,const int,TDEConfig*)</slot>
     </connection>
     <connection>
         <sender>pbNormalFont</sender>
@@ -1669,7 +1669,7 @@
     <slot access="protected">slotEditBox()</slot>
     <slot access="protected">slotActivated( const TQString&amp; )</slot>
     <slot access="protected">slotActivated( const int )</slot>
-    <slot access="protected">slotSetDefaults( const TQString&amp;, const int, KConfig* )</slot>
+    <slot access="protected">slotSetDefaults( const TQString&amp;, const int, TDEConfig* )</slot>
     <slot access="protected">slotChangeNormalFont()</slot>
     <slot access="protected">slotChangeNewFont()</slot>
     <slot access="protected">slotChangeNormalAnim()</slot>
diff --git a/korn/kornboxcfgimpl.cpp b/korn/kornboxcfgimpl.cpp
index ab6671427..fc699c10f 100644
--- a/korn/kornboxcfgimpl.cpp
+++ b/korn/kornboxcfgimpl.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
  
-class KConfig;
+class TDEConfig;
 #include "kornboxcfgimpl.h"
 
 #include "keditlistboxman.h"
@@ -73,7 +73,7 @@ KornBoxCfgImpl::~KornBoxCfgImpl()
 	delete _anims[ 1 ];
 }
 
-void KornBoxCfgImpl::readConfig( KConfig * config, const int index )
+void KornBoxCfgImpl::readConfig( TDEConfig * config, const int index )
 {
 	_config = config;
 	_index = index;
@@ -86,7 +86,7 @@ void KornBoxCfgImpl::readConfig( KConfig * config, const int index )
 	readAccountsConfig();
 }
 
-void KornBoxCfgImpl::writeConfig( KConfig * config, const int index )
+void KornBoxCfgImpl::writeConfig( TDEConfig * config, const int index )
 {
 	config->setGroup( TQString( "korn-%1" ).arg( index ) );
 	
@@ -165,7 +165,7 @@ void KornBoxCfgImpl::readDCOPConfig()
 	elbDCOP->insertStringList( _config->readListEntry( "dcop", ',' ) );
 }
 	
-void KornBoxCfgImpl::writeViewConfig( KConfig* config )
+void KornBoxCfgImpl::writeViewConfig( TDEConfig* config )
 {
 	TQColor invalid;
 	
@@ -194,7 +194,7 @@ void KornBoxCfgImpl::writeViewConfig( KConfig* config )
 	
 }
 
-void KornBoxCfgImpl::writeEventConfig( KConfig *config )
+void KornBoxCfgImpl::writeEventConfig( TDEConfig *config )
 {
 	config->writeEntry( "leftrecheck",   this->chLeftRecheck  ->isChecked() );
 	config->writeEntry( "middlerecheck", this->chMiddleRecheck->isChecked() );
@@ -224,11 +224,11 @@ void KornBoxCfgImpl::writeEventConfig( KConfig *config )
 	config->writeEntry( "passivedate", this->chPassiveDate->isChecked() );
 }
 
-void KornBoxCfgImpl::writeAccountsConfig( KConfig */*config */)
+void KornBoxCfgImpl::writeAccountsConfig( TDEConfig */*config */)
 {
 }
 
-void KornBoxCfgImpl::writeDCOPConfig( KConfig *config )
+void KornBoxCfgImpl::writeDCOPConfig( TDEConfig *config )
 {
 	config->writeEntry( "dcop", elbDCOP->items(), ',' );
 }
@@ -249,7 +249,7 @@ void KornBoxCfgImpl::slotEditBox()
 	
 	connect( _base, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogDestroyed() ) );
 
-	_group = new KConfigGroup( _config, TQString( "korn-%1-%2" ).
+	_group = new TDEConfigGroup( _config, TQString( "korn-%1-%2" ).
 			arg( _index ).arg(elbAccounts->listBox()->currentItem() ) );
 	
 	TQMap< TQString, TQString > *map = new TQMap< TQString, TQString >( _config->entryMap( TQString( "korn-%1-%2" ).
@@ -270,7 +270,7 @@ void KornBoxCfgImpl::slotActivated( const int )
 	slotEditBox();
 }
 
-void KornBoxCfgImpl::slotSetDefaults( const TQString& name, const int, KConfig* config )
+void KornBoxCfgImpl::slotSetDefaults( const TQString& name, const int, TDEConfig* config )
 {
 	config->writeEntry( "name", name );
 	config->writeEntry( "protocol", "mbox" );
diff --git a/korn/kornboxcfgimpl.h b/korn/kornboxcfgimpl.h
index 73cf7bb55..5bc82c443 100644
--- a/korn/kornboxcfgimpl.h
+++ b/korn/kornboxcfgimpl.h
@@ -21,8 +21,8 @@
 
 #include "kornboxcfg.h"
 
-class KConfig;
-class KConfigGroup;
+class TDEConfig;
+class TDEConfigGroup;
 class KDialogBase;
 
 class TQFont;
@@ -37,20 +37,20 @@ public:
 	~KornBoxCfgImpl();
 	
 	/**
-	 * This method write the current configuration to a specified KConfig-object.
+	 * This method write the current configuration to a specified TDEConfig-object.
 	 *
 	 * @param config The config where in which the configuration should be added.
 	 * @param index The index of the selected config. This is the group-number.
 	 */
-	void writeConfig( KConfig * config, const int index );
+	void writeConfig( TDEConfig * config, const int index );
 	
 	/**
-	 * This method write the current configuration to a specified KConfig-object.
+	 * This method write the current configuration to a specified TDEConfig-object.
 	 *
 	 * @param config The config where in which the configuration should be added. Note that this object is stored locally until the object is destroyed.
 	 * @param index The index of the selected config. This is the group-number.
 	 */
-	void readConfig( KConfig * config, const int index );
+	void readConfig( TDEConfig * config, const int index );
 	
 private:
 	void readViewConfig();
@@ -58,13 +58,13 @@ private:
 	void readAccountsConfig();
 	void readDCOPConfig();
 	
-	void writeViewConfig( KConfig* config );
-	void writeEventConfig( KConfig *config );
-	void writeAccountsConfig( KConfig *config );
-	void writeDCOPConfig( KConfig *config );
+	void writeViewConfig( TDEConfig* config );
+	void writeEventConfig( TDEConfig *config );
+	void writeAccountsConfig( TDEConfig *config );
+	void writeDCOPConfig( TDEConfig *config );
 	
-	KConfig* _config;
-	KConfigGroup *_group;
+	TDEConfig* _config;
+	TDEConfigGroup *_group;
 	KDialogBase *_base;
 	int _index;
 	TQString *_anims[ 2 ];
@@ -74,7 +74,7 @@ protected slots:
 	virtual void slotEditBox();
 	virtual void slotActivated( const TQString& );
 	virtual void slotActivated( const int );
-	virtual void slotSetDefaults( const TQString&, const int, KConfig* );
+	virtual void slotSetDefaults( const TQString&, const int, TDEConfig* );
 	virtual void slotChangeNormalAnim();
 	virtual void slotChangeNewAnim();
 	virtual void slotChangeNormalFont();
diff --git a/korn/korncfg.ui b/korn/korncfg.ui
index 8707cecc6..f99da3d4a 100644
--- a/korn/korncfg.ui
+++ b/korn/korncfg.ui
@@ -134,8 +134,8 @@
         <pixmap>image0</pixmap>
         <signal>activated( const TQString&amp; )</signal>
         <signal>activated( const int )</signal>
-        <signal>setDefaults( const TQString&amp;, KConfig* )</signal>
-        <signal>setDefaults( const TQString&amp;, const int, KConfig* )</signal>
+        <signal>setDefaults( const TQString&amp;, TDEConfig* )</signal>
+        <signal>setDefaults( const TQString&amp;, const int, TDEConfig* )</signal>
     </customwidget>
 </customwidgets>
 <images>
@@ -152,9 +152,9 @@
     </connection>
     <connection>
         <sender>elbBoxes</sender>
-        <signal>setDefaults(const TQString&amp;,const int,KConfig*)</signal>
+        <signal>setDefaults(const TQString&amp;,const int,TDEConfig*)</signal>
         <receiver>KornCfgWidget</receiver>
-        <slot>slotSetDefaults(const TQString&amp;,const int,KConfig*)</slot>
+        <slot>slotSetDefaults(const TQString&amp;,const int,TDEConfig*)</slot>
     </connection>
     <connection>
         <sender>pbEdit</sender>
@@ -169,7 +169,7 @@
     <slot>slotOK()</slot>
     <slot>slotApply()</slot>
     <slot>slotCancel()</slot>
-    <slot access="protected">slotSetDefaults( const TQString&amp;, const int, KConfig* )</slot>
+    <slot access="protected">slotSetDefaults( const TQString&amp;, const int, TDEConfig* )</slot>
     <slot access="protected">slotEditBox()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
diff --git a/korn/korncfgimpl.cpp b/korn/korncfgimpl.cpp
index 33af34065..b944087f1 100644
--- a/korn/korncfgimpl.cpp
+++ b/korn/korncfgimpl.cpp
@@ -39,7 +39,7 @@
  */
 KornCfgImpl::KornCfgImpl( TQWidget * parent, const char * name )
 	: KornCfgWidget( parent, name ),	
-	_config( new KConfig( "kornrc" ) ),
+	_config( new TDEConfig( "kornrc" ) ),
 	_base( 0 )
 {
 	elbBoxes->setSubGroupName( "korn-%1-%2" );
@@ -120,7 +120,7 @@ void KornCfgImpl::slotActivated( const int )
 	slotEditBox();
 }
 
-void KornCfgImpl::slotSetDefaults( const TQString& name, const int index, KConfig* config )
+void KornCfgImpl::slotSetDefaults( const TQString& name, const int index, TDEConfig* config )
 {
 	config->writeEntry( "name", name );
 	config->writeEntry( "hasnormalfgcolour", true );
@@ -234,14 +234,14 @@ void KornCfgImpl::rewritePasswords()
 {
 	int box = 0 - 1;
 	int account = 0 - 1;
-	KConfigGroup *group;
+	TDEConfigGroup *group;
 
 	while( _config->hasGroup( TQString( "korn-%1" ).arg( ++box ) ) )
 	{
 		account = 0 - 1;
 		while( _config->hasGroup( TQString( "korn-%1-%2" ).arg( box ).arg( ++account ) ) )
 		{
-			group = new KConfigGroup( _config, TQString( "korn-%1-%2" ).arg( box ).arg( account ) );
+			group = new TDEConfigGroup( _config, TQString( "korn-%1-%2" ).arg( box ).arg( account ) );
 			KOrnPassword::rewritePassword( box, account, *group, chUseWallet->isChecked() );
 			delete group;
 		}
diff --git a/korn/korncfgimpl.h b/korn/korncfgimpl.h
index eee7c610d..e1289cd8e 100644
--- a/korn/korncfgimpl.h
+++ b/korn/korncfgimpl.h
@@ -19,7 +19,7 @@
 #ifndef MK_KORNCFGIMPL_H
 #define MK_KORNCFGIMPL_H
 
-class KConfig;
+class TDEConfig;
 #include "korncfg.h"
 
 class KDialogBase;
@@ -42,7 +42,7 @@ protected slots:
 	virtual void slotEditBox();
 	virtual void slotActivated( const TQString& );
 	virtual void slotActivated( const int );
-	virtual void slotSetDefaults( const TQString&, const int, KConfig* );
+	virtual void slotSetDefaults( const TQString&, const int, TDEConfig* );
 public slots:
 	virtual void slotOK();
 	virtual void slotCancel();
@@ -54,7 +54,7 @@ private:
 
 	void rewritePasswords();
 	
-	KConfig *_config;
+	TDEConfig *_config;
 	KDialogBase *_base;
 };
 
diff --git a/korn/kornshell.cpp b/korn/kornshell.cpp
index dc823779d..2e0cc091d 100644
--- a/korn/kornshell.cpp
+++ b/korn/kornshell.cpp
@@ -34,7 +34,7 @@
 
 KornShell::KornShell( TQWidget * parent, const char * name )
 	: TQWidget( parent, name ),
-	_config( new KConfig( "kornrc" ) ),
+	_config( new TDEConfig( "kornrc" ) ),
 	_box( 0 ),
 	_configDialog( 0 ),
 	_show( false )
diff --git a/korn/kornshell.h b/korn/kornshell.h
index e3e506677..57d631d77 100644
--- a/korn/kornshell.h
+++ b/korn/kornshell.h
@@ -22,7 +22,7 @@
 class BoxContainer;
 class KDialogBase;
 
-class KConfig;
+class TDEConfig;
 
 #include <tqwidget.h>
 
@@ -49,7 +49,7 @@ private slots:
 	void readConfig();
 	
 private:
-	KConfig *_config;
+	TDEConfig *_config;
 	BoxContainer *_box;
 	KDialogBase *_configDialog;
 	bool _show;
diff --git a/korn/maildir_proto.h b/korn/maildir_proto.h
index 2ce5e9dbb..d7700ac3d 100644
--- a/korn/maildir_proto.h
+++ b/korn/maildir_proto.h
@@ -46,11 +46,11 @@ public:
 		
 	virtual TQString serverName() const { return i18n( "Path:" ); }
 
-	virtual void recheckKURL( KURL &kurl, KIO::MetaData & )
+	virtual void recheckKURL( KURL &kurl, TDEIO::MetaData & )
 	                               { kurl.setPath( kurl.host() + "/." + kurl.path().replace( '/' , '.' ) + "/new" ); kurl.setHost( "" ); }
-	virtual void readSubjectKURL( KURL &, KIO::MetaData & ) { }
-	virtual void deleteMailKURL( KURL &, KIO::MetaData & )  { }
-	virtual void readMailKURL( KURL &, KIO::MetaData & )    { }
+	virtual void readSubjectKURL( KURL &, TDEIO::MetaData & ) { }
+	virtual void deleteMailKURL( KURL &, TDEIO::MetaData & )  { }
+	virtual void readMailKURL( KURL &, TDEIO::MetaData & )    { }
 };
 
 #endif
diff --git a/korn/maildrop.cpp b/korn/maildrop.cpp
index 9d2f12f67..20b6dfe9d 100644
--- a/korn/maildrop.cpp
+++ b/korn/maildrop.cpp
@@ -72,7 +72,7 @@ void KMailDrop::forceCountZero()
   emit changed( 0, this );
 }
 
-void KMailDrop::readGeneralConfigGroup( const KConfigBase& cfg )
+void KMailDrop::readGeneralConfigGroup( const TDEConfigBase& cfg )
 {
   _passivePopup = cfg.readBoolEntry(fu(PassivePopupConfigKey), false );
   _passiveDate = cfg.readBoolEntry(fu(PassiveDateConfigKey), false );
@@ -82,7 +82,7 @@ void KMailDrop::readGeneralConfigGroup( const KConfigBase& cfg )
   emit(configChanged());
 }
 
-bool KMailDrop::readConfigGroup(const KConfigBase & c)
+bool KMailDrop::readConfigGroup(const TDEConfigBase & c)
 {
   _caption    = c.readEntry(fu(CaptionConfigKey));
   _clickCmd   = c.readPathEntry(fu(ClickConfigKey));
@@ -103,7 +103,7 @@ bool KMailDrop::readConfigGroup(const KConfigBase & c)
   return true;
 }
 
-bool KMailDrop::writeConfigGroup(KConfigBase & c) const
+bool KMailDrop::writeConfigGroup(TDEConfigBase & c) const
 {
   c.writeEntry(fu(TypeConfigKey),         type());
   c.writeEntry(fu(CaptionConfigKey),      caption());
diff --git a/korn/maildrop.h b/korn/maildrop.h
index 460f0afff..e0f1a46d1 100644
--- a/korn/maildrop.h
+++ b/korn/maildrop.h
@@ -13,8 +13,8 @@
 
 class Protocol;
 
-class KConfigBase;
-class KConfigGroup;
+class TDEConfigBase;
+class TDEConfigGroup;
 class KDropCfgDialog;
 class TQColor;
 class KornMailSubject;
@@ -150,7 +150,7 @@ class KMailDrop : public TQObject
      *@param cfg A configuration object with the group already
      * set to the configuration for this box
      */
-    virtual void readGeneralConfigGroup( const KConfigBase& cfg );
+    virtual void readGeneralConfigGroup( const TDEConfigBase& cfg );
 
     /** 
      * Read box configuration from a config group. Subclasses that
@@ -160,7 +160,7 @@ class KMailDrop : public TQObject
      *     the configuration for this box.
      * @return true if read was successful, false otherwise.
      */
-    virtual bool readConfigGroup( const KConfigBase& cfg );
+    virtual bool readConfigGroup( const TDEConfigBase& cfg );
     virtual bool readConfigGroup( const TQMap< TQString, TQString > &, const Protocol * ) { return true; }
 
     /** 
@@ -171,7 +171,7 @@ class KMailDrop : public TQObject
      *     the configuration for this box.
      * @return true if read was successful, false otherwise.
      */
-    virtual bool writeConfigGroup( KConfigBase& cfg ) const;
+    virtual bool writeConfigGroup( TDEConfigBase& cfg ) const;
 
     /** 
      * Return the type of this monitor, for display and
diff --git a/korn/mbox_proto.h b/korn/mbox_proto.h
index 78b01abfb..f017f3b6f 100644
--- a/korn/mbox_proto.h
+++ b/korn/mbox_proto.h
@@ -43,11 +43,11 @@ public:
 		
 	virtual TQString mailboxName() const { return i18n( "File:" ); }
 	
-	virtual void recheckKURL( KURL &, KIO::MetaData & md ) const
+	virtual void recheckKURL( KURL &, TDEIO::MetaData & md ) const
 		{ md.insert( "onlynew", "" ); md.insert( "savetime", "" ); }
-	virtual void readSubjectKURL( KURL &, KIO::MetaData & ) const { }
-	virtual void deleteMailKURL( KURL &, KIO::MetaData & ) const { }
-	virtual void readMailKURL( KURL &, KIO::MetaData & ) const   { }
+	virtual void readSubjectKURL( KURL &, TDEIO::MetaData & ) const { }
+	virtual void deleteMailKURL( KURL &, TDEIO::MetaData & ) const { }
+	virtual void readMailKURL( KURL &, TDEIO::MetaData & ) const   { }
 
 	virtual void configFillGroupBoxes( TQStringList* ) const;
 	virtual void configFields( TQPtrVector< TQWidget >*, const TQObject*, TQPtrList< AccountInput >* ) const;
diff --git a/korn/password.cpp b/korn/password.cpp
index 764b90f98..966221394 100644
--- a/korn/password.cpp
+++ b/korn/password.cpp
@@ -30,7 +30,7 @@ KWallet::Wallet* KOrnPassword::m_wallet = 0;
 bool KOrnPassword::m_openFailed = false;
 bool KOrnPassword::m_useWallet = false; //Not default true until moving works
 
-TQString KOrnPassword::readKOrnPassword( int box, int account, const KConfigBase &fallbackConfig )
+TQString KOrnPassword::readKOrnPassword( int box, int account, const TDEConfigBase &fallbackConfig )
 {
 	TQString result;
 
@@ -40,7 +40,7 @@ TQString KOrnPassword::readKOrnPassword( int box, int account, const KConfigBase
 		return fallbackConfig.readEntry( "password" );
 }
 
-TQString KOrnPassword::readKMailPassword( int accountnr, const KConfigBase& fallbackConfig )
+TQString KOrnPassword::readKMailPassword( int accountnr, const TDEConfigBase& fallbackConfig )
 {
 	TQString password;
 	open();
@@ -58,7 +58,7 @@ TQString KOrnPassword::readKMailPassword( int accountnr, const KConfigBase& fall
 	return password;
 }
 
-void KOrnPassword::writeKOrnPassword( int box, int account, KConfigBase& fallbackConfig, const TQString& password )
+void KOrnPassword::writeKOrnPassword( int box, int account, TDEConfigBase& fallbackConfig, const TQString& password )
 {
 	if( writeKOrnPassword( box, account, password ) )
 	{
@@ -69,7 +69,7 @@ void KOrnPassword::writeKOrnPassword( int box, int account, KConfigBase& fallbac
 		fallbackConfig.writeEntry( "password", password );
 }
 
-void KOrnPassword::deleteKOrnPassword( int box, int account, KConfigBase& fallbackConfig )
+void KOrnPassword::deleteKOrnPassword( int box, int account, TDEConfigBase& fallbackConfig )
 {
 	deleteKOrnPassword( box, account );
 	if( fallbackConfig.hasKey( "password" ) )
@@ -103,8 +103,8 @@ bool KOrnPassword::deleteKOrnPassword( int box, int account )
 	return true;
 }
 
-void KOrnPassword::moveKOrnPassword( int boxSrc, int accountSrc, KConfigBase& configSrc,
-                                     int boxDest, int accountDest, KConfigBase &configDest )
+void KOrnPassword::moveKOrnPassword( int boxSrc, int accountSrc, TDEConfigBase& configSrc,
+                                     int boxDest, int accountDest, TDEConfigBase &configDest )
 {
 	TQString password;
 	
@@ -113,7 +113,7 @@ void KOrnPassword::moveKOrnPassword( int boxSrc, int accountSrc, KConfigBase& co
 	writeKOrnPassword( boxDest, accountDest, configDest, password );
 }
 
-void KOrnPassword::swapKOrnPassword( int box1, int account1, KConfigBase &config1, int box2, int account2, KConfigBase &config2 )
+void KOrnPassword::swapKOrnPassword( int box1, int account1, TDEConfigBase &config1, int box2, int account2, TDEConfigBase &config2 )
 {
 	TQString password1, password2;
 	password1 = readKOrnPassword( box1, account1, config1 );
@@ -149,7 +149,7 @@ void KOrnPassword::swapKOrnWalletPasswords( int box1, int accountnumber1 ,int bo
 		swapKOrnWalletPassword( box1, xx, box2, xx );
 }
 
-void KOrnPassword::rewritePassword( int box, int account, KConfigBase &config, bool newUseWalletValue )
+void KOrnPassword::rewritePassword( int box, int account, TDEConfigBase &config, bool newUseWalletValue )
 {
 	bool useWallet = m_useWallet;
 	TQString password;
diff --git a/korn/password.h b/korn/password.h
index ebfb24c4a..a2df7f990 100644
--- a/korn/password.h
+++ b/korn/password.h
@@ -20,7 +20,7 @@
 #ifndef KORNPASSWORD_H
 #define KORNPASSWORD_H
 
-class KConfigBase;
+class TDEConfigBase;
 namespace KWallet { class Wallet; }
 
 class TQString;
@@ -49,7 +49,7 @@ public:
 	 * @param fallbackConfig The configuration file if KWallet cannot be used.
 	 * @return The password, or TQString() if it failes.
 	 */
-	static TQString readKOrnPassword( int box, int account, const KConfigBase& fallbackConfig );
+	static TQString readKOrnPassword( int box, int account, const TDEConfigBase& fallbackConfig );
 	/**
 	 * This function gets a password with is puts in KWallet by KMail
 	 *
@@ -57,7 +57,7 @@ public:
 	 * @param fallbackConfig The configuration used if KWallet isn't available.
 	 * @return The password, TQStirng::null if it failes.
 	 */
-	static TQString readKMailPassword( int accountnr, const KConfigBase& fallbackConfig );
+	static TQString readKMailPassword( int accountnr, const TDEConfigBase& fallbackConfig );
 	
 	/**
 	 * This function saves a password for usage in KOrn.
@@ -67,7 +67,7 @@ public:
 	 * @param fallbackConfig The configuration file if KWallet isn't available.
 	 * @param password The password to be stored.
 	 */
-	static void writeKOrnPassword( int box, int account, KConfigBase& fallbackConfig, const TQString& password );
+	static void writeKOrnPassword( int box, int account, TDEConfigBase& fallbackConfig, const TQString& password );
 
 	/**
 	 * This function deletes a password from both KWallet and the configuration file
@@ -76,7 +76,7 @@ public:
 	 * @param account The accountnumber of the account.
 	 * @param fallbackConfig The configuration file if KWallet isn't available.
 	 */
-	static void deleteKOrnPassword( int box, int account, KConfigBase& fallbackConfig );
+	static void deleteKOrnPassword( int box, int account, TDEConfigBase& fallbackConfig );
 
 	/**
 	 * This function deletes a password from KWallet 
@@ -96,8 +96,8 @@ public:
 	 * @param accountDest The destination account number
 	 * @param configDest The destination configuration group.
 	 */
-	static void moveKOrnPassword( int boxSrc, int accountSrc, KConfigBase &configSrc,
-	                              int boxDest, int accountDest, KConfigBase &configDest );
+	static void moveKOrnPassword( int boxSrc, int accountSrc, TDEConfigBase &configSrc,
+	                              int boxDest, int accountDest, TDEConfigBase &configDest );
 
 	/**
 	 * This swaps the password from one box/account combination to another.
@@ -109,7 +109,7 @@ public:
 	 * @param account2 The account number of the second password.
 	 * @param config2 The configurationgroup of the second password.
 	 */
-	static void swapKOrnPassword( int box1, int account1, KConfigBase &config1, int box2, int account2, KConfigBase &config2 );
+	static void swapKOrnPassword( int box1, int account1, TDEConfigBase &config1, int box2, int account2, TDEConfigBase &config2 );
 
 	/**
 	 * This swaps the Wallet password from one box/account combination to another.
@@ -140,7 +140,7 @@ public:
 	 * @param config The configuration group
 	 * @param newUseWalletValue true to transport a password from a configuration to a wallet, false the other wat around
 	 */
-	static void rewritePassword( int box, int account, KConfigBase &config, bool newUseWalletValue );
+	static void rewritePassword( int box, int account, TDEConfigBase &config, bool newUseWalletValue );
 	
 	/**
 	 * If set to true, this class will try to use KWallet,
diff --git a/korn/polldrop.cpp b/korn/polldrop.cpp
index 8d05a03be..bc4422caf 100644
--- a/korn/polldrop.cpp
+++ b/korn/polldrop.cpp
@@ -59,7 +59,7 @@ void KPollableDrop::timerEvent( TQTimerEvent *ev )
 	}
 }
 
-bool KPollableDrop::readConfigGroup( const KConfigBase& cfg )
+bool KPollableDrop::readConfigGroup( const TDEConfigBase& cfg )
 {
 	KMailDrop::readConfigGroup( cfg );
 
@@ -68,7 +68,7 @@ bool KPollableDrop::readConfigGroup( const KConfigBase& cfg )
 	return true;
 }
 
-bool KPollableDrop::writeConfigGroup( KConfigBase& cfg ) const
+bool KPollableDrop::writeConfigGroup( TDEConfigBase& cfg ) const
 {
 	KMailDrop::writeConfigGroup( cfg );
 
diff --git a/korn/polldrop.h b/korn/polldrop.h
index 44a90d1c2..b45cdb4da 100644
--- a/korn/polldrop.h
+++ b/korn/polldrop.h
@@ -47,8 +47,8 @@ public:
 	int freq() const { return _freq; }
 	void setFreq( int freq );
 
-	virtual bool readConfigGroup ( const KConfigBase& cfg );
-	virtual bool writeConfigGroup ( KConfigBase& cfg ) const;
+	virtual bool readConfigGroup ( const TDEConfigBase& cfg );
+	virtual bool writeConfigGroup ( TDEConfigBase& cfg ) const;
 
 	//virtual void addConfigPage( KDropCfgDialog * );
 
diff --git a/korn/pop3_proto.h b/korn/pop3_proto.h
index c828e595f..2d4e7661f 100644
--- a/korn/pop3_proto.h
+++ b/korn/pop3_proto.h
@@ -44,10 +44,10 @@ public:
 
 	virtual TQStringList authList() const { return TQStringList::split( '|', "Plain|APOP", false ); }
 	
-	virtual void readSubjectKURL( KURL & kurl, KIO::MetaData & ) const { kurl.setPath( kurl.path().replace( "/download/", "/headers/" ) ); }
-	virtual void deleteMailKURL ( KURL & kurl, KIO::MetaData & ) const { kurl.setPath( kurl.path().replace( "/download/", "/remove/" ) ); }
+	virtual void readSubjectKURL( KURL & kurl, TDEIO::MetaData & ) const { kurl.setPath( kurl.path().replace( "/download/", "/headers/" ) ); }
+	virtual void deleteMailKURL ( KURL & kurl, TDEIO::MetaData & ) const { kurl.setPath( kurl.path().replace( "/download/", "/remove/" ) ); }
 	virtual bool commitDelete () const { return true; }
-	virtual void deleteCommitKURL(KURL & kurl, KIO::MetaData & ) const { kurl.setPath( "commit" ); }
+	virtual void deleteCommitKURL(KURL & kurl, TDEIO::MetaData & ) const { kurl.setPath( "commit" ); }
 
 	virtual void configFillGroupBoxes( TQStringList* ) const;
         virtual void configFields( TQPtrVector< TQWidget >* vector, const TQObject*, TQPtrList< AccountInput >* ) const;
diff --git a/korn/protocol.h b/korn/protocol.h
index c5caca28a..700cd5979 100644
--- a/korn/protocol.h
+++ b/korn/protocol.h
@@ -21,7 +21,7 @@
 #define PROTOCOL_H
 
 class AccountInput;
-class KConfigGroup;
+class TDEConfigGroup;
 class KIO_Protocol;
 class KMailDrop;
 
@@ -42,9 +42,9 @@ public:
 	Protocol() {}
 	virtual ~Protocol() {}
 
-	virtual const Protocol* getProtocol( KConfigGroup* ) const = 0;
-	virtual KMailDrop* createMaildrop( KConfigGroup* ) const = 0;
-	virtual TQMap< TQString, TQString > * createConfig( KConfigGroup* config, const TQString& password ) const = 0;
+	virtual const Protocol* getProtocol( TDEConfigGroup* ) const = 0;
+	virtual KMailDrop* createMaildrop( TDEConfigGroup* ) const = 0;
+	virtual TQMap< TQString, TQString > * createConfig( TDEConfigGroup* config, const TQString& password ) const = 0;
 	virtual TQString configName() const { return "not specified"; }
 
 	virtual void configFillGroupBoxes( TQStringList* ) const = 0;
diff --git a/korn/qmail_proto.h b/korn/qmail_proto.h
index 4abd7fbc3..0d9374055 100644
--- a/korn/qmail_proto.h
+++ b/korn/qmail_proto.h
@@ -39,7 +39,7 @@ public:
 	virtual bool canReadMail() const { return true; }
 	virtual bool fullMessage() const { return true; }
 
-	virtual void recheckKURL( KURL &kurl, KIO::MetaData& ) const
+	virtual void recheckKURL( KURL &kurl, TDEIO::MetaData& ) const
 		{ if( kurl.path().right( 1 ) == "/" )
 		  	kurl.setPath( kurl.path() +  "new" );
 		  else