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 | |
parent | b82553bf90cb5311cfe8e673b07cf6cffc95fd3c (diff) | |
download | tqt3-520c05ef06ce203ad32470730f68402bc7719157.tar.gz tqt3-520c05ef06ce203ad32470730f68402bc7719157.zip |
Automated update from qt3
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/qbuttongroup.cpp | 2 | ||||
-rw-r--r-- | src/widgets/qcheckbox.cpp | 2 | ||||
-rw-r--r-- | src/widgets/qcombobox.cpp | 2 | ||||
-rw-r--r-- | src/widgets/qdatetimeedit.cpp | 8 | ||||
-rw-r--r-- | src/widgets/qdockwindow.cpp | 20 | ||||
-rw-r--r-- | src/widgets/qeffects.cpp | 22 | ||||
-rw-r--r-- | src/widgets/qlistbox.cpp | 2 | ||||
-rw-r--r-- | src/widgets/qlistview.cpp | 6 | ||||
-rw-r--r-- | src/widgets/qmenubar.cpp | 6 | ||||
-rw-r--r-- | src/widgets/qpopupmenu.cpp | 24 | ||||
-rw-r--r-- | src/widgets/qpushbutton.cpp | 4 | ||||
-rw-r--r-- | src/widgets/qradiobutton.cpp | 2 | ||||
-rw-r--r-- | src/widgets/qspinbox.cpp | 2 | ||||
-rw-r--r-- | src/widgets/qsplashscreen.cpp | 4 | ||||
-rw-r--r-- | src/widgets/qtabbar.cpp | 2 | ||||
-rw-r--r-- | src/widgets/qtabwidget.cpp | 2 | ||||
-rw-r--r-- | src/widgets/qtextbrowser.cpp | 6 | ||||
-rw-r--r-- | src/widgets/qtextedit.cpp | 2 | ||||
-rw-r--r-- | src/widgets/qtoolbutton.cpp | 2 | ||||
-rw-r--r-- | src/widgets/qtooltip.cpp | 18 | ||||
-rw-r--r-- | src/widgets/qwhatsthis.cpp | 8 | ||||
-rw-r--r-- | src/widgets/qwidgetresizehandler.cpp | 4 |
22 files changed, 75 insertions, 75 deletions
diff --git a/src/widgets/qbuttongroup.cpp b/src/widgets/qbuttongroup.cpp index f90223225..c94ba0378 100644 --- a/src/widgets/qbuttongroup.cpp +++ b/src/widgets/qbuttongroup.cpp @@ -499,7 +499,7 @@ void TQButtonGroup::setRadioButtonExclusive( bool on) void TQButtonGroup::moveFocus( int key ) { - TQWidget * f = qApp->focusWidget(); + TQWidget * f = tqApp->focusWidget(); TQButtonItem * i; i = buttons->first(); diff --git a/src/widgets/qcheckbox.cpp b/src/widgets/qcheckbox.cpp index a4b78c136..8a2ffd4e6 100644 --- a/src/widgets/qcheckbox.cpp +++ b/src/widgets/qcheckbox.cpp @@ -353,7 +353,7 @@ void TQCheckBox::updateMask() bool TQCheckBox::hitButton( const TQPoint &pos ) const { TQRect r = TQStyle::visualRect( style().subRect( TQStyle::SR_CheckBoxFocusRect, this ), this ); - if ( qApp->reverseLayout() ) { + if ( tqApp->reverseLayout() ) { r.setRight( width() ); } else { r.setLeft( 0 ); diff --git a/src/widgets/qcombobox.cpp b/src/widgets/qcombobox.cpp index 59fa0244b..60a85337c 100644 --- a/src/widgets/qcombobox.cpp +++ b/src/widgets/qcombobox.cpp @@ -1379,7 +1379,7 @@ void TQComboBox::mousePressEvent( TQMouseEvent *e ) if ( d->usingListBox() ) { listBox()->blockSignals( TRUE ); - qApp->sendEvent( listBox(), e ); // trigger the listbox's autoscroll + tqApp->sendEvent( listBox(), e ); // trigger the listbox's autoscroll listBox()->setCurrentItem(d->current); listBox()->blockSignals( FALSE ); popup(); diff --git a/src/widgets/qdatetimeedit.cpp b/src/widgets/qdatetimeedit.cpp index c7fa1d5a6..117c20cdc 100644 --- a/src/widgets/qdatetimeedit.cpp +++ b/src/widgets/qdatetimeedit.cpp @@ -495,7 +495,7 @@ bool TQDateTimeEditor::event( TQEvent *e ) { if ( e->type() == TQEvent::FocusIn || e->type() == TQEvent::FocusOut ) { if ( e->type() == TQEvent::FocusOut ) - qApp->sendEvent( cw, e ); + tqApp->sendEvent( cw, e ); update( rect() ); } else if ( e->type() == TQEvent::AccelOverride ) { TQKeyEvent* ke = (TQKeyEvent*) e; @@ -648,7 +648,7 @@ bool TQDateTimeEditor::eventFilter( TQObject *o, TQEvent *e ) } } - qApp->sendEvent( w, e ); + tqApp->sendEvent( w, e ); return TRUE; } } break; @@ -1547,7 +1547,7 @@ void TQDateEdit::addNumber( int sec, int num ) emit valueChanged( date() ); } d->overwrite = overwrite; - d->timerId = startTimer( qApp->doubleClickInterval()*4 ); + d->timerId = startTimer( tqApp->doubleClickInterval()*4 ); d->ed->repaint( d->ed->rect(), FALSE ); } @@ -2459,7 +2459,7 @@ void TQTimeEdit::addNumber( int sec, int num ) if ( accepted ) emit valueChanged( time() ); d->overwrite = overwrite; - d->timerId = startTimer( qApp->doubleClickInterval()*4 ); + d->timerId = startTimer( tqApp->doubleClickInterval()*4 ); d->ed->repaint( d->ed->rect(), FALSE ); } diff --git a/src/widgets/qdockwindow.cpp b/src/widgets/qdockwindow.cpp index 875f6d610..a0f4163c1 100644 --- a/src/widgets/qdockwindow.cpp +++ b/src/widgets/qdockwindow.cpp @@ -442,7 +442,7 @@ void TQDockWindowHandle::mousePressEvent( TQMouseEvent *e ) if ( !dockWindow->dockArea ) return; ctrlDown = ( e->state() & ControlButton ) == ControlButton; - oldFocus = qApp->focusWidget(); + oldFocus = tqApp->focusWidget(); setFocus(); e->ignore(); if ( e->button() != LeftButton ) @@ -453,7 +453,7 @@ void TQDockWindowHandle::mousePressEvent( TQMouseEvent *e ) offset = e->pos(); dockWindow->startRectDraw( mapToGlobal( e->pos() ), !opaque ); if ( !opaque ) - qApp->installEventFilter( dockWindow ); + tqApp->installEventFilter( dockWindow ); } void TQDockWindowHandle::mouseMoveEvent( TQMouseEvent *e ) @@ -469,7 +469,7 @@ void TQDockWindowHandle::mouseMoveEvent( TQMouseEvent *e ) void TQDockWindowHandle::mouseReleaseEvent( TQMouseEvent *e ) { ctrlDown = FALSE; - qApp->removeEventFilter( dockWindow ); + tqApp->removeEventFilter( dockWindow ); if ( oldFocus ) oldFocus->setFocus(); if ( !mousePressed ) @@ -610,7 +610,7 @@ void TQDockWindowTitleBar::mousePressEvent( TQMouseEvent *e ) } ctrlDown = ( e->state() & ControlButton ) == ControlButton; - oldFocus = qApp->focusWidget(); + oldFocus = tqApp->focusWidget(); // setFocus activates the window, which deactivates the main window // not what we want, and not required anyway on Windows #ifndef Q_WS_WIN @@ -659,7 +659,7 @@ void TQDockWindowTitleBar::mouseReleaseEvent( TQMouseEvent *e ) } ctrlDown = FALSE; - qApp->removeEventFilter( dockWindow ); + tqApp->removeEventFilter( dockWindow ); if ( oldFocus ) oldFocus->setFocus(); @@ -1117,7 +1117,7 @@ void TQDockWindow::setOrientation( Orientation o ) TQDockWindow::~TQDockWindow() { - qApp->removeEventFilter( this ); + tqApp->removeEventFilter( this ); if ( area() ) area()->removeDockWindow( this, FALSE, FALSE ); TQDockArea *a = area(); @@ -1158,7 +1158,7 @@ void TQDockWindow::swapRect( TQRect &r, TQt::Orientation o, const TQPoint &offse TQWidget *TQDockWindow::areaAt( const TQPoint &gp ) { - TQWidget *w = qApp->widgetAt( gp, TRUE ); + TQWidget *w = tqApp->widgetAt( gp, TRUE ); if ( w && ( w == this || w == titleBar ) && parentWidget() ) w = parentWidget()->childAt( parentWidget()->mapFromGlobal( gp ) ); @@ -1407,7 +1407,7 @@ void TQDockWindow::updatePosition( const TQPoint &globalPos ) } dockArea = 0; TQPoint topLeft = currRect.topLeft(); - TQRect screen = qApp->desktop()->availableGeometry( topLeft ); + TQRect screen = tqApp->desktop()->availableGeometry( topLeft ); if ( !screen.contains( topLeft ) ) { topLeft.setY(TQMAX(topLeft.y(), screen.top())); topLeft.setY(TQMIN(topLeft.y(), screen.bottom()-height())); @@ -1968,7 +1968,7 @@ void TQDockWindow::hideEvent( TQHideEvent *e ) void TQDockWindow::showEvent( TQShowEvent *e ) { if (curPlace == OutsideDock && (parent() && strcmp(parent()->name(), "qt_hide_dock") != 0)) { - TQRect sr = qApp->desktop()->availableGeometry( this ); + TQRect sr = tqApp->desktop()->availableGeometry( this ); if ( !sr.contains( pos() ) ) { int nx = TQMIN( TQMAX( x(), sr.x() ), sr.right()-width() ); int ny = TQMIN( TQMAX( y(), sr.y() ), sr.bottom()-height() ); @@ -2060,7 +2060,7 @@ bool TQDockWindow::eventFilter( TQObject * o, TQEvent *e ) verHandle->mousePressed = titleBar->mousePressed = FALSE; endRectDraw( !opaque ); - qApp->removeEventFilter( this ); + tqApp->removeEventFilter( this ); return TRUE; } } else if ( ((TQWidget*)o)->topLevelWidget() != this && place() == OutsideDock && isTopLevel() ) { diff --git a/src/widgets/qeffects.cpp b/src/widgets/qeffects.cpp index 98939b4c2..7377eba78 100644 --- a/src/widgets/qeffects.cpp +++ b/src/widgets/qeffects.cpp @@ -145,7 +145,7 @@ void TQAlphaWidget::run( int time ) checkTime.start(); showWidget = TRUE; - qApp->installEventFilter( this ); + tqApp->installEventFilter( this ); widget->setWState( WState_Visible ); @@ -251,7 +251,7 @@ void TQAlphaWidget::render() alpha = 1; if ( alpha >= 1 || !showWidget) { anim.stop(); - qApp->removeEventFilter( this ); + tqApp->removeEventFilter( this ); if ( widget ) { if ( !showWidget ) { @@ -318,9 +318,9 @@ void TQAlphaWidget::alphaBlend() Q_UINT32 bp = bl[sx]; Q_UINT32 fp = fl[sx]; - ((Q_UINT32*)(md[sy]))[sx] = qRgb(int (qRed(bp)*ia + qRed(fp)*alpha), - int (qGreen(bp)*ia + qGreen(fp)*alpha), - int (qBlue(bp)*ia + qBlue(fp)*alpha) ); + ((Q_UINT32*)(md[sy]))[sx] = tqRgb(int (tqRed(bp)*ia + tqRed(fp)*alpha), + int (tqGreen(bp)*ia + tqGreen(fp)*alpha), + int (tqBlue(bp)*ia + tqBlue(fp)*alpha) ); } } } @@ -519,7 +519,7 @@ void TQRollEffect::run( int time ) show(); setEnabled(FALSE); - qApp->installEventFilter( this ); + tqApp->installEventFilter( this ); showWidget = TRUE; done = FALSE; @@ -581,7 +581,7 @@ void TQRollEffect::scroll() } if ( done ) { anim.stop(); - qApp->removeEventFilter( this ); + tqApp->removeEventFilter( this ); if ( widget ) { if ( !showWidget ) { #ifdef Q_WS_WIN @@ -633,8 +633,8 @@ void qScrollEffect( TQWidget* w, TQEffects::DirFlags orient, int time ) q_roll = 0; } - qApp->sendPostedEvents( w, TQEvent::Move ); - qApp->sendPostedEvents( w, TQEvent::Resize ); + tqApp->sendPostedEvents( w, TQEvent::Move ); + tqApp->sendPostedEvents( w, TQEvent::Resize ); #ifdef Q_WS_X11 uint flags = TQt::WStyle_Customize | TQt::WNoAutoErase | TQt::WStyle_StaysOnTop | (w->isPopup() ? TQt::WType_Popup : (TQt::WX11BypassWM | TQt::WStyle_Tool)); @@ -657,8 +657,8 @@ void qFadeEffect( TQWidget* w, int time ) q_blend = 0; } - qApp->sendPostedEvents( w, TQEvent::Move ); - qApp->sendPostedEvents( w, TQEvent::Resize ); + tqApp->sendPostedEvents( w, TQEvent::Move ); + tqApp->sendPostedEvents( w, TQEvent::Resize ); #ifdef Q_WS_X11 uint flags = TQt::WStyle_Customize | TQt::WNoAutoErase | TQt::WStyle_StaysOnTop diff --git a/src/widgets/qlistbox.cpp b/src/widgets/qlistbox.cpp index 2dc526655..f38550260 100644 --- a/src/widgets/qlistbox.cpp +++ b/src/widgets/qlistbox.cpp @@ -2734,7 +2734,7 @@ void TQListBox::focusOutEvent( TQFocusEvent* ) if (style().styleHint( TQStyle::SH_ItemView_ChangeHighlightOnFocus, this )) { d->inMenuMode = TQFocusEvent::reason() == TQFocusEvent::Popup || - (qApp->focusWidget() && qApp->focusWidget()->inherits("TQMenuBar")); + (tqApp->focusWidget() && tqApp->focusWidget()->inherits("TQMenuBar")); if ( !d->inMenuMode ) repaintSelection(); } diff --git a/src/widgets/qlistview.cpp b/src/widgets/qlistview.cpp index 173548c38..7b776d523 100644 --- a/src/widgets/qlistview.cpp +++ b/src/widgets/qlistview.cpp @@ -4308,7 +4308,7 @@ void TQListView::contentsMousePressEventEx( TQMouseEvent * e ) bool close = i->isOpen(); setOpen( i, !close ); // ### Looks dangerous, removed because of reentrance problems - // qApp->processEvents(); + // tqApp->processEvents(); if ( !d->focusItem ) { d->focusItem = i; repaintItem( d->focusItem ); @@ -4518,7 +4518,7 @@ void TQListView::contentsMouseReleaseEventEx( TQMouseEvent * e ) bool close = i->isOpen(); setOpen( i, !close ); // ### Looks dangerous, removed because of reentrance problems - // qApp->processEvents(); + // tqApp->processEvents(); if ( !d->focusItem ) { d->focusItem = i; repaintItem( d->focusItem ); @@ -4845,7 +4845,7 @@ void TQListView::focusOutEvent( TQFocusEvent* ) if ( style().styleHint( TQStyle::SH_ItemView_ChangeHighlightOnFocus, this ) ) { d->inMenuMode = TQFocusEvent::reason() == TQFocusEvent::Popup - || (qApp->focusWidget() && qApp->focusWidget()->inherits("TQMenuBar")); + || (tqApp->focusWidget() && tqApp->focusWidget()->inherits("TQMenuBar")); if ( !d->inMenuMode ) { bool db = d->useDoubleBuffer; d->useDoubleBuffer = TRUE; 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 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; diff --git a/src/widgets/qpushbutton.cpp b/src/widgets/qpushbutton.cpp index cbb45e443..09e57b119 100644 --- a/src/widgets/qpushbutton.cpp +++ b/src/widgets/qpushbutton.cpp @@ -712,7 +712,7 @@ void TQPushButton::popupPressed() #endif if ( horizontal ) { if ( topLeft ) { - if ( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + popup->sizeHint().height() <= qApp->desktop()->height() ) + if ( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + popup->sizeHint().height() <= tqApp->desktop()->height() ) popup->exec( mapToGlobal( rect().bottomLeft() ) ); else popup->exec( mapToGlobal( rect().topLeft() - TQPoint( 0, popup->sizeHint().height() ) ) ); @@ -724,7 +724,7 @@ void TQPushButton::popupPressed() } } else { if ( topLeft ) { - if ( mapToGlobal( TQPoint( rect().right(), 0 ) ).x() + popup->sizeHint().width() <= qApp->desktop()->width() ) + if ( mapToGlobal( TQPoint( rect().right(), 0 ) ).x() + popup->sizeHint().width() <= tqApp->desktop()->width() ) popup->exec( mapToGlobal( rect().topRight() ) ); else popup->exec( mapToGlobal( rect().topLeft() - TQPoint( popup->sizeHint().width(), 0 ) ) ); diff --git a/src/widgets/qradiobutton.cpp b/src/widgets/qradiobutton.cpp index 2d0515137..d04c0ff10 100644 --- a/src/widgets/qradiobutton.cpp +++ b/src/widgets/qradiobutton.cpp @@ -179,7 +179,7 @@ bool TQRadioButton::hitButton( const TQPoint &pos ) const TQRect r = TQStyle::visualRect( style().subRect( TQStyle::SR_RadioButtonFocusRect, this ), this ); - if ( qApp->reverseLayout() ) { + if ( tqApp->reverseLayout() ) { r.setRight( width() ); } else { r.setLeft( 0 ); diff --git a/src/widgets/qspinbox.cpp b/src/widgets/qspinbox.cpp index 754d39ff5..44692688b 100644 --- a/src/widgets/qspinbox.cpp +++ b/src/widgets/qspinbox.cpp @@ -659,7 +659,7 @@ bool TQSpinBox::eventFilter( TQObject* o, TQEvent* ev ) return FALSE; if ( edited ) interpretText(); - qApp->sendEvent( this, ev ); + tqApp->sendEvent( this, ev ); retval = TRUE; } if ( k->key() == Key_Up ) { stepUp(); diff --git a/src/widgets/qsplashscreen.cpp b/src/widgets/qsplashscreen.cpp index 6be1506be..1896269b2 100644 --- a/src/widgets/qsplashscreen.cpp +++ b/src/widgets/qsplashscreen.cpp @@ -115,10 +115,10 @@ public: splash->show(); ... // Loading some items splash->message( "Loaded modules" ); - qApp->processEvents(); + tqApp->processEvents(); ... // Establishing connections splash->message( "Established connections" ); - qApp->processEvents(); + tqApp->processEvents(); \endcode */ diff --git a/src/widgets/qtabbar.cpp b/src/widgets/qtabbar.cpp index b141de8d4..dcee15084 100644 --- a/src/widgets/qtabbar.cpp +++ b/src/widgets/qtabbar.cpp @@ -585,7 +585,7 @@ void TQTabBar::paint( TQPainter * p, TQTab * t, bool selected ) const if (isEnabled() && t->isEnabled()) flags |= TQStyle::Style_Enabled; - if (topLevelWidget() == qApp->activeWindow()) + if (topLevelWidget() == tqApp->activeWindow()) flags |= TQStyle::Style_Active; if ( selected ) flags |= TQStyle::Style_Selected; diff --git a/src/widgets/qtabwidget.cpp b/src/widgets/qtabwidget.cpp index b255aaabe..bb2eccf8e 100644 --- a/src/widgets/qtabwidget.cpp +++ b/src/widgets/qtabwidget.cpp @@ -961,7 +961,7 @@ bool TQTabWidget::eventFilter( TQObject *o, TQEvent * e) page = 0; } setCurrentPage( page ); - if ( !qApp->focusWidget() ) + if ( !tqApp->focusWidget() ) d->tabs->setFocus(); return TRUE; } diff --git a/src/widgets/qtextbrowser.cpp b/src/widgets/qtextbrowser.cpp index d8d9b8a27..1dcf689aa 100644 --- a/src/widgets/qtextbrowser.cpp +++ b/src/widgets/qtextbrowser.cpp @@ -229,7 +229,7 @@ void TQTextBrowser::setSource(const TQString& name) { #ifndef QT_NO_CURSOR if ( isVisible() ) - qApp->setOverrideCursor( waitCursor ); + tqApp->setOverrideCursor( waitCursor ); #endif d->textOrSourceChanged = TRUE; TQString source = name; @@ -263,7 +263,7 @@ void TQTextBrowser::setSource(const TQString& name) if ( firstTag.left( 3 ) == "<qt" && firstTag.contains( "type" ) && firstTag.contains( "detail" ) ) { popupDetail( txt, TQCursor::pos() ); #ifndef QT_NO_CURSOR - qApp->restoreOverrideCursor(); + tqApp->restoreOverrideCursor(); #endif return; } @@ -304,7 +304,7 @@ void TQTextBrowser::setSource(const TQString& name) #ifndef QT_NO_CURSOR if ( isVisible() ) - qApp->restoreOverrideCursor(); + tqApp->restoreOverrideCursor(); #endif emit sourceChanged( url ); diff --git a/src/widgets/qtextedit.cpp b/src/widgets/qtextedit.cpp index cb6da79c3..5910ef4c6 100644 --- a/src/widgets/qtextedit.cpp +++ b/src/widgets/qtextedit.cpp @@ -2604,7 +2604,7 @@ void TQTextEdit::contentsMouseDoubleClickEvent( TQMouseEvent * e ) repaintChanged(); - d->trippleClickTimer->start( qApp->doubleClickInterval(), TRUE ); + d->trippleClickTimer->start( tqApp->doubleClickInterval(), TRUE ); d->trippleClickPoint = e->globalPos(); } inDoubleClick = TRUE; diff --git a/src/widgets/qtoolbutton.cpp b/src/widgets/qtoolbutton.cpp index eac653d99..644353820 100644 --- a/src/widgets/qtoolbutton.cpp +++ b/src/widgets/qtoolbutton.cpp @@ -915,7 +915,7 @@ void TQToolButton::popupTimerDone() horizontal = FALSE; #endif TQPoint p; - TQRect screen = qApp->desktop()->availableGeometry( this ); + TQRect screen = tqApp->desktop()->availableGeometry( this ); if ( horizontal ) { if ( TQApplication::reverseLayout() ) { if ( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + d->popup->sizeHint().height() <= screen.height() ) { diff --git a/src/widgets/qtooltip.cpp b/src/widgets/qtooltip.cpp index 5507bfc79..fc33aef55 100644 --- a/src/widgets/qtooltip.cpp +++ b/src/widgets/qtooltip.cpp @@ -156,7 +156,7 @@ static void initTipManager() TQTipManager::TQTipManager() - : TQObject( qApp, "toolTipManager" ) + : TQObject( tqApp, "toolTipManager" ) { wakeUpDelay = 700; tips = new TQPtrDict<TQTipManager::Tip>( 313 ); @@ -173,9 +173,9 @@ TQTipManager::TQTipManager() TQTipManager::~TQTipManager() { - if ( isApplicationFilter && !qApp->closingDown() ) { - qApp->setGlobalMouseTracking( FALSE ); - qApp->removeEventFilter( tipManager ); + if ( isApplicationFilter && !tqApp->closingDown() ) { + tqApp->setGlobalMouseTracking( FALSE ); + tqApp->removeEventFilter( tipManager ); } delete label; @@ -234,10 +234,10 @@ void TQTipManager::add( const TQRect &gm, TQWidget *w, showTip(); } - if ( !isApplicationFilter && qApp ) { + if ( !isApplicationFilter && tqApp ) { isApplicationFilter = TRUE; - qApp->installEventFilter( tipManager ); - qApp->setGlobalMouseTracking( TRUE ); + tqApp->installEventFilter( tipManager ); + tqApp->setGlobalMouseTracking( TRUE ); } if ( t->group ) { @@ -371,11 +371,11 @@ bool TQTipManager::eventFilter( TQObject *obj, TQEvent *e ) // avoid dumping core in case of application madness, and return // tquickly for some common but irrelevant events if ( e->type() == TQEvent::WindowDeactivate && - qApp && !qApp->activeWindow() && + tqApp && !tqApp->activeWindow() && label && label->isVisible() ) hideTipAndSleep(); - if ( !qApp + if ( !tqApp || !obj || !obj->isWidgetType() // isWidgetType() catches most stuff || e->type() == TQEvent::Paint || e->type() == TQEvent::Timer diff --git a/src/widgets/qwhatsthis.cpp b/src/widgets/qwhatsthis.cpp index f1c4fe6a5..6e3338b0b 100644 --- a/src/widgets/qwhatsthis.cpp +++ b/src/widgets/qwhatsthis.cpp @@ -475,7 +475,7 @@ void TQWhatsThisButton::mouseReleased() TQApplication::setOverrideCursor( whatsThisCursor, FALSE ); #endif wt->state = TQWhatsThisPrivate::Waiting; - qApp->installEventFilter( wt ); + tqApp->installEventFilter( wt ); } } @@ -502,7 +502,7 @@ TQWhatsThisPrivate::TQWhatsThisPrivate() TQWhatsThisPrivate::~TQWhatsThisPrivate() { #ifndef QT_NO_CURSOR - if ( state == Waiting && qApp ) + if ( state == Waiting && tqApp ) TQApplication::restoreOverrideCursor(); #endif // the two straight-and-simple dicts @@ -643,7 +643,7 @@ void TQWhatsThisPrivate::leaveWhatsThisMode() TQApplication::restoreOverrideCursor(); #endif state = Inactive; - qApp->removeEventFilter( this ); + tqApp->removeEventFilter( this ); } } @@ -923,7 +923,7 @@ void TQWhatsThis::enterWhatsThisMode() TQApplication::setOverrideCursor( whatsThisCursor, FALSE ); #endif wt->state = TQWhatsThisPrivate::Waiting; - qApp->installEventFilter( wt ); + tqApp->installEventFilter( wt ); } } diff --git a/src/widgets/qwidgetresizehandler.cpp b/src/widgets/qwidgetresizehandler.cpp index ff964b12c..f0d21a600 100644 --- a/src/widgets/qwidgetresizehandler.cpp +++ b/src/widgets/qwidgetresizehandler.cpp @@ -64,7 +64,7 @@ TQWidgetResizeHandler::TQWidgetResizeHandler( TQWidget *parent, TQWidget *cw, co range = frame ? frame->frameWidth() : RANGE; range = TQMAX( RANGE, range ); activeForMove = activeForResize = TRUE; - qApp->installEventFilter( this ); + tqApp->installEventFilter( this ); } void TQWidgetResizeHandler::setActive( Action ac, bool b ) @@ -116,7 +116,7 @@ bool TQWidgetResizeHandler::eventFilter( TQObject *o, TQEvent *ee ) #ifndef QT_NO_SIZEGRIP || ::qt_cast<TQSizeGrip*>(o) #endif - || qApp->activePopupWidget() ) { + || tqApp->activePopupWidget() ) { if ( buttonDown && ee->type() == TQEvent::MouseButtonRelease ) buttonDown = FALSE; return FALSE; |