rename the following methods:

tqfind find
tqreplace replace
tqcontains contains

5 files changed, 50 insertions, 50 deletions

diff --git a/tqtinterface/qt4/src/attic/README b/tqtinterface/qt4/src/attic/README
index 1d75931..7400da1 100644
--- a/tqtinterface/qt4/src/attic/README
+++ b/tqtinterface/qt4/src/attic/README
@@ -1,4 +1,4 @@
-This directory tqcontains classes that has been obsoleted and moved out
+This directory contains classes that has been obsoleted and moved out
 of the Qt API.
 
 To use these classes, simply include them in your project. Remember to
diff --git a/tqtinterface/qt4/src/attic/qtmultilineedit.cpp b/tqtinterface/qt4/src/attic/qtmultilineedit.cpp
index 203ed56..8442e14 100644
--- a/tqtinterface/qt4/src/attic/qtmultilineedit.cpp
+++ b/tqtinterface/qt4/src/attic/qtmultilineedit.cpp
@@ -6,7 +6,7 @@
 **
 ** Copyright (C) 2010 Timothy Pearson and (C) 1992-2008 Trolltech ASA.
 **
-** This file tqcontains a class moved out of the TQt GUI Toolkit API. It
+** This file contains a class moved out of the TQt GUI Toolkit API. It
 ** may be used, distributed and modified without limitation.
 **
 **********************************************************************/
@@ -187,7 +187,7 @@ edited flag is never read by TQtMultiLineEdit, but is changed to TRUE
 whenever the user changes its contents.
 
 This is useful e.g. for things that need to provide a default value,
-but cannot tqfind the default at once.  Just open the widget without the
+but cannot find the default at once.  Just open the widget without the
 best default and when the default is known, check the edited() return
 value and set the line edit's contents if the user has not started
 editing the line edit.  Another example is to detect whether the
@@ -1058,7 +1058,7 @@ TQString TQtMultiLineEdit::textLine( int line ) const
 
 
 /*
-  Returns a copy of the whole text. If the multi line edit tqcontains no
+  Returns a copy of the whole text. If the multi line edit contains no
   text, a
   \link TQString::operator!() null string\endlink
   is returned.
@@ -1568,9 +1568,9 @@ void TQtMultiLineEdit::insertAtAux( const TQString &txt, int line, int col, bool
 	cursorX += itxt.length();
     }
     TQFontMetrics fm( font() );
-    if ( !WORD_WRAP || ( col == 0 && itxt.tqcontains('\n') == int(itxt.length())) )
+    if ( !WORD_WRAP || ( col == 0 && itxt.contains('\n') == int(itxt.length())) )
 	wrapLine( line, 0 );
-    else if ( WORD_WRAP && itxt.tqfind('\n')<0 && itxt.tqfind('\t')<0
+    else if ( WORD_WRAP && itxt.find('\n')<0 && itxt.find('\t')<0
 	      && (
 		  ( DYNAMIC_WRAP && fm.width( itxt ) + row->w < contentsRect().width() -  2*d->lr_marg - d->marg_extra )
 		  ||
@@ -1578,7 +1578,7 @@ void TQtMultiLineEdit::insertAtAux( const TQString &txt, int line, int col, bool
 		  ||
 		  ( FIXED_COLUMN_WRAP && ( d->wrapcol < 0 || int(row->s.length()) < d->wrapcol ) )
 		  )
-	      && ( itxt.tqfind(' ') < 0 || row->s.tqfind(' ') >= 0 && row->s.tqfind(' ') < col ) ){
+	      && ( itxt.find(' ') < 0 || row->s.find(' ') >= 0 && row->s.find(' ') < col ) ){
 	row->w = textWidth( row->s );
 	setWidth( TQMAX( maxLineWidth(), row->w) );
 	updateCell( line, 0, FALSE );
@@ -1612,7 +1612,7 @@ void TQtMultiLineEdit::insertAtAux( const TQString &txt, int line, int col, bool
 /*
   Inserts \a txt at line number \a line. If \a line is less than zero,
   or larger than the number of rows, the new text is put at the end.
-  If \a txt tqcontains newline characters, several lines are inserted.
+  If \a txt contains newline characters, several lines are inserted.
 
   The cursor position is not changed.
 */
@@ -2232,7 +2232,7 @@ void TQtMultiLineEdit::mousePressEvent( TQMouseEvent *e )
 
 void TQtMultiLineEdit::pixelPosToCursorPos(TQPoint p, int* x, int* y) const
 {
-    *y = tqfindRow( p.y() );
+    *y = findRow( p.y() );
     if ( *y < 0 ) {
 	if ( p.y() < lineWidth() ) {
 	    *y = topCell();
@@ -2309,7 +2309,7 @@ void TQtMultiLineEdit::mouseMoveEvent( TQMouseEvent *e )
 #endif
     if ( !dragMarking )
 	return;
-    if ( rect().tqcontains( e->pos() ) ) {
+    if ( rect().contains( e->pos() ) ) {
 	stopAutoScroll();
     } else if ( !dragScrolling ) {
 	startAutoScroll();
@@ -2442,7 +2442,7 @@ void TQtMultiLineEdit::dragMoveEvent( TQDragMoveEvent* event )
     d->dnd_forcecursor = FALSE;
     TQRect inside_margin(scroll_margin, scroll_margin,
 			width()-scroll_margin*2, height()-scroll_margin*2);
-    if ( !inside_margin.tqcontains(event->pos()) ) {
+    if ( !inside_margin.contains(event->pos()) ) {
 	startAutoScroll();
     }
     if ( event->source() == this && event->action() == TQDropEvent::Move )
@@ -2469,8 +2469,8 @@ void TQtMultiLineEdit::dropEvent( TQDropEvent* event )
     TQCString fmt = pickSpecial(event,FALSE,event->pos());
     if ( TQTextDrag::decode(event, text, fmt) ) {
 	int i = -1;
-	while ( ( i = text.tqfind( '\r' ) ) != -1 )
-	    text.tqreplace( i,1,"" );
+	while ( ( i = text.find( '\r' ) ) != -1 )
+	    text.replace( i,1,"" );
 	if ( event->source() == this && event->action() == TQDropEvent::Move ) {
 	    event->acceptAction();
 	    // Careful not to tread on my own feet
@@ -2597,7 +2597,7 @@ int TQtMultiLineEdit::mapToView( int xIndex, int line )
 }
 
 /*
-  Traverses the list and tqfinds an item with the maximum width, and
+  Traverses the list and finds an item with the maximum width, and
   updates the internal list box structures accordingly.
 */
 
@@ -2665,7 +2665,7 @@ void TQtMultiLineEdit::pasteSubType(const TQCString& subtype)
 
 #if defined(_OS_WIN32_)
 	// Need to convert CRLF to NL
-	t.tqreplace( "\r\n", "\n" );
+	t.replace( "\r\n", "\n" );
 #endif
 
 	for (int i=0; (uint)i<t.length(); i++) {
@@ -2714,12 +2714,12 @@ TQCString TQtMultiLineEdit::pickSpecial(TQMimeSource* ms, bool always_ask, const
 	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++;
@@ -2880,7 +2880,7 @@ void TQtMultiLineEdit::copy() const
 #endif
 #if defined(_OS_WIN32_)
 	// Need to convert NL to CRLF
-	t.tqreplace( "\n", "\r\n" );
+	t.replace( "\n", "\r\n" );
 #endif
 	TQApplication::clipboard()->setText( t );
 #if defined(_WS_X11_)
@@ -3957,7 +3957,7 @@ void TQtMultiLineEdit::redo()
 /*
   Inserts \a s at line number \a line, after character number \a col
   in the line.
-  If \a s tqcontains newline characters, new lines are inserted.
+  If \a s contains newline characters, new lines are inserted.
   If \a mark is TRUE the inserted text is selected.
 
   The cursor position is adjusted. If the insertion position is equal to
diff --git a/tqtinterface/qt4/src/attic/qtmultilineedit.h b/tqtinterface/qt4/src/attic/qtmultilineedit.h
index 2e539ee..ef50a18 100644
--- a/tqtinterface/qt4/src/attic/qtmultilineedit.h
+++ b/tqtinterface/qt4/src/attic/qtmultilineedit.h
@@ -6,7 +6,7 @@
 **
 ** Copyright (C) 2010 Timothy Pearson and (C) 1992-2008 Trolltech ASA.
 **
-** This file tqcontains a class moved out of the TQt GUI Toolkit API. It
+** This file contains a class moved out of the TQt GUI Toolkit API. It
 ** may be used, distributed and modified without limitation.
 **
 **********************************************************************/
diff --git a/tqtinterface/qt4/src/attic/qttableview.cpp b/tqtinterface/qt4/src/attic/qttableview.cpp
index 0872fa6..34499aa 100644
--- a/tqtinterface/qt4/src/attic/qttableview.cpp
+++ b/tqtinterface/qt4/src/attic/qttableview.cpp
@@ -6,7 +6,7 @@
 **
 ** Copyright (C) 2010 Timothy Pearson and (C) 1992-2008 Trolltech ASA.
 **
-** This file tqcontains a class moved out of the TQt GUI Toolkit API. It
+** This file contains a class moved out of the TQt GUI Toolkit API. It
 ** may be used, distributed and modified without limitation.
 **
 **********************************************************************/
@@ -216,8 +216,8 @@ void TQtTableView::show()
   Erases the view area \a (x,y,w,h) if \a erase is TRUE. Parameters \a
   (x,y) are in \e widget coordinates.
 
-  If \a w is negative, it is tqreplaced with <code>width() - x</code>.
-  If \a h is negative, it is tqreplaced with <code>height() - y</code>.
+  If \a w is negative, it is replaced with <code>width() - x</code>.
+  If \a h is negative, it is replaced with <code>height() - y</code>.
 
   Doing a tqrepaint() usually is faster than doing an update(), but
   calling update() many times in a row will generate a single paint
@@ -999,7 +999,7 @@ TQRect TQtTableView::viewRect() const
 int TQtTableView::lastRowVisible() const
 {
     int cellMaxY;
-    int row = tqfindRawRow( maxViewY(), &cellMaxY );
+    int row = findRawRow( maxViewY(), &cellMaxY );
     if ( row == -1 || row >= nRows ) {		// maxViewY() past end?
 	row = nRows - 1;			// yes: return last row
     } else {
@@ -1026,7 +1026,7 @@ int TQtTableView::lastRowVisible() const
 int TQtTableView::lastColVisible() const
 {
     int cellMaxX;
-    int col = tqfindRawCol( maxViewX(), &cellMaxX );
+    int col = findRawCol( maxViewX(), &cellMaxX );
     if ( col == -1 || col >= nCols ) {		// maxViewX() past end?
 	col = nCols - 1;			// yes: return last col
     } else {
@@ -1278,7 +1278,7 @@ void TQtTableView::paintEvent( TQPaintEvent *e )
 
     TQPainter paint( this );
 
-    if ( !contentsRect().tqcontains( updateR, TRUE  ) ) {// update frame ?
+    if ( !contentsRect().contains( updateR, TRUE  ) ) {// update frame ?
 	drawFrame( &paint );
 	if ( updateR.left() < frameWidth() ) 		//###
 	    updateR.setLeft( frameWidth() );
@@ -1295,8 +1295,8 @@ void TQtTableView::paintEvent( TQPaintEvent *e )
 
     setupPainter( &paint );			// prepare for painting table
 
-    int firstRow = tqfindRow( updateR.y() );
-    int firstCol = tqfindCol( updateR.x() );
+    int firstRow = findRow( updateR.y() );
+    int firstCol = findCol( updateR.x() );
     int	 xStart, yStart;
     if ( !colXPos( firstCol, &xStart ) || !rowYPos( firstRow, &yStart ) ) {
 	paint.eraseRect( updateR ); // erase area outside cells but in view
@@ -1341,7 +1341,7 @@ void TQtTableView::paintEvent( TQPaintEvent *e )
 		matrix.translate( xPos, yPos );
 		paint.setWorldMatrix( matrix );
 		if ( testTableFlags(Tbl_clipCellPainting) ||
-		     frameWidth() > 0 && !winR.tqcontains( cellR ) ) { //##arnt
+		     frameWidth() > 0 && !winR.contains( cellR ) ) { //##arnt
 		    paint.setClipRect( cellUR );
 		    paintCell( &paint, row, col );
 		    paint.setClipping( FALSE );
@@ -1353,7 +1353,7 @@ void TQtTableView::paintEvent( TQPaintEvent *e )
 #else
 		paint.translate( xPos, yPos );
 		if ( testTableFlags(Tbl_clipCellPainting) ||
-		     frameWidth() > 0 && !winR.tqcontains( cellR ) ) { //##arnt
+		     frameWidth() > 0 && !winR.contains( cellR ) ) { //##arnt
 		    paint.setClipRect( cellUR );
 		    paintCell( &paint, row, col );
 		    paint.setClipping( FALSE );
@@ -1430,7 +1430,7 @@ void TQtTableView::updateView()
 /*
   Returns a pointer to the vertical scroll bar mainly so you can
   connect() to its Q_SIGNALS.  Note that the scroll bar works in pixel
-  values; use tqfindRow() to translate to cell numbers.
+  values; use findRow() to translate to cell numbers.
 */
 
 TQScrollBar *TQtTableView::verticalScrollBar() const
@@ -1461,7 +1461,7 @@ TQScrollBar *TQtTableView::verticalScrollBar() const
 /*
   Returns a pointer to the horizontal scroll bar mainly so you can
   connect() to its Q_SIGNALS. Note that the scroll bar works in pixel
-  values; use tqfindCol() to translate to cell numbers.
+  values; use findCol() to translate to cell numbers.
 */
 
 TQScrollBar *TQtTableView::horizontalScrollBar() const
@@ -1569,7 +1569,7 @@ void TQtTableView::setVerScrollBar( bool on, bool update )
 
 
 
-int TQtTableView::tqfindRawRow( int yPos, int *cellMaxY, int *cellMinY,
+int TQtTableView::findRawRow( int yPos, int *cellMaxY, int *cellMinY,
 			    bool goOutsideView ) const
 {
     int r = -1;
@@ -1578,7 +1578,7 @@ int TQtTableView::tqfindRawRow( int yPos, int *cellMaxY, int *cellMinY,
     if ( goOutsideView || yPos >= minViewY() && yPos <= maxViewY() ) {
 	if ( yPos < minViewY() ) {
 #if defined(TQT_CHECK_RANGE)
-	    qWarning( "TQtTableView::tqfindRawRow: (%s) internal error: "
+	    qWarning( "TQtTableView::findRawRow: (%s) internal error: "
 		     "yPos < minViewY() && goOutsideView "
 		     "not supported. (%d,%d)",
 		     name( "unnamed" ), yPos, yOffs );
@@ -1616,7 +1616,7 @@ int TQtTableView::tqfindRawRow( int yPos, int *cellMaxY, int *cellMinY,
 }
 
 
-int TQtTableView::tqfindRawCol( int xPos, int *cellMaxX, int *cellMinX ,
+int TQtTableView::findRawCol( int xPos, int *cellMaxX, int *cellMinX ,
 			    bool goOutsideView ) const
 {
     int c = -1;
@@ -1625,7 +1625,7 @@ int TQtTableView::tqfindRawCol( int xPos, int *cellMaxX, int *cellMinX ,
     if ( goOutsideView || xPos >= minViewX() && xPos <= maxViewX() ) {
 	if ( xPos < minViewX() ) {
 #if defined(TQT_CHECK_RANGE)
-	    qWarning( "TQtTableView::tqfindRawCol: (%s) internal error: "
+	    qWarning( "TQtTableView::findRawCol: (%s) internal error: "
 		     "xPos < minViewX() && goOutsideView "
 		     "not supported. (%d,%d)",
 		     name( "unnamed" ), xPos, xOffs );
@@ -1667,13 +1667,13 @@ int TQtTableView::tqfindRawCol( int xPos, int *cellMaxX, int *cellMinX ,
   \e widget coordinates.  Returns -1 if \a yPos is outside the valid
   range.
 
-  \sa tqfindCol(), rowYPos()
+  \sa findCol(), rowYPos()
 */
 
-int TQtTableView::tqfindRow( int yPos ) const
+int TQtTableView::findRow( int yPos ) const
 {
     int cellMaxY;
-    int row = tqfindRawRow( yPos, &cellMaxY );
+    int row = findRawRow( yPos, &cellMaxY );
     if ( testTableFlags(Tbl_cutCellsV) && cellMaxY > maxViewY() )
 	row = - 1;				//  cell cut by bottom margin
     if ( row >= nRows )
@@ -1687,13 +1687,13 @@ int TQtTableView::tqfindRow( int yPos ) const
   in \e widget coordinates.  Returns -1 if \a xPos is outside the valid
   range.
 
-  \sa tqfindRow(), colXPos()
+  \sa findRow(), colXPos()
 */
 
-int TQtTableView::tqfindCol( int xPos ) const
+int TQtTableView::findCol( int xPos ) const
 {
     int cellMaxX;
-    int col = tqfindRawCol( xPos, &cellMaxX );
+    int col = findRawCol( xPos, &cellMaxX );
     if ( testTableFlags(Tbl_cutCellsH) && cellMaxX > maxViewX() )
 	col = - 1;				//  cell cut by right margin
     if ( col >= nCols )
@@ -1709,7 +1709,7 @@ int TQtTableView::tqfindCol( int xPos ) const
   coordinates) if the row is visible.  Returns FALSE and does not modify
   \a *yPos if \a row is invisible or invalid.
 
-  \sa colXPos(), tqfindRow()
+  \sa colXPos(), findRow()
 */
 
 bool TQtTableView::rowYPos( int row, int *yPos ) const
@@ -1749,7 +1749,7 @@ bool TQtTableView::rowYPos( int row, int *yPos ) const
   coordinates) if the column is visible.  Returns FALSE and does not
   modify \a *xPos if \a col is invisible or invalid.
 
-  \sa rowYPos(), tqfindCol()
+  \sa rowYPos(), findCol()
 */
 
 bool TQtTableView::colXPos( int col, int *xPos ) const
@@ -1785,7 +1785,7 @@ bool TQtTableView::colXPos( int col, int *xPos ) const
   Moves the visible area of the table right by \a xPixels and
   down by \a yPixels pixels.  Both may be negative.
 
-  \warning You might tqfind that TQScrollView offers a higher-level of
+  \warning You might find that TQScrollView offers a higher-level of
 	functionality than using TQtTableView and this function.
 
   This function is \e not the same as TQWidget::scroll(); in particular,
diff --git a/tqtinterface/qt4/src/attic/qttableview.h b/tqtinterface/qt4/src/attic/qttableview.h
index 5ba8a17..b8e7c56 100644
--- a/tqtinterface/qt4/src/attic/qttableview.h
+++ b/tqtinterface/qt4/src/attic/qttableview.h
@@ -6,7 +6,7 @@
 **
 ** Copyright (C) 2010 Timothy Pearson and (C) 1992-2008 Trolltech ASA.
 **
-** This file tqcontains a class moved out of the TQt GUI Toolkit API. It
+** This file contains a class moved out of the TQt GUI Toolkit API. It
 ** may be used, distributed and modified without limitation.
 **
 **********************************************************************/
@@ -104,8 +104,8 @@ protected:
     void	paintEvent( TQPaintEvent * );
     void	resizeEvent( TQResizeEvent * );
 
-    int		tqfindRow( int yPos ) const;
-    int		tqfindCol( int xPos ) const;
+    int		findRow( int yPos ) const;
+    int		findCol( int xPos ) const;
 
     bool	rowYPos( int row, int *yPos ) const;
     bool	colXPos( int col, int *xPos ) const;
@@ -132,9 +132,9 @@ private:
     virtual void	setHorScrollBar( bool on, bool update = TRUE );
     virtual void	setVerScrollBar( bool on, bool update = TRUE );
     void	updateView();
-    int		tqfindRawRow( int yPos, int *cellMaxY, int *cellMinY = 0,
+    int		findRawRow( int yPos, int *cellMaxY, int *cellMinY = 0,
 			    bool goOutsideView = FALSE ) const;
-    int		tqfindRawCol( int xPos, int *cellMaxX, int *cellMinX = 0,
+    int		findRawCol( int xPos, int *cellMaxX, int *cellMinX = 0,
 			    bool goOutsideView = FALSE ) const;
     int		maxColsVisible() const;