rename the following methods:

tqfind find
tqreplace replace
tqcontains contains

35 files changed, 815 insertions, 815 deletions

diff --git a/tqtinterface/qt4/qmake/CHANGES b/tqtinterface/qt4/qmake/CHANGES
index b751524..ca786ee 100644
--- a/tqtinterface/qt4/qmake/CHANGES
+++ b/tqtinterface/qt4/qmake/CHANGES
@@ -53,7 +53,7 @@
  2) library dependencies, when on .pro depends on another library - it will
     automatically build that other library (unix makefiles only)
  3) automatic detection of configurations for Qt, if CONFIG qt is specified
-    it will tqfind the settings for the most recent Qt itself.
+    it will find the settings for the most recent Qt itself.
 
  Project Builder for Mac OS X is now a supported backend for qmake.
 
diff --git a/tqtinterface/qt4/qmake/book/qmake-advanced.leaf b/tqtinterface/qt4/qmake/book/qmake-advanced.leaf
index ab94a46..d1b8c4b 100644
--- a/tqtinterface/qt4/qmake/book/qmake-advanced.leaf
+++ b/tqtinterface/qt4/qmake/book/qmake-advanced.leaf
@@ -64,7 +64,7 @@ is not already defined.
 
 \section2 The '~=' operator
 
-This operator tqreplaces any values that match the regexp with the
+This operator replaces any values that match the regexp with the
 specified value.  It is used like this:
 
 \code
@@ -193,7 +193,7 @@ variable by prefixing $$ to the variable name. For example:
     MY_DEFINES = $$DEFINES
 \endcode
 
-Now the MY_DEFINES variable tqcontains what is in the DEFINES variable at
+Now the MY_DEFINES variable contains what is in the DEFINES variable at
 this point in the project file.  This is also equivalent to:
 
 \code 
@@ -204,7 +204,7 @@ The second notation allows you to adjoin the variable expansion to another
 value without separating by space. \e qmake will allow a variable to
 contain anything (including $(VALUE), which will be placed directly into
 the Makefile, and allow it to expand as appropriate, usually an environment
-variable). However, if you require an environment variable to be tqreplaced
+variable). However, if you require an environment variable to be replaced
 immediately then you may use the $$() notation. For example:
 
 \code
@@ -235,7 +235,7 @@ list. If the value of \e variablename is not long this will return an empty
 string. \e variablename is the only required field, if not specified
 position will default to the first value in the list (0).
 
-\section2 tqfind( variablename, substr )
+\section2 find( variablename, substr )
 
 This will place all the values in \e variablename that match \e substr. \e
 substr may be a regular expression as well, and will be matched
@@ -244,11 +244,11 @@ accordingly.
 \code
     MY_VAR = one two three four
     MY_VAR2 = $$join(MY_VAR, " -L", -L) -Lfive
-    MY_VAR3 = $$member(MY_VAR, 2) $$tqfind(MY_VAR, t.*)
+    MY_VAR3 = $$member(MY_VAR, 2) $$find(MY_VAR, t.*)
 \endcode
 
 MY_VAR2 will contain '-Lone -Ltwo -Lthree -Lfour -Lfive', and MYVAR3 will
-tqcontains 'three two three'.
+contains 'three two three'.
 
 \section2 system( program_and_args )
 
@@ -258,7 +258,7 @@ platform for example.
 
 \code
     UNAME = $$system(uname -s)
-    tqcontains( UNAME, [lL]inux ):message( This looks like Linux ($$UNAME) to me )
+    contains( UNAME, [lL]inux ):message( This looks like Linux ($$UNAME) to me )
 \endcode
 
 \section1 Test Functions
@@ -268,14 +268,14 @@ tests. These tests may be used in place of scopes (as described above), in
 some cases it is more usefull to use the test function by itself ignoring
 its test value.
 
-\section2 tqcontains( variablename, value )
+\section2 contains( variablename, value )
 
 If \e value is in the list of values stored in the variable called \e
 variablename, then the settings inside the scope will be processed.
 For example:
 
 \code
-    tqcontains( CONFIG, thread ) {
+    contains( CONFIG, thread ) {
 	DEFINES += QT_THREAD_SUPPORT
     }
 \endcode
@@ -396,6 +396,6 @@ headers.
 \section2 infile( filename, var, val )
 
 This function will succeed if the file \e filename (when parsed
-by qmake itself) tqcontains the variable \e var with a value of 
+by qmake itself) contains the variable \e var with a value of 
 \e val. You may also not pass in a third argument (\e val) and the
 function will only test if \e var has been assigned to in the file.
diff --git a/tqtinterface/qt4/qmake/book/qmake-commandreference.leaf b/tqtinterface/qt4/qmake/book/qmake-commandreference.leaf
index 5d803de..8eccfcc 100644
--- a/tqtinterface/qt4/qmake/book/qmake-commandreference.leaf
+++ b/tqtinterface/qt4/qmake/book/qmake-commandreference.leaf
@@ -66,7 +66,7 @@ The following options can be specified on the command line to \e qmake:
 	\e qmake will go over these features and give some useful help.
 \endlist
 
-There are also warning options that can help to tqfind problems in your
+There are also warning options that can help to find problems in your
 project file:
 
 \list
@@ -355,7 +355,7 @@ this syntax is not fully supported by \QD.
 \target LEXSOURCES
 \section3 LEXSOURCES
 
-This variable tqcontains a list of lex source files.  All
+This variable contains a list of lex source files.  All
 dependencies, headers and source files will automatically be added to
 the project for building these lex files.  
 
@@ -369,12 +369,12 @@ LEXSOURCES = lexer.l
 \target LIBS
 \section3 LIBS
 
-This variable tqcontains a list of libraries to be linked into the project.
+This variable contains a list of libraries to be linked into the project.
 If you are more comfortable with the Unix convension of -L/-l flags you are
 free to use them in a cross-platform manner and qmake will do the correct
 thing with these libraries on Windows (namely this means passing the full
 path of the library to the linker). The only limitation to this is the
-library must exist, for qmake to tqfind which directory a -l lib lives in.
+library must exist, for qmake to find which directory a -l lib lives in.
 
 For example:
 
@@ -467,7 +467,7 @@ This is mainly used in Qt's build system for building the examples.
 \target SOURCES
 \section3 SOURCES
 
-This variable tqcontains the name of all source files in the project.  
+This variable contains the name of all source files in the project.  
 
 For example:
 
@@ -484,7 +484,7 @@ See also \link #HEADERS HEADERS \endlink
 \section3 SUBDIRS
 
 This variable, when used with the 'subdirs'
-\link #TEMPLATE TEMPLATE \endlink tqcontains the names of all subdirectories
+\link #TEMPLATE TEMPLATE \endlink contains the names of all subdirectories
 to look for a project file.
 
 For example:
@@ -516,7 +516,7 @@ unix and 'myapp.exe' on windows.
 \target TEMPLATE
 \section3 TEMPLATE
 
-This variable tqcontains the name of the template to use when
+This variable contains the name of the template to use when
 generating the project.  The allowed values are:
 
 \list
@@ -548,7 +548,7 @@ the command line rather than use the \c -t option.
 
 \section3 VERSION
 
-This variable tqcontains the version number of the library if the
+This variable contains the version number of the library if the
 'lib' \link #TEMPLATE TEMPLATE \endlink is specified.
 
 For example:
@@ -559,7 +559,7 @@ VERSION = 1.2.3
 
 \section3 DISTFILES
 
-This variable tqcontains a list of files to be included in the dist
+This variable contains a list of files to be included in the dist
 target. This feature is supported by UnixMake specs only.
 
 For example:
@@ -572,7 +572,7 @@ DISTFILES += ../program.txt
 \target YACCSOURCES
 \section3 YACCSOURCES
 
-This variable tqcontains a list of yacc source files to be included
+This variable contains a list of yacc source files to be included
 in the project.  All dependencies, headers and source files will
 automatically be included in the project.
 
@@ -613,7 +613,7 @@ modified.
 \target LEXIMPLS
 \section3 LEXIMPLS
 
-This variable tqcontains a list of lex implementation files.  The value
+This variable contains a list of lex implementation files.  The value
 of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely
 needs to be modified.
 
@@ -622,7 +622,7 @@ needs to be modified.
 \target LEXOBJECTS
 \section3 LEXOBJECTS
 
-This variable tqcontains the names of intermediate lex object
+This variable contains the names of intermediate lex object
 files.The value of this variable is typically handled by
 \e qmake and rarely needs to be modified.
 
@@ -658,7 +658,7 @@ handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to
 \target MAKEFILE_GENERATOR
 \section3 MAKEFILE_GENERATOR
 
-This variable tqcontains the name of the makefile generator to use
+This variable contains the name of the makefile generator to use
 when generating a makefile.  The value of this variable is typically
 handled internally by \e qmake and rarely needs to be modified.
 
@@ -668,7 +668,7 @@ handled internally by \e qmake and rarely needs to be modified.
 
 This variable is generated from the \link #SOURCES SOURCES
 \endlink variable.  The extension of each source file will have been 
-tqreplaced by .o (Unix) or .obj (Win32).  The value of this variable is 
+replaced by .o (Unix) or .obj (Win32).  The value of this variable is 
 typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and
 rarely needs to be modified.
 
@@ -676,7 +676,7 @@ rarely needs to be modified.
 \section3 OBJTQMOC
 
 This variable is set by \e qmake if files can be found that
-contain the Q_OBJECT macro.  \c OBJTQMOC tqcontains the
+contain the Q_OBJECT macro.  \c OBJTQMOC contains the
 name of all intermediate tqmoc object files. The value of this variable
 is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be
 modified.
@@ -693,7 +693,7 @@ UNIX - gcc 3.3 and up).
 On other platforms, this variable has different meaning, as noted
 below.
 
-This variable tqcontains a list of header files that require some
+This variable contains a list of header files that require some
 sort of pre-compilation step (such as with tqmoc). The value of this
 variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be
 modified.  
@@ -701,7 +701,7 @@ modified.
 \target QMAKE
 \section3 QMAKE
 
-This variable tqcontains the name of the \e qmake program
+This variable contains the name of the \e qmake program
 itself and is placed in generated makefiles.  The value of this
 variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be
 modified.
@@ -711,7 +711,7 @@ modified.
 \target QMAKESPEC_systemvariable
 \section3 QMAKESPEC
 
-This variable tqcontains the name of the \e qmake
+This variable contains the name of the \e qmake
 configuration to use when generating makefiles.  The value of this
 variable is typically handled by \e qmake and rarely needs to be modified.
 Use the \link #QMAKESPEC QMAKESPEC \endlink environment variable instead.
@@ -751,7 +751,7 @@ modified.
 
 \e {This is used on Unix platforms only}
 
-This variable tqcontains the command for invoking the program which
+This variable contains the command for invoking the program which
 creates, modifies and extracts archives. The value of this variable is
 typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink 
 and rarely needs to be modified.
@@ -761,7 +761,7 @@ and rarely needs to be modified.
 \target TQMAKE_CFLAGS_DEBUG
 \section3 TQMAKE_CFLAGS_DEBUG
 
-This variable tqcontains the flags for the C compiler in debug mode.The value of this variable is
+This variable contains the flags for the C compiler in debug mode.The value of this variable is
 typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink 
 and rarely needs to be modified.
 
@@ -771,7 +771,7 @@ and rarely needs to be modified.
 \target TQMAKE_CFLAGS_MT
 \section3 TQMAKE_CFLAGS_MT
 
-This variable tqcontains the compiler flags for creating a
+This variable contains the compiler flags for creating a
 multi-threaded application or when the version of Qt that you link
 against is a multi-threaded statically linked library.  The value of 
 this variable is typically handled by \e qmake or 
@@ -783,7 +783,7 @@ this variable is typically handled by \e qmake or
 \target TQMAKE_CFLAGS_MT_DBG
 \section3 TQMAKE_CFLAGS_MT_DBG
 
-This variable tqcontains the compiler flags for creating a debuggable
+This variable contains the compiler flags for creating a debuggable
 multi-threaded application or when the version of Qt that you link
 against is a debuggable multi-threaded statically linked library.  The 
 value of this variable is typically handled by \e qmake or 
@@ -797,7 +797,7 @@ value of this variable is typically handled by \e qmake or
 
 \e {This is used on Windows only}
 
-This variable tqcontains the compiler flags for creating a 
+This variable contains the compiler flags for creating a 
 multi-threaded dll or when the version of Qt that you link
 against is a multi-threaded dll.  The value of this variable is typically
 handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and
@@ -811,7 +811,7 @@ rarely needs to be modified.
 
 \e {This is used on Windows only}
 
-This variable tqcontains the compiler flags for creating a debuggable
+This variable contains the compiler flags for creating a debuggable
 multi-threaded dll or when the version of Qt that you link
 against is a debuggable multi-threaded statically linked library. 
 The value of this variable is typically handled by \e qmake or 
@@ -823,7 +823,7 @@ The value of this variable is typically handled by \e qmake or
 \target TQMAKE_CFLAGS_RELEASE
 \section3 TQMAKE_CFLAGS_RELEASE
 
-This variable tqcontains the compiler flags for creating a non-debuggable
+This variable contains the compiler flags for creating a non-debuggable
 application.  The value of this variable is typically
 handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and
 rarely needs to be modified.
@@ -836,7 +836,7 @@ rarely needs to be modified.
 
 \e {This is used on Unix platforms only}
 
-This variable tqcontains the compiler flags for creating a shared
+This variable contains the compiler flags for creating a shared
 library. The value of this variable is typically handled by
 \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs
 to be modified.
@@ -847,7 +847,7 @@ to be modified.
 \target TQMAKE_CFLAGS_THREAD
 \section3 TQMAKE_CFLAGS_THREAD
 
-This variable tqcontains the compiler flags for creating a multi-threaded
+This variable contains the compiler flags for creating a multi-threaded
 application. The value of this variable is typically handled by
 \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs
 to be modified.
@@ -880,7 +880,7 @@ to be modified.
 \target QMAKE_CLEAN
 \section3 QMAKE_CLEAN
 
-This variable tqcontains any files which are not generated files (such as tqmoc and uic 
+This variable contains any files which are not generated files (such as tqmoc and uic 
 generated files) and object files that should be removed when using "make clean".
 
 
@@ -888,7 +888,7 @@ generated files) and object files that should be removed when using "make clean"
 \target TQMAKE_CXXFLAGS_DEBUG
 \section3 TQMAKE_CXXFLAGS_DEBUG
 
-This variable tqcontains the C++ compiler flags for creating a debuggable
+This variable contains the C++ compiler flags for creating a debuggable
 application. The value of this variable is typically handled by
 \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs
 to be modified.
@@ -898,7 +898,7 @@ to be modified.
 \target TQMAKE_CXXFLAGS_MT
 \section3 TQMAKE_CXXFLAGS_MT
 
-This variable tqcontains the C++ compiler flags for creating a multi-threaded
+This variable contains the C++ compiler flags for creating a multi-threaded
 application. The value of this variable is typically handled by
 \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs
 to be modified.
@@ -909,7 +909,7 @@ to be modified.
 \target TQMAKE_CXXFLAGS_MT_DBG
 \section3 TQMAKE_CXXFLAGS_MT_DBG
 
-This variable tqcontains the C++ compiler flags for creating a debuggable multi-threaded
+This variable contains the C++ compiler flags for creating a debuggable multi-threaded
 application. The value of this variable is typically handled by
 \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs
 to be modified.
@@ -922,7 +922,7 @@ to be modified.
 
 \c {This is used on Windows only}
 
-This variable tqcontains the C++ compiler flags for creating a multi-threaded
+This variable contains the C++ compiler flags for creating a multi-threaded
 dll. The value of this variable is typically handled by
 \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs
 to be modified.
@@ -935,7 +935,7 @@ to be modified.
 
 \c {This is used on Windows only}
 
-This variable tqcontains the C++ compiler flags for creating a multi-threaded debuggable
+This variable contains the C++ compiler flags for creating a multi-threaded debuggable
 dll. The value of this variable is typically handled by
 \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs
 to be modified.
@@ -946,7 +946,7 @@ to be modified.
 \target TQMAKE_CXXFLAGS_RELEASE
 \section3 TQMAKE_CXXFLAGS_RELEASE
 
-This variable tqcontains the C++ compiler flags for creating an 
+This variable contains the C++ compiler flags for creating an 
 application. The value of this variable is typically handled by
 \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs
 to be modified.
@@ -957,7 +957,7 @@ to be modified.
 \target TQMAKE_CXXFLAGS_SHLIB
 \section3 TQMAKE_CXXFLAGS_SHLIB
 
-This variable tqcontains the C++ compiler flags for creating a
+This variable contains the C++ compiler flags for creating a
 shared library.  The value of this variable is typically handled by
 \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs
 to be modified.
@@ -968,7 +968,7 @@ to be modified.
 \target TQMAKE_CXXFLAGS_THREAD
 \section3 TQMAKE_CXXFLAGS_THREAD
 
-This variable tqcontains the C++ compiler flags for creating a
+This variable contains the C++ compiler flags for creating a
 multi-threaded application.  The value of this variable is typically handled by
 \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs
 to be modified.
@@ -979,7 +979,7 @@ to be modified.
 \target TQMAKE_CXXFLAGS_WARN_OFF
 \section3 TQMAKE_CXXFLAGS_WARN_OFF
 
-This variable tqcontains the C++ compiler flags for suppressing compiler warnings.
+This variable contains the C++ compiler flags for suppressing compiler warnings.
  The value of this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
@@ -988,7 +988,7 @@ This variable tqcontains the C++ compiler flags for suppressing compiler warning
 \target TQMAKE_CXXFLAGS_WARN_ON
 \section3 TQMAKE_CXXFLAGS_WARN_ON
 
-This variable tqcontains C++ compiler flags for generating compiler warnings.
+This variable contains C++ compiler flags for generating compiler warnings.
  The value of this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
@@ -998,7 +998,7 @@ This variable tqcontains C++ compiler flags for generating compiler warnings.
 \target QMAKE_EXTENSION_SHLIB
 \section3 QMAKE_EXTENSION_SHLIB
 
-This variable tqcontains the extention for shared libraries.  The value of this 
+This variable contains the extention for shared libraries.  The value of this 
 variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink 
 and rarely needs to be modified.
 
@@ -1008,7 +1008,7 @@ and rarely needs to be modified.
 \target QMAKE_FAILED_REQUIREMENTS
 \section3 QMAKE_FAILED_REQUIREMENTS
 
-This variable tqcontains the list of requirements that were failed to be met when
+This variable contains the list of requirements that were failed to be met when
 \e qmake was used.  For example, the sql module is needed and wasn't compiled into Qt.  The 
 value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink 
 and rarely needs to be modified.
@@ -1019,7 +1019,7 @@ and rarely needs to be modified.
 \target QMAKE_FILETAGS
 \section3 QMAKE_FILETAGS
 
-This variable tqcontains the file tags needed to be entered into the makefile, such as SOURCES
+This variable contains the file tags needed to be entered into the makefile, such as SOURCES
 and HEADERS.  The value of this variable is typically handled by \e qmake or 
 \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
@@ -1029,7 +1029,7 @@ and HEADERS.  The value of this variable is typically handled by \e qmake or
 \target QMAKE_INCDIR
 \section3 QMAKE_INCDIR
 
-This variable tqcontains the location of all known header files to be added to 
+This variable contains the location of all known header files to be added to 
 INCLUDEPATH when building an application.  The value of this variable is 
 typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely 
 needs to be modified.
@@ -1063,7 +1063,7 @@ This list will go before all builtin dependencies.
 \target QMAKE_INCDIR_OPENGL
 \section3 QMAKE_INCDIR_OPENGL
 
-This variable tqcontains the location of OpenGL header files to be added
+This variable contains the location of OpenGL header files to be added
 to INCLUDEPATH when building an application with OpenGL support. The
 value of this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
@@ -1073,7 +1073,7 @@ value of this variable is typically handled by \e qmake or
 \target QMAKE_INCDIR_QT
 \section3 QMAKE_INCDIR_QT
 
-This variable tqcontains the location of all known header file
+This variable contains the location of all known header file
 paths to be added to INCLUDEPATH when building a Qt application. The value 
 of this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
@@ -1084,7 +1084,7 @@ of this variable is typically handled by \e qmake or
 \target QMAKE_INCDIR_THREAD
 \section3 QMAKE_INCDIR_THREAD
 
-This variable tqcontains the location of all known header file
+This variable contains the location of all known header file
 paths to be added to INCLUDEPATH when building a multi-threaded application. 
 The value of this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
@@ -1097,7 +1097,7 @@ The value of this variable is typically handled by \e qmake or
 
 \e {This is used on Unix platforms only}
 
-This variable tqcontains the location of X11 header file paths to be
+This variable contains the location of X11 header file paths to be
 added to INCLUDEPATH when building a X11 application.  The
 value of this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
@@ -1109,7 +1109,7 @@ value of this variable is typically handled by \e qmake or
 
 \e {This is used on Windows only}
 
-This variable tqcontains link flags when building console
+This variable contains link flags when building console
 programs.  The value of this variable is typically handled by
 \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
@@ -1119,7 +1119,7 @@ programs.  The value of this variable is typically handled by
 
 \e {This is used on Windows only}
 
-This variable tqcontains link flags when building console
+This variable contains link flags when building console
 dlls.  The value of this variable is typically handled by
 \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
@@ -1130,7 +1130,7 @@ dlls.  The value of this variable is typically handled by
 
 \section3 QMAKE_LFLAGS_DEBUG
 
-This variable tqcontains link flags when building debuggable applications.  The
+This variable contains link flags when building debuggable applications.  The
 value of this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
@@ -1140,7 +1140,7 @@ value of this variable is typically handled by \e qmake or
 
 \section3 QMAKE_LFLAGS_PLUGIN
 
-This variable tqcontains link flags when building plugins. The value
+This variable contains link flags when building plugins. The value
 of this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
@@ -1150,7 +1150,7 @@ of this variable is typically handled by \e qmake or
 
 \section3 QMAKE_LFLAGS_QT_DLL
 
-This variable tqcontains link flags when building programs that
+This variable contains link flags when building programs that
 use the Qt library built as a dll. The value of this variable is
 typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
@@ -1161,7 +1161,7 @@ typically handled by \e qmake or
 
 \section3 QMAKE_LFLAGS_RELEASE
 
-This variable tqcontains link flags when building applications for 
+This variable contains link flags when building applications for 
 release. The value of this variable is typically handled by
 \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
@@ -1171,7 +1171,7 @@ release. The value of this variable is typically handled by
 
 \section3 QMAKE_LFLAGS_SHAPP
 
-This variable tqcontains link flags when building applications which are using
+This variable contains link flags when building applications which are using
 the 'app' template.  The value of this variable is typically handled by
 \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
@@ -1181,7 +1181,7 @@ the 'app' template.  The value of this variable is typically handled by
 
 \section3 QMAKE_LFLAGS_SHLIB
 
-This variable tqcontains link flags when building shared libraries
+This variable contains link flags when building shared libraries
 The value of this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
@@ -1200,7 +1200,7 @@ qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
 \section3 QMAKE_LFLAGS_THREAD
 
-This variable tqcontains link flags when building multi-threaded projects.
+This variable contains link flags when building multi-threaded projects.
 The value of this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
@@ -1212,7 +1212,7 @@ The value of this variable is typically handled by \e qmake or
 
 \e {This is used on Windows only}
 
-This variable tqcontains link flags when building windows projects.
+This variable contains link flags when building windows projects.
 The value of this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
@@ -1221,14 +1221,14 @@ The value of this variable is typically handled by \e qmake or
 
 \e {This is used on Windows only}
 
-This variable tqcontains link flags when building windows dll projects.
+This variable contains link flags when building windows dll projects.
 The value of this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
 
 \section3 QMAKE_LIBDIR
 
-This variable tqcontains the location of all known library
+This variable contains the location of all known library
 directories.The value of this variable is typically handled by
 \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
@@ -1241,7 +1241,7 @@ directories.The value of this variable is typically handled by
 
 \e {This is used on Unix platforms only}
 
-This variable tqcontains the location of all library
+This variable contains the location of all library
 directory with -L prefixed.  The value of this variable is typically handled by
 \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
@@ -1252,23 +1252,23 @@ directory with -L prefixed.  The value of this variable is typically handled by
 
 This variable tells \e qmake where to search for files it cannot
 open. With this you may tell \e qmake where it may look for things
-like SOURCES, and if it tqfinds an entry in SOURCES that cannot be
+like SOURCES, and if it finds an entry in SOURCES that cannot be
 opened it will look through the entire VPATH list to see if it can
-tqfind the file on its own.
+find the file on its own.
 
 See also \link #DEPENDPATH DEPENDPATH \endlink.
 
 \target DEPENDPATH
 \section3 DEPENDPATH
 
-This variable tqcontains the list of all directories to look in to
+This variable contains the list of all directories to look in to
 resolve dependencies. This will be used when crawling through
 'included' files.
 
 
 \section3 QMAKE_LIBDIR_OPENGL
 
-This variable tqcontains the location of the OpenGL library
+This variable contains the location of the OpenGL library
 directory.The value of this variable is typically handled by
 \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
@@ -1279,7 +1279,7 @@ directory.The value of this variable is typically handled by
 
 \section3 QMAKE_LIBDIR_QT
 
-This variable tqcontains the location of the Qt library
+This variable contains the location of the Qt library
 directory.The value of this variable is typically handled by
 \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
@@ -1292,14 +1292,14 @@ directory.The value of this variable is typically handled by
 
 \e {This is used on Unix platforms only}
 
-This variable tqcontains the location of the X11 library
+This variable contains the location of the X11 library
 directory.The value of this variable is typically handled by
 \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
 \section3 QMAKE_LIBS
 
-This variable tqcontains all project libraries.  The value of this
+This variable contains all project libraries.  The value of this
 variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
@@ -1308,7 +1308,7 @@ variable is typically handled by \e qmake or
 
 \e {This is used on Windows only}
 
-This variable tqcontains all project libraries that should be linked against
+This variable contains all project libraries that should be linked against
 when building a console application.  The value of this
 variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
@@ -1318,7 +1318,7 @@ variable is typically handled by \e qmake or
 
 \section3 QMAKE_LIBS_OPENGL
 
-This variable tqcontains all OpenGL libraries.  The value of this
+This variable contains all OpenGL libraries.  The value of this
 variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
@@ -1328,7 +1328,7 @@ variable is typically handled by \e qmake or
 
 \section3 QMAKE_LIBS_OPENGL_QT
 
-This variable tqcontains all OpenGL Qt libraries.The value of this
+This variable contains all OpenGL Qt libraries.The value of this
 variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
@@ -1338,7 +1338,7 @@ variable is typically handled by \e qmake or
 
 \section3 QMAKE_LIBS_QT
 
-This variable tqcontains all Qt libraries.The value of this
+This variable contains all Qt libraries.The value of this
 variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
@@ -1350,7 +1350,7 @@ variable is typically handled by \e qmake or
 
 \e {This is used on Windows only}
 
-This variable tqcontains all Qt libraries when Qt is built as a dll.  The 
+This variable contains all Qt libraries when Qt is built as a dll.  The 
 value of this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
@@ -1360,7 +1360,7 @@ value of this variable is typically handled by \e qmake or
 
 \section3 QMAKE_LIBS_QT_OPENGL
 
-This variable tqcontains all the libraries needed to link against if 
+This variable contains all the libraries needed to link against if 
 OpenGL support is turned on. The 
 value of this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
@@ -1369,7 +1369,7 @@ value of this variable is typically handled by \e qmake or
 
 \section3 QMAKE_LIBS_QT_THREAD
 
-This variable tqcontains all the libraries needed to link against if 
+This variable contains all the libraries needed to link against if 
 thread support is turned on.  The 
 value of this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
@@ -1382,7 +1382,7 @@ value of this variable is typically handled by \e qmake or
 
 \e {This is used with Borland compilers only}
 
-This variable tqcontains the runtime library needed to link against when
+This variable contains the runtime library needed to link against when
 building an application.  The 
 value of this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
@@ -1395,7 +1395,7 @@ value of this variable is typically handled by \e qmake or
 
 \e {This is used with Borland compilers only}
 
-This variable tqcontains the runtime library needed to link against when
+This variable contains the runtime library needed to link against when
 building a multi-threaded application.  The 
 value of this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
@@ -1406,7 +1406,7 @@ value of this variable is typically handled by \e qmake or
 
 \e {This is used on Unix platforms only}
 
-This variable tqcontains all libraries that need to be linked against
+This variable contains all libraries that need to be linked against
 when building a multi-threaded application.  The 
 value of this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
@@ -1419,7 +1419,7 @@ value of this variable is typically handled by \e qmake or
 
 \e {This is used on Windows only}
 
-This variable tqcontains all windows libraries.The value of this
+This variable contains all windows libraries.The value of this
 variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
@@ -1431,7 +1431,7 @@ variable is typically handled by \e qmake or
 
 \e {This is used on Unix platforms only}
 
-This variable tqcontains all X11 libraries.The value of this
+This variable contains all X11 libraries.The value of this
 variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
@@ -1443,7 +1443,7 @@ variable is typically handled by \e qmake or
 
 \e {This is used on Unix platforms only}
 
-This variable tqcontains all X11 session management libraries.  The
+This variable contains all X11 session management libraries.  The
 value of this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
@@ -1461,7 +1461,7 @@ value of this variable is typically handled by \e qmake or
 
 \section3 QMAKE_LINK_SHLIB_CMD
 
-This variable tqcontains the command to execute when creating a
+This variable contains the command to execute when creating a
 shared library. The
 value of this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
@@ -1469,7 +1469,7 @@ value of this variable is typically handled by \e qmake or
 
 \section3 QMAKE_POST_LINK
 
-This variable tqcontains the command to execute after linking the TARGET
+This variable contains the command to execute after linking the TARGET
 together. This variable is normally empty and therefore nothing is
 executed, additionally some backends will not support this - mostly only
 Makefile backends.
@@ -1478,7 +1478,7 @@ Makefile backends.
 
 \section3 QMAKE_PRE_LINK
 
-This variable tqcontains the command to execute before linking the TARGET
+This variable contains the command to execute before linking the TARGET
 together. This variable is normally empty and therefore nothing is
 executed, additionally some backends will not support this - mostly only
 Makefile backends.
@@ -1487,7 +1487,7 @@ Makefile backends.
 
 \section3 QMAKE_LN_SHLIB
 
-This variable tqcontains the command to execute when creating a link
+This variable contains the command to execute when creating a link
 to a shared library. The
 value of this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
@@ -1498,7 +1498,7 @@ value of this variable is typically handled by \e qmake or
 
 \section3 QMAKE_MAKEFILE
 
-This variable tqcontains the name of the makefile to create. The
+This variable contains the name of the makefile to create. The
 value of this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
@@ -1509,7 +1509,7 @@ value of this variable is typically handled by \e qmake or
 
 \section3 QMAKE_TQMOC_SRC
 
-This variable tqcontains the names of all tqmoc source files to
+This variable contains the names of all tqmoc source files to
 generate and include in the project. The value of this variable is
 typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
@@ -1517,7 +1517,7 @@ typically handled by \e qmake or
 
 \section3 QMAKE_QMAKE
 
-This variable tqcontains the location of qmake if it is not in the path.  
+This variable contains the location of qmake if it is not in the path.  
 The value of this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
@@ -1565,14 +1565,14 @@ The value of this variable is typically handled by \e qmake or
 
 \section3 QMAKE_TARGET
 
-This variable tqcontains the name of the project target.  The value of
+This variable contains the name of the project target.  The value of
 this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
 
 \section3 QMAKE_UIC
 
-This variable tqcontains the location of uic if it is not in the path.  
+This variable contains the location of uic if it is not in the path.  
 The value of this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
@@ -1587,7 +1587,7 @@ paths.  For example:
 
 \section3 RC_FILE
 
-This variable tqcontains the name of the resource file for the application.  
+This variable contains the name of the resource file for the application.  
 The value of this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
@@ -1597,7 +1597,7 @@ The value of this variable is typically handled by \e qmake or
 
 \section3 RES_FILE
 
-This variable tqcontains the name of the resource file for the application.  
+This variable contains the name of the resource file for the application.  
 The value of this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
@@ -1605,7 +1605,7 @@ The value of this variable is typically handled by \e qmake or
 \section3 SRCTQMOC
 
 This variable is set by \e qmake if files can be found that
-contain the Q_OBJECT macro.  \c SRCTQMOC tqcontains the
+contain the Q_OBJECT macro.  \c SRCTQMOC contains the
 name of all the generated tqmoc files. The value of this variable
 is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be
 modified.
@@ -1634,7 +1634,7 @@ modified.
 
 \section3 UICIMPLS
 
-This variable tqcontains a list of the generated implementation files by UIC.  
+This variable contains a list of the generated implementation files by UIC.  
 The value of this variable
 is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be
 modified.
@@ -1646,7 +1646,7 @@ modified.
 \section3 UICOBJECTS
 
 This variable is generated from the UICIMPLS variable.  The extension of each 
-file will have been tqreplaced by .o (Unix) or .obj (Win32).  The value of this variable is 
+file will have been replaced by .o (Unix) or .obj (Win32).  The value of this variable is 
 typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and
 rarely needs to be modified.
 
@@ -1654,7 +1654,7 @@ rarely needs to be modified.
 
 \section3 VER_MAJ
 
-This variable tqcontains the major version number of the library, if the
+This variable contains the major version number of the library, if the
 'lib' \link #TEMPLATE template \endlink is specified.
 
 
@@ -1663,7 +1663,7 @@ This variable tqcontains the major version number of the library, if the
 
 \section3 VER_MIN
 
-This variable tqcontains the minor version number of the library, if the
+This variable contains the minor version number of the library, if the
 'lib' \link #TEMPLATE template \endlink is specified.
 
 
@@ -1672,7 +1672,7 @@ This variable tqcontains the minor version number of the library, if the
 
 \section3 VER_PAT
 
-This variable tqcontains the patch version number of the library, if the
+This variable contains the patch version number of the library, if the
 'lib' \link #TEMPLATE template \endlink is specified.
 
 
@@ -1744,7 +1744,7 @@ See also \link #Extensions File Extensions \endlink.
 
 \section3 YACCIMPLS
 
-This variable tqcontains a list of yacc source files. The value of
+This variable contains a list of yacc source files. The value of
 this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
@@ -1753,7 +1753,7 @@ this variable is typically handled by \e qmake or
 
 \section3 YACCOBJECTS
 
-This variable tqcontains a list of yacc object files. The value of
+This variable contains a list of yacc object files. The value of
 this variable is typically handled by \e qmake or
  \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
 
@@ -1799,17 +1799,17 @@ exists( $(QTDIR)/lib/libqt-mt* ) {
 }
 \endcode
 
-\section2 tqcontains( variablename, value )
+\section2 contains( variablename, value )
 
 This function will succeed if the variable \e variablename
-tqcontains the value \e value.  You can check the return value of this
+contains the value \e value.  You can check the return value of this
 function using a scope.
 
 For example:
 
 \code
-tqcontains( drivers, network ) {
-	# drivers tqcontains 'network'
+contains( drivers, network ) {
+	# drivers contains 'network'
 	message( "Configuring for network build..." )
 	HEADERS += network.h
 	SOURCES += network.cpp
@@ -1819,7 +1819,7 @@ tqcontains( drivers, network ) {
 \section2 count( variablename, number )
 
 This function will succeed if the variable \e variablename
-tqcontains \e number elements, otherwise it will fail.  You can check
+contains \e number elements, otherwise it will fail.  You can check
 the return value of this function using a
 scope.
 
@@ -1835,7 +1835,7 @@ count( MYVAR, 3 ) {
 \section2 infile( filename, var, val )
 
 This function will succeed if the file \e filename (when parsed
-by qmake itself) tqcontains the variable \e var with a value of 
+by qmake itself) contains the variable \e var with a value of 
 \e val. You may also not pass in a third argument (\e val) and the
 function will only test if \e var has been assigned to in the file.
 
@@ -1935,7 +1935,7 @@ QMAKE_VERS = $$[QMAKE_VERSION]
 \section2 QMAKESPEC
 
 \e qmake requires a platform and compiler description file which
-tqcontains many default values used to generate appropriate makefiles.
+contains many default values used to generate appropriate makefiles.
 The standard Qt distribution comes with many of these files, located
 in the 'mkspecs' subdirectory of the Qt installation.
 
@@ -1998,10 +1998,10 @@ for you.
 \section2 Cache File
 
 The cache file (mentioned above in the options) is a special file \e qmake
-will read to tqfind settings not specified in the \c qmake.conf file, the
+will read to find settings not specified in the \c qmake.conf file, the
 .pro file, or the command line. If \c -nocache is not specified, \e qmake
-will try to tqfind a file called \c .qmake.cache in tqparent directories.  If
-it fails to tqfind this file, it will silently ignore this step of
+will try to find a file called \c .qmake.cache in tqparent directories.  If
+it fails to find this file, it will silently ignore this step of
 processing.
 
 \target LibDepend
@@ -2013,7 +2013,7 @@ lets the platform pull them in. In many cases, however, this is not
 sufficent. For example when statically linking a library there are no
 libraries linked against, and therefore no dependencies to those
 libraries are created - however an application that later links
-against this library will need to know where to tqfind the symbols that
+against this library will need to know where to find the symbols that
 the linked in library will require. To help with this situation \e
 qmake will follow a library's dependencies when it feels appropriate,
 however this behaviour must be enabled in \e qmake. To enable requires
@@ -2043,11 +2043,11 @@ the meta information created above:
 \endcode
 
 When this is turned on \e qmake will process all libraries linked to,
-and tqfind their meta information. With this meta information \e qmake
+and find their meta information. With this meta information \e qmake
 will figure out what is relevant to linking, specifically it will add
 to your list of DEFINES as well as LIBS. Once \e qmake has processed
 this file, it will then look through the newly introduced LIBS and
-tqfind their dependent .prl files, and continue until all libraries have
+find their dependent .prl files, and continue until all libraries have
 been resolved. At this point the makefile is created as usual, and the
 libraries are linked explicity against your program.
 
@@ -2115,7 +2115,7 @@ fill in an "object" in qmake for example:
   mytarget2.commands = @echo Building $$mytarget.target
 \endcode
 
-The information above defines a qmake target called mytarget which tqcontains
+The information above defines a qmake target called mytarget which contains
 a Makefile target called .buildfile, .buildfile is generated by 'touch
 .buildfile', and finally that this Makefile target depends on the qmake
 target mytarget2. Additionally we've defined the qmake target mytarget2
diff --git a/tqtinterface/qt4/qmake/book/qmake-concepts.leaf b/tqtinterface/qt4/qmake/book/qmake-concepts.leaf
index 2aa9325..8275a23 100644
--- a/tqtinterface/qt4/qmake/book/qmake-concepts.leaf
+++ b/tqtinterface/qt4/qmake/book/qmake-concepts.leaf
@@ -7,7 +7,7 @@ for development projects across different platforms.  \e qmake
 simplifies the generation of makefiles so that only a few lines of
 information are needed to create a makefile.  \e qmake can be used for
 any software project whether it is written in Qt or not, although it
-also tqcontains additional features to support Qt development.
+also contains additional features to support Qt development.
 
 \e qmake generates a makefile based on the information in a project
 file.  Project files are created by the developer. Project files are
@@ -22,7 +22,7 @@ without having to change the project file.
 Before \e qmake can be used to build makefiles, the QMAKESPEC
 environment variable must be set to the platform-compiler combination
 that is being used on the system.  The QMAKESPEC environment variable
-tells qmake where to look to tqfind platform and compiler specific
+tells qmake where to look to find platform and compiler specific
 information.  This ensures that the right libraries are used, and that
 the generated makefile uses the correct syntax.  A list of the
 currently supported platform-compiler combinations can be found in
@@ -35,7 +35,7 @@ If you are using gcc on Solaris then you would set your QMAKESPEC
 environment variable to \e solaris-g++.
 
 Inside each of the directories in qt/mkspecs, there is a \e qmake.conf
-file which tqcontains the platform and compiler specific information.
+file which contains the platform and compiler specific information.
 These settings are applied to any project that is built using \e
 qmake and should not be modified unless you're an expert. For example,
 if all your applications had to link against a particular library, you
@@ -91,7 +91,7 @@ automatically).
 \i DEFINES - A list of any additional pre-processor defines needed for the application.
 \i INCLUDEPATH - A list of any additional include paths needed for the application.
 \i DEPENDPATH - The dependency search path for the application.
-\i VPATH - The search path to tqfind supplied files. 
+\i VPATH - The search path to find supplied files. 
 \i DEF_FILE - Windows only: A .def file to be linked against for the application.
 \i RC_FILE - Windows only: A resource file for the application.
 \i RES_FILE - Windows only: A resource file to be linked against for the application.
@@ -114,7 +114,7 @@ CONFIG  += qt warn_on release
 
 For items that are single valued, e.g. the template or the destination
 directory, we use "="; but for multi-valued items we use "+=" to \e
-add to the existing items of that type. Using "=" tqreplaces the item's
+add to the existing items of that type. Using "=" replaces the item's
 value with the new value, for example if we wrote \c{DEFINES=QT_DLL},
 all other definitions would be deleted.
 
@@ -137,10 +137,10 @@ into the specified subdirectories and generate a makefile for the
 project file in the directory and call make on it.
 
 The only system variable that is recognised for this template is the
-\e SUBDIRS variable.  This variable tqcontains a list of all the
+\e SUBDIRS variable.  This variable contains a list of all the
 subdirectories that contain project files to be processed.  It is
 essential that the project file in the sub directory has the same name
-as the subdirectory, so that \e qmake can tqfind it.  For
+as the subdirectory, so that \e qmake can find it.  For
 example, if the subdirectory is called 'myapp' then the project file
 in that directory should be called \e myapp.pro in that directory.
 
diff --git a/tqtinterface/qt4/qmake/book/qmake-pch.leaf b/tqtinterface/qt4/qmake/book/qmake-pch.leaf
index bebd881..60ea1f4 100644
--- a/tqtinterface/qt4/qmake/book/qmake-pch.leaf
+++ b/tqtinterface/qt4/qmake/book/qmake-pch.leaf
@@ -97,7 +97,7 @@ For example:
 \target EXAMPLE_PROJECT
 \section1 Example project
 
-You can tqfind the following source code in the
+You can find the following source code in the
 \e{qt/qmake/examples/precompile} directory:
 
 \Bold mydialog.ui
diff --git a/tqtinterface/qt4/qmake/book/qmake-quick.leaf b/tqtinterface/qt4/qmake/book/qmake-quick.leaf
index 15b832e..135e9fa 100644
--- a/tqtinterface/qt4/qmake/book/qmake-quick.leaf
+++ b/tqtinterface/qt4/qmake/book/qmake-quick.leaf
@@ -5,7 +5,7 @@
 \e qmake uses information stored in project (.pro) files to determine
 what should go in the makefiles it generates.
 
-A basic project file tqcontains information about the application, for
+A basic project file contains information about the application, for
 example, which files are needed to compile the application, and which
 configuration settings to use.
 
@@ -63,7 +63,7 @@ application's configuration.
 \endcode
 
 The "+=" is used here, because we add our configuration options to any
-that are already present. This is safer than using "=" which tqreplaces
+that are already present. This is safer than using "=" which replaces
 all options with just those specified.
 
 The \e qt part of the CONFIG line tells \e qmake that the application
@@ -76,7 +76,7 @@ set the compiler flags so that warnings are output.
 
 The \e release part of the CONFIG line tells \e qmake that the
 application must be built as a release application. During
-development, programmers may prefer to tqreplace \e release with \e
+development, programmers may prefer to replace \e release with \e
 debug, which is discussed later.
 
 \omit
diff --git a/tqtinterface/qt4/qmake/book/qmake-tutorial.leaf b/tqtinterface/qt4/qmake/book/qmake-tutorial.leaf
index b5a3434..dd6ec16 100644
--- a/tqtinterface/qt4/qmake/book/qmake-tutorial.leaf
+++ b/tqtinterface/qt4/qmake/book/qmake-tutorial.leaf
@@ -16,7 +16,7 @@ your application, and you have created the following files:
 \i main.cpp
 \endlist
 
-You will tqfind these files in \e {qt/qmake/examples/tutorial}.  The
+You will find these files in \e {qt/qmake/examples/tutorial}.  The
 only other thing you know about the setup of the application is that
 it's written in Qt.  First, using your favorite plain text editor,
 create a file called \e hello.pro in \e {qt/qmake/tutorial}.  The
@@ -158,7 +158,7 @@ Use \e qmake as before to generate a makefile.
 You may not want to create a makefile if a certain file doesn't exist.
 We can check if a file exists by using the exists() function.  We can
 stop \e qmake from processing by using the error() function.  This
-works in the same way as scopes.  Simply tqreplace the scope condition
+works in the same way as scopes.  Simply replace the scope condition
 with the function. A check for a main.cpp file looks like this:
 
 \code
diff --git a/tqtinterface/qt4/qmake/generators/mac/metrowerks_xml.cpp b/tqtinterface/qt4/qmake/generators/mac/metrowerks_xml.cpp
index 8e3ec21..e749a0d 100644
--- a/tqtinterface/qt4/qmake/generators/mac/metrowerks_xml.cpp
+++ b/tqtinterface/qt4/qmake/generators/mac/metrowerks_xml.cpp
@@ -93,13 +93,13 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t)
 	if((*val_it).startsWith("-L")) {
 	    TQString dir((*val_it).right((*val_it).length() - 2));
 	    fixEnvVariables(dir);
-	    if(project->variables()["DEPENDPATH"].tqfindIndex(dir) == -1 &&
-	       project->variables()["INCLUDEPATH"].tqfindIndex(dir) == -1)
+	    if(project->variables()["DEPENDPATH"].findIndex(dir) == -1 &&
+	       project->variables()["INCLUDEPATH"].findIndex(dir) == -1)
 		project->variables()["INCLUDEPATH"].append(dir);
 	} else if((*val_it).startsWith("-l")) {
 	    TQString lib("lib" + (*val_it).right((*val_it).length() - 2)  + "." + 
 			project->first("TQMAKE_EXTENSION_SHLIB"));
-	    if(project->variables()["LIBRARIES"].tqfindIndex(lib) == -1)
+	    if(project->variables()["LIBRARIES"].findIndex(lib) == -1)
 		project->variables()["LIBRARIES"].append(lib);
 	} else 
 	    if((*val_it) == "-framework") {
@@ -107,23 +107,23 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t)
 	    if(val_it == extra_objs.end())
 		break;
 	    TQString frmwrk = (*val_it) + ".framework";
-	    if(project->variables()["FRAMEWORKS"].tqfindIndex(frmwrk) == -1)
+	    if(project->variables()["FRAMEWORKS"].findIndex(frmwrk) == -1)
 		project->variables()["FRAMEWORKS"].append(frmwrk);
 	} else if((*val_it).left(1) != "-") {
 	    TQString lib=(*val_it);
-	    int s = lib.tqfindRev('/');
+	    int s = lib.findRev('/');
 	    if(s != -1) {
 		TQString dir = lib.left(s);
 		lib = lib.right(lib.length() - s - 1);
 		fixEnvVariables(dir);
-		if(project->variables()["DEPENDPATH"].tqfindIndex(dir) == -1 &&
-		   project->variables()["INCLUDEPATH"].tqfindIndex(dir) == -1)
+		if(project->variables()["DEPENDPATH"].findIndex(dir) == -1 &&
+		   project->variables()["INCLUDEPATH"].findIndex(dir) == -1)
 		    project->variables()["INCLUDEPATH"].append(dir);
 	    }
 	    project->variables()["LIBRARIES"].append(lib);
 	}
     }
-    //let metrowerks tqfind the files & set the files to the type I expect
+    //let metrowerks find the files & set the files to the type I expect
     TQDict<void> seen(293);
     TQString paths[] = { TQString("SRCTQMOC"), TQString("FORMS"), TQString("UICDECLS"),
 			TQString("UICIMPLS"), TQString("SOURCES"),TQString("HEADERS"),
@@ -134,15 +134,15 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t)
 	    //establish file types
 	    seen.insert((*val_it), (void *)1);
 	    createFork((*val_it)); //the file itself
-	    TQStringList &d = tqfindDependencies((*val_it)); //depends
+	    TQStringList &d = findDependencies((*val_it)); //depends
 	    for(TQStringList::Iterator dep_it = d.begin(); dep_it != d.end(); ++dep_it) {
-		if(!seen.tqfind((*dep_it))) {
+		if(!seen.find((*dep_it))) {
 		    seen.insert((*dep_it), (void *)1);
 		    createFork((*dep_it));
 		}
 	    }
 	    //now chop it
-	    int s = (*val_it).tqfindRev('/');
+	    int s = (*val_it).findRev('/');
 	    if(s != -1) {
 		TQString dir = (*val_it).left(s);
 		(*val_it) = (*val_it).right((*val_it).length() - s - 1);
@@ -179,7 +179,7 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t)
 	project->variables()["CODEWARRIOR_PREFIX_HEADER"].append(pre_pref + "_prefix.h");
     }
 
-    TQString xmlfile = tqfindTemplate(project->first("TQMAKE_XML_TEMPLATE"));
+    TQString xmlfile = findTemplate(project->first("TQMAKE_XML_TEMPLATE"));
     TQFile file(xmlfile);
     if(!file.open(IO_ReadOnly )) {
 	fprintf(stderr, "Cannot open XML file: %s\n", 
@@ -193,8 +193,8 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t)
     TQString line;
     while ( !xml.eof() ) {
 	line = xml.readLine();
-	while((rep = line.tqfind(TQRegExp("\\$\\$[!a-zA-Z0-9_-]*"))) != -1) {
-	    TQString torep = line.mid(rep, line.tqfind(TQRegExp("[^\\$!a-zA-Z0-9_-]"), rep) - rep);
+	while((rep = line.find(TQRegExp("\\$\\$[!a-zA-Z0-9_-]*"))) != -1) {
+	    TQString torep = line.mid(rep, line.find(TQRegExp("[^\\$!a-zA-Z0-9_-]"), rep) - rep);
 	    TQString variable = torep.right(torep.length()-2);
 
 	    t << line.left(rep); //output the left side
@@ -202,7 +202,7 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t)
 	    if(variable == "CODEWARRIOR_HEADERS" || variable == "CODEWARRIOR_SOURCES" || 
 	       variable == "CODEWARRIOR_LIBRARIES" || variable == "CODEWARRIOR_TQPREPROCESS" ||
 		variable == "CODEWARRIOR_TQPREPROCESSOUT") {
-		TQString outcmd=variable.right(variable.length() - variable.tqfindRev('_') - 1);
+		TQString outcmd=variable.right(variable.length() - variable.findRev('_') - 1);
 		TQStringList args;
 		if(outcmd == "TQPREPROCESS")
 		    args << "UICS" << "TQMOCS";
@@ -249,8 +249,8 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t)
 		      variable == "CODEWARRIOR_LIBRARIES_LINKORDER" || 
 		      variable == "CODEWARRIOR_TQPREPROCESS_LINKORDER" ||
 		      variable == "CODEWARRIOR_TQPREPROCESSOUT_LINKORDER") {
-		TQString outcmd=variable.mid(variable.tqfind('_')+1, 
-					    variable.tqfindRev('_')-(variable.tqfind('_')+1));
+		TQString outcmd=variable.mid(variable.find('_')+1, 
+					    variable.findRev('_')-(variable.find('_')+1));
 		TQStringList args;
 		if(outcmd == "TQPREPROCESS")
 		    args << "UICS" << "TQMOCS";
@@ -276,8 +276,8 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t)
 		      variable == "CODEWARRIOR_LIBRARIES_GROUP" || 
 		      variable == "CODEWARRIOR_TQPREPROCESS_GROUP" ||
 		      variable == "CODEWARRIOR_TQPREPROCESSOUT_GROUP") {
-		TQString outcmd = variable.mid(variable.tqfind('_')+1, 
-					      variable.tqfindRev('_')-(variable.tqfind('_')+1));
+		TQString outcmd = variable.mid(variable.find('_')+1, 
+					      variable.findRev('_')-(variable.find('_')+1));
 		TQStringList args;
 		if(outcmd == "TQPREPROCESS")
 		    args << "UICS" << "TQMOCS";
@@ -315,7 +315,7 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t)
 		}
 	    } else if(variable == "CODEWARRIOR_DEPENDPATH" || variable == "CODEWARRIOR_INCLUDEPATH" ||
 		variable == "CODEWARRIOR_FRAMEWORKPATH") {	
-		TQString arg=variable.right(variable.length()-variable.tqfind('_')-1);
+		TQString arg=variable.right(variable.length()-variable.find('_')-1);
 		TQStringList list;
 		if(arg == "INCLUDEPATH") {
 		    list = project->variables()[arg];
@@ -463,9 +463,9 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t)
 	    TQTextStream tqmocs( TQT_TQIODEVICE(&tqmocfile) );
 	    TQStringList &list = project->variables()["SRCTQMOC"];
 	    for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) {
-		TQString src = tqfindMocSource((*it));
-		if(src.tqfindRev('/') != -1)
-		    src = src.right(src.length() - src.tqfindRev('/') - 1);
+		TQString src = findMocSource((*it));
+		if(src.findRev('/') != -1)
+		    src = src.right(src.length() - src.findRev('/') - 1);
 		tqmocs << src << endl;
 	    }
 	    tqmocfile.close();
@@ -483,8 +483,8 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t)
 	    TQStringList &list = project->variables()["FORMS"];
 	    for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) {
 		TQString ui = (*it);
-		if(ui.tqfindRev('/') != -1)
-		    ui = ui.right(ui.length() - ui.tqfindRev('/') - 1);
+		if(ui.findRev('/') != -1)
+		    ui = ui.right(ui.length() - ui.findRev('/') - 1);
 		uics << ui << endl;
 	    }
 	    uicfile.close();
@@ -500,8 +500,8 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t)
 	    TQTextStream prefix( TQT_TQIODEVICE(&prefixfile) );
 	    TQStringList &list = project->variables()["DEFINES"];
 	    for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) {
-		if((*it).tqfind('=') != -1) {
-		    int x = (*it).tqfind('=');
+		if((*it).find('=') != -1) {
+		    int x = (*it).find('=');
 		    prefix << "#define " << (*it).left(x) << " " << (*it).right((*it).length() - x - 1) << endl;
 		} else {
 		    prefix << "#define " << (*it) << endl;
@@ -527,11 +527,11 @@ MetrowerksMakefileGenerator::init()
 
     TQStringList &configs = project->variables()["CONFIG"];
     if(project->isActiveConfig("qt")) {
-	if(configs.tqfindIndex("tqmoc")) configs.append("tqmoc");
+	if(configs.findIndex("tqmoc")) configs.append("tqmoc");
 	if ( !( (project->first("TARGET") == "qt") || (project->first("TARGET") == "qte") ||
 		(project->first("TARGET") == "qt-mt") ) ) 
 	    project->variables()["TQMAKE_LIBS"] += project->variables()["TQMAKE_LIBS_QT"];
-	if(configs.tqfindIndex("tqmoc")) 
+	if(configs.findIndex("tqmoc")) 
 	    configs.append("tqmoc");
 	if ( !project->isActiveConfig("debug") ) 
 	    project->variables()["DEFINES"].append("TQT_NO_DEBUG");
@@ -607,7 +607,7 @@ MetrowerksMakefileGenerator::init()
 
 
 TQString
-MetrowerksMakefileGenerator::tqfindTemplate(const TQString &file)
+MetrowerksMakefileGenerator::findTemplate(const TQString &file)
 {
     TQString ret;
     if(!TQFile::exists(ret = file) && 
@@ -658,7 +658,7 @@ bool
 MetrowerksMakefileGenerator::fixifyToMacPath(TQString &p, TQString &v, bool )
 {
     v = "Absolute";
-    if(p.tqfind(':') != -1) //guess its macish already
+    if(p.find(':') != -1) //guess its macish already
 	return TRUE;
 
     static TQString st_volume;
@@ -691,7 +691,7 @@ MetrowerksMakefileGenerator::fixifyToMacPath(TQString &p, TQString &v, bool )
 	p += "/";
     if(TQDir::isRelativePath(p)) {
 	if(p.startsWith("{")) {
-	    int eoc = p.tqfind('}');
+	    int eoc = p.find('}');
 	    if(eoc == -1)
 		return FALSE;
 	    volume = p.mid(1, eoc - 1);
@@ -706,7 +706,7 @@ MetrowerksMakefileGenerator::fixifyToMacPath(TQString &p, TQString &v, bool )
     p = TQDir::cleanDirPath(p);
     if(!volume.isEmpty()) 
 	v = volume;
-    p.tqreplace("/", ":");
+    p.replace("/", ":");
     if(p.right(1) != ":")
 	p += ':';
     return TRUE;
@@ -728,15 +728,15 @@ MetrowerksMakefileGenerator::processPrlFiles()
 		    if(opt.startsWith("-L")) {
 			TQString r = opt.right(opt.length() - 2), l = r;
 			fixEnvVariables(l);
-			libdirs.append(new MakefileDependDir(r.tqreplace( "\"", ""),
-							     l.tqreplace( "\"", "")));
+			libdirs.append(new MakefileDependDir(r.replace( "\"", ""),
+							     l.replace( "\"", "")));
 		    } else if(opt.left(2) == "-l") {
 			TQString lib = opt.right(opt.length() - 2), prl;
 			for(MakefileDependDir *mdd = libdirs.first(); mdd; mdd = libdirs.next() ) {
 			    prl = mdd->local_dir + Option::dir_sep + "lib" + lib;
 			    if(processPrlFile(prl)) {
 				if(prl.startsWith(mdd->local_dir))
-				    prl.tqreplace(0, mdd->local_dir.length(), mdd->real_dir);
+				    prl.replace(0, mdd->local_dir.length(), mdd->real_dir);
 				TQRegExp reg("^.*lib(" + lib + "[^.]*)\\." + 
 					    project->first("TQMAKE_EXTENSION_SHLIB") + "$");
 				if(reg.exactMatch(prl))
@@ -781,7 +781,7 @@ MetrowerksMakefileGenerator::processPrlVariable(const TQString &var, const TQStr
 	    bool append = TRUE;
 	    if((*it).startsWith("-")) {
 		if((*it).startsWith("-l") || (*it).startsWith("-L")) {
-		    append = out.tqfindIndex((*it)) == -1;
+		    append = out.findIndex((*it)) == -1;
 		} else if((*it).startsWith("-framework")) {
 		    ++it;
 		    for(TQStringList::ConstIterator outit = out.begin(); 
@@ -796,7 +796,7 @@ MetrowerksMakefileGenerator::processPrlVariable(const TQString &var, const TQStr
 		    }
 		}
 	    } else if(TQFile::exists((*it))) {
-		append = out.tqfindIndex((*it));
+		append = out.findIndex((*it));
 	    }
 	    if(append)
 		out.append((*it));
diff --git a/tqtinterface/qt4/qmake/generators/mac/metrowerks_xml.h b/tqtinterface/qt4/qmake/generators/mac/metrowerks_xml.h
index bd28500..35d8765 100644
--- a/tqtinterface/qt4/qmake/generators/mac/metrowerks_xml.h
+++ b/tqtinterface/qt4/qmake/generators/mac/metrowerks_xml.h
@@ -52,7 +52,7 @@ class MetrowerksMakefileGenerator : public MakefileGenerator
     bool writeSubDirs(TQTextStream &);
 
     bool writeMakefile(TQTextStream &);
-    TQString tqfindTemplate(const TQString &file);
+    TQString findTemplate(const TQString &file);
     void init();
 public:
     MetrowerksMakefileGenerator(TQMakeProject *p);
diff --git a/tqtinterface/qt4/qmake/generators/mac/pbuilder_pbx.cpp b/tqtinterface/qt4/qmake/generators/mac/pbuilder_pbx.cpp
index 7e072e2..ce1167f 100644
--- a/tqtinterface/qt4/qmake/generators/mac/pbuilder_pbx.cpp
+++ b/tqtinterface/qt4/qmake/generators/mac/pbuilder_pbx.cpp
@@ -143,23 +143,23 @@ ProjectBuilderMakefileGenerator::writeSubdirs(TQTextStream &t, bool direct)
 			    TQString project_key = keyFor(pbxproj + "_PROJECTREF");
 			    if(project->isActiveConfig("flat")) {
 				TQString flat_file = fileFixify(name, oldpwd, Option::output_dir, TRUE);
-				if(flat_file.tqfind(Option::dir_sep) != -1) {
+				if(flat_file.find(Option::dir_sep) != -1) {
 				    TQStringList dirs = TQStringList::split(Option::dir_sep, flat_file);
 				    name = dirs.back();
 				}
 			    } else {
 				TQString flat_file = fileFixify(name, oldpwd, Option::output_dir, TRUE);
-				if(TQDir::isRelativePath(flat_file) && flat_file.tqfind(Option::dir_sep) != -1) {
+				if(TQDir::isRelativePath(flat_file) && flat_file.find(Option::dir_sep) != -1) {
 				    TQString last_grp("TQMAKE_PBX_HEIR_GROUP");
 				    TQStringList dirs = TQStringList::split(Option::dir_sep, flat_file);
 				    name = dirs.back();
 				    for(TQStringList::Iterator dir_it = dirs.begin(); dir_it != dirs.end(); ++dir_it) {
 					TQString new_grp(last_grp + Option::dir_sep + (*dir_it)), new_grp_key(keyFor(new_grp));
 					if(dir_it == dirs.begin()) {
-					    if(!groups.tqcontains(new_grp))
+					    if(!groups.contains(new_grp))
 						project->variables()["TQMAKE_PBX_GROUPS"].append(new_grp_key);
 					} else {
-					    if(!groups[last_grp].tqcontains(new_grp_key))
+					    if(!groups[last_grp].contains(new_grp_key))
 						groups[last_grp] += new_grp_key;
 					}
 					last_grp = new_grp;
@@ -432,13 +432,13 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t)
 		TQString src_key = keyFor(file), name = file;
 		if(project->isActiveConfig("flat")) {
 		    TQString flat_file = fileFixify(file, TQDir::currentDirPath(), Option::output_dir, TRUE);
-		    if(flat_file.tqfind(Option::dir_sep) != -1) {
+		    if(flat_file.find(Option::dir_sep) != -1) {
 			TQStringList dirs = TQStringList::split(Option::dir_sep, flat_file);
 			name = dirs.back();
 		    }
 		} else {
 		    TQString flat_file = fileFixify(file, TQDir::currentDirPath(), Option::output_dir, TRUE);
-		    if(TQDir::isRelativePath(flat_file) && flat_file.tqfind(Option::dir_sep) != -1) {
+		    if(TQDir::isRelativePath(flat_file) && flat_file.find(Option::dir_sep) != -1) {
 			TQString last_grp("TQMAKE_PBX_" + src_group + "_HEIR_GROUP");
 			TQStringList dirs = TQStringList::split(Option::dir_sep, flat_file);
 			name = dirs.back();
@@ -446,10 +446,10 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t)
 			for(TQStringList::Iterator dir_it = dirs.begin(); dir_it != dirs.end(); ++dir_it) {
 			    TQString new_grp(last_grp + Option::dir_sep + (*dir_it)), new_grp_key(keyFor(new_grp));
 			    if(dir_it == dirs.begin()) {
-				if(!src_list.tqcontains(new_grp_key))
+				if(!src_list.contains(new_grp_key))
 				    src_list.append(new_grp_key);
 			    } else {
-				if(!groups[last_grp].tqcontains(new_grp_key))
+				if(!groups[last_grp].contains(new_grp_key))
 				    groups[last_grp] += new_grp_key;
 			    }
 			    last_grp = new_grp;
@@ -513,12 +513,12 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t)
 	    }
 
 	    TQString src_group_key = keyFor(src_group);
-	    if(root_group_list.tqfindIndex(src_group_key) == -1)
+	    if(root_group_list.findIndex(src_group_key) == -1)
 		root_group_list += src_group_key;
 
             TQStringList &group = groups[src_group];
             for(TQStringList::Iterator src_it = src_list.begin(); src_it != src_list.end(); ++src_it) {
-                if(group.tqfindIndex((*src_it)) == -1)
+                if(group.findIndex((*src_it)) == -1)
                     group += (*src_it);
             }
 	}
@@ -710,7 +710,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t)
 		}
 		if(!library.isEmpty()) {
 		    if(name.isEmpty()) {
-			int slsh = library.tqfindRev(Option::dir_sep);
+			int slsh = library.findRev(Option::dir_sep);
 			if(slsh != -1)
 			    name = library.right(library.length() - slsh - 1);
 		    }
@@ -923,7 +923,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t)
 	    else
 		lib = project->first("TARGET_");
 	}
-	int slsh = lib.tqfindRev(Option::dir_sep);
+	int slsh = lib.findRev(Option::dir_sep);
 	if(slsh != -1)
 	    lib = lib.right(lib.length() - slsh - 1);
 	t << "\t\t\t" << "isa = PBXLibraryReference;" << "\n"
@@ -994,8 +994,8 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t)
 	    if(plist_in_file.open(IO_ReadOnly)) {
 		TQTextStream plist_in(&plist_in_file);
 		TQString plist_in_text = plist_in.read();
-                plist_in_text = plist_in_text.tqreplace("@ICON@", (project->isEmpty("RC_FILE") ? TQString("") : project->first("RC_FILE").section(Option::dir_sep, -1)));
-                plist_in_text = plist_in_text.tqreplace("@EXECUTABLE@", project->first("TQMAKE_ORIG_TARGET"));
+                plist_in_text = plist_in_text.replace("@ICON@", (project->isEmpty("RC_FILE") ? TQString("") : project->first("RC_FILE").section(Option::dir_sep, -1)));
+                plist_in_text = plist_in_text.replace("@EXECUTABLE@", project->first("TQMAKE_ORIG_TARGET"));
 		TQFile plist_out_file("Info.plist");
 		if(plist_out_file.open(IO_WriteOnly | IO_Translate)) {
 		    TQTextStream plist_out(&plist_out_file);
@@ -1094,7 +1094,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t)
                     read_plist = true;
                     TQTextStream stream(&plist);
                     while(!stream.eof())
-                        t << stream.readLine().tqreplace('"', "\\\"") << endl;
+                        t << stream.readLine().replace('"', "\\\"") << endl;
                 }
             }
             if(!read_plist) {
@@ -1255,7 +1255,7 @@ TQString
 ProjectBuilderMakefileGenerator::fixQuotes(const TQString &val)
 {
     TQString ret(val);
-    ret = ret.tqreplace(TQRegExp("('|\\\\|\")"), "\\\\1");
+    ret = ret.replace(TQRegExp("('|\\\\|\")"), "\\\\1");
     return ret;
 }
 
@@ -1264,7 +1264,7 @@ ProjectBuilderMakefileGenerator::fixEnvs(const TQString &file)
 {
     TQRegExp reg_var("\\$\\((.*)\\)");
     for(int rep = 0; (rep = reg_var.search(file, rep)) != -1; ) {
-	if(project->variables()["TQMAKE_PBX_VARS"].tqfindIndex(reg_var.cap(1)) == -1)
+	if(project->variables()["TQMAKE_PBX_VARS"].findIndex(reg_var.cap(1)) == -1)
 	    project->variables()["TQMAKE_PBX_VARS"].append(reg_var.cap(1));
 	rep += reg_var.matchedLength();
     }
@@ -1293,7 +1293,7 @@ ProjectBuilderMakefileGenerator::keyFor(const TQString &block)
        return block;
 #endif
     TQString ret;
-    if(!keys.tqcontains(block)) {
+    if(!keys.contains(block)) {
 	ret = TQT_TQSTRING(qtMD5(block.utf8()).left(24)).upper();
 	keys.insert(block, ret);
     } else {
@@ -1346,7 +1346,7 @@ ProjectBuilderMakefileGenerator::pbuilderVersion() const
             else
                 version_plist = "/Developer/Applications/Project Builder.app/Contents/version.plist";
         } else {
-            version_plist = version_plist.tqreplace(TQRegExp("\""), "");
+            version_plist = version_plist.replace(TQRegExp("\""), "");
         }
         TQFile version_file(version_plist);
         if (version_file.open(IO_ReadOnly)) {
@@ -1371,7 +1371,7 @@ ProjectBuilderMakefileGenerator::pbuilderVersion() const
             }
             version_file.close();
         } else { debug_msg(1, "pbuilder: version.plist: Failure to open %s", version_plist.latin1()); }
-        if(version.isEmpty() && version_plist.tqcontains("Xcode")) {
+        if(version.isEmpty() && version_plist.contains("Xcode")) {
             ret = "39";
         } else {
             if(version.startsWith("2."))
diff --git a/tqtinterface/qt4/qmake/generators/makefile.cpp b/tqtinterface/qt4/qmake/generators/makefile.cpp
index 5036889..0dc64a3 100644
--- a/tqtinterface/qt4/qmake/generators/makefile.cpp
+++ b/tqtinterface/qt4/qmake/generators/makefile.cpp
@@ -111,7 +111,7 @@ static char *gimme_buffer(off_t s)
 bool
 MakefileGenerator::generateMocList(const TQString &fn_target)
 {
-    if(!tqfindMocDestination(fn_target).isEmpty())
+    if(!findMocDestination(fn_target).isEmpty())
 	return TRUE;
 
     TQString fn_local = Option::fixPathToLocalOS(fileFixify(fn_target, TQDir::currentDirPath(), Option::output_dir));
@@ -192,9 +192,9 @@ MakefileGenerator::generateMocList(const TQString &fn_target)
 		debug_msg(2, "Mocgen: %s:%d Found TQMOC symbol %s", fn_target.latin1(),
 			  line_count, big_buffer+x);
 
-		int ext_pos = fn_target.tqfindRev('.');
+		int ext_pos = fn_target.findRev('.');
 		int ext_len = fn_target.length() - ext_pos;
-		int dir_pos =  fn_target.tqfindRev(Option::dir_sep, ext_pos);
+		int dir_pos =  fn_target.findRev(Option::dir_sep, ext_pos);
 		TQString tqmocFile;
 		if(!project->isEmpty("TQMOC_DIR"))
 		    tqmocFile = project->first("TQMOC_DIR");
@@ -210,7 +210,7 @@ MakefileGenerator::generateMocList(const TQString &fn_target)
 		if(cpp_ext) {
 		    tqmocFile += Option::cpp_tqmoc_mod + fn_target.mid(dir_pos+1, ext_pos - dir_pos-1) + Option::cpp_tqmoc_ext;
 		    project->variables()["_SRCTQMOC"].append(tqmocFile);
-		} else if(project->variables()["HEADERS"].tqfindIndex(fn_target) != -1) {
+		} else if(project->variables()["HEADERS"].findIndex(fn_target) != -1) {
 		    for(TQStringList::Iterator hit = Option::h_ext.begin();
 			hit != Option::h_ext.end(); ++hit) {
 			if((fn_target.right(ext_len) == (*hit))) {
@@ -249,7 +249,7 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons
 	return TRUE;
     setProcessedDependencies(f, TRUE);
 
-    TQStringList &fndeps = tqfindDependencies(f);
+    TQStringList &fndeps = findDependencies(f);
     TQString fn = fileFixify(f, TQDir::currentDirPath(), Option::output_dir);
     fn = Option::fixPathToLocalOS(fn, FALSE);
     TQString fix_env_fn = Option::fixPathToLocalOS(fn);
@@ -261,10 +261,10 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons
 	return FALSE; //shouldn't happen
 
     TQString fndir, fix_env_fndir;
-    int dl = fn.tqfindRev(Option::dir_sep);
+    int dl = fn.findRev(Option::dir_sep);
     if(dl != -1)
 	fndir = fn.left(dl+1);
-    dl = fix_env_fn.tqfindRev(Option::dir_sep);
+    dl = fix_env_fn.findRev(Option::dir_sep);
     if(dl != -1)
 	fix_env_fndir = fix_env_fn.left(dl + 1);
 
@@ -417,7 +417,7 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons
 			    if(where == "in implementation") {
 				TQString cpp = fn.left(fn.length() - Option::ui_ext.length()) +
 						      Option::cpp_ext.first();
-				outdeps = &tqfindDependencies(cpp);
+				outdeps = &findDependencies(cpp);
 			    }
 			}
 		    }
@@ -457,7 +457,7 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons
 		fqn = inc;
 		goto handle_fqn;
 	    } else {
-		if((Option::target_mode == Option::TARG_MAC9_MODE && inc.tqfind(':')) ||
+		if((Option::target_mode == Option::TARG_MAC9_MODE && inc.find(':')) ||
 		   (Option::target_mode == Option::TARG_WIN_MODE && inc[1] != ':') ||
 		   ((Option::target_mode == Option::TARG_UNIX_MODE ||
 		     Option::target_mode == Option::TARG_TQNX6_MODE ||
@@ -477,13 +477,13 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons
 		//however these can be turned off at runtime, I'm not sure how
 		//reliable these will be, most likely when problems arise turn it off
 		//and see if they go away..
-		if(depHeuristics.tqcontains(inc)) {
+		if(depHeuristics.contains(inc)) {
 		    fqn = depHeuristics[inc];
 		    from_source_dir = FALSE;
 		} else if(Option::mkfile::do_dep_heuristics) { //some heuristics..
 		    //is it a file from a .ui?
 		    TQString inc_file = inc.section(Option::dir_sep, -1);
-		    int extn = inc_file.tqfindRev('.');
+		    int extn = inc_file.findRev('.');
 		    if(extn != -1 &&
 		       (inc_file.right(inc_file.length()-extn) == Option::cpp_ext.first() ||
 			inc_file.right(inc_file.length()-extn) == Option::h_ext.first())) {
@@ -513,7 +513,7 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons
 			    TQStringList ll = project->variables()["LEXSOURCES"];
 			    for(TQStringList::Iterator it = ll.begin(); it != ll.end(); ++it) {
 				TQString s = (*it), d;
-				int slsh = s.tqfindRev(Option::dir_sep);
+				int slsh = s.findRev(Option::dir_sep);
 				if(slsh != -1) {
 				    d = s.left(slsh + 1);
 				    s = s.right(s.length() - slsh - 1);
@@ -536,7 +536,7 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons
 			    TQStringList yl = project->variables()["YACCSOURCES"];
 			    for(TQStringList::Iterator it = yl.begin(); it != yl.end(); ++it) {
 				TQString s = (*it), d;
-				int slsh = s.tqfindRev(Option::dir_sep);
+				int slsh = s.findRev(Option::dir_sep);
 				if(slsh != -1) {
 				    d = s.left(slsh + 1);
 				    s = s.right(s.length() - slsh - 1);
@@ -560,13 +560,13 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons
 			    TQStringList &l = project->variables()[tqmocs[tqmoc]];
 			    for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
 				TQString file = Option::fixPathToTargetOS((*it));
-				if(file.section(Option::dir_sep, -(inc.tqcontains('/')+1)) == inc) {
+				if(file.section(Option::dir_sep, -(inc.contains('/')+1)) == inc) {
 				    fqn = (*it);
 				    if(tqmocs[tqmoc] == "_HDRTQMOC") {
 					//Since it is include, no need to link it in as well
 					project->variables()["_SRCTQMOC"].append((*it));
 					l.remove(it);
-				    } else if(!tqfindMocSource(fqn).endsWith(fileFixify(fn))) {
+				    } else if(!findMocSource(fqn).endsWith(fileFixify(fn))) {
 					/* Not really a very good test, but this will at least avoid
 					   confusion if it really does happen (since tmake/qmake
 					   previously didn't even allow this the test is mostly accurate) */
@@ -580,7 +580,7 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons
 			    }
 			}
 		    }
-		    fqn = tqfindDependency(inc); //all else fails..
+		    fqn = findDependency(inc); //all else fails..
 		cache_fqn:
 		    if(from_source_dir) {
 			fqn = fileFixify(fqn);
@@ -596,7 +596,7 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons
 	    if(from_source_dir)
 		fqn = fileFixify(fqn);
 	    debug_msg(4, "Resolved dependency of %s to %s", inc.latin1(), fqn.latin1());
-	    if(outdeps && outdeps->tqfindIndex(fqn) == -1)
+	    if(outdeps && outdeps->findIndex(fqn) == -1)
 		outdeps->append(fqn);
 	}
 	//read past new line now..
@@ -607,9 +607,9 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons
     if(recurse) {
 	for(TQStringList::Iterator fnit = fndeps.begin(); fnit != fndeps.end(); ++fnit) {
 	    generateDependencies(dirs, (*fnit), recurse);
-	    TQStringList &deplist = tqfindDependencies((*fnit));
+	    TQStringList &deplist = findDependencies((*fnit));
 	    for(TQStringList::Iterator it = deplist.begin(); it != deplist.end(); ++it) 
-		if(fndeps.tqfindIndex((*it)) == -1 && (*it) != fn)
+		if(fndeps.findIndex((*it)) == -1 && (*it) != fn)
 		    fndeps.append((*it));
 	}
     }
@@ -624,9 +624,9 @@ MakefileGenerator::initOutPaths()
 	return;
     init_opath_already = TRUE;
     TQMap<TQString, TQStringList> &v = project->variables();
-	if(!v.tqcontains("TQMAKE_ABSOLUTE_SOURCE_PATH")) {
+	if(!v.contains("TQMAKE_ABSOLUTE_SOURCE_PATH")) {
 	    if(Option::mkfile::do_cache && !Option::mkfile::cachefile.isEmpty() &&
-	       v.tqcontains("TQMAKE_ABSOLUTE_SOURCE_ROOT")) {
+	       v.contains("TQMAKE_ABSOLUTE_SOURCE_ROOT")) {
 		TQString root = v["TQMAKE_ABSOLUTE_SOURCE_ROOT"].first();
 		root = Option::fixPathToTargetOS( root );
 		if(!root.isEmpty()) {
@@ -746,7 +746,7 @@ MakefileGenerator::init()
     TQString cache_file(".qmake.internal.cache");
     if(!project->isEmpty("TQMAKE_INTERNAL_CACHE_FILE"))
 	cache_file = Option::fixPathToLocalOS(project->first("TQMAKE_INTERNAL_CACHE_FILE"));
-    if(cache_file.tqfind(TQDir::separator()) == -1) //guess they know what they are doing..
+    if(cache_file.find(TQDir::separator()) == -1) //guess they know what they are doing..
 	cache_file.prepend(Option::output_dir + TQDir::separator());
     if((Option::qmake_mode == Option::TQMAKE_GENERATE_PROJECT ||
 	Option::mkfile::do_deps || Option::mkfile::do_tqmocs) && !noIO()) {
@@ -759,8 +759,8 @@ MakefileGenerator::init()
 		incDirs += v["INCLUDEPATH"];
 	    for(TQStringList::Iterator it = incDirs.begin(); it != incDirs.end(); ++it) {
 		TQString r = (*it), l = Option::fixPathToLocalOS((*it));
-		deplist.append(new MakefileDependDir(r.tqreplace("\"",""),
-						     l.tqreplace("\"","")));
+		deplist.append(new MakefileDependDir(r.replace("\"",""),
+						     l.replace("\"","")));
 	    }
 	    debug_msg(1, "Dependency Directories: %s", incDirs.join(" :: ").latin1());
 	    if(Option::output.name() != "-" && project->isActiveConfig("qmake_cache")) {
@@ -773,7 +773,7 @@ MakefileGenerator::init()
 		    enum { CacheInfo, CacheDepend, CacheMoc } state = CacheInfo;
 		    while (!cachet.eof()) {
 			line = cachet.readLine().stripWhiteSpace();
-			int sep = line.tqfind('=');
+			int sep = line.find('=');
 			if(line == "[depend]") {
 			    state = CacheDepend;
 			} else if(line == "[tqmocable]") {
@@ -819,7 +819,7 @@ MakefileGenerator::init()
 				    if(found) {
 					debug_msg(2, "Dependencies (cached): %s -> %s", file.latin1(),
 						  files.join(" :: ").latin1());
-					tqfindDependencies(file) = files;
+					findDependencies(file) = files;
 					setProcessedDependencies(file, TRUE);
 				    }
 				}
@@ -827,7 +827,7 @@ MakefileGenerator::init()
 				void *found = cache_found_files[file];
 				if(found != (void *)2) {
 				    if(found) {
-					cache_found_files.tqreplace(file, (void *)2);
+					cache_found_files.replace(file, (void *)2);
 				    } else {
 					TQFileInfo fi(fileFixify(file, TQDir::currentDirPath(), Option::output_dir));
 					if(fi.exists() && fi.lastModified() < cachefi.lastModified()) {
@@ -837,7 +837,7 @@ MakefileGenerator::init()
 				    }
 				}
 				if(found && line != "*qmake_ignore*") {
-				    int ext_len = file.length() - file.tqfindRev('.');
+				    int ext_len = file.length() - file.findRev('.');
 				    bool cpp_ext = FALSE;
 				    for(TQStringList::Iterator cppit = Option::cpp_ext.begin();
 					cppit != Option::cpp_ext.end(); ++cppit) {
@@ -846,7 +846,7 @@ MakefileGenerator::init()
 				    }
 				    if(cpp_ext) {
 					project->variables()["_SRCTQMOC"].append(line);
-				    } else if(project->variables()["HEADERS"].tqfindIndex(file) != -1) {
+				    } else if(project->variables()["HEADERS"].findIndex(file) != -1) {
 					for(TQStringList::Iterator hit = Option::h_ext.begin();
 					    hit != Option::h_ext.end(); ++hit) {
 					    if((file.right(ext_len) == (*hit))) {
@@ -903,8 +903,8 @@ MakefileGenerator::init()
 			    }
 			    if(!found) {
 				TQString dir, regex = (*val_it), real_dir;
-				if(regex.tqfindRev(Option::dir_sep) != -1) {
-				    dir = regex.left(regex.tqfindRev(Option::dir_sep) + 1);
+				if(regex.findRev(Option::dir_sep) != -1) {
+				    dir = regex.left(regex.findRev(Option::dir_sep) + 1);
 				    real_dir = fileFixify(Option::fixPathToLocalOS(dir),
 							  TQDir::currentDirPath(), Option::output_dir);
 				    regex = regex.right(regex.length() - dir.length());
@@ -912,10 +912,10 @@ MakefileGenerator::init()
 				if(real_dir.isEmpty() || TQFile::exists(real_dir)) {
 				    TQDir d(real_dir, regex);
 				    if(!d.count()) {
-					debug_msg(1, "%s:%d Failure to tqfind %s in vpath (%s)",
+					debug_msg(1, "%s:%d Failure to find %s in vpath (%s)",
 						  __FILE__, __LINE__,
 						  (*val_it).latin1(), vpath.join("::").latin1());
-					warn_msg(WarnLogic, "Failure to tqfind: %s", (*val_it).latin1());
+					warn_msg(WarnLogic, "Failure to find: %s", (*val_it).latin1());
 					continue;
 				    } else {
 					for(int i = 0; i < (int)d.count(); i++) {
@@ -931,7 +931,7 @@ MakefileGenerator::init()
 					      __FILE__, __LINE__,
 					      real_dir.latin1(), TQDir::separator(), regex.latin1(),
 					      real_dir.latin1());
-				    warn_msg(WarnLogic, "Failure to tqfind: %s", (*val_it).latin1());
+				    warn_msg(WarnLogic, "Failure to find: %s", (*val_it).latin1());
 				}
 			    }
 			}
@@ -955,13 +955,13 @@ MakefileGenerator::init()
 		       tqmoc_*.cpp files */
 		    if(found_cache_tqmoc) {
 			TQString fixed_file(fileFixify((*val_it), TQDir::currentDirPath(), Option::output_dir));
-			TQString tqmoc = tqfindMocDestination(fixed_file);
+			TQString tqmoc = findMocDestination(fixed_file);
 			if(!tqmoc.isEmpty()) {
 			    for(TQStringList::Iterator cppit = Option::cpp_ext.begin();
 				    cppit != Option::cpp_ext.end(); ++cppit) {
 				if(fixed_file.endsWith((*cppit))) {
-				    TQStringList &deps = tqfindDependencies(fixed_file);
-				    if(!deps.tqcontains(tqmoc))
+				    TQStringList &deps = findDependencies(fixed_file);
+				    if(!deps.contains(tqmoc))
 					deps.append(tqmoc);
 				    break;
 				}
@@ -1034,10 +1034,10 @@ MakefileGenerator::init()
 	    if( ! project->isActiveConfig("lex_included")) {
 		v["SOURCES"].append(impl);
 		// attribute deps of lex file to impl file
-		TQStringList &lexdeps = tqfindDependencies((*it));
-		TQStringList &impldeps = tqfindDependencies(impl);
+		TQStringList &lexdeps = findDependencies((*it));
+		TQStringList &impldeps = findDependencies(impl);
 		for(TQStringList::ConstIterator d = lexdeps.begin(); d != lexdeps.end(); ++d) {
-		    if(!impldeps.tqcontains(*d))
+		    if(!impldeps.contains(*d))
 			impldeps.append(*d);
 		}
 		lexdeps.clear();
@@ -1066,12 +1066,12 @@ MakefileGenerator::init()
 	    decls.append(decl);
 	    impls.append(impl);
 	    v["SOURCES"].append(impl);
-	    TQStringList &impldeps = tqfindDependencies(impl);
+	    TQStringList &impldeps = findDependencies(impl);
 	    impldeps.append(decl);
 	    // attribute deps of yacc file to impl file
-	    TQStringList &yaccdeps = tqfindDependencies((*it));
+	    TQStringList &yaccdeps = findDependencies((*it));
 	    for(TQStringList::ConstIterator d = yaccdeps.begin(); d != yaccdeps.end(); ++d) {
-		if(!impldeps.tqcontains(*d))
+		if(!impldeps.contains(*d))
 		    impldeps.append(*d);
 	    }
 	    if( project->isActiveConfig("lex_included")) {
@@ -1079,10 +1079,10 @@ MakefileGenerator::init()
 		TQString lexsrc = fi.baseName(TRUE) + Option::lex_ext;
 		if(fi.dirPath() != ".")
 		    lexsrc.prepend(fi.dirPath() + Option::dir_sep);
-		if(v["LEXSOURCES"].tqfindIndex(lexsrc) != -1) {
+		if(v["LEXSOURCES"].findIndex(lexsrc) != -1) {
 		    TQString trg = dir + fi.baseName(TRUE) + Option::lex_mod + Option::cpp_ext.first();
 		    impldeps.append(trg);
-		    impldeps += tqfindDependencies(lexsrc);
+		    impldeps += findDependencies(lexsrc);
 		    depends[lexsrc].clear();
 		}
 	    }
@@ -1109,7 +1109,7 @@ MakefileGenerator::init()
 		if( d == ".")
 		    d = TQDir::currentDirPath();
 		d = fileFixify(d, TQDir::currentDirPath(), Option::output_dir);
-		if(!includepath.tqcontains(d))
+		if(!includepath.contains(d))
 		    includepath.append(d);
 	    } else {
 		if(decl.isEmpty() && !project->isEmpty("UI_HEADERS_DIR"))
@@ -1120,7 +1120,7 @@ MakefileGenerator::init()
 		    if( d == ".")
 			d = TQDir::currentDirPath();
 		    d = fileFixify(d, TQDir::currentDirPath(), Option::output_dir);
-		    if(!includepath.tqcontains(d))
+		    if(!includepath.contains(d))
 			includepath.append(d);
 		}
 		if(impl.isEmpty() && !project->isEmpty("UI_SOURCES_DIR"))
@@ -1139,9 +1139,9 @@ MakefileGenerator::init()
 	    if(Option::output_dir != TQDir::currentDirPath() &&
 	       project->isEmpty("UI_DIR") && project->isEmpty("UI_HEADERS_DIR")) {
 		TQString decl_fixed = fileFixify(decl, TQDir::currentDirPath(), Option::output_dir);
-		if(!includepath.tqcontains(decl_fixed))
+		if(!includepath.contains(decl_fixed))
 		    includepath.append(decl_fixed);
-		if(!includepath.tqcontains(decl))
+		if(!includepath.contains(decl))
 		    project->variables()["INCLUDEPATH"].append(decl);
 	    }
 	    decl = fileFixify(decl, TQDir::currentDirPath(), Option::output_dir);
@@ -1152,7 +1152,7 @@ MakefileGenerator::init()
 	    logicWarn(decl, "HEADERS");
 	    decls.append(decl);
 	    impls.append(impl);
-	    tqfindDependencies(impl).append(decl);
+	    findDependencies(impl).append(decl);
 
 	    TQString tqmocable = Option::h_tqmoc_mod + fi.baseName(TRUE) + Option::h_tqmoc_ext;
 	    if(!v["TQMOC_DIR"].isEmpty())
@@ -1182,8 +1182,8 @@ MakefileGenerator::init()
 	TQString imgfile = project->first("TQMAKE_IMAGE_COLLECTION");
 	Option::fixPathToTargetOS(imgfile);
 	if(!project->isEmpty("UI_DIR") || !project->isEmpty("UI_SOURCES_DIR")) {
-	    if(imgfile.tqfind(Option::dir_sep) != -1)
-		imgfile = imgfile.right(imgfile.tqfindRev(Option::dir_sep) + 1);
+	    if(imgfile.find(Option::dir_sep) != -1)
+		imgfile = imgfile.right(imgfile.findRev(Option::dir_sep) + 1);
 	    imgfile.prepend( (project->isEmpty("UI_DIR") ? project->first("UI_SOURCES_DIR") :
 			    project->first("UI_DIR")) );
 	    v["TQMAKE_IMAGE_COLLECTION"] = TQStringList(imgfile);
@@ -1196,7 +1196,7 @@ MakefileGenerator::init()
 		    warn_msg(WarnLogic, "Failure to open: %s", (*it).latin1());
 		    continue;
 		}
-		tqfindDependencies(imgfile).append(fileFixify((*it)));
+		findDependencies(imgfile).append(fileFixify((*it)));
 	    }
 	}
 	v["OBJECTS"] += (v["IMAGEOBJECTS"] = createObjectList("TQMAKE_IMAGE_COLLECTION"));
@@ -1242,15 +1242,15 @@ MakefileGenerator::init()
 bool
 MakefileGenerator::processPrlFile(TQString &file)
 {
-    bool ret = FALSE, try_tqreplace_file=FALSE;
+    bool ret = FALSE, try_replace_file=FALSE;
     TQString meta_file, orig_file = file;
     if(TQMakeMetaInfo::libExists(file)) {
-	try_tqreplace_file = TRUE;
+	try_replace_file = TRUE;
 	meta_file = file;
 	file = "";
     } else {
 	TQString tmp = file;
-	int ext = tmp.tqfindRev('.');
+	int ext = tmp.findRev('.');
 	if(ext != -1)
 	    tmp = tmp.left(ext);
 	meta_file = tmp;
@@ -1259,7 +1259,7 @@ MakefileGenerator::processPrlFile(TQString &file)
     if(!TQMakeMetaInfo::libExists(fileFixify(meta_file, TQDir::currentDirPath(), Option::output_dir)) &&
        project->isActiveConfig("qt")) {
 	TQString stem = meta_file, dir, extn;
-	int slsh = stem.tqfindRev('/'), hadlib = 0;
+	int slsh = stem.findRev('/'), hadlib = 0;
 	if(slsh != -1) {
 	    dir = stem.left(slsh + 1);
 	    stem = stem.right(stem.length() - slsh - 1);
@@ -1268,7 +1268,7 @@ MakefileGenerator::processPrlFile(TQString &file)
 	    hadlib = 1;
 	    stem = stem.right(stem.length() - 3);
 	}
-	int dot = stem.tqfind('.');
+	int dot = stem.find('.');
 	if(dot != -1) {
 	    extn = stem.right(stem.length() - dot);
 	    stem = stem.left(dot);
@@ -1282,11 +1282,11 @@ MakefileGenerator::processPrlFile(TQString &file)
 	    if(hadlib)
 		meta_file += "lib";
 	    meta_file += stem + extn;
-	    try_tqreplace_file = TRUE;
+	    try_replace_file = TRUE;
 	}
     }
     TQString real_meta_file = Option::fixPathToLocalOS(meta_file);
-    if(project->variables()["TQMAKE_PRL_INTERNAL_FILES"].tqfindIndex(TQMakeMetaInfo::tqfindLib(meta_file)) != -1) {
+    if(project->variables()["TQMAKE_PRL_INTERNAL_FILES"].findIndex(TQMakeMetaInfo::findLib(meta_file)) != -1) {
 	ret = TRUE;
     } else if(!meta_file.isEmpty()) {
 	TQString f = fileFixify(real_meta_file, TQDir::currentDirPath(), Option::output_dir);
@@ -1302,9 +1302,9 @@ MakefileGenerator::processPrlFile(TQString &file)
 		TQMap<TQString, TQStringList> &vars = libinfo.variables();
 		for( TQMap<TQString, TQStringList>::Iterator it = vars.begin(); it != vars.end(); ++it)
 		    processPrlVariable(it.key(), it.data());
-		if(try_tqreplace_file && !libinfo.isEmpty("TQMAKE_PRL_TARGET")) {
+		if(try_replace_file && !libinfo.isEmpty("TQMAKE_PRL_TARGET")) {
 		    TQString dir;
-		    int slsh = real_meta_file.tqfindRev(Option::dir_sep);
+		    int slsh = real_meta_file.findRev(Option::dir_sep);
 		    if(slsh != -1)
 			dir = real_meta_file.left(slsh+1);
 		    file = libinfo.first("TQMAKE_PRL_TARGET");
@@ -1314,12 +1314,12 @@ MakefileGenerator::processPrlFile(TQString &file)
 	    }
 	}
 	if(ret) {
-	    TQString mf = TQMakeMetaInfo::tqfindLib(meta_file);
+	    TQString mf = TQMakeMetaInfo::findLib(meta_file);
 	    project->variables()["TQMAKE_PRL_INTERNAL_FILES"].append(mf);
 	    project->variables()["TQMAKE_INTERNAL_INCLUDED_FILES"].append(mf);
 	}
     }
-    if(try_tqreplace_file && file.isEmpty()) {
+    if(try_replace_file && file.isEmpty()) {
 #if 0
 	warn_msg(WarnLogic, "Found prl [%s] file with no target [%s]!", meta_file.latin1(),
 		 orig_file.latin1());
@@ -1338,14 +1338,14 @@ MakefileGenerator::processPrlVariable(const TQString &var, const TQStringList &l
 	    where = project->first("TQMAKE_INTERNAL_PRL_LIBS");
 	TQStringList &out = project->variables()[where];
 	for(TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it) {
-	    if( out.tqfindIndex((*it)) == -1)
+	    if( out.findIndex((*it)) == -1)
 		out.append((*it));
 	}
     } else if(var == "TQMAKE_PRL_DEFINES") {
 	TQStringList &out = project->variables()["DEFINES"];
 	for(TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it) {
-	    if(out.tqfindIndex((*it)) == -1 &&
-	       project->variables()["PRL_EXPORT_DEFINES"].tqfindIndex((*it)) == -1)
+	    if(out.findIndex((*it)) == -1 &&
+	       project->variables()["PRL_EXPORT_DEFINES"].findIndex((*it)) == -1)
 		out.append((*it));
 	}
     }
@@ -1382,7 +1382,7 @@ void
 MakefileGenerator::writePrlFile(TQTextStream &t)
 {
     TQString target = project->first("TARGET");
-    int slsh = target.tqfindRev(Option::dir_sep);
+    int slsh = target.findRev(Option::dir_sep);
     if(slsh != -1)
 	target = target.right(target.length() - slsh - 1);
     TQString bdir = Option::output_dir;
@@ -1424,17 +1424,17 @@ MakefileGenerator::write()
 {
     usePlatformDir();
     init();
-    tqfindLibraries();
+    findLibraries();
     if((Option::qmake_mode == Option::TQMAKE_GENERATE_MAKEFILE || //write prl
        Option::qmake_mode == Option::TQMAKE_GENERATE_PRL) &&
        project->variables()["TQMAKE_FAILED_RETQUIREMENTS"].isEmpty() &&
        project->isActiveConfig("create_prl") && project->first("TEMPLATE") == "lib" &&
        !project->isActiveConfig("plugin")) {
 	TQString prl = var("TARGET");
-	int slsh = prl.tqfindRev(Option::dir_sep);
+	int slsh = prl.findRev(Option::dir_sep);
 	if(slsh != -1)
 	    prl = prl.right(prl.length() - slsh);
-	int dot = prl.tqfind('.');
+	int dot = prl.find('.');
 	if(dot != -1)
 	    prl = prl.left(dot);
 	prl += Option::prl_ext;
@@ -1490,7 +1490,7 @@ MakefileGenerator::usePlatformDir()
 					    + (filePath.isEmpty() ? pltDir : slashPltDir));
 
     filePath = project->first("TQMAKE_LIBS_QT");
-    int fpi = filePath.tqfindRev(sep);
+    int fpi = filePath.findRev(sep);
     if (fpi == -1)
 	project->variables()["TQMAKE_LIBS_QT"].prepend(pltDir + sep);
     else
@@ -1499,7 +1499,7 @@ MakefileGenerator::usePlatformDir()
 					      + filePath.mid(fpi));
     
     filePath = project->first("TQMAKE_LIBS_TQT_THREAD");
-    fpi = filePath.tqfindRev(sep);
+    fpi = filePath.findRev(sep);
     if (fpi == -1)
 	project->variables()["TQMAKE_LIBS_TQT_THREAD"].prepend(pltDir + sep);
     else
@@ -1508,7 +1508,7 @@ MakefileGenerator::usePlatformDir()
 						     + filePath.mid(fpi));
 
     filePath = project->first("TQMAKE_LIBS_TQT_ENTRY");
-    fpi = filePath.tqfindRev(sep);
+    fpi = filePath.findRev(sep);
     if (fpi == -1)
 	project->variables()["TQMAKE_LIBS_TQT_ENTRY"].prepend(pltDir + sep);
     else
@@ -1533,7 +1533,7 @@ MakefileGenerator::writeObj(TQTextStream &t, const TQString &obj, const TQString
 
 	if(!doDepends()) {
 	    TQString sdep, odep = (*sit) + " ";
-	    TQStringList deps = tqfindDependencies((*sit));
+	    TQStringList deps = findDependencies((*sit));
 	    for(TQStringList::Iterator dit = deps.begin(); dit != deps.end(); dit++) {
 		if((*dit).endsWith(Option::cpp_tqmoc_ext))
 		    odep += (*dit) + " ";
@@ -1543,7 +1543,7 @@ MakefileGenerator::writeObj(TQTextStream &t, const TQString &obj, const TQString
 	    t << (*sit) << ": " << sdep << endl
 	      << (*oit) << ": " << odep ;
 	} else {
-	    t << (*oit) << ": " << (*sit) << " " << tqfindDependencies((*sit)).join(" \\\n\t\t");
+	    t << (*oit) << ": " << (*sit) << " " << findDependencies((*sit)).join(" \\\n\t\t");
 	}
 
 	TQString comp, cimp;
@@ -1563,15 +1563,15 @@ MakefileGenerator::writeObj(TQTextStream &t, const TQString &obj, const TQString
 	    if(!project->isEmpty("OBJECTS_DIR")) {
 		use_implicit_rule = FALSE;
 	    } else {
-		int dot = (*sit).tqfindRev('.');
+		int dot = (*sit).findRev('.');
 		if(dot == -1 || ((*sit).left(dot) + Option::obj_ext != (*oit)))
 		    use_implicit_rule = FALSE;
 	    }
 	}
 	if (!use_implicit_rule && !project->isEmpty(comp)) {
 	    TQString p = var(comp), srcf(*sit);
-	    p.tqreplace(stringSrc, srcf);
-	    p.tqreplace(stringObj, (*oit));
+	    p.replace(stringSrc, srcf);
+	    p.replace(stringObj, (*oit));
 	    t << "\n\t" << p;
 	}
 	t << endl << endl;
@@ -1587,11 +1587,11 @@ MakefileGenerator::writeUicSrc(TQTextStream &t, const TQString &ui)
 	TQString decl, impl;
 	{
 	    TQString tmp = (*it), impl_dir, decl_dir;
-	    decl = tmp.tqreplace(TQRegExp("\\" + Option::ui_ext + "$"), Option::h_ext.first());
-	    int dlen = decl.tqfindRev(Option::dir_sep) + 1;
+	    decl = tmp.replace(TQRegExp("\\" + Option::ui_ext + "$"), Option::h_ext.first());
+	    int dlen = decl.findRev(Option::dir_sep) + 1;
 	    tmp = (*it);
-	    impl = tmp.tqreplace(TQRegExp("\\" + Option::ui_ext + "$"), Option::cpp_ext.first());
-	    int ilen = decl.tqfindRev(Option::dir_sep) + 1;
+	    impl = tmp.replace(TQRegExp("\\" + Option::ui_ext + "$"), Option::cpp_ext.first());
+	    int ilen = decl.findRev(Option::dir_sep) + 1;
 	    if(!project->isEmpty("UI_DIR")) {
 		impl_dir = project->first("UI_DIR");
 		decl = project->first("UI_DIR") + decl.right(decl.length() - dlen);
@@ -1619,14 +1619,14 @@ MakefileGenerator::writeUicSrc(TQTextStream &t, const TQString &ui)
 	    createDir(impl_dir);
 	    createDir(decl_dir);
 	}
-	TQStringList deps = tqfindDependencies((*it));
+	TQStringList deps = findDependencies((*it));
 	deps.remove(decl); //avoid circular dependencies..
 	t << decl << ": " << (*it) << " ";
         t << deps.join(" \\\n\t\t") << "\n\t"
           << "$(UIC) " << (*it) << " -o " << decl << endl << endl;
 
 	TQString mildDecl = decl;
-	int k = mildDecl.tqfindRev(Option::dir_sep);
+	int k = mildDecl.findRev(Option::dir_sep);
 	if ( k != -1 )
 	    mildDecl = mildDecl.mid( k + 1 );
 	t << impl << ": " << decl << " " << (*it) << " ";
@@ -1646,24 +1646,24 @@ MakefileGenerator::writeMocObj(TQTextStream &t, const TQString &obj, const TQStr
     TQStringList::Iterator oit = objl.begin(), sit = srcl.begin();
     TQString stringSrc("$src"), stringObj("$obj");
     for( ;sit != srcl.end() && oit != objl.end(); oit++, sit++) {
-	TQString hdr = tqfindMocSource((*sit));
+	TQString hdr = findMocSource((*sit));
 	t << (*oit) << ": " 
-	  << (*sit) << " " << tqfindDependencies((*sit)).join(" \\\n\t\t") << " "
-	  << hdr << " " << tqfindDependencies(hdr).join(" \\\n\t\t");
+	  << (*sit) << " " << findDependencies((*sit)).join(" \\\n\t\t") << " "
+	  << hdr << " " << findDependencies(hdr).join(" \\\n\t\t");
 	bool use_implicit_rule = !project->isEmpty("TQMAKE_RUN_CXX_IMP");
 	if(use_implicit_rule) {
 	    if(!project->isEmpty("OBJECTS_DIR") || !project->isEmpty("TQMOC_DIR")) {
 		use_implicit_rule = FALSE;
 	    } else {
-		int dot = (*sit).tqfindRev('.');
+		int dot = (*sit).findRev('.');
 		if(dot == -1 || ((*sit).left(dot) + Option::obj_ext != (*oit)))
 		    use_implicit_rule = FALSE;
 	    }
 	}
 	if (!use_implicit_rule && !project->isEmpty("TQMAKE_RUN_CXX")) {
 	    TQString p = var("TQMAKE_RUN_CXX"), srcf(*sit);
-	    p.tqreplace(stringSrc, srcf);
-	    p.tqreplace(stringObj, (*oit));
+	    p.replace(stringSrc, srcf);
+	    p.replace(stringObj, (*oit));
 	    t << "\n\t" << p;
 	}
 	t << endl << endl;
@@ -1676,7 +1676,7 @@ MakefileGenerator::writeMocSrc(TQTextStream &t, const TQString &src)
 {
     TQStringList &l = project->variables()[src];
     for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
-	TQString m = Option::fixPathToTargetOS(tqfindMocDestination(*it));
+	TQString m = Option::fixPathToTargetOS(findMocDestination(*it));
 	if ( !m.isEmpty()) {
 	    TQString deps;
 	    if(!project->isActiveConfig("no_tqmocdepend"))
@@ -1718,14 +1718,14 @@ MakefileGenerator::writeYaccSrc(TQTextStream &t, const TQString &src)
 	if(!project->isActiveConfig("yacc_no_name_mangle")) {
 	    mangle = fi.baseName(TRUE);
 	    if(!project->isEmpty("TQMAKE_YACCFLAGS_MANGLE")) 
-		yaccflags += " " + var("TQMAKE_YACCFLAGS_MANGLE").tqreplace(stringBase, mangle);
+		yaccflags += " " + var("TQMAKE_YACCFLAGS_MANGLE").replace(stringBase, mangle);
 	    else
 		yaccflags += " -p " + mangle;
 	}
 	TQString out_h = default_out_h, out_c = default_out_c;
 	if(!mangle.isEmpty()) {
-	    out_h.tqreplace(stringBase, mangle);
-	    out_c.tqreplace(stringBase, mangle);
+	    out_h.replace(stringBase, mangle);
+	    out_c.replace(stringBase, mangle);
 	}
 
 	t << impl << ": " << (*it) << "\n\t"
@@ -1765,9 +1765,9 @@ MakefileGenerator::writeLexSrc(TQTextStream &t, const TQString &src)
 	}
 	TQString out_c = default_out_c;
 	if(!stub.isEmpty())
-	    out_c.tqreplace(stringBase, stub);
+	    out_c.replace(stringBase, stub);
 
-	t << impl << ": " << (*it) << " " << tqfindDependencies((*it)).join(" \\\n\t\t") << "\n\t"
+	t << impl << ": " << (*it) << " " << findDependencies((*it)).join(" \\\n\t\t") << "\n\t"
 	  << ( "$(LEX) " + lexflags + " " ) << (*it) << "\n\t"
 	  << "-$(DEL_FILE) " << impl << " " << "\n\t"
 	  << "-$(MOVE) " << out_c << " " << impl << endl << endl;
@@ -1790,15 +1790,15 @@ MakefileGenerator::writeImageObj(TQTextStream &t, const TQString &obj)
 	    if(!project->isEmpty("OBJECTS_DIR") || !project->isEmpty("UI_DIR") || !project->isEmpty("UI_SOURCES_DIR")) {
 		use_implicit_rule = FALSE;
 	    } else {
-		int dot = src.tqfindRev('.');
+		int dot = src.findRev('.');
 		if(dot == -1 || (src.left(dot) + Option::obj_ext != (*oit)))
 		    use_implicit_rule = FALSE;
 	    }
 	}
 	if(!use_implicit_rule && !project->isEmpty("TQMAKE_RUN_CXX")) {
 	    TQString p = var("TQMAKE_RUN_CXX"), srcf(src);
-	    p.tqreplace(stringSrc, srcf);
-	    p.tqreplace(stringObj, (*oit));
+	    p.replace(stringSrc, srcf);
+	    p.replace(stringObj, (*oit));
 	    t << "\n\t" << p;
 	}
 	t << endl << endl;
@@ -1813,17 +1813,17 @@ MakefileGenerator::writeImageSrc(TQTextStream &t, const TQString &src)
     for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
 	TQString gen = project->first("MAKEFILE_GENERATOR");
 	if ( gen == "MSVC" ) {
-	    t << (*it) << ": " << tqfindDependencies((*it)).join(" \\\n\t\t") << "\n\t"
+	    t << (*it) << ": " << findDependencies((*it)).join(" \\\n\t\t") << "\n\t"
 		<< "$(UIC)  -o " << (*it) << " -embed " << project->first("TQMAKE_ORIG_TARGET")
-		<< " -f <<\n" << tqfindDependencies((*it)).join(" ") << "\n<<" << endl << endl;
+		<< " -f <<\n" << findDependencies((*it)).join(" ") << "\n<<" << endl << endl;
 	} else if ( gen == "BMAKE" ) {
-	    t << (*it) << ": " << tqfindDependencies((*it)).join(" \\\n\t\t") << "\n\t"
+	    t << (*it) << ": " << findDependencies((*it)).join(" \\\n\t\t") << "\n\t"
 		<< "$(UIC) " << " -embed " << project->first("TQMAKE_ORIG_TARGET")
-		<< " -f &&|\n" << tqfindDependencies((*it)).join(" ") << "\n| -o " << (*it) << endl << endl;
+		<< " -f &&|\n" << findDependencies((*it)).join(" ") << "\n| -o " << (*it) << endl << endl;
 	} else {
-	    t << (*it) << ": " << tqfindDependencies((*it)).join(" \\\n\t\t") << "\n\t"
+	    t << (*it) << ": " << findDependencies((*it)).join(" \\\n\t\t") << "\n\t"
 		<< "$(UIC) " << " -embed " << project->first("TQMAKE_ORIG_TARGET")
-		<< " " << tqfindDependencies((*it)).join(" ") << " -o " << (*it) << endl << endl;
+		<< " " << findDependencies((*it)).join(" ") << " -o " << (*it) << endl << endl;
 	}
     }
 }
@@ -1836,7 +1836,7 @@ MakefileGenerator::writeInstalls(TQTextStream &t, const TQString &installs)
     TQStringList &l = project->variables()[installs];
     for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
 	TQString pvar = (*it) + ".path";
-	if(project->variables()[(*it) + ".CONFIG"].tqfindIndex("no_path") == -1 &&
+	if(project->variables()[(*it) + ".CONFIG"].findIndex("no_path") == -1 &&
 	   project->variables()[pvar].isEmpty()) {
 	    warn_msg(WarnLogic, "%s is not defined: install target not created\n", pvar.latin1());
 	    continue;
@@ -1867,7 +1867,7 @@ MakefileGenerator::writeInstalls(TQTextStream &t, const TQString &installs)
 	    for(TQStringList::Iterator wild_it = tmp.begin(); wild_it != tmp.end(); ++wild_it) {
 		TQString wild = Option::fixPathToLocalOS((*wild_it), FALSE), wild_var = fileFixify(wild);
 		TQString dirstr = TQDir::currentDirPath(), filestr = wild;
-		int slsh = filestr.tqfindRev(Option::dir_sep);
+		int slsh = filestr.findRev(Option::dir_sep);
 		if(slsh != -1) {
 		    dirstr = filestr.left(slsh+1);
 		    filestr = filestr.right(filestr.length() - slsh - 1);
@@ -1967,7 +1967,7 @@ MakefileGenerator::writeInstalls(TQTextStream &t, const TQString &installs)
 	    }
 	    t << endl;
 
-	    if(project->variables()[(*it) + ".CONFIG"].tqfindIndex("no_default_install") == -1) {
+	    if(project->variables()[(*it) + ".CONFIG"].findIndex("no_default_install") == -1) {
 		all_installs += TQString("install_") + (*it) + " ";
 		if(!uninst.isEmpty())
 		    all_uninstalls += "uninstall_" + (*it) + " ";
@@ -2037,7 +2037,7 @@ MakefileGenerator::createObjectList(const TQString &var)
 	TQFileInfo fi(Option::fixPathToLocalOS((*it)));
 	if(objdir.isEmpty() && project->isActiveConfig("object_with_source")) {
 	    TQString fName = Option::fixPathToTargetOS((*it), FALSE);
-	    int dl = fName.tqfindRev(Option::dir_sep);
+	    int dl = fName.findRev(Option::dir_sep);
 	    if(dl != -1)
 		dir = fName.left(dl + 1);
 	} else {
@@ -2218,7 +2218,7 @@ MakefileGenerator::fileFixify(const TQString& file0, const TQString &out_d,
     if(!in_d.isEmpty() || !out_d.isEmpty() || force_fix || !canon)
 	key.prepend(in_d + "--" + out_d + "--" + TQString::number((int)force_fix) + "--" +
 		    TQString::number((int)canon) + "-");
-    if(fileFixed.tqcontains(key))
+    if(fileFixed.contains(key))
 	return fileFixed[key];
 
     TQString file = file0;
@@ -2294,7 +2294,7 @@ MakefileGenerator::fileFixify(const TQString& file0, const TQString &out_d,
 		file = file.right(file.length() - (match_dir.length() + 1));
 	    } else {
 		for(int i = 1; i <= depth; i++) {
-		    int sl = match_dir.tqfindRev(Option::dir_sep);
+		    int sl = match_dir.findRev(Option::dir_sep);
 		    if(sl == -1)
 			break;
 		    match_dir = match_dir.left(sl);
@@ -2337,13 +2337,13 @@ void MakefileGenerator::logicWarn(const TQString &f, const TQString &w)
     if(!(Option::warn_level & WarnLogic))
 	return;
     TQString file = f;
-    int slsh = f.tqfindRev(Option::dir_sep);
+    int slsh = f.findRev(Option::dir_sep);
     if(slsh != -1)
 	file = file.right(file.length() - slsh - 1);
     TQStringList &l = project->variables()[w];
     for(TQStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) {
 	TQString file2((*val_it));
-	slsh = file2.tqfindRev(Option::dir_sep);
+	slsh = file2.findRev(Option::dir_sep);
 	if(slsh != -1)
 	    file2 = file2.right(file2.length() - slsh - 1);
 	if(file2 == file) {
@@ -2359,8 +2359,8 @@ MakefileGenerator::dependencyKey(const TQString &file) const
 {
      TQString key = file;
      Option::fixPathToTargetOS(key);
-     if(key.tqfind(Option::dir_sep))
- 	key = key.right(key.length() - key.tqfindRev(Option::dir_sep) - 1);
+     if(key.find(Option::dir_sep))
+ 	key = key.right(key.length() - key.findRev(Option::dir_sep) - 1);
      return key;
 }
 
@@ -2374,13 +2374,13 @@ bool
 MakefileGenerator::processedDependencies(const TQString &file)
 {
     TQString key = dependencyKey(file);
-    if(!depProcessed.tqcontains(key))
+    if(!depProcessed.contains(key))
 	return FALSE;
     return depProcessed[key];
 }
 
 TQStringList
-&MakefileGenerator::tqfindDependencies(const TQString &file)
+&MakefileGenerator::findDependencies(const TQString &file)
 {
     return depends[dependencyKey(file)];
 }
@@ -2401,9 +2401,9 @@ MakefileGenerator::specdir()
 	TQFileInfo fi(spec);
 	TQString absSpec(fi.absFilePath());
 	absSpec = Option::fixPathToTargetOS(absSpec);
-	//tqreplace what you can
+	//replace what you can
 	if(absSpec.startsWith(qdir)) {
-	    absSpec.tqreplace(0, qdir.length(), "$(TQTDIR)");
+	    absSpec.replace(0, qdir.length(), "$(TQTDIR)");
 	    spec = absSpec;
 	}
     }
@@ -2436,7 +2436,7 @@ MakefileGenerator::openOutput(TQFile &file) const
 	file.setName(Option::output_dir + file.name()); //pwd when qmake was run
     if(project->isEmpty("TQMAKE_MAKEFILE"))
 	project->variables()["TQMAKE_MAKEFILE"].append(file.name());
-    int slsh = file.name().tqfindRev(Option::dir_sep);
+    int slsh = file.name().findRev(Option::dir_sep);
     if(slsh != -1)
 	createDir(file.name().left(slsh));
     if(file.open(IO_WriteOnly | IO_Translate)) {
@@ -2478,13 +2478,13 @@ MakefileGenerator::create(TQMakeProject *proj)
 	mkfile = new UnixMakefileGenerator(proj);
     } else if(gen == "MSVC") {
 	// Visual Studio =< v6.0
-	if(proj->first("TEMPLATE").tqfind(TQRegExp("^vc.*")) != -1)
+	if(proj->first("TEMPLATE").find(TQRegExp("^vc.*")) != -1)
 	    mkfile = new DspMakefileGenerator(proj);
 	else
 	    mkfile = new NmakeMakefileGenerator(proj);
     } else if(gen == "MSVC.NET") {
 	// Visual Studio >= v7.0
-	if(proj->first("TEMPLATE").tqfind(TQRegExp("^vc.*")) != -1)
+	if(proj->first("TEMPLATE").find(TQRegExp("^vc.*")) != -1)
 	    mkfile = new VcprojGenerator(proj);
 	else
 	    mkfile = new NmakeMakefileGenerator(proj);
diff --git a/tqtinterface/qt4/qmake/generators/makefile.h b/tqtinterface/qt4/qmake/generators/makefile.h
index c736a94..a33daff 100644
--- a/tqtinterface/qt4/qmake/generators/makefile.h
+++ b/tqtinterface/qt4/qmake/generators/makefile.h
@@ -88,9 +88,9 @@ protected:
     TQString cleanFilePath(const TQString &file) const;
     bool generateMocList(const TQString &fn);
 
-    TQString tqfindMocSource(const TQString &tqmoc_file) const;
-    TQString tqfindMocDestination(const TQString &src_file) const;
-    virtual TQStringList &tqfindDependencies(const TQString &file);
+    TQString findMocSource(const TQString &tqmoc_file) const;
+    TQString findMocDestination(const TQString &src_file) const;
+    virtual TQStringList &findDependencies(const TQString &file);
 
     void setNoIO(bool o);
     bool noIO() const;
@@ -119,8 +119,8 @@ protected:
     virtual void writePrlFile(TQTextStream &);
 
     //make sure libraries are found
-    virtual bool tqfindLibraries();
-    virtual TQString tqfindDependency(const TQString &);
+    virtual bool findLibraries();
+    virtual TQString findDependency(const TQString &);
 
     void setProcessedDependencies(const TQString &file, bool b);
     bool processedDependencies(const TQString &file);
@@ -146,19 +146,19 @@ public:
     virtual bool openOutput(TQFile &) const;
 };
 
-inline TQString MakefileGenerator::tqfindMocSource(const TQString &tqmoc_file) const
+inline TQString MakefileGenerator::findMocSource(const TQString &tqmoc_file) const
 {
     TQString tmp = cleanFilePath(tqmoc_file);
-    if (tqmocablesFromTQMOC.tqcontains(tmp))
+    if (tqmocablesFromTQMOC.contains(tmp))
 	return tqmocablesFromTQMOC[tmp];
     else
 	return TQString("");
 }
 
-inline TQString MakefileGenerator::tqfindMocDestination(const TQString &src_file) const
+inline TQString MakefileGenerator::findMocDestination(const TQString &src_file) const
 {
     TQString tmp = cleanFilePath(src_file);
-    if (tqmocablesToTQMOC.tqcontains(tmp))
+    if (tqmocablesToTQMOC.contains(tmp))
 	return tqmocablesToTQMOC[tmp];
     else
 	return TQString("");
@@ -179,10 +179,10 @@ inline bool MakefileGenerator::noIO() const
 inline TQString MakefileGenerator::defaultInstall(const TQString &)
 { return TQString(""); }
 
-inline bool MakefileGenerator::tqfindLibraries()
+inline bool MakefileGenerator::findLibraries()
 { return TRUE; }
 
-inline TQString MakefileGenerator::tqfindDependency(const TQString &)
+inline TQString MakefileGenerator::findDependency(const TQString &)
 { return TQString(""); }
 
 inline MakefileGenerator::~MakefileGenerator()
diff --git a/tqtinterface/qt4/qmake/generators/projectgenerator.cpp b/tqtinterface/qt4/qmake/generators/projectgenerator.cpp
index c608057..b52383e 100644
--- a/tqtinterface/qt4/qmake/generators/projectgenerator.cpp
+++ b/tqtinterface/qt4/qmake/generators/projectgenerator.cpp
@@ -87,7 +87,7 @@ ProjectGenerator::init()
 	TQString builtin_regex = project_builtin_regx();
 	TQStringList dirs = Option::projfile::project_dirs;
 	if(Option::projfile::do_pwd) {
-	    if(!v["INCLUDEPATH"].tqcontains("."))
+	    if(!v["INCLUDEPATH"].contains("."))
 		v["INCLUDEPATH"] += ".";
 	    dirs.prepend(TQDir::currentDirPath());
 	}
@@ -113,7 +113,7 @@ ProjectGenerator::init()
 		    regex = builtin_regex;
 		} else {
 		    TQString file = (*pd);
-		    int s = file.tqfindRev(Option::dir_sep);
+		    int s = file.findRev(Option::dir_sep);
 		    if(s != -1)
 			dir = file.left(s+1);
 		    if(addFile(file)) {
@@ -125,7 +125,7 @@ ProjectGenerator::init()
 		regex = (*pd);
 	    }
 	    if(!regex.isEmpty()) {
-		int s = regex.tqfindRev(Option::dir_sep);
+		int s = regex.findRev(Option::dir_sep);
 		if(s != -1) {
 		    dir = regex.left(s+1);
 		    regex = regex.right(regex.length() - (s+1));
@@ -147,7 +147,7 @@ ProjectGenerator::init()
 		    }
 		}
 	    }
-	    if(add_depend && !dir.isEmpty() && !v["DEPENDPATH"].tqcontains(dir)) {
+	    if(add_depend && !dir.isEmpty() && !v["DEPENDPATH"].contains(dir)) {
 		TQFileInfo fi(dir);
 		if(fi.absFilePath() != TQDir::currentDirPath()) 
 		    v["DEPENDPATH"] += fileFixify(dir);
@@ -167,7 +167,7 @@ ProjectGenerator::init()
 		    newdir = fileFixify(newdir);
 		    TQStringList &subdirs = v["SUBDIRS"];
 		    if(TQFile::exists(fi.filePath() + TQDir::separator() + fi.fileName() + ".pro") &&
-		       !subdirs.tqcontains(newdir)) {
+		       !subdirs.contains(newdir)) {
 			subdirs.append(newdir);
 		    } else {
 			TQDir d(newdir, "*.pro");
@@ -180,7 +180,7 @@ ProjectGenerator::init()
 				nd += TQDir::separator();
 			    nd += d[i];
 			    fileFixify(nd);
-			    if(d[i] != "." && d[i] != ".." && !subdirs.tqcontains(nd) && !out_file.endsWith(nd)) 
+			    if(d[i] != "." && d[i] != ".." && !subdirs.contains(nd) && !out_file.endsWith(nd)) 
 				subdirs.append(nd);
 			}
 		    }
@@ -189,14 +189,14 @@ ProjectGenerator::init()
 			d.setFilter(TQDir::Dirs);
 			for(int i = 0; i < (int)d.count(); i++) {
 			    TQString nd = fileFixify(newdir + TQDir::separator() + d[i]);
-			    if(d[i] != "." && d[i] != ".." && !dirs.tqcontains(nd))
+			    if(d[i] != "." && d[i] != ".." && !dirs.contains(nd))
 				dirs.append(nd);
 			}
 		    }
 		}
 	    } else { //regexp
 		TQString regx = (*pd), dir;
-		int s = regx.tqfindRev(Option::dir_sep);
+		int s = regx.findRev(Option::dir_sep);
 		if(s != -1) {
 		    dir = regx.left(s+1);
 		    regx = regx.right(regx.length() - (s+1));
@@ -210,7 +210,7 @@ ProjectGenerator::init()
 		    if(fi.fileName() != "." && fi.fileName() != "..") {
 			newdir = fileFixify(newdir);
 			if(TQFile::exists(fi.filePath() + TQDir::separator() + fi.fileName() + ".pro") &&
-			   !subdirs.tqcontains(newdir)) {
+			   !subdirs.contains(newdir)) {
 			   subdirs.append(newdir);
 			} else {
 			    TQDir d(newdir, "*.pro");
@@ -218,13 +218,13 @@ ProjectGenerator::init()
 			    for(int i = 0; i < (int)d.count(); i++) {
 				TQString nd = newdir + TQDir::separator() + d[i];
 				fileFixify(nd);
-				if(d[i] != "." && d[i] != ".." && !subdirs.tqcontains(nd)) {
+				if(d[i] != "." && d[i] != ".." && !subdirs.contains(nd)) {
 				    if(newdir + d[i] != Option::output_dir + Option::output.name())
 					subdirs.append(nd);
 				}
 			    }
 			}
-			if(Option::projfile::do_recursive && !dirs.tqcontains(newdir))
+			if(Option::projfile::do_recursive && !dirs.contains(newdir))
 			    dirs.append(newdir);
 		    }
 		}
@@ -250,18 +250,18 @@ ProjectGenerator::init()
 	TQStringList &l = v[srcs[i]];
 	for(TQStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) {
 	    if(generateDependencies(deplist, (*val_it), TRUE)) {
-		TQStringList &tmp = tqfindDependencies((*val_it));
+		TQStringList &tmp = findDependencies((*val_it));
 		if(!tmp.isEmpty()) {
 		    for(TQStringList::Iterator dep_it = tmp.begin(); dep_it != tmp.end(); ++dep_it) {
 			TQString file_dir = (*dep_it).section(Option::dir_sep, 0, -2),
 			    file_no_path = (*dep_it).section(Option::dir_sep, -1);
 			if(!file_dir.isEmpty()) {
 			    for(MakefileDependDir *mdd = deplist.first(); mdd; mdd = deplist.next()) {
-				if(mdd->local_dir == file_dir && !v["INCLUDEPATH"].tqcontains(mdd->real_dir))
+				if(mdd->local_dir == file_dir && !v["INCLUDEPATH"].contains(mdd->real_dir))
 				    v["INCLUDEPATH"] += mdd->real_dir;
 			    }
 			}
-			if(no_qt_files && file_no_path.tqfind(TQRegExp("^q[a-z_0-9].h$")) != -1)
+			if(no_qt_files && file_no_path.find(TQRegExp("^q[a-z_0-9].h$")) != -1)
 			    no_qt_files = FALSE;
 			TQString h_ext;
 			for(TQStringList::Iterator hit = Option::h_ext.begin(); 
@@ -299,8 +299,8 @@ ProjectGenerator::init()
 				  file_no_path.startsWith(Option::lex_mod)) {
 			    addConfig("lex_included");
 			}
-			if(!h.tqcontains((*dep_it))) {
-			    if(generateMocList((*dep_it)) && !tqfindMocDestination((*dep_it)).isEmpty())
+			if(!h.contains((*dep_it))) {
+			    if(generateMocList((*dep_it)) && !findMocDestination((*dep_it)).isEmpty())
 				h += (*dep_it);
 			}
 		    }
@@ -311,7 +311,7 @@ ProjectGenerator::init()
     if(h.isEmpty())
 	addConfig("tqmoc", FALSE);
 
-    //if we tqfind a file that matches an forms it needn't be included in the project
+    //if we find a file that matches an forms it needn't be included in the project
     TQStringList &u = v["INTERFACES"];
     TQString no_ui[] = { "SOURCES", "HEADERS", TQString::null };
     {
@@ -320,10 +320,10 @@ ProjectGenerator::init()
 	    for(TQStringList::Iterator val_it = l.begin(); val_it != l.end(); ) {
 		bool found = FALSE;
 		for(TQStringList::Iterator ui_it = u.begin(); ui_it != u.end(); ++ui_it) {
-		    TQString s1 = (*val_it).right((*val_it).length() - ((*val_it).tqfindRev(Option::dir_sep) + 1));
-		    if(s1.tqfindRev('.') != -1)
-			s1 = s1.left(s1.tqfindRev('.')) + Option::ui_ext;
-		    TQString u1 = (*ui_it).right((*ui_it).length() - ((*ui_it).tqfindRev(Option::dir_sep) + 1));
+		    TQString s1 = (*val_it).right((*val_it).length() - ((*val_it).findRev(Option::dir_sep) + 1));
+		    if(s1.findRev('.') != -1)
+			s1 = s1.left(s1.findRev('.')) + Option::ui_ext;
+		    TQString u1 = (*ui_it).right((*ui_it).length() - ((*ui_it).findRev(Option::dir_sep) + 1));
 		    if(s1 == u1) {
 			found = TRUE;
 			break;
@@ -380,7 +380,7 @@ ProjectGenerator::addConfig(const TQString &cfg, bool add)
     TQString where = "CONFIG";
     if(!add)
 	where = "CONFIG_REMOVE";
-    if(!project->variables()[where].tqcontains(cfg)) {
+    if(!project->variables()[where].contains(cfg)) {
 	project->variables()[where] += cfg;
 	return TRUE;
     }
@@ -393,7 +393,7 @@ ProjectGenerator::addFile(TQString file)
 {
     file = fileFixify(file, TQDir::currentDirPath());
     TQString dir;
-    int s = file.tqfindRev(Option::dir_sep);
+    int s = file.findRev(Option::dir_sep);
     if(s != -1)
 	dir = file.left(s+1);
     if(file.mid(dir.length(), Option::h_tqmoc_mod.length()) == Option::h_tqmoc_mod)
@@ -431,7 +431,7 @@ ProjectGenerator::addFile(TQString file)
     }
 
     TQString newfile = fileFixify(file);
-    if(!where.isEmpty() && !project->variables()[where].tqcontains(file)) {
+    if(!where.isEmpty() && !project->variables()[where].contains(file)) {
 	project->variables()[where] += newfile;
 	return TRUE;
     }
@@ -464,7 +464,7 @@ ProjectGenerator::getWritableVar(const TQString &v, bool fixPath)
     // ### Commented out for now so that project generation works.
     // Sam: it had to do with trailing \'s (ie considered continuation lines)
     if(fixPath)
-	join = join.tqreplace("\\", "/");
+	join = join.replace("\\", "/");
 #else
     TQ_UNUSED(fixPath);
 #endif
@@ -482,7 +482,7 @@ ProjectGenerator::openOutput(TQFile &file) const
     }
     if(!outdir.isEmpty() || file.name().isEmpty()) {
 	TQString dir = TQDir::currentDirPath();
-	int s = dir.tqfindRev('/');
+	int s = dir.findRev('/');
 	if(s != -1)
 	    dir = dir.right(dir.length() - (s + 1));
 	file.setName(outdir + dir + ".pro");
diff --git a/tqtinterface/qt4/qmake/generators/unix/unixmake.cpp b/tqtinterface/qt4/qmake/generators/unix/unixmake.cpp
index 4bee06b..82d7ef6 100644
--- a/tqtinterface/qt4/qmake/generators/unix/unixmake.cpp
+++ b/tqtinterface/qt4/qmake/generators/unix/unixmake.cpp
@@ -67,7 +67,7 @@ UnixMakefileGenerator::init()
 	    project->variables()["MAKEFILE"].append("Makefile");
 	if(project->isEmpty("TQMAKE"))
 	    project->variables()["TQMAKE"].append("qmake");
-	if(project->variables()["TQMAKE_INTERNAL_TQMAKE_DEPS"].tqfindIndex("qmake_all") == -1)
+	if(project->variables()["TQMAKE_INTERNAL_TQMAKE_DEPS"].findIndex("qmake_all") == -1)
 	    project->variables()["TQMAKE_INTERNAL_TQMAKE_DEPS"].append("qmake_all");
 	return; /* subdirs is done */
     }
@@ -100,7 +100,7 @@ UnixMakefileGenerator::init()
     //If the TARGET looks like a path split it into DESTDIR and the resulting TARGET
     if(!project->isEmpty("TARGET")) {
 	TQString targ = project->first("TARGET");
-	int slsh = TQMAX(targ.tqfindRev('/'), targ.tqfindRev(Option::dir_sep));
+	int slsh = TQMAX(targ.findRev('/'), targ.findRev(Option::dir_sep));
 	if(slsh != -1) {
 	    if(project->isEmpty("DESTDIR"))
 		project->values("DESTDIR").append("");
@@ -122,7 +122,7 @@ UnixMakefileGenerator::init()
     project->variables()["TQMAKE_LIBS"] += project->variables()["LIBS"];
     if ( (!project->isEmpty("TQMAKE_LIB_FLAG") && !project->isActiveConfig("staticlib") ) ||
 	 (project->isActiveConfig("qt") &&  project->isActiveConfig( "plugin" ) )) {
-	if(configs.tqfindIndex("dll") == -1) configs.append("dll");
+	if(configs.findIndex("dll") == -1) configs.append("dll");
     } else if ( !project->isEmpty("TQMAKE_APP_FLAG") || project->isActiveConfig("dll") ) {
 	configs.remove("staticlib");
     }
@@ -157,9 +157,9 @@ UnixMakefileGenerator::init()
 	project->variables()["TQMAKE_LIBDIR_FLAGS"] += varGlue( "TQMAKE_LIBDIR", "-L", " -L", "" );
     }
     if ( project->isActiveConfig("qtopia") ) {
-	if(configs.tqfindIndex("qtopialib") == -1)
+	if(configs.findIndex("qtopialib") == -1)
 	    configs.append("qtopialib");
-	if(configs.tqfindIndex("qtopiainc") == -1)
+	if(configs.findIndex("qtopiainc") == -1)
 	    configs.append("qtopiainc");
     }
     if ( project->isActiveConfig("qtopiainc") )
@@ -174,7 +174,7 @@ UnixMakefileGenerator::init()
 	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_ACCESSIBILITY_SUPPORT");
 	if ( project->isActiveConfig("tablet") )
 	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_TABLET_SUPPORT");
-	if(configs.tqfindIndex("tqmoc")) configs.append("tqmoc");
+	if(configs.findIndex("tqmoc")) configs.append("tqmoc");
 	project->variables()["INCLUDEPATH"] += project->variables()["TQMAKE_INCDIR_QT"];
 	if ( !project->isActiveConfig("debug") )
 	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_NO_DEBUG");
@@ -205,15 +205,15 @@ UnixMakefileGenerator::init()
 	    project->variables()["TQMAKE_LIBS"] += project->variables()["TQMAKE_LIBS_OPENGL"];
     }
     if ( extern_libs && (project->isActiveConfig("qt") || project->isActiveConfig("opengl")) ) {
-	if(configs.tqfindIndex("x11lib") == -1)
+	if(configs.findIndex("x11lib") == -1)
 	    configs.append("x11lib");
-	if ( project->isActiveConfig("opengl") && configs.tqfindIndex("x11inc") == -1 )
+	if ( project->isActiveConfig("opengl") && configs.findIndex("x11inc") == -1 )
 	    configs.append("x11inc");
     }
     if ( project->isActiveConfig("x11") ) {
-	if(configs.tqfindIndex("x11lib") == -1)
+	if(configs.findIndex("x11lib") == -1)
 	    configs.append("x11lib");
-	if(configs.tqfindIndex("x11inc") == -1)
+	if(configs.findIndex("x11inc") == -1)
 	    configs.append("x11inc");
     }
     if ( project->isActiveConfig("x11inc") )
@@ -387,11 +387,11 @@ UnixMakefileGenerator::combineSetLFlags(const TQStringList &list1, const TQStrin
 	for(TQStringList::ConstIterator it = lst->begin(); it != lst->end(); ++it) {
 	    if((*it).startsWith("-")) {
 		if((*it).startsWith("-L")) {
-		    if(ret.tqfindIndex((*it)) == -1)
+		    if(ret.findIndex((*it)) == -1)
 			ret.append((*it));
 		} else if((*it).startsWith("-l")) {
 		    while(1) {
-			TQStringList::Iterator idx = ret.tqfind((*it));
+			TQStringList::Iterator idx = ret.find((*it));
 			if(idx == ret.end())
 			    break;
 			ret.remove(idx);
@@ -439,7 +439,7 @@ UnixMakefileGenerator::combineSetLFlags(const TQStringList &list1, const TQStrin
 		} else {
 #if 1
 		    while(1) {
-			TQStringList::Iterator idx = ret.tqfind((*it));
+			TQStringList::Iterator idx = ret.find((*it));
 			if(idx == ret.end())
 			    break;
 			ret.remove(idx);
@@ -449,7 +449,7 @@ UnixMakefileGenerator::combineSetLFlags(const TQStringList &list1, const TQStrin
 		}
 	    } else /*if(TQFile::exists((*it)))*/ {
 		while(1) {
-		    TQStringList::Iterator idx = ret.tqfind((*it));
+		    TQStringList::Iterator idx = ret.find((*it));
 		    if(idx == ret.end())
 			break;
 		    ret.remove(idx);
@@ -472,7 +472,7 @@ UnixMakefileGenerator::processPrlVariable(const TQString &var, const TQStringLis
 }
 
 TQString
-UnixMakefileGenerator::tqfindDependency(const TQString &dep)
+UnixMakefileGenerator::findDependency(const TQString &dep)
 {
     TQStringList::Iterator it;
     {
@@ -498,21 +498,21 @@ UnixMakefileGenerator::tqfindDependency(const TQString &dep)
 		for(TQStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
 		    TQString out = tmp_out;
 		    TQFileInfo fi(Option::fixPathToLocalOS((*input)));
-		    out.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName());
-		    out.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath());
+		    out.replace("${TQMAKE_FILE_BASE}", fi.baseName());
+		    out.replace("${TQMAKE_FILE_NAME}", fi.filePath());
 		    if(out.endsWith(dep))
 			return out;
 		}
 	    }
 	}
     }
-    return MakefileGenerator::tqfindDependency(dep);
+    return MakefileGenerator::findDependency(dep);
 }
 
 TQStringList
-&UnixMakefileGenerator::tqfindDependencies(const TQString &file)
+&UnixMakefileGenerator::findDependencies(const TQString &file)
 {
-    TQStringList &ret = MakefileGenerator::tqfindDependencies(file);
+    TQStringList &ret = MakefileGenerator::findDependencies(file);
     // Note: The TQMAKE_IMAGE_COLLECTION file have all images
     // as dependency, so don't add precompiled header then
     if(doPrecompiledHeaders() && !project->isEmpty("PRECOMPILED_HEADER")
@@ -521,13 +521,13 @@ TQStringList
 	header_prefix += project->first("TQMAKE_PRECOMP_PREFIX");
 	if(file.endsWith(".c")) {
 	    TQString precomp_h = header_prefix + "c";
-	    if(!ret.tqcontains(precomp_h))
+	    if(!ret.contains(precomp_h))
 		ret += precomp_h;
 	} else {
 	    for(TQStringList::Iterator it = Option::cpp_ext.begin(); it != Option::cpp_ext.end(); ++it) {
 		if(file.endsWith(*it)) {
 		    TQString precomp_h = header_prefix + "c++";
-		    if(!ret.tqcontains(precomp_h))
+		    if(!ret.contains(precomp_h))
 			ret += precomp_h;
 		    break;
 		}
@@ -538,7 +538,7 @@ TQStringList
 }
 
 bool
-UnixMakefileGenerator::tqfindLibraries()
+UnixMakefileGenerator::findLibraries()
 {
     TQPtrList<MakefileDependDir> libdirs;
     libdirs.setAutoDelete(TRUE);
@@ -551,8 +551,8 @@ UnixMakefileGenerator::tqfindLibraries()
 		if(opt.startsWith("-L")) {
 		    TQString r = opt.right(opt.length() - 2), l = r;
 		    fixEnvVariables(l);
-		    libdirs.append(new MakefileDependDir(r.tqreplace("\"",""),
-							 l.tqreplace("\"","")));
+		    libdirs.append(new MakefileDependDir(r.replace("\"",""),
+							 l.replace("\"","")));
 		} else if(opt.startsWith("-l")) {
 		    stub = opt.mid(2);
 		} else if(project->isActiveConfig("macx") && opt.startsWith("-framework")) {
@@ -569,7 +569,7 @@ UnixMakefileGenerator::tqfindLibraries()
 	    } else {
 		extn = dir = "";
 		stub = opt;
-		int slsh = opt.tqfindRev(Option::dir_sep);
+		int slsh = opt.findRev(Option::dir_sep);
 		if(slsh != -1) {
 		    dir = opt.left(slsh);
 		    stub = opt.mid(slsh+1);
@@ -657,8 +657,8 @@ UnixMakefileGenerator::processPrlFiles()
 		    if(opt.startsWith("-L")) {
 			TQString r = opt.right(opt.length() - 2), l = r;
 			fixEnvVariables(l);
-			libdirs.append(new MakefileDependDir(r.tqreplace("\"",""),
-							     l.tqreplace("\"","")));
+			libdirs.append(new MakefileDependDir(r.replace("\"",""),
+							     l.replace("\"","")));
 		    } else if(opt.startsWith("-l") && !processed[opt]) {
 			TQString lib = opt.right(opt.length() - 2);
 			for(MakefileDependDir *mdd = libdirs.first(); mdd; mdd = libdirs.next() ) {
@@ -674,7 +674,7 @@ UnixMakefileGenerator::processPrlFiles()
 			    TQString prl = mdd->local_dir + Option::dir_sep + "lib" + lib;
 			    if(processPrlFile(prl)) {
 				if(prl.startsWith(mdd->local_dir))
-				    prl.tqreplace(0, mdd->local_dir.length(), mdd->real_dir);
+				    prl.replace(0, mdd->local_dir.length(), mdd->real_dir);
 				opt = linkLib(prl, lib);
 				processed.insert(opt, (void*)1);
 				ret = TRUE;
@@ -750,7 +750,7 @@ UnixMakefileGenerator::defaultInstall(const TQString &t)
 	if(project->isActiveConfig("create_prl") && !project->isActiveConfig("no_install_prl") &&
 	   !project->isEmpty("TQMAKE_INTERNAL_PRL_FILE")) {
 	    TQString dst_prl = project->first("TQMAKE_INTERNAL_PRL_FILE");
-	    int slsh = dst_prl.tqfindRev('/');
+	    int slsh = dst_prl.findRev('/');
 	    if(slsh != -1)
 		dst_prl = dst_prl.right(dst_prl.length() - slsh - 1);
 	    dst_prl = root + targetdir + dst_prl;
@@ -761,10 +761,10 @@ UnixMakefileGenerator::defaultInstall(const TQString &t)
 	}
 	if(project->isActiveConfig("create_libtool") && !project->isActiveConfig("compile_libtool")) {
 	    TQString src_lt = var("TQMAKE_ORIG_TARGET");
-	    int slsh = src_lt.tqfindRev(Option::dir_sep);
+	    int slsh = src_lt.findRev(Option::dir_sep);
 	    if(slsh != -1)
 		src_lt = src_lt.right(src_lt.length() - slsh);
-	    int dot = src_lt.tqfind('.');
+	    int dot = src_lt.find('.');
 	    if(dot != -1)
 		src_lt = src_lt.left(dot);
 	    src_lt += Option::libtool_ext;
@@ -784,10 +784,10 @@ UnixMakefileGenerator::defaultInstall(const TQString &t)
 	}
 	if(project->isActiveConfig("create_pc")) {
 	    TQString src_pc = var("TQMAKE_ORIG_TARGET");
-	    int slsh = src_pc.tqfindRev(Option::dir_sep);
+	    int slsh = src_pc.findRev(Option::dir_sep);
 	    if(slsh != -1)
 		src_pc = src_pc.right(src_pc.length() - slsh);
-	    int dot = src_pc.tqfind('.');
+	    int dot = src_pc.find('.');
 	    if(dot != -1)
 		src_pc = src_pc.left(dot);
 	    src_pc += ".pc";
@@ -885,7 +885,7 @@ UnixMakefileGenerator::defaultInstall(const TQString &t)
 		} else if(Option::target_mode == Option::TARG_UNIX_MODE ||
 			  Option::target_mode == Option::TARG_MACX_MODE) {
 		    TQString link = Option::fixPathToTargetOS(destdir + (*it), FALSE);
-		    int lslash = link.tqfindRev(Option::dir_sep);
+		    int lslash = link.findRev(Option::dir_sep);
 		    if(lslash != -1)
 			link = link.right(link.length() - (lslash + 1));
 		    TQString dst_link = root + targetdir + link;
diff --git a/tqtinterface/qt4/qmake/generators/unix/unixmake.h b/tqtinterface/qt4/qmake/generators/unix/unixmake.h
index 3b83317..a3a76de 100644
--- a/tqtinterface/qt4/qmake/generators/unix/unixmake.h
+++ b/tqtinterface/qt4/qmake/generators/unix/unixmake.h
@@ -70,9 +70,9 @@ protected:
     virtual void processPrlVariable(const TQString &, const TQStringList &);
     virtual void processPrlFiles();
 
-    virtual bool tqfindLibraries();
-    virtual TQString tqfindDependency(const TQString &);
-    virtual TQStringList &tqfindDependencies(const TQString &);
+    virtual bool findLibraries();
+    virtual TQString findDependency(const TQString &);
+    virtual TQStringList &findDependencies(const TQString &);
     virtual void init();
 
     void writeMakeParts(TQTextStream &);
diff --git a/tqtinterface/qt4/qmake/generators/unix/unixmake2.cpp b/tqtinterface/qt4/qmake/generators/unix/unixmake2.cpp
index dc56d1e..b4a8a8b 100644
--- a/tqtinterface/qt4/qmake/generators/unix/unixmake2.cpp
+++ b/tqtinterface/qt4/qmake/generators/unix/unixmake2.cpp
@@ -221,7 +221,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
 	for(TQStringList::Iterator objit = objs.begin(); objit != objs.end(); ++objit) {
 	    bool increment = FALSE;
 	    for(TQStringList::Iterator incrit = incrs.begin(); incrit != incrs.end(); ++incrit) {
-		if((*objit).tqfind(TQRegExp((*incrit), TRUE, TRUE)) != -1) {
+		if((*objit).find(TQRegExp((*incrit), TRUE, TRUE)) != -1) {
 		    increment = TRUE;
 		    incrs_out.append((*objit));
 		    break;
@@ -254,7 +254,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
 	for(TQStringList::Iterator objit = objs.begin(); objit != objs.end(); ++objit) {
 	    bool increment = FALSE;
 	    for(TQStringList::Iterator incrit = incrs.begin(); incrit != incrs.end(); ++incrit) {
-		if((*objit).tqfind(TQRegExp((*incrit), TRUE, TRUE)) != -1) {
+		if((*objit).find(TQRegExp((*incrit), TRUE, TRUE)) != -1) {
 		    increment = TRUE;
 		    incrs_out.append((*objit));
 		    break;
@@ -371,7 +371,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
 		    }
 		    if(!d_file.isEmpty()) {
 			d_file = odir + ".deps/" + d_file + ".d";
-			TQStringList deps = tqfindDependencies((*it)).grep(TQRegExp(Option::cpp_tqmoc_ext + "$"));
+			TQStringList deps = findDependencies((*it)).grep(TQRegExp(Option::cpp_tqmoc_ext + "$"));
 			if(!deps.isEmpty())
 			    t << d_file << ": " << deps.join(" ") << endl;
 			t << var("TQMAKE_CFLAGS_USE_PRECOMPILE") << " " << d_file << endl;
@@ -399,7 +399,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
 	    TQMakeMetaInfo libinfo;
 	    if(libinfo.readLib((*it)) && !libinfo.isEmpty("TQMAKE_PRL_BUILD_DIR")) {
 		TQString dir;
-		int slsh = (*it).tqfindRev(Option::dir_sep);
+		int slsh = (*it).findRev(Option::dir_sep);
 		if(slsh != -1)
 		    dir = (*it).left(slsh + 1);
 		TQString targ = dir + libinfo.first("TQMAKE_PRL_TARGET");
@@ -416,9 +416,9 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
 	if(do_incremental) {
 	    //incremental target
 	    TQString incr_target = var("TARGET") + "_incremental";
-	    if(incr_target.tqfind(Option::dir_sep) != -1)
+	    if(incr_target.find(Option::dir_sep) != -1)
 		incr_target = incr_target.right(incr_target.length() -
-						(incr_target.tqfindRev(Option::dir_sep) + 1));
+						(incr_target.findRev(Option::dir_sep) + 1));
 	    TQString incr_deps, incr_objs;
 	    if(project->first("TQMAKE_INCREMENTAL_STYLE") == "ld") {
 		TQString incr_target_dir = var("OBJECTS_DIR") + incr_target + Option::obj_ext;
@@ -494,11 +494,11 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
 	TQString destdir = project->first("DESTDIR"), incr_deps;
 	if(do_incremental) {
 	    TQString s_ext = project->variables()["TQMAKE_EXTENSION_SHLIB"].first();
-	    TQString incr_target = TQT_TQSTRING(var("TQMAKE_ORIG_TARGET").tqreplace(
-		TQRegExp("\\." + s_ext), "")).tqreplace(TQRegExp("^lib"), "") + "_incremental";
-	    if(incr_target.tqfind(Option::dir_sep) != -1)
+	    TQString incr_target = TQT_TQSTRING(var("TQMAKE_ORIG_TARGET").replace(
+		TQRegExp("\\." + s_ext), "")).replace(TQRegExp("^lib"), "") + "_incremental";
+	    if(incr_target.find(Option::dir_sep) != -1)
 		incr_target = incr_target.right(incr_target.length() -
-						(incr_target.tqfindRev(Option::dir_sep) + 1));
+						(incr_target.findRev(Option::dir_sep) + 1));
 
 	    if(project->first("TQMAKE_INCREMENTAL_STYLE") == "ld") {
 		TQString incr_target_dir = var("OBJECTS_DIR") + incr_target + Option::obj_ext;
@@ -508,7 +508,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
 		  << "ld -r  -o " << incr_target_dir << " " << link_deps << endl;
 		//communicated below
 		TQStringList &cmd = project->variables()["TQMAKE_LINK_SHLIB_CMD"];
-		cmd.first().tqreplace("$(OBJECTS) $(OBJTQMOC)",
+		cmd.first().replace("$(OBJECTS) $(OBJTQMOC)",
 				    "$(INCREMENTAL_OBJECTS) $(INCREMENTAL_OBJTQMOC)"); //ick
 		cmd.append(incr_target_dir);
 		deps.prepend(incr_target_dir + " ");
@@ -651,7 +651,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
 		    t << var("DESTDIR") << "$(TARGET): " << var("PRE_TARGETDEPS")
 		      << " $(UICDECLS) " << var("POST_TARGETDEPS") << valList(build) << "\n\t";
 		    ar = project->variables()["TQMAKE_AR_CMD"].first();
-		    ar = TQT_TQSTRING(ar.tqreplace("$(OBJTQMOC)", "")).tqreplace("$(OBJECTS)",
+		    ar = TQT_TQSTRING(ar.replace("$(OBJTQMOC)", "")).replace("$(OBJECTS)",
 							     build.join(" "));
 		} else {
 		    t << (*libit) << ": " << valList(build) << "\n\t";
@@ -906,7 +906,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
 		outfile += header_prefix + "c++";
 		compiler = "$(CXX) ";
 	    }
-	    t << outfile << ": " << precomph << " " << tqfindDependencies(precomph).join(" \\\n\t\t")
+	    t << outfile << ": " << precomph << " " << findDependencies(precomph).join(" \\\n\t\t")
 	      << "\n\t" << "test -d " << outdir << " || mkdir -p " << outdir
 	      << "\n\t" << compiler << flags << " $(INCPATH) " << precomph << " -o " << outfile << endl << endl;
 	}
@@ -940,7 +940,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
 		dep = (*dep_it);
 	    deps += " " + dep;
 	}
-	if(project->variables()[(*it) + ".CONFIG"].tqfindIndex("phony") != -1)
+	if(project->variables()[(*it) + ".CONFIG"].findIndex("phony") != -1)
 	    deps += TQString(" ") + "FORCE";
 	t << targ << ":" << deps << "\n\t"
 	  << cmd << endl << endl;
@@ -961,17 +961,17 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
 		TQFileInfo fi(Option::fixPathToLocalOS((*input)));
 		TQString in = Option::fixPathToTargetOS((*input), FALSE),
 		       out = tmp_out, cmd = tmp_cmd, deps;
-		out.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName());
-		out.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath());
-		cmd.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName());
-		cmd.tqreplace("${TQMAKE_FILE_OUT}", out);
-		cmd.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath());
+		out.replace("${TQMAKE_FILE_BASE}", fi.baseName());
+		out.replace("${TQMAKE_FILE_NAME}", fi.filePath());
+		cmd.replace("${TQMAKE_FILE_BASE}", fi.baseName());
+		cmd.replace("${TQMAKE_FILE_OUT}", out);
+		cmd.replace("${TQMAKE_FILE_NAME}", fi.filePath());
 		for(TQStringList::Iterator it3 = vars.begin(); it3 != vars.end(); ++it3)
-		    cmd.tqreplace("$(" + (*it3) + ")", "$(TQMAKE_COMP_" + (*it3)+")");
+		    cmd.replace("$(" + (*it3) + ")", "$(TQMAKE_COMP_" + (*it3)+")");
 		if(!tmp_dep.isEmpty()) {
 		    char buff[256];
 		    TQString dep_cmd = tmp_dep;
-		    dep_cmd.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath());
+		    dep_cmd.replace("${TQMAKE_FILE_NAME}", fi.filePath());
 		    if(FILE *proc = TQT_POPEN(dep_cmd.latin1(), "r")) {
 			while(!feof(proc)) {
 			    int read_in = int(fread(buff, 1, 255, proc));
@@ -1020,7 +1020,7 @@ UnixMakefileGenerator::writeSubdirs(TQTextStream &t, bool direct)
 	    subdirs.append(sd);
 	    sd->makefile = "$(MAKEFILE)";
 	    if((*it).right(4) == ".pro") {
-		int slsh = file.tqfindRev(Option::dir_sep);
+		int slsh = file.findRev(Option::dir_sep);
 		if(slsh != -1) {
 		    sd->directory = file.left(slsh+1);
 		    sd->profile = file.mid(slsh+1);
@@ -1036,22 +1036,22 @@ UnixMakefileGenerator::writeSubdirs(TQTextStream &t, bool direct)
 		sd->directory = sd->directory.left(sd->directory.length() - 1);
 	    if(!sd->profile.isEmpty()) {
 		TQString basename = sd->directory;
-		int new_slsh = basename.tqfindRev(Option::dir_sep);
+		int new_slsh = basename.findRev(Option::dir_sep);
 		if(new_slsh != -1)
 		    basename = basename.mid(new_slsh+1);
 		if(sd->profile != basename + ".pro")
 		    sd->makefile += "." + sd->profile.left(sd->profile.length() - 4); //no need for the .pro
 	    }
 	    sd->target = "sub-" + (*it);
-	    sd->target.tqreplace('/', '-');
-	    sd->target.tqreplace('.', '_');
+	    sd->target.replace('/', '-');
+	    sd->target.replace('.', '_');
 	}
     }
     TQPtrListIterator<SubDir> it(subdirs);
 
     TQString ofile = Option::output.name();
-    if(ofile.tqfindRev(Option::dir_sep) != -1)
-	ofile = ofile.right(ofile.length() - ofile.tqfindRev(Option::dir_sep) -1);
+    if(ofile.findRev(Option::dir_sep) != -1)
+	ofile = ofile.right(ofile.length() - ofile.findRev(Option::dir_sep) -1);
     t << "MAKEFILE =	" << var("MAKEFILE") << endl;
     t << "TQMAKE    =	" << var("TQMAKE") << endl;
     t << "DEL_FILE =    " << var("TQMAKE_DEL_FILE") << endl;
@@ -1173,7 +1173,7 @@ UnixMakefileGenerator::writeSubdirs(TQTextStream &t, bool direct)
 		dep = (*dep_it);
 	    deps += " " + dep;
 	}
-	if(project->variables()[(*qut_it) + ".CONFIG"].tqfindIndex("phony") != -1)
+	if(project->variables()[(*qut_it) + ".CONFIG"].findIndex("phony") != -1)
 	    deps += TQString(" ") + "FORCE";
 	t << targ << ":" << deps << "\n";
         if(!cmd.isEmpty())
@@ -1220,7 +1220,7 @@ void UnixMakefileGenerator::init2()
 	    project->variables()["TARGET_la"] = TQT_TQSTRING(project->first("DESTDIR") + "lib" + project->first("TARGET") + Option::libtool_ext);
 
 	if ( !project->variables()["TQMAKE_AR_CMD"].isEmpty() )
-	    project->variables()["TQMAKE_AR_CMD"].first().tqreplace("(TARGET)","(TARGETA)");
+	    project->variables()["TQMAKE_AR_CMD"].first().replace("(TARGET)","(TARGETA)");
 	else
 	    project->variables()["TQMAKE_AR_CMD"].append("$(AR) $(TARGETA) $(OBJECTS) $(OBJTQMOC)");
 	if( project->isActiveConfig("compile_libtool") ) {
@@ -1396,9 +1396,9 @@ void UnixMakefileGenerator::init2()
 		TQFileInfo fi(Option::fixPathToLocalOS((*input)));
 		TQString in = Option::fixPathToTargetOS((*input), FALSE),
 		       out = tmp_out;
-		out.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName());
-		out.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath());
-		if(project->variables()[(*it) + ".CONFIG"].tqfindIndex("no_link") == -1)
+		out.replace("${TQMAKE_FILE_BASE}", fi.baseName());
+		out.replace("${TQMAKE_FILE_NAME}", fi.filePath());
+		if(project->variables()[(*it) + ".CONFIG"].findIndex("no_link") == -1)
 		    project->variables()["OBJCOMP"] += out;
 	    }
 	}
@@ -1409,10 +1409,10 @@ TQString
 UnixMakefileGenerator::libtoolFileName()
 {
     TQString ret = var("TARGET");
-    int slsh = ret.tqfindRev(Option::dir_sep);
+    int slsh = ret.findRev(Option::dir_sep);
     if(slsh != -1)
 	ret = ret.right(ret.length() - slsh);
-    int dot = ret.tqfind('.');
+    int dot = ret.find('.');
     if(dot != -1)
 	ret = ret.left(dot);
     ret += Option::libtool_ext;
@@ -1425,7 +1425,7 @@ void
 UnixMakefileGenerator::writeLibtoolFile()
 {
     TQString fname = libtoolFileName(), lname = fname;
-    int slsh = lname.tqfindRev(Option::dir_sep);
+    int slsh = lname.findRev(Option::dir_sep);
     if(slsh != -1)
 	lname = lname.right(lname.length() - slsh - 1);
     TQFile ft(fname);
@@ -1494,12 +1494,12 @@ TQString
 UnixMakefileGenerator::pkgConfigFileName()
 {
     TQString ret = var("TARGET");
-    int slsh = ret.tqfindRev(Option::dir_sep);
+    int slsh = ret.findRev(Option::dir_sep);
     if(slsh != -1)
 	ret = ret.right(ret.length() - slsh);
     if(ret.startsWith("lib"))
 	ret = ret.mid(3);
-    int dot = ret.tqfind('.');
+    int dot = ret.find('.');
     if(dot != -1)
 	ret = ret.left(dot);
     ret += Option::pkgcfg_ext;
@@ -1545,7 +1545,7 @@ UnixMakefileGenerator::pkgConfigFixPath(TQString path) const
 {
     TQString prefix = pkgConfigPrefix();
     if(path.startsWith(prefix))
-	path = path.tqreplace(prefix, "${prefix}");
+	path = path.replace(prefix, "${prefix}");
     return path;
 }
 
@@ -1553,7 +1553,7 @@ void
 UnixMakefileGenerator::writePkgConfigFile()     // ### does make sense only for libtqt so far
 {
     TQString fname = pkgConfigFileName(), lname = fname;
-    int slsh = lname.tqfindRev(Option::dir_sep);
+    int slsh = lname.findRev(Option::dir_sep);
     if(slsh != -1)
 	lname = lname.right(lname.length() - slsh - 1);
     TQFile ft(fname);
@@ -1588,7 +1588,7 @@ UnixMakefileGenerator::writePkgConfigFile()     // ### does make sense only for
     TQString desc = project->first("TQMAKE_PKGCONFIG_DESCRIPTION");
     if(desc.isEmpty()) {
 	desc = project->first("TARGET").lower();
-	desc.tqreplace(0, 1, TQT_TQCHAR(desc[0]).upper());
+	desc.replace(0, 1, TQT_TQCHAR(desc[0]).upper());
 	if(project->first("TEMPLATE") == "lib") {
 	    if(project->isActiveConfig("plugin"))
 	       desc += " Plugin";
@@ -1632,7 +1632,7 @@ void
 UnixMakefileGenerator::writeTMOCFile()
 {
     TQString fname = TMOCFileName(), lname = fname;
-    int slsh = lname.tqfindRev(Option::dir_sep);
+    int slsh = lname.findRev(Option::dir_sep);
     if(slsh != -1)
 	lname = lname.right(lname.length() - slsh - 1);
     TQFile ft(fname);
@@ -1672,7 +1672,7 @@ void
 UnixMakefileGenerator::writeTMOCFile2()
 {
     TQString fname = TMOCFileName2(), lname = fname;
-    int slsh = lname.tqfindRev(Option::dir_sep);
+    int slsh = lname.findRev(Option::dir_sep);
     if(slsh != -1)
 	lname = lname.right(lname.length() - slsh - 1);
     TQFile ft(fname);
diff --git a/tqtinterface/qt4/qmake/generators/win32/borland_bmake.cpp b/tqtinterface/qt4/qmake/generators/win32/borland_bmake.cpp
index 640afdd..31ab882 100644
--- a/tqtinterface/qt4/qmake/generators/win32/borland_bmake.cpp
+++ b/tqtinterface/qt4/qmake/generators/win32/borland_bmake.cpp
@@ -97,8 +97,8 @@ BorlandMakefileGenerator::writeBorlandParts(TQTextStream &t)
     TQStringList &incs = project->variables()["INCLUDEPATH"];
     for(TQStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) {
 	TQString inc = (*incit);
-	inc.tqreplace(TQRegExp("\\\\*$"), "");
-	inc.tqreplace("\"", "");
+	inc.replace(TQRegExp("\\\\*$"), "");
+	inc.replace("\"", "");
 	t << " -I\"" << inc << "\"";
     }
     t << " -I\"" << specdir() << "\""
@@ -296,7 +296,7 @@ BorlandMakefileGenerator::writeBorlandParts(TQTextStream &t)
 	    deps += " " + dep;
 	}
 	if(!project->variables()["TQMAKE_NOFORCE"].isEmpty() &&
-	   project->variables()[(*it) + ".CONFIG"].tqfindIndex("phony") != -1)
+	   project->variables()[(*it) + ".CONFIG"].findIndex("phony") != -1)
 	    deps += TQString(" ") + "FORCE";
 	t << "\n\n" << targ << ":" << deps << "\n\t"
 	  << cmd;
@@ -319,17 +319,17 @@ BorlandMakefileGenerator::writeBorlandParts(TQTextStream &t)
 		TQFileInfo fi(Option::fixPathToLocalOS((*input)));
 		TQString in = Option::fixPathToTargetOS((*input), FALSE),
 		       out = tmp_out, cmd = tmp_cmd, deps;
-		out.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName());
-		out.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath());
-		cmd.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName());
-		cmd.tqreplace("${TQMAKE_FILE_OUT}", out);
-		cmd.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath());
+		out.replace("${TQMAKE_FILE_BASE}", fi.baseName());
+		out.replace("${TQMAKE_FILE_NAME}", fi.filePath());
+		cmd.replace("${TQMAKE_FILE_BASE}", fi.baseName());
+		cmd.replace("${TQMAKE_FILE_OUT}", out);
+		cmd.replace("${TQMAKE_FILE_NAME}", fi.filePath());
 		for(TQStringList::Iterator it3 = vars.begin(); it3 != vars.end(); ++it3)
-		    cmd.tqreplace("$(" + (*it3) + ")", "$(TQMAKE_COMP_" + (*it3)+")");
+		    cmd.replace("$(" + (*it3) + ")", "$(TQMAKE_COMP_" + (*it3)+")");
 		if(!tmp_dep.isEmpty()) {
 		    char buff[256];
 		    TQString dep_cmd = tmp_dep;
-		    dep_cmd.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath());
+		    dep_cmd.replace("${TQMAKE_FILE_NAME}", fi.filePath());
 		    if(FILE *proc = TQT_POPEN(dep_cmd.latin1(), "r")) {
 			while(!feof(proc)) {
 			    int read_in = int(fread(buff, 1, 255, proc));
@@ -391,11 +391,11 @@ BorlandMakefileGenerator::init()
     if (project->isActiveConfig("shared"))
 	project->variables()["DEFINES"].append("TQT_DLL");
     if (project->isActiveConfig("qt_dll"))
-	if(configs.tqfindIndex("qt") == -1) configs.append("qt");
+	if(configs.findIndex("qt") == -1) configs.append("qt");
     if ( project->isActiveConfig("qtopia") ) {
-	if(configs.tqfindIndex("qtopialib") == -1)
+	if(configs.findIndex("qtopialib") == -1)
 	    configs.append("qtopialib");
-	if(configs.tqfindIndex("qtopiainc") == -1)
+	if(configs.findIndex("qtopiainc") == -1)
 	    configs.append("qtopiainc");
     }
     if ( project->isActiveConfig("qt") ) {
@@ -403,9 +403,9 @@ BorlandMakefileGenerator::init()
 	    project->variables()["CONFIG"].append("dll");
 	    project->variables()["DEFINES"].append("TQT_PLUGIN");
 	}
-	if ( (project->variables()["DEFINES"].tqfindIndex("TQT_NODLL") == -1) &&
-	     ((project->variables()["DEFINES"].tqfindIndex("TQT_MAKEDLL") != -1 ||
-	       project->variables()["DEFINES"].tqfindIndex("TQT_DLL") != -1) ||
+	if ( (project->variables()["DEFINES"].findIndex("TQT_NODLL") == -1) &&
+	     ((project->variables()["DEFINES"].findIndex("TQT_MAKEDLL") != -1 ||
+	       project->variables()["DEFINES"].findIndex("TQT_DLL") != -1) ||
 	      (getenv("TQT_DLL") && !getenv("TQT_NODLL"))) ) {
 	    project->variables()["TQMAKE_TQT_DLL"].append("1");
 	    if ( is_qt && !project->variables()["TQMAKE_LIB_FLAG"].isEmpty() )
@@ -492,15 +492,15 @@ BorlandMakefileGenerator::init()
 	    else
 		project->variables()["TQMAKE_LIBS"] += project->variables()["TQMAKE_LIBS_QT"];
 	    if ( !project->variables()["TQMAKE_TQT_DLL"].isEmpty() ) {
-		int hver = tqfindHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt");
+		int hver = findHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt");
 		if ( hver == -1 )
-		    hver = tqfindHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qtmt");
+		    hver = findHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qtmt");
 		if(hver != -1) {
 		    TQString ver;
 		    ver.sprintf("qt%s" TQTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "mt" : ""), hver);
 		    TQStringList &libs = project->variables()["TQMAKE_LIBS"];
 		    for(TQStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit)
-			(*libit).tqreplace(TQRegExp("qt(mt)?\\.lib"), ver);
+			(*libit).replace(TQRegExp("qt(mt)?\\.lib"), ver);
 		}
 	    }
 	    if ( project->isActiveConfig( "activeqt" ) ) {
@@ -618,7 +618,7 @@ BorlandMakefileGenerator::init()
 	    exit(666);
 	}
 	project->variables()["RES_FILE"] = project->variables()["RC_FILE"];
-	project->variables()["RES_FILE"].first().tqreplace(".rc",".res");
+	project->variables()["RES_FILE"].first().replace(".rc",".res");
 	project->variables()["POST_TARGETDEPS"] += project->variables()["RES_FILE"];
 	project->variables()["CLEAN_FILES"] += project->variables()["RES_FILE"];
     }
@@ -654,9 +654,9 @@ BorlandMakefileGenerator::init()
 		TQFileInfo fi(Option::fixPathToLocalOS((*input)));
 		TQString in = Option::fixPathToTargetOS((*input), FALSE),
 		    out = tmp_out;
-		out.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName());
-		out.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath());
-		if(project->variables()[(*it) + ".CONFIG"].tqfindIndex("no_link") == -1)
+		out.replace("${TQMAKE_FILE_BASE}", fi.baseName());
+		out.replace("${TQMAKE_FILE_NAME}", fi.filePath());
+		if(project->variables()[(*it) + ".CONFIG"].findIndex("no_link") == -1)
 		    project->variables()["OBJCOMP"] += out;
 	    }
 	}
diff --git a/tqtinterface/qt4/qmake/generators/win32/mingw_make.cpp b/tqtinterface/qt4/qmake/generators/win32/mingw_make.cpp
index c4f8736..4053e5d 100644
--- a/tqtinterface/qt4/qmake/generators/win32/mingw_make.cpp
+++ b/tqtinterface/qt4/qmake/generators/win32/mingw_make.cpp
@@ -50,7 +50,7 @@ MingwMakefileGenerator::MingwMakefileGenerator(TQMakeProject *p) : Win32Makefile
 }
 
 bool
-MingwMakefileGenerator::tqfindLibraries() // todo - pascal
+MingwMakefileGenerator::findLibraries() // todo - pascal
 {
     return TRUE;
 }
@@ -119,8 +119,8 @@ MingwMakefileGenerator::writeMingwParts(TQTextStream &t)
     TQStringList &incs = project->variables()["INCLUDEPATH"];
     for(TQStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) {
 	TQString inc = (*incit);
-	inc.tqreplace(TQRegExp("\\\\$"), "");
-	inc.tqreplace(TQRegExp("\""), "");
+	inc.replace(TQRegExp("\\\\$"), "");
+	inc.replace(TQRegExp("\""), "");
 	t << " -I" << "\"" << inc << "\"";
     }
     t << " -I" << "\"" << specdir()  << "\"" << endl;
@@ -130,7 +130,7 @@ MingwMakefileGenerator::writeMingwParts(TQTextStream &t)
 	t << "LIBS	=	";
 	if ( !project->variables()["TQMAKE_LIBDIR"].isEmpty() )
 	    t << varGlue("TQMAKE_LIBDIR","-L\"","\" -L\"","\"") << " ";
-	t << var("TQMAKE_LIBS").tqreplace(TQRegExp("(\\slib|^lib)")," -l") << endl;
+	t << var("TQMAKE_LIBS").replace(TQRegExp("(\\slib|^lib)")," -l") << endl;
     }
     else {
 	t << "LIB	=	" << var("TQMAKE_LIB") << endl;
@@ -160,11 +160,11 @@ MingwMakefileGenerator::writeMingwParts(TQTextStream &t)
 
     t << "####### Output directory" << endl << endl;
     if (! project->variables()["OBJECTS_DIR"].isEmpty())
-	t << "OBJECTS_DIR = " << var("OBJECTS_DIR").tqreplace(TQRegExp("\\\\$"),"") << endl;
+	t << "OBJECTS_DIR = " << var("OBJECTS_DIR").replace(TQRegExp("\\\\$"),"") << endl;
     else
 	t << "OBJECTS_DIR = . " << endl;
     if (! project->variables()["TQMOC_DIR"].isEmpty())
-	t << "TQMOC_DIR = " << var("TQMOC_DIR").tqreplace(TQRegExp("\\\\$"),"") << endl;
+	t << "TQMOC_DIR = " << var("TQMOC_DIR").replace(TQRegExp("\\\\$"),"") << endl;
     else
 	t << "TQMOC_DIR = . " << endl;
     t << endl;
@@ -264,9 +264,9 @@ MingwMakefileGenerator::writeMingwParts(TQTextStream &t)
 
     if(!project->variables()["RC_FILE"].isEmpty()) {
 	t << var("RES_FILE") << ": " << var("RC_FILE") << "\n\t"
-	  << var("TQMAKE_RC") << " -i " << var("RC_FILE") << " -o " << var("RC_FILE").tqreplace(TQRegExp("\\.rc"),".o") << " --include-dir=" << TQFileInfo(var("RC_FILE")).dirPath() << endl << endl;
+	  << var("TQMAKE_RC") << " -i " << var("RC_FILE") << " -o " << var("RC_FILE").replace(TQRegExp("\\.rc"),".o") << " --include-dir=" << TQFileInfo(var("RC_FILE")).dirPath() << endl << endl;
     }
-	project->variables()["RES_FILE"].first().tqreplace(TQRegExp("\\.rc"),".o");
+	project->variables()["RES_FILE"].first().replace(TQRegExp("\\.rc"),".o");
 
     t << "tqmocables: $(SRCTQMOC)" << endl << endl;
 
@@ -283,9 +283,9 @@ MingwMakefileGenerator::writeMingwParts(TQTextStream &t)
       << var("PROJECT") << ".pro $(SOURCES) $(HEADERS) $(DIST) $(FORMS)" << endl << endl;
 
     t << "clean:"
-      << varGlue("OBJECTS","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","").tqreplace(TQRegExp("\\.obj"),".o")
+      << varGlue("OBJECTS","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","").replace(TQRegExp("\\.obj"),".o")
       << varGlue("SRCTQMOC" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","")
-      << varGlue("OBJTQMOC" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","").tqreplace(TQRegExp("\\.obj"),".o")
+      << varGlue("OBJTQMOC" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","").replace(TQRegExp("\\.obj"),".o")
       << varGlue("UICDECLS" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","")
       << varGlue("UICIMPLS" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","")
       << "\n\t-$(DEL_FILE) $(TARGET)"
@@ -335,17 +335,17 @@ MingwMakefileGenerator::writeMingwParts(TQTextStream &t)
 		TQFileInfo fi(Option::fixPathToLocalOS((*input)));
 		TQString in = Option::fixPathToTargetOS((*input), FALSE),
 		       out = tmp_out, cmd = tmp_cmd, deps;
-		out.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName());
-		out.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath());
-		cmd.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName());
-		cmd.tqreplace("${TQMAKE_FILE_OUT}", out);
-		cmd.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath());
+		out.replace("${TQMAKE_FILE_BASE}", fi.baseName());
+		out.replace("${TQMAKE_FILE_NAME}", fi.filePath());
+		cmd.replace("${TQMAKE_FILE_BASE}", fi.baseName());
+		cmd.replace("${TQMAKE_FILE_OUT}", out);
+		cmd.replace("${TQMAKE_FILE_NAME}", fi.filePath());
 		for(TQStringList::Iterator it3 = vars.begin(); it3 != vars.end(); ++it3)
-		    cmd.tqreplace("$(" + (*it3) + ")", "$(TQMAKE_COMP_" + (*it3)+")");
+		    cmd.replace("$(" + (*it3) + ")", "$(TQMAKE_COMP_" + (*it3)+")");
 		if(!tmp_dep.isEmpty()) {
 		    char buff[256];
 		    TQString dep_cmd = tmp_dep;
-		    dep_cmd.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath());
+		    dep_cmd.replace("${TQMAKE_FILE_NAME}", fi.filePath());
 		    if(FILE *proc = TQT_POPEN(dep_cmd.latin1(), "r")) {
 			while(!feof(proc)) {
 			    int read_in = int(fread(buff, 1, 255, proc));
@@ -410,7 +410,7 @@ MingwMakefileGenerator::init()
 	project->variables()["DEFINES"].append("TQT_DLL");
 
     if (project->isActiveConfig("qt_dll"))
-	if (configs.tqfindIndex("qt") == -1)
+	if (configs.findIndex("qt") == -1)
 	    configs.append("qt");
 
     if ( project->isActiveConfig("qt") ) {
@@ -419,9 +419,9 @@ MingwMakefileGenerator::init()
 	    if(project->isActiveConfig("qt"))
 		project->variables()["DEFINES"].append("TQT_PLUGIN");
 	}
-	if ( (project->variables()["DEFINES"].tqfindIndex("TQT_NODLL") == -1) &&
-         ((project->variables()["DEFINES"].tqfindIndex("TQT_MAKEDLL") != -1 ||
-           project->variables()["DEFINES"].tqfindIndex("TQT_DLL") != -1) ||
+	if ( (project->variables()["DEFINES"].findIndex("TQT_NODLL") == -1) &&
+         ((project->variables()["DEFINES"].findIndex("TQT_MAKEDLL") != -1 ||
+           project->variables()["DEFINES"].findIndex("TQT_DLL") != -1) ||
           (getenv("TQT_DLL") && !getenv("TQT_NODLL"))) ) {
 	    project->variables()["TQMAKE_TQT_DLL"].append("1");
 	    if ( is_qt && !project->variables()["TQMAKE_LIB_FLAG"].isEmpty() )
@@ -457,7 +457,7 @@ MingwMakefileGenerator::init()
     if ( project->isActiveConfig("debug") ) {
         if ( project->isActiveConfig("thread") ) {
 	    // use the DLL RT even here
-	    if ( project->variables()["DEFINES"].tqcontains("TQT_DLL") ) {
+	    if ( project->variables()["DEFINES"].contains("TQT_DLL") ) {
 		project->variables()["TQMAKE_CFLAGS"] += project->variables()["TQMAKE_CFLAGS_MT_DLLDBG"];
 		project->variables()["TQMAKE_CXXFLAGS"] += project->variables()["TQMAKE_CXXFLAGS_MT_DLLDBG"];
 	    } else {
@@ -470,7 +470,7 @@ MingwMakefileGenerator::init()
 	project->variables()["TQMAKE_LFLAGS"] += project->variables()["TQMAKE_LFLAGS_DEBUG"];
     } else {
 	if ( project->isActiveConfig("thread") ) {
-	    if ( project->variables()["DEFINES"].tqcontains("TQT_DLL") ) {
+	    if ( project->variables()["DEFINES"].contains("TQT_DLL") ) {
 		project->variables()["TQMAKE_CFLAGS"] += project->variables()["TQMAKE_CFLAGS_MT_DLL"];
 		project->variables()["TQMAKE_CXXFLAGS"] += project->variables()["TQMAKE_CXXFLAGS_MT_DLL"];
 	    } else {
@@ -507,16 +507,16 @@ MingwMakefileGenerator::init()
 	    else
 		project->variables()["TQMAKE_LIBS"] += project->variables()["TQMAKE_LIBS_QT"];
 	    if ( !project->variables()["TQMAKE_TQT_DLL"].isEmpty() ) {
-		int hver = tqfindHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt");
+		int hver = findHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt");
 		if ( hver == -1 )
-		    hver = tqfindHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt-mt");
+		    hver = findHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt-mt");
 		if(hver != -1) {
 		    TQString ver;
 		    ver.sprintf("-lqt%s" TQTDLL_POSTFIX "%d", (project->isActiveConfig("thread") ? "-mt" : ""), hver);
 		    TQStringList &libs = project->variables()["TQMAKE_LIBS"];
-// @@@HGTODO maybe we must change the tqreplace regexp if we understand what's going on
+// @@@HGTODO maybe we must change the replace regexp if we understand what's going on
 		    for(TQStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit)
-			(*libit).tqreplace(TQRegExp("-lqt(-mt)?"), ver);
+			(*libit).replace(TQRegExp("-lqt(-mt)?"), ver);
 		}
 	    }
 	    if ( project->isActiveConfig( "activeqt" ) ) {
@@ -641,10 +641,10 @@ MingwMakefileGenerator::init()
 #if 0
     if ( !project->variables()["VERSION"].isEmpty() ) {
 	TQString version = project->variables()["VERSION"][0];
-	int firstDot = version.tqfind( "." );
+	int firstDot = version.find( "." );
 	TQString major = version.left( firstDot );
 	TQString minor = version.right( version.length() - firstDot - 1 );
-	minor.tqreplace( ".", "" );
+	minor.replace( ".", "" );
 	project->variables()["TQMAKE_LFLAGS"].append( "/VERSION:" + major + "." + minor );
     }
 #endif
@@ -656,7 +656,7 @@ MingwMakefileGenerator::init()
 	    exit(666);
 	}
 	project->variables()["RES_FILE"] = project->variables()["RC_FILE"];
-	project->variables()["RES_FILE"].first().tqreplace(".rc",".o");
+	project->variables()["RES_FILE"].first().replace(".rc",".o");
 	project->variables()["POST_TARGETDEPS"] += project->variables()["RES_FILE"];
 	project->variables()["CLEAN_FILES"] += project->variables()["RES_FILE"];
     }
@@ -688,9 +688,9 @@ MingwMakefileGenerator::init()
 		TQFileInfo fi(Option::fixPathToLocalOS((*input)));
 		TQString in = Option::fixPathToTargetOS((*input), FALSE),
 		       out = tmp_out;
-		out.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName());
-		out.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath());
-		if(project->variables()[(*it) + ".CONFIG"].tqfindIndex("no_link") == -1)
+		out.replace("${TQMAKE_FILE_BASE}", fi.baseName());
+		out.replace("${TQMAKE_FILE_NAME}", fi.filePath());
+		if(project->variables()[(*it) + ".CONFIG"].findIndex("no_link") == -1)
 		    project->variables()["OBJCOMP"] += out;
 	    }
 	}
@@ -709,8 +709,8 @@ MingwMakefileGenerator::writeSubDirs(TQTextStream &t)
     while ( -1 != (pos = rx.search( qs, pos)))
     {
 	TQString qsMatch = rx.cap(2);
-	qsMatch.tqreplace("\n\t"," && \\\n\t");
-	qs.tqreplace(pos+rx.cap(1).length(), rx.cap(2).length(), qsMatch );
+	qsMatch.replace("\n\t"," && \\\n\t");
+	qs.replace(pos+rx.cap(1).length(), rx.cap(2).length(), qsMatch );
 	pos += (rx.cap(1).length()+qsMatch.length());
     }
     t << qs ;
diff --git a/tqtinterface/qt4/qmake/generators/win32/mingw_make.h b/tqtinterface/qt4/qmake/generators/win32/mingw_make.h
index 5d437fb..db5a580 100644
--- a/tqtinterface/qt4/qmake/generators/win32/mingw_make.h
+++ b/tqtinterface/qt4/qmake/generators/win32/mingw_make.h
@@ -50,7 +50,7 @@ class MingwMakefileGenerator : public Win32MakefileGenerator
     bool writeMakefile(TQTextStream &);
     void init();
     
-    virtual bool tqfindLibraries();
+    virtual bool findLibraries();
 
 public:
     MingwMakefileGenerator(TQMakeProject *p);
diff --git a/tqtinterface/qt4/qmake/generators/win32/msvc_dsp.cpp b/tqtinterface/qt4/qmake/generators/win32/msvc_dsp.cpp
index e50c136..52fa2af 100644
--- a/tqtinterface/qt4/qmake/generators/win32/msvc_dsp.cpp
+++ b/tqtinterface/qt4/qmake/generators/win32/msvc_dsp.cpp
@@ -81,7 +81,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
     }
     if (dspfile.startsWith("\"") && dspfile.endsWith("\""))
 	dspfile = dspfile.mid(1, dspfile.length() - 2);
-    TQString dspfile_loc = tqfindTemplate(dspfile);
+    TQString dspfile_loc = findTemplate(dspfile);
 
     TQFile file(dspfile_loc);
     if(!file.open(IO_ReadOnly)) {
@@ -101,11 +101,11 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
     if (usePCH) {
 	// Created files
 	TQString origTarget = project->first("TQMAKE_ORIG_TARGET");
-	origTarget.tqreplace(TQRegExp("-"), "_");
+	origTarget.replace(TQRegExp("-"), "_");
 	precompObj = "\"$(IntDir)\\" + origTarget + Option::obj_ext + "\"";
 	precompPch = "\"$(IntDir)\\" + origTarget + ".pch\"";
 	// Add PRECOMPILED_HEADER to HEADERS
-	if (!project->variables()["HEADERS"].tqcontains(precompH))
+	if (!project->variables()["HEADERS"].contains(precompH))
 	    project->variables()["HEADERS"] += precompH;
 	// Add precompile compiler options
 	project->variables()["PRECOMPILED_FLAGS_REL"]  = TQString("/Yu\"" + namePCH + "\" /FI\"" + namePCH + "\" ");
@@ -118,8 +118,8 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
     TQString line;
     while ( !dsp.eof() ) {
 	line = dsp.readLine();
-	while((rep = line.tqfind(TQRegExp("\\$\\$[a-zA-Z0-9_-]*"))) != -1) {
-	    TQString torep = line.mid(rep, line.tqfind(TQRegExp("[^\\$a-zA-Z0-9_-]"), rep) - rep);
+	while((rep = line.find(TQRegExp("\\$\\$[a-zA-Z0-9_-]*"))) != -1) {
+	    TQString torep = line.mid(rep, line.find(TQRegExp("[^\\$a-zA-Z0-9_-]"), rep) - rep);
 	    TQString variable = torep.right(torep.length()-2);
 
 	    t << line.left(rep); //output the left side
@@ -129,7 +129,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
 		    continue;
 
 		TQString tqmocpath = var( "TQMAKE_TQMOC" );
-		tqmocpath = tqmocpath.tqreplace( TQRegExp( "\\..*$" ), "" ) + " ";
+		tqmocpath = tqmocpath.replace( TQRegExp( "\\..*$" ), "" ) + " ";
 
 		TQStringList list = project->variables()["SOURCES"] + project->variables()["DEF_FILE"];
 		if(!project->isActiveConfig("flat"))
@@ -142,16 +142,16 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
 			t << "# SUBTRACT CPP /FI\"" << namePCH << "\" /Yu\"" << namePCH << "\" /Fp" << endl;
 		    if ( project->isActiveConfig("tqmoc") && (*it).endsWith(Option::cpp_tqmoc_ext)) {
 			TQString base = (*it);
-			TQT_TQSTRING(base.tqreplace(TQRegExp("\\..*$"), "")).upper();
-			base.tqreplace(TQRegExp("[^a-zA-Z]"), "_");
+			TQT_TQSTRING(base.replace(TQRegExp("\\..*$"), "")).upper();
+			base.replace(TQRegExp("[^a-zA-Z]"), "_");
 
-			TQString build = "\n\n# Begin Custom Build - Moc'ing " + tqfindMocSource((*it)) +
+			TQString build = "\n\n# Begin Custom Build - Moc'ing " + findMocSource((*it)) +
 					"...\n" "InputPath=.\\" + (*it) + "\n\n" "\"" + (*it) + "\""
 					" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n"
-					"\t" + tqmocpath + tqfindMocSource((*it)) + " -o " +
+					"\t" + tqmocpath + findMocSource((*it)) + " -o " +
 					(*it) + "\n\n" "# End Custom Build\n\n";
 
-			t << "USERDEP_" << base << "=\".\\" << tqfindMocSource((*it)) << "\" \"$(TQTDIR)\\bin\\tqmoc.exe\"" << endl << endl;
+			t << "USERDEP_" << base << "=\".\\" << findMocSource((*it)) << "\" \"$(TQTDIR)\\bin\\tqmoc.exe\"" << endl << endl;
 
 			t << "!IF  \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Release\"" << build
 			  << "!ELSEIF  \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Debug\""
@@ -183,8 +183,8 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
 		    // Create unique baseID
 		    TQString base = (*it);
 		    {
-			TQT_TQSTRING(base.tqreplace(TQRegExp("\\..*$"), "")).upper();
-			base.tqreplace(TQRegExp("[^a-zA-Z]"), "_");
+			TQT_TQSTRING(base.replace(TQRegExp("\\..*$"), "")).upper();
+			base.replace(TQRegExp("[^a-zA-Z]"), "_");
 		    }
 		    if (usePCH && precompH.endsWith(*it)) {
 			TQString basicBuildCmd = TQString("\tcl.exe /TP /W3 /FD /c /D \"WIN32\" /Yc /Fp\"%1\" /Fo\"%2\" %3 %4 %5 %6 %7 %8 %9 /D \"")
@@ -218,15 +218,15 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
 
 			compilePCH = precompPch + " : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n   $(BuildCmds)\n\n";
 
-			TQStringList &tmp = tqfindDependencies(precompH);
+			TQStringList &tmp = findDependencies(precompH);
 			if(!tmp.isEmpty()) // Got Deps for PCH
 			    customDependencies += tmp;
 		    }
-		    if (project->isActiveConfig("tqmoc") && !tqfindMocDestination((*it)).isEmpty()) {
+		    if (project->isActiveConfig("tqmoc") && !findMocDestination((*it)).isEmpty()) {
 			TQString tqmocpath = var( "TQMAKE_TQMOC" );
-			tqmocpath = tqmocpath.tqreplace( TQRegExp( "\\..*$" ), "" ) + " ";
-			buildCmds += "\t" + tqmocpath + (*it)  + " -o " + tqfindMocDestination((*it)) + " \\\n";
-			createTQMOC  = "\"" + tqfindMocDestination((*it)) +	"\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n   $(BuildCmds)\n\n";
+			tqmocpath = tqmocpath.replace( TQRegExp( "\\..*$" ), "" ) + " ";
+			buildCmds += "\t" + tqmocpath + (*it)  + " -o " + findMocDestination((*it)) + " \\\n";
+			createTQMOC  = "\"" + findMocDestination((*it)) +	"\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n   $(BuildCmds)\n\n";
 			customDependencies += "\"$(TQTDIR)\\bin\\tqmoc.exe\"";
 		    }
 		    if (!createTQMOC.isEmpty() || !compilePCH.isEmpty()) {
@@ -276,11 +276,11 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
 		TQString ext = variable == "MSVCDSP_FORMSOURCES" ? ".cpp" : ".h";
 		for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) {
 		    TQString base = (*it);
-		    int dot = base.tqfindRev(".");
-  		    base.tqreplace( dot, base.length() - dot, ext );
+		    int dot = base.findRev(".");
+  		    base.replace( dot, base.length() - dot, ext );
 		    TQString fname = base;
 
-		    int lbs = fname.tqfindRev( "\\" );
+		    int lbs = fname.findRev( "\\" );
 		    TQString fpath;
 		    if ( lbs != -1 )
 			fpath = fname.left( lbs + 1 );
@@ -309,10 +309,10 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
 		    list.sort();
 		for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) {
 		    TQString sify = *it;
-		    sify.tqreplace('/', '\\' );
+		    sify.replace('/', '\\' );
 		    TQString base = (*it);
-		    TQT_TQSTRING(base.tqreplace(TQRegExp("\\..*$"), "")).upper();
-		    base.tqreplace(TQRegExp("[^a-zA-Z]"), "_");
+		    TQT_TQSTRING(base.replace(TQRegExp("\\..*$"), "")).upper();
+		    base.replace(TQRegExp("[^a-zA-Z]"), "_");
 
 //		    beginGroupForFile(sify, t);
 		    t << "# Begin Source File\n\nSOURCE=" << sify << endl;
@@ -325,7 +325,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
 		    continue;
 
 		TQString tqmocpath = var( "TQMAKE_TQMOC" );
-		tqmocpath = tqmocpath.tqreplace( TQRegExp( "\\..*$" ), "" ) + " ";
+		tqmocpath = tqmocpath.replace( TQRegExp( "\\..*$" ), "" ) + " ";
 
 		TQStringList list = project->variables()["SRCTQMOC"];
 		if(!project->isActiveConfig("flat"))
@@ -335,16 +335,16 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
 		    t << "# Begin Source File\n\nSOURCE=" << (*it) << endl;
 		    if ( project->isActiveConfig("tqmoc") && (*it).endsWith(Option::cpp_tqmoc_ext)) {
 			TQString base = (*it);
-			TQT_TQSTRING(base.tqreplace(TQRegExp("\\..*$"), "")).upper();
-			base.tqreplace(TQRegExp("[^a-zA-Z]"), "_");
+			TQT_TQSTRING(base.replace(TQRegExp("\\..*$"), "")).upper();
+			base.replace(TQRegExp("[^a-zA-Z]"), "_");
 
-			TQString build = "\n\n# Begin Custom Build - Moc'ing " + tqfindMocSource((*it)) +
+			TQString build = "\n\n# Begin Custom Build - Moc'ing " + findMocSource((*it)) +
 					"...\n" "InputPath=.\\" + (*it) + "\n\n" "\"" + (*it) + "\""
 					" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n"
-					"\t" + tqmocpath + tqfindMocSource((*it)) + " -o " +
+					"\t" + tqmocpath + findMocSource((*it)) + " -o " +
 					(*it) + "\n\n" "# End Custom Build\n\n";
 
-			t << "USERDEP_" << base << "=\".\\" << tqfindMocSource((*it)) << "\" \"$(TQTDIR)\\bin\\tqmoc.exe\"" << endl << endl;
+			t << "USERDEP_" << base << "=\".\\" << findMocSource((*it)) << "\" \"$(TQTDIR)\\bin\\tqmoc.exe\"" << endl << endl;
 
 			t << "!IF  \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Release\"" << build
 			  << "!ELSEIF  \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Debug\""
@@ -381,7 +381,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
 
 		    TQString base = (*it);
 		    TQString uicpath = var("TQMAKE_UIC");
-		    uicpath = uicpath.tqreplace(TQRegExp("\\..*$"), "") + " ";
+		    uicpath = uicpath.replace(TQRegExp("\\..*$"), "") + " ";
 
 		    if ( !imagesBuildDone ) {
 			imagesBuildDone = TRUE;
@@ -420,9 +420,9 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
 		  << "# Prop Default_Filter \"ui\"\n";
 
 		TQString uicpath = var("TQMAKE_UIC");
-		uicpath = uicpath.tqreplace(TQRegExp("\\..*$"), "") + " ";
+		uicpath = uicpath.replace(TQRegExp("\\..*$"), "") + " ";
 		TQString tqmocpath = var( "TQMAKE_TQMOC" );
-		tqmocpath = tqmocpath.tqreplace( TQRegExp( "\\..*$" ), "" ) + " ";
+		tqmocpath = tqmocpath.replace( TQRegExp( "\\..*$" ), "" ) + " ";
 
 		TQStringList list = project->variables()["FORMS"];
 		if(!project->isActiveConfig("flat"))
@@ -433,8 +433,8 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
 		    t <<  "# Begin Source File\n\nSOURCE=" << base << endl;
 
 		    TQString fname = base;
-		    fname.tqreplace(".ui", "");
-		    int lbs = fname.tqfindRev( "\\" );
+		    fname.replace(".ui", "");
+		    int lbs = fname.findRev( "\\" );
 		    TQString fpath;
 		    if ( lbs != -1 )
 			fpath = fname.left( lbs + 1 );
@@ -502,7 +502,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
 		    TQString fname = (*it);
 //		    beginGroupForFile(fname, t);
 		    t <<  "# Begin Source File\n\nSOURCE=" << fname << endl;
-		    fname.tqreplace(".l", Option::lex_mod + Option::cpp_ext.first());
+		    fname.replace(".l", Option::lex_mod + Option::cpp_ext.first());
 
 		    TQString build = "\n\n# Begin Custom Build - Lex'ing " + (*it) + "...\n"
 			"InputPath=.\\" + (*it) + "\n\n"
@@ -535,7 +535,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
 		    TQString fname = (*it);
 //		    beginGroupForFile(fname, t);
 		    t <<  "# Begin Source File\n\nSOURCE=" << fname << endl;
-		    fname.tqreplace(".y", Option::yacc_mod);
+		    fname.replace(".y", Option::yacc_mod);
 
 		    TQString build = "\n\n# Begin Custom Build - Yacc'ing " + (*it) + "...\n"
 			"InputPath=.\\" + (*it) + "\n\n"
@@ -630,11 +630,11 @@ DspMakefileGenerator::init()
     if (project->isActiveConfig("shared"))
 	project->variables()["DEFINES"].append("TQT_DLL");
     if (project->isActiveConfig("qt_dll"))
-	if(configs.tqfindIndex("qt") == -1) configs.append("qt");
+	if(configs.findIndex("qt") == -1) configs.append("qt");
     if ( project->isActiveConfig("qtopia") ) {
-	if(configs.tqfindIndex("qtopialib") == -1)
+	if(configs.findIndex("qtopialib") == -1)
 	    configs.append("qtopialib");
-	if(configs.tqfindIndex("qtopiainc") == -1)
+	if(configs.findIndex("qtopiainc") == -1)
 	    configs.append("qtopiainc");
     }
     if ( project->isActiveConfig("qt") ) {
@@ -642,9 +642,9 @@ DspMakefileGenerator::init()
 	    project->variables()["CONFIG"].append("dll");
 	    project->variables()["DEFINES"].append("TQT_PLUGIN");
 	}
-	if ( (project->variables()["DEFINES"].tqfindIndex("TQT_NODLL") == -1) &&
-	     ((project->variables()["DEFINES"].tqfindIndex("TQT_MAKEDLL") != -1 ||
-	       project->variables()["DEFINES"].tqfindIndex("TQT_DLL") != -1) ||
+	if ( (project->variables()["DEFINES"].findIndex("TQT_NODLL") == -1) &&
+	     ((project->variables()["DEFINES"].findIndex("TQT_MAKEDLL") != -1 ||
+	       project->variables()["DEFINES"].findIndex("TQT_DLL") != -1) ||
 	      (getenv("TQT_DLL") && !getenv("TQT_NODLL"))) ) {
 	    project->variables()["TQMAKE_TQT_DLL"].append("1");
 	    if ( is_qt && !project->variables()["TQMAKE_LIB_FLAG"].isEmpty() )
@@ -663,10 +663,10 @@ DspMakefileGenerator::init()
     }
     if ( !project->variables()["VERSION"].isEmpty() ) {
 	TQString version = project->variables()["VERSION"][0];
-	int firstDot = version.tqfind( "." );
+	int firstDot = version.find( "." );
 	TQString major = version.left( firstDot );
 	TQString minor = version.right( version.length() - firstDot - 1 );
-	minor.tqreplace( ".", "" );
+	minor.replace( ".", "" );
 	project->variables()["MSVCDSP_VERSION"].append( "/VERSION:" + major + "." + minor );
     }
 
@@ -694,15 +694,15 @@ DspMakefileGenerator::init()
 	    else
 		project->variables()["TQMAKE_LIBS"] += project->variables()["TQMAKE_LIBS_QT"];
 	    if ( !project->variables()["TQMAKE_TQT_DLL"].isEmpty() ) {
-		int hver = tqfindHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt");
+		int hver = findHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt");
 		if ( hver == -1 )
-		    hver = tqfindHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt-mt");
+		    hver = findHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt-mt");
 		if(hver != -1) {
 		    TQString ver;
 		    ver.sprintf("qt%s" TQTDLL_POSTFIX "%d.lib", (thread ? "-mt" : ""), hver);
 		    TQStringList &libs = project->variables()["TQMAKE_LIBS"];
 		    for(TQStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit)
-			(*libit).tqreplace(TQRegExp("qt(-mt)?\\.lib"), ver);
+			(*libit).replace(TQRegExp("qt(-mt)?\\.lib"), ver);
 		}
 	    }
 	    if ( project->isActiveConfig( "activeqt" ) ) {
@@ -757,7 +757,7 @@ DspMakefileGenerator::init()
 	    project->variables()["MSVCDSP_MTDEFD"] += project->variables()["TQMAKE_CXXFLAGS_MT_DBG"];
 	    project->variables()["MSVCDSP_MTDEF"] += project->variables()["TQMAKE_CXXFLAGS_MT"];
 	}
-	if ( !project->variables()["DEFINES"].tqcontains("TQT_DLL") && is_qt
+	if ( !project->variables()["DEFINES"].contains("TQT_DLL") && is_qt
 	     && project->first("TARGET") != "qtmain" )
 	    project->variables()["TQMAKE_LFLAGS"].append("/NODEFAULTLIB:\"libc\"");
     }
@@ -775,7 +775,7 @@ DspMakefileGenerator::init()
 	project->variables()["TQMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["TQMAKE_LFLAGS_WINDOWS_DLL"];
 	if ( !project->variables()["TQMAKE_LIB_FLAG"].isEmpty() ) {
 	    TQString ver_xyz(project->first("VERSION"));
-	    ver_xyz.tqreplace(".", "");
+	    ver_xyz.replace(".", "");
 	    project->variables()["TARGET_EXT"].append(ver_xyz + ".dll");
 	} else {
 	    project->variables()["TARGET_EXT"].append(".dll");
@@ -840,15 +840,15 @@ DspMakefileGenerator::init()
     if ( msvcdsp_project.isEmpty() )
 	msvcdsp_project = Option::output.name();
 
-    msvcdsp_project = msvcdsp_project.right( msvcdsp_project.length() - msvcdsp_project.tqfindRev( "\\" ) - 1 );
-    msvcdsp_project = msvcdsp_project.left( msvcdsp_project.tqfindRev( "." ) );
-    msvcdsp_project.tqreplace("-", "");
+    msvcdsp_project = msvcdsp_project.right( msvcdsp_project.length() - msvcdsp_project.findRev( "\\" ) - 1 );
+    msvcdsp_project = msvcdsp_project.left( msvcdsp_project.findRev( "." ) );
+    msvcdsp_project.replace("-", "");
 
     project->variables()["MSVCDSP_PROJECT"].append(msvcdsp_project);
     TQStringList &proj = project->variables()["MSVCDSP_PROJECT"];
 
     for(it = proj.begin(); it != proj.end(); ++it)
-	(*it).tqreplace(TQRegExp("\\.[a-zA-Z0-9_]*$"), "");
+	(*it).replace(TQRegExp("\\.[a-zA-Z0-9_]*$"), "");
 
     if ( !project->variables()["TQMAKE_APP_FLAG"].isEmpty() ) {
 	project->variables()["MSVCDSP_TEMPLATE"].append("win32app" + project->first( "DSP_EXTENSION" ) );
@@ -901,14 +901,14 @@ DspMakefileGenerator::init()
     TQStringList &libs = project->variables()["TQMAKE_LIBS"];
     for(TQStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) {
 	TQString lib = (*libit);
-	lib.tqreplace(TQRegExp("\""), "");
+	lib.replace(TQRegExp("\""), "");
 	project->variables()["MSVCDSP_LIBS"].append(" \"" + lib + "\"");
     }
 
     TQStringList &incs = project->variables()["INCLUDEPATH"];
     for(TQStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) {
 	TQString inc = (*incit);
-	inc.tqreplace("\"", "");
+	inc.replace("\"", "");
 	if(inc.endsWith("\\")) // Remove trailing \'s from paths
 	    inc.truncate(inc.length()-1);
 	if (inc.startsWith("\"") && inc.endsWith("\""))
@@ -941,12 +941,12 @@ DspMakefileGenerator::init()
 	Option::fixPathToTargetOS(project->first("TARGET"));
 	dest = project->first("TARGET");
         if ( project->first("TARGET").startsWith("$(TQTDIR)") )
-	    dest.tqreplace( "$(TQTDIR)", getenv("TQTDIR") );
+	    dest.replace( "$(TQTDIR)", getenv("TQTDIR") );
 	project->variables()["MSVCDSP_TARGET"].append(
 	    TQString("/out:\"") + dest + "\"");
 	if ( project->isActiveConfig("dll") ) {
 	    TQString imp = dest;
-	    imp.tqreplace(".dll", ".lib");
+	    imp.replace(".dll", ".lib");
 	    project->variables()["MSVCDSP_TARGET"].append(TQString(" /implib:\"") + imp + "\"");
 	}
     }
@@ -1028,7 +1028,7 @@ DspMakefileGenerator::init()
 
 
 TQString
-DspMakefileGenerator::tqfindTemplate(const TQString &file)
+DspMakefileGenerator::findTemplate(const TQString &file)
 {
     TQString ret;
     if(!TQFile::exists((ret = file)) &&
@@ -1046,7 +1046,7 @@ DspMakefileGenerator::processPrlVariable(const TQString &var, const TQStringList
     if(var == "TQMAKE_PRL_DEFINES") {
 	TQStringList &out = project->variables()["MSVCDSP_DEFINES"];
 	for(TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it) {
-	    if(out.tqfindIndex((*it)) == -1)
+	    if(out.findIndex((*it)) == -1)
 		out.append((" /D \"" + *it + "\""));
 	}
     } else {
@@ -1076,11 +1076,11 @@ DspMakefileGenerator::beginGroupForFile(TQString file, TQTextStream &t,
     TQString tempFile = file;
     if(tempFile.startsWith(currentGroup))
 	tempFile = tempFile.mid(currentGroup.length());
-    int dirSep = currentGroup.tqfindRev( Option::dir_sep );
+    int dirSep = currentGroup.findRev( Option::dir_sep );
 
     while( !tempFile.startsWith( currentGroup ) && dirSep != -1 ) {
 	currentGroup.truncate( dirSep );
-	dirSep = currentGroup.tqfindRev( Option::dir_sep );
+	dirSep = currentGroup.findRev( Option::dir_sep );
 	if ( !tempFile.startsWith( currentGroup ) && dirSep != -1 )
 	    t << "\n# End Group\n";
     }
@@ -1129,14 +1129,14 @@ DspMakefileGenerator::openOutput(TQFile &file) const
     if(TQDir::isRelativePath(file.name())) {
 	TQString ofile;
 	ofile = file.name();
-	int slashtqfind = ofile.tqfindRev('\\');
-	if (slashtqfind == -1) {
-	    ofile = ofile.tqreplace(TQRegExp("-"), "_");
+	int slashfind = ofile.findRev('\\');
+	if (slashfind == -1) {
+	    ofile = ofile.replace(TQRegExp("-"), "_");
 	} else {
-	    int hypentqfind = ofile.tqfind('-', slashtqfind);
-	    while (hypentqfind != -1 && slashtqfind < hypentqfind) {
-		ofile = ofile.tqreplace(hypentqfind, 1, "_");
-		hypentqfind = ofile.tqfind('-', hypentqfind + 1);
+	    int hypenfind = ofile.find('-', slashfind);
+	    while (hypenfind != -1 && slashfind < hypenfind) {
+		ofile = ofile.replace(hypenfind, 1, "_");
+		hypenfind = ofile.find('-', hypenfind + 1);
 	    }
 	}
 	file.setName(Option::fixPathToLocalOS(TQDir::currentDirPath() + Option::dir_sep + ofile));
diff --git a/tqtinterface/qt4/qmake/generators/win32/msvc_dsp.h b/tqtinterface/qt4/qmake/generators/win32/msvc_dsp.h
index fb1afb2..f35798d 100644
--- a/tqtinterface/qt4/qmake/generators/win32/msvc_dsp.h
+++ b/tqtinterface/qt4/qmake/generators/win32/msvc_dsp.h
@@ -52,7 +52,7 @@ class DspMakefileGenerator : public Win32MakefileGenerator
     bool writeDspParts(TQTextStream &);
 
     bool writeMakefile(TQTextStream &);
-    TQString tqfindTemplate(const TQString &file);
+    TQString findTemplate(const TQString &file);
     void init();
 
 public:
@@ -63,7 +63,7 @@ public:
 
 protected:
     virtual void processPrlVariable(const TQString &, const TQStringList &);
-    virtual bool tqfindLibraries();
+    virtual bool findLibraries();
 
     TQString precompH, 
 	    precompObj, precompPch;
@@ -73,7 +73,7 @@ protected:
 inline DspMakefileGenerator::~DspMakefileGenerator()
 { }
 
-inline bool DspMakefileGenerator::tqfindLibraries()
-{ return Win32MakefileGenerator::tqfindLibraries("MSVCDSP_LIBS"); }
+inline bool DspMakefileGenerator::findLibraries()
+{ return Win32MakefileGenerator::findLibraries("MSVCDSP_LIBS"); }
 
 #endif /* __MSVC_DSP_H__ */
diff --git a/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.cpp b/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.cpp
index 6add6e7..ef12545 100644
--- a/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.cpp
+++ b/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.cpp
@@ -80,16 +80,16 @@ NmakeMakefileGenerator::writeMakefile(TQTextStream &t)
 }
 
 TQStringList
-&NmakeMakefileGenerator::tqfindDependencies(const TQString &file)
+&NmakeMakefileGenerator::findDependencies(const TQString &file)
 {
-    TQStringList &aList = MakefileGenerator::tqfindDependencies(file);
+    TQStringList &aList = MakefileGenerator::findDependencies(file);
     // Note: The TQMAKE_IMAGE_COLLECTION file have all images
     // as dependency, so don't add precompiled header then
     if (file == project->first("TQMAKE_IMAGE_COLLECTION"))
 	return aList;
     for(TQStringList::Iterator it = Option::cpp_ext.begin(); it != Option::cpp_ext.end(); ++it) {
 	if(file.endsWith(*it)) {
-            if(!precompObj.isEmpty() && !aList.tqcontains(precompObj))
+            if(!precompObj.isEmpty() && !aList.contains(precompObj))
                 aList += precompObj;
 	    break;
 	}
@@ -229,7 +229,7 @@ NmakeMakefileGenerator::writeNmakeParts(TQTextStream &t)
 	    TQStringList &l = project->variables()[srcs[x]];
 	    for(TQStringList::Iterator sit = l.begin(); sit != l.end(); ++sit) {
 		TQString sep = "\\";
-		if((*sit).tqfind(sep) == -1)
+		if((*sit).find(sep) == -1)
 		    sep = "/";
 		TQString dir = (*sit).section(sep, 0, -2);
 		if(!dir.isEmpty() && !source_directories[dir])
@@ -242,9 +242,9 @@ NmakeMakefileGenerator::writeNmakeParts(TQTextStream &t)
 		continue;
 	    for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit)
 		t << "{" << it.currentKey() << "}" << (*cppit) << "{" << var("OBJECTS_DIR") << "}" << Option::obj_ext << "::\n\t"
-		  << var("TQMAKE_RUN_CXX_IMP_BATCH").tqreplace( TQRegExp( "\\$@" ), var("OBJECTS_DIR") ) << endl << "\t$<" << endl << "<<" << endl << endl;
+		  << var("TQMAKE_RUN_CXX_IMP_BATCH").replace( TQRegExp( "\\$@" ), var("OBJECTS_DIR") ) << endl << "\t$<" << endl << "<<" << endl << endl;
 	    t << "{" << it.currentKey() << "}" << ".c{" << var("OBJECTS_DIR") << "}" << Option::obj_ext << "::\n\t"
-	      << var("TQMAKE_RUN_CC_IMP_BATCH").tqreplace( TQRegExp( "\\$@" ), var("OBJECTS_DIR") ) << endl << "\t$<" << endl << "<<" << endl << endl;
+	      << var("TQMAKE_RUN_CC_IMP_BATCH").replace( TQRegExp( "\\$@" ), var("OBJECTS_DIR") ) << endl << "\t$<" << endl << "<<" << endl << endl;
 	}
     } else {
 	for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit)
@@ -357,7 +357,7 @@ NmakeMakefileGenerator::writeNmakeParts(TQTextStream &t)
 	    deps += " " + dep;
 	}
 	if(!project->variables()["TQMAKE_NOFORCE"].isEmpty() &&
-	   project->variables()[(*it) + ".CONFIG"].tqfindIndex("phony") != -1)
+	   project->variables()[(*it) + ".CONFIG"].findIndex("phony") != -1)
 	    deps += TQString(" ") + "FORCE";
 	t << "\n\n" << targ << ":" << deps << "\n\t"
 	  << cmd;
@@ -379,17 +379,17 @@ NmakeMakefileGenerator::writeNmakeParts(TQTextStream &t)
 		TQFileInfo fi(Option::fixPathToLocalOS((*input)));
 		TQString in = Option::fixPathToTargetOS((*input), FALSE),
 		       out = tmp_out, cmd = tmp_cmd, deps;
-		out.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName());
-		out.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath());
-		cmd.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName());
-		cmd.tqreplace("${TQMAKE_FILE_OUT}", out);
-		cmd.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath());
+		out.replace("${TQMAKE_FILE_BASE}", fi.baseName());
+		out.replace("${TQMAKE_FILE_NAME}", fi.filePath());
+		cmd.replace("${TQMAKE_FILE_BASE}", fi.baseName());
+		cmd.replace("${TQMAKE_FILE_OUT}", out);
+		cmd.replace("${TQMAKE_FILE_NAME}", fi.filePath());
 		for(TQStringList::Iterator it3 = vars.begin(); it3 != vars.end(); ++it3)
-		    cmd.tqreplace("$(" + (*it3) + ")", "$(TQMAKE_COMP_" + (*it3)+")");
+		    cmd.replace("$(" + (*it3) + ")", "$(TQMAKE_COMP_" + (*it3)+")");
 		if(!tmp_dep.isEmpty()) {
 		    char buff[256];
 		    TQString dep_cmd = tmp_dep;
-		    dep_cmd.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath());
+		    dep_cmd.replace("${TQMAKE_FILE_NAME}", fi.filePath());
 		    if(FILE *proc = TQT_POPEN(dep_cmd.latin1(), "r")) {
 			while(!feof(proc)) {
 			    int read_in = int(fread(buff, 1, 255, proc));
@@ -423,7 +423,7 @@ NmakeMakefileGenerator::writeNmakeParts(TQTextStream &t)
     // precompiled header
     if(usePCH) {
 	TQString precompRule = TQString("-c -Yc -Fp%1 -Fo%2").arg(precompPch).arg(precompObj);
-	t << precompObj << ": " << precompH << " " << tqfindDependencies(precompH).join(" \\\n\t\t")
+	t << precompObj << ": " << precompH << " " << findDependencies(precompH).join(" \\\n\t\t")
 	  << "\n\t" << ("$(CXX) " + precompRule + " $(CXXFLAGS) $(INCPATH) -TP ") << precompH << endl << endl;
     }
 }
@@ -441,7 +441,7 @@ NmakeMakefileGenerator::var(const TQString &value)
 		.arg(precompHInfo.fileName())
 		.arg(precompPch);
 	    TQString p = MakefileGenerator::var(value);
-	    p.tqreplace("-c", precompRule);
+	    p.replace("-c", precompRule);
 	    // Cannot use -Gm with -FI & -Yu, as this gives an
 	    // internal compiler error, on the newer compilers
 	    p.remove("-Gm");
@@ -490,11 +490,11 @@ NmakeMakefileGenerator::init()
     if (project->isActiveConfig("qt") && project->isActiveConfig("shared"))
 	project->variables()["DEFINES"].append("TQT_DLL");
     if (project->isActiveConfig("qt_dll"))
-	if(configs.tqfindIndex("qt") == -1) configs.append("qt");
+	if(configs.findIndex("qt") == -1) configs.append("qt");
     if ( project->isActiveConfig("qtopia") ) {
-	if(configs.tqfindIndex("qtopialib") == -1)
+	if(configs.findIndex("qtopialib") == -1)
 	    configs.append("qtopialib");
-	if(configs.tqfindIndex("qtopiainc") == -1)
+	if(configs.findIndex("qtopiainc") == -1)
 	    configs.append("qtopiainc");
     }
     if ( project->isActiveConfig("qt") ) {
@@ -503,9 +503,9 @@ NmakeMakefileGenerator::init()
 	    if(project->isActiveConfig("qt"))
 		project->variables()["DEFINES"].append("TQT_PLUGIN");
 	}
-	if ( (project->variables()["DEFINES"].tqfindIndex("TQT_NODLL") == -1) &&
-         ((project->variables()["DEFINES"].tqfindIndex("TQT_MAKEDLL") != -1 ||
-           project->variables()["DEFINES"].tqfindIndex("TQT_DLL") != -1) ||
+	if ( (project->variables()["DEFINES"].findIndex("TQT_NODLL") == -1) &&
+         ((project->variables()["DEFINES"].findIndex("TQT_MAKEDLL") != -1 ||
+           project->variables()["DEFINES"].findIndex("TQT_DLL") != -1) ||
           (getenv("TQT_DLL") && !getenv("TQT_NODLL"))) ) {
 	    project->variables()["TQMAKE_TQT_DLL"].append("1");
 	    if ( is_qt && !project->variables()["TQMAKE_LIB_FLAG"].isEmpty() )
@@ -534,7 +534,7 @@ NmakeMakefileGenerator::init()
     if ( project->isActiveConfig("debug") ) {
         if ( project->isActiveConfig("thread") ) {
 	    // use the DLL RT even here
-	    if ( project->variables()["DEFINES"].tqcontains("TQT_DLL") ) {
+	    if ( project->variables()["DEFINES"].contains("TQT_DLL") ) {
 		project->variables()["TQMAKE_CFLAGS"] += project->variables()["TQMAKE_CFLAGS_MT_DLLDBG"];
 		project->variables()["TQMAKE_CXXFLAGS"] += project->variables()["TQMAKE_CXXFLAGS_MT_DLLDBG"];
 	    } else {
@@ -547,7 +547,7 @@ NmakeMakefileGenerator::init()
 	project->variables()["TQMAKE_LFLAGS"] += project->variables()["TQMAKE_LFLAGS_DEBUG"];
     } else {
 	if ( project->isActiveConfig("thread") ) {
-	    if ( project->variables()["DEFINES"].tqcontains("TQT_DLL") ) {
+	    if ( project->variables()["DEFINES"].contains("TQT_DLL") ) {
 		project->variables()["TQMAKE_CFLAGS"] += project->variables()["TQMAKE_CFLAGS_MT_DLL"];
 		project->variables()["TQMAKE_CXXFLAGS"] += project->variables()["TQMAKE_CXXFLAGS_MT_DLL"];
 	    } else {
@@ -559,7 +559,7 @@ NmakeMakefileGenerator::init()
 	project->variables()["TQMAKE_CXXFLAGS"] += project->variables()["TQMAKE_CXXFLAGS_RELEASE"];
 	project->variables()["TQMAKE_LFLAGS"] += project->variables()["TQMAKE_LFLAGS_RELEASE"];
     }
-    if ( project->isActiveConfig("thread") && !project->variables()["DEFINES"].tqcontains("TQT_DLL")
+    if ( project->isActiveConfig("thread") && !project->variables()["DEFINES"].contains("TQT_DLL")
 	&& !is_qt && project->first("TARGET") != "qtmain") {
 	project->variables()["TQMAKE_LFLAGS"].append("/NODEFAULTLIB:\"libc\"");
     }
@@ -592,15 +592,15 @@ NmakeMakefileGenerator::init()
 	    else
 		project->variables()["TQMAKE_LIBS"] += project->variables()["TQMAKE_LIBS_QT"];
 	    if ( !project->variables()["TQMAKE_TQT_DLL"].isEmpty() ) {
-		int hver = tqfindHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt");
+		int hver = findHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt");
 		if ( hver == -1 )
-		    hver = tqfindHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt-mt");
+		    hver = findHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt-mt");
 		if(hver != -1) {
 		    TQString ver;
 		    ver.sprintf("qt%s" TQTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "-mt" : ""), hver);
 		    TQStringList &libs = project->variables()["TQMAKE_LIBS"];
 		    for(TQStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit)
-			(*libit).tqreplace(TQRegExp("qt(-mt)?\\.lib"), ver);
+			(*libit).replace(TQRegExp("qt(-mt)?\\.lib"), ver);
 		}
 	    }
 	    if ( project->isActiveConfig( "activeqt" ) ) {
@@ -714,10 +714,10 @@ NmakeMakefileGenerator::init()
 
     if ( !project->variables()["VERSION"].isEmpty() ) {
 	TQString version = project->variables()["VERSION"][0];
-	int firstDot = version.tqfind( "." );
+	int firstDot = version.find( "." );
 	TQString major = version.left( firstDot );
 	TQString minor = version.right( version.length() - firstDot - 1 );
-	minor.tqreplace( ".", "" );
+	minor.replace( ".", "" );
 	project->variables()["TQMAKE_LFLAGS"].append( "/VERSION:" + major + "." + minor );
     }
     if ( !project->variables()["RC_FILE"].isEmpty()) {
@@ -727,7 +727,7 @@ NmakeMakefileGenerator::init()
 	    exit(666);
 	}
 	project->variables()["RES_FILE"] = project->variables()["RC_FILE"];
-	project->variables()["RES_FILE"].first().tqreplace(".rc",".res");
+	project->variables()["RES_FILE"].first().replace(".rc",".res");
 	project->variables()["POST_TARGETDEPS"] += project->variables()["RES_FILE"];
 	project->variables()["CLEAN_FILES"] += project->variables()["RES_FILE"];
     }
@@ -782,9 +782,9 @@ NmakeMakefileGenerator::init()
 		TQFileInfo fi(Option::fixPathToLocalOS((*input)));
 		TQString in = Option::fixPathToTargetOS((*input), FALSE),
 		       out = tmp_out;
-		out.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName());
-		out.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath());
-		if(project->variables()[(*it) + ".CONFIG"].tqfindIndex("no_link") == -1)
+		out.replace("${TQMAKE_FILE_BASE}", fi.baseName());
+		out.replace("${TQMAKE_FILE_NAME}", fi.filePath());
+		if(project->variables()[(*it) + ".CONFIG"].findIndex("no_link") == -1)
 		    project->variables()["OBJCOMP"] += out;
 	    }
 	}
diff --git a/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.h b/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.h
index 858f92c..adc29a0 100644
--- a/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.h
+++ b/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.h
@@ -50,7 +50,7 @@ class NmakeMakefileGenerator : public Win32MakefileGenerator
     void init();
 
 protected:
-    TQStringList &tqfindDependencies(const TQString &file);
+    TQStringList &findDependencies(const TQString &file);
     TQString var(const TQString &value);
     TQString precompH, precompObj, precompPch;
     bool usePCH;
diff --git a/tqtinterface/qt4/qmake/generators/win32/msvc_objectmodel.cpp b/tqtinterface/qt4/qmake/generators/win32/msvc_objectmodel.cpp
index cedcb01..b114ced 100644
--- a/tqtinterface/qt4/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/tqtinterface/qt4/qmake/generators/win32/msvc_objectmodel.cpp
@@ -317,7 +317,7 @@ TQTextStream &operator<<( TQTextStream &strm, const XPair &prop )
 {
     if ( !prop.value.isEmpty() ) {
         TQString outText = prop.value.join(prop.sep);
-        strm << prop.name << outText.tqreplace('\"', "&quot;") << "\"";
+        strm << prop.name << outText.replace('\"', "&quot;") << "\"";
     }
     return strm;
 }
@@ -1883,7 +1883,7 @@ VCFilter::VCFilter()
 
 void VCFilter::addTQMOCstage( TQTextStream & /*strm*/, TQString filename )
 {
-    TQString tqmocOutput = Project->tqfindMocDestination( filename );
+    TQString tqmocOutput = Project->findMocDestination( filename );
     TQString tqmocApp = Project->var( "TQMAKE_TQMOC" );
 
     bool inputMoc = false;
@@ -1891,7 +1891,7 @@ void VCFilter::addTQMOCstage( TQTextStream & /*strm*/, TQString filename )
         // In specialcases we DO tqmoc .cpp files
 	// when the result is an .tqmoc file
 	tqmocOutput = filename;
-	filename = Project->tqfindMocSource( tqmocOutput );
+	filename = Project->findMocSource( tqmocOutput );
         inputMoc = true;
     }
 
@@ -1923,7 +1923,7 @@ void VCFilter::addUICstage( TQTextStream & /*strm*/, TQString str )
     TQString uiSources;
 
     // Determining the paths for the output files.
-    int slash = str.tqfindRev( '\\' );
+    int slash = str.findRev( '\\' );
     TQString pname = ( slash != -1 ) ? str.left( slash+1 ) : TQString( ".\\" );
     if( !uiDir.isEmpty() ) {
 	uiHeaders = uiDir;
@@ -1942,7 +1942,7 @@ void VCFilter::addUICstage( TQTextStream & /*strm*/, TQString str )
 	uiSources += "\\";
 
     // Determine the file name.
-    int dot = fname.tqfindRev( '.' );
+    int dot = fname.findRev( '.' );
     if( dot != -1 )
 	fname.truncate( dot );
 
@@ -2035,9 +2035,9 @@ bool VCFilter::addIMGstage( TQTextStream &/*strm*/, TQString str )
 	+ " -f .imgcol -o " + collectionName;
 
     // The loop below is to avoid the resulting CommandLine buffer
-    // from being a size of between 2071-#char_tqreplaced and 2102,
+    // from being a size of between 2071-#char_replaced and 2102,
     // as this triggers a buffer overflow bug in VS2003. As we only
-    // the only tqreplacement we use in this buffer is one $(TQTDIR),
+    // the only replacement we use in this buffer is one $(TQTDIR),
     // we assume this can be upto 256 characters long, making the
     // lower-bound to be 1814 characters. So, if the buffer is
     // between 1814 and 2103 bytes, the buffer is "padded" til it's
diff --git a/tqtinterface/qt4/qmake/generators/win32/msvc_vcproj.cpp b/tqtinterface/qt4/qmake/generators/win32/msvc_vcproj.cpp
index 5e80188..f646962 100644
--- a/tqtinterface/qt4/qmake/generators/win32/msvc_vcproj.cpp
+++ b/tqtinterface/qt4/qmake/generators/win32/msvc_vcproj.cpp
@@ -109,7 +109,7 @@ DotNET which_dotnet_version()
 	        continue;
         TQStringList::iterator it;
         for(it = pathlist.begin(); it != pathlist.end(); ++it) {
-            if((*it).tqcontains(productPath)) {
+            if((*it).contains(productPath)) {
                 ++installed;
                 current_version = dotNetCombo[i].version;
                 warnPath += TQString("%1 in path").arg(dotNetCombo[i].versionStr);
@@ -142,7 +142,7 @@ const char* _slnHeader80        = "Microsoft Visual Studio Solution File, Format
 				  // The following UUID _may_ change for later servicepacks...
 				  // If so we need to search through the registry at
 				  // HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\7.0\Projects
-				  // to tqfind the subkey that tqcontains a "PossibleProjectExtension"
+				  // to find the subkey that contains a "PossibleProjectExtension"
 				  // containing "vcproj"...
 				  // Use the hardcoded value for now so projects generated on other
 				  // platforms are actually usable.
@@ -233,7 +233,7 @@ TQUuid VcprojGenerator::getProjectUUID(const TQString &filename)
     if (uuid.isNull() || !validUUID) {
 	uuid = TQUuid::createUuid();
 	fprintf(stderr,
-	        "qmake couldn't create a GUID based on filepath, and we couldn't\ntqfind a valid GUID in the .pro file (Consider adding\n'GUID = %s'  to the .pro file)\n",
+	        "qmake couldn't create a GUID based on filepath, and we couldn't\nfind a valid GUID in the .pro file (Consider adding\n'GUID = %s'  to the .pro file)\n",
 		uuid.toString().upper().latin1());
     }
 
@@ -519,7 +519,7 @@ void VcprojGenerator::init()
 	precompObj = origTarget + Option::obj_ext;
 	precompPch = origTarget + ".pch";
 	// Add PRECOMPILED_HEADER to HEADERS
-	if (!project->variables()["HEADERS"].tqcontains(precompH))
+	if (!project->variables()["HEADERS"].contains(precompH))
 	    project->variables()["HEADERS"] += precompH;
 	// Return to variable pool
 	project->variables()["PRECOMPILED_OBJECT"] = precompObj;
@@ -645,10 +645,10 @@ void VcprojGenerator::initConfiguration()
 	RConf.linker.parseOptions(project->variables()["TQMAKE_LFLAGS_RELEASE"]);
 	RConf.compiler.parseOptions(project->variables()["TQMAKE_CFLAGS_RELEASE"]);
 	RConf.compiler.parseOptions(project->variables()["TQMAKE_CXXFLAGS_RELEASE"]);
-        if (!project->variables()["TQMAKE_CXXFLAGS_RELEASE"].tqcontains("Gm")
-            && project->variables()["TQMAKE_CXXFLAGS_DEBUG"].tqcontains("Gm"))
+        if (!project->variables()["TQMAKE_CXXFLAGS_RELEASE"].contains("Gm")
+            && project->variables()["TQMAKE_CXXFLAGS_DEBUG"].contains("Gm"))
             RConf.compiler.parseOption("-Gm-");
-        if (RConf.compiler.PreprocessorDefinitions.tqfindIndex("TQT_NO_DEBUG") == -1)
+        if (RConf.compiler.PreprocessorDefinitions.findIndex("TQT_NO_DEBUG") == -1)
             RConf.compiler.PreprocessorDefinitions += "TQT_NO_DEBUG";
     } else {
 	DConf.IntermediateDirectory =
@@ -733,7 +733,7 @@ void VcprojGenerator::initCompilerTool()
     for(it=RConf.compiler.PreprocessorDefinitions.begin();
 	it!=RConf.compiler.PreprocessorDefinitions.end();
 	++it)
-	(*it).tqreplace('\"', "&quot;");
+	(*it).replace('\"', "&quot;");
 
     RConf.compiler.parseOptions( project->variables()["MSVCPROJ_INCPATH"] );
 }
@@ -741,7 +741,7 @@ void VcprojGenerator::initCompilerTool()
 void VcprojGenerator::initLibrarianTool()
 {
     VCConfiguration &RConf = vcProject.Configuration[0];
-    RConf.librarian.OutputFile = project->first( "DESTDIR" ).tqreplace("&", "&amp;");
+    RConf.librarian.OutputFile = project->first( "DESTDIR" ).replace("&", "&amp;");
     if( RConf.librarian.OutputFile.isEmpty() )
 	RConf.librarian.OutputFile = ".\\";
 
@@ -813,8 +813,8 @@ void VcprojGenerator::initPostBuildEventTools()
     if ( !project->variables()["TQMAKE_POST_LINK"].isEmpty() ) {
 	RConf.postBuild.Description = var("TQMAKE_POST_LINK");
 	RConf.postBuild.CommandLine = var("TQMAKE_POST_LINK");
-	RConf.postBuild.Description.tqreplace(" && ", " &amp;&amp; ");
-	RConf.postBuild.CommandLine.tqreplace(" && ", " &amp;&amp; ");
+	RConf.postBuild.Description.replace(" && ", " &amp;&amp; ");
+	RConf.postBuild.CommandLine.replace(" && ", " &amp;&amp; ");
     }
     if ( !project->variables()["MSVCPROJ_COPY_DLL"].isEmpty() ) {
 	if ( !RConf.postBuild.CommandLine.isEmpty() )
@@ -838,7 +838,7 @@ void VcprojGenerator::initPostBuildEventTools()
 		idc + " &quot;$(TargetPath)&quot; -idl " + objdir + name + ".idl -version 1.0 &amp;&amp; " +
 		// call midl to create implementations of the .idl file
 		project->first( "TQMAKE_IDL" ) + " /nologo " + objdir + name + ".idl /tlb " + objdir + name + ".tlb &amp;&amp; " +
-		// call idc to tqreplace tlb...
+		// call idc to replace tlb...
 		idc + " &quot;$(TargetPath)&quot; /tlb " + objdir + name + ".tlb &amp;&amp; " +
 		// register server
 		idc + " &quot;$(TargetPath)&quot; /regserver";
@@ -848,7 +848,7 @@ void VcprojGenerator::initPostBuildEventTools()
 		"&quot;$(TargetPath)&quot; -dumpidl " + objdir + name + ".idl -version 1.0 &amp;&amp; " +
 		// call midl to create implementations of the .idl file
 		project->first( "TQMAKE_IDL" ) + " /nologo " + objdir + name + ".idl /tlb " + objdir + name + ".tlb &amp;&amp; " +
-		// call idc to tqreplace tlb...
+		// call idc to replace tlb...
 		idc + " &quot;$(TargetPath)&quot; /tlb " + objdir + name + ".tlb &amp;&amp; " +
 		// call app to register
 		"&quot;$(TargetPath)&quot; -regserver";
@@ -867,8 +867,8 @@ void VcprojGenerator::initPreLinkEventTools()
 inline bool XLessThanY( TQString &x, TQString &y, bool flat_mode )
 {
     if ( flat_mode ) {
-	TQString subX = x.mid( x.tqfindRev('\\')+1 );
-	TQString subY = y.mid( y.tqfindRev('\\')+1 );
+	TQString subX = x.mid( x.findRev('\\')+1 );
+	TQString subY = y.mid( y.findRev('\\')+1 );
 	return TQString::compare(subX, subY) < 0;
     }
 
@@ -877,8 +877,8 @@ inline bool XLessThanY( TQString &x, TQString &y, bool flat_mode )
     int xSlashPos;
     int ySlashPos;
     for (;;) {
-	xSlashPos = x.tqfind('\\', xPos);
-	ySlashPos = y.tqfind('\\', yPos);
+	xSlashPos = x.find('\\', xPos);
+	ySlashPos = y.find('\\', yPos);
 
 	if (xSlashPos == -1 && ySlashPos != -1) {
 	    return FALSE;
@@ -954,7 +954,7 @@ void VcprojGenerator::initHeaderFiles()
     vcProject.HeaderFiles.Filter = "h;hpp;hxx;hm;inl";
     vcProject.HeaderFiles.Files += project->variables()["HEADERS"];
     if (usePCH) { // Generated PCH cpp file
-	if (!vcProject.HeaderFiles.Files.tqcontains(precompH))
+	if (!vcProject.HeaderFiles.Files.contains(precompH))
 	    vcProject.HeaderFiles.Files += precompH;
     }
     nonflatDir_BubbleSort( vcProject.HeaderFiles.Files,
@@ -1106,7 +1106,7 @@ void VcprojGenerator::initOld()
 	project->variables()["DEFINES"].append( "TQT_DLL" );
 
     if ( project->isActiveConfig( "qt_dll" ) &&
-	 configs.tqfindIndex("qt") == -1 )
+	 configs.findIndex("qt") == -1 )
 	    configs.append("qt");
 
     if ( project->isActiveConfig( "qt" ) ) {
@@ -1114,9 +1114,9 @@ void VcprojGenerator::initOld()
 	    project->variables()["CONFIG"].append( "dll" );
 	    project->variables()["DEFINES"].append( "TQT_PLUGIN" );
 	}
-	if ( ( project->variables()["DEFINES"].tqfindIndex( "TQT_NODLL" )   == -1 ) &&
-	    (( project->variables()["DEFINES"].tqfindIndex( "TQT_MAKEDLL" ) != -1   ||
-	       project->variables()["DEFINES"].tqfindIndex( "TQT_DLL" )     != -1 ) ||
+	if ( ( project->variables()["DEFINES"].findIndex( "TQT_NODLL" )   == -1 ) &&
+	    (( project->variables()["DEFINES"].findIndex( "TQT_MAKEDLL" ) != -1   ||
+	       project->variables()["DEFINES"].findIndex( "TQT_DLL" )     != -1 ) ||
 	     ( getenv( "TQT_DLL" ) && !getenv( "TQT_NODLL" ))) ) {
 	    project->variables()["TQMAKE_TQT_DLL"].append( "1" );
 	    if ( is_qt && !project->variables()["TQMAKE_LIB_FLAG"].isEmpty() )
@@ -1140,10 +1140,10 @@ void VcprojGenerator::initOld()
     // Decode version, and add it to $$MSVCPROJ_VERSION --------------
     if ( !project->variables()["VERSION"].isEmpty() ) {
 	TQString version = project->variables()["VERSION"][0];
-	int firstDot = version.tqfind( "." );
+	int firstDot = version.find( "." );
 	TQString major = version.left( firstDot );
 	TQString minor = version.right( version.length() - firstDot - 1 );
-	minor.tqreplace( TQRegExp( "\\." ), "" );
+	minor.replace( TQRegExp( "\\." ), "" );
 	project->variables()["MSVCPROJ_VERSION"].append( "/VERSION:" + major + "." + minor );
     }
 
@@ -1164,9 +1164,9 @@ void VcprojGenerator::initOld()
 	    else
 		project->variables()["TQMAKE_LIBS"] += project->variables()["TQMAKE_LIBS_QT"];
 	    if ( !project->variables()["TQMAKE_TQT_DLL"].isEmpty() ) {
-		int hver = tqfindHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt");
+		int hver = findHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt");
 		if( hver==-1 ) {
-		    hver = tqfindHighestVersion( project->first("TQMAKE_LIBDIR_QT"), "qt-mt" );
+		    hver = findHighestVersion( project->first("TQMAKE_LIBDIR_QT"), "qt-mt" );
 		}
 
 		if(hver != -1) {
@@ -1174,7 +1174,7 @@ void VcprojGenerator::initOld()
 		    ver.sprintf("qt%s" TQTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "-mt" : ""), hver);
 		    TQStringList &libs = project->variables()["TQMAKE_LIBS"];
 		    for(TQStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit)
-			(*libit).tqreplace(TQRegExp("qt(-mt)?\\.lib"), ver);
+			(*libit).replace(TQRegExp("qt(-mt)?\\.lib"), ver);
 		}
 	    }
 	    if ( project->isActiveConfig( "activeqt" ) ) {
@@ -1210,7 +1210,7 @@ void VcprojGenerator::initOld()
     if ( project->isActiveConfig("thread") ) {
 	if(project->isActiveConfig("qt"))
 	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT" );
-	if ( !project->variables()["DEFINES"].tqcontains("TQT_DLL") && is_qt
+	if ( !project->variables()["DEFINES"].contains("TQT_DLL") && is_qt
 	     && project->first("TARGET") != "qtmain" )
 	    project->variables()["TQMAKE_LFLAGS"].append("/NODEFAULTLIB:libc");
     }
@@ -1227,7 +1227,7 @@ void VcprojGenerator::initOld()
     if ( project->isActiveConfig("dll") ) {
 	if ( !project->variables()["TQMAKE_LIB_FLAG"].isEmpty() ) {
 	    TQString ver_xyz(project->first("VERSION"));
-	    ver_xyz.tqreplace(TQRegExp("\\."), "");
+	    ver_xyz.replace(TQRegExp("\\."), "");
 	    project->variables()["TARGET_EXT"].append(ver_xyz + ".dll");
 	} else {
 	    project->variables()["TARGET_EXT"].append(".dll");
@@ -1258,10 +1258,10 @@ void VcprojGenerator::initOld()
     // /VERSION:x.yz -------------------------------------------------
     if ( !project->variables()["VERSION"].isEmpty() ) {
 	TQString version = project->variables()["VERSION"][0];
-	int firstDot = version.tqfind( "." );
+	int firstDot = version.find( "." );
 	TQString major = version.left( firstDot );
 	TQString minor = version.right( version.length() - firstDot - 1 );
-	minor.tqreplace( ".", "" );
+	minor.replace( ".", "" );
 	project->variables()["TQMAKE_LFLAGS"].append( "/VERSION:" + major + "." + minor );
     }
 
@@ -1270,7 +1270,7 @@ void VcprojGenerator::initOld()
     TQStringList &libList = project->variables()["TQMAKE_LIBS"];
     for( it = libList.begin(); it != libList.end(); ) {
 	TQString s = *it;
-	s.tqreplace("&", "&amp;");
+	s.replace("&", "&amp;");
 	if( s.startsWith( "-l" ) ) {
 	    it = libList.remove( it );
 	    it = libList.insert( it, s.mid( 2 ) + ".lib" );
@@ -1313,15 +1313,15 @@ void VcprojGenerator::initOld()
     if ( msvcproj_project.isEmpty() )
 	msvcproj_project = Option::output.name();
 
-    msvcproj_project = msvcproj_project.right( msvcproj_project.length() - msvcproj_project.tqfindRev( "\\" ) - 1 );
-    msvcproj_project = msvcproj_project.left( msvcproj_project.tqfindRev( "." ) );
-    msvcproj_project.tqreplace(TQRegExp("-"), "");
+    msvcproj_project = msvcproj_project.right( msvcproj_project.length() - msvcproj_project.findRev( "\\" ) - 1 );
+    msvcproj_project = msvcproj_project.left( msvcproj_project.findRev( "." ) );
+    msvcproj_project.replace(TQRegExp("-"), "");
 
     project->variables()["MSVCPROJ_PROJECT"].append(msvcproj_project);
     TQStringList &proj = project->variables()["MSVCPROJ_PROJECT"];
 
     for(it = proj.begin(); it != proj.end(); ++it)
-	(*it).tqreplace(TQRegExp("\\.[a-zA-Z0-9_]*$"), "");
+	(*it).replace(TQRegExp("\\.[a-zA-Z0-9_]*$"), "");
 
     // SUBSYSTEM -----------------------------------------------------
     if ( !project->variables()["TQMAKE_APP_FLAG"].isEmpty() ) {
@@ -1353,7 +1353,7 @@ void VcprojGenerator::initOld()
 	TQStringList strl = project->variables()["TQMAKE_LIBDIR"];
 	TQStringList::iterator stri;
 	for ( stri = strl.begin(); stri != strl.end(); ++stri ) {
-	    (*stri).tqreplace("&", "&amp;");
+	    (*stri).replace("&", "&amp;");
 	    if ( !(*stri).startsWith("/LIBPATH:") )
 		(*stri).prepend( "/LIBPATH:" );
 	}
@@ -1366,8 +1366,8 @@ void VcprojGenerator::initOld()
     TQStringList &incs = project->variables()["INCLUDEPATH"];
     for(TQStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) {
 	TQString inc = (*incit);
-	inc.tqreplace("&", "&amp;");
-	inc.tqreplace(TQRegExp("\""), "");
+	inc.replace("&", "&amp;");
+	inc.replace(TQRegExp("\""), "");
 	project->variables()["MSVCPROJ_INCPATH"].append("/I" + inc );
     }
     project->variables()["MSVCPROJ_INCPATH"].append("/I" + specdir());
@@ -1377,7 +1377,7 @@ void VcprojGenerator::initOld()
     Option::fixPathToTargetOS(project->first("TARGET"));
     dest = project->first("TARGET") + project->first( "TARGET_EXT" );
     if ( project->first("TARGET").startsWith("$(TQTDIR)") )
-	dest.tqreplace( TQRegExp("\\$\\(TQTDIR\\)"), getenv("TQTDIR") );
+	dest.replace( TQRegExp("\\$\\(TQTDIR\\)"), getenv("TQTDIR") );
     project->variables()["MSVCPROJ_TARGET"] = dest;
 
     // DLL COPY ------------------------------------------------------
@@ -1491,20 +1491,20 @@ bool VcprojGenerator::openOutput(TQFile &file) const
 
 TQString VcprojGenerator::fixFilename(TQString ofile) const
 {
-    int slashtqfind = ofile.tqfindRev('\\');
-    if (slashtqfind == -1) {
-	ofile = ofile.tqreplace('-', '_');
+    int slashfind = ofile.findRev('\\');
+    if (slashfind == -1) {
+	ofile = ofile.replace('-', '_');
     } else {
-	int hypentqfind = ofile.tqfind('-', slashtqfind);
-	while (hypentqfind != -1 && slashtqfind < hypentqfind) {
-	    ofile = ofile.tqreplace(hypentqfind, 1, '_');
-	    hypentqfind = ofile.tqfind('-', hypentqfind + 1);
+	int hypenfind = ofile.find('-', slashfind);
+	while (hypenfind != -1 && slashfind < hypenfind) {
+	    ofile = ofile.replace(hypenfind, 1, '_');
+	    hypenfind = ofile.find('-', hypenfind + 1);
 	}
     }
     return ofile;
 }
 
-TQString VcprojGenerator::tqfindTemplate(TQString file)
+TQString VcprojGenerator::findTemplate(TQString file)
 {
     TQString ret;
     if(!TQFile::exists((ret = file)) &&
@@ -1522,7 +1522,7 @@ void VcprojGenerator::processPrlVariable(const TQString &var, const TQStringList
     if(var == "TQMAKE_PRL_DEFINES") {
 	TQStringList &out = project->variables()["MSVCPROJ_DEFINES"];
 	for(TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it) {
-	    if(out.tqfindIndex((*it)) == -1)
+	    if(out.findIndex((*it)) == -1)
 		out.append((" /D " + *it ));
 	}
     } else {
diff --git a/tqtinterface/qt4/qmake/generators/win32/msvc_vcproj.h b/tqtinterface/qt4/qmake/generators/win32/msvc_vcproj.h
index 9042d31..96f701b 100644
--- a/tqtinterface/qt4/qmake/generators/win32/msvc_vcproj.h
+++ b/tqtinterface/qt4/qmake/generators/win32/msvc_vcproj.h
@@ -57,7 +57,7 @@ class VcprojGenerator : public Win32MakefileGenerator
 
     bool writeMakefile(TQTextStream &);
     virtual void writeSubDirs(TQTextStream &t);
-    TQString tqfindTemplate(TQString file);
+    TQString findTemplate(TQString file);
     void init();
 
 public:
@@ -73,7 +73,7 @@ public:
 protected:
     virtual bool openOutput(TQFile &file) const;
     virtual void processPrlVariable(const TQString &, const TQStringList &);
-    virtual bool tqfindLibraries();
+    virtual bool findLibraries();
     virtual void outputVariables();
     TQString fixFilename(TQString ofile) const;
     
@@ -114,9 +114,9 @@ inline TQString VcprojGenerator::defaultMakefile() const
     return project->first("TARGET") + project->first("VCPROJ_EXTENSION");
 }
 
-inline bool VcprojGenerator::tqfindLibraries()
+inline bool VcprojGenerator::findLibraries()
 { 
-    return Win32MakefileGenerator::tqfindLibraries("MSVCVCPROJ_LIBS");
+    return Win32MakefileGenerator::findLibraries("MSVCVCPROJ_LIBS");
 }
 
 #endif /* __MSVC_VCPROJ_H__ */
diff --git a/tqtinterface/qt4/qmake/generators/win32/winmakefile.cpp b/tqtinterface/qt4/qmake/generators/win32/winmakefile.cpp
index 1cf1cbe..30701bd 100644
--- a/tqtinterface/qt4/qmake/generators/win32/winmakefile.cpp
+++ b/tqtinterface/qt4/qmake/generators/win32/winmakefile.cpp
@@ -72,7 +72,7 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t)
 	    subdirs.append(sd);
 	    sd->makefile = "$(MAKEFILE)";
 	    if((*it).right(4) == ".pro") {
-		int slsh = file.tqfindRev(Option::dir_sep);
+		int slsh = file.findRev(Option::dir_sep);
 		if(slsh != -1) {
 		    sd->directory = file.left(slsh+1);
 		    sd->profile = file.mid(slsh+1);
@@ -86,15 +86,15 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t)
 		sd->directory = sd->directory.left(sd->directory.length() - 1);
 	    if(!sd->profile.isEmpty()) {
 		TQString basename = sd->directory;
-		int new_slsh = basename.tqfindRev(Option::dir_sep);
+		int new_slsh = basename.findRev(Option::dir_sep);
 		if(new_slsh != -1)
 		    basename = basename.mid(new_slsh+1);
 		if(sd->profile != basename + ".pro")
 		    sd->makefile += "." + sd->profile.left(sd->profile.length() - 4); //no need for the .pro
 	    }
 	    sd->target = "sub-" + (*it);
-	    sd->target.tqreplace('/', '-');
-	    sd->target.tqreplace('.', '_');
+	    sd->target.replace('/', '-');
+	    sd->target.replace('.', '_');
 	}
     }
     TQPtrListIterator<SubDir> it(subdirs);
@@ -120,7 +120,7 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t)
 	t << "\n\t" << "$(TQMAKE) " << (*it)->profile << " " << buildArgs();
 	t << " -o " << (*it)->makefile;
 	if(have_dir) {
-	    int subLevels = it.current()->directory.tqcontains(Option::dir_sep) + 1;
+	    int subLevels = it.current()->directory.contains(Option::dir_sep) + 1;
 	    t << "\n\t" << "@cd ..";
 	    for(int i = 1; i < subLevels; i++ )
 		t << Option::dir_sep << "..";
@@ -136,7 +136,7 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t)
 	t << "\n\t" << "$(MAKE)";
         t << " -f " << (*it)->makefile;
 	if(have_dir) {
-	    int subLevels = it.current()->directory.tqcontains(Option::dir_sep) + 1;
+	    int subLevels = it.current()->directory.contains(Option::dir_sep) + 1;
 	    t << "\n\t" << "@cd ..";
 	    for(int i = 1; i < subLevels; i++ )
 		t << Option::dir_sep << "..";
@@ -154,7 +154,7 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t)
         t << endl;
     }
 
-    if(project->variables()["TQMAKE_INTERNAL_TQMAKE_DEPS"].tqfindIndex("qmake_all") == -1)
+    if(project->variables()["TQMAKE_INTERNAL_TQMAKE_DEPS"].findIndex("qmake_all") == -1)
 	project->variables()["TQMAKE_INTERNAL_TQMAKE_DEPS"].append("qmake_all");
     writeMakeQmake(t);
 
@@ -164,11 +164,11 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t)
             bool have_dir = !(*it)->directory.isEmpty();
 	    TQString subdir = (*it)->directory;
 	    TQString profile = (*it)->profile;
-	    int subLevels = subdir.tqcontains(Option::dir_sep) + 1;
+	    int subLevels = subdir.contains(Option::dir_sep) + 1;
             t << "\n\t";
             if(have_dir)
 	      t << "cd " << subdir << "\n\t";
-	    int lastSlash = subdir.tqfindRev(Option::dir_sep);
+	    int lastSlash = subdir.findRev(Option::dir_sep);
 	    if(lastSlash != -1)
 		subdir = subdir.mid( lastSlash + 1 );
 	    t << "$(TQMAKE) "
@@ -202,7 +202,7 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t)
 	    t << varGlue("TQMAKE_CLEAN","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ", "");
 	if (!subdirs.isEmpty()) {
 	    for( it.toFirst(); it.current(); ++it) {
-		int subLevels = (*it)->directory.tqcontains(Option::dir_sep) + 1;
+		int subLevels = (*it)->directory.contains(Option::dir_sep) + 1;
 		bool have_dir = !(*it)->directory.isEmpty();
 		if(have_dir)
 		    t << "\n\t" << "cd " << (*it)->directory;
@@ -242,7 +242,7 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t)
 	    deps += " " + dep;
 	}
 	if(!project->variables()["TQMAKE_NOFORCE"].isEmpty() &&
-	   project->variables()[(*sit) + ".CONFIG"].tqfindIndex("phony") != -1)
+	   project->variables()[(*sit) + ".CONFIG"].findIndex("phony") != -1)
 	    deps += TQString(" ") + "FORCE";
 	t << targ << ":" << deps << "\n";
         if(!cmd.isEmpty())
@@ -257,7 +257,7 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t)
 
 
 int
-Win32MakefileGenerator::tqfindHighestVersion(const TQString &d, const TQString &stem)
+Win32MakefileGenerator::findHighestVersion(const TQString &d, const TQString &stem)
 {
     TQString bd = Option::fixPathToLocalOS(d, TRUE);
     if(!TQFile::exists(bd))
@@ -278,13 +278,13 @@ Win32MakefileGenerator::tqfindHighestVersion(const TQString &d, const TQString &
     TQMakeMetaInfo libinfo;
     if(libinfo.readLib(bd + dllStem)) {
 	if(!libinfo.isEmpty("TQMAKE_PRL_VERSION"))
-	    biggest = TQMAX(biggest, libinfo.first("TQMAKE_PRL_VERSION").tqreplace(".", "").toInt());
+	    biggest = TQMAX(biggest, libinfo.first("TQMAKE_PRL_VERSION").replace(".", "").toInt());
     }
     return biggest;
 }
 
 TQString
-Win32MakefileGenerator::tqfindDependency(const TQString &dep)
+Win32MakefileGenerator::findDependency(const TQString &dep)
 {
     {
 	TQStringList &qut = project->variables()["TQMAKE_EXTRA_WIN_TARGETS"];
@@ -309,19 +309,19 @@ Win32MakefileGenerator::tqfindDependency(const TQString &dep)
 		for(TQStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
 		    TQString out = tmp_out;
 		    TQFileInfo fi(Option::fixPathToLocalOS((*input)));
-		    out.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName());
-		    out.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath());
+		    out.replace("${TQMAKE_FILE_BASE}", fi.baseName());
+		    out.replace("${TQMAKE_FILE_NAME}", fi.filePath());
 		    if(out.endsWith(dep))
 			return out;
 		}
 	    }
 	}
     }
-    return MakefileGenerator::tqfindDependency(dep);
+    return MakefileGenerator::findDependency(dep);
 }
 
 bool
-Win32MakefileGenerator::tqfindLibraries(const TQString &where)
+Win32MakefileGenerator::findLibraries(const TQString &where)
 {
 
     TQStringList &l = project->variables()[where];
@@ -331,7 +331,7 @@ Win32MakefileGenerator::tqfindLibraries(const TQString &where)
 	for(TQStringList::Iterator libpathit = libpaths.begin(); libpathit != libpaths.end(); ++libpathit) {
 	    TQString r = (*libpathit), l = r;
 	    fixEnvVariables(l);
-	    dirs.append(new MakefileDependDir(r.tqreplace("\"",""), l.tqreplace("\"","")));
+	    dirs.append(new MakefileDependDir(r.replace("\"",""), l.replace("\"","")));
 	}
     }
     dirs.setAutoDelete(TRUE);
@@ -345,19 +345,19 @@ Win32MakefileGenerator::tqfindLibraries(const TQString &where)
 	}
 	if(opt.startsWith("/LIBPATH:")) {
             TQString r = opt.mid(9), l = Option::fixPathToLocalOS(r);
-            dirs.append(new MakefileDependDir(r.tqreplace("\"",""),
-                                              l.tqreplace("\"","")));
+            dirs.append(new MakefileDependDir(r.replace("\"",""),
+                                              l.replace("\"","")));
         } else if(opt.startsWith("-L") || opt.startsWith("/L")) {
             TQString r = opt.mid(2), l = Option::fixPathToLocalOS(r);
-            dirs.append(new MakefileDependDir(r.tqreplace("\"",""),
-                                              l.tqreplace("\"","")));
+            dirs.append(new MakefileDependDir(r.replace("\"",""),
+                                              l.replace("\"","")));
             remove = TRUE; //we eat this switch
         } else if(opt.startsWith("-l") || opt.startsWith("/l")) {
             TQString lib = opt.right(opt.length() - 2), out;
             if(!lib.isEmpty()) {
                 for(MakefileDependDir *mdd = dirs.first(); mdd; mdd = dirs.next() ) {
 		    TQString extension;
-                    int ver = tqfindHighestVersion(mdd->local_dir, lib);
+                    int ver = findHighestVersion(mdd->local_dir, lib);
 		    if(ver > 0)
 			extension += TQString::number(ver);
 		    extension += ".lib";
@@ -369,7 +369,7 @@ Win32MakefileGenerator::tqfindLibraries(const TQString &where)
                 }
             }
             if(out.isEmpty()) {
-                remove = TRUE; //just eat it since we cannot tqfind one..
+                remove = TRUE; //just eat it since we cannot find one..
             } else {
 		modified_opt = TRUE;
                 (*it) = out;
@@ -377,11 +377,11 @@ Win32MakefileGenerator::tqfindLibraries(const TQString &where)
         } else if(!TQFile::exists(Option::fixPathToLocalOS(opt))) {
 	    TQPtrList<MakefileDependDir> lib_dirs;
 	    TQString file = opt;
-            int slsh = file.tqfindRev(Option::dir_sep);
+            int slsh = file.findRev(Option::dir_sep);
             if(slsh != -1) {
                 TQString r = file.left(slsh+1), l = r;
 		fixEnvVariables(l);
-		lib_dirs.append(new MakefileDependDir(r.tqreplace("\"",""), l.tqreplace("\"","")));
+		lib_dirs.append(new MakefileDependDir(r.replace("\"",""), l.replace("\"","")));
                 file = file.right(file.length() - slsh - 1);
             } else {
 		lib_dirs = dirs;
@@ -393,7 +393,7 @@ Win32MakefileGenerator::tqfindLibraries(const TQString &where)
 		    if(!file.at(file.length()-1).isNumber()) {
 			for(MakefileDependDir *mdd = lib_dirs.first(); mdd; mdd = lib_dirs.next() ) {
 			    TQString lib_tmpl(file + "%1" + ".lib");
-			    int ver = tqfindHighestVersion(mdd->local_dir, file);
+			    int ver = findHighestVersion(mdd->local_dir, file);
 			    if(ver != -1) {
 				if(ver)
 				    lib_tmpl = lib_tmpl.arg(ver);
@@ -437,8 +437,8 @@ Win32MakefileGenerator::processPrlFiles()
 	for(TQStringList::Iterator libpathit = libpaths.begin(); libpathit != libpaths.end(); ++libpathit) {
 	    TQString r = (*libpathit), l = r;
 	    fixEnvVariables(l);
-	    libdirs.append(new MakefileDependDir(r.tqreplace("\"",""),
-						 l.tqreplace("\"","")));
+	    libdirs.append(new MakefileDependDir(r.replace("\"",""),
+						 l.replace("\"","")));
 	}
     }
     for(bool ret = FALSE; TRUE; ret = FALSE) {
@@ -454,8 +454,8 @@ Win32MakefileGenerator::processPrlFiles()
 		if(opt.startsWith("/LIBPATH:")) {
 		    TQString r = opt.mid(9), l = r;
 		    fixEnvVariables(l);
-		    libdirs.append(new MakefileDependDir(r.tqreplace("\"",""),
-							 l.tqreplace("\"","")));
+		    libdirs.append(new MakefileDependDir(r.replace("\"",""),
+							 l.replace("\"","")));
 		}
 	    } else {
 		if(!processed[opt]) {
diff --git a/tqtinterface/qt4/qmake/generators/win32/winmakefile.h b/tqtinterface/qt4/qmake/generators/win32/winmakefile.h
index 67a4ee9..6233f4c 100644
--- a/tqtinterface/qt4/qmake/generators/win32/winmakefile.h
+++ b/tqtinterface/qt4/qmake/generators/win32/winmakefile.h
@@ -53,10 +53,10 @@ class Win32MakefileGenerator : public MakefileGenerator
 {
 protected:
     virtual void writeSubDirs(TQTextStream &t);
-    int tqfindHighestVersion(const TQString &dir, const TQString &stem);
-    bool tqfindLibraries(const TQString &);
-    TQString tqfindDependency(const TQString &);
-    virtual bool tqfindLibraries();
+    int findHighestVersion(const TQString &dir, const TQString &stem);
+    bool findLibraries(const TQString &);
+    TQString findDependency(const TQString &);
+    virtual bool findLibraries();
     virtual void processPrlFiles();
 
 public:
@@ -67,8 +67,8 @@ public:
 inline Win32MakefileGenerator::~Win32MakefileGenerator()
 { }
 
-inline bool Win32MakefileGenerator::tqfindLibraries()
-{ return tqfindLibraries("TQMAKE_LIBS"); }
+inline bool Win32MakefileGenerator::findLibraries()
+{ return findLibraries("TQMAKE_LIBS"); }
 
 
 
diff --git a/tqtinterface/qt4/qmake/main.cpp b/tqtinterface/qt4/qmake/main.cpp
index 3d7292b..84171e3 100644
--- a/tqtinterface/qt4/qmake/main.cpp
+++ b/tqtinterface/qt4/qmake/main.cpp
@@ -118,7 +118,7 @@ int main(int argc, char **argv)
 	    //setup pwd properly
 	    debug_msg(1, "Resetting dir to: %s", oldpwd.latin1());
 	    TQDir::setCurrent(oldpwd); //reset the old pwd
-	    int di = fn.tqfindRev(Option::dir_sep);
+	    int di = fn.findRev(Option::dir_sep);
 	    if(di != -1) {
 		debug_msg(1, "Changing dir to: %s", TQT_TQSTRING(fn.left(di)).latin1());
 		if(!TQDir::setCurrent(fn.left(di)))
diff --git a/tqtinterface/qt4/qmake/meta.cpp b/tqtinterface/qt4/qmake/meta.cpp
index 21e4e98..81b8809 100644
--- a/tqtinterface/qt4/qmake/meta.cpp
+++ b/tqtinterface/qt4/qmake/meta.cpp
@@ -53,9 +53,9 @@ bool
 TQMakeMetaInfo::readLib(const TQString &lib)
 {
     clear();
-    TQString meta_file = tqfindLib(lib);
+    TQString meta_file = findLib(lib);
     
-    if(cache_vars.tqcontains(meta_file)) {
+    if(cache_vars.contains(meta_file)) {
 	vars = cache_vars[meta_file];
 	return TRUE;
     }
@@ -94,7 +94,7 @@ TQMakeMetaInfo::clear()
 
 
 TQString
-TQMakeMetaInfo::tqfindLib(const TQString &lib)
+TQMakeMetaInfo::findLib(const TQString &lib)
 {
     TQString ret = TQString::null;
     TQString extns[] = { Option::prl_ext, /*Option::pkgcfg_ext, Option::libtool_ext,*/ TQString::null };
@@ -136,7 +136,7 @@ TQMakeMetaInfo::readLibtoolFile(const TQString &f)
 	if(lst.count() == 1 && (lst.first().startsWith("'") || lst.first().startsWith("\"")) &&
 	   lst.first().endsWith(TQString(lst.first()[0])))
 	    lst = TQString(lst.first().mid(1, lst.first().length() - 2));
-	if(!vars.tqcontains("TQMAKE_PRL_TARGET") &&
+	if(!vars.contains("TQMAKE_PRL_TARGET") &&
 	   (it.key() == "dlname" || it.key() == "library_names" || it.key() == "old_library")) {
 	    TQString dir = v["libdir"].first();
 	    if((dir.startsWith("'") || dir.startsWith("\"")) && dir.endsWith(TQString(dir[0])))
diff --git a/tqtinterface/qt4/qmake/meta.h b/tqtinterface/qt4/qmake/meta.h
index e940b43..3903527 100644
--- a/tqtinterface/qt4/qmake/meta.h
+++ b/tqtinterface/qt4/qmake/meta.h
@@ -55,7 +55,7 @@ public:
     TQMakeMetaInfo();
 
     bool readLib(const TQString &lib);
-    static TQString tqfindLib(const TQString &lib);
+    static TQString findLib(const TQString &lib);
     static bool libExists(const TQString &lib);
     TQString type() const;
 
@@ -66,7 +66,7 @@ public:
 };
 
 inline bool TQMakeMetaInfo::isEmpty(const TQString &v)
-{ return !vars.tqcontains(v) || vars[v].isEmpty(); }
+{ return !vars.contains(v) || vars[v].isEmpty(); }
 
 inline TQString TQMakeMetaInfo::type() const
 { return meta_type; }
@@ -91,6 +91,6 @@ inline TQMap<TQString, TQStringList> &TQMakeMetaInfo::variables()
 { return vars; }
 
 inline bool TQMakeMetaInfo::libExists(const TQString &lib)
-{ return !tqfindLib(lib).isNull(); }
+{ return !findLib(lib).isNull(); }
 
 #endif /* __META_H__ */
diff --git a/tqtinterface/qt4/qmake/option.cpp b/tqtinterface/qt4/qmake/option.cpp
index 1d44b72..04c1771 100644
--- a/tqtinterface/qt4/qmake/option.cpp
+++ b/tqtinterface/qt4/qmake/option.cpp
@@ -107,7 +107,7 @@ TQString Option::mkfile::qmakespec_commandline;
 
 static Option::TQMAKE_MODE default_mode(TQString progname)
 {
-    int s = progname.tqfindRev(Option::dir_sep);
+    int s = progname.findRev(Option::dir_sep);
     if(s != -1)
 	progname = progname.right(progname.length() - (s + 1));
     if(progname == "qmakegen")
@@ -134,7 +134,7 @@ bool usage(const char *a0)
 	    "\t               defaults to %s\n"
 	    "\t-makefile      Put qmake into makefile generation mode%s\n"
 	    "\t               In this mode qmake interprets files as project files to\n"
-	    "\t               be processed, if skipped qmake will try to tqfind a project\n"
+	    "\t               be processed, if skipped qmake will try to find a project\n"
 	    "\t               file in your current working directory\n"
 	    "\n"
 	    "Warnings Options:\n"
@@ -275,7 +275,7 @@ Option::internalParseCommandLine(int argc, char **argv, int skip)
 	    }
 	} else {
 	    TQString arg = argv[x];
-	    if(arg.tqfind('=') != -1) {
+	    if(arg.find('=') != -1) {
 		if(before)
 		    Option::before_user_vars.append(arg);
 		else
@@ -382,7 +382,7 @@ Option::parseCommandLine(int argc, char **argv)
 	//try REALLY hard to do it for them, lazy..
 	if(Option::mkfile::project_files.isEmpty()) {
 	    TQString pwd = TQDir::currentDirPath(), 
-		   proj = pwd + "/" + pwd.right(pwd.length() - (pwd.tqfindRev('/') + 1)) + ".pro";
+		   proj = pwd + "/" + pwd.right(pwd.length() - (pwd.findRev('/') + 1)) + ".pro";
 	    if(TQFile::exists(proj)) {
 		Option::mkfile::project_files.append(proj);
 	    } else { //last try..
@@ -456,7 +456,7 @@ void fixEnvVariables(TQString &x)
     TQRegExp reg_var("\\$\\(.*\\)");
     reg_var.setMinimal( TRUE );
     while((rep = reg_var.search(x)) != -1)
-	x.tqreplace(rep, reg_var.matchedLength(), TQString(getenv(TQT_TQSTRING(x.mid(rep + 2, reg_var.matchedLength() - 3)).latin1())));
+	x.replace(rep, reg_var.matchedLength(), TQString(getenv(TQT_TQSTRING(x.mid(rep + 2, reg_var.matchedLength() - 3)).latin1())));
 }
 static TQString fixPath(TQString x)
 {
@@ -486,11 +486,11 @@ Option::fixPathToTargetOS(const TQString& in, bool fix_env, bool canonical)
 	tmp = fixPath(tmp);
     TQString rep;
     if(Option::target_mode == TARG_MAC9_MODE) 
-	tmp = TQT_TQSTRING(tmp.tqreplace('/', Option::dir_sep)).tqreplace('\\', Option::dir_sep);
+	tmp = TQT_TQSTRING(tmp.replace('/', Option::dir_sep)).replace('\\', Option::dir_sep);
     else if(Option::target_mode == TARG_WIN_MODE) 
-	tmp = tmp.tqreplace('/', Option::dir_sep);
+	tmp = tmp.replace('/', Option::dir_sep);
     else 
-	tmp = tmp.tqreplace('\\', Option::dir_sep);
+	tmp = tmp.replace('\\', Option::dir_sep);
     return tmp;
 }
 
@@ -503,9 +503,9 @@ Option::fixPathToLocalOS(const TQString& in, bool fix_env, bool canonical)
     if(canonical)
 	tmp = fixPath(tmp);
 #if defined(TQ_OS_WIN32)
-    return tmp.tqreplace('/', '\\');
+    return tmp.replace('/', '\\');
 #else
-    return tmp.tqreplace('\\', '/');
+    return tmp.replace('\\', '/');
 #endif
 }
 
diff --git a/tqtinterface/qt4/qmake/project.cpp b/tqtinterface/qt4/qmake/project.cpp
index 2278904..c3aeccd 100644
--- a/tqtinterface/qt4/qmake/project.cpp
+++ b/tqtinterface/qt4/qmake/project.cpp
@@ -211,7 +211,7 @@ bool
 TQMakeProject::parse(const TQString &t, TQMap<TQString, TQStringList> &place)
 {
     TQString s = t.simplifyWhiteSpace();
-    int hash_mark = s.tqfind("#");
+    int hash_mark = s.find("#");
     if(hash_mark != -1) //good bye comments
 	s = s.left(hash_mark);
     if(s.isEmpty()) /* blank_line */
@@ -228,7 +228,7 @@ TQMakeProject::parse(const TQString &t, TQMap<TQString, TQStringList> &place)
     }
     if(!(scope_flag & (0x01 << scope_block))) {
 	/* adjust scope for each block which appears on a single line */
-	for(int i = (s.tqcontains('{')-s.tqcontains('}')); i>0; i--)
+	for(int i = (s.contains('{')-s.contains('}')); i>0; i--)
 	    scope_flag &= ~(0x01 << (++scope_block));
 	debug_msg(1, "Project Parser: %s:%d : Ignored due to block being false.",
 		  parser.file.latin1(), parser.line_no);
@@ -290,10 +290,10 @@ TQMakeProject::parse(const TQString &t, TQMap<TQString, TQStringList> &place)
 		bool invert_test = (comp_scope.left(1) == "!");
 		if(invert_test)
 		    comp_scope = comp_scope.right(comp_scope.length()-1);
-		int lparen = comp_scope.tqfind('(');
+		int lparen = comp_scope.find('(');
 		if(or_op == scope_failed) {
 		    if(lparen != -1) { /* if there is an lparen in the scope, it IS a function */
-			int rparen = comp_scope.tqfindRev(')');
+			int rparen = comp_scope.findRev(')');
 			if(rparen == -1) {
 			    TQCString error;
 			    error.sprintf("Function missing right paren: %s ('%s')",
@@ -356,13 +356,13 @@ TQMakeProject::parse(const TQString &t, TQMap<TQString, TQStringList> &place)
     }
 
     SKIP_WS(d);
-    for( ; *d && op.tqfind('=') == -1; op += *(d++))
+    for( ; *d && op.find('=') == -1; op += *(d++))
 	;
-    op.tqreplace(TQRegExp("\\s"), "");
+    op.replace(TQRegExp("\\s"), "");
 
     SKIP_WS(d);
-    TQString vals(d); /* vals now tqcontains the space separated list of values */
-    int rbraces = vals.tqcontains('}'), lbraces = vals.tqcontains('{');
+    TQString vals(d); /* vals now contains the space separated list of values */
+    int rbraces = vals.contains('}'), lbraces = vals.contains('{');
     if(scope_block && rbraces - lbraces == 1) {
 	debug_msg(1, "Project Parser: %s:%d : Leaving block %d", parser.file.latin1(),
 		  parser.line_no, scope_block);
@@ -420,14 +420,14 @@ TQMakeProject::parse(const TQString &t, TQMap<TQString, TQStringList> &place)
 	}
 	bool global = FALSE, case_sense = TRUE;
 	if(func.count() == 4) {
-	    global = func[3].tqfind('g') != -1;
-	    case_sense = func[3].tqfind('i') == -1;
+	    global = func[3].find('g') != -1;
+	    case_sense = func[3].find('i') == -1;
 	}
 	TQRegExp regexp(func[1], case_sense);
 	for(TQStringList::Iterator varit = varlist.begin();
 	    varit != varlist.end(); ++varit) {
-	    if((*varit).tqcontains(regexp)) {
-		(*varit) = (*varit).tqreplace(regexp, func[2]);
+	    if((*varit).contains(regexp)) {
+		(*varit) = (*varit).replace(regexp, func[2]);
 		if(!global)
 		    break;
 	    }
@@ -443,7 +443,7 @@ TQMakeProject::parse(const TQString &t, TQMap<TQString, TQStringList> &place)
 	    valit != vallist.end(); ++valit) {
 	    if((*valit).isEmpty())
 		continue;
-	    if((op == "*=" && !(*varlist.tqfind((*valit)))) ||
+	    if((op == "*=" && !(*varlist.find((*valit)))) ||
 	       op == "=" || op == "+=")
 		varlist.append((*valit));
 	    else if(op == "-=")
@@ -484,7 +484,7 @@ TQMakeProject::read(const TQString &file, TQMap<TQString, TQStringList> &place)
 	    line = t.readLine().stripWhiteSpace();
 	    int prelen = line.length();
 
-	    int hash_mark = line.tqfind("#");
+	    int hash_mark = line.find("#");
 	    if(hash_mark != -1) //good bye comments
 		line = line.left(hash_mark);
 	    if(!line.isEmpty() && line.right(1) == "\\") {
@@ -532,12 +532,12 @@ TQMakeProject::read(uchar cmd)
 	    base_vars["TEMPLATE_PREFIX"] = Option::user_template_prefix;
 
 	if(cmd & ReadCache && Option::mkfile::do_cache) {	/* parse the cache */
-	    if(Option::mkfile::cachefile.isEmpty())  { //tqfind it as it has not been specified
+	    if(Option::mkfile::cachefile.isEmpty())  { //find it as it has not been specified
 		TQString dir = TQDir::convertSeparators(Option::output_dir);
 		while(!TQFile::exists((Option::mkfile::cachefile = dir +
 				      TQDir::separator() + ".qmake.cache"))) {
-		    dir = dir.left(dir.tqfindRev(TQDir::separator()));
-		    if(dir.isEmpty() || dir.tqfind(TQDir::separator()) == -1) {
+		    dir = dir.left(dir.findRev(TQDir::separator()));
+		    if(dir.isEmpty() || dir.find(TQDir::separator()) == -1) {
 			Option::mkfile::cachefile = "";
 			break;
 		    }
@@ -581,7 +581,7 @@ TQMakeProject::read(uchar cmd)
 		    }
 		}
 		if(!found_mkspec) {
-		    fprintf(stderr, "Could not tqfind mkspecs for your TQMAKESPEC after trying:\n\t%s\n",
+		    fprintf(stderr, "Could not find mkspecs for your TQMAKESPEC after trying:\n\t%s\n",
 			    mkspec_roots.join("\n\t").latin1());
 		    return FALSE;
 		}
@@ -672,10 +672,10 @@ TQMakeProject::read(uchar cmd)
 	// TQFileInfo fi(pfile);
 	// fi.baseName();
 	TQString tmp = pfile;
-	if(tmp.tqfindRev('/') != -1)
-	    tmp = tmp.right( tmp.length() - tmp.tqfindRev('/') - 1 );
-	if(tmp.tqfindRev('.') != -1)
-	    tmp = tmp.left(tmp.tqfindRev('.'));
+	if(tmp.findRev('/') != -1)
+	    tmp = tmp.right( tmp.length() - tmp.findRev('/') - 1 );
+	if(tmp.findRev('.') != -1)
+	    tmp = tmp.left(tmp.findRev('.'));
 	vars["TARGET"].append(tmp);
     }
 
@@ -718,7 +718,7 @@ TQMakeProject::isActiveConfig(const TQString &x, bool regex, TQMap<TQString, TQS
 
     TQRegExp re(x, FALSE, TRUE);
     TQString spec = Option::mkfile::qmakespec.right(Option::mkfile::qmakespec.length() -
-						   (Option::mkfile::qmakespec.tqfindRev(TQDir::separator())+1));
+						   (Option::mkfile::qmakespec.findRev(TQDir::separator())+1));
     if((regex && re.exactMatch(spec)) || (!regex && spec == x))
 	return TRUE;
 #ifdef TQ_OS_UNIX
@@ -730,8 +730,8 @@ TQMakeProject::isActiveConfig(const TQString &x, bool regex, TQMap<TQString, TQS
 	if(l != -1) {
 	    buffer[l] = '\0';
 	    TQString r = buffer;
-	    if(r.tqfindRev('/') != -1)
-		r = r.mid(r.tqfindRev('/') + 1);
+	    if(r.findRev('/') != -1)
+		r = r.mid(r.findRev('/') + 1);
 	    if((regex && re.exactMatch(r)) || (!regex && r == x))
 		return TRUE;
 	}
@@ -795,7 +795,7 @@ TQMakeProject::doProjectTest(const TQString& func, TQStringList args, TQMap<TQSt
 	    return TRUE;
 	//regular expression I guess
 	TQString dirstr = TQDir::currentDirPath();
-	int slsh = file.tqfindRev(Option::dir_sep);
+	int slsh = file.findRev(Option::dir_sep);
 	if(slsh != -1) {
 	    dirstr = file.left(slsh+1);
 	    file = file.right(file.length() - slsh - 1);
@@ -809,9 +809,9 @@ TQMakeProject::doProjectTest(const TQString& func, TQStringList args, TQMap<TQSt
 	    return FALSE;
 	}
 	return system(args.first().latin1()) == 0;
-    } else if(func == "tqcontains") {
+    } else if(func == "contains") {
 	if(args.count() != 2) {
-	    fprintf(stderr, "%s:%d: tqcontains(var, val) requires two arguments.\n", parser.file.latin1(),
+	    fprintf(stderr, "%s:%d: contains(var, val) requires two arguments.\n", parser.file.latin1(),
 		    parser.line_no);
 	    return FALSE;
 	}
@@ -832,11 +832,11 @@ TQMakeProject::doProjectTest(const TQString& func, TQStringList args, TQMap<TQSt
 	TQString file = args[0];
 	doVariableReplace(file, place);
 	fixEnvVariables(file);
-	int di = file.tqfindRev(Option::dir_sep);
+	int di = file.findRev(Option::dir_sep);
 	TQDir sunworkshop42workaround = TQDir::current();
 	TQString oldpwd = sunworkshop42workaround.currentDirPath();
 	if(di != -1) {
-	    if(!TQDir::setCurrent(file.left(file.tqfindRev(Option::dir_sep)))) {
+	    if(!TQDir::setCurrent(file.left(file.findRev(Option::dir_sep)))) {
 		fprintf(stderr, "Cannot find directory: %s\n", TQT_TQSTRING(file.left(di)).latin1());
 		return FALSE;
 	    }
@@ -893,12 +893,12 @@ TQMakeProject::doProjectTest(const TQString& func, TQStringList args, TQMap<TQSt
 
 	TQString file = args.first();
 	file = Option::fixPathToLocalOS(file);
-	file.tqreplace("\"", "");
+	file.replace("\"", "");
 	doVariableReplace(file, place);
 	if(func == "load") {
 	    if(!file.endsWith(Option::prf_ext))
 		file += Option::prf_ext;
-	    if(file.tqfind(Option::dir_sep) == -1 || !TQFile::exists(file)) {
+	    if(file.find(Option::dir_sep) == -1 || !TQFile::exists(file)) {
 		bool found = FALSE;
 		const TQString concat = TQDir::separator() + TQString("mkspecs") +
 				       TQDir::separator() + TQString("features");
@@ -976,11 +976,11 @@ TQMakeProject::doProjectTest(const TQString& func, TQStringList args, TQMap<TQSt
 		    parser.file.latin1(), parser.line_no);
 	debug_msg(1, "Project Parser: %s'ing file %s.", func.latin1(), file.latin1());
 	TQString orig_file = file;
-	int di = file.tqfindRev(Option::dir_sep);
+	int di = file.findRev(Option::dir_sep);
 	TQDir sunworkshop42workaround = TQDir::current();
 	TQString oldpwd = sunworkshop42workaround.currentDirPath();
 	if(di != -1) {
-	    if(!TQDir::setCurrent(file.left(file.tqfindRev(Option::dir_sep)))) {
+	    if(!TQDir::setCurrent(file.left(file.findRev(Option::dir_sep)))) {
 		fprintf(stderr, "Cannot find directory: %s\n", TQT_TQSTRING(file.left(di)).latin1());
 		return FALSE;
 	    }
@@ -1018,9 +1018,9 @@ TQMakeProject::doProjectTest(const TQString& func, TQStringList args, TQMap<TQSt
 	TQString msg = args.first();
 	if((msg.startsWith("\"") || msg.startsWith("'")) && msg.endsWith(msg.left(1)))
 	    msg = msg.mid(1, msg.length()-2);
-	msg.tqreplace(TQString("${TQMAKE_FILE}"), parser.file.latin1());
-	msg.tqreplace(TQString("${TQMAKE_LINE_NUMBER}"), TQString::number(parser.line_no));
-	msg.tqreplace(TQString("${TQMAKE_DATE}"), TQDateTime::tqcurrentDateTime().toString());
+	msg.replace(TQString("${TQMAKE_FILE}"), parser.file.latin1());
+	msg.replace(TQString("${TQMAKE_LINE_NUMBER}"), TQString::number(parser.line_no));
+	msg.replace(TQString("${TQMAKE_DATE}"), TQDateTime::tqcurrentDateTime().toString());
 	doVariableReplace(msg, place);
 	fixEnvVariables(msg);
 	fprintf(stderr, "Project %s: %s\n", func.upper().latin1(), msg.latin1());
@@ -1047,9 +1047,9 @@ TQMakeProject::doProjectCheckReqs(const TQStringList &deps, TQMap<TQString, TQSt
 	    chk = chk.right(chk.length() - 1);
 
 	bool test;
-	int lparen = chk.tqfind('(');
+	int lparen = chk.find('(');
 	if(lparen != -1) { /* if there is an lparen in the chk, it IS a function */
-	    int rparen = chk.tqfindRev(')');
+	    int rparen = chk.findRev(')');
 	    if(rparen == -1) {
 		TQCString error;
 		error.sprintf("Function (in REQUIRES) missing right paren: %s", chk.latin1());
@@ -1079,11 +1079,11 @@ TQMakeProject::doProjectCheckReqs(const TQStringList &deps, TQMap<TQString, TQSt
 TQString
 TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringList> &place)
 {
-    for(int var_begin, var_last=0; (var_begin = str.tqfind("$$", var_last)) != -1; var_last = var_begin) {
+    for(int var_begin, var_last=0; (var_begin = str.find("$$", var_last)) != -1; var_last = var_begin) {
 	if(var_begin >= (int)str.length() + 2) {
 	    break;
 	} else if(var_begin != 0 && str[var_begin-1] == '\\') {
-	    str.tqreplace(var_begin-1, 1, "");
+	    str.replace(var_begin-1, 1, "");
 	    var_begin += 1;
 	    continue;
 	}
@@ -1111,7 +1111,7 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi
 	if(as_env) {
 	    if(str[var_incr] != ')') {
 		var_incr++;
-		warn_msg(WarnParser, "%s:%d: Unterminated env-variable tqreplacement '%s' (%s)",
+		warn_msg(WarnParser, "%s:%d: Unterminated env-variable replacement '%s' (%s)",
 			 parser.file.latin1(), parser.line_no,
 			 TQT_TQSTRING(str.mid(var_begin, TQMAX(var_incr - var_begin,
 						 (int)str.length()))).latin1(), str.latin1());
@@ -1122,7 +1122,7 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi
 	} else if(as_prop) {
 	    if(str[var_incr] != ']') {
 		var_incr++;
-		warn_msg(WarnParser, "%s:%d: Unterminated prop-variable tqreplacement '%s' (%s)",
+		warn_msg(WarnParser, "%s:%d: Unterminated prop-variable replacement '%s' (%s)",
 			 parser.file.latin1(), parser.line_no,
 			 TQT_TQSTRING(str.mid(var_begin, TQMAX(var_incr - var_begin, int(str.length())))).latin1(), str.latin1());
 		var_begin += var_incr;
@@ -1147,7 +1147,7 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi
 	}
 	if(var_incr > (int)str.length() || (in_braces && str[var_incr] != '}')) {
 	    var_incr++;
-	    warn_msg(WarnParser, "%s:%d: Unterminated variable tqreplacement '%s' (%s)",
+	    warn_msg(WarnParser, "%s:%d: Unterminated variable replacement '%s' (%s)",
 		     parser.file.latin1(), parser.line_no,
 		     TQT_TQSTRING(str.mid(var_begin, TQMAX(var_incr - var_begin,
 					     (int)str.length()))).latin1(), str.latin1());
@@ -1157,27 +1157,27 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi
 	    var_incr++;
 	}
 
-	TQString tqreplacement;
+	TQString replacement;
 	if(as_env) {
-	    tqreplacement = getenv(val);
+	    replacement = getenv(val);
 	} else if(as_prop) {
 	    if(prop)
-		tqreplacement = prop->value(val);
+		replacement = prop->value(val);
 	} else if(args.isEmpty()) {
 	    if(val.left(1) == ".")
-		tqreplacement = "";
+		replacement = "";
 	    else if(val == "LITERAL_WHITESPACE")
-		tqreplacement = "\t";
+		replacement = "\t";
 	    else if(val == "LITERAL_DOLLAR")
-		tqreplacement = "$";
+		replacement = "$";
 	    else if(val == "LITERAL_HASH")
-		tqreplacement = "#";
+		replacement = "#";
 	    else if(val == "PWD")
-		tqreplacement = TQDir::currentDirPath();
+		replacement = TQDir::currentDirPath();
 	    else if(val == "DIR_SEPARATOR")
-		tqreplacement = Option::dir_sep;
+		replacement = Option::dir_sep;
 	    else
-		tqreplacement = place[varMap(val)].join(" ");
+		replacement = place[varMap(val)].join(" ");
 	} else {
 	    TQStringList arg_list = split_arg_list(doVariableReplace(args, place));
 	    debug_msg(1, "Running function: %s( %s )", val.latin1(), arg_list.join("::").latin1());
@@ -1200,9 +1200,9 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi
 		    if(end < start)
 			end = start;
 		    for(int i = start; i <= end && (int)var.count() >= i; i++) {
-			if(!tqreplacement.isEmpty())
-			    tqreplacement += " ";
-			tqreplacement += var[i];
+			if(!replacement.isEmpty())
+			    replacement += " ";
+			replacement += var[i];
 		    }
 		}
 	    } else if(val.lower() == "fromfile") {
@@ -1212,7 +1212,7 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi
 		} else {
 		    TQString file = arg_list[0];
 		    file = Option::fixPathToLocalOS(file);
-		    file.tqreplace("\"", "");
+		    file.replace("\"", "");
 
 		    if(TQDir::isRelativePath(file)) {
 			TQStringList include_roots;
@@ -1230,10 +1230,10 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi
 			}
 		    }
 		    TQString orig_file = file;
-		    int di = file.tqfindRev(Option::dir_sep);
+		    int di = file.findRev(Option::dir_sep);
 		    TQDir sunworkshop42workaround = TQDir::current();
 		    TQString oldpwd = sunworkshop42workaround.currentDirPath();
-		    if(di != -1 && TQDir::setCurrent(file.left(file.tqfindRev(Option::dir_sep))))
+		    if(di != -1 && TQDir::setCurrent(file.left(file.findRev(Option::dir_sep))))
 			file = file.right(file.length() - di - 1);
 		    parser_info pi = parser;
 		    int sb = scope_block;
@@ -1242,7 +1242,7 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi
 		    TQMap<TQString, TQStringList> tmp;
 		    bool r = read(file.latin1(), tmp);
 		    if(r) {
-			tqreplacement = tmp[arg_list[1]].join(" ");
+			replacement = tmp[arg_list[1]].join(" ");
 			vars["TQMAKE_INTERNAL_INCLUDED_FILES"].append(orig_file);
 		    } else {
 			warn_msg(WarnParser, "%s:%d: Failure to include file %s.",
@@ -1257,14 +1257,14 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi
 	    } else if(val.lower() == "eval") {
 		for(TQStringList::ConstIterator arg_it = arg_list.begin();
 		    arg_it != arg_list.end(); ++arg_it) {
-		    if(!tqreplacement.isEmpty())
-			tqreplacement += " ";
-		    tqreplacement += place[(*arg_it)].join(" ");
+		    if(!replacement.isEmpty())
+			replacement += " ";
+		    replacement += place[(*arg_it)].join(" ");
 		}
 	    } else if(val.lower() == "list") {
 		static int x = 0;
-		tqreplacement.sprintf(".TQMAKE_INTERNAL_TMP_VAR_%d", x++);
-		TQStringList &lst = (*((TQMap<TQString, TQStringList>*)&place))[tqreplacement];
+		replacement.sprintf(".TQMAKE_INTERNAL_TMP_VAR_%d", x++);
+		TQStringList &lst = (*((TQMap<TQString, TQStringList>*)&place))[replacement];
 		lst.clear();
 		for(TQStringList::ConstIterator arg_it = arg_list.begin();
 		    arg_it != arg_list.end(); ++arg_it)
@@ -1276,14 +1276,14 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi
 		} else {
 		    TQString glue, before, after;
 		    if(arg_list.count() >= 2)
-			glue = arg_list[1].tqreplace("\"", "" );
+			glue = arg_list[1].replace("\"", "" );
 		    if(arg_list.count() >= 3)
-			before = arg_list[2].tqreplace("\"", "" );
+			before = arg_list[2].replace("\"", "" );
 		    if(arg_list.count() == 4)
-			after = arg_list[3].tqreplace("\"", "" );
+			after = arg_list[3].replace("\"", "" );
 		    const TQStringList &var = place[varMap(arg_list.first())];
 		    if(!var.isEmpty())
-			tqreplacement = before + var.join(glue) + after;
+			replacement = before + var.join(glue) + after;
 		}
 	    } else if(val.lower() == "split") {
 		if(arg_list.count() < 2 || arg_list.count() > 3) {
@@ -1297,15 +1297,15 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi
 		    for(TQStringList::Iterator vit = var.begin(); vit != var.end(); ++vit) {
 			TQStringList lst = TQStringList::split(sep, (*vit));
 			for(TQStringList::Iterator spltit = lst.begin(); spltit != lst.end(); ++spltit) {
-			    if(!tqreplacement.isEmpty())
-				tqreplacement += join;
-			    tqreplacement += (*spltit);
+			    if(!replacement.isEmpty())
+				replacement += join;
+			    replacement += (*spltit);
 			}
 		    }
 		}
-	    } else if(val.lower() == "tqfind") {
+	    } else if(val.lower() == "find") {
 		if(arg_list.count() != 2) {
-		    fprintf(stderr, "%s:%d tqfind(var, str) requires two arguments\n",
+		    fprintf(stderr, "%s:%d find(var, str) requires two arguments\n",
 			    parser.file.latin1(), parser.line_no);
 		} else {
 		    TQRegExp regx(arg_list[1]);
@@ -1313,9 +1313,9 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi
 		    for(TQStringList::ConstIterator vit = var.begin();
 			vit != var.end(); ++vit) {
 			if(regx.search(*vit) != -1) {
-			    if(!tqreplacement.isEmpty())
-				tqreplacement += " ";
-			    tqreplacement += (*vit);
+			    if(!replacement.isEmpty())
+				replacement += " ";
+			    replacement += (*vit);
 			}
 		    }
 		}
@@ -1335,7 +1335,7 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi
 				buff[i] = ' ';
 			}
 			buff[read_in] = '\0';
-			tqreplacement += buff;
+			replacement += buff;
 		    }
 		}
 	    } else if(val.lower() == "files") {
@@ -1345,16 +1345,16 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi
 		} else {
 		    TQString dir, regex = arg_list[0];
 		    regex = Option::fixPathToLocalOS(regex);
-		    regex.tqreplace("\"", "");
-		    if(regex.tqfindRev(TQDir::separator()) != -1) {
-			dir = regex.left(regex.tqfindRev(TQDir::separator()) + 1);
+		    regex.replace("\"", "");
+		    if(regex.findRev(TQDir::separator()) != -1) {
+			dir = regex.left(regex.findRev(TQDir::separator()) + 1);
 			regex = regex.right(regex.length() - dir.length());
 		    }
 		    TQDir d(dir, regex);
 		    for(int i = 0; i < (int)d.count(); i++) {
-			if(!tqreplacement.isEmpty())
-			    tqreplacement += " ";
-			tqreplacement += dir + d[i];
+			if(!replacement.isEmpty())
+			    replacement += " ";
+			replacement += dir + d[i];
 		    }
 		}
 	    } else if(val.lower() == "prompt") {
@@ -1368,9 +1368,9 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi
 		    TQString msg = arg_list.first();
 		    if((msg.startsWith("\"") || msg.startsWith("'")) && msg.endsWith(msg.left(1)))
 			msg = msg.mid(1, msg.length()-2);
-		    msg.tqreplace(TQString("${TQMAKE_FILE}"), parser.file.latin1());
-		    msg.tqreplace(TQString("${TQMAKE_LINE_NUMBER}"), TQString::number(parser.line_no));
-		    msg.tqreplace(TQString("${TQMAKE_DATE}"), TQDateTime::tqcurrentDateTime().toString());
+		    msg.replace(TQString("${TQMAKE_FILE}"), parser.file.latin1());
+		    msg.replace(TQString("${TQMAKE_LINE_NUMBER}"), TQString::number(parser.line_no));
+		    msg.replace(TQString("${TQMAKE_DATE}"), TQDateTime::tqcurrentDateTime().toString());
 		    doVariableReplace(msg, place);
 		    fixEnvVariables(msg);
 		    if(!msg.endsWith("?"))
@@ -1380,20 +1380,20 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi
 		    TQFile qfile;
 		    if(qfile.open(IO_ReadOnly, stdin)) {
 			TQTextStream t( TQT_TQIODEVICE(&qfile) );
-			tqreplacement = t.readLine();
+			replacement = t.readLine();
 		    }
 		}
 	    } else {
-		fprintf(stderr, "%s:%d: Unknown tqreplace function: %s\n",
+		fprintf(stderr, "%s:%d: Unknown replace function: %s\n",
 			parser.file.latin1(), parser.line_no, val.latin1());
 	    }
 	}
-	//actually do tqreplacement now..
+	//actually do replacement now..
 	int mlen = var_incr - var_begin;
-	debug_msg(2, "Project Parser [var tqreplace]: '%s' :: %s -> %s", str.latin1(),
-		  TQT_TQSTRING(str.mid(var_begin, mlen)).latin1(), tqreplacement.latin1());
-	str.tqreplace(var_begin, mlen, tqreplacement);
-	var_begin += tqreplacement.length();
+	debug_msg(2, "Project Parser [var replace]: '%s' :: %s -> %s", str.latin1(),
+		  TQT_TQSTRING(str.mid(var_begin, mlen)).latin1(), replacement.latin1());
+	str.replace(var_begin, mlen, replacement);
+	var_begin += replacement.length();
     }
     return str;
 }
diff --git a/tqtinterface/qt4/qmake/project.h b/tqtinterface/qt4/qmake/project.h
index 62913b4..ec8104a 100644
--- a/tqtinterface/qt4/qmake/project.h
+++ b/tqtinterface/qt4/qmake/project.h
@@ -100,7 +100,7 @@ inline TQString TQMakeProject::configFile()
 { return cfile; }
 
 inline bool TQMakeProject::isEmpty(const TQString &v)
-{ return !vars.tqcontains(v) || vars[v].isEmpty(); }
+{ return !vars.contains(v) || vars[v].isEmpty(); }
 
 inline TQStringList &TQMakeProject::values(const TQString &v)
 { return vars[v]; }
diff --git a/tqtinterface/qt4/qmake/property.cpp b/tqtinterface/qt4/qmake/property.cpp
index dfb200e..dfb7301 100644
--- a/tqtinterface/qt4/qmake/property.cpp
+++ b/tqtinterface/qt4/qmake/property.cpp
@@ -98,7 +98,7 @@ TQMakeProperty::value(TQString v, bool just_check)
 
     if(initSettings()) {
 	bool ok;
-	int slash = v.tqfindRev('/');
+	int slash = v.findRev('/');
 	TQString ret = sett->readEntry(keyBase(slash == -1) + v, TQString::null, &ok);
 	if(!ok) {
 	    TQString version = qmake_version();