1 files changed, 18 insertions, 18 deletions

diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index 90fa59f82..1cf193fde 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -20,8 +20,8 @@
 
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
-#include <ksimpleconfig.h>
+#include <tdestandarddirs.h>
+#include <tdesimpleconfig.h>
 #include <tdemessagebox.h>
 #include <kseparator.h>
 #include <dcopclient.h>
@@ -128,7 +128,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
   TQWhatsThis::add(addBt, i18n("Click here to add a new key bindings scheme. You will be prompted for a name."));
 
   removeBt = new TQPushButton(  i18n("&Remove Scheme"), this );
-  removeBt->setEnabled(FALSE);
+  removeBt->setEnabled(false);
   connect( removeBt, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemove() ) );
   TQWhatsThis::add( removeBt, i18n("Click here to remove the selected key bindings scheme. You can not"
     " remove the standard system wide schemes, 'Current scheme' and 'TDE default'.") );
@@ -206,12 +206,12 @@ void KKeyModule::load()
   kc->commitChanges();
   actions.writeActions( KeySet, 0, true, true );
   if ( KeyType == "global" ) {
-    if ( !kapp->dcopClient()->isAttached() )
-      kapp->dcopClient()->attach();
+    if ( !tdeApp->dcopClient()->isAttached() )
+      tdeApp->dcopClient()->attach();
     // TODO: create a reconfigureKeys() method.
-    kapp->dcopClient()->send("twin", "", "reconfigure()", "");
-    kapp->dcopClient()->send("kdesktop", "", "configure()", "");
-    kapp->dcopClient()->send("kicker", "Panel", "configure()", "");
+    tdeApp->dcopClient()->send("twin", "", "reconfigure()", "");
+    tdeApp->dcopClient()->send("kdesktop", "", "configure()", "");
+    tdeApp->dcopClient()->send("kicker", "Panel", "configure()", "");
   }
 }*/
 
@@ -258,7 +258,7 @@ void KKeyModule::slotKeyChange()
 
 /*void KKeyModule::slotSave( )
 {
-    KSimpleConfig config(*sFileList->at( sList->currentItem() ) );
+    TDESimpleConfig config(*sFileList->at( sList->currentItem() ) );
     //  global=true is necessary in order to
     //  let both 'Global Shortcuts' and 'Shortcut Sequences' be
     //  written to the same scheme file.
@@ -281,7 +281,7 @@ void KKeyModule::readScheme( int index )
   else {
     TDEConfigBase* config = 0;
     if( index == 0 )	config = new TDEConfig( "kdeglobals" );
-    //else		config = new KSimpleConfig( *sFileList->at( index ), true );
+    //else		config = new TDESimpleConfig( *sFileList->at( index ), true );
 
     actions.readActions( (index == 0) ? KeySet : KeyScheme, config );
     kc->listSync();
@@ -303,7 +303,7 @@ void KKeyModule::readScheme( int index )
 
   do {
 
-    nameValid = TRUE;
+    nameValid = true;
 
     if ( ss.exec() ) {
       sName = ss.nameLine->text();
@@ -354,7 +354,7 @@ void KKeyModule::readScheme( int index )
       }
     } else return;
 
-  } while ( nameValid == FALSE );
+  } while ( nameValid == false );
 
   disconnect( sList, TQ_SIGNAL( highlighted( int ) ), this,
               TQ_SLOT( slotPreviewScheme( int ) ) );
@@ -394,8 +394,8 @@ void KKeyModule::readScheme( int index )
      sList->setCurrentItem( exists );
   }
 
-  KSimpleConfig *config =
-    new KSimpleConfig( sFile );
+  TDESimpleConfig *config =
+    new TDESimpleConfig( sFile );
 
   config->setGroup( KeyScheme );
   config->writeEntry( "Name", sName );
@@ -418,9 +418,9 @@ void KKeyModule::readScheme( int index )
   if ( indx < nSysSchemes ||
        (*sFileList->at(indx)).contains( "/global-" ) ||
        (*sFileList->at(indx)).contains( "/app-" ) ) {
-    removeBt->setEnabled( FALSE );
+    removeBt->setEnabled( false );
   } else {
-    removeBt->setEnabled( TRUE );
+    removeBt->setEnabled( true );
   }
 }*/
 
@@ -449,7 +449,7 @@ void KKeyModule::readScheme( int index )
     //if( r.search( *it ) != -1 )
     //   continue;
 
-    KSimpleConfig config( *it, true );
+    TDESimpleConfig config( *it, true );
     // TODO: Put 'Name' in "Settings" group
     config.setGroup( KeyScheme );
     TQString str = config.readEntry( "Name" );
@@ -496,7 +496,7 @@ void KKeyModule::init()
   keys->readActions( "Global Keys" );
 
   {
-    KSimpleConfig cfg( "kdeglobals" );
+    TDESimpleConfig cfg( "kdeglobals" );
     cfg.deleteGroup( "Global Keys" );
   }