summaryrefslogtreecommitdiffstats
path: root/src/widgets/qmenubar.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-02-27 02:13:42 -0600
committerTimothy Pearson <[email protected]>2012-02-27 02:13:42 -0600
commit520c05ef06ce203ad32470730f68402bc7719157 (patch)
tree8d0bb18bbbecb4c837e232848905e5819db84b81 /src/widgets/qmenubar.cpp
parentb82553bf90cb5311cfe8e673b07cf6cffc95fd3c (diff)
downloadtqt3-520c05ef06ce203ad32470730f68402bc7719157.tar.gz
tqt3-520c05ef06ce203ad32470730f68402bc7719157.zip
Automated update from qt3
Diffstat (limited to 'src/widgets/qmenubar.cpp')
-rw-r--r--src/widgets/qmenubar.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/qmenubar.cpp b/src/widgets/qmenubar.cpp
index d1fde81c2..ed592df6a 100644
--- a/src/widgets/qmenubar.cpp
+++ b/src/widgets/qmenubar.cpp
@@ -594,7 +594,7 @@ bool TQMenuBar::eventFilter( TQObject *object, TQEvent *event )
waitforalt = 0;
}
// ### ! block all accelerator events when the menu bar is active
- if ( qApp && qApp->focusWidget() == this ) {
+ if ( tqApp && tqApp->focusWidget() == this ) {
return TRUE;
}
@@ -1504,13 +1504,13 @@ void TQMenuBar::setAltMode( bool enable )
actItemDown = FALSE;
if ( enable ) {
if ( !TQMenuData::d->aWidget )
- TQMenuData::d->aWidget = qApp->focusWidget();
+ TQMenuData::d->aWidget = tqApp->focusWidget();
setFocus();
updateItem( idAt( actItem ) );
} else {
// set the focus back to the previous widget if
// we still have the focus.
- if ( qApp->focusWidget() == this ) {
+ if ( tqApp->focusWidget() == this ) {
if ( TQMenuData::d->aWidget )
TQMenuData::d->aWidget->setFocus();
else