summaryrefslogtreecommitdiffstats
path: root/tdecore/kaccelaction.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:22 -0600
commit28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch)
tree7b7a01768b3781763186c825af21bb14717d2c32 /tdecore/kaccelaction.cpp
parent07c48c43ff72c237e4028154f4594102b798073f (diff)
downloadtdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz
tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kaccelaction.cpp')
-rw-r--r--tdecore/kaccelaction.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tdecore/kaccelaction.cpp b/tdecore/kaccelaction.cpp
index 856bbefdc..0dc320a84 100644
--- a/tdecore/kaccelaction.cpp
+++ b/tdecore/kaccelaction.cpp
@@ -203,8 +203,8 @@ bool KAccelAction::useFourModifierKeys()
{
if( KAccelAction::g_bUseFourModifierKeys == -1 ) {
// Read in whether to use 4 modifier keys
- KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" );
- bool b = KGlobal::config()->readBoolEntry( "Use Four Modifier Keys", false );
+ KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
+ bool b = TDEGlobal::config()->readBoolEntry( "Use Four Modifier Keys", false );
KAccelAction::g_bUseFourModifierKeys = b && KKeyNative::keyboardHasWinKey();
}
return KAccelAction::g_bUseFourModifierKeys == 1;
@@ -219,8 +219,8 @@ void KAccelAction::useFourModifierKeys( bool b )
if( b && !KKeyNative::keyboardHasWinKey() )
kdDebug(125) << "Tried to use four modifier keys on a keyboard layout without a Meta key.\n";
}
- KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" );
- KGlobal::config()->writeEntry( "Use Four Modifier Keys", KAccelAction::g_bUseFourModifierKeys, true, true);
+ KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
+ TDEGlobal::config()->writeEntry( "Use Four Modifier Keys", KAccelAction::g_bUseFourModifierKeys, true, true);
kdDebug(125) << "bUseFourModifierKeys = " << KAccelAction::g_bUseFourModifierKeys << endl;
}
@@ -507,7 +507,7 @@ bool KAccelActions::writeActions( const TQString &sGroup, KConfigBase* pConfig,
{
kdDebug(125) << "KAccelActions::writeActions( " << sGroup << ", " << pConfig << ", " << bWriteAll << ", " << bGlobal << " )" << endl;
if( !pConfig )
- pConfig = KGlobal::config();
+ pConfig = TDEGlobal::config();
KConfigGroupSaver cs( pConfig, sGroup );
for( uint i = 0; i < m_nSize; i++ ) {