diff options
Diffstat (limited to 'tdecore/kglobalaccel_x11.cpp')
| -rw-r--r-- | tdecore/kglobalaccel_x11.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tdecore/kglobalaccel_x11.cpp b/tdecore/kglobalaccel_x11.cpp index 701c954f3..64af90572 100644 --- a/tdecore/kglobalaccel_x11.cpp +++ b/tdecore/kglobalaccel_x11.cpp @@ -80,7 +80,7 @@ static void calculateGrabMasks() static TQValueList< TDEGlobalAccelPrivate* >* all_accels = 0; TDEGlobalAccelPrivate::TDEGlobalAccelPrivate() -: KAccelBase( KAccelBase::NATIVE_KEYS ) +: TDEAccelBase( TDEAccelBase::NATIVE_KEYS ) , m_blocked( false ) , m_blockingDisabled( false ) , m_suspended( false ) @@ -133,7 +133,7 @@ void TDEGlobalAccelPrivate::disableBlocking( bool block ) bool TDEGlobalAccelPrivate::isEnabledInternal() const { - return KAccelBase::isEnabled() && !m_blocked; + return TDEAccelBase::isEnabled() && !m_blocked; } // see #117169 - the bug is hard to reproduce, probably somewhere in X, testcase would be probably @@ -148,16 +148,16 @@ bool TDEGlobalAccelPrivate::emitSignal( Signal ) return false; } -bool TDEGlobalAccelPrivate::connectKey( KAccelAction& action, const KKeyServer::Key& key ) +bool TDEGlobalAccelPrivate::connectKey( TDEAccelAction& action, const KKeyServer::Key& key ) { return grabKey( key, true, &action ); } bool TDEGlobalAccelPrivate::connectKey( const KKeyServer::Key& key ) { return grabKey( key, true, 0 ); } -bool TDEGlobalAccelPrivate::disconnectKey( KAccelAction& action, const KKeyServer::Key& key ) +bool TDEGlobalAccelPrivate::disconnectKey( TDEAccelAction& action, const KKeyServer::Key& key ) { return grabKey( key, false, &action ); } bool TDEGlobalAccelPrivate::disconnectKey( const KKeyServer::Key& key ) { return grabKey( key, false, 0 ); } -bool TDEGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAccelAction* pAction ) +bool TDEGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, TDEAccelAction* pAction ) { if( !key.code() ) { kdWarning(125) << "TDEGlobalAccelPrivate::grabKey( " << key.key().toStringInternal() << ", " << bGrab << ", \"" << (pAction ? pAction->name().latin1() : "(null)") << "\" ): Tried to grab key with null code." << endl; @@ -286,7 +286,7 @@ void TDEGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) { if( !m_rgCodeModToAction.contains( codemod ) ) { #ifndef NDEBUG for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) { - KAccelAction* pAction = *it; + TDEAccelAction* pAction = *it; kdDebug(125) << "\tcode: " << TQString::number(it.key().code, 16) << " mod: " << TQString::number(it.key().mod, 16) << (pAction ? TQString(" name: \"%1\" shortcut: %2").arg(pAction->name()).arg(pAction->shortcut().toStringInternal()) : TQString()) << endl; @@ -295,7 +295,7 @@ void TDEGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) { return; } - KAccelAction* pAction = m_rgCodeModToAction[codemod]; + TDEAccelAction* pAction = m_rgCodeModToAction[codemod]; if( !pAction ) { static bool recursion_block = false; @@ -364,7 +364,7 @@ bool TDEGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) if( !m_rgCodeModToAction.contains( codemod ) ) { #ifndef NDEBUG for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) { - KAccelAction* pAction = *it; + TDEAccelAction* pAction = *it; kdDebug(125) << "\tcode: " << TQString::number(it.key().code, 16) << " mod: " << TQString::number(it.key().mod, 16) << (pAction ? TQString(" name: \"%1\" shortcut: %2").arg(pAction->name()).arg(pAction->shortcut().toStringInternal()) : TQString()) << endl; @@ -373,7 +373,7 @@ bool TDEGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) return false; } - KAccelAction* pAction = m_rgCodeModToAction[codemod]; + TDEAccelAction* pAction = m_rgCodeModToAction[codemod]; if( !pAction ) { static bool recursion_block = false; @@ -394,7 +394,7 @@ bool TDEGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) return true; } -void TDEGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& seq ) +void TDEGlobalAccelPrivate::activate( TDEAccelAction* pAction, const KKeySequence& seq ) { kdDebug(125) << "TDEGlobalAccelPrivate::activate( \"" << pAction->name() << "\" ) " << endl; @@ -432,7 +432,7 @@ void TDEGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& void TDEGlobalAccelPrivate::slotActivated( int iAction ) { - KAccelAction* pAction = KAccelBase::actions().actionPtr( iAction ); + TDEAccelAction* pAction = TDEAccelBase::actions().actionPtr( iAction ); if( pAction ) activate( pAction, KKeySequence() ); } |