diff options
Diffstat (limited to 'src/widgets/qmenubar.cpp')
| -rw-r--r-- | src/widgets/qmenubar.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/widgets/qmenubar.cpp b/src/widgets/qmenubar.cpp index d832bcc40..c0051ef6e 100644 --- a/src/widgets/qmenubar.cpp +++ b/src/widgets/qmenubar.cpp @@ -375,7 +375,7 @@ void TQMenuBar::menuContentsChanged() return; pendingDelayedContentsChanges = 1; if( !pendingDelayedStateChanges )// if the timer hasn't been started yet - TQTimer::singleShot( 0, this, SLOT(performDelayedChanges())); + TQTimer::singleShot( 0, this, TQ_SLOT(performDelayedChanges())); } void TQMenuBar::performDelayedContentsChanged() @@ -418,7 +418,7 @@ void TQMenuBar::menuStateChanged() return; pendingDelayedStateChanges = 1; if( !pendingDelayedContentsChanges ) // if the timer hasn't been started yet - TQTimer::singleShot( 0, this, SLOT(performDelayedChanges())); + TQTimer::singleShot( 0, this, TQ_SLOT(performDelayedChanges())); } void TQMenuBar::performDelayedStateChanged() @@ -467,20 +467,20 @@ void TQMenuBar::performDelayedChanges() void TQMenuBar::menuInsPopup( TQPopupMenu *popup ) { - connect( popup, SIGNAL(activatedRedirect(int)), - SLOT(subActivated(int)) ); - connect( popup, SIGNAL(highlightedRedirect(int)), - SLOT(subHighlighted(int)) ); - connect( popup, SIGNAL(destroyed(TQObject*)), - this, SLOT(popupDestroyed(TQObject*)) ); + connect( popup, TQ_SIGNAL(activatedRedirect(int)), + TQ_SLOT(subActivated(int)) ); + connect( popup, TQ_SIGNAL(highlightedRedirect(int)), + TQ_SLOT(subHighlighted(int)) ); + connect( popup, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(popupDestroyed(TQObject*)) ); } void TQMenuBar::menuDelPopup( TQPopupMenu *popup ) { - popup->disconnect( SIGNAL(activatedRedirect(int)) ); - popup->disconnect( SIGNAL(highlightedRedirect(int)) ); - disconnect( popup, SIGNAL(destroyed(TQObject*)), - this, SLOT(popupDestroyed(TQObject*)) ); + popup->disconnect( TQ_SIGNAL(activatedRedirect(int)) ); + popup->disconnect( TQ_SIGNAL(highlightedRedirect(int)) ); + disconnect( popup, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(popupDestroyed(TQObject*)) ); } void TQMenuBar::frameChanged() @@ -1547,12 +1547,12 @@ void TQMenuBar::setupAccelerators() autoaccel = new TQAccel( this ); TQ_CHECK_PTR( autoaccel ); autoaccel->setIgnoreWhatsThis( TRUE ); - connect( autoaccel, SIGNAL(activated(int)), - SLOT(accelActivated(int)) ); - connect( autoaccel, SIGNAL(activatedAmbiguously(int)), - SLOT(accelActivated(int)) ); - connect( autoaccel, SIGNAL(destroyed()), - SLOT(accelDestroyed()) ); + connect( autoaccel, TQ_SIGNAL(activated(int)), + TQ_SLOT(accelActivated(int)) ); + connect( autoaccel, TQ_SIGNAL(activatedAmbiguously(int)), + TQ_SLOT(accelActivated(int)) ); + connect( autoaccel, TQ_SIGNAL(destroyed()), + TQ_SLOT(accelDestroyed()) ); } autoaccel->insertItem( i, mi->id() ); } |