summaryrefslogtreecommitdiffstats
path: root/kcontrol/keys/keyconfig.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/keys/keyconfig.cpp
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/keys/keyconfig.cpp')
-rw-r--r--kcontrol/keys/keyconfig.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index 539c67215..88f3aabe0 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -179,7 +179,7 @@ KKeyModule::~KKeyModule (){
delete sFileList;
}
-bool KKeyModule::writeSettings( const TQString& sGroup, KConfig* pConfig )
+bool KKeyModule::writeSettings( const TQString& sGroup, TDEConfig* pConfig )
{
kc->commitChanges();
actions.writeActions( sGroup, pConfig, true, false );
@@ -279,8 +279,8 @@ void KKeyModule::readScheme( int index )
//else if( index == 2 )
// kc->allDefault( true );
else {
- KConfigBase* config = 0;
- if( index == 0 ) config = new KConfig( "kdeglobals" );
+ TDEConfigBase* config = 0;
+ if( index == 0 ) config = new TDEConfig( "kdeglobals" );
//else config = new KSimpleConfig( *sFileList->at( index ), true );
actions.readActions( (index == 0) ? KeySet : KeyScheme, config );
@@ -472,7 +472,7 @@ void KKeyModule::init()
kdDebug(125) << "KKeyModule::init()\n";
/*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n";
- KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
+ TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
KAccel::useFourModifierKeys( fourMods == "true" );
bool bUseFourModifierKeys = KAccel::useFourModifierKeys();