summaryrefslogtreecommitdiffstats
path: root/kcontrol/keys/keyconfig.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kcontrol/keys/keyconfig.cpp
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/keys/keyconfig.cpp')
-rw-r--r--kcontrol/keys/keyconfig.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index dc9d30954..539c67215 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -226,7 +226,7 @@ void KKeyModule::defaults()
/*void KKeyModule::slotRemove()
{
TQString kksPath =
- KGlobal::dirs()->saveLocation("data", "kcmkeys/" + KeyType);
+ TDEGlobal::dirs()->saveLocation("data", "kcmkeys/" + KeyType);
TQDir d( kksPath );
if (!d.exists()) // what can we do?
@@ -360,7 +360,7 @@ void KKeyModule::readScheme( int index )
TQT_SLOT( slotPreviewScheme( int ) ) );
- TQString kksPath = KGlobal::dirs()->saveLocation("data", "kcmkeys/");
+ TQString kksPath = TDEGlobal::dirs()->saveLocation("data", "kcmkeys/");
TQDir d( kksPath );
if ( !d.exists() )
@@ -426,7 +426,7 @@ void KKeyModule::readScheme( int index )
/*void KKeyModule::readSchemeNames( )
{
- TQStringList schemes = KGlobal::dirs()->findAllResources("data", "kcmkeys/" + KeyType + "/*.kksrc");
+ TQStringList schemes = TDEGlobal::dirs()->findAllResources("data", "kcmkeys/" + KeyType + "/*.kksrc");
//TQRegExp r( "-kde[34].kksrc$" );
TQRegExp r( "-trinity.kksrc$" );
@@ -472,11 +472,11 @@ void KKeyModule::init()
kdDebug(125) << "KKeyModule::init()\n";
/*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n";
- KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" );
- TQString fourMods = KGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
+ KConfigGroupSaver 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();
- KGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true );
+ TDEGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true );
*/
KAccelActions* keys = new KAccelActions();