summaryrefslogtreecommitdiffstats
path: root/tdecore/tdeaccel.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tdecore/tdeaccel.cpp')
-rw-r--r--tdecore/tdeaccel.cpp56
1 files changed, 28 insertions, 28 deletions
diff --git a/tdecore/tdeaccel.cpp b/tdecore/tdeaccel.cpp
index 5430c2529..5796bf060 100644
--- a/tdecore/tdeaccel.cpp
+++ b/tdecore/tdeaccel.cpp
@@ -34,7 +34,7 @@
#include "tdeaccelprivate.h"
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
# include <X11/Xlib.h>
# ifdef KeyPress // needed for --enable-final
// defined by X11 headers
@@ -49,7 +49,7 @@
//---------------------------------------------------------------------
//
// In TDEAccelEventHandler::x11Event we do our own X11 keyboard event handling
-// This allows us to map the Win key to Qt::MetaButton, Qt does not know about
+// This allows us to map the Win key to TQt::MetaButton, Qt does not know about
// the Win key.
//
// TDEAccelEventHandler::x11Event will generate an AccelOverride event. The
@@ -95,7 +95,7 @@ class TDEAccelEventHandler : public TQWidget
private:
TDEAccelEventHandler();
-# ifdef Q_WS_X11
+# ifdef TQ_WS_X11
bool x11Event( XEvent* pEvent );
# endif
@@ -109,21 +109,21 @@ bool TDEAccelEventHandler::g_bAccelActivated = false;
TDEAccelEventHandler::TDEAccelEventHandler()
: TQWidget( 0, "TDEAccelEventHandler" )
{
-# ifdef Q_WS_X11
- if ( kapp )
- kapp->installX11EventFilter( TQT_TQWIDGET(this) );
+# ifdef TQ_WS_X11
+ if ( tdeApp )
+ tdeApp->installX11EventFilter( this );
# endif
}
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
bool tqt_try_modal( TQWidget *, XEvent * );
bool TDEAccelEventHandler::x11Event( XEvent* pEvent )
{
- if( TQWidget::keyboardGrabber() || !kapp->focusWidget() )
+ if( TQWidget::keyboardGrabber() || !tdeApp->focusWidget() )
return false;
- if ( !tqt_try_modal(kapp->focusWidget(), pEvent) )
+ if ( !tqt_try_modal(tdeApp->focusWidget(), pEvent) )
return false;
if( pEvent->type == XKeyPress ) {
@@ -144,7 +144,7 @@ bool TDEAccelEventHandler::x11Event( XEvent* pEvent )
ke.ignore();
g_bAccelActivated = false;
- kapp->sendEvent( kapp->focusWidget(), &ke );
+ tdeApp->sendEvent( tdeApp->focusWidget(), &ke );
// If the Override event was accepted from a non-TDEAccel widget,
// then kill the next AccelOverride in TDEApplication::notify.
@@ -157,7 +157,7 @@ bool TDEAccelEventHandler::x11Event( XEvent* pEvent )
return false;
}
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
//---------------------------------------------------------------------
// TDEAccelPrivate
@@ -170,9 +170,9 @@ TDEAccelPrivate::TDEAccelPrivate( TDEAccel* pParent, TQWidget* pWatch )
m_pAccel = pParent;
m_pWatch = pWatch;
m_bAutoUpdate = true;
- connect( (TQAccel*)m_pAccel, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotKeyPressed(int)) );
+ connect( (TQAccel*)m_pAccel, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotKeyPressed(int)) );
-#ifdef Q_WS_X11 //only makes sense if TDEAccelEventHandler is working
+#ifdef TQ_WS_X11 //only makes sense if TDEAccelEventHandler is working
if( m_pWatch )
m_pWatch->installEventFilter( this );
#endif
@@ -237,10 +237,10 @@ bool TDEAccelPrivate::connectKey( TDEAccelAction& action, const KKeyServer::Key&
m_mapIDToKey[nID] = keyQt;
if( action.objSlotPtr() && action.methodSlotPtr() ) {
-#ifdef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
+#ifdef TQ_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
((TQAccel*)m_pAccel)->connectItem( nID, action.objSlotPtr(), action.methodSlotPtr() );
#else
- ((TQAccel*)m_pAccel)->connectItem( nID, this, TQT_SLOT(slotKeyPressed(int)));
+ ((TQAccel*)m_pAccel)->connectItem( nID, this, TQ_SLOT(slotKeyPressed(int)));
#endif
if( !action.isEnabled() )
((TQAccel*)m_pAccel)->setItemEnabled( nID, false );
@@ -318,9 +318,9 @@ void TDEAccelPrivate::slotKeyPressed( int id )
int iAction = pMenu->idAt(1);
slotMenuActivated( iAction );
} else {
- connect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuActivated(int)) );
+ connect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuActivated(int)) );
pMenu->exec( m_pWatch->mapToGlobal( TQPoint( 0, 0 ) ) );
- disconnect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuActivated(int)) );
+ disconnect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuActivated(int)) );
}
delete pMenu;
}
@@ -334,11 +334,11 @@ void TDEAccelPrivate::slotMenuActivated( int iAction )
{
kdDebug(125) << "TDEAccelPrivate::slotMenuActivated( " << iAction << " )" << endl;
TDEAccelAction* pAction = actions().actionPtr( iAction );
-#ifdef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
+#ifdef TQ_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
if( pAction ) {
- connect( this, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
+ connect( this, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
emit menuItemActivated();
- disconnect( this, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
+ disconnect( this, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
}
#else
emitActivatedSignal( pAction );
@@ -362,12 +362,12 @@ bool TDEAccelPrivate::eventFilter( TQObject* /*pWatched*/, TQEvent* pEvent )
TDEAccelAction* pAction = m_mapIDToAction[nID];
if( !pAction->isEnabled() )
continue;
-#ifdef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
+#ifdef TQ_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
TQGuardedPtr<TDEAccelPrivate> me = this;
- connect( this, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
+ connect( this, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
emit menuItemActivated();
if (me) {
- disconnect( me, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
+ disconnect( me, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
}
#else
emitActivatedSignal( pAction );
@@ -384,25 +384,25 @@ bool TDEAccelPrivate::eventFilter( TQObject* /*pWatched*/, TQEvent* pEvent )
return false;
}
-#ifndef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
+#ifndef TQ_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
void TDEAccelPrivate::emitActivatedSignal( TDEAccelAction* pAction )
{
if( pAction ) {
TQGuardedPtr<TDEAccelPrivate> me = this;
TQRegExp reg( "([ ]*TDEAccelAction.*)" );
if( reg.search( pAction->methodSlotPtr()) >= 0 ) {
- connect( this, TQT_SIGNAL(menuItemActivated(TDEAccelAction*)),
+ connect( this, TQ_SIGNAL(menuItemActivated(TDEAccelAction*)),
pAction->objSlotPtr(), pAction->methodSlotPtr() );
emit menuItemActivated( pAction );
if (me)
- disconnect( me, TQT_SIGNAL(menuItemActivated(TDEAccelAction*)),
+ disconnect( me, TQ_SIGNAL(menuItemActivated(TDEAccelAction*)),
pAction->objSlotPtr(), pAction->methodSlotPtr() );
} else {
- connect( this, TQT_SIGNAL(menuItemActivated()),
+ connect( this, TQ_SIGNAL(menuItemActivated()),
pAction->objSlotPtr(), pAction->methodSlotPtr() );
emit menuItemActivated();
if (me)
- disconnect( me, TQT_SIGNAL(menuItemActivated()),
+ disconnect( me, TQ_SIGNAL(menuItemActivated()),
pAction->objSlotPtr(), pAction->methodSlotPtr() );
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-26 13:39:59 +0000