diff options
Diffstat (limited to 'experimental/tqtinterface/qt4/src/widgets')
53 files changed, 438 insertions, 438 deletions
diff --git a/experimental/tqtinterface/qt4/src/widgets/tqaction.cpp b/experimental/tqtinterface/qt4/src/widgets/tqaction.cpp index 8ffa77322..8a65d068c 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqaction.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqaction.cpp @@ -210,7 +210,7 @@ TQActionPrivate::~TQActionPrivate() while ( ( mi = itmi.current() ) ) { ++itmi; TQPopupMenu* menu = mi->popup; - if ( menu->tqfindItem( mi->id ) ) + if ( menu->findItem( mi->id ) ) menu->removeItem( mi->id ); } @@ -356,7 +356,7 @@ TQString TQActionPrivate::menuText() const { if ( menutext.isNull() ) { TQString t(text); - t.tqreplace('&', "&&"); + t.replace('&', "&&"); return t; } return menutext; @@ -1105,7 +1105,7 @@ void TQAction::addedTo( int index, TQPopupMenu *menu ) void TQAction::showtqStatusText( const TQString& text ) { #ifndef TQT_NO_STATUSBAR - // tqfind out whether we are clearing the status bar by the popup that actually set the text + // find out whether we are clearing the status bar by the popup that actually set the text static TQPopupMenu *lastmenu = 0; TQObject *s = (TQObject*)sender(); if ( s ) { @@ -1363,7 +1363,7 @@ void TQActionGroupPrivate::update( const TQActionGroup* that ) continue; int index; - tqparent->tqfindPopup( popup, &index ); + tqparent->findPopup( popup, &index ); int id = tqparent->idAt( index ); if ( !that->iconSet().isNull() ) tqparent->changeItem( id, that->iconSet(), that->menuText() ); @@ -1578,7 +1578,7 @@ bool TQActionGroup::usesDropDown() const */ void TQActionGroup::add( TQAction* action ) { - if ( d->actions.tqcontainsRef( action ) ) + if ( d->actions.containsRef( action ) ) return; d->actions.append( action ); @@ -1769,14 +1769,14 @@ bool TQActionGroup::addTo( TQWidget* w ) popup = (TQPopupMenu*)w; } for ( TQPtrListIterator<TQAction> it( d->actions); it.current(); ++it ) { - // #### do an addedTo( index, popup, action), need to tqfind out index + // #### do an addedTo( index, popup, action), need to find out index it.current()->addTo( popup ); } return TRUE; } for ( TQPtrListIterator<TQAction> it( d->actions); it.current(); ++it ) { - // #### do an addedTo( index, popup, action), need to tqfind out index + // #### do an addedTo( index, popup, action), need to find out index it.current()->addTo( w ); } @@ -2051,7 +2051,7 @@ void TQActionGroup::internalComboBoxHighlighted( int index ) */ void TQActionGroup::internalToggle( TQAction *a ) { - int index = d->actions.tqfind( a ); + int index = d->actions.find( a ); if ( index == -1 ) return; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqbutton.cpp b/experimental/tqtinterface/qt4/src/widgets/tqbutton.cpp index c667fecf3..e9f8d10df 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqbutton.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqbutton.cpp @@ -663,7 +663,7 @@ void TQButton::setState( ToggleState s ) */ bool TQButton::hitButton( const TQPoint &pos ) const { - return TQT_TQRECT_OBJECT(rect()).tqcontains( pos ); + return TQT_TQRECT_OBJECT(rect()).contains( pos ); } /*! diff --git a/experimental/tqtinterface/qt4/src/widgets/tqbuttongroup.cpp b/experimental/tqtinterface/qt4/src/widgets/tqbuttongroup.cpp index 1879a8a38..41da90888 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqbuttongroup.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqbuttongroup.cpp @@ -84,7 +84,7 @@ \endlist A button can be removed from the group with remove(). A pointer to - a button with a given id can be obtained using tqfind(). The id of a + a button with a given id can be obtained using find(). The id of a button is available using id(). A button can be set \e on with setButton(). The number of buttons in the group is returned by count(). @@ -245,7 +245,7 @@ void TQButtonGroup::setExclusive( bool enable ) other negative integer, for instance -2, a unique identifier (negative integer \<= -2) is generated. No button has an id of -1. - \sa tqfind(), remove(), setExclusive() + \sa find(), remove(), setExclusive() */ int TQButtonGroup::insert( TQButton *button, int id ) @@ -319,7 +319,7 @@ void TQButtonGroup::remove( TQButton *button ) the button was not found. */ -TQButton *TQButtonGroup::tqfind( int id ) const +TQButton *TQButtonGroup::find( int id ) const { // introduce a TQButtonListIt if calling anything for ( TQButtonItem *i=buttons->first(); i; i=buttons->next() ) @@ -477,7 +477,7 @@ void TQButtonGroup::buttonToggled( bool on ) void TQButtonGroup::setButton( int id ) { - TQButton * b = tqfind( id ); + TQButton * b = find( id ); if ( b ) b->setOn( TRUE ); } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqbuttongroup.h b/experimental/tqtinterface/qt4/src/widgets/tqbuttongroup.h index edbc441bd..cdef0a828 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqbuttongroup.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqbuttongroup.h @@ -78,7 +78,7 @@ public: public: int insert( TQButton *, int id=-1 ); void remove( TQButton * ); - TQButton *tqfind( int id ) const; + TQButton *find( int id ) const; int id( TQButton * ) const; int count() const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqcheckbox.cpp b/experimental/tqtinterface/qt4/src/widgets/tqcheckbox.cpp index 37e8eac97..49838ecdf 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqcheckbox.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqcheckbox.cpp @@ -218,7 +218,7 @@ printf("[WARNING] TQSharedDoubleBuffer double buffering has been disabled\n\r"); TQTextOStream os(&pmkey); os << "$qt_check_" << tqstyle().className() << "_" << palette().serialNumber() << "_" << irect.width() << "x" << irect.height() << "_" << kf; - TQPixmap *pm = TQPixmapCache::tqfind( pmkey ); + TQPixmap *pm = TQPixmapCache::find( pmkey ); if ( pm ) { // pixmap exists p->drawPixmap( irect.topLeft(), *pm ); drawButtonLabel( p ); @@ -362,7 +362,7 @@ bool TQCheckBox::hitButton( const TQPoint &pos ) const } else { r.setLeft( 0 ); } - return r.tqcontains( pos ); + return r.contains( pos ); } #endif diff --git a/experimental/tqtinterface/qt4/src/widgets/tqcombobox.cpp b/experimental/tqtinterface/qt4/src/widgets/tqcombobox.cpp index 630599395..382258b30 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqcombobox.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqcombobox.cpp @@ -171,7 +171,7 @@ \value AtTop insert the string as the first item in the combobox. - \value AtCurrent tqreplace the previously selected item with the + \value AtCurrent replace the previously selected item with the string the user has entered. \value AtBottom insert the string as the last item in the @@ -239,7 +239,7 @@ This signal is used for editable comboboxes. It is emitted whenever the contents of the text entry field changes. \a string - tqcontains the new text. + contains the new text. */ /*! @@ -356,7 +356,7 @@ public: static inline TQString escapedComboString(const TQString &str) { TQString stringToReturn = str; - return stringToReturn.tqreplace('&', "&&"); + return stringToReturn.replace('&', "&&"); } class TQComboBoxPopupItem : public TQCustomMenuItem @@ -955,7 +955,7 @@ TQString TQComboBox::text( int index ) const return d->listBox()->text( index ); } else { TQString retText = d->popup()->text(index); - retText.tqreplace("&&", "&"); + retText.replace("&&", "&"); return retText; } } @@ -1374,7 +1374,7 @@ void TQComboBox::mousePressEvent( TQMouseEvent *e ) // and thus has a rect that doesn't fit the button. arrowRect.setHeight( TQMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) ); - if ( count() && ( !editable() || arrowRect.tqcontains( e->pos() ) ) ) { + if ( count() && ( !editable() || arrowRect.contains( e->pos() ) ) ) { d->arrowPressed = FALSE; if ( d->usingListBox() ) { @@ -1383,7 +1383,7 @@ void TQComboBox::mousePressEvent( TQMouseEvent *e ) listBox()->setCurrentItem(d->current); listBox()->blockSignals( FALSE ); popup(); - if ( arrowRect.tqcontains( e->pos() ) ) { + if ( arrowRect.contains( e->pos() ) ) { d->arrowPressed = TRUE; d->arrowDown = TRUE; tqrepaint( FALSE ); @@ -1625,7 +1625,7 @@ void TQComboBox::popup() lb->blockSignals( TRUE ); TQListBoxItem* currentLBItem = 0; if ( editable() && currentText() != text( currentItem() ) ) - currentLBItem = lb->tqfindItem( currentText() ); + currentLBItem = lb->findItem( currentText() ); currentLBItem = currentLBItem ? currentLBItem : lb->item( d->current ); @@ -1781,7 +1781,7 @@ bool TQComboBox::eventFilter( TQObject *object, TQEvent *event ) case TQEvent::MouseMove: if ( !d->mouseWasInsidePopup ) { TQPoint pos = e->pos(); - if ( TQT_TQRECT_OBJECT(d->listBox()->rect()).tqcontains( pos ) ) + if ( TQT_TQRECT_OBJECT(d->listBox()->rect()).contains( pos ) ) d->mouseWasInsidePopup = TRUE; // Check if arrow button should toggle if ( d->arrowPressed ) { @@ -1791,7 +1791,7 @@ bool TQComboBox::eventFilter( TQObject *object, TQEvent *event ) tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow); arrowRect = TQStyle::tqvisualRect(arrowRect, this); - if ( arrowRect.tqcontains( comboPos ) ) { + if ( arrowRect.contains( comboPos ) ) { if ( !d->arrowDown ) { d->arrowDown = TRUE; tqrepaint( FALSE ); @@ -1820,7 +1820,7 @@ bool TQComboBox::eventFilter( TQObject *object, TQEvent *event ) break; case TQEvent::MouseButtonRelease: - if ( TQT_TQRECT_OBJECT(d->listBox()->rect()).tqcontains( e->pos() ) ) { + if ( TQT_TQRECT_OBJECT(d->listBox()->rect()).contains( e->pos() ) ) { TQMouseEvent tmp( TQEvent::MouseButtonDblClick, e->pos(), e->button(), e->state() ) ; // will hide popup @@ -1840,7 +1840,7 @@ bool TQComboBox::eventFilter( TQObject *object, TQEvent *event ) break; case TQEvent::MouseButtonDblClick: case TQEvent::MouseButtonPress: - if ( !TQT_TQRECT_OBJECT(d->listBox()->rect()).tqcontains( e->pos() ) ) { + if ( !TQT_TQRECT_OBJECT(d->listBox()->rect()).contains( e->pos() ) ) { TQPoint globalPos = d->listBox()->mapToGlobal(e->pos()); if ( TQApplication::widgetAt( globalPos, TRUE ) == this ) { d->discardNextMousePress = TRUE; @@ -1892,7 +1892,7 @@ bool TQComboBox::eventFilter( TQObject *object, TQEvent *event ) break; case TQEvent::MouseButtonDblClick: case TQEvent::MouseButtonPress: - if ( !TQT_TQRECT_OBJECT(d->popup()->rect()).tqcontains( e->pos() ) ) { + if ( !TQT_TQRECT_OBJECT(d->popup()->rect()).contains( e->pos() ) ) { d->poppedUp = FALSE; d->arrowDown = FALSE; // remove filter, event will take down popup: diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdatetimeedit.cpp b/experimental/tqtinterface/qt4/src/widgets/tqdatetimeedit.cpp index 4aaea53ab..346bdd34b 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdatetimeedit.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqdatetimeedit.cpp @@ -150,9 +150,9 @@ static void readLocaleSettings() *lTimeSep = ":"; #endif TQString d = TQDate( 1999, 11, 22 ).toString( Qt::LocalDate ); - dpos = d.tqfind( "22" ); - mpos = d.tqfind( "11" ); - ypos = d.tqfind( "99" ); + dpos = d.find( "22" ); + mpos = d.find( "11" ); + ypos = d.find( "99" ); if ( dpos > -1 && mpos > -1 && ypos > -1 ) { // test for DMY, MDY, YMD, YDM if ( dpos < mpos && mpos < ypos ) { @@ -172,7 +172,7 @@ static void readLocaleSettings() #ifndef TQ_WS_WIN TQString sep = d.mid( TQMIN( dpos, mpos ) + 2, TQABS( dpos - mpos ) - 2 ); - if ( d.tqcontains( sep ) == 2 ) { + if ( d.contains( sep ) == 2 ) { *lDateSep = sep; } #endif @@ -180,9 +180,9 @@ static void readLocaleSettings() #ifndef TQ_WS_WIN TQString t = TQTime( 11, 22, 33 ).toString( Qt::LocalDate ); - dpos = t.tqfind( "11" ); - mpos = t.tqfind( "22" ); - ypos = t.tqfind( "33" ); + dpos = t.find( "11" ); + mpos = t.find( "22" ); + ypos = t.find( "33" ); // We only allow hhmmss if ( dpos > -1 && dpos < mpos && mpos < ypos ) { TQString sep = t.mid( dpos + 2, mpos - dpos - 2 ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdialogbuttons.cpp b/experimental/tqtinterface/qt4/src/widgets/tqdialogbuttons.cpp index cabc7e878..bb7d5f1da 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdialogbuttons.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqdialogbuttons.cpp @@ -119,7 +119,7 @@ TQDialogButtons::setButtonEnabled(Button button, bool enabled) d->enabled |= button; else d->enabled ^= button; - if(d->buttons.tqcontains(button)) + if(d->buttons.contains(button)) d->buttons[button]->setEnabled(enabled); } @@ -133,11 +133,11 @@ void TQDialogButtons::setButtonVisible(Button button, bool visible) { if(visible) { - if(d->buttons.tqcontains(button)) + if(d->buttons.contains(button)) d->buttons[button]->show(); d->visible |= button; } else { - if(d->buttons.tqcontains(button)) + if(d->buttons.contains(button)) d->buttons[button]->hide(); d->visible ^= button; } @@ -178,12 +178,12 @@ TQDialogButtons::setDefaultButton(Button button) } if(d->def != button) { #ifndef TQT_NO_PROPERTIES - if(d->buttons.tqcontains(d->def)) + if(d->buttons.contains(d->def)) d->buttons[d->def]->setProperty("default", TQVariant(FALSE,0)); #endif d->def = button; #ifndef TQT_NO_PROPERTIES - if(d->buttons.tqcontains(d->def)) + if(d->buttons.contains(d->def)) d->buttons[d->def]->setProperty("default", TQVariant(FALSE,0)); #endif } @@ -200,7 +200,7 @@ TQDialogButtons::setButtonText(Button button, const TQString &str) { d->text[button] = str; #ifndef TQT_NO_PROPERTIES - if(d->buttons.tqcontains(button)) + if(d->buttons.contains(button)) d->buttons[button]->setProperty("text", TQVariant(str)); #endif layoutButtons(); @@ -209,7 +209,7 @@ TQDialogButtons::setButtonText(Button button, const TQString &str) TQString TQDialogButtons::buttonText(Button b) const { - if(d->text.tqcontains(b)) + if(d->text.contains(b)) return d->text[b]; return TQString(); //null if it is default.. } @@ -237,7 +237,7 @@ TQDialogButtons::createButton(Button b) { TQPushButton *ret = new TQPushButton(this, "qdialog_button"); TQObject::connect(ret, TQT_SIGNAL(clicked()), this, TQT_SLOT(handleClicked())); - if(d->text.tqcontains(b)) { + if(d->text.contains(b)) { ret->setText(d->text[b]); } else { switch(b) { @@ -391,7 +391,7 @@ TQDialogButtons::layoutButtons() else if(rects[i] == TQStyle::SR_DialogButtonIgnore) b = Ignore; if(b != None) { - if(d->buttons.tqcontains(b)) { + if(d->buttons.contains(b)) { w = d->buttons[b]; if(!(d->visible & b)) { w->hide(); @@ -437,7 +437,7 @@ TQDialogButtons::tqsizeHint(TQDialogButtons::Button button) const { TQWidget *w = NULL; if(d->visible & button) { - if(!d->buttons.tqcontains(button)) { + if(!d->buttons.contains(button)) { TQDialogButtons *that = (TQDialogButtons*)this; //ick, constness.. w = that->createButton(button); that->d->buttons.insert(button, w); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdockarea.cpp b/experimental/tqtinterface/qt4/src/widgets/tqdockarea.cpp index 5aed4893d..72f65c2cf 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdockarea.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqdockarea.cpp @@ -367,7 +367,7 @@ int TQDockAreaLayout::layoutItems( const TQRect &rect, bool testonly ) if ( dw->isHidden() ) continue; ++visibleWindows; - // tqfind position for the widget: This is the maximum of the + // find position for the widget: This is the maximum of the // end of the previous widget and the offset of the widget. If // the position + the width of the widget dosn't fit into the // dock, try moving it a bit back, if possible. @@ -484,9 +484,9 @@ int TQDockAreaLayout::widthForHeight( int h ) const fill the available space as compactly as possible. TQDockAreas can contain TQToolBars since TQToolBar is a TQDockWindow subclass. - TQMainWindow tqcontains four TQDockAreas which you can use for your + TQMainWindow contains four TQDockAreas which you can use for your TQToolBars and TQDockWindows, so in most situations you do not need - to use the TQDockArea class directly. Although TQMainWindow tqcontains + to use the TQDockArea class directly. Although TQMainWindow contains support for its own dock areas it isn't convenient for adding new TQDockAreas. If you need to create your own dock areas we suggest that you create a subclass of TQWidget and add your TQDockAreas to @@ -517,9 +517,9 @@ int TQDockAreaLayout::widthForHeight( int h ) const To dock or undock a dock window use TQDockWindow::dock() and TQDockWindow::undock() respectively. If you want to control which dock windows can dock in a dock area use setAcceptDockWindow(). To - see if a dock area tqcontains a particular dock window use + see if a dock area contains a particular dock window use \l{hasDockWindow()}; to see how many dock windows a dock area - tqcontains use count(). + contains use count(). The streaming operators can write the positions of the dock windows in the dock area to a TQTextStream. The positions can be @@ -614,7 +614,7 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, int index ) { invalidateFixedSizes(); TQDockWindow *dockWindow = 0; - int dockWindowIndex = tqfindDockWindow( w ); + int dockWindowIndex = findDockWindow( w ); if ( dockWindowIndex == -1 ) { dockWindow = w; dockWindow->reparent( this, TQPoint( 0, 0 ), TRUE ); @@ -643,15 +643,15 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, int index ) } /*! - Returns TRUE if the dock area tqcontains the dock window \a w; + Returns TRUE if the dock area contains the dock window \a w; otherwise returns FALSE. If \a index is not 0 it will be set as - follows: if the dock area tqcontains the dock window \a *index is + follows: if the dock area contains the dock window \a *index is set to \a w's index position; otherwise \a *index is set to -1. */ bool TQDockArea::hasDockWindow( TQDockWindow *w, int *index ) { - int i = dockWindows->tqfindRef( w ); + int i = dockWindows->findRef( w ); if ( index ) *index = i; return i != -1; @@ -662,7 +662,7 @@ int TQDockArea::lineOf( int index ) TQPtrList<TQDockWindow> lineStarts = tqlayout->lineStarts(); int i = 0; for ( TQDockWindow *w = lineStarts.first(); w; w = lineStarts.next(), ++i ) { - if ( dockWindows->tqfind( w ) >= index ) + if ( dockWindows->find( w ) >= index ) return i; } return i; @@ -703,20 +703,20 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, const TQPoint &p, const TQRect } TQDockWindow *dockWindow = 0; - int dockWindowIndex = tqfindDockWindow( w ); + int dockWindowIndex = findDockWindow( w ); TQPtrList<TQDockWindow> lineStarts = tqlayout->lineStarts(); TQValueList<TQRect> lines = tqlayout->lineList(); bool wasAloneInLine = FALSE; TQPoint pos = mapFromGlobal( p ); TQRect lr = *lines.at( lineOf( dockWindowIndex ) ); if ( dockWindowIndex != -1 ) { - if ( lineStarts.tqfind( w ) != -1 && - ( (dockWindowIndex < (int)dockWindows->count() - 1 && lineStarts.tqfind( dockWindows->at( dockWindowIndex + 1 ) ) != -1) || + if ( lineStarts.find( w ) != -1 && + ( (dockWindowIndex < (int)dockWindows->count() - 1 && lineStarts.find( dockWindows->at( dockWindowIndex + 1 ) ) != -1) || dockWindowIndex == (int)dockWindows->count() - 1 ) ) wasAloneInLine = TRUE; dockWindow = dockWindows->take( dockWindowIndex ); if ( !wasAloneInLine ) { // only do the pre-tqlayout if the widget isn't the only one in its line - if ( lineStarts.tqfindRef( dockWindow ) != -1 && dockWindowIndex < (int)dockWindows->count() ) + if ( lineStarts.findRef( dockWindow ) != -1 && dockWindowIndex < (int)dockWindows->count() ) dockWindows->at( dockWindowIndex )->setNewLine( TRUE ); tqlayout->layoutItems( TQRect( 0, 0, width(), height() ), TRUE ); } @@ -754,7 +754,7 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, const TQPoint &p, const TQRect bool insertLine = FALSE; int i = 0; TQRect lineRect; - // tqfind the line which we touched with the mouse + // find the line which we touched with the mouse for ( TQValueList<TQRect>::Iterator it = lines.begin(); it != lines.end(); ++it, ++i ) { if ( point_pos( pos, orientation(), TRUE ) >= point_pos( (*it).topLeft(), orientation(), TRUE ) && point_pos( pos, orientation(), TRUE ) <= point_pos( (*it).topLeft(), orientation(), TRUE ) + @@ -782,7 +782,7 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, const TQPoint &p, const TQRect } } - if ( !insertLine && wasAloneInLine && lr.tqcontains( pos ) ) // if we are alone in a line and just moved in there, re-insert it + if ( !insertLine && wasAloneInLine && lr.contains( pos ) ) // if we are alone in a line and just moved in there, re-insert it insertLine = TRUE; #if defined(TQDOCKAREA_DEBUG) @@ -807,14 +807,14 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, const TQPoint &p, const TQRect for ( dw = lineStarts.first(); dw; dw = lineStarts.next() ) dw->setNewLine( TRUE ); - // tqfind the index of the first widget in the search line + // find the index of the first widget in the search line int searchLine = dockLine; #if defined(TQDOCKAREA_DEBUG) qDebug( "search line start of %d", searchLine ); #endif TQDockWindow *lsw = lineStarts.at( searchLine ); - int index = dockWindows->tqfind( lsw ); - if ( index == -1 ) { // the linestart widget hasn't been found, try to tqfind it harder + int index = dockWindows->find( lsw ); + if ( index == -1 ) { // the linestart widget hasn't been found, try to find it harder if ( lsw == w && dockWindowIndex <= (int)dockWindows->count()) index = dockWindowIndex; else @@ -826,7 +826,7 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, const TQPoint &p, const TQRect qDebug( " which starts at %d", index ); #endif if ( !insertLine ) { // if we insert the docking widget in the existing line - // tqfind the index for the widget + // find the index for the widget bool inc = TRUE; bool firstTime = TRUE; for ( dw = dockWindows->current(); dw; dw = dockWindows->next() ) { @@ -834,7 +834,7 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, const TQPoint &p, const TQRect dw->setFixedExtentWidth( -1 ); else dw->setFixedExtentHeight( -1 ); - if ( !firstTime && lineStarts.tqfind( dw ) != -1 ) // we are in the next line, so break + if ( !firstTime && lineStarts.find( dw ) != -1 ) // we are in the next line, so break break; if ( point_pos( pos, orientation() ) < point_pos( fix_pos( dw ), orientation() ) + size_extent( dw->size(), orientation() ) / 2 ) { @@ -849,7 +849,7 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, const TQPoint &p, const TQRect #endif // if we insert it just before a widget which has a new line, transfer the newline to the docking widget // but not if we didn't only mave a widget in its line which was alone in the line before - if ( !( wasAloneInLine && lr.tqcontains( pos ) ) + if ( !( wasAloneInLine && lr.contains( pos ) ) && index >= 0 && index < (int)dockWindows->count() && dockWindows->at( index )->newLine() && lineOf( index ) == dockLine ) { #if defined(TQDOCKAREA_DEBUG) @@ -857,7 +857,7 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, const TQPoint &p, const TQRect #endif dockWindows->at( index )->setNewLine( FALSE ); dockWindow->setNewLine( TRUE ); - } else if ( wasAloneInLine && lr.tqcontains( pos ) ) { + } else if ( wasAloneInLine && lr.contains( pos ) ) { dockWindow->setNewLine( TRUE ); } else { // if we are somewhere in a line, get rid of the newline dockWindow->setNewLine( FALSE ); @@ -910,13 +910,13 @@ void TQDockArea::removeDockWindow( TQDockWindow *w, bool makeFloating, bool swap { w->removeEventFilter( this ); TQDockWindow *dockWindow = 0; - int i = tqfindDockWindow( w ); + int i = findDockWindow( w ); if ( i == -1 ) return; dockWindow = dockWindows->at( i ); dockWindows->remove( i ); TQPtrList<TQDockWindow> lineStarts = tqlayout->lineStarts(); - if ( fixNewLines && lineStarts.tqfindRef( dockWindow ) != -1 && i < (int)dockWindows->count() ) + if ( fixNewLines && lineStarts.findRef( dockWindow ) != -1 && i < (int)dockWindows->count() ) dockWindows->at( i )->setNewLine( TRUE ); if ( makeFloating ) { TQWidget *p = parentWidget() ? parentWidget() : tqtopLevelWidget(); @@ -929,9 +929,9 @@ void TQDockArea::removeDockWindow( TQDockWindow *w, bool makeFloating, bool swap tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); } -int TQDockArea::tqfindDockWindow( TQDockWindow *w ) +int TQDockArea::findDockWindow( TQDockWindow *w ) { - return dockWindows ? dockWindows->tqfindRef( w ) : -1; + return dockWindows ? dockWindows->findRef( w ) : -1; } void TQDockArea::updateLayout() @@ -964,7 +964,7 @@ bool TQDockArea::eventFilter( TQObject *o, TQEvent *e ) void TQDockArea::invalidNextOffset( TQDockWindow *dw ) { - int i = dockWindows->tqfind( dw ); + int i = dockWindows->find( dw ); if ( i == -1 || i >= (int)dockWindows->count() - 1 ) return; if ( ( dw = dockWindows->at( ++i ) ) ) @@ -1020,7 +1020,7 @@ void TQDockArea::lineUp( bool keepNewLines ) TQDockArea::DockWindowData *TQDockArea::dockWindowData( TQDockWindow *w ) { DockWindowData *data = new DockWindowData; - data->index = tqfindDockWindow( w ); + data->index = findDockWindow( w ); if ( data->index == -1 ) { delete data; return 0; @@ -1028,7 +1028,7 @@ TQDockArea::DockWindowData *TQDockArea::dockWindowData( TQDockWindow *w ) TQPtrList<TQDockWindow> lineStarts = tqlayout->lineStarts(); int i = -1; for ( TQDockWindow *dw = dockWindows->first(); dw; dw = dockWindows->next() ) { - if ( lineStarts.tqfindRef( dw ) != -1 ) + if ( lineStarts.findRef( dw ) != -1 ) ++i; if ( dw == w ) break; @@ -1056,7 +1056,7 @@ void TQDockArea::dockWindow( TQDockWindow *dockWindow, DockWindowData *data ) TQPtrList<TQDockWindow> lineStarts = tqlayout->lineStarts(); int index = 0; if ( (int)lineStarts.count() > data->line ) - index = dockWindows->tqfind( lineStarts.at( data->line ) ); + index = dockWindows->find( lineStarts.at( data->line ) ); if ( index == -1 ) { index = 0; (void)dockWindows->at( index ); @@ -1064,7 +1064,7 @@ void TQDockArea::dockWindow( TQDockWindow *dockWindow, DockWindowData *data ) bool firstTime = TRUE; int offset = data->offset; for ( TQDockWindow *dw = dockWindows->current(); dw; dw = dockWindows->next() ) { - if ( !firstTime && lineStarts.tqfind( dw ) != -1 ) + if ( !firstTime && lineStarts.find( dw ) != -1 ) break; if ( offset < point_pos( fix_pos( dw ), orientation() ) + size_extent( dw->size(), orientation() ) / 2 ) @@ -1104,7 +1104,7 @@ bool TQDockArea::isDockWindowAccepted( TQDockWindow *dw ) { if ( !dw ) return FALSE; - if ( forbiddenWidgets.tqfindRef( dw ) != -1 ) + if ( forbiddenWidgets.findRef( dw ) != -1 ) return FALSE; TQMainWindow *mw = ::tqqt_cast<TQMainWindow*>(parentWidget()); @@ -1131,7 +1131,7 @@ void TQDockArea::setAcceptDockWindow( TQDockWindow *dw, bool accept ) { if ( accept ) forbiddenWidgets.removeRef( dw ); - else if ( forbiddenWidgets.tqfindRef( dw ) == -1 ) + else if ( forbiddenWidgets.findRef( dw ) == -1 ) forbiddenWidgets.append( dw ); } @@ -1147,7 +1147,7 @@ void TQDockArea::invalidateFixedSizes() int TQDockArea::maxSpace( int hint, TQDockWindow *dw ) { - int index = tqfindDockWindow( dw ); + int index = findDockWindow( dw ); if ( index == -1 || index + 1 >= (int)dockWindows->count() ) { if ( orientation() == Qt::Horizontal ) return dw->width(); @@ -1224,7 +1224,7 @@ void TQDockArea::setFixedExtent( int d, TQDockWindow *dw ) bool TQDockArea::isLastDockWindow( TQDockWindow *dw ) { - int i = dockWindows->tqfind( dw ); + int i = dockWindows->find( dw ); if ( i == -1 || i >= (int)dockWindows->count() - 1 ) return TRUE; TQDockWindow *w = 0; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdockarea.h b/experimental/tqtinterface/qt4/src/widgets/tqdockarea.h index 34c2a50ce..550732bb0 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdockarea.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqdockarea.h @@ -161,7 +161,7 @@ private: TQGuardedPtr<TQDockArea> area; }; - int tqfindDockWindow( TQDockWindow *w ); + int findDockWindow( TQDockWindow *w ); int lineOf( int index ); DockWindowData *dockWindowData( TQDockWindow *w ); void dockWindow( TQDockWindow *dockWindow, DockWindowData *data ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdockwindow.cpp b/experimental/tqtinterface/qt4/src/widgets/tqdockwindow.cpp index e6e6f558f..fcf0821d2 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdockwindow.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqdockwindow.cpp @@ -767,7 +767,7 @@ void TQDockWindowTitleBar::mouseDoubleClickEvent( TQMouseEvent * ) A dock window is often used to contain a single widget. In these cases the widget can be set by calling setWidget(). If you're - constructing a dock window that tqcontains multiple widgets, e.g. a + constructing a dock window that contains multiple widgets, e.g. a toolbar, arrange the widgets within a box tqlayout inside the dock window. To do this use the boxLayout() function to get a pointer to the dock window's box tqlayout, then add widgets to the tqlayout @@ -1411,7 +1411,7 @@ void TQDockWindow::updatePosition( const TQPoint &globalPos ) dockArea = 0; TQPoint topLeft = currRect.topLeft(); TQRect screen = tqApp->desktop()->availableGeometry( topLeft ); - if ( !screen.tqcontains( topLeft ) ) { + if ( !screen.contains( topLeft ) ) { topLeft.setY(TQMAX(topLeft.y(), screen.top())); topLeft.setY(TQMIN(topLeft.y(), screen.bottom()-height())); topLeft.setX(TQMAX(topLeft.x(), screen.left())); @@ -1972,7 +1972,7 @@ void TQDockWindow::showEvent( TQShowEvent *e ) { if (curPlace == OutsideDock && (tqparent() && strcmp(tqparent()->name(), "qt_hide_dock") != 0)) { TQRect sr = tqApp->desktop()->availableGeometry( this ); - if ( !sr.tqcontains( pos() ) ) { + if ( !sr.contains( pos() ) ) { int nx = TQMIN( TQMAX( x(), sr.x() ), sr.right()-width() ); int ny = TQMIN( TQMAX( y(), sr.y() ), sr.bottom()-height() ); move( nx, ny ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqframe.cpp b/experimental/tqtinterface/qt4/src/widgets/tqframe.cpp index f49b30c8b..811292470 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqframe.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqframe.cpp @@ -511,7 +511,7 @@ void TQFrame::paintEvent( TQPaintEvent *event ) TQPainter paint( this ); - if ( !contentsRect().tqcontains( event->rect() ) ) { + if ( !contentsRect().contains( event->rect() ) ) { paint.save(); paint.setClipRegion( event->region().intersect(frameRect()) ); drawFrame( &paint ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqgridview.cpp b/experimental/tqtinterface/qt4/src/widgets/tqgridview.cpp index 4f6090304..0551c30dd 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqgridview.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqgridview.cpp @@ -63,7 +63,7 @@ draw the contents of a cell. With ensureCellVisible(), you can ensure a certain cell is - visible. With rowAt() and columnAt() you can tqfind a cell based on + visible. With rowAt() and columnAt() you can find a cell based on the given x- and y-coordinates. If you need to monitor changes to the grid's dimensions (i.e. when diff --git a/experimental/tqtinterface/qt4/src/widgets/tqgroupbox.cpp b/experimental/tqtinterface/qt4/src/widgets/tqgroupbox.cpp index f9c341e9e..228204acb 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqgroupbox.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqgroupbox.cpp @@ -277,7 +277,7 @@ void TQGroupBox::setTitle( const TQString &title ) \brief the group box title text. The group box title text will have a focus-change keyboard - accelerator if the title tqcontains \&, followed by a letter. + accelerator if the title contains \&, followed by a letter. \code g->setTitle( "&User information" ); @@ -658,7 +658,7 @@ void TQGroupBox::skip() /*! \internal - This private slot tqfinds a widget in this group box that can accept + This private slot finds a widget in this group box that can accept focus, and gives the focus to that widget. */ diff --git a/experimental/tqtinterface/qt4/src/widgets/tqheader.cpp b/experimental/tqtinterface/qt4/src/widgets/tqheader.cpp index 67fb7f0a4..18d813de9 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqheader.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqheader.cpp @@ -196,7 +196,7 @@ public: \row \i 3 \i 1 \i 2 \endtable - In the example above, if we wanted to tqfind out which section is at + In the example above, if we wanted to find out which section is at index position 3 we'd call mapToSection(3) and get a section number of 1 since section 1 was moved. Similarly, if we wanted to know which index position section 2 occupied we'd call @@ -264,7 +264,7 @@ void TQHeader::showEvent( TQShowEvent *e ) This signal is emitted when the user has changed the size of a \a section from \a oldSize to \a newSize. This signal is typically - connected to a slot that repaints the table or list that tqcontains + connected to a slot that repaints the table or list that contains the header. */ @@ -499,15 +499,15 @@ void TQHeader::unMarkLine( int idx ) Use sectionAt() instead. - Returns the index at which the section is displayed, which tqcontains + Returns the index at which the section is displayed, which contains \a pos in widget coordinates, or -1 if \a pos is outside the header sections. */ /* - Tries to tqfind a line that is not a neighbor of \c handleIdx. + Tries to find a line that is not a neighbor of \c handleIdx. */ -int TQHeader::tqfindLine( int c ) +int TQHeader::findLine( int c ) { int i = 0; if ( c > d->lastPos || (reverse() && c < 0 )) { @@ -716,7 +716,7 @@ void TQHeader::mouseReleaseEvent( TQMouseEvent *e ) case Pressed: { int section = d->i2s[handleIdx]; emit released( section ); - if ( sRect( handleIdx ).tqcontains( e->pos() ) ) { + if ( sRect( handleIdx ).contains( e->pos() ) ) { oldHandleIdx = handleIdx; emit sectionClicked( handleIdx ); emit clicked( section ); @@ -747,7 +747,7 @@ void TQHeader::mouseReleaseEvent( TQMouseEvent *e ) emit released( section ); tqrepaint(); // a bit overkill, but removes the handle as well } else { - if ( sRect( handleIdx).tqcontains( e->pos() ) ) { + if ( sRect( handleIdx).contains( e->pos() ) ) { oldHandleIdx = handleIdx; emit released( section ); emit sectionClicked( handleIdx ); @@ -811,7 +811,7 @@ void TQHeader::mouseMoveEvent( TQMouseEvent *e ) handleColumnResize( handleIdx, c, FALSE, FALSE ); break; case Moving: { - int newPos = tqfindLine( pos ); + int newPos = findLine( pos ); if ( newPos != moveToIdx ) { if ( moveToIdx == handleIdx || moveToIdx == handleIdx + 1 ) tqrepaint( sRect(handleIdx) ); @@ -1104,7 +1104,7 @@ TQSize TQHeader::sectionSizeHint( int section, const TQFontMetrics& fm ) const TQRect bound; TQString *label = d->labels[section]; if ( label ) { - int lines = label->tqcontains( '\n' ) + 1; + int lines = label->contains( '\n' ) + 1; int w = 0; if (lines > 1) { bound.setHeight(fm.height() + fm.lineSpacing() * (lines - 1)); @@ -1733,7 +1733,7 @@ int TQHeader::sectionPos( int section ) const } /*! - Returns the index of the section which tqcontains the position \a + Returns the index of the section which contains the position \a pos given in pixels from the left (or top). \sa offset() diff --git a/experimental/tqtinterface/qt4/src/widgets/tqheader.h b/experimental/tqtinterface/qt4/src/widgets/tqheader.h index ab0f3716e..24fcd259e 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqheader.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqheader.h @@ -173,7 +173,7 @@ private: void unMarkLine( int idx ); int pPos( int i ) const; int pSize( int i ) const; - int tqfindLine( int ); + int findLine( int ); int handleAt( int p ); bool reverse() const; void calculatePositions( bool onlyVisible = FALSE, int start = 0 ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlabel.cpp b/experimental/tqtinterface/qt4/src/widgets/tqlabel.cpp index b29d5999f..491adab9c 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlabel.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqlabel.cpp @@ -85,7 +85,7 @@ public: \row \i Plain text \i Pass a TQString to setText(). \row \i Rich text - \i Pass a TQString that tqcontains rich text to setText(). + \i Pass a TQString that contains rich text to setText(). \row \i A pixmap \i Pass a TQPixmap to setPixmap(). \row \i A movie @@ -180,7 +180,7 @@ TQLabel::TQLabel( const TQString &text, TQWidget *tqparent, const char *name, Constructs a label that displays the text \a text. The label has a buddy widget, \a buddy. - If the \a text tqcontains an underlined letter (a letter preceded by + If the \a text contains an underlined letter (a letter preceded by an ampersand, \&), and the text is in plain text format, when the user presses Alt+ the underlined letter, focus is passed to the buddy widget. @@ -419,7 +419,7 @@ void TQLabel::setNum( double num ) The tqalignment is a bitwise OR of \c TQt::AlignmentFlags and \c TQt::TextFlags values. The \c ExpandTabs, \c SingleLine and \c - ShowPrefix flags apply only if the label tqcontains plain text; + ShowPrefix flags apply only if the label contains plain text; otherwise they are ignored. The \c DontClip flag is always ignored. \c WordBreak applies to both rich text and plain text labels. The \c BreakAnywhere flag is not supported in TQLabel. @@ -430,7 +430,7 @@ void TQLabel::setNum( double num ) The default tqalignment is \c{AlignAuto | AlignVCenter | ExpandTabs} if the label doesn't have a buddy and \c{AlignAuto | AlignVCenter | ExpandTabs | ShowPrefix} if the label has a buddy. If the label - tqcontains rich text, additionally \c WordBreak is turned on. + contains rich text, additionally \c WordBreak is turned on. \sa TQt::AlignmentFlags, tqalignment, setBuddy(), text */ diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlcdnumber.cpp b/experimental/tqtinterface/qt4/src/widgets/tqlcdnumber.cpp index 16f225b41..e84332cb7 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlcdnumber.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqlcdnumber.cpp @@ -197,7 +197,7 @@ static TQString double2string( double num, int base, int ndigits, bool *oflow ) int nd = ndigits; do { s.sprintf( "%*.*g", ndigits, nd, num ); - int i = s.tqfind('e'); + int i = s.find('e'); if ( i > 0 && s[i+1]=='+' ) { s[i] = ' '; s[i+1] = 'e'; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlineedit.cpp b/experimental/tqtinterface/qt4/src/widgets/tqlineedit.cpp index 10c1be869..cca37a751 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlineedit.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqlineedit.cpp @@ -130,12 +130,12 @@ struct TQLineEditPrivate : public TQt TQChar blank; MaskInputData *maskData; inline int nextMaskBlank( int pos ) { - int c = tqfindInMask( pos, TRUE, FALSE ); + int c = findInMask( pos, TRUE, FALSE ); separator |= ( c != pos ); return ( c != -1 ? c : maxLength ); } inline int prevMaskBlank( int pos ) { - int c = tqfindInMask( pos, FALSE, FALSE ); + int c = findInMask( pos, FALSE, FALSE ); separator |= ( c != pos ); return ( c != -1 ? c : 0 ); } @@ -250,7 +250,7 @@ struct TQLineEditPrivate : public TQt TQString maskString( uint pos, const TQString &str, bool clear = FALSE ) const; TQString clearString( uint pos, uint len ) const; TQString stripString( const TQString &str ) const; - int tqfindInMask( int pos, bool forward, bool tqfindSeparator, TQChar searchChar = TQChar() ) const; + int findInMask( int pos, bool forward, bool findSeparator, TQChar searchChar = TQChar() ) const; // input methods int imstart, imend, imselstart, imselend; @@ -1842,7 +1842,7 @@ void TQLineEdit::imComposeEvent( TQIMEvent *e ) e->ignore(); return; } - d->text.tqreplace( d->imstart, d->imend - d->imstart, e->text() ); + d->text.replace( d->imstart, d->imend - d->imstart, e->text() ); d->imend = d->imstart + e->text().length(); d->imselstart = d->imstart + e->cursorPos(); d->imselend = d->imselstart + e->selectionLength(); @@ -1948,11 +1948,11 @@ void TQLineEdit::drawContents( TQPainter *p ) // locate cursor position int cix = 0; - TQTextItem ci = d->textLayout.tqfindItem( d->cursor ); + TQTextItem ci = d->textLayout.findItem( d->cursor ); if ( ci.isValid() ) { if ( d->cursor != (int)d->text.length() && d->cursor == ci.from() + ci.length() && ci.isRightToLeft() != d->isRightToLeft() ) - ci = d->textLayout.tqfindItem( d->cursor + 1 ); + ci = d->textLayout.findItem( d->cursor + 1 ); cix = ci.x() + ci.cursorToX( d->cursor - ci.from() ); } @@ -2376,7 +2376,7 @@ void TQLineEditPrivate::init( const TQString& txt ) void TQLineEditPrivate::updateTextLayout() { - // tqreplace all non-printable characters with spaces (to avoid + // replace all non-printable characters with spaces (to avoid // drawing boxes when using fonts that don't have glyphs for such // characters) const TQString &displayText = q->displayText(); @@ -2419,11 +2419,11 @@ TQRect TQLineEditPrivate::cursorRect() const { TQRect cr = q->contentsRect(); int cix = cr.x() - hscroll + innerMargin; - TQTextItem ci = textLayout.tqfindItem( cursor ); + TQTextItem ci = textLayout.findItem( cursor ); if ( ci.isValid() ) { if ( cursor != (int)text.length() && cursor == ci.from() + ci.length() && ci.isRightToLeft() != isRightToLeft() ) - ci = textLayout.tqfindItem( cursor + 1 ); + ci = textLayout.findItem( cursor + 1 ); cix += ci.x() + ci.cursorToX( cursor - ci.from() ); } int ch = q->fontMetrics().height(); @@ -2560,7 +2560,7 @@ void TQLineEditPrivate::setCursorVisible( bool visible ) if ( cursorTimer ) cursorVisible = visible; TQRect r = cursorRect(); - if ( maskData || !q->contentsRect().tqcontains( r ) ) + if ( maskData || !q->contentsRect().contains( r ) ) q->update(); else q->update( r ); @@ -2586,7 +2586,7 @@ void TQLineEditPrivate::insert( const TQString& s ) addCommand ( Command( DeleteSelection, cursor+i, text.at(cursor+i) ) ); addCommand( Command( Insert, cursor+i, ms.at(i) ) ); } - text.tqreplace( cursor, ms.length(), ms ); + text.replace( cursor, ms.length(), ms ); cursor += ms.length(); cursor = nextMaskBlank( cursor ); } else { @@ -2603,7 +2603,7 @@ void TQLineEditPrivate::del( bool wasBackspace ) if ( cursor < (int) text.length() ) { addCommand ( Command( (CommandType)((maskData?2:0)+(wasBackspace?Remove:Delete)), cursor, text.at(cursor) ) ); if ( maskData ) { - text.tqreplace( cursor, 1, clearString( cursor, 1 ) ); + text.replace( cursor, 1, clearString( cursor, 1 ) ); addCommand( Command( Insert, cursor, text.at( cursor ) ) ); } else { text.remove( cursor, 1 ); @@ -2629,7 +2629,7 @@ void TQLineEditPrivate::removeSelectedText() addCommand ( Command( RemoveSelection, i, text.at(i) ) ); } if ( maskData ) { - text.tqreplace( selstart, selend - selstart, clearString( selstart, selend - selstart ) ); + text.replace( selstart, selend - selstart, clearString( selstart, selend - selstart ) ); for ( int i = 0; i < selend - selstart; ++i ) addCommand( Command( Insert, selstart + i, text.at( selstart + i ) ) ); } else { @@ -2832,15 +2832,15 @@ TQString TQLineEditPrivate::maskString( uint pos, const TQString &str, bool clea ++i; } else { // search for separator first - int n = tqfindInMask( i, TRUE, TRUE, str[(int)strIndex] ); + int n = findInMask( i, TRUE, TRUE, str[(int)strIndex] ); if ( n != -1 ) { if ( str.length() != 1 || i == 0 || (i > 0 && (!maskData[i-1].separator || maskData[i-1].maskChar != str[(int)strIndex])) ) { s += fill.mid( i, n-i+1 ); - i = n + 1; // update i to tqfind + 1 + i = n + 1; // update i to find + 1 } } else { // search for valid blank if not - n = tqfindInMask( i, TRUE, FALSE, str[(int)strIndex] ); + n = findInMask( i, TRUE, FALSE, str[(int)strIndex] ); if ( n != -1 ) { s += fill.mid( i, n-i ); switch ( maskData[ n ].caseMode ) { @@ -2853,7 +2853,7 @@ TQString TQLineEditPrivate::maskString( uint pos, const TQString &str, bool clea default: s += str[(int)strIndex]; } - i = n + 1; // updates i to tqfind + 1 + i = n + 1; // updates i to find + 1 } } } @@ -2910,7 +2910,7 @@ TQString TQLineEditPrivate::stripString( const TQString &str ) const } /* searches forward/backward in maskData for either a separator or a blank */ -int TQLineEditPrivate::tqfindInMask( int pos, bool forward, bool tqfindSeparator, TQChar searchChar ) const +int TQLineEditPrivate::findInMask( int pos, bool forward, bool findSeparator, TQChar searchChar ) const { if ( pos >= maxLength || pos < 0 ) return -1; @@ -2920,7 +2920,7 @@ int TQLineEditPrivate::tqfindInMask( int pos, bool forward, bool tqfindSeparator int i = pos; while ( i != end ) { - if ( tqfindSeparator ) { + if ( findSeparator ) { if ( maskData[ i ].separator && maskData[ i ].maskChar == searchChar ) return i; } else { diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlistbox.cpp b/experimental/tqtinterface/qt4/src/widgets/tqlistbox.cpp index b829780e0..3b84d033f 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlistbox.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqlistbox.cpp @@ -89,7 +89,7 @@ public: variableWidth( FALSE ), inMenuMode( FALSE ) {} - int tqfindItemByName( int item, const TQString &text ); + int findItemByName( int item, const TQString &text ); ~TQListBoxPrivate(); TQListBoxItem * head, *last, *cache; @@ -340,7 +340,7 @@ TQListBoxPrivate::~TQListBoxPrivate() /*! \obsolete - \fn int TQListBox::tqfindItem( int yPos ) const + \fn int TQListBox::findItem( int yPos ) const Returns the index of the item a point (0, \a yPos). \sa index() itemAt() */ @@ -488,11 +488,11 @@ void TQListBoxItem::setSelectable( bool b ) { if ( !listBox() ) return; - bool *sel = listBox()->d->selectable.tqfind( this ); + bool *sel = listBox()->d->selectable.find( this ); if ( !sel ) listBox()->d->selectable.insert( this, new bool( b ) ); else - listBox()->d->selectable.tqreplace( this, new bool( b ) ); + listBox()->d->selectable.replace( this, new bool( b ) ); } /*! @@ -506,7 +506,7 @@ bool TQListBoxItem::isSelectable() const { if ( !listBox() ) return TRUE; - bool *sel = listBox()->d->selectable.tqfind( ( (TQListBoxItem*)this ) ); + bool *sel = listBox()->d->selectable.find( ( (TQListBoxItem*)this ) ); if ( !sel ) return TRUE; else @@ -852,7 +852,7 @@ int TQListBoxPixmap::rtti() const The TQListBox's items are TQListBoxItem objects. TQListBox provides methods to insert new items as strings, as pixmaps, and as TQListBoxItem * (insertItem() with various arguments), and to - tqreplace an existing item with a new string, pixmap or TQListBoxItem + replace an existing item with a new string, pixmap or TQListBoxItem (changeItem() with various arguments). You can also remove items singly with removeItem() or clear() the entire list box. Note that if you create a TQListBoxItem yourself and insert it, TQListBox @@ -876,7 +876,7 @@ int TQListBoxPixmap::rtti() const still supports this mode of operation). Everything can be done using the new objects, and most things can be done using indexes. - Each item in a TQListBox tqcontains a TQListBoxItem. One of the items + Each item in a TQListBox contains a TQListBoxItem. One of the items can be the current item. The currentChanged() signal and the highlighted() signal are emitted when a new item becomes current, e.g. because the user clicks on it or TQListBox::setCurrentItem() @@ -2260,7 +2260,7 @@ void TQListBox::mouseMoveEvent( TQMouseEvent *e ) // hack to keep the combo (and what else?) working: if we get a // move outside the listbox without having seen a press, discard // it. - if ( !TQRect( 0, 0, visibleWidth(), visibleHeight() ).tqcontains( e->pos() ) && + if ( !TQRect( 0, 0, visibleWidth(), visibleHeight() ).contains( e->pos() ) && ( (d->mousePressColumn < 0 && d->mousePressRow < 0) || (e->state() == Qt::NoButton && !d->pressedItem) ) ) return; @@ -2643,14 +2643,14 @@ void TQListBox::keyPressEvent( TQKeyEvent *e ) curItem = 0; if ( !d->inputTimer->isActive() ) { d->currInputString = e->text(); - curItem = d->tqfindItemByName( ++curItem, d->currInputString ); + curItem = d->findItemByName( ++curItem, d->currInputString ); } else { d->inputTimer->stop(); d->currInputString += e->text(); int oldCurItem = curItem; - curItem = d->tqfindItemByName( curItem, d->currInputString ); + curItem = d->findItemByName( curItem, d->currInputString ); if ( curItem < 0 ) { - curItem = d->tqfindItemByName( ++oldCurItem, e->text() ); + curItem = d->findItemByName( ++oldCurItem, e->text() ); d->currInputString = e->text(); } } @@ -3531,7 +3531,7 @@ TQListBoxItem * TQListBox::itemAt( const TQPoint& p ) const // take into acount frame margin to get to viewport np -= viewport()->pos(); - if (!TQT_TQRECT_OBJECT(viewport()->rect()).tqcontains(np)) + if (!TQT_TQRECT_OBJECT(viewport()->rect()).contains(np)) return 0; // take into account contents position @@ -3910,7 +3910,7 @@ int TQListBox::rowAt( int y ) const if ( y < 0 ) return -1; - // tqfind the top item, use bsearch for speed + // find the top item, use bsearch for speed int l = 0; int r = d->rowPos.size() - 2; if ( r < 0 ) @@ -4281,7 +4281,7 @@ void TQListBox::takeItem( const TQListBoxItem * item ) Finds the next item after start beginning with \a text. */ -int TQListBoxPrivate::tqfindItemByName( int start, const TQString &text ) +int TQListBoxPrivate::findItemByName( int start, const TQString &text ) { if ( start < 0 || (uint)start >= listBox->count() ) start = 0; @@ -4322,7 +4322,7 @@ void TQListBox::clearInputString() \sa TQt::StringComparisonMode */ -TQListBoxItem *TQListBox::tqfindItem( const TQString &text, TQt::ComparisonFlags compare ) const +TQListBoxItem *TQListBox::findItem( const TQString &text, TQt::ComparisonFlags compare ) const { if ( text.isEmpty() ) return 0; @@ -4343,7 +4343,7 @@ TQListBoxItem *TQListBox::tqfindItem( const TQString &text, TQt::ComparisonFlags TQListBoxItem *beginsWithItem = 0; TQListBoxItem *endsWithItem = 0; - TQListBoxItem *tqcontainsItem = 0; + TQListBoxItem *containsItem = 0; if ( item ) { for ( ; item; item = item->n ) { @@ -4355,11 +4355,11 @@ TQListBoxItem *TQListBox::tqfindItem( const TQString &text, TQt::ComparisonFlags if ( compare & TQt::ExactMatch && itmtxt == comtxt ) return item; if ( compare & TQt::BeginsWith && !beginsWithItem && itmtxt.startsWith( comtxt ) ) - beginsWithItem = tqcontainsItem = item; + beginsWithItem = containsItem = item; if ( compare & TQt::EndsWith && !endsWithItem && itmtxt.endsWith( comtxt ) ) - endsWithItem = tqcontainsItem = item; - if ( compare & TQt::Contains && !tqcontainsItem && itmtxt.tqcontains( comtxt ) ) - tqcontainsItem = item; + endsWithItem = containsItem = item; + if ( compare & TQt::Contains && !containsItem && itmtxt.contains( comtxt ) ) + containsItem = item; } if ( d->current && d->head ) { @@ -4373,11 +4373,11 @@ TQListBoxItem *TQListBox::tqfindItem( const TQString &text, TQt::ComparisonFlags if ( compare & TQt::ExactMatch && itmtxt == comtxt ) return item; if ( compare & TQt::BeginsWith && !beginsWithItem && itmtxt.startsWith( comtxt ) ) - beginsWithItem = tqcontainsItem = item; + beginsWithItem = containsItem = item; if ( compare & TQt::EndsWith && !endsWithItem && itmtxt.endsWith( comtxt ) ) - endsWithItem = tqcontainsItem = item; - if ( compare & TQt::Contains && !tqcontainsItem && itmtxt.tqcontains( comtxt ) ) - tqcontainsItem = item; + endsWithItem = containsItem = item; + if ( compare & TQt::Contains && !containsItem && itmtxt.contains( comtxt ) ) + containsItem = item; } } } @@ -4387,8 +4387,8 @@ TQListBoxItem *TQListBox::tqfindItem( const TQString &text, TQt::ComparisonFlags return beginsWithItem; else if ( endsWithItem ) return endsWithItem; - else if ( tqcontainsItem ) - return tqcontainsItem; + else if ( containsItem ) + return containsItem; return 0; } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlistbox.h b/experimental/tqtinterface/qt4/src/widgets/tqlistbox.h index 936c69a56..0b464a9c1 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlistbox.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqlistbox.h @@ -141,7 +141,7 @@ public: TQListBoxItem *item( int index ) const; int index( const TQListBoxItem * ) const; - TQListBoxItem *tqfindItem( const TQString &text, TQt::ComparisonFlags compare = TQt::BeginsWith ) const; + TQListBoxItem *findItem( const TQString &text, TQt::ComparisonFlags compare = TQt::BeginsWith ) const; void triggerUpdate( bool doLayout ); @@ -276,7 +276,7 @@ protected: #ifndef TQT_NO_COMPAT bool itemYPos( int index, int *yPos ) const; - int tqfindItem( int yPos ) const { return index(itemAt(TQPoint(0,yPos)) ); } + int findItem( int yPos ) const { return index(itemAt(TQPoint(0,yPos)) ); } #endif protected Q_SLOTS: diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlistview.cpp b/experimental/tqtinterface/qt4/src/widgets/tqlistview.cpp index 46060c882..506ec6035 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlistview.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqlistview.cpp @@ -403,7 +403,7 @@ static TQString qEllipsisText( const TQString &org, const TQFontMetrics &fm, int you can get a pointer to any TQListViewItem in a TQListView using TQListView::selectedItem(), TQListView::currentItem(), TQListView::firstChild(), TQListView::lastItem() and - TQListView::tqfindItem(). + TQListView::findItem(). If you call \c delete on a list view item, it will be deleted as expected, and as usual for \l{TQObject}s, if it has any child items @@ -1115,7 +1115,7 @@ bool TQListViewItem::acceptDrop( const TQMimeSource * ) const /*! This function is called when something was dropped on the item. \a e - tqcontains all the information about the drop. + contains all the information about the drop. The default implementation does nothing, subclasses may need to reimplement this function. @@ -1611,7 +1611,7 @@ void TQListViewItem::setup() if ( mlenabled ) { h = ph; for ( int c = 0; c < lv->columns(); ++c ) { - int lines = text( c ).tqcontains( TQChar('\n') ) + 1; + int lines = text( c ).contains( TQChar('\n') ) + 1; int tmph = lv->d->fontMetricsHeight + lv->fontMetrics().lineSpacing() * ( lines - 1 ); h = TQMAX( h, tmph ); @@ -1884,9 +1884,9 @@ void TQListViewItem::setText( int column, const TQString &text ) int newLc = 0; if ( mlenabled ) { if ( !l->text.isEmpty() ) - oldLc = l->text.tqcontains( TQChar( '\n' ) ) + 1; + oldLc = l->text.contains( TQChar( '\n' ) ) + 1; if ( !text.isEmpty() ) - newLc = text.tqcontains( TQChar( '\n' ) ) + 1; + newLc = text.contains( TQChar( '\n' ) ) + 1; } l->dirty = TRUE; @@ -2860,7 +2860,7 @@ void TQListView::drawContentsOffset( TQPainter * p, int ox, int oy, while( (i = (TQListViewItem *)(it.currentKey())) != 0 ) { ++it; TQRect ir = tqitemRect( i ).intersect( viewport()->rect() ); - if ( ir.isEmpty() || br.tqcontains( ir ) ) + if ( ir.isEmpty() || br.contains( ir ) ) // we're painting this one, or it needs no painting: forget it d->dirtyItems->remove( (void *)i ); } @@ -2896,7 +2896,7 @@ void TQListView::drawContentsOffset( TQPainter * p, int ox, int oy, // need to paint current? if ( ih > 0 && current->y < cy+ch && current->y+ih > cy ) { if ( fx < 0 ) { - // tqfind first interesting column, once + // find first interesting column, once x = 0; c = 0; cs = d->h->cellSize( 0 ); @@ -3125,7 +3125,7 @@ void TQListView::buildDrawableList() const // down again if any tqchildren are not to be painted if ( cur->y < d->topPixel ) d->topPixel = cur->y; - // bottompixel is easy: the bottom item drawn tqcontains it + // bottompixel is easy: the bottom item drawn contains it d->bottomPixel = cur->y + ih - 1; } @@ -3880,7 +3880,7 @@ bool TQListView::eventFilter( TQObject * o, TQEvent * e ) /*! Returns a pointer to the list view containing this item. - Note that this function traverses the items to the root to tqfind the + Note that this function traverses the items to the root to find the listview. This function will return 0 for taken items - see TQListViewItem::takeItem() */ @@ -3916,7 +3916,7 @@ int TQListViewItem::depth() const that this item is visible, or can be made visible by scrolling). This function might be relatively slow because of the tree - traversions needed to tqfind the correct item. + traversions needed to find the correct item. \sa itemBelow() TQListView::tqitemRect() */ @@ -4256,7 +4256,7 @@ void TQListView::contentsMousePressEventEx( TQMouseEvent * e ) d->ignoreEditAfterFocus = FALSE; if ( currentItem() && currentItem()->renameBox && - !tqitemRect( currentItem() ).tqcontains( e->pos() ) ) { + !tqitemRect( currentItem() ).contains( e->pos() ) ) { d->startEdit = FALSE; if ( d->defRenameAction == Reject ) currentItem()->cancelRename( currentItem()->renameCol ); @@ -4557,7 +4557,7 @@ void TQListView::contentsMouseReleaseEventEx( TQMouseEvent * e ) if ( d->pressedColumn == 0 ) r.setLeft( r.left() + itemMargin() + ( currentItem()->depth() + ( rootIsDecorated() ? 1 : 0 ) ) * treeStepSize() - 1 ); - if ( r.tqcontains( e->pos() ) && + if ( r.contains( e->pos() ) && !( e->state() & ( ShiftButton | ControlButton ) ) ) d->renameTimer->start( TQApplication::doubleClickInterval(), TRUE ); } @@ -5179,7 +5179,7 @@ void TQListView::keyPressEvent( TQKeyEvent * e ) } \endcode - This might be interesting if you use this function to tqfind out + This might be interesting if you use this function to find out where the user clicked and if you want to start a drag (which you do not want to do if the user clicked onto the root decoration of an item). @@ -5948,7 +5948,7 @@ TQListViewItem * TQListView::firstChild() const Returns the last item in the list view tree. Returns 0 if there are no items in the TQListView. - This function is slow because it traverses the entire tree to tqfind + This function is slow because it traverses the entire tree to find the last item. */ @@ -5990,7 +5990,7 @@ void TQListView::repaintItem( const TQListViewItem * item ) const d->dirtyItemTimer->start( 0, TRUE ); if ( !d->dirtyItems ) d->dirtyItems = new TQPtrDict<void>(); - d->dirtyItems->tqreplace( (void *)item, (void *)item ); + d->dirtyItems->replace( (void *)item, (void *)item ); } @@ -6426,7 +6426,7 @@ void TQCheckListItem::setCurrentState( ToggleState s ) void TQCheckListItem::setStoredState( ToggleState newState, void *key ) { if ( myType == CheckBox || myType == CheckBoxController ) - d->statesDict->tqreplace( key, new ToggleState(newState) ); + d->statesDict->replace( key, new ToggleState(newState) ); } /* @@ -6438,7 +6438,7 @@ TQCheckListItem::ToggleState TQCheckListItem::storedState( void *key ) const if ( !d->statesDict ) return Off; - ToggleState *foundState = d->statesDict->tqfind( key ); + ToggleState *foundState = d->statesDict->find( key ); if ( foundState ) return ToggleState( *foundState ); else @@ -6494,7 +6494,7 @@ void TQCheckListItem::activate() TQRect r( x, y, boxsize-3, boxsize-3 ); // columns might have been swapped r.moveBy( lv->header()->sectionPos( 0 ), 0 ); - if ( !r.tqcontains( pos ) ) + if ( !r.contains( pos ) ) return; } if ( ( myType == CheckBox ) || ( myType == CheckBoxController) ) { @@ -7444,7 +7444,7 @@ TQListViewItemIterator::TQListViewItemIterator() } /*! - Constructs an iterator for the TQListView that tqcontains the \a + Constructs an iterator for the TQListView that contains the \a item. The current iterator item is set to point to the \a item. */ @@ -7461,7 +7461,7 @@ TQListViewItemIterator::TQListViewItemIterator( TQListViewItem *item ) } /*! - Constructs an iterator for the TQListView that tqcontains the \a item + Constructs an iterator for the TQListView that contains the \a item using the flags \a iteratorFlags. The current iterator item is set to point to \a item or the next matching item if \a item doesn't match the flags. @@ -7772,7 +7772,7 @@ TQListViewItem *TQListViewItemIterator::current() const TQListViewItemIteratorPrivate* TQListViewItemIterator::d() const { return qt_iteratorprivate_dict ? - qt_iteratorprivate_dict->tqfind( (void *)this ) : 0; + qt_iteratorprivate_dict->find( (void *)this ) : 0; } void TQListViewItemIterator::init( int iteratorFlags ) @@ -8081,7 +8081,7 @@ bool TQListView::selectRange( TQListViewItem *newItem, TQListViewItem *oldItem, The default comparison mode is case-sensitive, exact match. */ -TQListViewItem *TQListView::tqfindItem( const TQString& text, int column, +TQListViewItem *TQListView::findItem( const TQString& text, int column, TQt::ComparisonFlags compare ) const { if (text.isEmpty() && !(compare & TQt::ExactMatch)) @@ -8100,7 +8100,7 @@ TQListViewItem *TQListView::tqfindItem( const TQString& text, int column, TQListViewItem *item; TQListViewItem *beginsWithItem = 0; TQListViewItem *endsWithItem = 0; - TQListViewItem *tqcontainsItem = 0; + TQListViewItem *containsItem = 0; for ( int pass = 0; pass < 2; pass++ ) { while ( (item = it.current()) != sentinel ) { @@ -8111,11 +8111,11 @@ TQListViewItem *TQListView::tqfindItem( const TQString& text, int column, if ( compare & TQt::ExactMatch && itmtxt == comtxt ) return item; if ( compare & TQt::BeginsWith && !beginsWithItem && itmtxt.startsWith( comtxt ) ) - beginsWithItem = tqcontainsItem = item; + beginsWithItem = containsItem = item; if ( compare & TQt::EndsWith && !endsWithItem && itmtxt.endsWith( comtxt ) ) - endsWithItem = tqcontainsItem = item; - if ( compare & TQt::Contains && !tqcontainsItem && itmtxt.tqcontains( comtxt ) ) - tqcontainsItem = item; + endsWithItem = containsItem = item; + if ( compare & TQt::Contains && !containsItem && itmtxt.contains( comtxt ) ) + containsItem = item; ++it; } @@ -8128,8 +8128,8 @@ TQListViewItem *TQListView::tqfindItem( const TQString& text, int column, return beginsWithItem; else if ( endsWithItem ) return endsWithItem; - else if ( tqcontainsItem ) - return tqcontainsItem; + else if ( containsItem ) + return containsItem; return 0; } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlistview.h b/experimental/tqtinterface/qt4/src/widgets/tqlistview.h index 11d2110b8..3d6c997c2 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlistview.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqlistview.h @@ -353,7 +353,7 @@ public: virtual void setResizeMode( ResizeMode m ); ResizeMode resizeMode() const; - TQListViewItem * tqfindItem( const TQString& text, int column, TQt::ComparisonFlags compare = TQt::ExactMatch | TQt::CaseSensitive ) const; + TQListViewItem * findItem( const TQString& text, int column, TQt::ComparisonFlags compare = TQt::ExactMatch | TQt::CaseSensitive ) const; enum RenameAction { Accept, Reject }; virtual void setDefaultRenameAction( RenameAction a ); @@ -508,7 +508,7 @@ public: int width( const TQFontMetrics&, const TQListView*, int column) const; void setup(); - virtual void setOn( bool ); // ### should be tqreplaced by setChecked in ver4 + virtual void setOn( bool ); // ### should be replaced by setChecked in ver4 bool isOn() const { return on; } Type type() const { return myType; } TQString text() const { return TQListViewItem::text( 0 ); } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqmainwindow.cpp b/experimental/tqtinterface/qt4/src/widgets/tqmainwindow.cpp index 1921297c2..6a649bc7f 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqmainwindow.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqmainwindow.cpp @@ -1125,7 +1125,7 @@ TQToolTipGroup * TQMainWindow::toolTipGroup() const void TQMainWindow::setDockEnabled( TQt::Dock dock, bool enable ) { - d->docks.tqreplace( dock, enable ); + d->docks.replace( dock, enable ); } @@ -1180,7 +1180,7 @@ bool TQMainWindow::isDockEnabled( TQDockArea *area ) const void TQMainWindow::setDockEnabled( TQDockWindow *dw, TQt::Dock dock, bool enable ) { - if ( d->dockWindows.tqfind( dw ) == -1 ) { + if ( d->dockWindows.find( dw ) == -1 ) { d->dockWindows.append( dw ); connect( dw, TQT_SIGNAL( placeChanged(TQDockWindow::Place) ), this, TQT_SLOT( slotPlaceChanged() ) ); @@ -1189,7 +1189,7 @@ void TQMainWindow::setDockEnabled( TQDockWindow *dw, TQt::Dock dock, bool enable s.sprintf( "%p_%d", (void*)dw, (int)dock ); if ( enable ) d->disabledDocks.remove( s ); - else if ( d->disabledDocks.tqfind( s ) == d->disabledDocks.end() ) + else if ( d->disabledDocks.find( s ) == d->disabledDocks.end() ) d->disabledDocks << s; switch ( dock ) { case TQt::DockTop: @@ -1251,7 +1251,7 @@ bool TQMainWindow::isDockEnabled( TQDockWindow *tb, TQt::Dock dock ) const return FALSE; TQString s; s.sprintf( "%p_%d", (void*)tb, (int)dock ); - return d->disabledDocks.tqfind( s ) == d->disabledDocks.end(); + return d->disabledDocks.find( s ) == d->disabledDocks.end(); } @@ -1279,7 +1279,7 @@ void TQMainWindow::addDockWindow( TQDockWindow *dockWindow, #endif moveDockWindow( dockWindow, edge ); dockWindow->setNewLine( newLine ); - if ( d->dockWindows.tqfind( dockWindow ) == -1 ) { + if ( d->dockWindows.find( dockWindow ) == -1 ) { d->dockWindows.append( dockWindow ); connect( dockWindow, TQT_SIGNAL( placeChanged(TQDockWindow::Place) ), this, TQT_SLOT( slotPlaceChanged() ) ); @@ -1701,7 +1701,7 @@ void TQMainWindow::childEvent( TQChildEvent* e) d->sb = ::tqqt_cast<TQStatusBar*>(e->child()); if ( d->sb ) { if ( d->tll ) { - if ( !d->tll->tqfindWidget( d->sb ) ) + if ( !d->tll->findWidget( d->sb ) ) d->tll->addWidget( d->sb ); } else { triggerLayout(); @@ -2154,7 +2154,7 @@ void TQMainWindow::setDockMenuEnabled( bool b ) } /*! - Creates the dock window menu which tqcontains all toolbars (if \a + Creates the dock window menu which contains all toolbars (if \a dockWindows is \c OnlyToolBars ), all dock windows (if \a dockWindows is \c NoToolBars) or all toolbars and dock windows (if \a dockWindows is \c AllDockWindows - the default). @@ -2198,7 +2198,7 @@ TQPopupMenu *TQMainWindow::createDockWindowMenu( DockWindows dockWindows ) const TQPopupMenu *menu = new TQPopupMenu( (TQMainWindow*)this, "qt_customize_menu" ); menu->setCheckable( TRUE ); - d->dockWindowModes.tqreplace( menu, dockWindows ); + d->dockWindowModes.replace( menu, dockWindows ); connect( menu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( menuAboutToShow() ) ); return menu; } @@ -2218,7 +2218,7 @@ TQPopupMenu *TQMainWindow::createDockWindowMenu( DockWindows dockWindows ) const void TQMainWindow::menuAboutToShow() { TQPopupMenu *menu = (TQPopupMenu*)sender(); - TQMap<TQPopupMenu*, DockWindows>::Iterator it = d->dockWindowModes.tqfind( menu ); + TQMap<TQPopupMenu*, DockWindows>::Iterator it = d->dockWindowModes.find( menu ); if ( it == d->dockWindowModes.end() ) return; menu->clear(); @@ -2349,7 +2349,7 @@ TQDockArea *TQMainWindow::dockingArea( const TQPoint &p ) bool TQMainWindow::hasDockWindow( TQDockWindow *dw ) { - return d->dockWindows.tqfindRef( dw ) != -1; + return d->dockWindows.findRef( dw ) != -1; } /*! @@ -2451,7 +2451,7 @@ bool TQMainWindow::isCustomizable() const bool TQMainWindow::appropriate( TQDockWindow *dw ) const { - TQMap<TQDockWindow*, bool>::ConstIterator it = d->appropriate.tqfind( dw ); + TQMap<TQDockWindow*, bool>::ConstIterator it = d->appropriate.find( dw ); if ( it == d->appropriate.end() ) return TRUE; return *it; @@ -2474,7 +2474,7 @@ bool TQMainWindow::appropriate( TQDockWindow *dw ) const void TQMainWindow::setAppropriate( TQDockWindow *dw, bool a ) { - d->appropriate.tqreplace( dw, a ); + d->appropriate.replace( dw, a ); } #ifndef TQT_NO_TEXTSTREAM diff --git a/experimental/tqtinterface/qt4/src/widgets/tqmenubar.cpp b/experimental/tqtinterface/qt4/src/widgets/tqmenubar.cpp index 0a1feba61..e932f1814 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqmenubar.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqmenubar.cpp @@ -695,7 +695,7 @@ void TQMenuBar::popupDestroyed( TQObject *o ) bool TQMenuBar::tryMouseEvent( TQPopupMenu *, TQMouseEvent *e ) { TQPoint pos = mapFromGlobal( e->globalPos() ); - if ( !TQT_TQRECT_OBJECT(rect()).tqcontains( pos ) ) // outside + if ( !TQT_TQRECT_OBJECT(rect()).contains( pos ) ) // outside return FALSE; int item = itemAtPos( pos ); if ( item == -1 && (e->type() == TQEvent::MouseButtonPress || @@ -965,8 +965,8 @@ int TQMenuBar::calculateRects( int max_width ) } else { w = fm.boundingRect( s ).width() + 2*motifItemHMargin; } - w -= s.tqcontains('&')*fm.width('&'); - w += s.tqcontains("&&")*fm.width('&'); + w -= s.contains('&')*fm.width('&'); + w += s.contains("&&")*fm.width('&'); w = TQMAX( w, TQApplication::globalStrut().width() ); if (gs == GtkStyle ) { h = TQMAX( fm.height() + gtkItemVMargin, TQApplication::globalStrut().height() ); @@ -1106,7 +1106,7 @@ int TQMenuBar::itemAtPos( const TQPoint &pos_ ) pos.setX( TQMAX( margin, TQMIN( width() - margin, pos.x()))); pos.setY( TQMAX( margin, TQMIN( height() - margin, pos.y()))); while ( i < (int)mitems->count() ) { - if ( !irects[i].isEmpty() && irects[i].tqcontains( pos ) ) { + if ( !irects[i].isEmpty() && irects[i].contains( pos ) ) { TQMenuItem *mi = mitems->at(i); return mi->isSeparator() ? -1 : i; } @@ -1219,7 +1219,7 @@ void TQMenuBar::mousePressEvent( TQMouseEvent *e ) #ifndef USE_QT4 TQFocusEvent::Reason oldReason = TQFocusEvent::reason(); #endif // USE_QT4 - TQMenuItem *mi = tqfindItem( idAt( item ) ); + TQMenuItem *mi = findItem( idAt( item ) ); // we know that a popup will open, so set the reason to avoid // itemviews to redraw their selections if ( mi && mi->popup() ) @@ -1377,7 +1377,7 @@ void TQMenuBar::keyPressEvent( TQKeyEvent *e ) ++it; TQString s = m->text(); if ( !s.isEmpty() ) { - int i = s.tqfind( '&' ); + int i = s.find( '&' ); if ( i >= 0 ) { if ( s[i+1].upper() == c ) { diff --git a/experimental/tqtinterface/qt4/src/widgets/tqmenudata.cpp b/experimental/tqtinterface/qt4/src/widgets/tqmenudata.cpp index 2f0fd808d..2061254a3 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqmenudata.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqmenudata.cpp @@ -96,7 +96,7 @@ TQMenuDataData::TQMenuDataData() respectively. By default, newly created menu items are visible. They can be hidden (and shown again) with setItemVisible(). - Menu items are stored in a list. Use tqfindItem() to tqfind an item by + Menu items are stored in a list. Use findItem() to find an item by its list position or by its menu identifier. (See also indexOf() and idAt().) @@ -278,7 +278,7 @@ int TQMenuData::insertAny( const TQString *text, const TQPixmap *pixmap, mi->text_data = text?*text:TQString(); #else TQString newText( *text ); - newText.truncate( newText.tqfindRev( '\t' ) ); + newText.truncate( newText.findRev( '\t' ) ); mi->text_data = newText.isEmpty()?TQString():newText; #endif #ifndef TQT_NO_ACCEL @@ -308,10 +308,10 @@ int TQMenuData::insertAny( const TQString *text, const TQPixmap *pixmap, /*! \internal - Internal function that tqfinds the menu item where \a popup is located, + Internal function that finds the menu item where \a popup is located, storing its index at \a index if \a index is not NULL. */ -TQMenuItem *TQMenuData::tqfindPopup( TQPopupMenu *popup, int *index ) +TQMenuItem *TQMenuData::findPopup( TQPopupMenu *popup, int *index ) { int i = 0; TQMenuItem *mi = mitems->first(); @@ -329,7 +329,7 @@ TQMenuItem *TQMenuData::tqfindPopup( TQPopupMenu *popup, int *index ) void TQMenuData::removePopup( TQPopupMenu *popup ) { int index = 0; - TQMenuItem *mi = tqfindPopup( popup, &index ); + TQMenuItem *mi = findPopup( popup, &index ); if ( mi ) { mi->popup_menu = 0; removeItemAt( index ); @@ -802,7 +802,7 @@ int TQMenuData::insertSeparator( int index ) void TQMenuData::removeItem( int id ) { TQMenuData *tqparent; - if ( tqfindItem( id, &tqparent ) ) + if ( findItem( id, &tqparent ) ) tqparent->removeItemAt(tqparent->indexOf(id)); } @@ -872,7 +872,7 @@ void TQMenuData::clear() TQKeySequence TQMenuData::accel( int id ) const { - TQMenuItem *mi = tqfindItem( id ); + TQMenuItem *mi = findItem( id ); if ( mi ) return mi->key(); return TQKeySequence(); @@ -883,7 +883,7 @@ TQKeySequence TQMenuData::accel( int id ) const An accelerator key consists of a key code and a combination of the modifiers \c SHIFT, \c CTRL, \c ALT or \c UNICODE_ACCEL (OR'ed or - added). The header file \c tqnamespace.h tqcontains a list of key + added). The header file \c tqnamespace.h contains a list of key codes. Defining an accelerator key produces a text that is added to the @@ -927,7 +927,7 @@ TQKeySequence TQMenuData::accel( int id ) const void TQMenuData::setAccel( const TQKeySequence& key, int id ) { TQMenuData *tqparent; - TQMenuItem *mi = tqfindItem( id, &tqparent ); + TQMenuItem *mi = findItem( id, &tqparent ); if ( mi ) { mi->accel_key = key; tqparent->menuContentsChanged(); @@ -945,7 +945,7 @@ void TQMenuData::setAccel( const TQKeySequence& key, int id ) TQIconSet* TQMenuData::iconSet( int id ) const { - TQMenuItem *mi = tqfindItem( id ); + TQMenuItem *mi = findItem( id ); return mi ? mi->iconSet() : 0; } @@ -958,7 +958,7 @@ TQIconSet* TQMenuData::iconSet( int id ) const TQString TQMenuData::text( int id ) const { - TQMenuItem *mi = tqfindItem( id ); + TQMenuItem *mi = findItem( id ); return mi ? mi->text() : TQString::null; } @@ -971,7 +971,7 @@ TQString TQMenuData::text( int id ) const TQPixmap *TQMenuData::pixmap( int id ) const { - TQMenuItem *mi = tqfindItem( id ); + TQMenuItem *mi = findItem( id ); return mi ? mi->pixmap() : 0; } @@ -1013,7 +1013,7 @@ TQPixmap *TQMenuData::pixmap( int id ) const void TQMenuData::changeItem( int id, const TQString &text ) { TQMenuData *tqparent; - TQMenuItem *mi = tqfindItem( id, &tqparent ); + TQMenuItem *mi = findItem( id, &tqparent ); if ( mi ) { // item found if ( mi->text_data == text ) // same string return; @@ -1023,7 +1023,7 @@ void TQMenuData::changeItem( int id, const TQString &text ) } mi->text_data = text; #ifndef TQT_NO_ACCEL - if ( !mi->accel_key && text.tqfind( '\t' ) != -1 ) + if ( !mi->accel_key && text.find( '\t' ) != -1 ) mi->accel_key = TQt::Key_unknown; #endif tqparent->menuContentsChanged(); @@ -1042,7 +1042,7 @@ void TQMenuData::changeItem( int id, const TQString &text ) void TQMenuData::changeItem( int id, const TQPixmap &pixmap ) { TQMenuData *tqparent; - TQMenuItem *mi = tqfindItem( id, &tqparent ); + TQMenuItem *mi = findItem( id, &tqparent ); if ( mi ) { // item found register TQPixmap *i = mi->pixmap_data; bool fast_refresh = i != 0 && @@ -1104,7 +1104,7 @@ void TQMenuData::changeItem( int id, const TQIconSet &icon, const TQPixmap &pixm void TQMenuData::changeItemIconSet( int id, const TQIconSet &icon ) { TQMenuData *tqparent; - TQMenuItem *mi = tqfindItem( id, &tqparent ); + TQMenuItem *mi = findItem( id, &tqparent ); if ( mi ) { // item found register TQIconSet *i = mi->iconset_data; bool fast_refresh = i != 0; @@ -1130,7 +1130,7 @@ void TQMenuData::changeItemIconSet( int id, const TQIconSet &icon ) bool TQMenuData::isItemEnabled( int id ) const { - TQMenuItem *mi = tqfindItem( id ); + TQMenuItem *mi = findItem( id ); return mi ? mi->isEnabled() : FALSE; } @@ -1144,7 +1144,7 @@ bool TQMenuData::isItemEnabled( int id ) const void TQMenuData::setItemEnabled( int id, bool enable ) { TQMenuData *tqparent; - TQMenuItem *mi = tqfindItem( id, &tqparent ); + TQMenuItem *mi = findItem( id, &tqparent ); if ( mi && (bool)mi->is_enabled != enable ) { mi->is_enabled = enable; #if !defined(TQT_NO_ACCEL) && !defined(TQT_NO_POPUPMENU) @@ -1176,7 +1176,7 @@ bool TQMenuData::isItemActive( int id ) const bool TQMenuData::isItemChecked( int id ) const { - TQMenuItem *mi = tqfindItem( id ); + TQMenuItem *mi = findItem( id ); return mi ? mi->isChecked() : FALSE; } @@ -1191,7 +1191,7 @@ bool TQMenuData::isItemChecked( int id ) const void TQMenuData::setItemChecked( int id, bool check ) { TQMenuData *tqparent; - TQMenuItem *mi = tqfindItem( id, &tqparent ); + TQMenuItem *mi = findItem( id, &tqparent ); if ( mi && (bool)mi->is_checked != check ) { mi->is_checked = check; #ifndef TQT_NO_POPUPMENU @@ -1211,7 +1211,7 @@ void TQMenuData::setItemChecked( int id, bool check ) bool TQMenuData::isItemVisible( int id ) const { - TQMenuItem *mi = tqfindItem( id ); + TQMenuItem *mi = findItem( id ); return mi ? mi->isVisible() : FALSE; } @@ -1225,7 +1225,7 @@ bool TQMenuData::isItemVisible( int id ) const void TQMenuData::setItemVisible( int id, bool visible ) { TQMenuData *tqparent; - TQMenuItem *mi = tqfindItem( id, &tqparent ); + TQMenuItem *mi = findItem( id, &tqparent ); if ( mi && (bool)mi->is_visible != visible ) { mi->is_visible = visible; tqparent->menuContentsChanged(); @@ -1245,9 +1245,9 @@ void TQMenuData::setItemVisible( int id, bool visible ) \sa indexOf() */ -TQMenuItem *TQMenuData::tqfindItem( int id ) const +TQMenuItem *TQMenuData::findItem( int id ) const { - return tqfindItem( id, 0 ); + return findItem( id, 0 ); } @@ -1266,7 +1266,7 @@ TQMenuItem *TQMenuData::tqfindItem( int id ) const \sa indexOf() */ -TQMenuItem * TQMenuData::tqfindItem( int id, TQMenuData ** tqparent ) const +TQMenuItem * TQMenuData::findItem( int id, TQMenuData ** tqparent ) const { if ( tqparent ) *tqparent = (TQMenuData *)this; // ### @@ -1288,7 +1288,7 @@ TQMenuItem * TQMenuData::tqfindItem( int id, TQMenuData ** tqparent ) const TQPopupMenu *p = mi->popup_menu; if (!p->avoid_circularity) { p->avoid_circularity = 1; - mi = mi->popup_menu->tqfindItem( id, tqparent ); + mi = mi->popup_menu->findItem( id, tqparent ); p->avoid_circularity = 0; if ( mi ) // found item return mi; @@ -1303,7 +1303,7 @@ TQMenuItem * TQMenuData::tqfindItem( int id, TQMenuData ** tqparent ) const Returns the index of the menu item with identifier \a id, or -1 if there is no item with this identifier. - \sa idAt(), tqfindItem() + \sa idAt(), findItem() */ int TQMenuData::indexOf( int id ) const @@ -1359,7 +1359,7 @@ void TQMenuData::setId( int index, int id ) \sa connectItem(), disconnectItem(), itemParameter() */ bool TQMenuData::setItemParameter( int id, int param ) { - TQMenuItem *mi = tqfindItem( id ); + TQMenuItem *mi = findItem( id ); if ( !mi ) // no such identifier return FALSE; if ( !mi->signal_data ) { // create new signal @@ -1381,7 +1381,7 @@ bool TQMenuData::setItemParameter( int id, int param ) { */ int TQMenuData::itemParameter( int id ) const { - TQMenuItem *mi = tqfindItem( id ); + TQMenuItem *mi = findItem( id ); if ( !mi || !mi->signal_data ) return id; return mi->signal_data->value().toInt(); @@ -1401,7 +1401,7 @@ int TQMenuData::itemParameter( int id ) const bool TQMenuData::connectItem( int id, const TQT_BASE_OBJECT_NAME *receiver, const char* member ) { - TQMenuItem *mi = tqfindItem( id ); + TQMenuItem *mi = findItem( id ); if ( !mi ) // no such identifier return FALSE; if ( !mi->signal_data ) { // create new signal @@ -1426,7 +1426,7 @@ bool TQMenuData::connectItem( int id, const TQT_BASE_OBJECT_NAME *receiver, bool TQMenuData::disconnectItem( int id, const TQT_BASE_OBJECT_NAME *receiver, const char* member ) { - TQMenuItem *mi = tqfindItem( id ); + TQMenuItem *mi = findItem( id ); if ( !mi || !mi->signal_data ) // no identifier or no signal return FALSE; return mi->signal_data->disconnect( receiver, member ); @@ -1442,7 +1442,7 @@ void TQMenuData::setWhatsThis( int id, const TQString& text ) { TQMenuData *tqparent; - TQMenuItem *mi = tqfindItem( id, &tqparent ); + TQMenuItem *mi = findItem( id, &tqparent ); if ( mi ) { mi->setWhatsThis( text ); tqparent->menuContentsChanged(); @@ -1458,7 +1458,7 @@ void TQMenuData::setWhatsThis( int id, const TQString& text ) TQString TQMenuData::whatsThis( int id ) const { - TQMenuItem *mi = tqfindItem( id ); + TQMenuItem *mi = findItem( id ); return mi? mi->whatsThis() : TQString::null; } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqmenudata.h b/experimental/tqtinterface/qt4/src/widgets/tqmenudata.h index 96128c063..70f7a4375 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqmenudata.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqmenudata.h @@ -245,9 +245,9 @@ public: bool setItemParameter( int id, int param ); int itemParameter( int id ) const; - TQMenuItem *tqfindItem( int id ) const; - TQMenuItem *tqfindItem( int id, TQMenuData ** tqparent ) const; - TQMenuItem * tqfindPopup( TQPopupMenu *, int *index = 0 ); + TQMenuItem *findItem( int id ) const; + TQMenuItem *findItem( int id, TQMenuData ** tqparent ) const; + TQMenuItem * findPopup( TQPopupMenu *, int *index = 0 ); virtual void activateItemAt( int index ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqmultilineedit.cpp b/experimental/tqtinterface/qt4/src/widgets/tqmultilineedit.cpp index 22066bc87..1dba7ed38 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqmultilineedit.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqmultilineedit.cpp @@ -262,7 +262,7 @@ void TQMultiLineEdit::pageUp( bool mark ) /*! Inserts \a txt at paragraph number \a line. If \a line is less than zero, or larger than the number of paragraphs, the new text is - put at the end. If \a txt tqcontains newline characters, several + put at the end. If \a txt contains newline characters, several paragraphs are inserted. The cursor position is not changed. @@ -452,7 +452,7 @@ void TQMultiLineEdit::cursorWordBackward( bool mark ) */ /*! Inserts string \a s at paragraph number \a line, after character - number \a col in the paragraph. If \a s tqcontains newline + number \a col in the paragraph. If \a s contains newline characters, new lines are inserted. If \a mark is TRUE the inserted string will be selected. diff --git a/experimental/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp b/experimental/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp index 89f525aee..a96b67d8f 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp @@ -75,7 +75,7 @@ bool tqwidget_is_popup_menu(QWidget* w) { QWidget* tqwidget_parent_popup_menu(QWidget* w) { TQPopupMenu* tqpm = dynamic_cast<TQPopupMenu*>(w); if (tqpm) { - TQMenuData *top = tqpm; // tqfind top level + TQMenuData *top = tqpm; // find top level if ( top->parentMenu ) { if (top->parentMenu->isPopupMenu == FALSE) return 0; return (dynamic_cast<TQPopupMenu*>(top->parentMenu)); @@ -202,7 +202,7 @@ static TQMenuItem* whatsThisItem = 0; into a popup menu (for example, a color selector). A TQPopupMenu can also provide a tear-off menu. A tear-off menu is - a top-level window that tqcontains a copy of the menu. This makes it + a top-level window that contains a copy of the menu. This makes it possible for the user to "tear off" frequently used menus and position them in a convenient place on the screen. If you want that functionality for a certain menu, insert a tear-off handle @@ -210,7 +210,7 @@ static TQMenuItem* whatsThisItem = 0; mind that the concept isn't typically used on Microsoft Windows so users may not be familiar with it. Consider using a TQToolBar instead. Tear-off menus cannot contain custom widgets; if the - original menu tqcontains a custom widget item, this item is omitted. + original menu contains a custom widget item, this item is omitted. \link menu-example.html menu/menu.cpp\endlink is an example of TQMenuBar and TQPopupMenu use. @@ -752,7 +752,7 @@ static bool fromAccel = FALSE; #ifndef TQT_NO_ACCEL void TQPopupMenu::accelActivated( int id ) { - TQMenuItem *mi = tqfindItem( id ); + TQMenuItem *mi = findItem( id ); if ( mi && mi->isEnabledAndVisible() ) { TQGuardedPtr<TQSignal> signal = mi->signal(); fromAccel = TRUE; @@ -786,7 +786,7 @@ void TQPopupMenu::actSig( int id, bool inwhatsthis ) #ifndef TQT_NO_WHATSTHIS TQRect r( itemGeometry( indexOf( id ) ) ); TQPoint p( r.center().x(), r.bottom() ); - TQString whatsThis = tqfindItem( id )->whatsThis(); + TQString whatsThis = findItem( id )->whatsThis(); if ( whatsThis.isNull() ) whatsThis = TQWhatsThis::textFor( this, p ); TQWhatsThis::leaveWhatsThisMode( whatsThis, mapToGlobal( p ), this ); @@ -833,7 +833,7 @@ void TQPopupMenu::setFirstItemActive() void TQPopupMenu::hideAllPopups() { - register TQMenuData *top = this; // tqfind top level popup + register TQMenuData *top = this; // find top level popup if ( !preventAnimation ) TQTimer::singleShot( 10, this, TQT_SLOT(allowAnimation()) ); preventAnimation = TRUE; @@ -889,7 +889,7 @@ void TQPopupMenu::hidePopups() bool TQPopupMenu::tryMenuBar( TQMouseEvent *e ) { - register TQMenuData *top = this; // tqfind top level + register TQMenuData *top = this; // find top level while ( top->parentMenu ) top = top->parentMenu; #ifndef TQT_NO_MENUBAR @@ -910,7 +910,7 @@ bool TQPopupMenu::tryMouseEvent( TQPopupMenu *p, TQMouseEvent * e) if ( p == this ) return FALSE; TQPoint pos = mapFromGlobal( e->globalPos() ); - if ( !TQT_TQRECT_OBJECT(rect()).tqcontains( pos ) ) // outside + if ( !TQT_TQRECT_OBJECT(rect()).contains( pos ) ) // outside return FALSE; TQMouseEvent ee( e->type(), pos, e->globalPos(), e->button(), e->state() ); event( &ee ); @@ -925,7 +925,7 @@ bool TQPopupMenu::tryMouseEvent( TQPopupMenu *p, TQMouseEvent * e) void TQPopupMenu::byeMenuBar() { #ifndef TQT_NO_MENUBAR - register TQMenuData *top = this; // tqfind top level + register TQMenuData *top = this; // find top level while ( top->parentMenu ) top = top->parentMenu; #endif @@ -945,7 +945,7 @@ void TQPopupMenu::byeMenuBar() int TQPopupMenu::itemAtPos( const TQPoint &pos, bool ignoreSeparator ) const { - if ( !contentsRect().tqcontains(pos) ) + if ( !contentsRect().contains(pos) ) return -1; int row = 0; @@ -988,7 +988,7 @@ int TQPopupMenu::itemAtPos( const TQPoint &pos, bool ignoreSeparator ) const y = contentsRect().y(); x +=itemw; } - if ( TQRect( x, y, itemw, itemh ).tqcontains( pos ) ) + if ( TQRect( x, y, itemw, itemh ).contains( pos ) ) break; y += itemh; ++row; @@ -1146,17 +1146,17 @@ TQSize TQPopupMenu::updateSize(bool force_update, bool do_resize) if (! mi->text().isNull()) { TQString s = mi->text(); int t; - if ( (t = s.tqfind('\t')) >= 0 ) { // string tqcontains tab + if ( (t = s.find('\t')) >= 0 ) { // string contains tab w += fm.width( s, t ); - w -= s.tqcontains('&') * fm.width('&'); - w += s.tqcontains("&&") * fm.width('&'); + w -= s.contains('&') * fm.width('&'); + w += s.contains("&&") * fm.width('&'); int tw = fm.width( s.mid(t + 1) ); if ( tw > tab) tab = tw; } else { w += fm.width( s ); - w -= s.tqcontains('&') * fm.width('&'); - w += s.tqcontains("&&") * fm.width('&'); + w -= s.contains('&') * fm.width('&'); + w += s.contains("&&") * fm.width('&'); } } else if (mi->pixmap()) w += mi->pixmap()->width(); @@ -1280,7 +1280,7 @@ void TQPopupMenu::updateAccel( TQWidget *tqparent ) delete autoaccel; autoaccel = 0; } else if ( !autoaccel ) { - // we have no tqparent. Rather than ignoring any accelerators we try to tqfind this popup's main window + // we have no tqparent. Rather than ignoring any accelerators we try to find this popup's main window if ( tornOff ) { tqparent = this; } else { @@ -1322,13 +1322,13 @@ void TQPopupMenu::updateAccel( TQWidget *tqparent ) } if ( !mi->text().isNull() || mi->custom() ) { TQString s = mi->text(); - int i = s.tqfind('\t'); + int i = s.find('\t'); // Note: Only looking at the first key in the sequence! if ( (int)k && (int)k != TQt::Key_unknown ) { TQString t = (TQString)mi->key(); if ( i >= 0 ) - s.tqreplace( i+1, s.length()-i, t ); + s.replace( i+1, s.length()-i, t ); else { s += '\t'; s += t; @@ -1557,7 +1557,7 @@ void TQPopupMenu::drawContents( TQPainter* p ) if(d->scroll.scrollable & TQPopupMenuPrivate::Scroll::ScrollUp) { TQRect rect(x, y, contentsRect().width(), tqstyle().tqpixelMetric(TQStyle::PM_PopupMenuScrollerHeight, this)); - if(!p->hasClipping() || TQT_TQREGION_OBJECT(p->clipRegion()).tqcontains(rect)) { + if(!p->hasClipping() || TQT_TQREGION_OBJECT(p->clipRegion()).contains(rect)) { TQStyle::SFlags flags = TQStyle::Style_Up; if (isEnabled()) flags |= TQStyle::Style_Enabled; @@ -1592,7 +1592,7 @@ void TQPopupMenu::drawContents( TQPainter* p ) if ( ncols > 1 && y + itemh > contentsRect().bottom() ) { if ( y < contentsRect().bottom() ) { TQRect rect(x, y, itemw, contentsRect().bottom() - y); - if(!p->hasClipping() || TQT_TQREGION_OBJECT(p->clipRegion()).tqcontains(rect)) { + if(!p->hasClipping() || TQT_TQREGION_OBJECT(p->clipRegion()).contains(rect)) { flags = TQStyle::Style_Default; if (isEnabled() && mi->isEnabledAndVisible()) flags |= TQStyle::Style_Enabled; @@ -1603,14 +1603,14 @@ void TQPopupMenu::drawContents( TQPainter* p ) y = contentsRect().y(); x +=itemw; } - if (!mi->widget() && (!p->hasClipping() || TQT_TQREGION_OBJECT(p->clipRegion()).tqcontains(TQRect(x, y, itemw, itemh)))) + if (!mi->widget() && (!p->hasClipping() || TQT_TQREGION_OBJECT(p->clipRegion()).contains(TQRect(x, y, itemw, itemh)))) drawItem( p, tab, mi, row == actItem, x, y, itemw, itemh ); y += itemh; ++row; } if ( y < contentsRect().bottom() ) { TQRect rect(x, y, itemw, contentsRect().bottom() - y); - if(!p->hasClipping() || TQT_TQREGION_OBJECT(p->clipRegion()).tqcontains(rect)) { + if(!p->hasClipping() || TQT_TQREGION_OBJECT(p->clipRegion()).contains(rect)) { flags = TQStyle::Style_Default; if ( isEnabled() ) flags |= TQStyle::Style_Enabled; @@ -1621,7 +1621,7 @@ void TQPopupMenu::drawContents( TQPainter* p ) if( d->scroll.scrollable & TQPopupMenuPrivate::Scroll::ScrollDown ) { int sh = tqstyle().tqpixelMetric(TQStyle::PM_PopupMenuScrollerHeight, this); TQRect rect(x, contentsRect().height() - sh, contentsRect().width(), sh); - if(!p->hasClipping() || TQT_TQREGION_OBJECT(p->clipRegion()).tqcontains(rect)) { + if(!p->hasClipping() || TQT_TQREGION_OBJECT(p->clipRegion()).contains(rect)) { TQStyle::SFlags flags = TQStyle::Style_Down; if (isEnabled()) flags |= TQStyle::Style_Enabled; @@ -1668,7 +1668,7 @@ void TQPopupMenu::closeEvent( TQCloseEvent * e) { void TQPopupMenu::mousePressEvent( TQMouseEvent *e ) { int sh = tqstyle().tqpixelMetric(TQStyle::PM_PopupMenuScrollerHeight, this); - if (TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos()) && + if (TQT_TQRECT_OBJECT(rect()).contains(e->pos()) && ((d->scroll.scrollable & TQPopupMenuPrivate::Scroll::ScrollUp && e->pos().y() <= sh) || //up (d->scroll.scrollable & TQPopupMenuPrivate::Scroll::ScrollDown && e->pos().y() >= contentsRect().height() - sh))) //down @@ -1677,7 +1677,7 @@ void TQPopupMenu::mousePressEvent( TQMouseEvent *e ) mouseBtDn = TRUE; // mouse button down int item = itemAtPos( e->pos() ); if ( item == -1 ) { - if ( !TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos()) && !tryMenuBar(e) ) { + if ( !TQT_TQRECT_OBJECT(rect()).contains(e->pos()) && !tryMenuBar(e) ) { byeMenuBar(); } return; @@ -1719,7 +1719,7 @@ void TQPopupMenu::mouseReleaseEvent( TQMouseEvent *e ) // to the menubar or our parent menu int sh = tqstyle().tqpixelMetric(TQStyle::PM_PopupMenuScrollerHeight, this); - if ( !TQT_TQRECT_OBJECT(rect()).tqcontains( e->pos() ) && tryMenuBar(e) ) { + if ( !TQT_TQRECT_OBJECT(rect()).contains( e->pos() ) && tryMenuBar(e) ) { return; } else if((d->scroll.scrollable & TQPopupMenuPrivate::Scroll::ScrollUp && e->pos().y() <= sh) || //up @@ -1730,7 +1730,7 @@ void TQPopupMenu::mouseReleaseEvent( TQMouseEvent *e ) if ( actItem < 0 ) { // we do not have an active item // if the release is inside without motion (happens with // oversized popup menus on small screens), ignore it - if ( TQT_TQRECT_OBJECT(rect()).tqcontains( e->pos() ) && motion < 6 ) + if ( TQT_TQRECT_OBJECT(rect()).contains( e->pos() ) && motion < 6 ) return; else byeMenuBar(); @@ -1794,9 +1794,9 @@ void TQPopupMenu::mouseMoveEvent( TQMouseEvent *e ) TQPopupMenu* p = (TQPopupMenu*)parentMenu; int myIndex; - p->tqfindPopup( this, &myIndex ); + p->findPopup( this, &myIndex ); TQPoint pPos = p->mapFromParent( e->globalPos() ); - if ( p->actItem != myIndex && !TQT_TQRECT_OBJECT(p->rect()).tqcontains( pPos ) ) + if ( p->actItem != myIndex && !TQT_TQRECT_OBJECT(p->rect()).contains( pPos ) ) p->setActiveItem( myIndex ); if ( tqstyle().tqstyleHint(TQStyle::SH_PopupMenu_SloppySubMenus, this )) { @@ -1838,7 +1838,7 @@ void TQPopupMenu::mouseMoveEvent( TQMouseEvent *e ) if ( lastActItem >= 0 ) updateRow( lastActItem ); if ( lastActItem > 0 || - ( !TQT_TQRECT_OBJECT(rect()).tqcontains( e->pos() ) && !tryMenuBar( e ) ) ) { + ( !TQT_TQRECT_OBJECT(rect()).contains( e->pos() ) && !tryMenuBar( e ) ) ) { popupSubMenuLater(tqstyle().tqstyleHint(TQStyle::SH_PopupMenu_SubMenuPopupDelay, this), this); } @@ -1863,7 +1863,7 @@ void TQPopupMenu::mouseMoveEvent( TQMouseEvent *e ) return; if ( tqstyle().tqstyleHint(TQStyle::SH_PopupMenu_SloppySubMenus, this) && - d->mouseMoveBuffer.tqcontains( e->pos() ) ) { + d->mouseMoveBuffer.contains( e->pos() ) ) { actItem = item; popupSubMenuLater( tqstyle().tqstyleHint(TQStyle::SH_PopupMenu_SubMenuPopupDelay, this) * 6, this ); @@ -2078,7 +2078,7 @@ void TQPopupMenu::keyPressEvent( TQKeyEvent *e ) ++it; TQString s = m->text(); if ( !s.isEmpty() ) { - int i = s.tqfind( '&' ); + int i = s.find( '&' ); while ( i >= 0 && i < (int)s.length() - 1 ) { if ( s[i+1].upper() == c ) { ok_key = TRUE; @@ -2091,7 +2091,7 @@ void TQPopupMenu::keyPressEvent( TQKeyEvent *e ) firstAfterCurrent = m; break; } else if ( s[i+1] == '&' ) { - i = s.tqfind( '&', i+2 ); + i = s.find( '&', i+2 ); } else { break; } @@ -2137,7 +2137,7 @@ void TQPopupMenu::keyPressEvent( TQKeyEvent *e ) } #ifndef TQT_NO_MENUBAR if ( !ok_key ) { // send to menu bar - register TQMenuData *top = this; // tqfind top level + register TQMenuData *top = this; // find top level while ( top->parentMenu ) top = top->parentMenu; if ( top->isMenuBar ) { @@ -2430,7 +2430,7 @@ void TQPopupMenu::subMenuTimer() { if ( tqstyle().tqstyleHint(TQStyle::SH_PopupMenu_SloppySubMenus, this )) { TQPoint cur = TQCursor::pos(); - if ( r.tqcontains( mapFromGlobal( cur ) ) ) { + if ( r.contains( mapFromGlobal( cur ) ) ) { TQPoint pts[4]; pts[0] = TQPoint( cur.x(), cur.y() - 2 ); pts[3] = TQPoint( cur.x(), cur.y() + 2 ); @@ -2753,7 +2753,7 @@ public: Inserts a tear-off handle into the menu. A tear-off handle is a special menu item that creates a copy of the menu when the menu is selected. This "torn-off" copy lives in a separate window. It - tqcontains the same menu items as the original menu, with the + contains the same menu items as the original menu, with the exception of the tear-off handle. The handle item is assigned the identifier \a id or an diff --git a/experimental/tqtinterface/qt4/src/widgets/tqradiobutton.cpp b/experimental/tqtinterface/qt4/src/widgets/tqradiobutton.cpp index 69bdedba8..13ca86671 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqradiobutton.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqradiobutton.cpp @@ -184,7 +184,7 @@ bool TQRadioButton::hitButton( const TQPoint &pos ) const } else { r.setLeft( 0 ); } - return r.tqcontains( pos ); + return r.contains( pos ); } @@ -223,7 +223,7 @@ printf("[WARNING] TQSharedDoubleBuffer double buffering has been disabled\n\r"); TQTextOStream os(&pmkey); os << "$qt_radio_" << tqstyle().className() << "_" << palette().serialNumber() << "_" << irect.width() << "x" << irect.height() << "_" << kf; - TQPixmap *pm = TQPixmapCache::tqfind( pmkey ); + TQPixmap *pm = TQPixmapCache::find( pmkey ); if ( pm ) { // pixmap exists drawButtonLabel( p ); p->drawPixmap( irect.topLeft(), *pm ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqscrollbar.cpp b/experimental/tqtinterface/qt4/src/widgets/tqscrollbar.cpp index 09d1575f7..de8c74c8e 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqscrollbar.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqscrollbar.cpp @@ -511,7 +511,7 @@ void TQScrollBar::wheelEvent( TQWheelEvent *e ) offset_owner = this; offset = 0; } - if ( e->orientation() != orient && !TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos()) ) + if ( e->orientation() != orient && !TQT_TQRECT_OBJECT(rect()).contains(e->pos()) ) return; e->accept(); int step = TQMIN( TQApplication::wheelScrollLines()*lineStep(), @@ -765,7 +765,7 @@ void TQScrollBar::mouseMoveEvent( TQMouseEvent *e ) r.setRect( r.x() - m, r.y() - 2*m, r.width() + 2*m, r.height() + 4*m ); else r.setRect( r.x() - 2*m, r.y() - m, r.width() + 4*m, r.height() + 2*m ); - if (! r.tqcontains( e->pos())) + if (! r.contains( e->pos())) newSliderPos = sliderStartPos; else newSliderPos = (HORIZONTAL ? e->pos().x() : diff --git a/experimental/tqtinterface/qt4/src/widgets/tqscrollview.cpp b/experimental/tqtinterface/qt4/src/widgets/tqscrollview.cpp index 3ba7eec04..dba2bc060 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqscrollview.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqscrollview.cpp @@ -155,7 +155,7 @@ public: } ~TQScrollViewData(); - TQSVChildRec* rec(TQWidget* w) { return childDict.tqfind(w); } + TQSVChildRec* rec(TQWidget* w) { return childDict.find(w); } TQSVChildRec* ancestorRec(TQWidget* w); TQSVChildRec* addChildRec(TQWidget* w, int x, int y ) { @@ -1525,7 +1525,7 @@ bool TQScrollView::eventFilter( TQObject *obj, TQEvent *e ) TQRect inside_margin( autoscroll_margin, autoscroll_margin, visibleWidth() - autoscroll_margin * 2, visibleHeight() - autoscroll_margin * 2 ); - if ( !inside_margin.tqcontains( vp ) ) { + if ( !inside_margin.contains( vp ) ) { startDragAutoScroll(); // Keep sending move events ( (TQDragMoveEvent*)e )->accept( TQRect(0,0,0,0) ); @@ -2550,7 +2550,7 @@ bool TQScrollView::focusNextPrevChild( bool next ) w = next ? f->next() : f->prev(); } - // if we could not tqfind one, maybe super or parentWidget() can? + // if we could not find one, maybe super or parentWidget() can? if ( !candidate ) return TQFrame::focusNextPrevChild( next ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqslider.cpp b/experimental/tqtinterface/qt4/src/widgets/tqslider.cpp index 9d3ece2fd..4ba251511 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqslider.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqslider.cpp @@ -438,7 +438,7 @@ void TQSlider::mousePressEvent( TQMouseEvent *e ) if ( e->button() == Qt::RightButton ) return; - if ( r.tqcontains( e->pos() ) ) { + if ( r.contains( e->pos() ) ) { state = Dragging; clickOffset = (TQCOORD)( goodPart( e->pos() ) - sliderPos ); emit sliderPressed(); @@ -495,7 +495,7 @@ void TQSlider::mouseMoveEvent( TQMouseEvent *e ) else r.setRect( r.x() - 2*m/3, r.y() - m, r.width() + 3*m, r.height() + 2*m ); - if ( !r.tqcontains( e->pos() ) ) { + if ( !r.contains( e->pos() ) ) { moveSlider( positionFromValue(d->sliderStartVal) ); return; } @@ -511,7 +511,7 @@ void TQSlider::mouseMoveEvent( TQMouseEvent *e ) #ifndef TQT_NO_WHEELEVENT void TQSlider::wheelEvent( TQWheelEvent * e ) { - if ( e->orientation() != orientation() && !TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos()) ) + if ( e->orientation() != orientation() && !TQT_TQRECT_OBJECT(rect()).contains(e->pos()) ) return; static float offset = 0; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqspinbox.cpp b/experimental/tqtinterface/qt4/src/widgets/tqspinbox.cpp index 579d93b57..8ea1775a4 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqspinbox.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqspinbox.cpp @@ -108,7 +108,7 @@ TQValidator::State TQSpinBoxValidator::validate( TQString& str, int& pos ) const int corePos = pos - pref.length(); state = TQIntValidator::validate( core, corePos ); pos = corePos + pref.length(); - str.tqreplace( pref.length(), str.length() - overhead, core ); + str.replace( pref.length(), str.length() - overhead, core ); } else { state = TQIntValidator::validate( str, pos ); if ( state == Invalid ) { diff --git a/experimental/tqtinterface/qt4/src/widgets/tqspinwidget.cpp b/experimental/tqtinterface/qt4/src/widgets/tqspinwidget.cpp index 1fc44074e..f035c1368 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqspinwidget.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqspinwidget.cpp @@ -141,9 +141,9 @@ void TQSpinWidget::mousePressEvent( TQMouseEvent *e ) uint oldButtonDown = d->buttonDown; - if ( d->down.tqcontains( e->pos() ) && d->downEnabled ) + if ( d->down.contains( e->pos() ) && d->downEnabled ) d->buttonDown = 1; - else if ( d->up.tqcontains( e->pos() ) && d->upEnabled ) + else if ( d->up.contains( e->pos() ) && d->upEnabled ) d->buttonDown = 2; else d->buttonDown = 0; @@ -269,19 +269,19 @@ void TQSpinWidget::mouseMoveEvent( TQMouseEvent *e ) return; uint oldButtonDown = d->theButton; - if ( oldButtonDown & 1 && !d->down.tqcontains( e->pos() ) ) { + if ( oldButtonDown & 1 && !d->down.contains( e->pos() ) ) { d->stopTimer(); d->theButton = 0; tqrepaint( d->down, FALSE ); - } else if ( oldButtonDown & 2 && !d->up.tqcontains( e->pos() ) ) { + } else if ( oldButtonDown & 2 && !d->up.contains( e->pos() ) ) { d->stopTimer(); d->theButton = 0; tqrepaint( d->up, FALSE ); - } else if ( !oldButtonDown && d->up.tqcontains( e->pos() ) && d->buttonDown & 2 ) { + } else if ( !oldButtonDown && d->up.contains( e->pos() ) && d->buttonDown & 2 ) { d->startTimer( 500 ); d->theButton = 2; tqrepaint( d->up, FALSE ); - } else if ( !oldButtonDown && d->down.tqcontains( e->pos() ) && d->buttonDown & 1 ) { + } else if ( !oldButtonDown && d->down.contains( e->pos() ) && d->buttonDown & 1 ) { d->startTimer( 500 ); d->theButton = 1; tqrepaint( d->down, FALSE ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqsplitter.cpp b/experimental/tqtinterface/qt4/src/widgets/tqsplitter.cpp index 50a4a1338..b5a159be8 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqsplitter.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqsplitter.cpp @@ -329,7 +329,7 @@ bool TQSplitter::tqchildrenCollapsible() const void TQSplitter::setCollapsible( TQWidget *w, bool collapse ) { - tqfindWidget( w )->collapsible = collapse ? 1 : 0; + findWidget( w )->collapsible = collapse ? 1 : 0; } /*! @@ -340,7 +340,7 @@ void TQSplitter::resizeEvent( TQResizeEvent * ) doResize(); } -TQSplitterLayoutStruct *TQSplitter::tqfindWidget( TQWidget *w ) +TQSplitterLayoutStruct *TQSplitter::findWidget( TQWidget *w ) { processChildEvents(); TQSplitterLayoutStruct *s = d->list.first(); @@ -625,7 +625,7 @@ void TQSplitter::doMove( bool backwards, int pos, int id, int delta, bool upLeft } } -int TQSplitter::tqfindWidgetJustBeforeOrJustAfter( int id, int delta, int &collapsibleSize ) +int TQSplitter::findWidgetJustBeforeOrJustAfter( int id, int delta, int &collapsibleSize ) { id += delta; do { @@ -648,10 +648,10 @@ void TQSplitter::getRange( int id, int *farMin, int *min, int *max, int *farMax return; int collapsibleSizeBefore = 0; - int idJustBefore = tqfindWidgetJustBeforeOrJustAfter( id, -1, collapsibleSizeBefore ); + int idJustBefore = findWidgetJustBeforeOrJustAfter( id, -1, collapsibleSizeBefore ); int collapsibleSizeAfter = 0; - int idJustAfter = tqfindWidgetJustBeforeOrJustAfter( id, +1, collapsibleSizeAfter ); + int idJustAfter = findWidgetJustBeforeOrJustAfter( id, +1, collapsibleSizeAfter ); int minBefore = 0; int minAfter = 0; @@ -953,7 +953,7 @@ void TQSplitter::recalc( bool update ) void TQSplitter::setResizeMode( TQWidget *w, ResizeMode mode ) { - tqfindWidget( w )->resizeMode = mode; + findWidget( w )->resizeMode = mode; } @@ -1175,7 +1175,7 @@ TQValueList<int> TQSplitter::sizes() const values set the heights of each widget going from top to bottom. Extra values in the \a list are ignored. - If \a list tqcontains too few values, the result is undefined but + If \a list contains too few values, the result is undefined but the program will still be well-behaved. Note that the values in \a list should be the height/width that diff --git a/experimental/tqtinterface/qt4/src/widgets/tqsplitter.h b/experimental/tqtinterface/qt4/src/widgets/tqsplitter.h index 7dd9a3a70..18d62f9ed 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqsplitter.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqsplitter.h @@ -154,13 +154,13 @@ public: //private: int adjustPos( int, int, int *, int *, int *, int * ); bool collapsible( TQSplitterLayoutStruct * ); void processChildEvents(); - TQSplitterLayoutStruct *tqfindWidget( TQWidget * ); + TQSplitterLayoutStruct *findWidget( TQWidget * ); TQSplitterLayoutStruct *addWidget( TQWidget *, bool prepend = FALSE ); void recalcId(); void doMove( bool backwards, int pos, int id, int delta, bool upLeft, bool mayCollapse ); void setGeo( TQWidget *w, int pos, int size, bool splitterMoved ); - int tqfindWidgetJustBeforeOrJustAfter( int id, int delta, int &collapsibleSize ); + int findWidgetJustBeforeOrJustAfter( int id, int delta, int &collapsibleSize ); void updateHandles(); inline TQCOORD pick( const TQPoint &p ) const diff --git a/experimental/tqtinterface/qt4/src/widgets/tqsyntaxhighlighter.cpp b/experimental/tqtinterface/qt4/src/widgets/tqsyntaxhighlighter.cpp index aebaa6c84..b948045ee 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqsyntaxhighlighter.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqsyntaxhighlighter.cpp @@ -127,7 +127,7 @@ TQSyntaxHighlighter::~TQSyntaxHighlighter() that this paragraph has ended in the middle of a paragraph spanning construct). - To tqfind out which paragraph is highlighted, call + To find out which paragraph is highlighted, call currentParagraph(). For example, if you're writing a simple C++ syntax highlighter, diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtabbar.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtabbar.cpp index dd31f44c8..fd02625a1 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtabbar.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqtabbar.cpp @@ -261,7 +261,7 @@ public: void add( TQTab * tab, const TQString & tip ) { - tabTips.tqreplace( tab, tip ); + tabTips.replace( tab, tip ); } void remove( TQTab * tab ) @@ -272,7 +272,7 @@ public: TQString tipForTab( TQTab * tab ) const { TQMapConstIterator<TQTab *, TQString> it; - it = tabTips.tqfind( tab ); + it = tabTips.find( tab ); if ( it != tabTips.end() ) return it.data(); else @@ -293,14 +293,14 @@ protected: tb->d->leftB->width(), tb->d->leftB->height() ); rectR.setRect( tb->d->rightB->x(), tb->d->rightB->y(), tb->d->rightB->width(), tb->d->rightB->height() ); - if ( tb->d->scrolls && (rectL.tqcontains( p ) || rectR.tqcontains( p )) ) + if ( tb->d->scrolls && (rectL.contains( p ) || rectR.contains( p )) ) return; #ifndef TQT_NO_TOOLTIP - // tqfind and show the tool tip for the tab under the point p + // find and show the tool tip for the tab under the point p TQMapIterator<TQTab *, TQString> it; for ( it = tabTips.begin(); it != tabTips.end(); ++it ) { - if ( it.key()->rect().tqcontains( p ) ) + if ( it.key()->rect().contains( p ) ) tip( it.key()->rect(), it.data() ); } #endif @@ -387,7 +387,7 @@ TQTabBar::~TQTabBar() Adds the tab, \a newTab, to the tab control. Sets \a newTab's id to a new id and places the tab just to the - right of the existing tabs. If the tab's label tqcontains an + right of the existing tabs. If the tab's label contains an ampersand, the letter following the ampersand is used as an accelerator for the tab, e.g. if the label is "Bro\&wse" then Alt+W becomes an accelerator which will move the focus to this @@ -408,7 +408,7 @@ int TQTabBar::addTab( TQTab * newTab ) If \a index is not specified, the tab is simply appended. Otherwise it's inserted at the specified position. - Sets \a newTab's id to a new id. If the tab's label tqcontains an + Sets \a newTab's id to a new id. If the tab's label contains an ampersand, the letter following the ampersand is used as an accelerator for the tab, e.g. if the label is "Bro\&wse" then Alt+W becomes an accelerator which will move the focus to this @@ -515,7 +515,7 @@ void TQTabBar::setTabEnabled( int id, bool enabled ) } if ( t->enabled ) { r = r.unite( t->r ); - l->append( l->take( l->tqfindRef( t ) ) ); + l->append( l->take( l->findRef( t ) ) ); emit selected( t->id ); } } @@ -592,7 +592,7 @@ void TQTabBar::paint( TQPainter * p, TQTab * t, bool selected ) const else if(t == d->pressed) flags |= TQStyle::Style_Sunken; //selection flags - if(t->rect().tqcontains(mapFromGlobal(TQCursor::pos()))) + if(t->rect().contains(mapFromGlobal(TQCursor::pos()))) flags |= TQStyle::Style_MouseOver; tqstyle().tqdrawControl( TQStyle::CE_TabBarTab, p, this, t->rect(), tqcolorGroup(), flags, TQStyleOption(t) ); @@ -608,8 +608,8 @@ void TQTabBar::paint( TQPainter * p, TQTab * t, bool selected ) const } TQFontMetrics fm = p->fontMetrics(); int fw = fm.width( t->label ); - fw -= t->label.tqcontains('&') * fm.width('&'); - fw += t->label.tqcontains("&&") * fm.width('&'); + fw -= t->label.contains('&') * fm.width('&'); + fw += t->label.contains("&&") * fm.width('&'); int w = iw + fw + 4; int h = TQMAX(fm.height() + 4, ih ); int offset = 3; @@ -662,7 +662,7 @@ void TQTabBar::paintLabel( TQPainter* p, const TQRect& br, flags |= TQStyle::Style_Selected; else if(t == d->pressed) flags |= TQStyle::Style_Sunken; - if(t->rect().tqcontains(mapFromGlobal(TQCursor::pos()))) + if(t->rect().contains(mapFromGlobal(TQCursor::pos()))) flags |= TQStyle::Style_MouseOver; tqstyle().tqdrawControl( TQStyle::CE_TabBarLabel, p, this, r, t->isEnabled() ? tqcolorGroup(): tqpalette().disabled(), @@ -721,8 +721,8 @@ void TQTabBar::paintEvent( TQPaintEvent * e ) /*! This virtual function is called by the mouse event handlers to determine which tab is pressed. The default implementation returns - a pointer to the tab whose bounding rectangle tqcontains \a p, if - exactly one tab's bounding rectangle tqcontains \a p. Otherwise it + a pointer to the tab whose bounding rectangle contains \a p, if + exactly one tab's bounding rectangle contains \a p. Otherwise it returns 0. \sa mousePressEvent() mouseReleaseEvent() @@ -738,7 +738,7 @@ TQTab * TQTabBar::selectTab( const TQPoint & p ) const TQTab * t = i.current(); ++i; - if ( t && t->r.tqcontains( p ) ) { + if ( t && t->r.contains( p ) ) { if ( selected ) moreThanOne = TRUE; else @@ -866,7 +866,7 @@ void TQTabBar::setCurrentTab( TQTab * tab ) return; TQRect r = l->last()->r; - if ( l->tqfindRef( tab ) >= 0 ) + if ( l->findRef( tab ) >= 0 ) l->append( l->take() ); d->focus = tab->id; @@ -896,7 +896,7 @@ void TQTabBar::setCurrentTab( TQTab * tab ) \property TQTabBar::keyboardFocusTab \brief the id of the tab that has the keyboard focus - This property tqcontains the id of the tab that has the keyboard + This property contains the id of the tab that has the keyboard focus or -1 if the tab bar does not have the keyboard focus. */ @@ -1095,8 +1095,8 @@ void TQTabBar::layoutTabs() int offset = (t && d->scrolls) ? t->r.x() : 0; while ( t ) { int lw = fm.width( t->label ); - lw -= t->label.tqcontains('&') * fm.width('&'); - lw += t->label.tqcontains("&&") * fm.width('&'); + lw -= t->label.contains('&') * fm.width('&'); + lw += t->label.contains("&&") * fm.width('&'); int iw = 0; int ih = 0; if ( t->iconset != 0 ) { diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtabwidget.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtabwidget.cpp index 5fab113e8..e1afe3d97 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtabwidget.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqtabwidget.cpp @@ -96,7 +96,7 @@ The current page is available as an index position with currentPageIndex() or as a wiget pointer with currentPage(). You can retrieve a pointer to a page with a given index using page(), - and can tqfind the index position of a page with indexOf(). Use + and can find the index position of a page with indexOf(). Use setCurrentPage() to show a particular page by index, or showPage() to show a page by widget pointer. @@ -266,7 +266,7 @@ TQTabWidget::~TQTabWidget() the label is shown on-screen and may vary according to language and other factors. - If the tab's \a label tqcontains an ampersand, the letter following + If the tab's \a label contains an ampersand, the letter following the ampersand is used as an accelerator for the tab, e.g. if the label is "Bro\&wse" then Alt+W becomes an accelerator which will move the focus to this tab. @@ -322,7 +322,7 @@ void TQTabWidget::addTab( TQWidget *child, TQTab* tab ) the label is shown on-screen and may vary according to language and other factors. - If the tab's \a label tqcontains an ampersand, the letter following + If the tab's \a label contains an ampersand, the letter following the ampersand is used as an accelerator for the tab, e.g. if the label is "Bro\&wse" then Alt+W becomes an accelerator which will move the focus to this tab. diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtextbrowser.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtextbrowser.cpp index af1b07816..81cf7de9b 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtextbrowser.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqtextbrowser.cpp @@ -234,7 +234,7 @@ void TQTextBrowser::setSource(const TQString& name) d->textOrSourceChanged = TRUE; TQString source = name; TQString mark; - int hash = name.tqfind('#'); + int hash = name.find('#'); if ( hash != -1) { source = name.left( hash ); mark = name.mid( hash+1 ); @@ -259,8 +259,8 @@ void TQTextBrowser::setSource(const TQString& name) } } if ( isVisible() ) { - TQString firstTag = txt.left( txt.tqfind( '>' ) + 1 ); - if ( firstTag.left( 3 ) == "<qt" && firstTag.tqcontains( "type" ) && firstTag.tqcontains( "detail" ) ) { + TQString firstTag = txt.left( txt.find( '>' ) + 1 ); + if ( firstTag.left( 3 ) == "<qt" && firstTag.contains( "type" ) && firstTag.contains( "detail" ) ) { popupDetail( txt, TQCursor::pos() ); #ifndef TQT_NO_CURSOR tqApp->restoreOverrideCursor(); @@ -471,7 +471,7 @@ void TQTextBrowser::popupDetail( const TQString& contents, const TQPoint& pos ) popup->resize( w + shadowWidth, h + shadowWidth ); - // okay, now to tqfind a suitable location + // okay, now to find a suitable location //###### we need a global fancy popup positioning somewhere popup->move(pos - popup->rect().center()); if (popup->tqgeometry().right() > TQApplication::desktop()->width()) diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtextedit.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtextedit.cpp index c2c31416f..7900d3cd9 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtextedit.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqtextedit.cpp @@ -283,7 +283,7 @@ static bool block_set_tqalignment = FALSE; \i \e{current format} -- this is the format at the current cursor position, \e and it is the format of the selected text if any. - \i \e{current paragraph} -- the paragraph which tqcontains the + \i \e{current paragraph} -- the paragraph which contains the cursor. \endlist @@ -325,8 +325,8 @@ static bool block_set_tqalignment = FALSE; TQTextEdit can display a large HTML subset, including tables and images. - The text is set or tqreplaced using setText() which deletes any - existing text and tqreplaces it with the text passed in the + The text is set or replaced using setText() which deletes any + existing text and replaces it with the text passed in the setText() call. If you call setText() with legacy HTML (with setTextFormat(RichText) in force), and then call text(), the text that is returned may have different markup, but will render the @@ -384,8 +384,8 @@ static bool block_set_tqalignment = FALSE; length(). You can scroll to an anchor in the text, e.g. - \c{<a name="anchor">} with scrollToAnchor(). The tqfind() function - can be used to tqfind and select a given string within the text. + \c{<a name="anchor">} with scrollToAnchor(). The find() function + can be used to find and select a given string within the text. A read-only TQTextEdit provides the same functionality as the (obsolete) TQTextView. (TQTextView is still supplied for @@ -490,7 +490,7 @@ static bool block_set_tqalignment = FALSE; Use setSelection() to select text. The setSelectionAttributes() function is used to indicate how selected text should be - displayed. Use hasSelectedText() to tqfind out if any text is + displayed. Use hasSelectedText() to find out if any text is selected. The currently selected text's position is available using getSelection() and the selected text itself is returned by selectedText(). The selection can be copied to the clipboard with @@ -850,7 +850,7 @@ static bool block_set_tqalignment = FALSE; \fn void TQTextEdit::cursorPositionChanged( int para, int pos ) This signal is emitted if the position of the cursor has changed. - \a para tqcontains the paragraph index and \a pos tqcontains the + \a para contains the paragraph index and \a pos contains the character position within the paragraph. \sa setCursorPosition() @@ -910,7 +910,7 @@ TQTextEdit::TQTextEdit( TQWidget *tqparent, const char *name ) uses to resolve the locations of files and images. It is passed to the mimeSourceFactory() when quering data. - For example if the text tqcontains an image tag, + For example if the text contains an image tag, \c{<img src="image.png">}, and the context is "path/to/look/in", the TQMimeSourceFactory will try to load the image from "path/to/look/in/image.png". If the tag was @@ -2546,12 +2546,12 @@ void TQTextEdit::contentsMouseDoubleClickEvent( TQMouseEvent * e ) int startIdx = index, endIdx = index, i; if ( !str[ index ].isSpace() ) { i = startIdx; - // tqfind start of word + // find start of word while ( i >= 0 && !str[ i ].isSpace() ) { startIdx = i--; } i = endIdx; - // tqfind end of word.. + // find end of word.. while ( (uint) i < str.length() && !str[ i ].isSpace() ) { endIdx = ++i; } @@ -3053,9 +3053,9 @@ void TQTextEdit::insert( const TQString &text, bool indent, RedoIndentation is set, the paragraph is re-indented. If \c CheckNewLines is set, newline characters in \a text result in hard line breaks (i.e. new paragraphs). If \c checkNewLine is not set, - the behaviour of the editor is undefined if the \a text tqcontains + the behaviour of the editor is undefined if the \a text contains newlines. (It is not possible to change TQTextEdit's newline handling - behavior, but you can use TQString::tqreplace() to preprocess text + behavior, but you can use TQString::replace() to preprocess text before inserting it.) If \c RemoveSelected is set, any selected text (in selection 0) is removed before the text is inserted. @@ -4040,10 +4040,10 @@ void TQTextEdit::setText( const TQString &text, const TQString &context ) modify the cursor position. Using the \a para and \a index parameters will not work correctly - in case the document tqcontains tables. + in case the document contains tables. */ -bool TQTextEdit::tqfind( const TQString &expr, bool cs, bool wo, bool forward, +bool TQTextEdit::find( const TQString &expr, bool cs, bool wo, bool forward, int *para, int *index ) { #ifdef TQT_TEXTEDIT_OPTIMIZATION @@ -4054,29 +4054,29 @@ bool TQTextEdit::tqfind( const TQString &expr, bool cs, bool wo, bool forward, #ifndef TQT_NO_CURSOR viewport()->setCursor( isReadOnly() ? Qt::ArrowCursor : Qt::IBeamCursor ); #endif - TQTextCursor tqfindcur = *cursor; + TQTextCursor findcur = *cursor; if ( para && index ) { if ( doc->paragAt( *para ) ) - tqfindcur.gotoPosition( doc->paragAt(*para), *index ); + findcur.gotoPosition( doc->paragAt(*para), *index ); else - tqfindcur.gotoEnd(); + findcur.gotoEnd(); } else if ( doc->hasSelection( TQTextDocument::Standard ) ){ - // maks sure we do not tqfind the same selection again + // maks sure we do not find the same selection again if ( forward ) - tqfindcur.gotoNextLetter(); + findcur.gotoNextLetter(); else - tqfindcur.gotoPreviousLetter(); - } else if (!forward && tqfindcur.index() == 0 && tqfindcur.paragraph() == tqfindcur.topParagraph()) { - tqfindcur.gotoEnd(); + findcur.gotoPreviousLetter(); + } else if (!forward && findcur.index() == 0 && findcur.paragraph() == findcur.topParagraph()) { + findcur.gotoEnd(); } removeSelection( TQTextDocument::Standard ); - bool found = doc->tqfind( tqfindcur, expr, cs, wo, forward ); + bool found = doc->find( findcur, expr, cs, wo, forward ); if ( found ) { if ( para ) - *para = tqfindcur.paragraph()->paragId(); + *para = findcur.paragraph()->paragId(); if ( index ) - *index = tqfindcur.index(); - *cursor = tqfindcur; + *index = findcur.index(); + *cursor = findcur; repaintChanged(); ensureCursorVisible(); } @@ -4146,7 +4146,7 @@ void TQTextEdit::getCursorPosition( int *para, int *index ) const Any existing selections which have a different id (\a selNum) are left alone, but if an existing selection has the same id as \a - selNum it is removed and tqreplaced by this selection. + selNum it is removed and replaced by this selection. Uses the selection settings of selection \a selNum. If \a selNum is 0, this is the default selection. @@ -5003,7 +5003,7 @@ void TQTextEdit::scrollToAnchor( const TQString& name ) if( c->isAnchor() ) { TQString a = c->anchorName(); if ( a == name || - (a.tqcontains( '#' ) && TQStringList::split( '#', a ).tqcontains( name ) ) ) { + (a.contains( '#' ) && TQStringList::split( '#', a ).contains( name ) ) ) { setContentsPos( contentsX(), TQMIN( cursor.paragraph()->rect().top() + cursor.totalOffsetY(), contentsHeight() - visibleHeight() ) ); break; } @@ -5125,9 +5125,9 @@ void TQTextEdit::pasteSubType( const TQCString& subtype, TQMimeSource *m ) return; if ( st == "application/x-qrichtext" ) { int start; - if ( (start = t.tqfind( "<!--StartFragment-->" )) != -1 ) { + if ( (start = t.find( "<!--StartFragment-->" )) != -1 ) { start += 20; - int end = t.tqfind( "<!--EndFragment-->" ); + int end = t.find( "<!--EndFragment-->" ); TQTextCursor oldC = *cursor; // during the setRichTextInternal() call the cursors @@ -5200,10 +5200,10 @@ void TQTextEdit::pasteSubType( const TQCString& subtype, TQMimeSource *m ) } else { #if defined(TQ_OS_WIN32) // Need to convert CRLF to LF - t.tqreplace( "\r\n", "\n" ); + t.replace( "\r\n", "\n" ); #elif defined(TQ_OS_MAC) //need to convert CR to LF - t.tqreplace( '\r', '\n' ); + t.replace( '\r', '\n' ); #endif TQChar *uc = (TQChar *)t.tqunicode(); for ( int i=0; (uint) i<t.length(); i++ ) { @@ -5241,12 +5241,12 @@ TQCString TQTextEdit::pickSpecial( TQMimeSource* ms, bool always_ask, const TQPo int n = 0; TQDict<void> done; for (int i = 0; !( fmt = ms->format( i ) ).isNull(); i++) { - int semi = fmt.tqfind( ";" ); + int semi = fmt.find( ";" ); if ( semi >= 0 ) fmt = fmt.left( semi ); if ( fmt.left( 5 ) == "text/" ) { fmt = fmt.mid( 5 ); - if ( !done.tqfind( fmt ) ) { + if ( !done.find( fmt ) ) { done.insert( fmt,(void*)1 ); popup.insertItem( fmt, i ); n++; @@ -5261,7 +5261,7 @@ TQCString TQTextEdit::pickSpecial( TQMimeSource* ms, bool always_ask, const TQPo #else TQString fmt; for (int i = 0; !( fmt = ms->format( i ) ).isNull(); i++) { - int semi = fmt.tqfind( ";" ); + int semi = fmt.find( ";" ); if ( semi >= 0 ) fmt = fmt.left( semi ); if ( fmt.left( 5 ) == "text/" ) { @@ -6220,7 +6220,7 @@ TQString TQTextEdit::optimText() const } else { tmp = d->od->lines[ LOGOFFSET(i) ] + "\n"; // inject the tags for this line - if ( (it = d->od->tagIndex.tqfind( LOGOFFSET(i) )) != d->od->tagIndex.end() ) + if ( (it = d->od->tagIndex.find( LOGOFFSET(i) )) != d->od->tagIndex.end() ) ftag = it.data(); offset = 0; while ( ftag && ftag->line == i ) { @@ -6286,7 +6286,7 @@ TQTextEditOptimPrivate::Tag * TQTextEdit::optimAppendTag( int index, const TQStr d->od->lastTag = t; tmp = d->od->tagIndex[ LOGOFFSET(t->line) ]; if ( !tmp || (tmp && tmp->index > t->index) ) { - d->od->tagIndex.tqreplace( LOGOFFSET(t->line), t ); + d->od->tagIndex.replace( LOGOFFSET(t->line), t ); } return t; } @@ -6311,9 +6311,9 @@ TQTextEditOptimPrivate::Tag *TQTextEdit::optimInsertTag(int line, int index, con t->next = 0; t->prev = 0; - // tqfind insertion pt. in tag struct. + // find insertion pt. in tag struct. TQMap<int,TQTextEditOptimPrivate::Tag *>::ConstIterator it; - if ((it = d->od->tagIndex.tqfind(LOGOFFSET(line))) != d->od->tagIndex.end()) { + if ((it = d->od->tagIndex.find(LOGOFFSET(line))) != d->od->tagIndex.end()) { tmp = *it; if (tmp->index >= index) { // the exisiting tag may be placed AFTER the one we want to insert tmp = tmp->prev; @@ -6338,7 +6338,7 @@ TQTextEditOptimPrivate::Tag *TQTextEdit::optimInsertTag(int line, int index, con tmp = d->od->tagIndex[LOGOFFSET(t->line)]; if (!tmp || (tmp && tmp->index >= t->index)) { - d->od->tagIndex.tqreplace(LOGOFFSET(t->line), t); + d->od->tagIndex.replace(LOGOFFSET(t->line), t); } return t; } @@ -6405,7 +6405,7 @@ void TQTextEdit::optimParseTags( TQString * line, int lineNo, int indexOffset ) c = '>'; else if ( esc == "&" ) c = '&'; - line->tqreplace( escIndex, i - escIndex + 1, c ); + line->replace( escIndex, i - escIndex + 1, c ); len = line->length(); i -= i-escIndex; escIndex = -1; @@ -6518,7 +6518,7 @@ void TQTextEdit::optimParseTags( TQString * line, int lineNo, int indexOffset ) // calculate the width of a string in pixels inc. tabs static int qStrWidth(const TQString& str, int tabWidth, const TQFontMetrics& fm) { - int tabs = str.tqcontains('\t'); + int tabs = str.contains('\t'); if (!tabs) return fm.width(str); @@ -6528,7 +6528,7 @@ static int qStrWidth(const TQString& str, int tabWidth, const TQFontMetrics& fm) int strWidth = 0; int tn; for (tn = 1; tn <= tabs; ++tn) { - newIdx = str.tqfind('\t', newIdx); + newIdx = str.find('\t', newIdx); strWidth += fm.width(str.mid(lastIdx, newIdx - lastIdx)); if (strWidth >= tn * tabWidth) { int u = tn; @@ -6549,7 +6549,7 @@ bool TQTextEdit::optimHasBoldMetrics(int line) { TQTextEditOptimPrivate::Tag *t; TQMapConstIterator<int,TQTextEditOptimPrivate::Tag *> it; - if ((it = d->od->tagIndex.tqfind(line)) != d->od->tagIndex.end()) { + if ((it = d->od->tagIndex.find(line)) != d->od->tagIndex.end()) { t = *it; while (t && t->line == line) { if (t->bold) @@ -6564,7 +6564,7 @@ bool TQTextEdit::optimHasBoldMetrics(int line) /*! \internal - Append \a str to the current text buffer. Parses each line to tqfind + Append \a str to the current text buffer. Parses each line to find formatting tags. */ void TQTextEdit::optimAppend( const TQString &str ) @@ -6628,7 +6628,7 @@ static void qStripTags(TQString *line) c = '>'; else if ( esc == "&" ) c = '&'; - line->tqreplace( escIndex, i - escIndex + 1, c ); + line->replace( escIndex, i - escIndex + 1, c ); len = line->length(); i -= i-escIndex; escIndex = -1; @@ -6685,7 +6685,7 @@ void TQTextEdit::optimInsert(const TQString& text, int line, int index) qStripTags( &stripped ); d->od->lines[LOGOFFSET(line)].insert(index, stripped); // move the tag indices following the insertion pt. - if ((ii = d->od->tagIndex.tqfind(LOGOFFSET(line))) != d->od->tagIndex.end()) { + if ((ii = d->od->tagIndex.find(LOGOFFSET(line))) != d->od->tagIndex.end()) { tag = *ii; while (tag && (LOGOFFSET(tag->line) == line && tag->index < index)) tag = tag->next; @@ -6710,7 +6710,7 @@ void TQTextEdit::optimInsert(const TQString& text, int line, int index) // fix the tag index and the tag line/index numbers - this // might take a while.. for (x = line; x < d->od->numLines; x++) { - if ((ii = d->od->tagIndex.tqfind(LOGOFFSET(line))) != d->od->tagIndex.end()) { + if ((ii = d->od->tagIndex.find(LOGOFFSET(line))) != d->od->tagIndex.end()) { tag = ii.data(); if (LOGOFFSET(tag->line) == line) while (tag && (LOGOFFSET(tag->line) == line && tag->index < index)) @@ -6731,7 +6731,7 @@ void TQTextEdit::optimInsert(const TQString& text, int line, int index) d->od->tagIndex.clear(); tag = d->od->tags; while (tag) { - if (!((ii = d->od->tagIndex.tqfind(LOGOFFSET(tag->line))) != d->od->tagIndex.end())) + if (!((ii = d->od->tagIndex.find(LOGOFFSET(tag->line))) != d->od->tagIndex.end())) d->od->tagIndex[LOGOFFSET(tag->line)] = tag; tag = tag->next; } @@ -6739,7 +6739,7 @@ void TQTextEdit::optimInsert(const TQString& text, int line, int index) // update the tag indices on the spliced line - needs to be done before new tags are added TQString stripped = strl[strl.count() - 1]; qStripTags(&stripped); - if ((ii = d->od->tagIndex.tqfind(LOGOFFSET(line + numNewLines))) != d->od->tagIndex.end()) { + if ((ii = d->od->tagIndex.find(LOGOFFSET(line + numNewLines))) != d->od->tagIndex.end()) { tag = *ii; while (tag && (LOGOFFSET(tag->line) == line + numNewLines)) { tag->index += stripped.length(); @@ -6794,7 +6794,7 @@ TQTextEditOptimPrivate::Tag * TQTextEdit::optimPreviousLeftTag( int line ) { TQTextEditOptimPrivate::Tag * ftag = 0; TQMapConstIterator<int,TQTextEditOptimPrivate::Tag *> it; - if ( (it = d->od->tagIndex.tqfind( LOGOFFSET(line) )) != d->od->tagIndex.end() ) + if ( (it = d->od->tagIndex.find( LOGOFFSET(line) )) != d->od->tagIndex.end() ) ftag = it.data(); if ( !ftag ) { // start searching for an open tag @@ -6823,7 +6823,7 @@ TQTextEditOptimPrivate::Tag * TQTextEdit::optimPreviousLeftTag( int line ) /*! \internal Set the format for the string starting at index \a start and ending - at \a end according to \a tag. If \a tag is a Format tag, tqfind the + at \a end according to \a tag. If \a tag is a Format tag, find the first open color tag appearing before \a tag and use that tag to color the string. */ @@ -6854,7 +6854,7 @@ void TQTextEdit::optimSetTextFormat( TQTextDocument * td, TQTextCursor * cur, if ( tag ) { TQString col = tag->tag.simplifyWhiteSpace(); if ( col.left( 10 ) == "font color" ) { - int i = col.tqfind( '=', 10 ); + int i = col.find( '=', 10 ); col = TQT_TQSTRING(col.mid( i + 1 )).simplifyWhiteSpace(); if ( col[0] == '\"' ) col = col.mid( 1, col.length() - 2 ); @@ -6923,10 +6923,10 @@ void TQTextEdit::optimDrawContents( TQPainter * p, int clipx, int clipy, TQMapConstIterator<int,TQTextEditOptimPrivate::Tag *> it; TQTextEditOptimPrivate::Tag * tag = 0, * tmp = 0; TQTextCursor cur( td ); - // Step 1 - tqfind previous left-tag + // Step 1 - find previous left-tag tmp = optimPreviousLeftTag( i ); for ( ; i < startLine + nLines; i++ ) { - if ( (it = d->od->tagIndex.tqfind( LOGOFFSET(i) )) != d->od->tagIndex.end() ) + if ( (it = d->od->tagIndex.find( LOGOFFSET(i) )) != d->od->tagIndex.end() ) tag = it.data(); // Step 2 - iterate over tags on the current line int lastIndex = 0; @@ -7124,7 +7124,7 @@ void TQTextEdit::optimDoAutoScroll() int xx = contentsX() + pos.x(); int yy = contentsY() + pos.y(); - // tqfind out how much we have to scroll in either dir. + // find out how much we have to scroll in either dir. if ( pos.x() < 0 || pos.x() > viewport()->width() || pos.y() < 0 || pos.y() > viewport()->height() ) { int my = yy; @@ -7201,7 +7201,7 @@ int TQTextEdit::optimCharIndex( const TQString &str, int mx ) const int strWidth; mx = mx - 4; // ### get the real margin from somewhere - if (!str.tqcontains('\t') && mx > fm.width(str)) + if (!str.contains('\t') && mx > fm.width(str)) return str.length(); while (i < str.length()) { @@ -7296,8 +7296,8 @@ bool TQTextEdit::optimFind( const TQString & expr, bool cs, bool /*wo*/, return FALSE; for ( i = parag; fw ? i < d->od->numLines : i >= 0; fw ? i++ : i-- ) { - idx = fw ? d->od->lines[ LOGOFFSET(i) ].tqfind( expr, idx, cs ) : - d->od->lines[ LOGOFFSET(i) ].tqfindRev( expr, idx, cs ); + idx = fw ? d->od->lines[ LOGOFFSET(i) ].find( expr, idx, cs ) : + d->od->lines[ LOGOFFSET(i) ].findRev( expr, idx, cs ); if ( idx != -1 ) { found = TRUE; break; @@ -7413,11 +7413,11 @@ void TQTextEdit::optimCheckLimit( const TQString& str ) } // ...in the tag index as well TQMapIterator<int, TQTextEditOptimPrivate::Tag *> idx; - if ( (idx = d->od->tagIndex.tqfind( d->logOffset )) != d->od->tagIndex.end() ) + if ( (idx = d->od->tagIndex.find( d->logOffset )) != d->od->tagIndex.end() ) d->od->tagIndex.remove( idx ); TQMapIterator<int,TQString> it; - if ( (it = d->od->lines.tqfind( d->logOffset )) != d->od->lines.end() ) { + if ( (it = d->od->lines.find( d->logOffset )) != d->od->lines.end() ) { d->od->len -= (*it).length(); d->od->lines.remove( it ); d->od->numLines--; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtextedit.h b/experimental/tqtinterface/qt4/src/widgets/tqtextedit.h index ebca63414..a69b43441 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtextedit.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqtextedit.h @@ -235,7 +235,7 @@ public: void getSelection( int *paraFrom, int *indexFrom, int *paraTo, int *indexTo, int selNum = 0 ) const; - virtual bool tqfind( const TQString &expr, bool cs, bool wo, bool forward = TRUE, + virtual bool find( const TQString &expr, bool cs, bool wo, bool forward = TRUE, int *para = 0, int *index = 0 ); int paragraphs() const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtitlebar.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtitlebar.cpp index ed7cd5145..84ec7b9d9 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtitlebar.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqtitlebar.cpp @@ -407,7 +407,7 @@ void TQTitleBar::mouseMoveEvent( TQMouseEvent * e) TQWorkspace *workspace = ::tqqt_cast<TQWorkspace*>(d->window->parentWidget()->parentWidget()); if(workspace) { p = workspace->mapFromGlobal( e->globalPos() ); - if ( !TQT_TQRECT_OBJECT(workspace->rect()).tqcontains(p) ) { + if ( !TQT_TQRECT_OBJECT(workspace->rect()).contains(p) ) { if ( p.x() < 0 ) p.rx() = 0; if ( p.y() < 0 ) diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtoolbar.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtoolbar.cpp index 0701c6a3c..e7ff8f4ef 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtoolbar.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqtoolbar.cpp @@ -221,7 +221,7 @@ void TQToolBarSeparator::paintEvent( TQPaintEvent * ) \ingroup application \mainclass - A toolbar is a panel that tqcontains a set of controls, usually + A toolbar is a panel that contains a set of controls, usually represented by small icons. It's purpose is to provide quick access to frequently used commands or options. Within a TQMainWindow the user can drag toolbars within and between the diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtoolbox.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtoolbox.cpp index 5950b1c44..b082f5624 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtoolbox.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqtoolbox.cpp @@ -508,7 +508,7 @@ TQWidget *TQToolBox::item( int index ) const int TQToolBox::indexOf( TQWidget *item ) const { TQToolBoxPrivate::Page *c = d->page(item); - return c ? d->pageList.tqfindIndex( *c ) : -1; + return c ? d->pageList.findIndex( *c ) : -1; } /*! diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtoolbutton.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtoolbutton.cpp index 2cfd96261..8c84a59e4 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtoolbutton.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqtoolbutton.cpp @@ -581,7 +581,7 @@ void TQToolButton::mousePressEvent( TQMouseEvent *e ) TQRect popupr = TQStyle::tqvisualRect( tqstyle().querySubControlMetrics(TQStyle::CC_ToolButton, this, TQStyle::SC_ToolButtonMenu), this ); - d->instantPopup = (popupr.isValid() && popupr.tqcontains(e->pos())); + d->instantPopup = (popupr.isValid() && popupr.contains(e->pos())); #ifndef TQT_NO_POPUPMENU if ( d->discardNextMouseEvent ) { @@ -702,8 +702,8 @@ TQIconSet TQToolButton::offIconSet( ) const \obsolete - Since TQt 3.0, TQIconSet tqcontains both the On and Off icons. There is - now an \l TQToolButton::iconSet property that tqreplaces both \l + Since TQt 3.0, TQIconSet contains both the On and Off icons. There is + now an \l TQToolButton::iconSet property that replaces both \l TQToolButton::onIconSet and \l TQToolButton::offIconSet. For ease of porting, this property is a synonym for \l @@ -729,8 +729,8 @@ void TQToolButton::setOnIconSet( const TQIconSet& set ) \obsolete - Since TQt 3.0, TQIconSet tqcontains both the On and Off icons. There is - now an \l TQToolButton::iconSet property that tqreplaces both \l + Since TQt 3.0, TQIconSet contains both the On and Off icons. There is + now an \l TQToolButton::iconSet property that replaces both \l TQToolButton::onIconSet and \l TQToolButton::offIconSet. For ease of porting, this property is a synonym for \l @@ -775,7 +775,7 @@ void TQToolButton::setIconSet( const TQIconSet & set ) /*! \overload \obsolete - Since TQt 3.0, TQIconSet tqcontains both the On and Off icons. + Since TQt 3.0, TQIconSet contains both the On and Off icons. For ease of porting, this function ignores the \a on parameter and sets the \l iconSet property. If you relied on the \a on parameter, @@ -820,7 +820,7 @@ TQIconSet TQToolButton::iconSet() const /*! \overload \obsolete - Since TQt 3.0, TQIconSet tqcontains both the On and Off icons. + Since TQt 3.0, TQIconSet contains both the On and Off icons. For ease of porting, this function ignores the \a on parameter and returns the \l iconSet property. If you relied on the \a on diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtooltip.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtooltip.cpp index 1c82b0e16..411487d85 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtooltip.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqtooltip.cpp @@ -115,7 +115,7 @@ public: void hideTipAndSleep(); - TQString tqfind( TQWidget *, const TQPoint& ); + TQString find( TQWidget *, const TQPoint& ); void setWakeUpDelay(int); public Q_SLOTS: @@ -231,7 +231,7 @@ void TQTipManager::add( const TQRect &gm, TQWidget *w, tips->insert( w, t ); - if ( a && t->rect.tqcontains( pos ) && (!g || g->enabled()) ) { + if ( a && t->rect.contains( pos ) && (!g || g->enabled()) ) { removeTimer->stop(); showTip(); } @@ -426,7 +426,7 @@ bool TQTipManager::eventFilter( TQObject *obj, TQEvent *e ) TQMouseEvent * m = (TQMouseEvent *)e; TQPoint mousePos = w->mapFromGlobal( m->globalPos() ); - if ( currentTip && !currentTip->rect.tqcontains( mousePos ) ) { + if ( currentTip && !currentTip->rect.contains( mousePos ) ) { hideTip(); if ( m->state() == 0 ) return FALSE; @@ -484,7 +484,7 @@ void TQTipManager::showTip() return; TQTipManager::Tip *t = (*tips)[ widget ]; - while ( t && !t->rect.tqcontains( pos ) ) + while ( t && !t->rect.contains( pos ) ) t = t->next; if ( t == 0 ) return; @@ -637,10 +637,10 @@ void TQTipManager::allowAnimation() preventAnimation = FALSE; } -TQString TQTipManager::tqfind( TQWidget *w, const TQPoint& pos ) +TQString TQTipManager::find( TQWidget *w, const TQPoint& pos ) { Tip *t = (*tips)[ w ]; - while ( t && !t->rect.tqcontains( pos ) ) + while ( t && !t->rect.contains( pos ) ) t = t->next; return t ? t->text : TQString::null; @@ -938,7 +938,7 @@ void TQToolTip::remove( TQWidget * widget, const TQRect & rect ) TQString TQToolTip::textFor( TQWidget *widget, const TQPoint& pos ) { if ( tipManager ) - return tipManager->tqfind( widget, pos ); + return tipManager->find( widget, pos ); return TQString::null; } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqvalidator.cpp b/experimental/tqtinterface/qt4/src/widgets/tqvalidator.cpp index e238ab061..423e83761 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqvalidator.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqvalidator.cpp @@ -184,7 +184,7 @@ void TQValidator::fixup( TQString & ) const /*! \class TQIntValidator \brief The TQIntValidator class provides a validator which ensures - that a string tqcontains a valid integer within a specified range. + that a string contains a valid integer within a specified range. \ingroup misc @@ -408,10 +408,10 @@ TQDoubleValidator::~TQDoubleValidator() /*! - Returns \c Acceptable if the string \a input tqcontains a double + Returns \c Acceptable if the string \a input contains a double that is within the valid range and is in the correct format. - Returns \c Intermediate if \a input tqcontains a double that is + Returns \c Intermediate if \a input contains a double that is outside the range or is in the wrong format, e.g. with too many digits after the decimal point or is empty. @@ -431,7 +431,7 @@ TQValidator::State TQDoubleValidator::validate( TQString & input, int & ) const return Intermediate; bool ok = TRUE; double entered = input.toDouble( &ok ); - int nume = input.tqcontains( 'e', FALSE ); + int nume = input.contains( 'e', FALSE ); if ( !ok ) { // explicit exponent regexp TQRegExp expexpexp( TQString::tqfromLatin1("[Ee][+-]?\\d*$") ); @@ -448,7 +448,7 @@ TQValidator::State TQDoubleValidator::validate( TQString & input, int & ) const } } - int i = input.tqfind( '.' ); + int i = input.find( '.' ); if ( i >= 0 && nume == 0 ) { // has decimal point (but no E), now count digits after that i++; @@ -524,7 +524,7 @@ void TQDoubleValidator::setDecimals( int decimals ) \ingroup misc - TQRegExpValidator tqcontains a regular expression, "regexp", used to + TQRegExpValidator contains a regular expression, "regexp", used to determine whether an input string is \c Acceptable, \c Intermediate or \c Invalid. diff --git a/experimental/tqtinterface/qt4/src/widgets/tqwhatsthis.cpp b/experimental/tqtinterface/qt4/src/widgets/tqwhatsthis.cpp index 80e984c8c..3ada61988 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqwhatsthis.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqwhatsthis.cpp @@ -311,7 +311,7 @@ void TQWhatsThat::hide() void TQWhatsThat::mousePressEvent( TQMouseEvent* e ) { pressed = TRUE; - if ( e->button() == Qt::LeftButton && TQT_TQRECT_OBJECT(rect()).tqcontains( e->pos() ) ) { + if ( e->button() == Qt::LeftButton && TQT_TQRECT_OBJECT(rect()).contains( e->pos() ) ) { #ifndef TQT_NO_RICHTEXT if ( doc ) anchor = doc->anchorAt( e->pos() - TQPoint( hMargin, vMargin) ); @@ -326,14 +326,14 @@ void TQWhatsThat::mouseReleaseEvent( TQMouseEvent* e ) if ( !pressed ) return; #ifndef TQT_NO_RICHTEXT - if ( e->button() == Qt::LeftButton && doc && TQT_TQRECT_OBJECT(rect()).tqcontains( e->pos() ) ) { + if ( e->button() == Qt::LeftButton && doc && TQT_TQRECT_OBJECT(rect()).contains( e->pos() ) ) { TQString a = doc->anchorAt( e->pos() - TQPoint( hMargin, vMargin ) ); TQString href; if ( anchor == a ) href = a; anchor = TQString::null; if ( widget && wt && wt->dict ) { - TQWhatsThisPrivate::WhatsThisItem * i = wt->dict->tqfind( widget ); + TQWhatsThisPrivate::WhatsThisItem * i = wt->dict->find( widget ); if ( i && i->whatsthis && !i->whatsthis->clicked( href ) ) return; } @@ -545,7 +545,7 @@ bool TQWhatsThisPrivate::eventFilter( TQObject * o, TQEvent * e ) TQMouseEvent* me = (TQMouseEvent*) e; TQPoint p = me->pos(); while( w && !i ) { - i = dict->tqfind( w ); + i = dict->find( w ); if ( !i ) { p += w->pos(); w = w->parentWidget( TRUE ); @@ -670,7 +670,7 @@ void TQWhatsThisPrivate::say( TQWidget * widget, const TQString &text, const TQP "automatic what's this? widget" ); - // okay, now to tqfind a suitable location + // okay, now to find a suitable location int scr = ( widget ? TQApplication::desktop()->screenNumber( widget ) : @@ -735,13 +735,13 @@ void TQWhatsThisPrivate::say( TQWidget * widget, const TQString &text, const TQP TQWhatsThisPrivate::WhatsThisItem* TQWhatsThisPrivate::newItem( TQWidget * widget ) { - WhatsThisItem * i = dict->tqfind( (void *)widget ); + WhatsThisItem * i = dict->find( (void *)widget ); if ( i ) TQWhatsThis::remove( widget ); i = new WhatsThisItem; dict->insert( (void *)widget, i ); TQWidget * t = widget->tqtopLevelWidget(); - if ( !tlw->tqfind( (void *)t ) ) { + if ( !tlw->find( (void *)t ) ) { tlw->insert( (void *)t, t ); t->installEventFilter( this ); } @@ -764,7 +764,7 @@ void TQWhatsThisPrivate::add( TQWidget * widget, const TQString &text ) /*! Adds \a text as "What's this" help for \a widget. If the text is - rich text formatted (i.e. it tqcontains markup) it will be rendered + rich text formatted (i.e. it contains markup) it will be rendered with the default stylesheet TQStyleSheet::defaultSheet(). The text is destroyed if the widget is later destroyed, so it need @@ -790,7 +790,7 @@ void TQWhatsThis::add( TQWidget * widget, const TQString &text ) void TQWhatsThis::remove( TQWidget * widget ) { TQWhatsThisPrivate::setUpWhatsThis(); - TQWhatsThisPrivate::WhatsThisItem * i = wt->dict->tqfind( (void *)widget ); + TQWhatsThisPrivate::WhatsThisItem * i = wt->dict->find( (void *)widget ); if ( !i ) return; @@ -804,7 +804,7 @@ void TQWhatsThis::remove( TQWidget * widget ) /*! Returns the what's this text for widget \a w or TQString::null if - there is no "What's this?" help for the widget. \a pos tqcontains + there is no "What's this?" help for the widget. \a pos contains the mouse position; this is useful, for example, if you've subclassed to make the text that is displayed position dependent. @@ -819,7 +819,7 @@ TQString TQWhatsThis::textFor( TQWidget * w, const TQPoint& pos, bool includePar TQWhatsThisPrivate::WhatsThisItem * i = 0; TQPoint p = pos; while( w && !i ) { - i = wt->dict->tqfind( w ); + i = wt->dict->find( w ); if ( !includeParents ) break; if ( !i ) { diff --git a/experimental/tqtinterface/qt4/src/widgets/tqwidgetplugin.cpp b/experimental/tqtinterface/qt4/src/widgets/tqwidgetplugin.cpp index d4aa8fcf8..9b4d106c2 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqwidgetplugin.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqwidgetplugin.cpp @@ -714,7 +714,7 @@ TQWidgetList TQWidgetContainerPlugin::pages( const TQString &, TQWidget * ) cons return widget + "->addTab( " + page + ", \"" + pageName + "\" )"; \endcode - Warning: If the code returned by this function tqcontains invalid + Warning: If the code returned by this function contains invalid C++ syntax, the generated \c uic code will not compile. */ diff --git a/experimental/tqtinterface/qt4/src/widgets/tqwidgetresizehandler.cpp b/experimental/tqtinterface/qt4/src/widgets/tqwidgetresizehandler.cpp index b9b576afb..d09353d10 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqwidgetresizehandler.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqwidgetresizehandler.cpp @@ -127,7 +127,7 @@ bool TQWidgetResizeHandler::eventFilter( TQObject *o, TQEvent *ee ) case TQEvent::MouseButtonPress: { if ( w->isMaximized() ) break; - if ( !TQT_TQRECT_OBJECT(widget->rect()).tqcontains( widget->mapFromGlobal( e->globalPos() ) ) ) + if ( !TQT_TQRECT_OBJECT(widget->rect()).contains( widget->mapFromGlobal( e->globalPos() ) ) ) return FALSE; if ( e->button() == Qt::LeftButton ) { emit activate(); @@ -214,7 +214,7 @@ void TQWidgetResizeHandler::mouseMoveEvent( TQMouseEvent *e ) TQPoint globalPos = widget->parentWidget( TRUE ) ? widget->parentWidget( TRUE )->mapFromGlobal( e->globalPos() ) : e->globalPos(); - if ( widget->parentWidget( TRUE ) && !TQT_TQRECT_OBJECT(widget->parentWidget( TRUE )->rect()).tqcontains( globalPos ) ) { + if ( widget->parentWidget( TRUE ) && !TQT_TQRECT_OBJECT(widget->parentWidget( TRUE )->rect()).contains( globalPos ) ) { if ( globalPos.x() < 0 ) globalPos.rx() = 0; if ( globalPos.y() < 0 ) diff --git a/experimental/tqtinterface/qt4/src/widgets/tqwidgetstack.cpp b/experimental/tqtinterface/qt4/src/widgets/tqwidgetstack.cpp index 4bf824e59..ff78a7ba1 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqwidgetstack.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqwidgetstack.cpp @@ -177,7 +177,7 @@ int TQWidgetStack::addWidget(TQWidget * w, int id) // prevent duplicates removeWidget(w); - if (id >= 0 && dict->tqfind(id)) + if (id >= 0 && dict->find(id)) id = -2; if (id < -1) id = d->nextNegativeID--; @@ -196,7 +196,7 @@ int TQWidgetStack::addWidget(TQWidget * w, int id) if (f) { if (!focusWidgets) focusWidgets = new TQPtrDict<TQWidget>(17); - focusWidgets->tqreplace(w, TQT_TQWIDGET(w->focusWidget())); + focusWidgets->replace(w, TQT_TQWIDGET(w->focusWidget())); } w->hide(); @@ -241,7 +241,7 @@ void TQWidgetStack::raiseWidget(int id) { if (id == -1) return; - TQWidget * w = dict->tqfind(id); + TQWidget * w = dict->find(id); if (w) raiseWidget(w); } @@ -415,7 +415,7 @@ void TQWidgetStack::setVisible(bool visible) TQWidget * TQWidgetStack::widget(int id) const { - return id != -1 ? dict->tqfind(id) : 0; + return id != -1 ? dict->find(id) : 0; } @@ -785,7 +785,7 @@ int TQWidgetStack::addWidget( TQWidget * w, int id ) // prevent duplicates removeWidget( w ); - if ( id >= 0 && dict->tqfind( id ) ) + if ( id >= 0 && dict->find( id ) ) id = -2; if ( id < -1 ) id = nseq_no--; @@ -804,7 +804,7 @@ int TQWidgetStack::addWidget( TQWidget * w, int id ) if ( f ) { if ( !tqfocusWidgets ) tqfocusWidgets = new TQPtrDict<TQWidget>( 17 ); - tqfocusWidgets->tqreplace( w, w->tqfocusWidget() ); + tqfocusWidgets->replace( w, w->tqfocusWidget() ); } w->hide(); @@ -850,7 +850,7 @@ void TQWidgetStack::raiseWidget( int id ) { if ( id == -1 ) return; - TQWidget * w = dict->tqfind( id ); + TQWidget * w = dict->find( id ); if ( w ) raiseWidget( w ); } @@ -913,9 +913,9 @@ void TQWidgetStack::raiseWidget( TQWidget *w ) if ( p == topWidget ) { // focus was on old page if ( !tqfocusWidgets ) tqfocusWidgets = new TQPtrDict<TQWidget>( 17 ); - tqfocusWidgets->tqreplace( topWidget, fw ); + tqfocusWidgets->replace( topWidget, fw ); fw->clearFocus(); - // look for the best focus widget we can tqfind + // look for the best focus widget we can find // best == what we had (which may be deleted) fw = tqfocusWidgets->take( w ); if ( isChildOf( fw, w ) ) { @@ -1036,7 +1036,7 @@ void TQWidgetStack::show() TQWidget * TQWidgetStack::widget( int id ) const { - return id != -1 ? dict->tqfind( id ) : 0; + return id != -1 ? dict->find( id ) : 0; } |