rename the following methods:

tqfind find
tqreplace replace
tqcontains contains

1 files changed, 30 insertions, 30 deletions

diff --git a/tqtinterface/qt4/src/kernel/tqapplication.cpp b/tqtinterface/qt4/src/kernel/tqapplication.cpp
index 74d2f08..0e3b55c 100644
--- a/tqtinterface/qt4/src/kernel/tqapplication.cpp
+++ b/tqtinterface/qt4/src/kernel/tqapplication.cpp
@@ -725,7 +725,7 @@ void TQApplication::commitData( TQSessionManager& sm  )
 	    } else {
 		w = list->next();
 	    }
-	    while ( w && done.tqcontainsRef( w ) )
+	    while ( w && done.containsRef( w ) )
 		w = list->next();
 	}
 	delete list;
@@ -954,14 +954,14 @@ TQPalette TQApplication::tqpalette( const TQWidget* w ) {
 }
 
 #ifndef TQT_NO_CURSOR
-//void TQApplication::setOverrideCursor( const QCursor &cur, bool tqreplace=FALSE ) {
-// 	TQ_UNUSED(tqreplace);
+//void TQApplication::setOverrideCursor( const QCursor &cur, bool replace=FALSE ) {
+// 	TQ_UNUSED(replace);
 // 	QApplication::setOverrideCursor( cur );
 // }
 
-void TQApplication::setOverrideCursor( const QCursor &cur, bool tqreplace ) {
-	TQ_UNUSED(tqreplace);
-	printf("[FIXME] TQApplication::setOverrideCursor( const QCursor &cur, bool tqreplace=FALSE ) unimplemented\n\r");
+void TQApplication::setOverrideCursor( const QCursor &cur, bool replace ) {
+	TQ_UNUSED(replace);
+	printf("[FIXME] TQApplication::setOverrideCursor( const QCursor &cur, bool replace=FALSE ) unimplemented\n\r");
 }
 #endif
 
@@ -1033,7 +1033,7 @@ void TQApplication::aboutTQt()
   \ingroup application
   \mainclass
 
-  It tqcontains the main event loop, where all events from the window
+  It contains the main event loop, where all events from the window
   system and other sources are processed and dispatched. It also
   handles the application's initialization and finalization, and
   provides session management. It also handles most system-wide and
@@ -1095,7 +1095,7 @@ void TQApplication::aboutTQt()
   \endlist
 
   The <a href="simple-application.html">Application walk-through
-  example</a> tqcontains a typical complete main() that does the usual
+  example</a> contains a typical complete main() that does the usual
   things with TQApplication.
 
   Since the TQApplication object does so much initialization, it
@@ -1554,7 +1554,7 @@ void TQApplication::process_cmdline( int* argcptr, char ** argv )
 	TQCString s;
 	if ( arg == "-qdevel" || arg == "-qdebug") {
 	    // obsolete argument
-	} else if ( arg.tqfind( "-style=", 0, FALSE ) != -1 ) {
+	} else if ( arg.find( "-style=", 0, FALSE ) != -1 ) {
 	    s = arg.right( arg.length() - 7 );
 	} else if ( qstrcmp(arg,"-style") == 0 && i < argc-1 ) {
 	    s = argv[++i];
@@ -1564,7 +1564,7 @@ void TQApplication::process_cmdline( int* argcptr, char ** argv )
 	    TQCString s = argv[++i];
 	    if ( !s.isEmpty() ) {
 		session_id = TQString::tqfromLatin1( s );
-		int p = session_id.tqfind( '_' );
+		int p = session_id.find( '_' );
 		if ( p >= 0 ) {
 		    if ( !session_key )
 			session_key = new TQString;
@@ -1613,7 +1613,7 @@ void TQApplication::process_cmdline( int* argcptr, char ** argv )
   Note that \a argc and \a argv might be changed. TQt removes command
   line arguments that it recognizes. The modified \a argc and \a argv
   can also be accessed later with \c tqApp->argc() and \c tqApp->argv().
-  The documentation for argv() tqcontains a detailed description of how
+  The documentation for argv() contains a detailed description of how
   to process command line arguments.
 
   TQt debugging options (not available if TQt was compiled with the
@@ -2132,7 +2132,7 @@ TQApplication::~TQApplication()
     \endcode
 
     If you run \c{showargs -display unix:0 -font 9x15bold hello world}
-    under X11, the list box tqcontains the three strings "showargs",
+    under X11, the list box contains the three strings "showargs",
     "hello" and "world".
 
     TQt provides a global pointer, \c tqApp, that points to the
@@ -2519,7 +2519,7 @@ static TQString resolveSymlinks( const TQString& path, int depth = 0 )
 	    linkTarget = fileInfo.readLink();
 	    break;
 	}
-    } while ( (slashPos = part.tqfindRev('/')) != -1 );
+    } while ( (slashPos = part.findRev('/')) != -1 );
 
     if ( foundLink ) {
 	TQString path2;
@@ -2529,7 +2529,7 @@ static TQString resolveSymlinks( const TQString& path, int depth = 0 )
 		path2 += "/" + path.right( path.length() - slashPos - 1 );
 	} else {
 	    TQString relPath;
-	    relPath = part.left( part.tqfindRev('/') + 1 ) + linkTarget;
+	    relPath = part.left( part.findRev('/') + 1 ) + linkTarget;
 	    if ( slashPos < (int) path.length() ) {
 		if ( !linkTarget.endsWith( "/" ) )
 		    relPath += "/";
@@ -2546,7 +2546,7 @@ static TQString resolveSymlinks( const TQString& path, int depth = 0 )
 #endif // TQ_WS_WIN
 
 /*!
-    Returns the directory that tqcontains the application executable.
+    Returns the directory that contains the application executable.
 
     For example, if you have installed TQt in the \c{C:\Trolltech\TQt}
     directory, and you run the \c{demo} example, this function will
@@ -2556,7 +2556,7 @@ static TQString resolveSymlinks( const TQString& path, int depth = 0 )
     executable, which may be inside of an application bundle (if the
     application is bundled).
 
-    \warning On Unix, this function assumes that argv[0] tqcontains the file
+    \warning On Unix, this function assumes that argv[0] contains the file
     name of the executable (which it normally does). It also assumes that
     the current directory hasn't been changed by the application.
 
@@ -2574,7 +2574,7 @@ TQString TQApplication::applicationDirPath()
     directory, and you run the \c{demo} example, this function will
     return "C:/Trolltech/TQt/examples/demo/demo.exe".
 
-    \warning On Unix, this function assumes that argv[0] tqcontains the file
+    \warning On Unix, this function assumes that argv[0] contains the file
     name of the executable (which it normally does). It also assumes that
     the current directory hasn't been changed by the application.
 
@@ -2607,9 +2607,9 @@ TQString TQApplication::applicationFilePath()
 	  file path.
 	*/
 	absPath = argv0;
-    } else if ( argv0.tqfind('/') != -1 ) {
+    } else if ( argv0.find('/') != -1 ) {
 	/*
-	  If argv0 tqcontains one or more slashes, it is a file path
+	  If argv0 contains one or more slashes, it is a file path
 	  relative to the current directory.
 	*/
 	absPath = TQDir::current().absFilePath( argv0 );
@@ -2675,7 +2675,7 @@ TQStringList TQApplication::libraryPaths()
 	TQString installPathPlugins = TQString::fromLocal8Bit(qInstallPathPlugins());
 	if ( TQFile::exists(installPathPlugins) ) {
 #ifdef TQ_WS_WIN
-	    installPathPlugins.tqreplace('\\', '/');
+	    installPathPlugins.replace('\\', '/');
 #endif
 	    app_libpaths->append(installPathPlugins);
 	}
@@ -2686,11 +2686,11 @@ TQStringList TQApplication::libraryPaths()
 #ifdef TQ_WS_WIN
 	else {
 	    app_location = TQString(tqAppFileName());
-	    app_location.tqreplace('\\', '/');
+	    app_location.replace('\\', '/');
 	}
 #endif
 	if (!app_location.isEmpty()) {
-	    app_location.truncate( app_location.tqfindRev( '/' ) );
+	    app_location.truncate( app_location.findRev( '/' ) );
 	    if ( app_location != qInstallPathPlugins() && TQFile::exists( app_location ) )
 		app_libpaths->append( app_location );
 	}
@@ -2731,7 +2731,7 @@ void TQApplication::addLibraryPath( const TQString &path )
     // make sure that library paths is initialized
     libraryPaths();
 
-    if ( !app_libpaths->tqcontains( path ) )
+    if ( !app_libpaths->contains( path ) )
 	app_libpaths->prepend( path );
 }
 
@@ -2749,7 +2749,7 @@ void TQApplication::removeLibraryPath( const TQString &path )
     // make sure that library paths is initialized
     libraryPaths();
 
-    if ( app_libpaths->tqcontains( path ) )
+    if ( app_libpaths->contains( path ) )
 	app_libpaths->remove( path );
 }
 #endif //TQT_NO_COMPONENT
@@ -2782,7 +2782,7 @@ TQPalette TQApplication::palette(const TQWidget* w)
     }
 
     if ( w && app_palettes ) {
-	TQPalette* wp = app_palettes->tqfind( w->className() );
+	TQPalette* wp = app_palettes->find( w->className() );
 	if ( wp )
 	    return *wp;
 	TQAsciiDictIterator<TQPalette> it( *app_palettes );
@@ -2841,7 +2841,7 @@ void TQApplication::setPalette( const TQPalette &palette, bool informWidgets,
 	    TQ_CHECK_PTR( app_palettes );
 	    app_palettes->setAutoDelete( TRUE );
 	}
-	oldpal = app_palettes->tqfind( className );
+	oldpal = app_palettes->find( className );
 	app_palettes->insert( className, new TQPalette( pal ) );
     }
     if ( informWidgets && is_app_running && !is_app_closing ) {
@@ -2870,7 +2870,7 @@ void TQApplication::setPalette( const TQPalette &palette, bool informWidgets,
 TQFont TQApplication::font( const TQWidget *w )
 {
     if ( w && app_fonts ) {
-	TQFont* wf = app_fonts->tqfind( w->className() );
+	TQFont* wf = app_fonts->find( w->className() );
 	if ( wf )
 	    return *wf;
 	TQAsciiDictIterator<TQFont> it( *app_fonts );
@@ -4005,7 +4005,7 @@ TQString TQApplication::translate( const char * context, const char * sourceText
 	TQString result;
 	for ( it = translators->begin(); it != translators->end(); ++it ) {
 	    mf = *it;
-	    result = mf->tqfindMessage( context, sourceText, comment ).translation();
+	    result = mf->findMessage( context, sourceText, comment ).translation();
 	    if ( !result.isNull() )
 		return result;
 	}
@@ -4920,7 +4920,7 @@ void TQApplication::commitData( TQSessionManager& sm  )
 	    } else {
 		w = list->next();
 	    }
-	    while ( w && done.tqcontainsRef( w ) )
+	    while ( w && done.containsRef( w ) )
 		w = list->next();
 	}
 	delete list;
@@ -5009,7 +5009,7 @@ void TQApplication::setStartDragDistance( int l )
 
   For example, if the mouse position of the click is stored in \c
   startPos and the current position (e.g. in the mouse move event) is
-  \c currPos, you can tqfind out if a drag should be started with code
+  \c currPos, you can find out if a drag should be started with code
   like this:
   \code
   if ( ( startPos - currPos ).manhattanLength() >