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

1 files changed, 77 insertions, 77 deletions

diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index 4bad5bc5d..7b24e228d 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -156,7 +156,7 @@ namespace {
     I18N_NOOP("<qt><p>This setting has been fixed by your administrator.</p>"
               "<p>If you think this is an error, please contact him.</p></qt>");
 
-  void checkLockDown( TQWidget * w, const KConfigBase & c, const char * key ) {
+  void checkLockDown( TQWidget * w, const TDEConfigBase & c, const char * key ) {
     if ( c.entryIsImmutable( key ) ) {
       w->setEnabled( false );
       TQToolTip::add( w, i18n( lockedDownWarning ) );
@@ -176,13 +176,13 @@ namespace {
     b->setText( i18n( e.desc ) );
   }
 
-  void loadWidget( TQCheckBox * b, const KConfigBase & c, const BoolConfigEntry & e ) {
+  void loadWidget( TQCheckBox * b, const TDEConfigBase & c, const BoolConfigEntry & e ) {
     Q_ASSERT( c.group() == e.group );
     checkLockDown( b, c, e.key );
     b->setChecked( c.readBoolEntry( e.key, e.defaultValue ) );
   }
 
-  void loadWidget( TQButtonGroup * g, const KConfigBase & c, const EnumConfigEntry & e ) {
+  void loadWidget( TQButtonGroup * g, const TDEConfigBase & c, const EnumConfigEntry & e ) {
     Q_ASSERT( c.group() == e.group );
     Q_ASSERT( g->count() == e.numItems );
     checkLockDown( g, c, e.key );
@@ -195,19 +195,19 @@ namespace {
     g->setButton( e.defaultItem );
   }
 
-  void saveCheckBox( TQCheckBox * b, KConfigBase & c, const BoolConfigEntry & e ) {
+  void saveCheckBox( TQCheckBox * b, TDEConfigBase & c, const BoolConfigEntry & e ) {
     Q_ASSERT( c.group() == e.group );
     c.writeEntry( e.key, b->isChecked() );
   }
 
-  void saveButtonGroup( TQButtonGroup * g, KConfigBase & c, const EnumConfigEntry & e ) {
+  void saveButtonGroup( TQButtonGroup * g, TDEConfigBase & c, const EnumConfigEntry & e ) {
     Q_ASSERT( c.group() == e.group );
     Q_ASSERT( g->count() == e.numItems );
     c.writeEntry( e.key, e.items[ g->id( g->selected() ) ].key );
   }
 
   template <typename T_Widget, typename T_Entry>
-  inline void loadProfile( T_Widget * g, const KConfigBase & c, const T_Entry & e ) {
+  inline void loadProfile( T_Widget * g, const TDEConfigBase & c, const T_Entry & e ) {
     if ( c.hasKey( e.key ) )
       loadWidget( g, c, e );
   }
@@ -233,7 +233,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.
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
   int width = geometry.readNumEntry( "ConfigureDialogWidth" );
   int height = geometry.readNumEntry( "ConfigureDialogHeight" );
   if ( width != 0 && height != 0 ) {
@@ -243,7 +243,7 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
 }
 
 void ConfigureDialog::hideEvent( TQHideEvent *ev ) {
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
   geometry.writeEntry( "ConfigureDialogWidth", width() );
   geometry.writeEntry( "ConfigureDialogHeight",height() );
   KDialogBase::hideEvent( ev );
@@ -270,8 +270,8 @@ void ConfigureDialog::slotUser2() {
     return;
   }
   mProfileDialog = new ProfileDialog( this, "mProfileDialog" );
-  connect( mProfileDialog, TQT_SIGNAL(profileSelected(KConfig*)),
-                this, TQT_SIGNAL(installProfile(KConfig*)) );
+  connect( mProfileDialog, TQT_SIGNAL(profileSelected(TDEConfig*)),
+                this, TQT_SIGNAL(installProfile(TDEConfig*)) );
   mProfileDialog->show();
 }
 
@@ -359,7 +359,7 @@ void IdentityPage::save() {
   if( mOldNumberOfIdentities < 2 && mIdentityList->childCount() > 1 ) {
     // have more than one identity, so better show the combo in the
     // composer now:
-    KConfigGroup composer( KMKernel::config(), "Composer" );
+    TDEConfigGroup composer( KMKernel::config(), "Composer" );
     int showHeaders = composer.readNumEntry( "headers", HDR_STANDARD );
     showHeaders |= HDR_IDENTITY;
     composer.writeEntry( "headers", showHeaders );
@@ -367,7 +367,7 @@ void IdentityPage::save() {
   // and now the reverse
   if( mOldNumberOfIdentities > 1 && mIdentityList->childCount() < 2 ) {
     // have only one identity, so remove the combo in the composer:
-    KConfigGroup composer( KMKernel::config(), "Composer" );
+    TDEConfigGroup composer( KMKernel::config(), "Composer" );
     int showHeaders = composer.readNumEntry( "headers", HDR_STANDARD );
     showHeaders &= ~HDR_IDENTITY;
     composer.writeEntry( "headers", showHeaders );
@@ -970,8 +970,8 @@ void AccountsPage::SendingTab::doLoadFromGlobalSettings() {
 }
 
 void AccountsPage::SendingTab::doLoadOther() {
-  KConfigGroup general( KMKernel::config(), "General");
-  KConfigGroup composer( KMKernel::config(), "Composer");
+  TDEConfigGroup general( KMKernel::config(), "General");
+  TDEConfigGroup composer( KMKernel::config(), "Composer");
 
   int numTransports = general.readNumEntry("transports", 0);
 
@@ -1032,8 +1032,8 @@ void AccountsPage::SendingTab::doLoadOther() {
 }
 
 void AccountsPage::SendingTab::save() {
-  KConfigGroup general( KMKernel::config(), "General" );
-  KConfigGroup composer( KMKernel::config(), "Composer" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup composer( KMKernel::config(), "Composer" );
 
   // Save transports:
   general.writeEntry( "transports", mTransportInfoList.count() );
@@ -1391,7 +1391,7 @@ void AccountsPage::ReceivingTab::doLoadFromGlobalSettings() {
 }
 
 void AccountsPage::ReceivingTab::doLoadOther() {
-  KConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
 
   mAccountList->clear();
   TQListViewItem *top = 0;
@@ -1453,7 +1453,7 @@ void AccountsPage::ReceivingTab::save() {
   kmkernel->cleanupImapFolders();
 
   // Save Mail notification settings
-  KConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
   general.writeEntry( "beep-on-mail", mBeepNewMailCheck->isChecked() );
   GlobalSettings::self()->setVerboseNewMailNotification( mVerboseNotificationCheck->isChecked() );
 
@@ -1644,7 +1644,7 @@ void AppearancePage::FontsTab::slotFontSelectorChanged( int index )
 }
 
 void AppearancePage::FontsTab::doLoadOther() {
-  KConfigGroup fonts( KMKernel::config(), "Fonts" );
+  TDEConfigGroup fonts( KMKernel::config(), "Fonts" );
 
   mFont[0] = TDEGlobalSettings::generalFont();
   TQFont fixedFont = TDEGlobalSettings::fixedFont();
@@ -1657,8 +1657,8 @@ void AppearancePage::FontsTab::doLoadOther() {
   slotFontSelectorChanged( 0 );
 }
 
-void AppearancePage::FontsTab::installProfile( KConfig * profile ) {
-  KConfigGroup fonts( profile, "Fonts" );
+void AppearancePage::FontsTab::installProfile( TDEConfig * profile ) {
+  TDEConfigGroup fonts( profile, "Fonts" );
 
   // read fonts that are defined in the profile:
   bool needChange = false;
@@ -1678,7 +1678,7 @@ void AppearancePage::FontsTab::installProfile( KConfig * profile ) {
 }
 
 void AppearancePage::FontsTab::save() {
-  KConfigGroup fonts( KMKernel::config(), "Fonts" );
+  TDEConfigGroup fonts( KMKernel::config(), "Fonts" );
 
   // read the current font (might have been modified)
   if ( mActiveFontIndex >= 0 )
@@ -1786,7 +1786,7 @@ AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * parent, const char
 }
 
 void AppearancePage::ColorsTab::doLoadOther() {
-  KConfigGroup reader( KMKernel::config(), "Reader" );
+  TDEConfigGroup reader( KMKernel::config(), "Reader" );
 
   mCustomColorCheck->setChecked( !reader.readBoolEntry( "defaultColors", true ) );
   mRecycleColorCheck->setChecked( reader.readBoolEntry( "RecycleQuoteColors", false ) );
@@ -1827,8 +1827,8 @@ void AppearancePage::ColorsTab::doLoadOther() {
            this, TQT_SLOT( slotEmitChanged( void ) ) );
 }
 
-void AppearancePage::ColorsTab::installProfile( KConfig * profile ) {
-  KConfigGroup reader( profile, "Reader" );
+void AppearancePage::ColorsTab::installProfile( TDEConfig * profile ) {
+  TDEConfigGroup reader( profile, "Reader" );
 
   if ( reader.hasKey( "defaultColors" ) )
     mCustomColorCheck->setChecked( !reader.readBoolEntry( "defaultColors" ) );
@@ -1841,7 +1841,7 @@ void AppearancePage::ColorsTab::installProfile( KConfig * profile ) {
 }
 
 void AppearancePage::ColorsTab::save() {
-  KConfigGroup reader( KMKernel::config(), "Reader" );
+  TDEConfigGroup reader( KMKernel::config(), "Reader" );
 
   bool customColors = mCustomColorCheck->isChecked();
   reader.writeEntry( "defaultColors", !customColors );
@@ -1940,8 +1940,8 @@ AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * parent, const char
 }
 
 void AppearancePage::LayoutTab::doLoadOther() {
-  const KConfigGroup reader( KMKernel::config(), "Reader" );
-  const KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  const TDEConfigGroup reader( KMKernel::config(), "Reader" );
+  const TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
 
   loadWidget( mFolderListGroup, geometry, folderListMode );
   loadWidget( mMIMETreeLocationGroup, reader, mimeTreeLocation );
@@ -1950,9 +1950,9 @@ void AppearancePage::LayoutTab::doLoadOther() {
   mFavoriteFolderViewCB->setChecked( GlobalSettings::self()->enableFavoriteFolderView() );
 }
 
-void AppearancePage::LayoutTab::installProfile( KConfig * profile ) {
-  const KConfigGroup reader( profile, "Reader" );
-  const KConfigGroup geometry( profile, "Geometry" );
+void AppearancePage::LayoutTab::installProfile( TDEConfig * profile ) {
+  const TDEConfigGroup reader( profile, "Reader" );
+  const TDEConfigGroup geometry( profile, "Geometry" );
 
   loadProfile( mFolderListGroup, geometry, folderListMode );
   loadProfile( mMIMETreeLocationGroup, reader, mimeTreeLocation );
@@ -1961,8 +1961,8 @@ void AppearancePage::LayoutTab::installProfile( KConfig * profile ) {
 }
 
 void AppearancePage::LayoutTab::save() {
-  KConfigGroup reader( KMKernel::config(), "Reader" );
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  TDEConfigGroup reader( KMKernel::config(), "Reader" );
+  TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
 
   saveButtonGroup( mFolderListGroup, geometry, folderListMode );
   saveButtonGroup( mMIMETreeLocationGroup, reader, mimeTreeLocation );
@@ -2114,8 +2114,8 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
 }
 
 void AppearancePage::HeadersTab::doLoadOther() {
-  KConfigGroup general( KMKernel::config(), "General" );
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
 
   // "General Options":
   mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages", false ) );
@@ -2150,9 +2150,9 @@ void AppearancePage::HeadersTab::setDateDisplay( int num, const TQString & forma
   mDateDisplay->setButton( numDateDisplayConfig - 2 ); // default
 }
 
-void AppearancePage::HeadersTab::installProfile( KConfig * profile ) {
-  KConfigGroup general( profile, "General" );
-  KConfigGroup geometry( profile, "Geometry" );
+void AppearancePage::HeadersTab::installProfile( TDEConfig * profile ) {
+  TDEConfigGroup general( profile, "General" );
+  TDEConfigGroup geometry( profile, "Geometry" );
 
   if ( geometry.hasKey( "nestedMessages" ) )
     mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages" ) );
@@ -2176,8 +2176,8 @@ void AppearancePage::HeadersTab::installProfile( KConfig * profile ) {
 }
 
 void AppearancePage::HeadersTab::save() {
-  KConfigGroup general( KMKernel::config(), "General" );
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
 
   if ( geometry.readBoolEntry( "nestedMessages", false )
        != mNestedMessagesCheck->isChecked() ) {
@@ -2191,7 +2191,7 @@ void AppearancePage::HeadersTab::save() {
       TQStringList groups = KMKernel::config()->groupList().grep( TQRegExp("^Folder-") );
       kdDebug(5006) << "groups.count() == " << groups.count() << endl;
       for ( TQStringList::const_iterator it = groups.begin() ; it != groups.end() ; ++it ) {
-        KConfigGroup group( KMKernel::config(), *it );
+        TDEConfigGroup group( KMKernel::config(), *it );
         group.deleteEntry( "threadMessagesOverride" );
       }
     }
@@ -2433,14 +2433,14 @@ void AppearancePage::ReaderTab::doLoadFromGlobalSettings()
 
 void AppearancePage::ReaderTab::doLoadOther()
 {
-  const KConfigGroup reader( KMKernel::config(), "Reader" );
+  const TDEConfigGroup reader( KMKernel::config(), "Reader" );
   loadWidget( mShowColorbarCheck, reader, showColorbarMode );
   loadWidget( mShowSpamStatusCheck, reader, showSpamStatusMode );
 }
 
 
 void AppearancePage::ReaderTab::save() {
-  KConfigGroup reader( KMKernel::config(), "Reader" );
+  TDEConfigGroup reader( KMKernel::config(), "Reader" );
   saveCheckBox( mShowColorbarCheck, reader, showColorbarMode );
   saveCheckBox( mShowSpamStatusCheck, reader, showSpamStatusMode );
   GlobalSettings::self()->setCloseAfterReplyOrForward( mCloseAfterReplyOrForwardCheck->isChecked() );
@@ -2459,8 +2459,8 @@ void AppearancePage::ReaderTab::save() {
 }
 
 
-void AppearancePage::ReaderTab::installProfile( KConfig * /* profile */ ) {
-  const KConfigGroup reader( KMKernel::config(), "Reader" );
+void AppearancePage::ReaderTab::installProfile( TDEConfig * /* profile */ ) {
+  const TDEConfigGroup reader( KMKernel::config(), "Reader" );
   loadProfile( mCloseAfterReplyOrForwardCheck, reader, closeAfterReplyOrForward );
   loadProfile( mShowColorbarCheck, reader, showColorbarMode );
   loadProfile( mShowSpamStatusCheck, reader, showSpamStatusMode );
@@ -2512,8 +2512,8 @@ void AppearancePage::SystemTrayTab::doLoadFromGlobalSettings() {
   mSystemTrayGroup->setEnabled( mSystemTrayCheck->isChecked() );
 }
 
-void AppearancePage::SystemTrayTab::installProfile( KConfig * profile ) {
-  KConfigGroup general( profile, "General" );
+void AppearancePage::SystemTrayTab::installProfile( TDEConfig * profile ) {
+  TDEConfigGroup general( profile, "General" );
 
   if ( general.hasKey( "SystemTrayEnabled" ) ) {
     mSystemTrayCheck->setChecked( general.readBoolEntry( "SystemTrayEnabled" ) );
@@ -2832,9 +2832,9 @@ void ComposerPage::GeneralTab::doLoadFromGlobalSettings() {
   mEditorRequester->setURL( GlobalSettings::self()->externalEditor() );
 }
 
-void ComposerPage::GeneralTab::installProfile( KConfig * profile ) {
-  KConfigGroup composer( profile, "Composer" );
-  KConfigGroup general( profile, "General" );
+void ComposerPage::GeneralTab::installProfile( TDEConfig * profile ) {
+  TDEConfigGroup composer( profile, "Composer" );
+  TDEConfigGroup general( profile, "General" );
 
   if ( composer.hasKey( "signature" ) ) {
     bool state = composer.readBoolEntry("signature");
@@ -3320,7 +3320,7 @@ void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) {
 }
 
 void ComposerPage::CharsetTab::doLoadOther() {
-  KConfigGroup composer( KMKernel::config(), "Composer" );
+  TDEConfigGroup composer( KMKernel::config(), "Composer" );
 
   TQStringList charsets = composer.readListEntry( "pref-charsets" );
   for ( TQStringList::Iterator it = charsets.begin() ;
@@ -3336,7 +3336,7 @@ void ComposerPage::CharsetTab::doLoadOther() {
 }
 
 void ComposerPage::CharsetTab::save() {
-  KConfigGroup composer( KMKernel::config(), "Composer" );
+  TDEConfigGroup composer( KMKernel::config(), "Composer" );
 
   TQStringList charsetList = mCharsetListEditor->stringList();
   TQStringList::Iterator it = charsetList.begin();
@@ -3509,7 +3509,7 @@ void ComposerPage::HeadersTab::slotRemoveMimeHeader()
 }
 
 void ComposerPage::HeadersTab::doLoadOther() {
-  KConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
 
   TQString suffix = general.readEntry( "myMessageIdSuffix" );
   mMessageIdSuffixEdit->setText( suffix );
@@ -3525,7 +3525,7 @@ void ComposerPage::HeadersTab::doLoadOther() {
 
   int count = general.readNumEntry( "mime-header-count", 0 );
   for( int i = 0 ; i < count ; i++ ) {
-    KConfigGroup config( KMKernel::config(),
+    TDEConfigGroup config( KMKernel::config(),
                          TQCString("Mime #") + TQCString().setNum(i) );
     TQString name  = config.readEntry( "name" );
     TQString value = config.readEntry( "value" );
@@ -3543,7 +3543,7 @@ void ComposerPage::HeadersTab::doLoadOther() {
 }
 
 void ComposerPage::HeadersTab::save() {
-  KConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
 
   general.writeEntry( "useCustomMessageIdSuffix",
                       mCreateOwnMessageIdCheck->isChecked() );
@@ -3554,7 +3554,7 @@ void ComposerPage::HeadersTab::save() {
   TQListViewItem * item = mTagList->firstChild();
   for ( ; item ; item = item->itemBelow() )
     if( !item->text(0).isEmpty() ) {
-      KConfigGroup config( KMKernel::config(), TQCString("Mime #")
+      TDEConfigGroup config( KMKernel::config(), TQCString("Mime #")
                              + TQCString().setNum( numValidEntries ) );
       config.writeEntry( "name",  item->text( 0 ) );
       config.writeEntry( "value", item->text( 1 ) );
@@ -3708,7 +3708,7 @@ SecurityPage::SecurityPage( TQWidget * parent, const char * name )
 }
 
 
-void SecurityPage::installProfile( KConfig * profile ) {
+void SecurityPage::installProfile( TDEConfig * profile ) {
   mGeneralTab->installProfile( profile );
   mComposerCryptoTab->installProfile( profile );
   mWarningTab->installProfile( profile );
@@ -3910,7 +3910,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
 }
 
 void SecurityPage::GeneralTab::doLoadOther() {
-  const KConfigGroup reader( KMKernel::config(), "Reader" );
+  const TDEConfigGroup reader( KMKernel::config(), "Reader" );
 
   mHtmlMailCheck->setChecked( reader.readBoolEntry( "htmlMail", false ) );
   mExternalReferences->setChecked( reader.readBoolEntry( "htmlLoadExternal", false ) );
@@ -3918,7 +3918,7 @@ void SecurityPage::GeneralTab::doLoadOther() {
 
   mAlwaysDecrypt->setChecked( GlobalSettings::self()->alwaysDecrypt() );
 
-  const KConfigGroup mdn( KMKernel::config(), "MDN" );
+  const TDEConfigGroup mdn( KMKernel::config(), "MDN" );
 
   int num = mdn.readNumEntry( "default-policy", 0 );
   if ( num < 0 || num >= mMDNGroup->count() ) num = 0;
@@ -3929,9 +3929,9 @@ void SecurityPage::GeneralTab::doLoadOther() {
   mNoMDNsWhenEncryptedCheck->setChecked(mdn.readBoolEntry( "not-send-when-encrypted", true ));
 }
 
-void SecurityPage::GeneralTab::installProfile( KConfig * profile ) {
-  const KConfigGroup reader( profile, "Reader" );
-  const KConfigGroup mdn( profile, "MDN" );
+void SecurityPage::GeneralTab::installProfile( TDEConfig * profile ) {
+  const TDEConfigGroup reader( profile, "Reader" );
+  const TDEConfigGroup mdn( profile, "MDN" );
 
   if ( reader.hasKey( "htmlMail" ) )
     mHtmlMailCheck->setChecked( reader.readBoolEntry( "htmlMail" ) );
@@ -3955,8 +3955,8 @@ void SecurityPage::GeneralTab::installProfile( KConfig * profile ) {
 }
 
 void SecurityPage::GeneralTab::save() {
-  KConfigGroup reader( KMKernel::config(), "Reader" );
-  KConfigGroup mdn( KMKernel::config(), "MDN" );
+  TDEConfigGroup reader( KMKernel::config(), "Reader" );
+  TDEConfigGroup mdn( KMKernel::config(), "MDN" );
 
   if (reader.readBoolEntry( "htmlMail", false ) != mHtmlMailCheck->isChecked())
   {
@@ -3976,7 +3976,7 @@ void SecurityPage::GeneralTab::save() {
       {
         if (*it)
         {
-          KConfigGroupSaver saver(KMKernel::config(),
+          TDEConfigGroupSaver saver(KMKernel::config(),
             "Folder-" + (*it)->idString());
           KMKernel::config()->writeEntry("htmlMailOverride", false);
         }
@@ -4014,7 +4014,7 @@ SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( TQWidget * parent,
 }
 
 void SecurityPage::ComposerCryptoTab::doLoadOther() {
-  const KConfigGroup composer( KMKernel::config(), "Composer" );
+  const TDEConfigGroup composer( KMKernel::config(), "Composer" );
 
   // If you change default values, sync messagecomposer.cpp too
 
@@ -4031,8 +4031,8 @@ void SecurityPage::ComposerCryptoTab::doLoadOther() {
   mWidget->mStoreEncrypted->setChecked( composer.readBoolEntry( "crypto-store-encrypted", true ) );
 }
 
-void SecurityPage::ComposerCryptoTab::installProfile( KConfig * profile ) {
-  const KConfigGroup composer( profile, "Composer" );
+void SecurityPage::ComposerCryptoTab::installProfile( TDEConfig * profile ) {
+  const TDEConfigGroup composer( profile, "Composer" );
 
   if ( composer.hasKey( "pgp-auto-sign" ) )
     mWidget->mAutoSignature->setChecked( composer.readBoolEntry( "pgp-auto-sign" ) );
@@ -4053,7 +4053,7 @@ void SecurityPage::ComposerCryptoTab::installProfile( KConfig * profile ) {
 }
 
 void SecurityPage::ComposerCryptoTab::save() {
-  KConfigGroup composer( KMKernel::config(), "Composer" );
+  TDEConfigGroup composer( KMKernel::config(), "Composer" );
 
   composer.writeEntry( "pgp-auto-sign", mWidget->mAutoSignature->isChecked() );
 
@@ -4097,7 +4097,7 @@ SecurityPageWarningTab::SecurityPageWarningTab( TQWidget * parent, const char *
 }
 
 void SecurityPage::WarningTab::doLoadOther() {
-  const KConfigGroup composer( KMKernel::config(), "Composer" );
+  const TDEConfigGroup composer( KMKernel::config(), "Composer" );
 
   mWidget->warnUnencryptedCB->setChecked( composer.readBoolEntry( "crypto-warning-unencrypted", false ) );
   mWidget->mWarnUnsigned->setChecked( composer.readBoolEntry( "crypto-warning-unsigned", false ) );
@@ -4118,8 +4118,8 @@ void SecurityPage::WarningTab::doLoadOther() {
   mWidget->enableAllWarningsPB->setEnabled( true );
 }
 
-void SecurityPage::WarningTab::installProfile( KConfig * profile ) {
-  const KConfigGroup composer( profile, "Composer" );
+void SecurityPage::WarningTab::installProfile( TDEConfig * profile ) {
+  const TDEConfigGroup composer( profile, "Composer" );
 
   if ( composer.hasKey( "crypto-warning-unencrypted" ) )
     mWidget->warnUnencryptedCB->setChecked( composer.readBoolEntry( "crypto-warning-unencrypted" ) );
@@ -4147,7 +4147,7 @@ void SecurityPage::WarningTab::installProfile( KConfig * profile ) {
 }
 
 void SecurityPage::WarningTab::save() {
-  KConfigGroup composer( KMKernel::config(), "Composer" );
+  TDEConfigGroup composer( KMKernel::config(), "Composer" );
 
   composer.writeEntry( "crypto-warn-recv-not-in-cert", mWidget->warnReceiverNotInCertificateCB->isChecked() );
   composer.writeEntry( "crypto-warning-unencrypted", mWidget->warnUnencryptedCB->isChecked() );
@@ -4390,7 +4390,7 @@ void SecurityPage::SMimeTab::slotUpdateHTTPActions() {
   mWidget->customHTTPProxy->setEnabled( enableProxySettings );
 }
 
-void SecurityPage::SMimeTab::installProfile( KConfig * ) {
+void SecurityPage::SMimeTab::installProfile( TDEConfig * ) {
 }
 
 static void saveCheckBoxToKleoEntry( TQCheckBox* cb, Kleo::CryptoConfigEntry* entry ) {
@@ -4758,7 +4758,7 @@ void MiscPage::FolderTab::doLoadFromGlobalSettings() {
 }
 
 void MiscPage::FolderTab::doLoadOther() {
-  KConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
 
   mEmptyTrashCheck->setChecked( general.readBoolEntry( "empty-trash-on-exit", true ) );
   mOnStartupOpenFolder->setFolder( general.readEntry( "startupFolder",
@@ -4775,7 +4775,7 @@ void MiscPage::FolderTab::doLoadOther() {
 }
 
 void MiscPage::FolderTab::save() {
-  KConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
 
   general.writeEntry( "empty-trash-on-exit", mEmptyTrashCheck->isChecked() );
   general.writeEntry( "confirm-before-empty", mEmptyFolderConfirmCheck->isChecked() );
@@ -5076,7 +5076,7 @@ void MiscPage::GroupwareTab::doLoadFromGlobalSettings() {
 }
 
 void MiscPage::GroupwareTab::save() {
-  KConfigGroup groupware( KMKernel::config(), "Groupware" );
+  TDEConfigGroup groupware( KMKernel::config(), "Groupware" );
 
   // Write the groupware config
   if ( mEnableGwCB ) {