rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

11 files changed, 20 insertions, 20 deletions

diff --git a/parts/appwizard/common/COPYING.LIB b/parts/appwizard/common/COPYING.LIB
index 4da30f2f..789c31ee 100644
--- a/parts/appwizard/common/COPYING.LIB
+++ b/parts/appwizard/common/COPYING.LIB
@@ -123,7 +123,7 @@ included without limitation in the term "modification".)
 
   "Source code" for a work means the preferred form of the work for
 making modifications to it.  For a library, complete source code means
-all the source code for all modules it tqcontains, plus any associated
+all the source code for all modules it contains, plus any associated
 interface definition files, plus the scripts used to control compilation
 and installation of the library.
 
diff --git a/parts/appwizard/common/gnome/macros/autogen.sh b/parts/appwizard/common/gnome/macros/autogen.sh
index 33acff24..70273913 100644
--- a/parts/appwizard/common/gnome/macros/autogen.sh
+++ b/parts/appwizard/common/gnome/macros/autogen.sh
@@ -79,7 +79,7 @@ xlc )
   am_opt=--include-deps;;
 esac
 
-for coin in `tqfind $srcdir -name configure.in -print`
+for coin in `find $srcdir -name configure.in -print`
 do 
   dr=`dirname $coin`
   if test -f $dr/NO-AUTO-GEN; then
diff --git a/parts/appwizard/common/gnome/macros/curses.m4 b/parts/appwizard/common/gnome/macros/curses.m4
index 21d90b01..3dd4ffaa 100644
--- a/parts/appwizard/common/gnome/macros/curses.m4
+++ b/parts/appwizard/common/gnome/macros/curses.m4
@@ -11,7 +11,7 @@ dnl   @CURSES_INCLUDEDIR@ and @CURSES_LIBS@ will be available in
 dnl   Makefile.in's
 dnl - Modify the following configure variables (these are the only
 dnl   curses.m4 variables you can access from within configure.in)
-dnl   CURSES_INCLUDEDIR - tqcontains -I's and possibly -DRENAMED_CURSES if
+dnl   CURSES_INCLUDEDIR - contains -I's and possibly -DRENAMED_CURSES if
 dnl                       an ncurses.h that's been renamed to curses.h
 dnl                       is found.
 dnl   CURSES_LIBS       - sets -L and -l's appropriately
diff --git a/parts/appwizard/common/gnome/macros/gnome-fileutils.m4 b/parts/appwizard/common/gnome/macros/gnome-fileutils.m4
index 5c9f976f..7c11a785 100644
--- a/parts/appwizard/common/gnome/macros/gnome-fileutils.m4
+++ b/parts/appwizard/common/gnome/macros/gnome-fileutils.m4
@@ -38,7 +38,7 @@ fi
 list_mounted_fs=
 
 # If the getmntent function is available but not in the standard library,
-# make sure LIBS tqcontains -lsun (on Irix4) or -lseq (on PTX).
+# make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX).
 AC_FUNC_GETMNTENT
 
 # This test must precede the ones for getmntent because Unicos-9 is
diff --git a/parts/appwizard/common/gnome2/macros/autogen.sh b/parts/appwizard/common/gnome2/macros/autogen.sh
index 9cd3c7fe..ac9e0b68 100755
--- a/parts/appwizard/common/gnome2/macros/autogen.sh
+++ b/parts/appwizard/common/gnome2/macros/autogen.sh
@@ -216,7 +216,7 @@ want_intltool=false
 want_pkg_config=false
 want_gtk_doc=false
 
-configure_files="`tqfind $srcdir -name '{arch}' -prune -o -name configure.ac -print -or -name configure.in -print`"
+configure_files="`find $srcdir -name '{arch}' -prune -o -name configure.ac -print -or -name configure.in -print`"
 for configure_ac in $configure_files; do
     if grep "^A[CM]_PROG_LIBTOOL" $configure_ac >/dev/null; then
 	want_libtool=true
diff --git a/parts/appwizard/common/gnome2/macros/curses.m4 b/parts/appwizard/common/gnome2/macros/curses.m4
index d7beb9bf..5307e13d 100644
--- a/parts/appwizard/common/gnome2/macros/curses.m4
+++ b/parts/appwizard/common/gnome2/macros/curses.m4
@@ -11,7 +11,7 @@ dnl   @CURSES_INCLUDEDIR@ and @CURSES_LIBS@ will be available in
 dnl   Makefile.in's
 dnl - Modify the following configure variables (these are the only
 dnl   curses.m4 variables you can access from within configure.in)
-dnl   CURSES_INCLUDEDIR - tqcontains -I's and possibly -DRENAMED_CURSES if
+dnl   CURSES_INCLUDEDIR - contains -I's and possibly -DRENAMED_CURSES if
 dnl                       an ncurses.h that's been renamed to curses.h
 dnl                       is found.
 dnl   CURSES_LIBS       - sets -L and -l's appropriately
diff --git a/parts/appwizard/common/incadmin/config.guess b/parts/appwizard/common/incadmin/config.guess
index 494d04c6..3ddf6182 100755
--- a/parts/appwizard/common/incadmin/config.guess
+++ b/parts/appwizard/common/incadmin/config.guess
@@ -1135,7 +1135,7 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-plan9
 	exit 0 ;;
     i*86:OS/2:*:*)
-	# If we were able to tqfind `uname', then EMX Unix compatibility
+	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
 	echo ${UNAME_MACHINE}-pc-os2-emx
 	exit 0 ;;
diff --git a/parts/appwizard/common/incadmin/install-sh b/parts/appwizard/common/incadmin/install-sh
index f811e309..36f96f3e 100755
--- a/parts/appwizard/common/incadmin/install-sh
+++ b/parts/appwizard/common/incadmin/install-sh
@@ -126,7 +126,7 @@ else
 
 # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
 # might cause directories to be created, which would be especially bad
-# if $src (and thus $dsttmp) tqcontains '*'.
+# if $src (and thus $dsttmp) contains '*'.
 
 	if [ -f "$src" ] || [ -d "$src" ]
 	then
diff --git a/parts/appwizard/common/incadmin/ltmain.sh b/parts/appwizard/common/incadmin/ltmain.sh
index 8f29b4b9..0cb90869 100644
--- a/parts/appwizard/common/incadmin/ltmain.sh
+++ b/parts/appwizard/common/incadmin/ltmain.sh
@@ -1306,7 +1306,7 @@ func_mode_compile ()
     elif test "$need_locks" = warn; then
       if test -f "$lockfile"; then
 	$ECHO "\
-*** ERROR, $lockfile exists and tqcontains:
+*** ERROR, $lockfile exists and contains:
 `cat $lockfile 2>/dev/null`
 
 This indicates that another process is trying to use the same
@@ -1358,7 +1358,7 @@ compiler."
       if test "$need_locks" = warn &&
 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
 	$ECHO "\
-*** ERROR, $lockfile tqcontains:
+*** ERROR, $lockfile contains:
 `cat $lockfile 2>/dev/null`
 
 but it should contain:
@@ -1407,7 +1407,7 @@ compiler."
       if test "$need_locks" = warn &&
 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
 	$ECHO "\
-*** ERROR, $lockfile tqcontains:
+*** ERROR, $lockfile contains:
 `cat $lockfile 2>/dev/null`
 
 but it should contain:
@@ -1674,7 +1674,7 @@ func_mode_execute ()
 	  dir="$dir/$objdir"
 	else
 	  if test ! -f "$dir/$dlname"; then
-	    func_fatal_error "cannot tqfind \`$dlname' in \`$dir' or \`$dir/$objdir'"
+	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
 	  fi
 	fi
 	;;
@@ -2062,7 +2062,7 @@ func_mode_install ()
 	  if test "$#" -gt 0; then
 	    # Delete the old symlinks, and create new ones.
 	    # Try `ln -sf' first, because the `ln' binary might depend on
-	    # the symlink we tqreplace!  Solaris /bin/ln does not understand -f,
+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
 	    # so we also need to try rm && ln -s.
 	    for linkname
 	    do
@@ -2684,7 +2684,7 @@ func_extract_archives ()
         func_extract_an_archive "$my_xdir" "$my_xabs"
 	;;
       esac
-      my_oldobjs="$my_oldobjs "`tqfind $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
     done
 
     func_extract_archives_result="$my_oldobjs"
@@ -3400,7 +3400,7 @@ EOF
   newargz = XMALLOC (char *, argc + 1);
   tmp_pathspec = find_executable (argv[0]);
   if (tmp_pathspec == NULL)
-    lt_fatal ("Couldn't tqfind %s", argv[0]);
+    lt_fatal ("Couldn't find %s", argv[0]);
   LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
 			  tmp_pathspec));
 
@@ -7843,7 +7843,7 @@ EOF
 	    func_emit_cwrapperexe_src > $cwrappersource
 
 	    # The wrapper executable is built using the $host compiler,
-	    # because it tqcontains $host paths and files. If cross-
+	    # because it contains $host paths and files. If cross-
 	    # compiling, it, like the target executable, must be
 	    # executed on the $host or under an emulation environment.
 	    $opt_dry_run || {
@@ -8339,7 +8339,7 @@ func_mode_uninstall ()
 	      func_source $dir/$noexename
 	    fi
 
-	    # note $name still tqcontains .exe if it was in $file originally
+	    # note $name still contains .exe if it was in $file originally
 	    # as does the version of $file that was added into $rmfiles
 	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
 	    if test "$fast_install" = yes && test -n "$relink_command"; then
diff --git a/parts/appwizard/common/incadmin/missing b/parts/appwizard/common/incadmin/missing
index a311c33a..2c025eb6 100755
--- a/parts/appwizard/common/incadmin/missing
+++ b/parts/appwizard/common/incadmin/missing
@@ -150,7 +150,7 @@ WARNING: \`$1' is missing on your system.  You should only need it if
          you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
          You might want to install the \`Automake' and \`Perl' packages.
          Grab them from any GNU archive site."
-    tqfind . -type f -name Makefile.am -print |
+    find . -type f -name Makefile.am -print |
 	   sed 's/\.am$/.in/' |
 	   while read f; do touch "$f"; done
     ;;
diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py
index b0e51997..f74943dd 100644
--- a/parts/appwizard/common/scons/admin/kde.py
+++ b/parts/appwizard/common/scons/admin/kde.py
@@ -157,8 +157,8 @@ def detect_kde(env):
 		if not libdir:
 			libdir=execprefix+"/lib"+libsuffix
 
-		subst_vars = lambda x: x.tqreplace('${exec_prefix}', execprefix).tqreplace('${datadir}',datadir).tqreplace('${libdir}', libdir)
-		debian_fix = lambda x: x.tqreplace('/usr/share', '${datadir}')
+		subst_vars = lambda x: x.replace('${exec_prefix}', execprefix).replace('${datadir}',datadir).replace('${libdir}', libdir)
+		debian_fix = lambda x: x.replace('/usr/share', '${datadir}')
 		env['KDEBIN']   = subst_vars(os.popen('kde-config --install exe').read().strip())
 		env['KDEAPPS']  = subst_vars(os.popen('kde-config --install apps').read().strip())		
 		env['KDEDATA']  = subst_vars(os.popen('kde-config --install data').read().strip())