diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
| commit | 10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch) | |
| tree | 4bc444c00a79e88105f2cfce5b6209994c413ca0 /kdecore/kaccelaction.cpp | |
| parent | 307136d8eef0ba133b78ceee8e901138d4c996a1 (diff) | |
| download | tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip | |
Revert automated changes
Sorry guys, they are just not ready for prime time
Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdecore/kaccelaction.cpp')
| -rw-r--r-- | kdecore/kaccelaction.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kdecore/kaccelaction.cpp b/kdecore/kaccelaction.cpp index b7ea84ca5..856bbefdc 100644 --- a/kdecore/kaccelaction.cpp +++ b/kdecore/kaccelaction.cpp @@ -177,9 +177,9 @@ void KAccelAction::clearShortcut() m_cut.clear(); } -bool KAccelAction::tqcontains( const KKeySequence& seq ) +bool KAccelAction::contains( const KKeySequence& seq ) { - return m_cut.tqcontains( seq ); + return m_cut.contains( seq ); for( uint i = 0; i < m_cut.count(); i++ ) { if( m_cut.seq(i) == seq ) return true; @@ -217,7 +217,7 @@ void KAccelAction::useFourModifierKeys( bool b ) // If we're 'turning off' the meta key or, if we're turning it on, // the keyboard must actually have a meta key. if( b && !KKeyNative::keyboardHasWinKey() ) - kdDebug(125) << "Tried to use four modifier keys on a keyboard tqlayout without a Meta key.\n"; + 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); @@ -409,7 +409,7 @@ KAccelAction* KAccelActions::actionPtr( KKeySequence cut ) for( uint i = 0; i < m_nSize; i++ ) { if( m_prgActions[i] == 0 ) kdWarning(125) << "KAccelActions::actionPtr( " << cut.toStringInternal() << " ): encountered null pointer at m_prgActions[" << i << "]" << endl; - else if( m_prgActions[i]->tqcontains( cut ) ) + else if( m_prgActions[i]->contains( cut ) ) return m_prgActions[i]; } return 0; @@ -495,7 +495,7 @@ bool KAccelActions::readActions( const TQString& sConfigGroup, KConfigBase* pCon 1) KAccelSequence = "Meta+X" 1) KKeySequence = Meta+X 2) KAccelSequence = "Asterisk" - 1) KKeySequence = Shift+8 (English tqlayout) + 1) KKeySequence = Shift+8 (English layout) 2) KKeySequence = Keypad_Asterisk 2) KKeySequence = "Alt+F2" 1) KAccelSequence = "Alt+F2" |