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

9 files changed, 102 insertions, 102 deletions

diff --git a/kio/misc/kpac/downloader.cpp b/kio/misc/kpac/downloader.cpp
index 19417b1fb..c150a732c 100644
--- a/kio/misc/kpac/downloader.cpp
+++ b/kio/misc/kpac/downloader.cpp
@@ -43,10 +43,10 @@ namespace KPAC
         m_script = TQString::null;
         m_scriptURL = url;
 
-        KIO::TransferJob* job = KIO::get( url, false, false );
-        connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
-                 TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) );
-        connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( result( KIO::Job* ) ) );
+        TDEIO::TransferJob* job = TDEIO::get( url, false, false );
+        connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+                 TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
+        connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( result( TDEIO::Job* ) ) );
     }
 
     void Downloader::failed()
@@ -59,16 +59,16 @@ namespace KPAC
         m_error = error;
     }
 
-    void Downloader::data( KIO::Job*, const TQByteArray& data )
+    void Downloader::data( TDEIO::Job*, const TQByteArray& data )
     {
         unsigned offset = m_data.size();
         m_data.resize( offset + data.size() );
         std::memcpy( m_data.data() + offset, data.data(), data.size() );
     }
 
-    void Downloader::result( KIO::Job* job )
+    void Downloader::result( TDEIO::Job* job )
     {
-        if ( !job->error() && !static_cast< KIO::TransferJob* >( job )->isErrorPage() )
+        if ( !job->error() && !static_cast< TDEIO::TransferJob* >( job )->isErrorPage() )
         {
             bool dummy;
             m_script = TDEGlobal::charsets()->codecForName(
diff --git a/kio/misc/kpac/downloader.h b/kio/misc/kpac/downloader.h
index 82418882f..808e09378 100644
--- a/kio/misc/kpac/downloader.h
+++ b/kio/misc/kpac/downloader.h
@@ -25,7 +25,7 @@
 
 #include <kurl.h>
 
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 
 namespace KPAC
 {
@@ -48,8 +48,8 @@ namespace KPAC
         void setError( const TQString& );
 
     private slots:
-        void data( KIO::Job*, const TQByteArray& );
-        void result( KIO::Job* );
+        void data( TDEIO::Job*, const TQByteArray& );
+        void result( TDEIO::Job* );
 
     private:
         TQByteArray m_data;
diff --git a/kio/misc/ksendbugmail/smtp.cpp b/kio/misc/ksendbugmail/smtp.cpp
index 36a417b88..d282782fc 100644
--- a/kio/misc/ksendbugmail/smtp.cpp
+++ b/kio/misc/ksendbugmail/smtp.cpp
@@ -158,7 +158,7 @@ void SMTP::connectTimerTick(void)
     }
 
     kdDebug() << "connecting to " << serverHost << ":" << hostPort << " ..... " << endl;
-    sock = new KSocket(serverHost.ascii(), hostPort);
+    sock = new TDESocket(serverHost.ascii(), hostPort);
 
     if(sock == 0L || sock->socket() < 0) {
         timeOutTimer.stop();
@@ -173,8 +173,8 @@ void SMTP::connectTimerTick(void)
     state = INIT;
     serverState = NONE;
 
-    connect(sock, TQT_SIGNAL(readEvent(KSocket *)), this, TQT_SLOT(socketRead(KSocket *)));
-    connect(sock, TQT_SIGNAL(closeEvent(KSocket *)), this, TQT_SLOT(socketClose(KSocket *)));
+    connect(sock, TQT_SIGNAL(readEvent(TDESocket *)), this, TQT_SLOT(socketRead(TDESocket *)));
+    connect(sock, TQT_SIGNAL(closeEvent(TDESocket *)), this, TQT_SLOT(socketClose(TDESocket *)));
     //    sock->enableRead(true);
     timeOutTimer.stop();
     kdDebug() << "connected" << endl;
@@ -202,7 +202,7 @@ void SMTP::interactTimedOut(void)
     emit error(INTERACTTIMEOUT);
 }
 
-void SMTP::socketRead(KSocket *socket)
+void SMTP::socketRead(TDESocket *socket)
 {
     int n, nl;
 
@@ -228,11 +228,11 @@ void SMTP::socketRead(KSocket *socket)
         interactTimer.start(timeOut, true);
 }
 
-void SMTP::socketClose(KSocket *socket)
+void SMTP::socketClose(TDESocket *socket)
 {
     timeOutTimer.stop();
-    disconnect(sock, TQT_SIGNAL(readEvent(KSocket *)), this, TQT_SLOT(socketRead(KSocket *)));
-    disconnect(sock, TQT_SIGNAL(closeEvent(KSocket *)), this, TQT_SLOT(socketClose(KSocket *)));
+    disconnect(sock, TQT_SIGNAL(readEvent(TDESocket *)), this, TQT_SLOT(socketRead(TDESocket *)));
+    disconnect(sock, TQT_SIGNAL(closeEvent(TDESocket *)), this, TQT_SLOT(socketClose(TDESocket *)));
     socket->enableRead(false);
     kdDebug() << "connection terminated" << endl;
     connected = false;
diff --git a/kio/misc/ksendbugmail/smtp.h b/kio/misc/ksendbugmail/smtp.h
index 707d20ae4..acdb4a3c3 100644
--- a/kio/misc/ksendbugmail/smtp.h
+++ b/kio/misc/ksendbugmail/smtp.h
@@ -104,8 +104,8 @@ public slots:
     void connectTimedOut();
     void interactTimedOut();
 
-    void socketRead(KSocket *);
-    void socketClose(KSocket *);
+    void socketRead(TDESocket *);
+    void socketClose(TDESocket *);
 
 signals:
     void connectionClosed();
@@ -131,7 +131,7 @@ private:
 
     TQString domainName;
 
-    KSocket *sock;
+    TDESocket *sock;
     TQTimer connectTimer;
     TQTimer timeOutTimer;
     TQTimer interactTimer;
diff --git a/kio/misc/kssld/kssld.cpp b/kio/misc/kssld/kssld.cpp
index 40c52a1be..22bf6ab84 100644
--- a/kio/misc/kssld/kssld.cpp
+++ b/kio/misc/kssld/kssld.cpp
@@ -61,7 +61,7 @@ extern "C" {
 }
 
 
-static void updatePoliciesConfig(KConfig *cfg) {
+static void updatePoliciesConfig(TDEConfig *cfg) {
 	TQStringList groups = cfg->groupList();
 
 	for (TQStringList::Iterator i = groups.begin(); i != groups.end(); ++i) {
@@ -641,7 +641,7 @@ TQFile out(path);
 	if (!out.open(IO_WriteOnly))
 		return false;
 
-KConfig cfg("ksslcalist", true, false);
+TDEConfig cfg("ksslcalist", true, false);
 
 TQStringList x = cfg.groupList();
 
@@ -677,7 +677,7 @@ KSSLCertificate *x = KSSLCertificate::fromString(certificate.local8Bit());
 
 	if (!x) return false;
 
-KConfig cfg("ksslcalist", false, false);
+TDEConfig cfg("ksslcalist", false, false);
 
 	cfg.setGroup(x->getSubject());
 	cfg.writeEntry("x509", certificate);
@@ -766,7 +766,7 @@ bool KSSLD::caRemoveFromFile(TQString filename) {
 
 TQStringList KSSLD::caList() {
 TQStringList x;
-KConfig cfg("ksslcalist", true, false);
+TDEConfig cfg("ksslcalist", true, false);
 
 	x = cfg.groupList();
 	x.remove("<default>");
@@ -776,7 +776,7 @@ return x;
 
 
 bool KSSLD::caUseForSSL(TQString subject) {
-KConfig cfg("ksslcalist", true, false);
+TDEConfig cfg("ksslcalist", true, false);
 
 	if (!cfg.hasGroup(subject))
 		return false;
@@ -788,7 +788,7 @@ return cfg.readBoolEntry("site", false);
 
 
 bool KSSLD::caUseForEmail(TQString subject) {
-KConfig cfg("ksslcalist", true, false);
+TDEConfig cfg("ksslcalist", true, false);
 
 	if (!cfg.hasGroup(subject))
 		return false;
@@ -800,7 +800,7 @@ return cfg.readBoolEntry("email", false);
 
 
 bool KSSLD::caUseForCode(TQString subject) {
-KConfig cfg("ksslcalist", true, false);
+TDEConfig cfg("ksslcalist", true, false);
 
 	if (!cfg.hasGroup(subject))
 		return false;
@@ -811,7 +811,7 @@ return cfg.readBoolEntry("code", false);
 
 
 bool KSSLD::caRemove(TQString subject) {
-KConfig cfg("ksslcalist", false, false);
+TDEConfig cfg("ksslcalist", false, false);
 	if (!cfg.hasGroup(subject))
 		return false;
 
@@ -823,7 +823,7 @@ return true;
 
 
 TQString KSSLD::caGetCert(TQString subject) {
-KConfig cfg("ksslcalist", true, false);
+TDEConfig cfg("ksslcalist", true, false);
 	if (!cfg.hasGroup(subject))
 		return TQString::null;
 
@@ -834,7 +834,7 @@ return cfg.readEntry("x509", TQString::null);
 
 
 bool KSSLD::caSetUse(TQString subject, bool ssl, bool email, bool code) {
-KConfig cfg("ksslcalist", false, false);
+TDEConfig cfg("ksslcalist", false, false);
 	if (!cfg.hasGroup(subject))
 		return false;
 
diff --git a/kio/misc/ktelnetservice.cpp b/kio/misc/ktelnetservice.cpp
index ea8708863..cf1b5694c 100644
--- a/kio/misc/ktelnetservice.cpp
+++ b/kio/misc/ktelnetservice.cpp
@@ -49,7 +49,7 @@ int main(int argc, char **argv)
 	if (args->count() != 1)
 		return 1;
 
-	KConfig *config = new KConfig("kdeglobals", true);
+	TDEConfig *config = new TDEConfig("kdeglobals", true);
 	config->setGroup("General");
 	TQString terminal = config->readPathEntry("TerminalApplication", "konsole");
 
diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/kwalletd/kwalletd.cpp
index e87f96c31..afa634c64 100644
--- a/kio/misc/kwalletd/kwalletd.cpp
+++ b/kio/misc/kwalletd/kwalletd.cpp
@@ -314,7 +314,7 @@ int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet,
 		setupDialog( wiz, wId, appid, modal );
 		int rc = wiz->exec();
 		if (rc == TQDialog::Accepted) {
-			KConfig cfg("kwalletrc");
+			TDEConfig cfg("kwalletrc");
 			cfg.setGroup("Wallet");
 			cfg.writeEntry("First Use", false);
 			cfg.writeEntry("Enabled", wiz->_useWallet->isChecked());
@@ -344,7 +344,7 @@ int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet,
 			return -1;
 		}
 	} else if (_firstUse) {
-		KConfig cfg("kwalletrc");
+		TDEConfig cfg("kwalletrc");
 		_firstUse = false;
 		cfg.setGroup("Wallet");
 		cfg.writeEntry("First Use", false);
@@ -564,7 +564,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W
 
 	if (response == 0 || response == 1) {
 		if (response == 1) {
-			KConfig cfg("kwalletrc");
+			TDEConfig cfg("kwalletrc");
 			cfg.setGroup("Auto Allow");
 			TQStringList apps = cfg.readListEntry(wallet);
 			if (!apps.contains(thisApp)) {
@@ -575,7 +575,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W
 			}
 		}
 	} else if (response == 3) {
-		KConfig cfg("kwalletrc");
+		TDEConfig cfg("kwalletrc");
 		cfg.setGroup("Auto Deny");
 		TQStringList apps = cfg.readListEntry(wallet);
 		if (!apps.contains(thisApp)) {
@@ -1343,7 +1343,7 @@ void KWalletD::emitWalletListDirty() {
 
 
 void KWalletD::reconfigure() {
-	KConfig cfg("kwalletrc");
+	TDEConfig cfg("kwalletrc");
 	cfg.setGroup("Wallet");
 	_firstUse = cfg.readBoolEntry("First Use", true);
 	_enabled = cfg.readBoolEntry("Enabled", true);
diff --git a/kio/misc/uiserver.cpp b/kio/misc/uiserver.cpp
index 3e890c553..e898e5a50 100644
--- a/kio/misc/uiserver.cpp
+++ b/kio/misc/uiserver.cpp
@@ -192,7 +192,7 @@ ProgressItem::ProgressItem( ListProgress* view, TQListViewItem *after, TQCString
   m_defaultProgressVisible = showDefault;
 
   // create dialog, but don't show it
-  defaultProgress = new KIO::DefaultProgress( false );
+  defaultProgress = new TDEIO::DefaultProgress( false );
   defaultProgress->setOnlyClean( true );
   connect ( defaultProgress, TQT_SIGNAL( stopped() ), this, TQT_SLOT( slotCanceled() ) );
   connect ( &m_showTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT(slotShowDefaultProgress()) );
@@ -217,11 +217,11 @@ ProgressItem::~ProgressItem() {
 }
 
 
-void ProgressItem::setTotalSize( KIO::filesize_t size ) {
+void ProgressItem::setTotalSize( TDEIO::filesize_t size ) {
   m_iTotalSize = size;
 
   // It's already in the % column...
-  //setText( listProgress->lv_total, KIO::convertSize( m_iTotalSize ) );
+  //setText( listProgress->lv_total, TDEIO::convertSize( m_iTotalSize ) );
 
   defaultProgress->slotTotalSize( 0, m_iTotalSize );
 }
@@ -239,10 +239,10 @@ void ProgressItem::setTotalDirs( unsigned long dirs ) {
 }
 
 
-void ProgressItem::setProcessedSize( KIO::filesize_t size ) {
+void ProgressItem::setProcessedSize( TDEIO::filesize_t size ) {
   m_iProcessedSize = size;
 
-  setText( ListProgress::TB_TOTAL, KIO::convertSize( size ) );
+  setText( ListProgress::TB_TOTAL, TDEIO::convertSize( size ) );
 
   defaultProgress->slotProcessedSize( 0, size );
 }
@@ -264,7 +264,7 @@ void ProgressItem::setProcessedDirs( unsigned long dirs ) {
 
 
 void ProgressItem::setPercent( unsigned long percent ) {
-  const TQString tmps = KIO::DefaultProgress::makePercentString( percent, m_iTotalSize, m_iTotalFiles );
+  const TQString tmps = TDEIO::DefaultProgress::makePercentString( percent, m_iTotalSize, m_iTotalFiles );
   setText( ListProgress::TB_PROGRESS, tmps );
 
   defaultProgress->slotPercent( 0, percent );
@@ -281,15 +281,15 @@ void ProgressItem::setInfoMessage( const TQString & msg ) {
 
 void ProgressItem::setSpeed( unsigned long bytes_per_second ) {
   m_iSpeed = bytes_per_second;
-  m_remainingSeconds = KIO::calculateRemainingSeconds( m_iTotalSize, m_iProcessedSize, m_iSpeed );
+  m_remainingSeconds = TDEIO::calculateRemainingSeconds( m_iTotalSize, m_iProcessedSize, m_iSpeed );
 
   TQString tmps, tmps2;
   if ( m_iSpeed == 0 ) {
     tmps = i18n( "Stalled");
     tmps2 = tmps;
   } else {
-    tmps = i18n( "%1/s").arg( KIO::convertSize( m_iSpeed ));
-    tmps2 = KIO::convertSeconds( m_remainingSeconds );
+    tmps = i18n( "%1/s").arg( TDEIO::convertSize( m_iSpeed ));
+    tmps2 = TDEIO::convertSeconds( m_remainingSeconds );
   }
   setText( ListProgress::TB_SPEED, tmps );
   setText( ListProgress::TB_REMAINING_TIME, tmps2 );
@@ -382,7 +382,7 @@ void ProgressItem::setUnmounting( const TQString & point ) {
   defaultProgress->slotUnmounting( 0, point );
 }
 
-void ProgressItem::setCanResume( KIO::filesize_t offset ) {
+void ProgressItem::setCanResume( TDEIO::filesize_t offset ) {
   /*
   TQString tmps;
   // set canResume
@@ -527,7 +527,7 @@ void ListProgress::applySettings()
 }
 
 void ListProgress::readSettings() {
-  KConfig config("uiserverrc");
+  TDEConfig config("uiserverrc");
 
   // read listview geometry properties
   config.setGroup( "ProgressList" );
@@ -560,7 +560,7 @@ void ListProgress::columnWidthChanged(int column)
 }
 
 void ListProgress::writeSettings() {
-   KConfig config("uiserverrc");
+   TDEConfig config("uiserverrc");
 
    // write listview geometry properties
    config.setGroup( "ProgressList" );
@@ -830,9 +830,9 @@ void UIServer::jobFinished( int id )
 void UIServer::totalSize( int id, unsigned long size )
 { totalSize64(id, size); }
 
-void UIServer::totalSize64( int id, KIO::filesize_t size )
+void UIServer::totalSize64( int id, TDEIO::filesize_t size )
 {
-//  kdDebug(7024) << "UIServer::totalSize " << id << " " << KIO::number(size) << endl;
+//  kdDebug(7024) << "UIServer::totalSize " << id << " " << TDEIO::number(size) << endl;
 
   ProgressItem *item = findItem( id );
   if ( item ) {
@@ -863,9 +863,9 @@ void UIServer::totalDirs( int id, unsigned long dirs )
 void UIServer::processedSize( int id, unsigned long size )
 { processedSize64(id, size); }
 
-void UIServer::processedSize64( int id, KIO::filesize_t size )
+void UIServer::processedSize64( int id, TDEIO::filesize_t size )
 {
-  //kdDebug(7024) << "UIServer::processedSize " << id << " " << KIO::number(size) << endl;
+  //kdDebug(7024) << "UIServer::processedSize " << id << " " << TDEIO::number(size) << endl;
 
   ProgressItem *item = findItem( id );
   if ( item ) {
@@ -926,7 +926,7 @@ void UIServer::infoMessage( int id, const TQString & msg )
 void UIServer::canResume( int id, unsigned long offset )
 { canResume64(id, offset); }
 
-void UIServer::canResume64( int id, KIO::filesize_t offset )
+void UIServer::canResume64( int id, TDEIO::filesize_t offset )
 {
   //kdDebug(7024) << "UIServer::canResume " << id << " " << offset << endl;
 
@@ -1018,8 +1018,8 @@ void UIServer::unmounting( int id, TQString point )
 
 void UIServer::killJob( TQCString observerAppId, int progressId )
 {
-    // Contact the object "KIO::Observer" in the application <appId>
-    Observer_stub observer( observerAppId, "KIO::Observer" );
+    // Contact the object "TDEIO::Observer" in the application <appId>
+    Observer_stub observer( observerAppId, "TDEIO::Observer" );
     // Tell it to kill the job
     observer.killJob( progressId );
 }
@@ -1029,7 +1029,7 @@ void UIServer::slotJobCanceled( ProgressItem *item ) {
   // kill the corresponding job
   killJob( item->appId(), item->jobId() );
 
-  // KIO::Job, when killed, should call back jobFinished(), but we can't
+  // TDEIO::Job, when killed, should call back jobFinished(), but we can't
   // really rely on that - the app may have crashed
   delete item;
 }
@@ -1071,7 +1071,7 @@ void UIServer::slotUpdate() {
   }
 
   int iTotalFiles = 0;
-  KIO::filesize_t iTotalSize = 0;
+  TDEIO::filesize_t iTotalSize = 0;
   int iTotalSpeed = 0;
   unsigned int totalRemTime = 0; // in seconds
 
@@ -1095,11 +1095,11 @@ void UIServer::slotUpdate() {
 
   // update statusbar
   statusBar()->changeItem( i18n( " Files: %1 ").arg( iTotalFiles ), ID_TOTAL_FILES);
-  statusBar()->changeItem( i18n( "Remaining Size", " Rem. Size: %1 ").arg( KIO::convertSize( iTotalSize ) ),
+  statusBar()->changeItem( i18n( "Remaining Size", " Rem. Size: %1 ").arg( TDEIO::convertSize( iTotalSize ) ),
                            ID_TOTAL_SIZE);
-  statusBar()->changeItem( i18n( "Remaining Time", " Rem. Time: %1 ").arg( KIO::convertSeconds( totalRemTime ) ),
+  statusBar()->changeItem( i18n( "Remaining Time", " Rem. Time: %1 ").arg( TDEIO::convertSeconds( totalRemTime ) ),
                            ID_TOTAL_TIME);
-  statusBar()->changeItem( i18n( " %1/s ").arg( KIO::convertSize( iTotalSpeed ) ),
+  statusBar()->changeItem( i18n( " %1/s ").arg( TDEIO::convertSize( iTotalSpeed ) ),
                            ID_TOTAL_SPEED);
 
 }
@@ -1145,12 +1145,12 @@ void UIServer::slotSelection() {
 
 // This code is deprecated, slaves go to Observer::openPassDlg now,
 // but this is kept for compat (DCOP calls to kio_uiserver).
-TQByteArray UIServer::openPassDlg( const KIO::AuthInfo &info )
+TQByteArray UIServer::openPassDlg( const TDEIO::AuthInfo &info )
 {
     kdDebug(7024) << "UIServer::openPassDlg: User= " << info.username
                   << ", Msg= " << info.prompt << endl;
-    KIO::AuthInfo inf(info);
-    int result = KIO::PasswordDialog::getNameAndPassword( inf.username, inf.password,
+    TDEIO::AuthInfo inf(info);
+    int result = TDEIO::PasswordDialog::getNameAndPassword( inf.username, inf.password,
                                                           &inf.keepPassword, inf.prompt,
                                                           inf.readOnly, inf.caption,
                                                           inf.comment, inf.commentLabel );
@@ -1169,12 +1169,12 @@ int UIServer::messageBox( int progressId, int type, const TQString &text, const
     return Observer::messageBox( progressId, type, text, caption, buttonYes, buttonNo );
 }
 
-void UIServer::showSSLInfoDialog(const TQString &url, const KIO::MetaData &meta)
+void UIServer::showSSLInfoDialog(const TQString &url, const TDEIO::MetaData &meta)
 {
     return showSSLInfoDialog(url,meta,0);
 }
 
-void UIServer::showSSLInfoDialog(const TQString &url, const KIO::MetaData &meta, int mainwindow)
+void UIServer::showSSLInfoDialog(const TQString &url, const TDEIO::MetaData &meta, int mainwindow)
 {
    KSSLInfoDlg *kid = new KSSLInfoDlg(meta["ssl_in_use"].upper()=="TRUE", 0L /*parent?*/, 0L, true);
    KSSLCertificate *x = KSSLCertificate::fromString(meta["ssl_peer_certificate"].local8Bit());
@@ -1269,8 +1269,8 @@ TQByteArray UIServer::open_RenameDlg64( int id,
                                      const TQString & caption,
                                      const TQString& src, const TQString & dest,
                                      int mode,
-                                     KIO::filesize_t sizeSrc,
-                                     KIO::filesize_t sizeDest,
+                                     TDEIO::filesize_t sizeSrc,
+                                     TDEIO::filesize_t sizeDest,
                                      unsigned long ctimeSrc,
                                      unsigned long ctimeDest,
                                      unsigned long mtimeSrc,
@@ -1282,17 +1282,17 @@ TQByteArray UIServer::open_RenameDlg64( int id,
   if ( item )
     setItemVisible( item, false );
   TQString newDest;
-  kdDebug(7024) << "Calling KIO::open_RenameDlg" << endl;
-  KIO::RenameDlg_Result result = KIO::open_RenameDlg( caption, src, dest,
-                                                      (KIO::RenameDlg_Mode) mode, newDest,
+  kdDebug(7024) << "Calling TDEIO::open_RenameDlg" << endl;
+  TDEIO::RenameDlg_Result result = TDEIO::open_RenameDlg( caption, src, dest,
+                                                      (TDEIO::RenameDlg_Mode) mode, newDest,
                                                       sizeSrc, sizeDest,
                                                       (time_t)ctimeSrc, (time_t)ctimeDest,
                                                       (time_t)mtimeSrc, (time_t)mtimeDest );
-  kdDebug(7024) << "KIO::open_RenameDlg done" << endl;
+  kdDebug(7024) << "TDEIO::open_RenameDlg done" << endl;
   TQByteArray data;
   TQDataStream stream( data, IO_WriteOnly );
   stream << TQ_UINT8(result) << newDest;
-  if ( item && result != KIO::R_CANCEL )
+  if ( item && result != TDEIO::R_CANCEL )
     setItemVisible( item, true );
   return data;
 }
@@ -1305,16 +1305,16 @@ int UIServer::open_SkipDlg( int id,
   ProgressItem *item = findItem( id );
   if ( item )
     setItemVisible( item, false );
-  kdDebug(7024) << "Calling KIO::open_SkipDlg" << endl;
-  KIO::SkipDlg_Result result = KIO::open_SkipDlg( (bool)multi, error_text );
-  if ( item && result != KIO::S_CANCEL )
+  kdDebug(7024) << "Calling TDEIO::open_SkipDlg" << endl;
+  TDEIO::SkipDlg_Result result = TDEIO::open_SkipDlg( (bool)multi, error_text );
+  if ( item && result != TDEIO::S_CANCEL )
     setItemVisible( item, true );
-  return (KIO::SkipDlg_Result) result;
+  return (TDEIO::SkipDlg_Result) result;
 }
 
 
 void UIServer::readSettings() {
-  KConfig config("uiserverrc");
+  TDEConfig config("uiserverrc");
   config.setGroup( "UIServer" );
   m_showStatusBar=config.readBoolEntry("ShowStatusBar",false);
   m_showToolBar=config.readBoolEntry("ShowToolBar",true);
@@ -1326,7 +1326,7 @@ void UIServer::readSettings() {
 }
 
 void UIServer::writeSettings() {
-  KConfig config("uiserverrc");
+  TDEConfig config("uiserverrc");
   config.setGroup( "UIServer" );
   config.writeEntry("InitialWidth",width());
   config.writeEntry("InitialHeight",height());
diff --git a/kio/misc/uiserver.h b/kio/misc/uiserver.h
index 85e255a43..c7cfaf5c0 100644
--- a/kio/misc/uiserver.h
+++ b/kio/misc/uiserver.h
@@ -37,7 +37,7 @@ class KSqueezedTextLabel;
 class ProgressItem;
 class UIServer;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
   class DefaultProgress;
 }
@@ -122,11 +122,11 @@ public:
   void setDefaultProgressVisible( bool visible );
   bool isVisible() const { return m_visible; }
 
-  void setTotalSize( KIO::filesize_t bytes );
+  void setTotalSize( TDEIO::filesize_t bytes );
   void setTotalFiles( unsigned long files );
   void setTotalDirs( unsigned long dirs );
 
-  void setProcessedSize( KIO::filesize_t size );
+  void setProcessedSize( TDEIO::filesize_t size );
   void setProcessedFiles( unsigned long files );
   void setProcessedDirs( unsigned long dirs );
 
@@ -143,11 +143,11 @@ public:
   void setMounting( const TQString & dev, const TQString & point );
   void setUnmounting( const TQString & point );
 
-  void setCanResume( KIO::filesize_t offset );
+  void setCanResume( TDEIO::filesize_t offset );
 
-  KIO::filesize_t totalSize() { return m_iTotalSize; }
+  TDEIO::filesize_t totalSize() { return m_iTotalSize; }
   unsigned long totalFiles() { return m_iTotalFiles; }
-  KIO::filesize_t processedSize() { return m_iProcessedSize; }
+  TDEIO::filesize_t processedSize() { return m_iProcessedSize; }
   unsigned long processedFiles() { return m_iProcessedFiles; }
   unsigned long speed() { return m_iSpeed; }
   unsigned int remainingSeconds() { return m_remainingSeconds; }
@@ -179,12 +179,12 @@ protected:
   ListProgress *listProgress;
 
   // associated default progress dialog
-  KIO::DefaultProgress *defaultProgress;
+  TDEIO::DefaultProgress *defaultProgress;
 
   // we store these values for calculation of totals ( for statusbar )
-  KIO::filesize_t m_iTotalSize;
+  TDEIO::filesize_t m_iTotalSize;
   unsigned long m_iTotalFiles;
-  KIO::filesize_t m_iProcessedSize;
+  TDEIO::filesize_t m_iProcessedSize;
   unsigned long m_iProcessedFiles;
   unsigned long m_iSpeed;
   int m_remainingSeconds;
@@ -230,7 +230,7 @@ k_dcop:
   /**
    * Signal a new job
    * @param appId the DCOP application id of the job's parent application
-   * @see KIO::Observer::newJob
+   * @see TDEIO::Observer::newJob
    * @param showProgress whether to popup the progress for the job.
    *   Usually true, but may be false when we use kio_uiserver for
    *   other things, like SSL dialogs.
@@ -241,12 +241,12 @@ k_dcop:
   ASYNC jobFinished( int id );
 
   ASYNC totalSize( int id, unsigned long size );
-  ASYNC totalSize64( int id, KIO::filesize_t size );
+  ASYNC totalSize64( int id, TDEIO::filesize_t size );
   ASYNC totalFiles( int id, unsigned long files );
   ASYNC totalDirs( int id, unsigned long dirs );
 
   ASYNC processedSize( int id, unsigned long bytes );
-  ASYNC processedSize64( int id, KIO::filesize_t bytes );
+  ASYNC processedSize64( int id, TDEIO::filesize_t bytes );
   ASYNC processedFiles( int id, unsigned long files );
   ASYNC processedDirs( int id, unsigned long dirs );
 
@@ -265,14 +265,14 @@ k_dcop:
   ASYNC unmounting( int id, TQString point );
 
   ASYNC canResume( int id, unsigned long offset );
-  ASYNC canResume64( int id, KIO::filesize_t offset );
+  ASYNC canResume64( int id, TDEIO::filesize_t offset );
 
   /**
    * @deprecated (it blocks other apps).
-   * Use KIO::PasswordDialog::getNameAndPassword instead.
+   * Use TDEIO::PasswordDialog::getNameAndPassword instead.
    * To be removed in KDE 4.0.
    */
-  TQByteArray openPassDlg( const KIO::AuthInfo &info );
+  TQByteArray openPassDlg( const TDEIO::AuthInfo &info );
 
   /**
    * Popup a message box.
@@ -296,15 +296,15 @@ k_dcop:
 
   /**
    * @deprecated (it blocks other apps).
-   * Use KIO::open_RenameDlg instead.
+   * Use TDEIO::open_RenameDlg instead.
    * To be removed in KDE 4.0.
    */
   TQByteArray open_RenameDlg64( int id,
                              const TQString & caption,
                              const TQString& src, const TQString & dest,
-                             int /* KIO::RenameDlg_Mode */ mode,
-                             KIO::filesize_t sizeSrc,
-                             KIO::filesize_t sizeDest,
+                             int /* TDEIO::RenameDlg_Mode */ mode,
+                             TDEIO::filesize_t sizeSrc,
+                             TDEIO::filesize_t sizeDest,
                              unsigned long /* time_t */ ctimeSrc,
                              unsigned long /* time_t */ ctimeDest,
                              unsigned long /* time_t */ mtimeSrc,
@@ -312,13 +312,13 @@ k_dcop:
                              );
   /**
    * @deprecated (it blocks other apps).
-   * Use KIO::open_RenameDlg instead.
+   * Use TDEIO::open_RenameDlg instead.
    * To be removed in KDE 4.0.
    */
   TQByteArray open_RenameDlg( int id,
                              const TQString & caption,
                              const TQString& src, const TQString & dest,
-                             int /* KIO::RenameDlg_Mode */ mode,
+                             int /* TDEIO::RenameDlg_Mode */ mode,
                              unsigned long sizeSrc,
                              unsigned long sizeDest,
                              unsigned long /* time_t */ ctimeSrc,
@@ -329,7 +329,7 @@ k_dcop:
 
   /**
    * @deprecated (it blocks other apps).
-   * Use KIO::open_SkipDlg instead.
+   * Use TDEIO::open_SkipDlg instead.
    * To be removed in KDE 4.0.
    */
   int open_SkipDlg( int id,
@@ -350,12 +350,12 @@ k_dcop:
   /**
    * Show a SSL Information Dialog
    */
-  void showSSLInfoDialog(const TQString &url, const KIO::MetaData &data, int mainwindow);
+  void showSSLInfoDialog(const TQString &url, const TDEIO::MetaData &data, int mainwindow);
 
   /**
    * @deprecated
    */
-  void showSSLInfoDialog(const TQString &url, const KIO::MetaData &data);
+  void showSSLInfoDialog(const TQString &url, const TDEIO::MetaData &data);
 
   /*
    * Show an SSL Certificate Selection Dialog