From 28edc0aa2ab09297288186f5bc15765eb7be58c0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:47:22 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- tdecore/kglobalaccel_x11.cpp | 50 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'tdecore/kglobalaccel_x11.cpp') diff --git a/tdecore/kglobalaccel_x11.cpp b/tdecore/kglobalaccel_x11.cpp index 260bc39e1..701c954f3 100644 --- a/tdecore/kglobalaccel_x11.cpp +++ b/tdecore/kglobalaccel_x11.cpp @@ -77,23 +77,23 @@ static void calculateGrabMasks() //---------------------------------------------------- -static TQValueList< KGlobalAccelPrivate* >* all_accels = 0; +static TQValueList< TDEGlobalAccelPrivate* >* all_accels = 0; -KGlobalAccelPrivate::KGlobalAccelPrivate() +TDEGlobalAccelPrivate::TDEGlobalAccelPrivate() : KAccelBase( KAccelBase::NATIVE_KEYS ) , m_blocked( false ) , m_blockingDisabled( false ) , m_suspended( false ) { if( all_accels == NULL ) - all_accels = new TQValueList< KGlobalAccelPrivate* >; + all_accels = new TQValueList< TDEGlobalAccelPrivate* >; all_accels->append( this ); m_sConfigGroup = "Global Shortcuts"; kapp->installX11EventFilter( this ); connect(kapp, TQT_SIGNAL(coreFakeKeyPress(unsigned int)), this, TQT_SLOT(fakeKeyPressed(unsigned int))); } -KGlobalAccelPrivate::~KGlobalAccelPrivate() +TDEGlobalAccelPrivate::~TDEGlobalAccelPrivate() { // TODO: Need to release all grabbed keys if the main window is not shutting down. //for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) { @@ -106,17 +106,17 @@ KGlobalAccelPrivate::~KGlobalAccelPrivate() } } -void KGlobalAccelPrivate::setEnabled( bool bEnable ) +void TDEGlobalAccelPrivate::setEnabled( bool bEnable ) { m_bEnabled = bEnable; updateConnections(); } -void KGlobalAccelPrivate::blockShortcuts( bool block ) +void TDEGlobalAccelPrivate::blockShortcuts( bool block ) { if( all_accels == NULL ) return; - for( TQValueList< KGlobalAccelPrivate* >::ConstIterator it = all_accels->begin(); + for( TQValueList< TDEGlobalAccelPrivate* >::ConstIterator it = all_accels->begin(); it != all_accels->end(); ++it ) { if( (*it)->m_blockingDisabled ) @@ -126,41 +126,41 @@ void KGlobalAccelPrivate::blockShortcuts( bool block ) } } -void KGlobalAccelPrivate::disableBlocking( bool block ) +void TDEGlobalAccelPrivate::disableBlocking( bool block ) { m_blockingDisabled = block; } -bool KGlobalAccelPrivate::isEnabledInternal() const +bool TDEGlobalAccelPrivate::isEnabledInternal() const { return KAccelBase::isEnabled() && !m_blocked; } // see #117169 - the bug is hard to reproduce, probably somewhere in X, testcase would be probably // difficult to make, and so on - just don't release the grabs and only ignore the events instead -void KGlobalAccelPrivate::suspend( bool s ) +void TDEGlobalAccelPrivate::suspend( bool s ) { m_suspended = s; } -bool KGlobalAccelPrivate::emitSignal( Signal ) +bool TDEGlobalAccelPrivate::emitSignal( Signal ) { return false; } -bool KGlobalAccelPrivate::connectKey( KAccelAction& action, const KKeyServer::Key& key ) +bool TDEGlobalAccelPrivate::connectKey( KAccelAction& action, const KKeyServer::Key& key ) { return grabKey( key, true, &action ); } -bool KGlobalAccelPrivate::connectKey( const KKeyServer::Key& key ) +bool TDEGlobalAccelPrivate::connectKey( const KKeyServer::Key& key ) { return grabKey( key, true, 0 ); } -bool KGlobalAccelPrivate::disconnectKey( KAccelAction& action, const KKeyServer::Key& key ) +bool TDEGlobalAccelPrivate::disconnectKey( KAccelAction& action, const KKeyServer::Key& key ) { return grabKey( key, false, &action ); } -bool KGlobalAccelPrivate::disconnectKey( const KKeyServer::Key& key ) +bool TDEGlobalAccelPrivate::disconnectKey( const KKeyServer::Key& key ) { return grabKey( key, false, 0 ); } -bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAccelAction* pAction ) +bool TDEGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAccelAction* pAction ) { if( !key.code() ) { - kdWarning(125) << "KGlobalAccelPrivate::grabKey( " << key.key().toStringInternal() << ", " << bGrab << ", \"" << (pAction ? pAction->name().latin1() : "(null)") << "\" ): Tried to grab key with null code." << endl; + kdWarning(125) << "TDEGlobalAccelPrivate::grabKey( " << key.key().toStringInternal() << ", " << bGrab << ", \"" << (pAction ? pAction->name().latin1() : "(null)") << "\" ): Tried to grab key with null code." << endl; return false; } @@ -245,7 +245,7 @@ bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAcce return !failed; } -bool KGlobalAccelPrivate::x11Event( XEvent* pEvent ) +bool TDEGlobalAccelPrivate::x11Event( XEvent* pEvent ) { //kdDebug(125) << "x11EventFilter( type = " << pEvent->type << " )" << endl; switch( pEvent->type ) { @@ -261,9 +261,9 @@ bool KGlobalAccelPrivate::x11Event( XEvent* pEvent ) } } -void KGlobalAccelPrivate::x11MappingNotify() +void TDEGlobalAccelPrivate::x11MappingNotify() { - kdDebug(125) << "KGlobalAccelPrivate::x11MappingNotify()" << endl; + kdDebug(125) << "TDEGlobalAccelPrivate::x11MappingNotify()" << endl; // Maybe the X modifier map has been changed. KKeyServer::initializeMods(); calculateGrabMasks(); @@ -271,7 +271,7 @@ void KGlobalAccelPrivate::x11MappingNotify() updateConnections(); } -void KGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) { +void TDEGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) { CodeMod codemod; codemod.code = keyCode; codemod.mod = 0; @@ -314,7 +314,7 @@ void KGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) { activate( pAction, KKeySequence(key) ); } -bool KGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) +bool TDEGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) { // do not change this line unless you really really know what you are doing (Matthias) if ( !TQWidget::keyboardGrabber() && !TQApplication::activePopupWidget() ) { @@ -394,9 +394,9 @@ bool KGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) return true; } -void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& seq ) +void TDEGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& seq ) { - kdDebug(125) << "KGlobalAccelPrivate::activate( \"" << pAction->name() << "\" ) " << endl; + kdDebug(125) << "TDEGlobalAccelPrivate::activate( \"" << pAction->name() << "\" ) " << endl; TQRegExp rexPassIndex( "([ ]*int[ ]*)" ); TQRegExp rexPassInfo( " TQString" ); @@ -430,7 +430,7 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s } } -void KGlobalAccelPrivate::slotActivated( int iAction ) +void TDEGlobalAccelPrivate::slotActivated( int iAction ) { KAccelAction* pAction = KAccelBase::actions().actionPtr( iAction ); if( pAction ) -- cgit v1.2.1