diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
tree | 7b7a01768b3781763186c825af21bb14717d2c32 /tdecore/kshortcutlist.cpp | |
parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kshortcutlist.cpp')
-rw-r--r-- | tdecore/kshortcutlist.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tdecore/kshortcutlist.cpp b/tdecore/kshortcutlist.cpp index 7c3fc67da..9666f7aab 100644 --- a/tdecore/kshortcutlist.cpp +++ b/tdecore/kshortcutlist.cpp @@ -72,7 +72,7 @@ bool KShortcutList::readSettings( const TQString& sConfigGroup, KConfigBase* pCo { kdDebug(125) << "KShortcutList::readSettings( \"" << sConfigGroup << "\", " << pConfig << " ) start" << endl; if( !pConfig ) - pConfig = KGlobal::config(); + pConfig = TDEGlobal::config(); TQString sGroup = (!sConfigGroup.isEmpty()) ? sConfigGroup : TQString("Shortcuts"); // If the config file still has the old group name: @@ -110,7 +110,7 @@ bool KShortcutList::writeSettings( const TQString &sConfigGroup, KConfigBase* pC { kdDebug(125) << "KShortcutList::writeSettings( " << sConfigGroup << ", " << pConfig << ", " << bWriteAll << ", " << bGlobal << " )" << endl; if( !pConfig ) - pConfig = KGlobal::config(); + pConfig = TDEGlobal::config(); TQString sGroup = (!sConfigGroup.isEmpty()) ? sConfigGroup : TQString("Shortcuts"); @@ -166,7 +166,7 @@ KAccelShortcutList::KAccelShortcutList( KAccel* pAccel ) d->m_configGroup=pAccel->configGroup(); } -KAccelShortcutList::KAccelShortcutList( KGlobalAccel* pAccel ) +KAccelShortcutList::KAccelShortcutList( TDEGlobalAccel* pAccel ) : m_actions( pAccel->actions() ) { d=new KAccelShortcutListPrivate; |