rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 files changed, 15 insertions, 15 deletions

diff --git a/kview/kview.cpp b/kview/kview.cpp
index f30d5c3c..aca76bd4 100644
--- a/kview/kview.cpp
+++ b/kview/kview.cpp
@@ -499,9 +499,9 @@ void KView::setupActions( TQObject * partobject )
 	if( extension )
 	{
 		TQStrList slotNames = extension->tqmetaObject()->slotNames();
-		if( slotNames.tqcontains( "print()" ) )
+		if( slotNames.contains( "print()" ) )
 			KStdAction::print( extension, TQT_SLOT( print() ), actionCollection(), "print" );
-		if( slotNames.tqcontains( "del()" ) )
+		if( slotNames.contains( "del()" ) )
 			( void )new KAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete,
 								 extension, TQT_SLOT( del() ), actionCollection(), "del" );
 		connect( extension, TQT_SIGNAL( enableAction( const char *, bool ) ), TQT_SLOT( enableAction( const char *, bool ) ) );
diff --git a/kview/kviewcanvas/kimageholder.cpp b/kview/kviewcanvas/kimageholder.cpp
index a26a061f..1bf3df98 100644
--- a/kview/kviewcanvas/kimageholder.cpp
+++ b/kview/kviewcanvas/kimageholder.cpp
@@ -83,7 +83,7 @@ void KImageHolder::mousePressEvent( TQMouseEvent *ev )
 void KImageHolder::mouseMoveEvent( TQMouseEvent *ev )
 {
 	//FIXME: when scrolling the cursorpos shouldn't change
-	if( TQT_TQRECT_OBJECT(this->rect()).tqcontains( ev->pos(), false ) )
+	if( TQT_TQRECT_OBJECT(this->rect()).contains( ev->pos(), false ) )
 		emit cursorPos( ev->pos() );
 	//kdDebug( 4620 ) << k_funcinfo << " ev->state() = " << ev->state() << endl;
 	if( ev->state() & Qt::LeftButton || ev->state() & Qt::MidButton )
diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp
index eb4adb13..d4d2cda6 100644
--- a/kview/kviewviewer/kviewviewer.cpp
+++ b/kview/kviewviewer/kviewviewer.cpp
@@ -259,7 +259,7 @@ bool KViewViewer::openURL( const KURL & url )
 		// Use same extension as remote file. This is important for mimetype-determination (e.g. koffice)
 		TQString extension;
 		TQString fileName = url.fileName();
-		int extensionPos = fileName.tqfindRev( '.' );
+		int extensionPos = fileName.findRev( '.' );
 		if ( extensionPos != -1 )
 			extension = fileName.mid( extensionPos ); // keep the '.'
 		delete m_pTempFile;
@@ -645,7 +645,7 @@ void KViewViewer::setZoom( const TQString & newZoom )
 	kdDebug( 4610 ) << k_funcinfo << newZoom << endl;
 	double zoom;
 	TQString z = newZoom;
-	z.remove( z.tqfind( '%' ), 1 );
+	z.remove( z.find( '%' ), 1 );
 	if( newZoom == "33%" )
 		zoom = 1.0 / 3.0;
 	else
@@ -667,14 +667,14 @@ void KViewViewer::updateZoomMenu( double zoom )
 		TQStringList itemsList = m_paZoom->items();
 		for( TQStringList::Iterator it = itemsList.begin(); it != itemsList.end(); ++it )
 		{
-			z = ( *it ).tqreplace( TQRegExp( "%" ), "" );
+			z = ( *it ).replace( TQRegExp( "%" ), "" );
 			z = z.simplifyWhiteSpace();
 			val = z.toInt( &ok );
-			if( ok && val > 0 && list.tqcontains( val ) == 0 )
+			if( ok && val > 0 && list.contains( val ) == 0 )
 				list << val;
 		}
 		val = TQString::number( zoom * 100, 'f', 0 ).toInt(); // round/lround from math.h doesn't work - dunno
-		if( list.tqcontains( val ) == 0 )
+		if( list.contains( val ) == 0 )
 			list.append( val );
 
 		qHeapSort( list );
@@ -687,7 +687,7 @@ void KViewViewer::updateZoomMenu( double zoom )
 	// first look if it's a new value (not in the list yet)
 	TQString z = TQString( "%1%" ).tqarg( zoom * 100, 0, 'f', 0 );
 	TQStringList items = m_paZoom->items();
-	int idx = items.tqfindIndex( z );
+	int idx = items.findIndex( z );
 	if( -1 == idx )
 	{
 		// not found XXX: remove when done
diff --git a/kview/modules/browser/kviewbrowser.cpp b/kview/modules/browser/kviewbrowser.cpp
index ef4d091a..7e52732b 100644
--- a/kview/modules/browser/kviewbrowser.cpp
+++ b/kview/modules/browser/kviewbrowser.cpp
@@ -163,7 +163,7 @@ void KViewBrowser::setupDirLister()
 	{
 		TQApplication::setOverrideCursor( WaitCursor );
 		TQString url = m_pViewer->url().prettyURL();
-		int pos = url.tqfindRev( "/" );
+		int pos = url.findRev( "/" );
 		url = url.left( (unsigned int)pos );
 		kdDebug( 4630 ) << "open KDirLister for " << url << endl;
 		m_pDirLister->openURL( KURL( url ));
diff --git a/kview/modules/presenter/imagelistitem.cpp b/kview/modules/presenter/imagelistitem.cpp
index b31c65b2..870987be 100644
--- a/kview/modules/presenter/imagelistitem.cpp
+++ b/kview/modules/presenter/imagelistitem.cpp
@@ -41,7 +41,7 @@ ImageListItem::ImageListItem( KListView * tqparent, const KURL & url )
 		/*
 		TQString extension;
 		TQString fileName = m_url.fileName();
-		int extensionPos = fileName.tqfindRev( '.' );
+		int extensionPos = fileName.findRev( '.' );
 		if ( extensionPos != -1 )
 			extension = fileName.mid( extensionPos ); // keep the '.'
 		delete m_pTempFile;
diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp
index 6b08593c..4f5eeb10 100644
--- a/kview/modules/presenter/kviewpresenter.cpp
+++ b/kview/modules/presenter/kviewpresenter.cpp
@@ -191,7 +191,7 @@ bool KViewPresenter::eventFilter( TQObject *obj, TQEvent *ev )
 					for( TQStringList::const_iterator it = l.begin(); it != l.end(); ++it )
 					{
 						ImageInfo * info = new ImageInfo( KURL( *it ) );
-						if( ! m_imagelist.tqcontains( info ) )
+						if( ! m_imagelist.contains( info ) )
 						{
 							m_imagelist.inSort( info );
 							( void )new ImageListItem( m_pImageList->m_pListView, KURL( *it ) );
@@ -218,7 +218,7 @@ void KViewPresenter::slotImageOpened( const KURL & url )
 	{
 		kdDebug( 4630 ) << k_funcinfo << "imagelist:" << endl;
 		ImageInfo * info = new ImageInfo( url );
-		if( ! m_imagelist.tqcontains( info ) )
+		if( ! m_imagelist.contains( info ) )
 		{
 			m_imagelist.inSort( info );
 			TQListViewItem * item = new ImageListItem( m_pImageList->m_pListView, url );
@@ -248,7 +248,7 @@ void KViewPresenter::slotOpenFiles()
 	for( ++it; it != urls.end(); ++it )
 	{
 		ImageInfo * info = new ImageInfo( *it );
-		if( ! m_imagelist.tqcontains( info ) )
+		if( ! m_imagelist.contains( info ) )
 		{
 			m_imagelist.inSort( info );
 			( void )new ImageListItem( m_pImageList->m_pListView, *it );
@@ -431,7 +431,7 @@ void KViewPresenter::loadList()
 			{
 				KURL url ( t.readLine() );
 				ImageInfo * info = new ImageInfo( url );
-				if( ! m_imagelist.tqcontains( info ) )
+				if( ! m_imagelist.contains( info ) )
 				{
 					m_imagelist.inSort( info );
 					( void )new ImageListItem( m_pImageList->m_pListView, url );