diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-27 02:13:42 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-27 02:13:42 -0600 |
commit | 520c05ef06ce203ad32470730f68402bc7719157 (patch) | |
tree | 8d0bb18bbbecb4c837e232848905e5819db84b81 /src/widgets/qpopupmenu.cpp | |
parent | b82553bf90cb5311cfe8e673b07cf6cffc95fd3c (diff) | |
download | tqt3-520c05ef06ce203ad32470730f68402bc7719157.tar.gz tqt3-520c05ef06ce203ad32470730f68402bc7719157.zip |
Automated update from qt3
Diffstat (limited to 'src/widgets/qpopupmenu.cpp')
-rw-r--r-- | src/widgets/qpopupmenu.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp index ed9aa45c8..f6858c25e 100644 --- a/src/widgets/qpopupmenu.cpp +++ b/src/widgets/qpopupmenu.cpp @@ -111,7 +111,7 @@ static void cleanup() static void popupSubMenuLater( int msec, TQPopupMenu * receiver ) { if ( !singleSingleShot ) { - singleSingleShot = new TQTimer( qApp, "popup submenu timer" ); + singleSingleShot = new TQTimer( tqApp, "popup submenu timer" ); qAddPostRoutine( cleanup ); } @@ -314,8 +314,8 @@ TQPopupMenu::TQPopupMenu( TQWidget *parent, const char *name ) TQPopupMenu::~TQPopupMenu() { - if ( syncMenu == this && qApp ) { - qApp->exit_loop(); + if ( syncMenu == this && tqApp ) { + tqApp->exit_loop(); syncMenu = 0; } @@ -558,7 +558,7 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint ) int h = height(); if ( snapToMouse ) { - if ( qApp->reverseLayout() ) + if ( tqApp->reverseLayout() ) x -= w; if ( x+w > sx+sw ) x = mouse.x()-w; @@ -587,7 +587,7 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint ) if( parent == NULL ) parent = TQApplication::widgetAt( pos ); if( parent == NULL ) - parent = qApp->activeWindow(); + parent = tqApp->activeWindow(); if( parent != NULL ) x11SetWindowTransient( parent ); } @@ -649,9 +649,9 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint ) actItem = -1; #ifndef QT_NO_EFFECTS - int hGuess = qApp->reverseLayout() ? TQEffects::LeftScroll : TQEffects::RightScroll; + int hGuess = tqApp->reverseLayout() ? TQEffects::LeftScroll : TQEffects::RightScroll; int vGuess = TQEffects::DownScroll; - if ( qApp->reverseLayout() ) { + if ( tqApp->reverseLayout() ) { if ( snapToMouse && ( x + w/2 > mouse.x() ) || ( parentMenu && parentMenu->isPopupMenu && ( x + w/2 > ((TQPopupMenu*)parentMenu)->x() ) ) ) @@ -1403,8 +1403,8 @@ void TQPopupMenu::show() void TQPopupMenu::hide() { - if ( syncMenu == this && qApp ) { - qApp->exit_loop(); + if ( syncMenu == this && tqApp ) { + tqApp->exit_loop(); syncMenu = 0; } @@ -2200,7 +2200,7 @@ void TQPopupMenu::keyPressEvent( TQKeyEvent *e ) #ifdef Q_OS_WIN32 if ( !ok_key && !( e->key() == Key_Control || e->key() == Key_Shift || e->key() == Key_Meta ) ) - qApp->beep(); + tqApp->beep(); #endif // Q_OS_WIN32 } @@ -2480,7 +2480,7 @@ void TQPopupMenu::updateRow( int row ) int TQPopupMenu::exec( const TQPoint & pos, int indexAtPoint ) { snapToMouse = TRUE; - if ( !qApp ) + if ( !tqApp ) return -1; TQPopupMenu* priorSyncMenu = syncMenu; @@ -2491,7 +2491,7 @@ int TQPopupMenu::exec( const TQPoint & pos, int indexAtPoint ) TQGuardedPtr<TQPopupMenu> that = this; connectModal( that, TRUE ); popup( pos, indexAtPoint ); - qApp->enter_loop(); + tqApp->enter_loop(); connectModal( that, FALSE ); syncMenu = priorSyncMenu; |