From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:43:14 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kcontrol/keys/shortcuts.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'kcontrol/keys/shortcuts.cpp') diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp index 265f25564..3dac9dcf7 100644 --- a/kcontrol/keys/shortcuts.cpp +++ b/kcontrol/keys/shortcuts.cpp @@ -69,10 +69,10 @@ void ShortcutsModule::save() // FIXME: This isn't working. Why? -- ellis, 2002/01/27 // Check for old group, - if( KGlobal::config()->hasGroup( "Keys" ) ) { - KGlobal::config()->deleteGroup( "Keys", true, true ); + if( TDEGlobal::config()->hasGroup( "Keys" ) ) { + TDEGlobal::config()->deleteGroup( "Keys", true, true ); } - KGlobal::config()->sync(); + TDEGlobal::config()->sync(); m_pkcGeneral->commitChanges(); m_pkcSequence->commitChanges(); @@ -104,7 +104,7 @@ TQString ShortcutsModule::quickHelp() const void ShortcutsModule::initGUI() { - TQString kde_winkeys_env_dir = KGlobal::dirs()->localtdedir() + "/env/"; + TQString kde_winkeys_env_dir = TDEGlobal::dirs()->localtdedir() + "/env/"; kdDebug(125) << "A-----------" << endl; KAccelActions* keys = &m_actionsGeneral; @@ -264,7 +264,7 @@ void ShortcutsModule::createActionsSequence() void ShortcutsModule::readSchemeNames() { - TQStringList schemes = KGlobal::dirs()->findAllResources("data", "kcmkeys/*.kksrc"); + TQStringList schemes = TDEGlobal::dirs()->findAllResources("data", "kcmkeys/*.kksrc"); m_pcbSchemes->clear(); m_rgsSchemeFiles.clear(); @@ -406,7 +406,7 @@ void ShortcutsModule::slotSaveSchemeAs() disconnect( m_pcbSchemes, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSelectScheme(int)) ); - TQString kksPath = KGlobal::dirs()->saveLocation( "data", "kcmkeys/" ); + TQString kksPath = TDEGlobal::dirs()->saveLocation( "data", "kcmkeys/" ); TQDir dir( kksPath ); if( !dir.exists() && !dir.mkdir( kksPath ) ) { @@ -458,7 +458,7 @@ void ShortcutsModule::slotRemoveScheme() void ShortcutsModule::slotUseRmWinKeysClicked() { - TQString kde_winkeys_env_dir = KGlobal::dirs()->localtdedir() + "/env/"; + TQString kde_winkeys_env_dir = TDEGlobal::dirs()->localtdedir() + "/env/"; // See if ~/.trinity/env/win-key.sh exists TQFile f( kde_winkeys_env_dir + "win-key.sh" ); -- cgit v1.2.1