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

31 files changed, 108 insertions, 108 deletions

diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp
index 789f24b0..364c5cd0 100644
--- a/certmanager/certificatewizardimpl.cpp
+++ b/certmanager/certificatewizardimpl.cpp
@@ -129,7 +129,7 @@ CertificateWizardImpl::CertificateWizardImpl( TQWidget* parent,  const char* nam
     connect( storeUR, TQT_SIGNAL( urlSelected( const TQString& ) ),
              this, TQT_SLOT( slotURLSelected( const TQString& ) ) );
 
-    const KConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" );
+    const TDEConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" );
     caEmailED->setText( config.readEntry( "CAEmailAddress" ) );
 
     connect( this, TQT_SIGNAL( helpClicked() ),
@@ -337,7 +337,7 @@ void CertificateWizardImpl::createPersonalDataPage()
   TQGridLayout* grid = new TQGridLayout( edContainer, 2, 1,
 				       KDialog::marginHint(), KDialog::spacingHint() );
 
-  KConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" );
+  TDEConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" );
   TQStringList attrOrder = config.readListEntry( "DNAttributeOrder" );
   if ( attrOrder.empty() )
     attrOrder << "CN!" << "L" << "OU" << "O!" << "C!" << "EMAIL!";
@@ -477,7 +477,7 @@ void CertificateWizardImpl::accept()
     // Save in file/URL
     KURL url = saveFileUrl();
     bool overwrite = false;
-    if ( KIO::NetAccess::exists( url, false /*dest*/, this ) ) {
+    if ( TDEIO::NetAccess::exists( url, false /*dest*/, this ) ) {
       if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(
                                                                      this,
                                                                      i18n( "A file named \"%1\" already exists. "
@@ -488,10 +488,10 @@ void CertificateWizardImpl::accept()
       overwrite = true;
     }
 
-    KIO::Job* uploadJob = KIOext::put( _keyData, url, -1, overwrite, false /*resume*/ );
+    TDEIO::Job* uploadJob = KIOext::put( _keyData, url, -1, overwrite, false /*resume*/ );
     uploadJob->setWindow( this );
-    connect( uploadJob, TQT_SIGNAL( result( KIO::Job* ) ),
-             this, TQT_SLOT( slotUploadResult( KIO::Job* ) ) );
+    connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
+             this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) );
     // Can't press finish again during the upload
     setFinishEnabled( finishPage, false );
   }
@@ -501,7 +501,7 @@ void CertificateWizardImpl::accept()
    This slot is invoked by the KIO job used in newCertificate
    to save/upload the certificate, when finished (success or error).
 */
-void CertificateWizardImpl::slotUploadResult( KIO::Job* job )
+void CertificateWizardImpl::slotUploadResult( TDEIO::Job* job )
 {
   if ( job->error() ) {
     job->showErrorDialog();
diff --git a/certmanager/certificatewizardimpl.h b/certmanager/certificatewizardimpl.h
index b2256297..9ac52f7a 100644
--- a/certmanager/certificatewizardimpl.h
+++ b/certmanager/certificatewizardimpl.h
@@ -42,7 +42,7 @@
 namespace GpgME {
   class KeyGenerationResult;
 }
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -75,7 +75,7 @@ private slots:
 
     void slotHelpClicked();
 
-    void slotUploadResult( KIO::Job* );
+    void slotUploadResult( TDEIO::Job* );
 
 private:
     void createPersonalDataPage();
diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index 66f53fe1..7c86e8b2 100644
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@@ -218,7 +218,7 @@ CertManager::~CertManager() {
 }
 
 void CertManager::readConfig( bool noQueryGiven ) {
-  KConfig config( "kleopatrarc" );
+  TDEConfig config( "kleopatrarc" );
   config.setGroup( "Display Options" );
   mHierarchicalView = config.readBoolEntry( "hierarchicalView", false );
   if ( noQueryGiven ) {
@@ -227,7 +227,7 @@ void CertManager::readConfig( bool noQueryGiven ) {
 }
 
 void CertManager::writeConfig() {
-  KConfig config( "kleopatrarc" );
+  TDEConfig config( "kleopatrarc" );
   config.setGroup( "Display Options" );
   config.writeEntry( "hierarchicalView", mKeyListView->hierarchical() );
   config.writeEntry( "startInRemoteMode", mNextFindRemote );
@@ -685,10 +685,10 @@ void CertManager::slotImportCertFromFile( const KURL & certURL )
   // Download the cert
   KIOext::StoredTransferJob* importJob = KIOext::storedGet( certURL );
   importJob->setWindow( this );
-  connect( importJob, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotImportResult(KIO::Job*)) );
+  connect( importJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotImportResult(TDEIO::Job*)) );
 }
 
-void CertManager::slotImportResult( KIO::Job* job )
+void CertManager::slotImportResult( TDEIO::Job* job )
 {
   if ( job->error() ) {
     job->showErrorDialog();
@@ -904,17 +904,17 @@ void CertManager::importCRLFromFile() {
       KTempFile tempFile;
       KURL destURL;
       destURL.setPath( tempFile.name() );
-      KIO::Job* copyJob = KIO::file_copy( url, destURL, 0600, true, false );
+      TDEIO::Job* copyJob = TDEIO::file_copy( url, destURL, 0600, true, false );
       copyJob->setWindow( this );
-      connect( copyJob, TQT_SIGNAL( result( KIO::Job * ) ),
-               TQT_SLOT( slotImportCRLJobFinished( KIO::Job * ) ) );
+      connect( copyJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+               TQT_SLOT( slotImportCRLJobFinished( TDEIO::Job * ) ) );
     }
   }
 }
 
-void CertManager::slotImportCRLJobFinished( KIO::Job *job )
+void CertManager::slotImportCRLJobFinished( TDEIO::Job *job )
 {
-  KIO::FileCopyJob* fcjob = static_cast<KIO::FileCopyJob*>( job );
+  TDEIO::FileCopyJob* fcjob = static_cast<TDEIO::FileCopyJob*>( job );
   TQString tempFilePath = fcjob->destURL().path();
   if ( job->error() ) {
     job->showErrorDialog();
@@ -1234,7 +1234,7 @@ void CertManager::startCertificateExport( const TQStringList & fingerprints ) {
 // return true if we should proceed, false if we should abort
 static bool checkOverwrite( const KURL& url, bool& overwrite, TQWidget* w )
 {
-  if ( KIO::NetAccess::exists( url, false /*dest*/, w ) ) {
+  if ( TDEIO::NetAccess::exists( url, false /*dest*/, w ) ) {
     if ( KMessageBox::Cancel ==
          KMessageBox::warningContinueCancel(
                                             w,
@@ -1269,10 +1269,10 @@ void CertManager::slotCertificateExportResult( const GpgME::Error & err, const T
   if ( !checkOverwrite( url, overwrite, this ) )
     return;
 
-  KIO::Job* uploadJob = KIOext::put( data, url, -1, overwrite, false /*resume*/ );
+  TDEIO::Job* uploadJob = KIOext::put( data, url, -1, overwrite, false /*resume*/ );
   uploadJob->setWindow( this );
-  connect( uploadJob, TQT_SIGNAL( result( KIO::Job* ) ),
-           this, TQT_SLOT( slotUploadResult( KIO::Job* ) ) );
+  connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
+           this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) );
 }
 
 
@@ -1388,13 +1388,13 @@ void CertManager::slotSecretKeyExportResult( const GpgME::Error & err, const TQB
   if ( !checkOverwrite( url, overwrite, this ) )
     return;
 
-  KIO::Job* uploadJob = KIOext::put( data, url, -1, overwrite, false /*resume*/ );
+  TDEIO::Job* uploadJob = KIOext::put( data, url, -1, overwrite, false /*resume*/ );
   uploadJob->setWindow( this );
-  connect( uploadJob, TQT_SIGNAL( result( KIO::Job* ) ),
-           this, TQT_SLOT( slotUploadResult( KIO::Job* ) ) );
+  connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
+           this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) );
 }
 
-void CertManager::slotUploadResult( KIO::Job* job )
+void CertManager::slotUploadResult( TDEIO::Job* job )
 {
   if ( job->error() )
     job->showErrorDialog();
diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h
index 835f408c..2ecc5e9d 100644
--- a/certmanager/certmanager.h
+++ b/certmanager/certmanager.h
@@ -51,7 +51,7 @@ namespace Kleo {
   class Job;
 }
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 class TDEProcess;
@@ -99,11 +99,11 @@ private slots:
     void slotDeleteCertificate();
     void slotExportSecretKey();
     void slotExportCertificate();
-    void slotUploadResult( KIO::Job* job );
+    void slotUploadResult( TDEIO::Job* job );
 
     void slotImportCertFromFile();
     void slotImportCertFromFile( const KURL & filename );
-    void slotImportResult( KIO::Job* );
+    void slotImportResult( TDEIO::Job* );
 
     void slotCertificateImportResult( const GpgME::ImportResult & result );
     void slotCertificateDownloadResult( const GpgME::Error & error, const TQByteArray & keyData );
@@ -115,7 +115,7 @@ private slots:
 
     void importCRLFromFile();
     void importCRLFromLDAP();
-    void slotImportCRLJobFinished( KIO::Job * );
+    void slotImportCRLJobFinished( TDEIO::Job * );
 
     void slotDirmngrExited();
     void slotStderr( TDEProcess*, char*, int );
diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp
index 9e5d0f74..53030bbd 100644
--- a/certmanager/conf/appearanceconfigpage.cpp
+++ b/certmanager/conf/appearanceconfigpage.cpp
@@ -39,7 +39,7 @@
 #include <tdepimmacros.h>
 
 AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * parent, const char * name )
-    : KCModule( parent, name )
+    : TDECModule( parent, name )
 {
   TQVBoxLayout* lay = new TQVBoxLayout( this );
   mWidget = new Kleo::AppearanceConfigWidget( this );
@@ -70,7 +70,7 @@ void AppearanceConfigurationPage::defaults()
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kleopatra_config_appear( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_kleopatra_config_appear( TQWidget *parent, const char * )
   {
     AppearanceConfigurationPage *page =
       new AppearanceConfigurationPage( parent, "kleopatra_config_appear" );
@@ -78,7 +78,7 @@ extern "C"
   }
 }
 
-// tdelibs-3.2 didn't have the changed signal in KCModule...
+// tdelibs-3.2 didn't have the changed signal in TDECModule...
 void AppearanceConfigurationPage::slotChanged()
 {
   emit changed(true);
diff --git a/certmanager/conf/appearanceconfigpage.h b/certmanager/conf/appearanceconfigpage.h
index 89c56cfc..9425e1e6 100644
--- a/certmanager/conf/appearanceconfigpage.h
+++ b/certmanager/conf/appearanceconfigpage.h
@@ -41,7 +41,7 @@ namespace Kleo {
 /**
  * "Appearance" configuration page for kleopatra's configuration dialog
  */
-class AppearanceConfigurationPage : public KCModule {
+class AppearanceConfigurationPage : public TDECModule {
   Q_OBJECT
   
 public:
diff --git a/certmanager/conf/appearanceconfigwidget.cpp b/certmanager/conf/appearanceconfigwidget.cpp
index 57a76741..96c0bfff 100644
--- a/certmanager/conf/appearanceconfigwidget.cpp
+++ b/certmanager/conf/appearanceconfigwidget.cpp
@@ -66,7 +66,7 @@ using namespace Kleo;
 class CategoryListViewItem : public TQListViewItem
 {
 public:
-  CategoryListViewItem( TQListView* lv, TQListViewItem* prev, const KConfigBase& config )
+  CategoryListViewItem( TQListView* lv, TQListViewItem* prev, const TDEConfigBase& config )
     : TQListViewItem( lv, prev ) {
 
     setName( config.readEntry( "Name", i18n("<unnamed>") ) );
@@ -85,7 +85,7 @@ public:
     mDirty = false;
   }
 
-  void save( KConfigBase& config ) {
+  void save( TDEConfigBase& config ) {
     config.writeEntry( "Name", text( 0 ) );
     config.writeEntry( "foreground-color", mForegroundColor );
     config.writeEntry( "background-color", mBackgroundColor );
@@ -235,19 +235,19 @@ void AppearanceConfigWidget::slotDefaultClicked()
 void AppearanceConfigWidget::load()
 {
   categoriesLV->clear();
-  KConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
+  TDEConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
   if ( !config )
     return;
   TQStringList groups = config->groupList().grep( TQRegExp( "^Key Filter #\\d+$" ) );
   for ( TQStringList::const_iterator it = groups.begin() ; it != groups.end() ; ++it ) {
-    KConfigGroup cfg( config, *it );
+    TDEConfigGroup cfg( config, *it );
     (void) new CategoryListViewItem( categoriesLV, categoriesLV->lastItem(), cfg );
   }
 }
 
 void AppearanceConfigWidget::save()
 {
-  KConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
+  TDEConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
   if ( !config )
     return;
   // We know (assume) that the groups in the config object haven't changed,
@@ -263,7 +263,7 @@ void AppearanceConfigWidget::save()
   TQListViewItemIterator lvit( categoriesLV );
   for ( TQStringList::const_iterator it = groups.begin() ; it != groups.end() && lvit.current(); ++it, ++lvit ) {
     CategoryListViewItem* item = static_cast<CategoryListViewItem*>(lvit.current() );
-    KConfigGroup cfg( config, *it );
+    TDEConfigGroup cfg( config, *it );
     item->save( cfg );
   }
   config->sync();
diff --git a/certmanager/conf/appearanceconfigwidget.h b/certmanager/conf/appearanceconfigwidget.h
index 3840df13..f6ca9c8e 100644
--- a/certmanager/conf/appearanceconfigwidget.h
+++ b/certmanager/conf/appearanceconfigwidget.h
@@ -36,7 +36,7 @@
 
 #include "appearanceconfigwidgetbase.h"
 #include <tqstringlist.h>
-class KConfig;
+class TDEConfig;
 
 namespace Kleo {
 
diff --git a/certmanager/conf/configuredialog.cpp b/certmanager/conf/configuredialog.cpp
index 57ed0ee4..fde9df9d 100644
--- a/certmanager/conf/configuredialog.cpp
+++ b/certmanager/conf/configuredialog.cpp
@@ -52,7 +52,7 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
   // the KCMultiDialog starts with the size of the first kcm, not
   // the largest one. This way at least after the first showing of
   // the largest kcm the size is kept.
-  const KConfigGroup geometry( TDEGlobal::config(), "Geometry" );
+  const TDEConfigGroup geometry( TDEGlobal::config(), "Geometry" );
   const int width = geometry.readNumEntry( "ConfigureDialogWidth" );
   const int height = geometry.readNumEntry( "ConfigureDialogHeight" );
   if ( width != 0 && height != 0 ) {
@@ -62,7 +62,7 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
 }
 
 void ConfigureDialog::hideEvent( TQHideEvent * ) {
-  KConfigGroup geometry( TDEGlobal::config(), "Geometry" );
+  TDEConfigGroup geometry( TDEGlobal::config(), "Geometry" );
   geometry.writeEntry( "ConfigureDialogWidth", width() );
   geometry.writeEntry( "ConfigureDialogHeight",height() );
 }
diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp
index 9d82d86e..40ab0998 100644
--- a/certmanager/conf/dirservconfigpage.cpp
+++ b/certmanager/conf/dirservconfigpage.cpp
@@ -116,7 +116,7 @@ public:
   }
 
 private:
-  KConfig mConfig;
+  TDEConfig mConfig;
 };
 
 #endif
@@ -138,7 +138,7 @@ static const char s_addnewservers_groupName[] = "LDAP";
 static const char s_addnewservers_entryName[] = "add-servers";
 
 DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget * parent, const char * name )
-    : KCModule( parent, name )
+    : TDECModule( parent, name )
 {
   mConfig = Kleo::CryptoBackendFactory::instance()->config();
   TQVBoxLayout* lay = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
@@ -259,7 +259,7 @@ void DirectoryServicesConfigurationPage::defaults()
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kleopatra_config_dirserv( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_kleopatra_config_dirserv( TQWidget *parent, const char * )
   {
     DirectoryServicesConfigurationPage *page =
       new DirectoryServicesConfigurationPage( parent, "kleopatra_config_dirserv" );
@@ -267,7 +267,7 @@ extern "C"
   }
 }
 
-// tdelibs-3.2 didn't have the changed signal in KCModule...
+// tdelibs-3.2 didn't have the changed signal in TDECModule...
 void DirectoryServicesConfigurationPage::slotChanged()
 {
   emit changed(true);
diff --git a/certmanager/conf/dirservconfigpage.h b/certmanager/conf/dirservconfigpage.h
index c5ebcad1..536cf76e 100644
--- a/certmanager/conf/dirservconfigpage.h
+++ b/certmanager/conf/dirservconfigpage.h
@@ -50,7 +50,7 @@ namespace Kleo {
  * The user can configure LDAP servers in this page, to be used for listing/fetching
  * remote certificates in kleopatra.
  */
-class KDE_EXPORT DirectoryServicesConfigurationPage : public KCModule {
+class KDE_EXPORT DirectoryServicesConfigurationPage : public TDECModule {
   Q_OBJECT
   
 public:
diff --git a/certmanager/conf/dnorderconfigpage.cpp b/certmanager/conf/dnorderconfigpage.cpp
index a224b6f7..a802a06f 100644
--- a/certmanager/conf/dnorderconfigpage.cpp
+++ b/certmanager/conf/dnorderconfigpage.cpp
@@ -39,7 +39,7 @@
 #include <tqlayout.h>
 
 DNOrderConfigPage::DNOrderConfigPage( TQWidget * parent, const char * name )
-  : KCModule( parent, name )
+  : TDECModule( parent, name )
 {
   TQVBoxLayout * vlay = new TQVBoxLayout( this );
   mWidget = Kleo::DNAttributeMapper::instance()->configWidget( this, "mWidget" );
@@ -65,12 +65,12 @@ void DNOrderConfigPage::defaults() {
   mWidget->defaults();
 }
 
-// tdelibs-3.2 didn't have the changed signal in KCModule...
+// tdelibs-3.2 didn't have the changed signal in TDECModule...
 void DNOrderConfigPage::slotChanged() {
   emit changed(true);
 }
 
-extern "C" KDE_EXPORT KCModule * create_kleopatra_config_dnorder( TQWidget * parent, const char * ) {
+extern "C" KDE_EXPORT TDECModule * create_kleopatra_config_dnorder( TQWidget * parent, const char * ) {
     return new DNOrderConfigPage( parent, "kleopatra_config_dnorder" );
 }
 
diff --git a/certmanager/conf/dnorderconfigpage.h b/certmanager/conf/dnorderconfigpage.h
index b053c5cb..b183b1f2 100644
--- a/certmanager/conf/dnorderconfigpage.h
+++ b/certmanager/conf/dnorderconfigpage.h
@@ -41,7 +41,7 @@ namespace Kleo {
 /**
  * "DN Order" configuration page for kleopatra's configuration dialog
  */
-class DNOrderConfigPage : public KCModule {
+class DNOrderConfigPage : public TDECModule {
   Q_OBJECT
   
 public:
diff --git a/certmanager/conf/kleopatra_config_appear.desktop b/certmanager/conf/kleopatra_config_appear.desktop
index 1fb2cc71..b0ee2ac7 100644
--- a/certmanager/conf/kleopatra_config_appear.desktop
+++ b/certmanager/conf/kleopatra_config_appear.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=looknfeel
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 DocPath=kleopatra/configuration-appearance.html
 
 X-TDE-ModuleType=Library
diff --git a/certmanager/conf/kleopatra_config_dirserv.desktop b/certmanager/conf/kleopatra_config_dirserv.desktop
index f645cffb..33e65a7a 100644
--- a/certmanager/conf/kleopatra_config_dirserv.desktop
+++ b/certmanager/conf/kleopatra_config_dirserv.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=network
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 DocPath=kleopatra/configuration.html#configuration-directory-services
 
 X-TDE-ModuleType=Library
diff --git a/certmanager/conf/kleopatra_config_dnorder.desktop b/certmanager/conf/kleopatra_config_dnorder.desktop
index beec7945..f77761ac 100644
--- a/certmanager/conf/kleopatra_config_dnorder.desktop
+++ b/certmanager/conf/kleopatra_config_dnorder.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=looknfeel
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 DocPath=kleopatra/configuration-dn-order.html
 
 X-TDE-ModuleType=Library
diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
index 5a49f134..200175b2 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
@@ -157,7 +157,7 @@ void KWatchGnuPGConfig::slotSetHistorySizeUnlimited() {
 
 void KWatchGnuPGConfig::loadConfig()
 {
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
   config->setGroup("WatchGnuPG");
   mExeED->setURL( config->readEntry( "Executable", "watchgnupg" ) );
   mSocketED->setURL( config->readEntry( "Socket", TQDir::home().canonicalPath()
@@ -175,7 +175,7 @@ void KWatchGnuPGConfig::loadConfig()
 
 void KWatchGnuPGConfig::saveConfig()
 {
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
   config->setGroup("WatchGnuPG");
   config->writeEntry( "Executable", mExeED->url() );
   config->writeEntry( "Socket", mSocketED->url() );
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
index 24264319..9bcd0b39 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
@@ -138,7 +138,7 @@ void KWatchGnuPGMainWindow::startWatcher()
 						   .arg( TQDateTime::currentDateTime().toString(Qt::ISODate)));
   }
   mWatcher->clearArguments();
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
   config->setGroup("WatchGnuPG");
   *mWatcher << config->readEntry("Executable", WATCHGNUPGBINARY);
   *mWatcher << "--force";
@@ -162,7 +162,7 @@ void KWatchGnuPGMainWindow::setGnuPGConfig()
   if ( !cconfig )
     return;
   //Q_ASSERT( cconfig );
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
   config->setGroup("WatchGnuPG");
   TQStringList comps = cconfig->componentList();
   for( TQStringList::const_iterator it = comps.begin(); it != comps.end(); ++it ) {
@@ -270,7 +270,7 @@ void KWatchGnuPGMainWindow::slotConfigure()
 
 void KWatchGnuPGMainWindow::slotReadConfig()
 {
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
   config->setGroup("LogWindow");
   mCentralWidget->setWordWrap( config->readBoolEntry("WordWrap", false)
 							   ?TQTextEdit::WidgetWidth
diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
index b3e75140..da875e30 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
@@ -197,13 +197,13 @@ namespace {
 
     TQVariant value() const { return mValue; }
 
-    void sync( KConfigBase * config ) {
+    void sync( TDEConfigBase * config ) {
       if ( !mDirty )
         return;
       mDirty = false;
       config->writeEntry( kleo_chiasmus_config_entries[mIdx].name, mValue );
     }
-    void read( const KConfigBase * config ) {
+    void read( const TDEConfigBase * config ) {
       mDirty = false;
       mValue = config->readPropertyEntry( kleo_chiasmus_config_entries[mIdx].name, defaultValue() );
     }
@@ -254,7 +254,7 @@ namespace {
 
   class ChiasmusGeneralGroup : public Kleo::CryptoConfigGroup {
     mutable std::map<TQString,ChiasmusConfigEntry*> mCache;
-    mutable KConfig * mConfigObject;
+    mutable TDEConfig * mConfigObject;
   public:
     ChiasmusGeneralGroup() : Kleo::CryptoConfigGroup(), mConfigObject( 0 ) {}
     ~ChiasmusGeneralGroup() { clear(); delete mConfigObject; }
@@ -271,7 +271,7 @@ namespace {
     Kleo::CryptoConfigEntry * entry( const TQString & name ) const {
       if ( ChiasmusConfigEntry * entry = mCache[name] )
         return entry;
-      const KConfigGroup group( configObject(), "Chiasmus" );
+      const TDEConfigGroup group( configObject(), "Chiasmus" );
       for ( unsigned int i = 0 ; i < kleo_chiasmus_config_entries_dim ; ++i )
         if ( name == kleo_chiasmus_config_entries[i].name ) {
           ChiasmusConfigEntry * entry = new ChiasmusConfigEntry( i );
@@ -282,17 +282,17 @@ namespace {
     }
 
     void sync() {
-      KConfigGroup group( configObject(), "Chiasmus" );
+      TDEConfigGroup group( configObject(), "Chiasmus" );
       for ( std::map<TQString,ChiasmusConfigEntry*>::const_iterator it = mCache.begin(), end = mCache.end() ; it != end ; ++it )
         it->second->sync( &group );
       group.sync();
       clear();
     }
   private:
-    KConfig * configObject() const {
+    TDEConfig * configObject() const {
       if ( !mConfigObject )
         // this is unsafe. We're a lib, used by concurrent apps.
-        mConfigObject = new KConfig( "chiasmusbackendrc" );
+        mConfigObject = new TDEConfig( "chiasmusbackendrc" );
       return mConfigObject;
     }
     void clear() {
diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp
index 6f07c954..f997e930 100644
--- a/certmanager/lib/cryptplugwrapper.cpp
+++ b/certmanager/lib/cryptplugwrapper.cpp
@@ -133,7 +133,7 @@ public:
     _unknownAttrsHandling = unknownAttrsInfix;
     _unknownAttrsHandlingChar = "INFIX";
   }
-  DNBeautifier( KConfig* config,
+  DNBeautifier( TDEConfig* config,
                 const TQString& cfgGroup,
                 const TQString& cfgAttributeOrderEntry,
                 const TQString& cfgUnknownAttrsEntry,
diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h
index bf197670..39fd680a 100644
--- a/certmanager/lib/cryptplugwrapper.h
+++ b/certmanager/lib/cryptplugwrapper.h
@@ -57,7 +57,7 @@
 #include <tdepimmacros.h>
 
 
-class KConfigBase;
+class TDEConfigBase;
 class QGpgMECryptoConfig;
 
 namespace GpgME {
diff --git a/certmanager/lib/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp
index 295c05c6..f67343ca 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.cpp
+++ b/certmanager/lib/kleo/cryptobackendfactory.cpp
@@ -178,10 +178,10 @@ Kleo::BackendConfigWidget * Kleo::CryptoBackendFactory::configWidget( TQWidget *
   return new Kleo::BackendConfigWidget( mSelf, parent, name );
 }
 
-KConfig* Kleo::CryptoBackendFactory::configObject() const {
+TDEConfig* Kleo::CryptoBackendFactory::configObject() const {
   if ( !mConfigObject )
     // this is unsafe. We're a lib, used by concurrent apps.
-    mConfigObject = new KConfig( "libkleopatrarc" );
+    mConfigObject = new TDEConfig( "libkleopatrarc" );
   return mConfigObject;
 }
 
@@ -195,7 +195,7 @@ void Kleo::CryptoBackendFactory::setOpenPGPBackend( const CryptoBackend* backend
 
 void Kleo::CryptoBackendFactory::setProtocolBackend( const char * protocol, const CryptoBackend * backend ) {
   const TQString name = backend ? backend->name() : TQString() ;
-  KConfigGroup group( configObject(), "Backends" );
+  TDEConfigGroup group( configObject(), "Backends" );
   group.writeEntry( protocol, name );
   configObject()->sync();
   mBackends[protocol] = backend;
@@ -218,7 +218,7 @@ static const char * defaultBackend( const char * proto ) {
 
 void Kleo::CryptoBackendFactory::readConfig() {
   mBackends.clear();
-  const KConfigGroup group( configObject(), "Backends" );
+  const TDEConfigGroup group( configObject(), "Backends" );
   for ( ProtocolSet::const_iterator it = mAvailableProtocols.begin(), end = mAvailableProtocols.end() ; it != end ; ++it ) {
     const TQString backend = group.readEntry( *it, defaultBackend( *it ) );
     mBackends[*it] = backendByName( backend );
diff --git a/certmanager/lib/kleo/cryptobackendfactory.h b/certmanager/lib/kleo/cryptobackendfactory.h
index da1743f9..09012da3 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.h
+++ b/certmanager/lib/kleo/cryptobackendfactory.h
@@ -46,7 +46,7 @@ namespace Kleo {
 }
 
 class TQString;
-class KConfig;
+class TDEConfig;
 
 namespace Kleo {
 
@@ -76,7 +76,7 @@ namespace Kleo {
 
     Kleo::BackendConfigWidget * configWidget( TQWidget * parent=0, const char * name=0 ) const;
 
-    KConfig* configObject() const;
+    TDEConfig* configObject() const;
 
     // The preferred backend for smime (can be 0) - currently unused
     //const CryptoBackend* smimeBackend() const;
@@ -97,7 +97,7 @@ namespace Kleo {
 
   protected:
     std::vector<CryptoBackend*> mBackendList;
-    mutable KConfig* mConfigObject;
+    mutable TDEConfig* mConfigObject;
     typedef std::map<const char *, const CryptoBackend*, lt_i_str> BackendMap;
     BackendMap mBackends;
     typedef std::vector<const char *> ProtocolSet;
diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp
index 774302ba..3249cc73 100644
--- a/certmanager/lib/kleo/dn.cpp
+++ b/certmanager/lib/kleo/dn.cpp
@@ -484,7 +484,7 @@ Kleo::DNAttributeMapper::Private::Private()
 
 Kleo::DNAttributeMapper::DNAttributeMapper() {
   d = new Private();
-  const KConfigGroup config( kapp->config(), "DN" );
+  const TDEConfigGroup config( kapp->config(), "DN" );
   d->attributeOrder = config.readListEntry( "AttributeOrder" );
   if ( d->attributeOrder.empty() )
     std::copy( defaultOrder, defaultOrder + sizeof defaultOrder / sizeof *defaultOrder,
@@ -529,7 +529,7 @@ void Kleo::DNAttributeMapper::setAttributeOrder( const TQStringList & order ) {
   if ( order.empty() )
     std::copy( defaultOrder, defaultOrder + sizeof defaultOrder / sizeof *defaultOrder,
 	       std::back_inserter( d->attributeOrder ) );
-  KConfigGroup config( kapp->config(), "DN" );
+  TDEConfigGroup config( kapp->config(), "DN" );
   config.writeEntry( "AttributeOrder", order );
 }
 
diff --git a/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp b/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp
index 47e1548e..4ed6ab37 100644
--- a/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp
+++ b/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp
@@ -67,7 +67,7 @@ static GpgME::UserID::Validity map2Validity( const TQString & s ) {
 }
 
 
-Kleo::KConfigBasedKeyFilter::KConfigBasedKeyFilter( const KConfigBase & config )
+Kleo::TDEConfigBasedKeyFilter::TDEConfigBasedKeyFilter( const TDEConfigBase & config )
   : KeyFilter(),
     mSpecificity( 0 ),
     mItalic( false ),
@@ -151,11 +151,11 @@ Kleo::KConfigBasedKeyFilter::KConfigBasedKeyFilter( const KConfigBase & config )
   }
 }
 
-Kleo::KConfigBasedKeyFilter::~KConfigBasedKeyFilter() {
+Kleo::TDEConfigBasedKeyFilter::~TDEConfigBasedKeyFilter() {
 
 }
 
-bool Kleo::KConfigBasedKeyFilter::matches( const GpgME::Key & key ) const {
+bool Kleo::TDEConfigBasedKeyFilter::matches( const GpgME::Key & key ) const {
 #ifdef MATCH
 #undef MATCH
 #endif
@@ -243,7 +243,7 @@ static inline TQFont adapt( TQFont font, bool it, bool b, bool strike ) {
   return font;
 }
 
-TQFont Kleo::KConfigBasedKeyFilter::font( const TQFont & f ) const {
+TQFont Kleo::TDEConfigBasedKeyFilter::font( const TQFont & f ) const {
   if ( mUseFullFont )
     return resizedFont( mFont, f.pointSize(), mStrikeOut );
   else
diff --git a/certmanager/lib/kleo/kconfigbasedkeyfilter.h b/certmanager/lib/kleo/kconfigbasedkeyfilter.h
index 98050cc6..487b3791 100644
--- a/certmanager/lib/kleo/kconfigbasedkeyfilter.h
+++ b/certmanager/lib/kleo/kconfigbasedkeyfilter.h
@@ -41,14 +41,14 @@
 
 #include <gpgmepp/key.h>
 
-class KConfigBase;
+class TDEConfigBase;
 
 namespace Kleo {
 
-  class KConfigBasedKeyFilter : public KeyFilter {
+  class TDEConfigBasedKeyFilter : public KeyFilter {
   public:
-    explicit KConfigBasedKeyFilter( const KConfigBase & config );
-    ~KConfigBasedKeyFilter();
+    explicit TDEConfigBasedKeyFilter( const TDEConfigBase & config );
+    ~TDEConfigBasedKeyFilter();
     bool matches( const GpgME::Key & key ) const;
 
     unsigned int specificity() const { return mSpecificity; }
diff --git a/certmanager/lib/kleo/keyfiltermanager.cpp b/certmanager/lib/kleo/keyfiltermanager.cpp
index 6edc7c57..1276f9fd 100644
--- a/certmanager/lib/kleo/keyfiltermanager.cpp
+++ b/certmanager/lib/kleo/keyfiltermanager.cpp
@@ -104,13 +104,13 @@ static inline bool by_increasing_specificity( const Kleo::KeyFilter * left, cons
 void Kleo::KeyFilterManager::reload() {
   d->clear();
 
-  KConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
+  TDEConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
   if ( !config )
     return;
   const TQStringList groups = config->groupList().grep( TQRegExp( "^Key Filter #\\d+$" ) );
   for ( TQStringList::const_iterator it = groups.begin() ; it != groups.end() ; ++it ) {
-    const KConfigGroup cfg( config, *it );
-    d->filters.push_back( new KConfigBasedKeyFilter( cfg ) );
+    const TDEConfigGroup cfg( config, *it );
+    d->filters.push_back( new TDEConfigBasedKeyFilter( cfg ) );
   }
   std::stable_sort( d->filters.begin(), d->filters.end(), by_increasing_specificity );
 }
diff --git a/certmanager/lib/ui/cryptoconfigmodule.h b/certmanager/lib/ui/cryptoconfigmodule.h
index 4d5042f5..2902423c 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.h
+++ b/certmanager/lib/ui/cryptoconfigmodule.h
@@ -43,7 +43,7 @@ namespace Kleo {
 
   /**
    * Crypto Config Module widget, dynamically generated from CryptoConfig
-   * It's a simple TQWidget so that it can be embedded into a dialog or into a KCModule.
+   * It's a simple TQWidget so that it can be embedded into a dialog or into a TDECModule.
    */
   class CryptoConfigModule : public KJanusWidget {
     Q_OBJECT
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index 35a97611..adb25749 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -449,14 +449,14 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection
     KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() );
     TQSize dialogSize( 500, 400 );
 
-    KConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" );
+    TDEConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" );
     dialogSize = dialogConfig.readSizeEntry( "Dialog size", &dialogSize );
     resize( dialogSize );
   }
 }
 
 Kleo::KeySelectionDialog::~KeySelectionDialog() {
-  KConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" );
+  TDEConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" );
   dialogConfig.writeEntry( "Dialog size", size() );
   dialogConfig.sync();
 }
diff --git a/certmanager/storedtransferjob.cpp b/certmanager/storedtransferjob.cpp
index fd9e601b..e2e9ea95 100644
--- a/certmanager/storedtransferjob.cpp
+++ b/certmanager/storedtransferjob.cpp
@@ -19,7 +19,7 @@
 
 #include "storedtransferjob.h"
 
-using namespace KIOext;
+using namespace TDEIOext;
 
 #define KIO_ARGS TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream
 
@@ -27,13 +27,13 @@ StoredTransferJob::StoredTransferJob(const KURL& url, int command,
                                      const TQByteArray &packedArgs,
                                      const TQByteArray &_staticData,
                                      bool showProgressInfo)
-    : KIO::TransferJob( url, command, packedArgs, _staticData, showProgressInfo ),
+    : TDEIO::TransferJob( url, command, packedArgs, _staticData, showProgressInfo ),
       m_uploadOffset( 0 )
 {
-    connect( this, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-             TQT_SLOT( slotData( KIO::Job *, const TQByteArray & ) ) );
-    connect( this, TQT_SIGNAL( dataReq( KIO::Job *, TQByteArray & ) ),
-             TQT_SLOT( slotDataReq( KIO::Job *, TQByteArray & ) ) );
+    connect( this, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+             TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
+    connect( this, TQT_SIGNAL( dataReq( TDEIO::Job *, TQByteArray & ) ),
+             TQT_SLOT( slotDataReq( TDEIO::Job *, TQByteArray & ) ) );
 }
 
 void StoredTransferJob::setData( const TQByteArray& arr )
@@ -43,7 +43,7 @@ void StoredTransferJob::setData( const TQByteArray& arr )
     m_data = arr;
 }
 
-void StoredTransferJob::slotData( KIO::Job *, const TQByteArray &data )
+void StoredTransferJob::slotData( TDEIO::Job *, const TQByteArray &data )
 {
   // check for end-of-data marker:
   if ( data.size() == 0 )
@@ -53,7 +53,7 @@ void StoredTransferJob::slotData( KIO::Job *, const TQByteArray &data )
   memcpy( m_data.data() + oldSize, data.data(), data.size() );
 }
 
-void StoredTransferJob::slotDataReq( KIO::Job *, TQByteArray &data )
+void StoredTransferJob::slotDataReq( TDEIO::Job *, TQByteArray &data )
 {
   // Inspired from kmail's KMKernel::byteArrayToRemoteFile
   // send the data in 64 KB chunks
@@ -80,7 +80,7 @@ StoredTransferJob *KIOext::storedGet( const KURL& url, bool reload, bool showPro
 {
     // Send decoded path and encoded query
     KIO_ARGS << url;
-    StoredTransferJob * job = new StoredTransferJob( url, KIO::CMD_GET, packedArgs, TQByteArray(), showProgressInfo );
+    StoredTransferJob * job = new StoredTransferJob( url, TDEIO::CMD_GET, packedArgs, TQByteArray(), showProgressInfo );
     if (reload)
        job->addMetaData("cache", "reload");
     return job;
@@ -90,7 +90,7 @@ StoredTransferJob *KIOext::put( const TQByteArray& arr, const KURL& url, int per
                                 bool overwrite, bool resume, bool showProgressInfo )
 {
     KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions;
-    StoredTransferJob * job = new StoredTransferJob( url, KIO::CMD_PUT, packedArgs, TQByteArray(), showProgressInfo );
+    StoredTransferJob * job = new StoredTransferJob( url, TDEIO::CMD_PUT, packedArgs, TQByteArray(), showProgressInfo );
     job->setData( arr );
     return job;
 }
diff --git a/certmanager/storedtransferjob.h b/certmanager/storedtransferjob.h
index ddc687fc..7fab7706 100644
--- a/certmanager/storedtransferjob.h
+++ b/certmanager/storedtransferjob.h
@@ -23,28 +23,28 @@
 #include <kio/job.h>
 
 // To be moved to KIO?
-namespace KIOext {
+namespace TDEIOext {
 
 /**
  * StoredTransferJob is a TransferJob (for downloading or uploading data) that
  * also stores a TQByteArray with the data, making it simpler to use than the
  * standard TransferJob.
  *
- * For KIO::get it puts the data into the member TQByteArray, so the user
+ * For TDEIO::get it puts the data into the member TQByteArray, so the user
  * of this class can get hold of the whole data at once by calling data()
  * when the result signal is emitted.
  * You should only use StoredTransferJob to download data if you cannot
  * process the data by chunks while it's being downloaded, since storing
  * everything in a TQByteArray can potentially require a lot of memory.
  *
- * For KIO::put the user of this class simply provides the bytearray from
+ * For TDEIO::put the user of this class simply provides the bytearray from
  * the start, and the job takes care of uploading it.
  * You should only use StoredTransferJob to upload data if you cannot
  * provide the in chunks while it's being uploaded, since storing
  * everything in a TQByteArray can potentially require a lot of memory.
  *
  */
-class StoredTransferJob : public KIO::TransferJob {
+class StoredTransferJob : public TDEIO::TransferJob {
     Q_OBJECT
   
 
@@ -76,8 +76,8 @@ public:
     TQByteArray data() const { return m_data; }
 
 private slots:
-    void slotData( KIO::Job *job, const TQByteArray &data );
-    void slotDataReq( KIO::Job *job, TQByteArray &data );
+    void slotData( TDEIO::Job *job, const TQByteArray &data );
+    void slotDataReq( TDEIO::Job *job, TQByteArray &data );
 private:
     TQByteArray m_data;
     int m_uploadOffset;