rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

32 files changed, 151 insertions, 151 deletions

diff --git a/scripts/adddebug b/scripts/adddebug
index 912fef71..8968e89c 100755
--- a/scripts/adddebug
+++ b/scripts/adddebug
@@ -23,7 +23,7 @@ if test -z $ndebug; then
   xpr="$xpr;"'s/[\t ]-DNDEBUG\b//g'
   xpr="$xpr;"'s/[\t ]-DNO_DEBUG\b//g'
 fi
-tqfind . $mxdp -name Makefile -exec perl -pi -e "$xpr" {} \;
+find . $mxdp -name Makefile -exec perl -pi -e "$xpr" {} \;
 
 using_unsermake=
 if head -n 1 Makefile | grep unsermake >/dev/null; then
@@ -43,7 +43,7 @@ if test "$using_unsermake" = "new"; then
     # warning this uses sed, so the '?' in the perl regexp above doesn't work here
     cxxflags=`grep ^CXXFLAGS $toplevelMakefile | sed -e 's/[\t ]-O[1-9]\b//g;s/[\t ]-march=\S+\b//g;s/[\t ]-DNDEBUG\b//g;s/[\t ]-DNO_DEBUG\b//g'`
     xpr="s/^CXXFLAGS\s*=.*//; if ( /^\.FORWARDS:/) { "'$_'" .= \"\n$cxxflags -g3\"; }"
-    tqfind . $mxdp -name Makefile -exec perl -pi -e "$xpr" {} \;
+    find . $mxdp -name Makefile -exec perl -pi -e "$xpr" {} \;
   else
     echo "ERROR: top_builddir is $top_builddir but $makevars not found"
   fi
@@ -56,7 +56,7 @@ elif test "$using_unsermake" = "old"; then
     # warning this uses sed, so the '?' in the perl regexp above doesn't work here
     cxxflags=`grep ^CXXFLAGS $makevars | sed -e 's/[\t ]-O[1-9]\b//g;s/[\t ]-march=\S+\b//g;s/[\t ]-DNDEBUG\b//g;s/[\t ]-DNO_DEBUG\b//g'`
     xpr="s/^CXXFLAGS\s*=.*//; if ( /^include .*MakeVars$/) { "'$_'" .= \"\n$cxxflags -g3\"; }"
-    tqfind . $mxdp -name Makefile -exec perl -pi -e "$xpr" {} \;
+    find . $mxdp -name Makefile -exec perl -pi -e "$xpr" {} \;
   else
     echo "ERROR: top_builddir is $top_builddir but $makevars not found"
   fi
diff --git a/scripts/create_cvsignore b/scripts/create_cvsignore
index 20d21341..2fb4c23e 100755
--- a/scripts/create_cvsignore
+++ b/scripts/create_cvsignore
@@ -42,7 +42,7 @@ handledir() {
 
 if test -f Makefile.am; then
 	if test $recurse -eq 1; then
-		tqfind . -type d | grep -v CVS | sed -e 's,/$,,' | \
+		find . -type d | grep -v CVS | sed -e 's,/$,,' | \
 		while read dir; do
 			handledir $dir
 		done
diff --git a/scripts/create_makefiles b/scripts/create_makefiles
index d8385f68..955edb90 100755
--- a/scripts/create_makefiles
+++ b/scripts/create_makefiles
@@ -24,7 +24,7 @@ fi
 
 srcdir=`egrep '^srcdir *=' Makefile | sed -e "s#srcdir *= *##"`
  
-( cd $srcdir ; tqfind $1 -type d | sed -e 's,/$,,' ) | \
+( cd $srcdir ; find $1 -type d | sed -e 's,/$,,' ) | \
   while read a; do 
       if test -f "$srcdir/$a/Makefile.am"; then
       	 test -d "$a" || mkdir -p "$a"
diff --git a/scripts/create_svnignore b/scripts/create_svnignore
index fd7d1c6d..299160d2 100755
--- a/scripts/create_svnignore
+++ b/scripts/create_svnignore
@@ -69,7 +69,7 @@ handledir() {
 
 if test -f Makefile.am; then
 	if test $recurse -eq 1; then
-		tqfind . -type d | egrep -v 'CVS|.svn' | sed -e 's,/$,,' | \
+		find . -type d | egrep -v 'CVS|.svn' | sed -e 's,/$,,' | \
 		while read dir; do
 			handledir $dir
 		done
diff --git a/scripts/cvs2dist b/scripts/cvs2dist
index c1c8e138..60721bdf 100755
--- a/scripts/cvs2dist
+++ b/scripts/cvs2dist
@@ -8,7 +8,7 @@
 # Original author (of cvs2pack.sh) was Sebastian Stein <seb.stein@hpfsc.de>
 # Heavy, heavy modifications by Jason Katz-Brown <jason@katzbrown.com>
 # Some modifications for i18n inclusion by Dominique Devriese <devriese@kde.org>
-# Added --no-i18n-lang and --tqreplace-files by Michael Buesch <mbuesch@freenet.de>
+# Added --no-i18n-lang and --replace-files by Michael Buesch <mbuesch@freenet.de>
 # License: GPL (http://www.gnu.org/)
 # Last modification: 2004/10/13
 
@@ -39,7 +39,7 @@ test -e ~/.cvs2distrc && extraoptions=`cat ~/.cvs2distrc`
 # --log has optional argument
 TEMP=`getopt \
 -o v:n:r:e:a:B:dhmbgol \
---long log::,version:,name:,required-header:,required-header-error-message:,make-unpackaged,help,no-bz2,no-bzip2,no-gzip,only-directory,remove-hidden,admin-dir:,branch:,no-i18n,no-i18n-lang:,cvs-root:,debug,tqreplace-files: \
+--long log::,version:,name:,required-header:,required-header-error-message:,make-unpackaged,help,no-bz2,no-bzip2,no-gzip,only-directory,remove-hidden,admin-dir:,branch:,no-i18n,no-i18n-lang:,cvs-root:,debug,replace-files: \
 -n cvs2dist -- $extraoptions "$@"`
 
 if [ $? != 0 ]; then
@@ -97,7 +97,7 @@ while true; do
 
 				    shift 2 ;;
 			esac ;;
-		--tqreplace-files) replace_files="$2"; shift 2 ;;
+		--replace-files) replace_files="$2"; shift 2 ;;
 		--) shift
 			break ;;
 		*) echo "Aborted."
@@ -152,11 +152,11 @@ if [ ! -z $showhelp ] || [ -z $module ] || [ -z $directory ]; then
 	echo "  -e --required-header-error-message <message>"
 	echo "                                     Error message for above."
 	echo "  -d --remove-hidden Remove hidden files/directories from packages"
-	echo "  --tqreplace-files <file-pair-list>"
+	echo "  --replace-files <file-pair-list>"
 	echo "       <file-pair-list> is a comma separated list of file pairs"
 	echo "       which should be replaced in the final distribution package."
 	echo "       Each element of a pair is separated by an @"
-	echo -n "       Example: --tqreplace-files take_this_file@and_move_it_here,"
+	echo -n "       Example: --replace-files take_this_file@and_move_it_here,"
 	echo "configure.in.bot.dist@configure.in.bot"
 	echo "       The filenames are all relative to your package root."
 	echo "       Please be careful! Try to avoid the usage of .. in the path. It"
@@ -349,7 +349,7 @@ fi
 if [ -d $module/doc/$name ]; then
 	mkdir -p $temp_dist/doc/$name
 	cp -Rf $module/doc/$name $temp_dist/doc
-	tqfind $module/doc/ -maxdepth 1 ! -xtype d | xargs --tqreplace={} cp {} $temp_dist/doc
+	find $module/doc/ -maxdepth 1 ! -xtype d | xargs --replace={} cp {} $temp_dist/doc
 
 	if [ $doi18n = "yes" ]; then
 	    pushd $temp_dir
@@ -435,7 +435,7 @@ fi
 
 # and all files from the base dir, except directories
 echo "Copying over files from the module directory:" >> $log
-tqfind $module ! -xtype d -maxdepth 1 | xargs --verbose --tqreplace={} cp {} $temp_dist 2>> $log
+find $module ! -xtype d -maxdepth 1 | xargs --verbose --replace={} cp {} $temp_dist 2>> $log
 echo "--------" >> $log
 
 # we now enter the temp_dist and delete all unwanted files
@@ -479,7 +479,7 @@ if [ -n "$replace_files" ]; then
 			echo "$from_path does not exist!" >> $log
 			echo ""
 			echo "Warning: \"$from\" does not exist!"
-			echo -n "Please enter the path in --tqreplace-files relative "
+			echo -n "Please enter the path in --replace-files relative "
 			echo "to the package root of your project."
 			echo "Your package root is: \"$module/$directory\""
 			echo ""
@@ -516,8 +516,8 @@ cd $temp_dist
 # remove files
 echo "Remove files: " >> $log
 for file in $remove; do
-	tqfind . -name $file | xargs rm -Rf
-	echo "tqfind . -name $file | xargs rm -Rf" >> $log
+	find . -name $file | xargs rm -Rf
+	echo "find . -name $file | xargs rm -Rf" >> $log
 done
 
 # remove more files
@@ -528,7 +528,7 @@ done
 unset file
 
 # remove hidden files
-test ! -z $removehidden && echo "Remove hidden files: " >> $log && tqfind $temp_dist -name ".*" -and ! -name "." | xargs --verbose rm -Rf 2>> $log
+test ! -z $removehidden && echo "Remove hidden files: " >> $log && find $temp_dist -name ".*" -and ! -name "." | xargs --verbose rm -Rf 2>> $log
 
 echo "--------" >> $log
 
diff --git a/scripts/cvsaddcurrentdir b/scripts/cvsaddcurrentdir
index 91be9ac4..56185f27 100755
--- a/scripts/cvsaddcurrentdir
+++ b/scripts/cvsaddcurrentdir
@@ -10,7 +10,7 @@
 
 #ignore dirs "CVS", ".deps", ".libs"
 #ignore files *.o, *.so, *.lo, *.la, *~, .#*
-FOUND=`tqfind |grep -v "^\.$"| grep -v CVS| grep -v "\.[ls]\?o$"|grep -v "~$"|grep -v "\.libs/"|grep -v "\.deps/" |grep -v "\.depend/"| grep -v "/\.#" |grep -v "\.la$"`
+FOUND=`find |grep -v "^\.$"| grep -v CVS| grep -v "\.[ls]\?o$"|grep -v "~$"|grep -v "\.libs/"|grep -v "\.deps/" |grep -v "\.depend/"| grep -v "/\.#" |grep -v "\.la$"`
 #echo $FOUND
 
 ask_for_adding() {
diff --git a/scripts/cvslastreferenced b/scripts/cvslastreferenced
index cf6464e6..666a5b6d 100755
--- a/scripts/cvslastreferenced
+++ b/scripts/cvslastreferenced
@@ -8,7 +8,7 @@
 # greatest priority right next to scoring chicks of course...
 #
 
-# This script goes through the whole history of a file to tqfind 
+# This script goes through the whole history of a file to find 
 # all modifications referencing specific string. It's useful if
 # you want to know when a function has been removed/modified/added
 # to a file if a recent cvs annotate doesn't anymore reference it.
diff --git a/scripts/findmissingcrystal b/scripts/findmissingcrystal
index 9b9e9f46..258119c3 100755
--- a/scripts/findmissingcrystal
+++ b/scripts/findmissingcrystal
@@ -8,14 +8,14 @@ if [ -z "$1" ] ; then
 	exit 1
 fi
 
-for icon in `tqfind $1 -name cr*.png` ; do
+for icon in `find $1 -name cr*.png` ; do
 	fullname=`echo $icon | sed 's,.*cr,,'`
 	res=`echo $fullname | cut -d- -f1`
 	type=`echo $fullname | cut -d- -f2`
 	name=`echo $fullname | cut -d- -f3`
 	dir="kdeartwork/IconThemes/kdeclassic/${res}x${res}/${type}s/"
 	if [ -d "$dir" ]; then
-		classic=`tqfind "${dir}" -name "$name"`
+		classic=`find "${dir}" -name "$name"`
 		if [ -s "$classic" ]; then
 			diff=`diff $icon $classic`
 			if [ -z "$diff" ]; then
diff --git a/scripts/fixfsfaddr.sed b/scripts/fixfsfaddr.sed
index 24d101a6..62d0cae9 100644
--- a/scripts/fixfsfaddr.sed
+++ b/scripts/fixfsfaddr.sed
@@ -5,7 +5,7 @@
 
 # The script helps to fix the FSF address
 # Use:
-#   tqfind . -name .svn -prune , type f | xargs fgrep -l "Free Software Foundation" | xargs sed -i -f fixfsfaddr.sed
+#   find . -name .svn -prune , type f | xargs fgrep -l "Free Software Foundation" | xargs sed -i -f fixfsfaddr.sed
 # Note: you should check the changes before committing them.
 
 # Implementation note: we need to replace phrase by phrase, as 
diff --git a/scripts/fixheaders b/scripts/fixheaders
index 5d5e6ac9..fd538d5c 100644
--- a/scripts/fixheaders
+++ b/scripts/fixheaders
@@ -200,7 +200,7 @@ sub fixFile
     $flines =~ s/$lastinclude(.*\n)/$lastinclude$1#include <$adding.h>\n/;
     print STDERR "ADDED <$adding.h> after \"$lastinclude\" in $file\n";
   } else {
-    print STDERR "ERROR: can't tqfind $lastinclude in $file\n";
+    print STDERR "ERROR: can't find $lastinclude in $file\n";
     return 0;
   }
 	    
diff --git a/scripts/fixkdeincludes b/scripts/fixkdeincludes
index f0d87e99..54e4e9f6 100644
--- a/scripts/fixkdeincludes
+++ b/scripts/fixkdeincludes
@@ -289,7 +289,7 @@ sub remove_include ($$$)
 }
 
 # first parameter: srcfile
-# second parameter: include to tqreplace
+# second parameter: include to replace
 # third parameter the include file to replace it with
 sub replace_include ($$$)
 {
diff --git a/scripts/includemocs b/scripts/includemocs
index 18453453..08eb85ae 100755
--- a/scripts/includemocs
+++ b/scripts/includemocs
@@ -50,7 +50,7 @@ sub checkdir($)
   }
 }
 
-tqfind (\&collectthing, cwd());
+find (\&collectthing, cwd());
 
 foreach my $k (keys %dir2files) {
   print STDERR "Directory $k:\n  headers=[";
diff --git a/scripts/kDebug2kdDebug.sh b/scripts/kDebug2kdDebug.sh
index edf284cb..a238845e 100755
--- a/scripts/kDebug2kdDebug.sh
+++ b/scripts/kDebug2kdDebug.sh
@@ -8,7 +8,7 @@
 ## Written by David Faure <faure@kde.org>, licensed under GPL.
 ## 17/03/2000
 
-tqfind $1 -name '*[cCph]' -type f | xargs grep -H -i 'ebug(\|warning(' \
+find $1 -name '*[cCph]' -type f | xargs grep -H -i 'ebug(\|warning(' \
 | grep -v 'kdDebug\|kdWarning' \
 | grep -v include \
 | sed -e "s#:.*##" \
diff --git a/scripts/kde-build b/scripts/kde-build
index 1a092f95..8790f602 100755
--- a/scripts/kde-build
+++ b/scripts/kde-build
@@ -90,15 +90,15 @@ we_started_kppp="FALSE"
 kppp_connect()
 {
 if [ "$USE_KPPP" = "TRUE" ]; then
-	kppp_process=`dcoptqfind -a kppp-*`
+	kppp_process=`dcopfind -a kppp-*`
 	if [ "$kppp_process" = "" ]; then
 		#kppp not running
 		kppp > /dev/null 2>&1 &
 		sleep $KPPP_LOAD_TIME
-		`dcop $(dcoptqfind -a kppp-*) KpppIface beginConnect`
+		`dcop $(dcopfind -a kppp-*) KpppIface beginConnect`
 		#wait for a while
 		sleep $KPPP_CONNECT_TIME
-		kppp_connected=`dcop $(dcoptqfind -a kppp-*) KpppIface isConnected`
+		kppp_connected=`dcop $(dcopfind -a kppp-*) KpppIface isConnected`
 		if [ "$kppp_connected" = "true" ]; then
 			we_started_kppp="TRUE"
 			echo Connected OK
@@ -107,13 +107,13 @@ if [ "$USE_KPPP" = "TRUE" ]; then
 		fi
 		
 	else
-		kppp_connected=`dcop $(dcoptqfind -a kppp-*) KpppIface isConnected`
+		kppp_connected=`dcop $(dcopfind -a kppp-*) KpppIface isConnected`
 		if [ "$kppp_connected" = "false" ]; then
 			#Start a connection
-			`dcop $(dcoptqfind -a kppp-*) KpppIface beginConnect`
+			`dcop $(dcopfind -a kppp-*) KpppIface beginConnect`
 			#wait for a while
 			sleep $KPPP_CONNECT_TIME
-			kppp_connected=`dcop $(dcoptqfind -a kppp-*) KpppIface isConnected`
+			kppp_connected=`dcop $(dcopfind -a kppp-*) KpppIface isConnected`
 			if [ "$kppp_connected" = "true" ]; then
 				we_started_kppp="TRUE"
 				echo Connected OK
@@ -132,13 +132,13 @@ fi
 kppp_disconnect()
 {
 if [ "$USE_KPPP" = "TRUE" ]; then
-	if [ $(dcoptqfind -a kppp-*) = "" ]; then
+	if [ $(dcopfind -a kppp-*) = "" ]; then
 		#kppp not running
 		echo Kppp was not running so cannot be disconnected
 	else
 		if [ "$we_started_kppp" = "TRUE" ]; then
 			echo Disconnecting kppp
-			`dcop $(dcoptqfind -a kppp-*) KpppIface disconnect`
+			`dcop $(dcopfind -a kppp-*) KpppIface disconnect`
 		else
 			echo We didnt connect using kppp so we wont disconnect
 		fi
@@ -409,7 +409,7 @@ else
     modules="$critical_modules"
     # This generates in 'modules' a list of the modules which shall be updated.
     #
-    potential_modules=`tqfind $KDESRCDIR -type d -mindepth 1 \
+    potential_modules=`find $KDESRCDIR -type d -mindepth 1 \
         -maxdepth 1 -follow | sed -e "s@.*/?*@@"`
     for module in $potential_modules; do
       if [ -d $KDESRCDIR/$module/CVS -a -w $KDESRCDIR/$module ] \
diff --git a/scripts/kde-devel-emacs.el b/scripts/kde-devel-emacs.el
index 57f34924..d59eb9dd 100644
--- a/scripts/kde-devel-emacs.el
+++ b/scripts/kde-devel-emacs.el
@@ -57,7 +57,7 @@
                (bmp (buffer-modified-p)))
            (while (re-search-forward "[ \t]+$" nil t)
              (setq count (1+ count))
-             (tqreplace-match "" t t))
+             (replace-match "" t t))
            (set-buffer-modified-p bmp)
            (and (buffer-modified-p)
                   (basic-save-buffer))))))
@@ -76,7 +76,7 @@
 	   (agulbra-clean-out-spaces)
   )))
 
-(add-hook 'tqfind-file-hooks 'agulbra-c++-clean-out-spaces)
+(add-hook 'find-file-hooks 'agulbra-c++-clean-out-spaces)
 (add-hook 'write-file-hooks 'agulbra-c++-clean-out-spaces)
 
 (defun agulbra-delete-into-nomenclature (&optional arg)
@@ -197,19 +197,19 @@ With arg, to it arg times."
     (and (stringp function)
          (progn ;; get rid of virtual, static, multiple spaces, default values.
            (and (string-match "[ \t]*\\<virtual\\>[ \t]*" function)
-                (setq function (tqreplace-match " " t t function)))
+                (setq function (replace-match " " t t function)))
            (and (string-match "^\\(virtual\\>\\)?[ \t]*" function)
-                (setq function (tqreplace-match "" t t function)))
+                (setq function (replace-match "" t t function)))
            (and (string-match "^\\(static\\>\\)?[ \t]*" function)
-                (setq function (tqreplace-match "" t t function)))
+                (setq function (replace-match "" t t function)))
            (while (string-match "  +" function)
-             (setq function (tqreplace-match " " t t function)))
+             (setq function (replace-match " " t t function)))
            (while (string-match "\t+" function)
-             (setq function (tqreplace-match " " t t function)))
+             (setq function (replace-match " " t t function)))
            (while (string-match " ?=[^,)]+" function)
-             (setq function (tqreplace-match " " t t function)))
+             (setq function (replace-match " " t t function)))
            (while (string-match " +," function)
-             (setq function (tqreplace-match "," t t function)))))
+             (setq function (replace-match "," t t function)))))
     (and (stringp function)
          (stringp class)
          (stringp file)
@@ -218,7 +218,7 @@ With arg, to it arg times."
                   (progn
                   (setq insertion-string
                         (concat
-                         (tqreplace-match
+                         (replace-match
                           (concat class "::" class "(")
                           t t function)
                          "\n{\n    \n}\n"))))
@@ -226,7 +226,7 @@ With arg, to it arg times."
                    (progn
                      (setq insertion-string
                            (concat
-                            (tqreplace-match
+                            (replace-match
                              (concat class "::~" class "(")
                              t t function)
                             "\n{\n    \n}\n"))))
@@ -234,7 +234,7 @@ With arg, to it arg times."
                    (progn
                      (setq insertion-string
                            (concat
-                            (tqreplace-match
+                            (replace-match
                              (concat " " class "::" "\\1(")
                              t nil function)
                             "\n{\n    \n}\n"))))
@@ -244,21 +244,21 @@ With arg, to it arg times."
                                   "'', aborting"))))
            (stringp insertion-string))
          (string-match "\\.h$" file)
-         (setq f (tqreplace-match ".cpp" t t file))
+         (setq f (replace-match ".cpp" t t file))
          (if (file-readable-p f )
                (message "")
            (progn
               (string-match "\\.h$" file)
-              (setq f (tqreplace-match ".cc" t t file))
+              (setq f (replace-match ".cc" t t file))
               ))
-         (tqfind-file f)
+         (find-file f)
          (progn
            (goto-char (point-max))
            (insert insertion-string)
            (forward-char -3)
            (save-excursion
              (and (string-match ".*/" file)
-                  (setq file (tqreplace-match "" t nil file)))
+                  (setq file (replace-match "" t nil file)))
              (or (re-search-backward
                   (concat "^#include *\"" file "\"$") nil t)
                  (progn
@@ -488,7 +488,7 @@ With arg, to it arg times."
 	     ((or (eq char-before-ip ?:)
 		  (eq char-after-ip ?:))
 	      ;; this line should be indented relative to the beginning
-	      ;; of indentation for the topmost-intro line that tqcontains
+	      ;; of indentation for the topmost-intro line that contains
 	      ;; the prototype's open paren
 	      ;; TBD: is the following redundant?
 	      (if (eq char-before-ip ?:)
@@ -1402,31 +1402,31 @@ With arg, to it arg times."
         (c nil))
     (cond ((and (string-match "\\.h$" n)
                 (progn
-                  (setq c (tqreplace-match ".cpp" t t n))
+                  (setq c (replace-match ".cpp" t t n))
                   (file-readable-p c)))
-           (tqfind-file c))
+           (find-file c))
           ((and (string-match "\\.h$" n)
                 (progn
-                  (setq c (tqreplace-match ".cc" t t n))
+                  (setq c (replace-match ".cc" t t n))
                   (file-readable-p c)))
-           (tqfind-file c))
+           (find-file c))
           ((and (string-match "\\.h$" n)
                 (progn
-                  (setq c (tqreplace-match ".C" t t n))
+                  (setq c (replace-match ".C" t t n))
                   (file-readable-p c)))
-           (tqfind-file c))
+           (find-file c))
           ((string-match "\\.h$" n)
-           (tqfind-file (tqreplace-match ".cpp" t t n)))
+           (find-file (replace-match ".cpp" t t n)))
           ((string-match "\\.h$" n)
-           (tqfind-file (tqreplace-match ".cpp" t t n)))
+           (find-file (replace-match ".cpp" t t n)))
           ;((string-match "_[a-z]+[0-9]*.cpp$" n)
-          ; (tqfind-file (tqreplace-match ".h" t t n)))
+          ; (find-file (replace-match ".h" t t n)))
           ((string-match "\\.cpp$" n)
-           (tqfind-file (tqreplace-match ".h" t t n)))
+           (find-file (replace-match ".h" t t n)))
           ((string-match "\\.cc$" n)
-           (tqfind-file (tqreplace-match ".h" t t n)))
+           (find-file (replace-match ".h" t t n)))
           ((string-match "\\.c$" n)
-           (tqfind-file (tqreplace-match ".h" t t n)))
+           (find-file (replace-match ".h" t t n)))
           (t
            (error "%s is neither .h, .cc, .C or .cpp" n)))))
 
@@ -1569,7 +1569,7 @@ With arg, to it arg times."
     (let* ((word (downcase (kdab-word-under-point)))
           (url (if (not (string-match "XXX" kdab-qt-documentation))
                    (error "didn't find three X's in kdab-qt-documentation")
-                 (tqreplace-match word t t kdab-qt-documentation))))
+                 (replace-match word t t kdab-qt-documentation))))
       (start-process "qt documentation" nil "kfmclient" "openURL" url)
       (message (concat "Loading " url)))))
 
@@ -1585,10 +1585,10 @@ With arg, to it arg times."
 (if xemacs 
     (progn
       (require 'func-menu)
-      (add-hook 'tqfind-file-hooks 'fume-add-menubar-entry) )
+      (add-hook 'find-file-hooks 'fume-add-menubar-entry) )
   (progn
     (require 'imenu)))
-    ;(add-hook 'tqfind-file-hooks 'imenu)) )
+    ;(add-hook 'find-file-hooks 'imenu)) )
 
 ;; Switch between the declaration of a class member in .cc/.cpp/.C, and its definition in the .h file
 ;; Written by David and Reggie after much hair tearing
@@ -1640,7 +1640,7 @@ With arg, to it arg times."
 	(message "")
       (error "Makefile.am not found!")
       )
-    (tqfind-file makefile)
+    (find-file makefile)
     (goto-char (point-min))
     (if (re-search-forward "_SOURCES" nil t)
 	(progn
@@ -1670,9 +1670,9 @@ With arg, to it arg times."
   (interactive)
   (let ((f (buffer-file-name)))
     (if (string-match "^.*/" f)
-      (setq f (tqreplace-match "" t t f)))
+      (setq f (replace-match "" t t f)))
     (while (string-match "\\." f)
-      (setq f (tqreplace-match "_" t t f)))
+      (setq f (replace-match "_" t t f)))
     (save-excursion
       (goto-char (point-min))
       (insert "#ifndef " (upcase f) "\n#define " (upcase f) "\n\n")
@@ -1798,8 +1798,8 @@ With arg, to it arg times."
 (defun makeinstallexec () (interactive) (compile "make install-exec"))
 (defun makethisfile () (interactive)
     (let ((f (buffer-name)))
-      (if (string-match "\.cpp$" f) (setq f (tqreplace-match "\.lo" t t f)))
-      (if (string-match "\.cc$" f) (setq f (tqreplace-match "\.lo" t t f)))
+      (if (string-match "\.cpp$" f) (setq f (replace-match "\.lo" t t f)))
+      (if (string-match "\.cc$" f) (setq f (replace-match "\.lo" t t f)))
       (compile (concat "make " f ))))
 
 ;; Indentation: 4 characters, no tabs.
diff --git a/scripts/kde-emacs/dirvars.el b/scripts/kde-emacs/dirvars.el
index 489ece98..94f682b0 100644
--- a/scripts/kde-emacs/dirvars.el
+++ b/scripts/kde-emacs/dirvars.el
@@ -78,7 +78,7 @@
   "*Control use of directory variables in files you visit.
 The meaningful values are nil and non-nil.")
 
-(defun dirvars-tqfind-upwards (file-name)
+(defun dirvars-find-upwards (file-name)
   "Find a file in the current directory or one of its parents.
 
 Returns the fully qualified file name, or nil if it isn't found.
@@ -186,7 +186,7 @@ A few variable names are treated specially."
 	   (set var val))))
 
 (defun dirvars-hack-local-variables-before ()
-  (let ((dirvars-file (dirvars-tqfind-upwards ".emacs-dirvars")))
+  (let ((dirvars-file (dirvars-find-upwards ".emacs-dirvars")))
     (if dirvars-file
 	(dirvars-hack-local-variables dirvars-file))))
 
diff --git a/scripts/kde-emacs/kde-emacs-bindings.el b/scripts/kde-emacs/kde-emacs-bindings.el
index 14ccd85d..84202dfb 100644
--- a/scripts/kde-emacs/kde-emacs-bindings.el
+++ b/scripts/kde-emacs/kde-emacs-bindings.el
@@ -84,11 +84,11 @@
 
 (if (featurep 'igrep)
     (progn
-      (setq igrep-tqfind-prune-clause
+      (setq igrep-find-prune-clause
 	    (format "-type d %s -name CVS -o -name .libs -o -name .deps %s"
 		    (shell-quote-argument "(")
 		    (shell-quote-argument ")")))
-      (setq igrep-tqfind-file-clause
+      (setq igrep-find-file-clause
 	    (format "-type f %s -name %s %s -name %s %s -name %s %s -name %s" ; -type l
 		    (shell-quote-argument "!")
 		    (shell-quote-argument "*~")	; Emacs backup
@@ -103,8 +103,8 @@
 		    )
 	    )
       (define-key global-map [(f2)] 'igrep)
-      (define-key global-map [(shift f2)] 'igrep-tqfind)
-      (define-key global-map [(f12)] 'igrep-tqfind)  ; on the console, shift f2 gives f12 for some reason..
+      (define-key global-map [(shift f2)] 'igrep-find)
+      (define-key global-map [(f12)] 'igrep-find)  ; on the console, shift f2 gives f12 for some reason..
       ;(setq igrep-files-default 'ignore) ; too hard to use *.cc *.h with it, because of the full path
       )
   (define-key global-map [(f2)] 'grep))
diff --git a/scripts/kde-emacs/kde-emacs-compat.el b/scripts/kde-emacs/kde-emacs-compat.el
index 2cddbb1e..baa88a4d 100644
--- a/scripts/kde-emacs/kde-emacs-compat.el
+++ b/scripts/kde-emacs/kde-emacs-compat.el
@@ -22,8 +22,8 @@
 (require 'kde-emacs-vars)
 
 ;;GNU/Emacs does not have this one
-(if (not (fboundp 'tqreplace-in-string))
-    (defun tqreplace-in-string (str regexp newtext &optional literal)
+(if (not (fboundp 'replace-in-string))
+    (defun replace-in-string (str regexp newtext &optional literal)
       "Replace all matches in STR for REGEXP with NEWTEXT string,
  and returns the new string.
 Optional LITERAL non-nil means do a literal replacement.
@@ -42,11 +42,11 @@ Otherwise treat `\\' in NEWTEXT as special:
 	    (insert str)
 	    (goto-char 1)
 	    (while (re-search-forward regexp nil t)
-	      (tqreplace-match newtext t literal))
+	      (replace-match newtext t literal))
 	    (buffer-string))
 	(let ((start 0) newstr)
 	  (while (string-match regexp str start)
-	    (setq newstr (tqreplace-match newtext t literal str)
+	    (setq newstr (replace-match newtext t literal str)
 		  start (+ (match-end 0) (- (length newstr) (length str)))
 		  str newstr))
 	  str)))
diff --git a/scripts/kde-emacs/kde-emacs-core.el b/scripts/kde-emacs/kde-emacs-core.el
index 52ff6314..37017413 100644
--- a/scripts/kde-emacs/kde-emacs-core.el
+++ b/scripts/kde-emacs/kde-emacs-core.el
@@ -68,7 +68,7 @@ Try to finish the symbol, or indent the line."
                (bmp (buffer-modified-p)))
            (while (re-search-forward "[ \t]+$" nil t)
              (setq count (1+ count))
-             (tqreplace-match "" t t))
+             (replace-match "" t t))
            (set-buffer-modified-p bmp)
 	   nil
            ))))
@@ -556,7 +556,7 @@ This function does not do any hidden buffer changes."
 	     ((or (eq char-before-ip ?:)
 		  (eq char-after-ip ?:))
 	      ;; this line should be indented relative to the beginning
-	      ;; of indentation for the topmost-intro line that tqcontains
+	      ;; of indentation for the topmost-intro line that contains
 	      ;; the prototype's open paren
 	      ;; TBD: is the following redundant?
 	      (if (eq char-before-ip ?:)
@@ -1815,7 +1815,7 @@ This function does not do any hidden buffer changes."
 		 ((or (eq char-before-ip ?:)
 		      (eq char-after-ip ?:))
 		  ;; this line should be indented relative to the beginning
-		  ;; of indentation for the topmost-intro line that tqcontains
+		  ;; of indentation for the topmost-intro line that contains
 		  ;; the prototype's open paren
 		  ;; TBD: is the following redundant?
 		  (if (eq char-before-ip ?:)
@@ -2901,7 +2901,7 @@ This function does not do any hidden buffer changes."
 	       ((or (eq char-before-ip ?:)
 		    (eq char-after-ip ?:))
 		;; this line should be indented relative to the beginning
-		;; of indentation for the topmost-intro line that tqcontains
+		;; of indentation for the topmost-intro line that contains
 		;; the prototype's open paren
 		;; TBD: is the following redundant?
 		(if (eq char-before-ip ?:)
@@ -3808,7 +3808,7 @@ This function does not do any hidden buffer changes."
 	  ;; return the syntax
 	  syntax))))))
 
-(add-hook 'tqfind-file-hooks 'agulbra-c++-clean-out-spaces)
+(add-hook 'find-file-hooks 'agulbra-c++-clean-out-spaces)
 (add-hook 'write-file-hooks 'agulbra-c++-clean-out-spaces)
 
 (add-hook 'c++-mode-hook 'kde-c++-mode-hook)
diff --git a/scripts/kde-emacs/kde-emacs-doc.el b/scripts/kde-emacs/kde-emacs-doc.el
index 998141c4..5fca1361 100644
--- a/scripts/kde-emacs/kde-emacs-doc.el
+++ b/scripts/kde-emacs/kde-emacs-doc.el
@@ -219,7 +219,7 @@ buffer."
   "Substitues %s in the param string with ARG."
   (let ((par (kde-doc-type-string 'param)))
     (if (string-match "\%s" par)
-	(tqreplace-match ARG t t par)
+	(replace-match ARG t t par)
       par))
   )
 
diff --git a/scripts/kde-emacs/kde-emacs-general.el b/scripts/kde-emacs/kde-emacs-general.el
index aae86d2f..be34047c 100644
--- a/scripts/kde-emacs/kde-emacs-general.el
+++ b/scripts/kde-emacs/kde-emacs-general.el
@@ -29,7 +29,7 @@
 ;*---------------------------------------------------------------------*/
 
 ;; Helper for kde-file-get-cpp-h
-(defun kde-tqfind-file (filename basedir)
+(defun kde-find-file (filename basedir)
   "Looks for \"filename\" under \"basedir\""
   (if basedir
       (let ((path (concat basedir "/" filename)))
@@ -68,7 +68,7 @@ return (\"test.cpp\" t)."
 	  )
 	(if (not ret)
 	    (progn ; look in kde-source-directory
-	      (setq path (kde-tqfind-file (file-name-nondirectory path) kde-source-directory))
+	      (setq path (kde-find-file (file-name-nondirectory path) kde-source-directory))
 	      (if (and
 		   path
 		   (file-readable-p path))
@@ -95,7 +95,7 @@ return (\"test.cpp\" t)."
 		       (setq ret (cons path t)))))
 	(if (not (file-readable-p path))
 	    (progn ;  look in kde-include-directory
-	      (setq path (kde-tqfind-file (file-name-nondirectory path) kde-include-directory))
+	      (setq path (kde-find-file (file-name-nondirectory path) kde-include-directory))
 	      (if (and 
 		   path
 		   (file-readable-p path))
@@ -118,7 +118,7 @@ return (\"test.cpp\" t)."
   (interactive)
   (let ((file (kde-file-get-cpp-h)))
     (if (car file)
-	(tqfind-file (car file))
+	(find-file (car file))
       (error "Corresponding source file doesn't exist.")
     )
   ))
diff --git a/scripts/kde-emacs/kde-emacs-semantic.el b/scripts/kde-emacs/kde-emacs-semantic.el
index 4f09f5da..6b5f8c3f 100644
--- a/scripts/kde-emacs/kde-emacs-semantic.el
+++ b/scripts/kde-emacs/kde-emacs-semantic.el
@@ -122,7 +122,7 @@ from semantic-token-function-args"
     (setq res (concat res kde-expand-arg-end))
     ;; if it's something like "(   )" replace it with "()"
     (when (string= res (concat kde-expand-arg-start kde-expand-arg-end))
-      (setq res (tqreplace-regexp-in-string "([ \t]+)" "()" res)))
+      (setq res (replace-regexp-in-string "([ \t]+)" "()" res)))
     res
     ))
 
@@ -214,12 +214,12 @@ would return t"
   "Return function at pt as a token."
   (save-excursion
     (let ((token)
-	  (what (semantic-tqfind-nonterminal-by-position pt (current-buffer)))
+	  (what (semantic-find-nonterminal-by-position pt (current-buffer)))
 	  (ctx))
       (goto-char pt)
       (if (eq (semantic-token-token what) 'function)
 	  what
-	(semantic-tqfind-nonterminal-by-position pt (semantic-token-type-parts what)))
+	(semantic-find-nonterminal-by-position pt (semantic-token-type-parts what)))
       )
     ))
 
@@ -374,7 +374,7 @@ class-token has to be a token representing either a class or a struct."
 	(tokens))
     (if exists
 	(progn
-	  (tqfind-file FILENAME)
+	  (find-file FILENAME)
 	  (setq tokens (semantic-bovinate-toplevel t))
 	  (switch-to-buffer buf)
 	  tokens)
@@ -417,7 +417,7 @@ in the current header file."
 	(filename (buffer-name))
 	(cppfile (car (kde-file-get-cpp-h)))
 	(funcs (kde-expand-tokens all-tokens)))
-    (tqfind-file cppfile)
+    (find-file cppfile)
     (save-excursion
       (insert "#include \"" filename "\"\n\n")
       (insert funcs)
@@ -428,7 +428,7 @@ in the current header file."
 (defun kde-function-expand-at-point (PT)
   "Expand function at point PT."
   (interactive "d")
-  (let ((object (semantic-tqfind-nonterminal-by-position PT (current-buffer)))
+  (let ((object (semantic-find-nonterminal-by-position PT (current-buffer)))
 	(func (kde-function-at-point PT))
 	(file)
 	(buf)
@@ -441,7 +441,7 @@ in the current header file."
 	  (setq func (kde-function-construct func tqparent))
 	  (setq file (car (kde-file-get-cpp-h)))
 	  (setq buf (current-buffer))
-	  (tqfind-file file)
+	  (find-file file)
 	  (save-excursion
 	    (goto-char (point-max))
 	    (insert "\n" func "\n")
diff --git a/scripts/kde-emacs/kde-emacs-utils.el b/scripts/kde-emacs/kde-emacs-utils.el
index ee1ae19e..cb5b58da 100644
--- a/scripts/kde-emacs/kde-emacs-utils.el
+++ b/scripts/kde-emacs/kde-emacs-utils.el
@@ -25,7 +25,7 @@
 (if (eq kde-emacs-type 'xemacs)
     (progn
       (require 'func-menu)
-      (add-hook 'tqfind-file-hooks 'fume-add-menubar-entry))
+      (add-hook 'find-file-hooks 'fume-add-menubar-entry))
   (require 'imenu))
 
 (defmacro c-safe-scan-lists (from count depth)
@@ -133,24 +133,24 @@ This function does not do any hidden buffer changes."
 ; get rid of virtual, static, multiple spaces, default values.
 (defun canonical-function-sig (function)
   (and (string-match "[ \t]*\\<virtual\\>[ \t]*" function)
-       (setq function (tqreplace-match " " t t function)))
+       (setq function (replace-match " " t t function)))
   (and (string-match "^\\(virtual\\>\\)?[ \t]*" function)
-       (setq function (tqreplace-match "" t t function)))
+       (setq function (replace-match "" t t function)))
   (and (string-match "^\\(explicit\\>\\)?[ \t]*" function)
-       (setq function (tqreplace-match "" t t function)))
+       (setq function (replace-match "" t t function)))
   (and (string-match "^\\(static\\>\\)?[ \t]*" function)
-       (setq function (tqreplace-match "" t t function)))
+       (setq function (replace-match "" t t function)))
   (while (string-match "  +" function) ; simplifyWhiteSpace
-    (setq function (tqreplace-match " " t t function)))
+    (setq function (replace-match " " t t function)))
   (while (string-match "\t+" function)
-    (setq function (tqreplace-match " " t t function)))
+    (setq function (replace-match " " t t function)))
   (while (string-match "^ " function)  ; remove leading whitespace
-    (setq function (tqreplace-match "" t t function)))
+    (setq function (replace-match "" t t function)))
   (let ((startargs (string-match "(" function)))
     (while (string-match " ?=[^,)]+" function startargs) ; remove default values
-      (setq function (tqreplace-match " " t t function))))
+      (setq function (replace-match " " t t function))))
   (while (string-match " +," function) ; remove space before commas
-    (setq function (tqreplace-match "," t t function)))
+    (setq function (replace-match "," t t function)))
   function ; the return value
 )
 
@@ -165,13 +165,13 @@ This function does not do any hidden buffer changes."
 	 (cond
 	  ((string-match (concat "^ *" class "[ \\t]*(") function) ; constructor
 	   (setq insertion-string
-		 (tqreplace-match
+		 (replace-match
 		  (concat namespace class "::" class "(")
 		  t t function)
 		 ))
 	  ((string-match (concat "^ *~" class "[ \\t]*(") function) ; destructor
 	   (setq insertion-string
-		 (tqreplace-match
+		 (replace-match
 		  (concat namespace class "::~" class "(")
 		  t t function)
 		 ))
@@ -180,7 +180,7 @@ This function does not do any hidden buffer changes."
 	(if (or (string-match " *\\([a-zA-Z0-9_]+\\)[ \\t]*(" function) ; normal method
 		(string-match " *\\(operator[^ \\t]+\\)[ \\t]*(" function)) ; operator
 	      (setq insertion-string
-		    (tqreplace-match
+		    (replace-match
 		     (if class
 			 (concat " " namespace class "::" "\\1(") ; c++ method
 		       (concat " " "\\1(")) ; c function
@@ -243,7 +243,7 @@ This function does not do any hidden buffer changes."
 	    (goto-char 0)
 	    (setq sig (kde-remove-newline (kde-function-impl-sig namespace class function)))
 	    (if (string-match "(.*" sig) ; remove args
-		(setq sig (tqreplace-match "" nil t sig)))
+		(setq sig (replace-match "" nil t sig)))
 	    (setq found (re-search-forward (concat "^[^()]*" (kde-function-regexp-quote sig) "[ \t]*(") nil t) )
 
         (if (not found)
@@ -254,15 +254,15 @@ This function does not do any hidden buffer changes."
               (setq sig (kde-remove-newline (kde-function-impl-sig "" class function)))
               
               (if (string-match "(.*" sig) ; remove args
-                  (setq sig (tqreplace-match "" nil t sig)))
+                  (setq sig (replace-match "" nil t sig)))
               (re-search-forward (concat "^[^()]*" (kde-function-regexp-quote sig) "[ \t]*(") nil t) ) )
 	    )))))
 
 (defun kde-remove-newline (str) 
-    (tqreplace-in-string str "\n" " "))
+    (replace-in-string str "\n" " "))
 ; quote for use as regexp, but replace spaces with "any whitespace"
 (defun kde-function-regexp-quote (str)
-  (tqreplace-in-string (regexp-quote str) "[ \n\t]" "[ \n\t]"))
+  (replace-in-string (regexp-quote str) "[ \n\t]" "[ \n\t]"))
 
 ; Initial implementation by Arnt Gulbransen
 ; Current maintainer: David Faure
@@ -282,9 +282,9 @@ This function does not do any hidden buffer changes."
 	 )
     (setq insertion-string 
 	  (concat insertion-string "\n{\n"
-		  (tqreplace-in-string kde-make-member-default-impl "FUNCTION" 
+		  (replace-in-string kde-make-member-default-impl "FUNCTION" 
 				     ; the function name and args, without newlines
-				     (tqreplace-in-string insertion-string "\n" " " t)
+				     (replace-in-string insertion-string "\n" " " t)
 				     t)
 		  "}\n"))
     ; move to next method, to be ready for next call
@@ -330,7 +330,7 @@ This function does not do any hidden buffer changes."
     (c-indent-defun)   
     (save-excursion
       (and (string-match ".*/" file)
-	   (setq file (tqreplace-match "" t nil file)))
+	   (setq file (replace-match "" t nil file)))
       (and (string-match "\\.h$" file)
 	   (functionp 'kdab-insert-include-file)
 	   (kdab-insert-include-file file 't nil)))
@@ -360,7 +360,7 @@ This function does not do any hidden buffer changes."
     (if (not (file-readable-p makefile))
 	(error (concat makefile " not found!"))
       )
-    (tqfind-file makefile)
+    (find-file makefile)
     (goto-char (point-min))
     (if (re-search-forward searchString nil t)
 	(progn
@@ -405,7 +405,7 @@ This function does not do any hidden buffer changes."
        (let ((part (pop parts)))
 	 (setq definablestring
 	       (concat
-		(upcase (tqreplace-in-string part "[\\.-]" "_"))
+		(upcase (replace-in-string part "[\\.-]" "_"))
 		(if (not first-iter) "_" "")
 		definablestring
 		)
@@ -619,8 +619,8 @@ This function does not do any hidden buffer changes."
     (if (file-readable-p "Makefile.am")
 	(setq objext "\.lo")
       (setq objext "\.o"))
-    (if (string-match "\.cpp$" f) (setq f (tqreplace-match objext t t f)))
-    (if (string-match "\.cc$" f) (setq f (tqreplace-match objext t t f)))
+    (if (string-match "\.cpp$" f) (setq f (replace-match objext t t f)))
+    (if (string-match "\.cc$" f) (setq f (replace-match objext t t f)))
     (compile (concat kde-emacs-make " " f)))
   )
 
@@ -688,7 +688,7 @@ This function does not do any hidden buffer changes."
     )
   )
 
-(defun kde-year-range-tqcontains-year (ranges year)
+(defun kde-year-range-contains-year (ranges year)
   "checks whether year is in ranges.. ( ranges is a list as \
    kde-year-range-parse-years-string returns.. "
   (let ((ret))
@@ -766,7 +766,7 @@ This function does not do any hidden buffer changes."
 	    (let ((years (kde-year-range-cleanup (kde-year-range-parse-years-string (match-string 1))))
 		  (new-copyright-string "Copyright (C) ")
 		  (this-year (string-to-int (format-time-string "%Y"))))
-	      (when (not (kde-year-range-tqcontains-year years this-year))
+	      (when (not (kde-year-range-contains-year years this-year))
 		(kde-year-range-add-year years this-year))
 	      (setq new-copyright-string
 		    (concat new-copyright-string (kde-year-range-to-string years)))
@@ -843,7 +843,7 @@ This function does not do any hidden buffer changes."
   (let ((line "")
 	(begin nil)
 	(buffer nil))
-    (tqfind-file file)
+    (find-file file)
     (goto-char 0)
     (if (looking-at "#include \"")
 	(progn
diff --git a/scripts/kde-emacs/klaralv.el b/scripts/kde-emacs/klaralv.el
index 9da6ab82..082f9bbb 100644
--- a/scripts/kde-emacs/klaralv.el
+++ b/scripts/kde-emacs/klaralv.el
@@ -328,7 +328,7 @@
     (beginning-of-buffer)
     (if (re-search-forward (concat "^ *// *\\(#include *[<\"][ \t]*" header "[ \t]*[>\"]\\)") nil t)
         (progn
-          (tqreplace-match "\\1")
+          (replace-match "\\1")
           (when show-message
             (message (concat "commented in #include for " header))))
       
@@ -363,7 +363,7 @@
       (beginning-of-buffer)
       (if (re-search-forward (concat "^ *// *\\(class *" word ";\\)") nil t)
           (progn
-            (tqreplace-match "\\1")
+            (replace-match "\\1")
             (message (concat "commented in forward declaration for " word)))
 
         (if (not (re-search-forward (concat "class *" word ";") nil t))
@@ -415,7 +415,7 @@
            (doc (if (is-qpe-class word) kdab-qpe-documentation kdab-qt-documentation))
            (url (if (not (string-match "XXX" doc))
                    (error "didn't find three X's in kdab-qt-documentation or kdab-qpe-documentation")
-                 (tqreplace-match word t t doc))))
+                 (replace-match word t t doc))))
       (start-process "qt documentation" nil "kfmclient" "openURL" url)
       (message (concat "Loading " url)))))
 
diff --git a/scripts/kdelnk2desktop.py b/scripts/kdelnk2desktop.py
index ea9575ba..9d96d87c 100755
--- a/scripts/kdelnk2desktop.py
+++ b/scripts/kdelnk2desktop.py
@@ -13,7 +13,7 @@ for fn in sys.argv[1:]:
 	print "Doing %s ..." % fn
 	f = open(fn, 'r').readlines()
 
-	if string.tqfind(f[0], "# KDE Config") == 0:
+	if string.find(f[0], "# KDE Config") == 0:
 		p = open(fn, 'w')
 		p.writelines(f[1:])
 		p.close()
diff --git a/scripts/kdesvn-build b/scripts/kdesvn-build
index 7e7f5a71..1cd46284 100755
--- a/scripts/kdesvn-build
+++ b/scripts/kdesvn-build
@@ -2990,7 +2990,7 @@ sub safe_lndir
 
     # Recursively descend from source dir using File::Find
     eval {
-        tqfind ({ 'wanted' => $wanted,
+        find ({ 'wanted' => $wanted,
                 'follow_fast' => 1,
                 'follow_skip' => 2},
               $from);
@@ -3361,7 +3361,7 @@ sub setup_build_system
     # Check for admin dir, if it doesn't exist, create a softlink
     if (not create_admin_dir($module))
     {
-        warning "Unable to tqfind /admin directory for y[$module], it probably";
+        warning "Unable to find /admin directory for y[$module], it probably";
         warning "won't build.";
         # But continue anyways, because in this case I'm just not sure that it
         # won't work in the future. ;)
@@ -3888,7 +3888,7 @@ sub handle_install
         # there.
         if (not create_admin_dir($module))
         {
-            warning "Unable to tqfind /admin directory for y[$module], it probably";
+            warning "Unable to find /admin directory for y[$module], it probably";
             warning "won't install.";
             # But continue anyways, because in this case I'm just not sure that it
             # won't work in the future. ;)
diff --git a/scripts/makeobj b/scripts/makeobj
index 02aadff0..cc79c663 100755
--- a/scripts/makeobj
+++ b/scripts/makeobj
@@ -44,7 +44,7 @@ if test ! -f $dir/$file; then
        if test "$dir" = "/"; then
          # the case that someone puts the compile dir in /
          # is very unlikely, so we better skip here ;)
-         echo "can't tqfind $OBJ_SUBDIR above current dir"
+         echo "can't find $OBJ_SUBDIR above current dir"
          exit 1
        fi
     done
diff --git a/scripts/noncvslist b/scripts/noncvslist
index 67b8fae9..69f5a591 100755
--- a/scripts/noncvslist
+++ b/scripts/noncvslist
@@ -64,7 +64,7 @@ if( $#dirqueue < 0 ) {
 foreach $dir ( @dirqueue ) {
 	processEntries( $dir );
 
-	open( FILES, 'tqfind "'.$dir.'" | grep -v "/CVS"|' )
+	open( FILES, 'find "'.$dir.'" | grep -v "/CVS"|' )
 			|| die "Couldn't find files in $dir";
 
 	while( <FILES> ) {
diff --git a/scripts/package_crystalsvg b/scripts/package_crystalsvg
index 4456613a..1502da20 100755
--- a/scripts/package_crystalsvg
+++ b/scripts/package_crystalsvg
@@ -75,7 +75,7 @@ echo "done" # Startup
 # Find the SVGs
 FILES="$PKGDIR/FILES"
 echo -n "Searching for the SVG files..."
-SVGFILES=$(tqfind "$SEARCH_DIR" -name "cr*.svg*" -type f)
+SVGFILES=$(find "$SEARCH_DIR" -name "cr*.svg*" -type f)
 if [ $? -ne 0 ]; then
 	echo "There was an error when searching for the files. Exiting."
 	exit 1;
diff --git a/scripts/pruneemptydirs b/scripts/pruneemptydirs
index 90e443b5..528c0ee8 100755
--- a/scripts/pruneemptydirs
+++ b/scripts/pruneemptydirs
@@ -16,11 +16,11 @@ force=0;
 if [ "$1" = "-f" ]; then force=1; fi
 
 # Look for toplevel dirs
-files=`tqfind . -type d | grep -v CVS\$ | grep -v admin\$ | grep -v .libs\$ | fgrep -v .svn`
+files=`find . -type d | grep -v CVS\$ | grep -v admin\$ | grep -v .libs\$ | fgrep -v .svn`
 toremove="rm -rf";
 for i in $files; do if test -d $i; then
   # List their contents and filter out generated files
-  realfiles=`tqfind $i -type f | egrep -v  '.svn|CVS/|Makefile$|Makefile.in$|Makefile.rules.in$|Makefile.calls.in$|\.o$|\.lo$|\.rpo$|\.la$|\.tqmoc|/\.#' `
+  realfiles=`find $i -type f | egrep -v  '.svn|CVS/|Makefile$|Makefile.in$|Makefile.rules.in$|Makefile.calls.in$|\.o$|\.lo$|\.rpo$|\.la$|\.tqmoc|/\.#' `
   if [ -z "$realfiles" ]; then
     toremove="$toremove '$i'"
   fi
diff --git a/scripts/svn2dist b/scripts/svn2dist
index 377ef80c..76f09b20 100755
--- a/scripts/svn2dist
+++ b/scripts/svn2dist
@@ -6,7 +6,7 @@
 # Original author (of cvs2pack.sh) was Sebastian Stein <seb.stein@hpfsc.de>
 # Heavy, heavy modifications by Jason Katz-Brown <jason@katzbrown.com>
 # Some modifications for i18n inclusion by Dominique Devriese <devriese@kde.org>
-# Added --no-i18n-lang and --tqreplace-files by Michael Buesch <mbuesch@freenet.de>
+# Added --no-i18n-lang and --replace-files by Michael Buesch <mbuesch@freenet.de>
 # License: GPL (http://www.gnu.org/)
 # Last modification: 2005/01/08
 
@@ -40,7 +40,7 @@ test -e ~/.svn2distrc && extraoptions=`cat ~/.svn2distrc`
 # --log has optional argument
 TEMP=`getopt \
 -o v:n:r:e:a:B:dhmbgol \
---long log::,version:,name:,required-header:,required-header-error-message:,make-unpackaged,help,no-bz2,no-bzip2,no-gzip,only-directory,remove-hidden,admin-dir:,branch:,no-i18n,no-i18n-lang:,svn-root:,i18n-module:,debug,tqreplace-files: \
+--long log::,version:,name:,required-header:,required-header-error-message:,make-unpackaged,help,no-bz2,no-bzip2,no-gzip,only-directory,remove-hidden,admin-dir:,branch:,no-i18n,no-i18n-lang:,svn-root:,i18n-module:,debug,replace-files: \
 -n svn2dist -- $extraoptions "$@"`
 
 if [ $? != 0 ]; then
@@ -101,7 +101,7 @@ while true; do
 
 				    shift 2 ;;
 			esac ;;
-		--tqreplace-files) replace_files="$2"; shift 2 ;;
+		--replace-files) replace_files="$2"; shift 2 ;;
 		--) shift
 			break ;;
 		*) echo "Aborted."
@@ -157,11 +157,11 @@ if [ ! -z $showhelp ] || [ -z $module ] || [ -z $directory ]; then
 	echo "  -e --required-header-error-message <message>"
 	echo "                                     Error message for above."
 	echo "  -d --remove-hidden Remove hidden files/directories from packages"
-	echo "  --tqreplace-files <file-pair-list>"
+	echo "  --replace-files <file-pair-list>"
 	echo "       <file-pair-list> is a comma separated list of file pairs"
 	echo "       which should be replaced in the final distribution package."
 	echo "       Each element of a pair is separated by an @"
-	echo -n "       Example: --tqreplace-files take_this_file@and_move_it_here,"
+	echo -n "       Example: --replace-files take_this_file@and_move_it_here,"
 	echo "configure.in.bot.dist@configure.in.bot"
 	echo "       The filenames are all relative to your package root."
 	echo "       Please be careful! Try to avoid the usage of .. in the path. It"
@@ -222,7 +222,7 @@ cd $module
 directory=`echo $directory | sed -e 's#^/##'`
 pofiles=""
 
-for makefile in `tqfind $directory -name Makefile.am`; do
+for makefile in `find $directory -name Makefile.am`; do
     cat $makefile | while read line; do echo $line; done | perl -e '$mes=0; while (<STDIN>) { if (/^messages:/) { $mes=1; next; } if ($_ !~ m/^[^\t ]/) { $mes=0; } if ($mes && /\$\(XGETTEXT\)/ && / -o/) { s,.*-o \$\(podir\)/([a-z._-]+).*$,$1, ; chomp $_; $_ =~ s/\.pot/.po/; print "pofiles=\"$_ \$pofiles\"\n" }  }' > _tmppot
     . _tmppot
     rm -f _tmppot
@@ -357,7 +357,7 @@ fi
 if [ -d $module/doc/$name ]; then
 	mkdir -p $temp_dist/doc/$name
 	cp -Rf $module/doc/$name $temp_dist/doc
-	tqfind $module/doc/ -maxdepth 1 ! -xtype d | xargs --tqreplace={} cp {} $temp_dist/doc
+	find $module/doc/ -maxdepth 1 ! -xtype d | xargs --replace={} cp {} $temp_dist/doc
 
 	if [ $doi18n = "yes" ]; then
 	    pushd $temp_dir
@@ -446,7 +446,7 @@ fi
 
 # and all files from the base dir, except directories
 echo "Copying over files from the module directory:" >> $log
-tqfind $module -maxdepth 1 ! -xtype d  | xargs --verbose --tqreplace={} cp {} $temp_dist 2>> $log
+find $module -maxdepth 1 ! -xtype d  | xargs --verbose --replace={} cp {} $temp_dist 2>> $log
 echo "--------" >> $log
 
 # we now enter the temp_dist and delete all unwanted files
@@ -490,7 +490,7 @@ if [ -n "$replace_files" ]; then
 			echo "$from_path does not exist!" >> $log
 			echo ""
 			echo "Warning: \"$from\" does not exist!"
-			echo -n "Please enter the path in --tqreplace-files relative "
+			echo -n "Please enter the path in --replace-files relative "
 			echo "to the package root of your project."
 			echo "Your package root is: \"$module/$directory\""
 			echo ""
@@ -527,8 +527,8 @@ cd $temp_dist
 # remove files
 echo "Remove files: " >> $log
 for file in $remove; do
-	tqfind . -name $file | xargs rm -Rf
-	echo "tqfind . -name $file | xargs rm -Rf" >> $log
+	find . -name $file | xargs rm -Rf
+	echo "find . -name $file | xargs rm -Rf" >> $log
 done
 
 # remove more files
@@ -539,7 +539,7 @@ done
 unset file
 
 # remove hidden files
-test ! -z $removehidden && echo "Remove hidden files: " >> $log && tqfind $temp_dist -name ".*" -and ! -name "." | xargs --verbose rm -Rf 2>> $log
+test ! -z $removehidden && echo "Remove hidden files: " >> $log && find $temp_dist -name ".*" -and ! -name "." | xargs --verbose rm -Rf 2>> $log
 
 echo "--------" >> $log
 
diff --git a/scripts/svnaddcurrentdir b/scripts/svnaddcurrentdir
index b97ddace..2474bb01 100755
--- a/scripts/svnaddcurrentdir
+++ b/scripts/svnaddcurrentdir
@@ -10,7 +10,7 @@
 
 #ignore dirs "CVS", ".deps", ".libs" ".svn"
 #ignore files *.o, *.so, *.lo, *.la, *~, .#*
-FOUND=`tqfind |grep -v "^\.$"| grep -v CVS| grep -v "\.[ls]\?o$"|grep -v "~$"|grep -v "\.libs/"|grep -v "\.deps/" |grep -v "\.svn/" |grep -v "\.depend/"| grep -v "/\.#" |grep -v "\.la$"`
+FOUND=`find |grep -v "^\.$"| grep -v CVS| grep -v "\.[ls]\?o$"|grep -v "~$"|grep -v "\.libs/"|grep -v "\.deps/" |grep -v "\.svn/" |grep -v "\.depend/"| grep -v "/\.#" |grep -v "\.la$"`
 #echo $FOUND
 
 ask_for_adding() {