TQt4 convert kdesdk

This enables compilation under both Qt3 and Qt4


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

43 files changed, 249 insertions, 249 deletions

diff --git a/scripts/adddebug b/scripts/adddebug
index 8968e89c..912fef71 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
-find . $mxdp -name Makefile -exec perl -pi -e "$xpr" {} \;
+tqfind . $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\"; }"
-    find . $mxdp -name Makefile -exec perl -pi -e "$xpr" {} \;
+    tqfind . $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\"; }"
-    find . $mxdp -name Makefile -exec perl -pi -e "$xpr" {} \;
+    tqfind . $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/check_licenses b/scripts/check_licenses
index 6accd259..33e64479 100755
--- a/scripts/check_licenses
+++ b/scripts/check_licenses
@@ -26,7 +26,7 @@ sub nameok()
          and  $f !~ /_stub\.cpp/
          and  $f !~ /_skel.cpp/
          and  $f !~ /_closure\.cpp/
-         and  $f !~ /moc\.cpp/
+         and  $f !~ /tqmoc\.cpp/
         )
       {
         return 1;
diff --git a/scripts/completions/bash/dcop b/scripts/completions/bash/dcop
index 675bf6cf..d3e0fba4 100644
--- a/scripts/completions/bash/dcop
+++ b/scripts/completions/bash/dcop
@@ -32,7 +32,7 @@ _complete_dcop ()
     elif (( $COMP_CWORD == 2 )); then
         #
         # Object. 'dcop <application>' returns all objects the application
-        # supports plus (default). The parenthesis in (default) should be 
+        # supports plus (default). The tqparenthesis in (default) should be 
         # omitted when using it as an argument so we need to remove them.
         #
         wordlist=$(dcop ${COMP_WORDS[1]} | sed -e "s,(default),default,")
diff --git a/scripts/completions/zsh/_kdekillall b/scripts/completions/zsh/_kdekillall
index 16ab40dc..eb3eb0ab 100644
--- a/scripts/completions/zsh/_kdekillall
+++ b/scripts/completions/zsh/_kdekillall
@@ -4,5 +4,5 @@ local progs
 progs=(`ps x | grep kdeinit: | grep -v Running | grep -v grep | sed 's,.*kdeinit: ,,' | sed 's, .*,,'`)
 
 _alternative \
-	'signals:: _signals -p' \
+	'Q_SIGNALS:: _Q_SIGNALS -p' \
 	'compadd $progs'
diff --git a/scripts/create_cvsignore b/scripts/create_cvsignore
index 2fb4c23e..20d21341 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
-		find . -type d | grep -v CVS | sed -e 's,/$,,' | \
+		tqfind . -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 955edb90..d8385f68 100755
--- a/scripts/create_makefiles
+++ b/scripts/create_makefiles
@@ -24,7 +24,7 @@ fi
 
 srcdir=`egrep '^srcdir *=' Makefile | sed -e "s#srcdir *= *##"`
  
-( cd $srcdir ; find $1 -type d | sed -e 's,/$,,' ) | \
+( cd $srcdir ; tqfind $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 fed482fa..fd7d1c6d 100755
--- a/scripts/create_svnignore
+++ b/scripts/create_svnignore
@@ -42,7 +42,7 @@ handledir() {
 			done
 		fi
 		grep -q LIBRARIES Makefile.am && addignore ".libs"
-		grep -q METASOURCES Makefile.am && addignore "*.moc"
+		grep -q METASOURCES Makefile.am && addignore "*.tqmoc"
 		fgrep -q .skel Makefile.am && addignore "*.kidl"
 		fgrep -q .skel Makefile.am && addignore "*_skel.c*"
 		fgrep -q .stub Makefile.am && addignore "*_stub.cpp"
@@ -69,7 +69,7 @@ handledir() {
 
 if test -f Makefile.am; then
 	if test $recurse -eq 1; then
-		find . -type d | egrep -v 'CVS|.svn' | sed -e 's,/$,,' | \
+		tqfind . -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 dba8a4d9..c1c8e138 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 --replace-files by Michael Buesch <mbuesch@freenet.de>
+# Added --no-i18n-lang and --tqreplace-files by Michael Buesch <mbuesch@freenet.de>
 # License: GPL (http://www.gnu.org/)
 # Last modification: 2004/10/13
 
@@ -16,7 +16,7 @@ cmdline="$@"
 
 returndir=`pwd`
 override="README ChangeLog INSTALL AUTHORS AUTHOR COPYING COPYING.LIB TODO"
-remove="config.cache config.log config.status Makefile configure inst-apps CVS acinclude.m4 aclocal.m4 config.h config.h.bot config.h.in configure.files libtool stamp-h stamp-h.in stamp-h1 subdirs *.moc *.la .libs .deps .cvsignore autom4te.cache {arch} .arch-ids"
+remove="config.cache config.log config.status Makefile configure inst-apps CVS acinclude.m4 aclocal.m4 config.h config.h.bot config.h.in configure.files libtool stamp-h stamp-h.in stamp-h1 subdirs *.tqmoc *.la .libs .deps .cvsignore autom4te.cache {arch} .arch-ids"
 toplevelremove="configure.in.bot"
 # whitespace seperated list of languages to never include.
 always_skip_languages="xx"
@@ -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,replace-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,tqreplace-files: \
 -n cvs2dist -- $extraoptions "$@"`
 
 if [ $? != 0 ]; then
@@ -97,7 +97,7 @@ while true; do
 
 				    shift 2 ;;
 			esac ;;
-		--replace-files) replace_files="$2"; shift 2 ;;
+		--tqreplace-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 "  --replace-files <file-pair-list>"
+	echo "  --tqreplace-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: --replace-files take_this_file@and_move_it_here,"
+	echo -n "       Example: --tqreplace-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
-	find $module/doc/ -maxdepth 1 ! -xtype d | xargs --replace={} cp {} $temp_dist/doc
+	tqfind $module/doc/ -maxdepth 1 ! -xtype d | xargs --tqreplace={} 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
-find $module ! -xtype d -maxdepth 1 | xargs --verbose --replace={} cp {} $temp_dist 2>> $log
+tqfind $module ! -xtype d -maxdepth 1 | xargs --verbose --tqreplace={} 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 --replace-files relative "
+			echo -n "Please enter the path in --tqreplace-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
-	find . -name $file | xargs rm -Rf
-	echo "find . -name $file | xargs rm -Rf" >> $log
+	tqfind . -name $file | xargs rm -Rf
+	echo "tqfind . -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 && find $temp_dist -name ".*" -and ! -name "." | xargs --verbose rm -Rf 2>> $log
+test ! -z $removehidden && echo "Remove hidden files: " >> $log && tqfind $temp_dist -name ".*" -and ! -name "." | xargs --verbose rm -Rf 2>> $log
 
 echo "--------" >> $log
 
diff --git a/scripts/cvsaddcurrentdir b/scripts/cvsaddcurrentdir
index 56185f27..91be9ac4 100755
--- a/scripts/cvsaddcurrentdir
+++ b/scripts/cvsaddcurrentdir
@@ -10,7 +10,7 @@
 
 #ignore dirs "CVS", ".deps", ".libs"
 #ignore files *.o, *.so, *.lo, *.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$"`
+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$"`
 #echo $FOUND
 
 ask_for_adding() {
diff --git a/scripts/cvscheck b/scripts/cvscheck
index 1e1da5a8..1e2bb6b7 100755
--- a/scripts/cvscheck
+++ b/scripts/cvscheck
@@ -144,9 +144,9 @@ sub processEntries
 	  next if ($e eq "Makefile.calls");
 	  next if ($e eq "Makefile.rules.in");
 	  next if ($e eq "Makefile.calls.in");
-          next if ($e =~ /^.*\.moc$/);
+          next if ($e =~ /^.*\.tqmoc$/);
           next if ($e =~ /^.+\.gmo$/);
-          next if ($e =~ /^.+\.moc\.[^\.]+$/);
+          next if ($e =~ /^.+\.tqmoc\.[^\.]+$/);
           next if ($e =~ /^.+\.lo$/);
           next if ($e =~ /^.+\.la$/);
           next if ($e =~ /^.+\.rpo$/);
@@ -160,7 +160,7 @@ sub processEntries
 
           # Qt specific entries
           next if ($e eq ".ui");
-          next if ($e eq ".moc");
+          next if ($e eq ".tqmoc");
           next if ($e eq ".obj");
 
           $dirunknown{$e} = 1;
diff --git a/scripts/cvslastreferenced b/scripts/cvslastreferenced
index 666a5b6d..cf6464e6 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 find 
+# This script goes through the whole history of a file to tqfind 
 # 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 258119c3..9b9e9f46 100755
--- a/scripts/findmissingcrystal
+++ b/scripts/findmissingcrystal
@@ -8,14 +8,14 @@ if [ -z "$1" ] ; then
 	exit 1
 fi
 
-for icon in `find $1 -name cr*.png` ; do
+for icon in `tqfind $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=`find "${dir}" -name "$name"`
+		classic=`tqfind "${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 62d0cae9..24d101a6 100644
--- a/scripts/fixfsfaddr.sed
+++ b/scripts/fixfsfaddr.sed
@@ -5,7 +5,7 @@
 
 # The script helps to fix the FSF address
 # Use:
-#   find . -name .svn -prune , type f | xargs fgrep -l "Free Software Foundation" | xargs sed -i -f fixfsfaddr.sed
+#   tqfind . -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 b1b0a15b..5d5e6ac9 100644
--- a/scripts/fixheaders
+++ b/scripts/fixheaders
@@ -53,7 +53,7 @@ $lastdir = '.';
  'variable `class QFile \S*\' has initializer but incomplete type' => "qfile",
  'implicit declaration of function `int ICON\(\.\.\.\)' => "kiconloader",
  '`QMessageBox\' undeclared \(first use this function\)' => "qmessagebox",
- 'no matching function for call to `QBoxLayout::QBoxLayout' => "qlayout",
+ 'no matching function for call to `QBoxLayout::QBoxLayout' => "qtqlayout",
  '`QUriDrag\' undeclared \(first use this function\)' => "qdragobject",
  '`kdDebug\' undeclared \(first use this function\)' => "kdebug",
  '`kdWarning\' undeclared \(first use this function\)' => "kdebug",
@@ -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 find $lastinclude in $file\n";
+    print STDERR "ERROR: can't tqfind $lastinclude in $file\n";
     return 0;
   }
 	    
diff --git a/scripts/fixkdeincludes b/scripts/fixkdeincludes
index 54e4e9f6..f0d87e99 100644
--- a/scripts/fixkdeincludes
+++ b/scripts/fixkdeincludes
@@ -289,7 +289,7 @@ sub remove_include ($$$)
 }
 
 # first parameter: srcfile
-# second parameter: include to replace
+# second parameter: include to tqreplace
 # third parameter the include file to replace it with
 sub replace_include ($$$)
 {
diff --git a/scripts/fixuifiles b/scripts/fixuifiles
index 785b45b4..3b387df9 100755
--- a/scripts/fixuifiles
+++ b/scripts/fixuifiles
@@ -212,7 +212,7 @@ sub fix_captions($)
   }
 }
 
-# Find a .qt_minversion in $dir or any parent directory.
+# Find a .qt_minversion in $dir or any tqparent directory.
 sub read_required_version($)
 {
   my $dir = Cwd::abs_path( shift @_ );
diff --git a/scripts/includemocs b/scripts/includemocs
index 32df1b20..18453453 100755
--- a/scripts/includemocs
+++ b/scripts/includemocs
@@ -32,7 +32,7 @@ sub checkdir($)
   my $srcs=$dir2files{$dir}->{sources};
   foreach my $h (keys %$hdrs) {
     (my $name=$h) =~ s/\.[^.]+$//;
-    my @answer = `grep -l "^#include[ ]*.$name\.moc." $cppFiles 2> /dev/null`;
+    my @answer = `grep -l "^#include[ ]*.$name\.tqmoc." $cppFiles 2> /dev/null`;
     if (@answer == 0) {
       my $s;
       foreach my $e (split(/\s+/, $cppExt)) {
@@ -42,7 +42,7 @@ sub checkdir($)
       }
       if ($s) {
         print "echo >> $s ;\n";
-        print "echo '#include \"$name.moc\"' >> $s ;\n";
+        print "echo '#include \"$name.tqmoc\"' >> $s ;\n";
       } else {
         print "echo \"can't guess a C++ file for $dir/$h\" ;\n";
       }
@@ -50,7 +50,7 @@ sub checkdir($)
   }
 }
 
-find (\&collectthing, cwd());
+tqfind (\&collectthing, cwd());
 
 foreach my $k (keys %dir2files) {
   print STDERR "Directory $k:\n  headers=[";
@@ -63,23 +63,23 @@ foreach my $k (keys %dir2files) {
 
 =head1 NAME
 
-includemocs -- handle mocifyable headers, whose .moc file is nowhere included.
+includetqmocs -- handle tqmocifyable headers, whose .tqmoc file is nowhere included.
 
 =head1 SYNOPSIS
 
-	includemocs
+	includetqmocs
 
 =head1 DESCRIPTION
 
-Header files declaring a QObject descendant have to be run through moc to
-produce a .moc file.  This .moc file has to be compiled, for which two
+Header files declaring a QObject descendant have to be run through tqmoc to
+produce a .tqmoc file.  This .tqmoc file has to be compiled, for which two
 possibilities exists: compile it separately, or #include it in the C++ file
 implementing that above mentioned class.  The latter is more efficient in term
 of compilation speed.
 
 This script searches in the current directory and its subdirs for header files
 declaring a QObject descendant class.  If it finds some, it looks, if there is
-a C++ file containing an '#include' for the generated .moc file.  If thats not
+a C++ file containing an '#include' for the generated .tqmoc file.  If thats not
 the case, it tries to guess into which C++ file that '#include' is placed best
 (based on the filename).  If it fails to guess a proper place, it mentions
 that.
@@ -91,8 +91,8 @@ On stderr some informational messages are printed.
 
 =head1 EXAMPLES
 
-	cd kdebase ; includemocs
-	cd kdebase ; `eval includemocs 2> /dev/null`
+	cd kdebase ; includetqmocs
+	cd kdebase ; `eval includetqmocs 2> /dev/null`
 
 =head1 AUTHOR
 
diff --git a/scripts/kDebug2kdDebug.sh b/scripts/kDebug2kdDebug.sh
index a238845e..24f605f4 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
 
-find $1 -name '*[cCph]' -type f | xargs grep -H -i 'ebug(\|warning(' \
+tqfind $1 -name '*[cCph]' -type f | xargs grep -H -i 'ebug(\|warning(' \
 | grep -v 'kdDebug\|kdWarning' \
 | grep -v include \
 | sed -e "s#:.*##" \
@@ -109,7 +109,7 @@ while (<>)
 			$arg =~ s/\.ascii\(\)$//;              # remove
 			$arg =~ s/\.latin1\(\)$//;             # remove
 			$arg =~ s/debugString\(([^\)]+)\)/$1/; # remove
-                        # If "a ? b : c" then add parenthesis
+                        # If "a ? b : c" then add tqparenthesis
                         if ( $arg =~ m/.+\s*\?\s*.+\s*:\s*.+/ ) {
                            $arg = "(" . $arg . ")";
                         }
diff --git a/scripts/kde-build b/scripts/kde-build
index 8790f602..1a092f95 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=`dcopfind -a kppp-*`
+	kppp_process=`dcoptqfind -a kppp-*`
 	if [ "$kppp_process" = "" ]; then
 		#kppp not running
 		kppp > /dev/null 2>&1 &
 		sleep $KPPP_LOAD_TIME
-		`dcop $(dcopfind -a kppp-*) KpppIface beginConnect`
+		`dcop $(dcoptqfind -a kppp-*) KpppIface beginConnect`
 		#wait for a while
 		sleep $KPPP_CONNECT_TIME
-		kppp_connected=`dcop $(dcopfind -a kppp-*) KpppIface isConnected`
+		kppp_connected=`dcop $(dcoptqfind -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 $(dcopfind -a kppp-*) KpppIface isConnected`
+		kppp_connected=`dcop $(dcoptqfind -a kppp-*) KpppIface isConnected`
 		if [ "$kppp_connected" = "false" ]; then
 			#Start a connection
-			`dcop $(dcopfind -a kppp-*) KpppIface beginConnect`
+			`dcop $(dcoptqfind -a kppp-*) KpppIface beginConnect`
 			#wait for a while
 			sleep $KPPP_CONNECT_TIME
-			kppp_connected=`dcop $(dcopfind -a kppp-*) KpppIface isConnected`
+			kppp_connected=`dcop $(dcoptqfind -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 [ $(dcopfind -a kppp-*) = "" ]; then
+	if [ $(dcoptqfind -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 $(dcopfind -a kppp-*) KpppIface disconnect`
+			`dcop $(dcoptqfind -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=`find $KDESRCDIR -type d -mindepth 1 \
+    potential_modules=`tqfind $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 55955f0f..57f34924 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))
-             (replace-match "" t t))
+             (tqreplace-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 'find-file-hooks 'agulbra-c++-clean-out-spaces)
+(add-hook 'tqfind-file-hooks 'agulbra-c++-clean-out-spaces)
 (add-hook 'write-file-hooks 'agulbra-c++-clean-out-spaces)
 
 (defun agulbra-delete-into-nomenclature (&optional arg)
@@ -98,7 +98,7 @@ With arg, to it arg times."
 	       indent-tabs-mode nil
                fume-auto-rescan-buffer-p nil
                c-basic-offset 4
-               c-access-key "\\<\\(signals\\|k_dcop\\|\\(public\\|protected\\|private\\)\\([     ]+slots\\)?\\)\\>:"
+               c-access-key "\\<\\(Q_SIGNALS\\|k_dcop\\|\\(public\\|protected\\|private\\)\\([     ]+Q_SLOTS\\)?\\)\\>:"
                c-hanging-comment-ender-p nil
                c-offsets-alist (append '((case-label   . 0)
                                          (access-label . -)
@@ -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 (replace-match " " t t function)))
+                (setq function (tqreplace-match " " t t function)))
            (and (string-match "^\\(virtual\\>\\)?[ \t]*" function)
-                (setq function (replace-match "" t t function)))
+                (setq function (tqreplace-match "" t t function)))
            (and (string-match "^\\(static\\>\\)?[ \t]*" function)
-                (setq function (replace-match "" t t function)))
+                (setq function (tqreplace-match "" t t function)))
            (while (string-match "  +" function)
-             (setq function (replace-match " " t t function)))
+             (setq function (tqreplace-match " " t t function)))
            (while (string-match "\t+" function)
-             (setq function (replace-match " " t t function)))
+             (setq function (tqreplace-match " " t t function)))
            (while (string-match " ?=[^,)]+" function)
-             (setq function (replace-match " " t t function)))
+             (setq function (tqreplace-match " " t t function)))
            (while (string-match " +," function)
-             (setq function (replace-match "," t t function)))))
+             (setq function (tqreplace-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
-                         (replace-match
+                         (tqreplace-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
-                            (replace-match
+                            (tqreplace-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
-                            (replace-match
+                            (tqreplace-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 (replace-match ".cpp" t t file))
+         (setq f (tqreplace-match ".cpp" t t file))
          (if (file-readable-p f )
                (message "")
            (progn
               (string-match "\\.h$" file)
-              (setq f (replace-match ".cc" t t file))
+              (setq f (tqreplace-match ".cc" t t file))
               ))
-         (find-file f)
+         (tqfind-file f)
          (progn
            (goto-char (point-max))
            (insert insertion-string)
            (forward-char -3)
            (save-excursion
              (and (string-match ".*/" file)
-                  (setq file (replace-match "" t nil file)))
+                  (setq file (tqreplace-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 contains
+	      ;; of indentation for the topmost-intro line that tqcontains
 	      ;; the prototype's open paren
 	      ;; TBD: is the following redundant?
 	      (if (eq char-before-ip ?:)
@@ -758,7 +758,7 @@ With arg, to it arg times."
 			  (save-excursion
 			    (c-safe (progn (c-backward-sexp 1) t))
 			    ;; agulbrahack 2
-                            (and (looking-at "slots:")
+                            (and (looking-at "Q_SLOTS:")
                                  (c-backward-sexp 1))
                             (looking-at c-access-key)))
 		(c-backward-sexp 1)
@@ -1402,31 +1402,31 @@ With arg, to it arg times."
         (c nil))
     (cond ((and (string-match "\\.h$" n)
                 (progn
-                  (setq c (replace-match ".cpp" t t n))
+                  (setq c (tqreplace-match ".cpp" t t n))
                   (file-readable-p c)))
-           (find-file c))
+           (tqfind-file c))
           ((and (string-match "\\.h$" n)
                 (progn
-                  (setq c (replace-match ".cc" t t n))
+                  (setq c (tqreplace-match ".cc" t t n))
                   (file-readable-p c)))
-           (find-file c))
+           (tqfind-file c))
           ((and (string-match "\\.h$" n)
                 (progn
-                  (setq c (replace-match ".C" t t n))
+                  (setq c (tqreplace-match ".C" t t n))
                   (file-readable-p c)))
-           (find-file c))
+           (tqfind-file c))
           ((string-match "\\.h$" n)
-           (find-file (replace-match ".cpp" t t n)))
+           (tqfind-file (tqreplace-match ".cpp" t t n)))
           ((string-match "\\.h$" n)
-           (find-file (replace-match ".cpp" t t n)))
+           (tqfind-file (tqreplace-match ".cpp" t t n)))
           ;((string-match "_[a-z]+[0-9]*.cpp$" n)
-          ; (find-file (replace-match ".h" t t n)))
+          ; (tqfind-file (tqreplace-match ".h" t t n)))
           ((string-match "\\.cpp$" n)
-           (find-file (replace-match ".h" t t n)))
+           (tqfind-file (tqreplace-match ".h" t t n)))
           ((string-match "\\.cc$" n)
-           (find-file (replace-match ".h" t t n)))
+           (tqfind-file (tqreplace-match ".h" t t n)))
           ((string-match "\\.c$" n)
-           (find-file (replace-match ".h" t t n)))
+           (tqfind-file (tqreplace-match ".h" t t n)))
           (t
            (error "%s is neither .h, .cc, .C or .cpp" n)))))
 
@@ -1441,7 +1441,7 @@ With arg, to it arg times."
 ;; Please notify blackie@klaralvdalens-datakonsult.se with any modification to this variable!
 (defvar kdab-special-includes
   '( 
-    (qlayout.h QHBoxLayout QVBoxLayout QGridLayout QBoxLayout)
+    (qtqlayout.h QHBoxLayout QVBoxLayout QGridLayout QBoxLayout)
     (qlistview.h QListViewItem QCheckListItem QListViewItemIterator)
     (qiconview.h QIconViewItem QIconDragItem QIconDrag)
     (qdragobject.h QTextDrag QStoredDrag QUriDag QColorDrag QImageDrag QDragManager)
@@ -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")
-                 (replace-match word t t kdab-qt-documentation))))
+                 (tqreplace-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 'find-file-hooks 'fume-add-menubar-entry) )
+      (add-hook 'tqfind-file-hooks 'fume-add-menubar-entry) )
   (progn
     (require 'imenu)))
-    ;(add-hook 'find-file-hooks 'imenu)) )
+    ;(add-hook 'tqfind-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!")
       )
-    (find-file makefile)
+    (tqfind-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 (replace-match "" t t f)))
+      (setq f (tqreplace-match "" t t f)))
     (while (string-match "\\." f)
-      (setq f (replace-match "_" t t f)))
+      (setq f (tqreplace-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 (replace-match "\.lo" t t f)))
-      (if (string-match "\.cc$" f) (setq f (replace-match "\.lo" t t f)))
+      (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)))
       (compile (concat "make " f ))))
 
 ;; Indentation: 4 characters, no tabs.
diff --git a/scripts/kde-devel-gdb b/scripts/kde-devel-gdb
index bf69d233..7627adad 100644
--- a/scripts/kde-devel-gdb
+++ b/scripts/kde-devel-gdb
@@ -25,7 +25,7 @@ define printqstringdata
     set $i=0
     set $d = (QStringData *)$arg0
     while $i < $d->len
-        printf "%c", (char)($d->unicode[$i++].ucs & 0xff)
+        printf "%c", (char)($d->tqunicode[$i++].ucs & 0xff)
     end
     printf "\n"
 end
@@ -57,7 +57,7 @@ define printqstring_utf8
    set $i=0
    set $s = $arg0
    while $i < $s.d->len
-     set $uc = (unsigned short) $s.d->unicode[$i++].ucs
+     set $uc = (unsigned short) $s.d->tqunicode[$i++].ucs
      if ( $uc < 0x80 )
        printf "%c", (unsigned char)($uc & 0x7f)
      else
@@ -188,10 +188,10 @@ define _qmapiterator_inc
             set $ret = $ret->left
         end
     else
-        set $y = $ret->parent
+        set $y = $ret->tqparent
         while $ret == $y->right
             set $ret = $y
-            set $y = $y->parent
+            set $y = $y->tqparent
         end
         if $ret->right != $y
             set $ret = $y
diff --git a/scripts/kde-devel-vim.vim b/scripts/kde-devel-vim.vim
index ddf2efa8..3507c805 100644
--- a/scripts/kde-devel-vim.vim
+++ b/scripts/kde-devel-vim.vim
@@ -9,7 +9,7 @@
 " should do the trick.
 
 " Don't include these in filename completions
-set suffixes+=.lo,.o,.moc,.la,.closure,.loT
+set suffixes+=.lo,.o,.tqmoc,.la,.closure,.loT
 
 " Search for headers here
 set path=.,/usr/include,/usr/local/include,
@@ -174,7 +174,7 @@ endfunction
 function! MapIdentHeader( ident )
     " Qt stuff
     if a:ident =~ 'Q.*Layout'
-        return '<qlayout.h>'
+        return '<qtqlayout.h>'
     elseif a:ident == 'QListViewItem' ||
           \a:ident == 'QCheckListItem' ||
           \a:ident == 'QListViewItemIterator'
@@ -228,7 +228,7 @@ function! MapIdentHeader( ident )
           \a:ident == 'QComboTableItem' ||
           \a:ident == 'QCheckTableItem'
         return '<qtable.h>'
-    elseif a:ident == 'qApp'
+    elseif a:ident == 'tqApp'
         return '<qapplication.h>'
 
     " KDE stuff
@@ -314,7 +314,7 @@ function! AddHeader()
             let incomment = 1
         elseif s =~ '^' . include
             break
-        elseif s =~ '^#include' && s !~ '\.moc"'
+        elseif s =~ '^#include' && s !~ '\.tqmoc"'
             let appendpos = line
         elseif codestart == 0 && s !~ '^$'
             let codestart = line
@@ -383,11 +383,11 @@ endfunction
 
 function! AddQtSyntax()
     if expand( "<amatch>" ) == "cpp"
-        syn keyword qtKeywords     signals slots emit foreach
+        syn keyword qtKeywords     Q_SIGNALS Q_SLOTS emit foreach
         syn keyword qtMacros       Q_OBJECT Q_WIDGET Q_PROPERTY Q_ENUMS Q_OVERRIDE Q_CLASSINFO Q_SETS SIGNAL SLOT
         syn keyword qtCast         qt_cast qobject_cast qvariant_cast qstyleoption_cast
         syn keyword qtTypedef      uchar uint ushort ulong Q_INT8 Q_UINT8 Q_INT16 Q_UINT16 Q_INT32 Q_UINT32 Q_LONG Q_ULONG Q_INT64 Q_UINT64 Q_LLONG Q_ULLONG pchar puchar pcchar qint8 quint8 qint16 quint16 qint32 quint32 qint64 quint64 qlonglong qulonglong
-        syn keyword kdeKeywords    k_dcop k_dcop_signals
+        syn keyword kdeKeywords    k_dcop k_dcop_Q_SIGNALS
         syn keyword kdeMacros      K_DCOP ASYNC
         syn keyword cRepeat        foreach
         syn keyword cRepeat        forever
@@ -411,7 +411,7 @@ function! UpdateMocFiles()
         while i < 80
             let s = getline( i )
             if s =~ '^#include ".*\.moc"'
-                let s = substitute( s, '.*"\(.*\)\.moc"', '\1.h', '' )
+                let s = substitute( s, '.*"\(.*\)\.tqmoc"', '\1.h', '' )
                 if stridx( &complete, s ) == -1
                     let &complete = &complete . ',k' . s
                 endif
diff --git a/scripts/kde-emacs/dirvars.el b/scripts/kde-emacs/dirvars.el
index 5fba18e7..302bb75e 100644
--- a/scripts/kde-emacs/dirvars.el
+++ b/scripts/kde-emacs/dirvars.el
@@ -78,8 +78,8 @@
   "*Control use of directory variables in files you visit.
 The meaningful values are nil and non-nil.")
 
-(defun dirvars-find-upwards (file-name)
-  "Find a file in the current directory or one of its parents.
+(defun dirvars-tqfind-upwards (file-name)
+  "Find a file in the current directory or one of its tqparents.
 
 Returns the fully qualified file name, or nil if it isn't found.
 
@@ -96,18 +96,18 @@ The FILE-NAME specifies the file name to search for."
   (setq dir-name (expand-file-name dir-name))
   ;; Move up in the dir hierarchy till we find a change log file.
   (let ((file1 (concat dir-name file-name))
-	parent-dir)
+	tqparent-dir)
     (while (and (not (file-exists-p file1))
-		(progn (setq parent-dir
+		(progn (setq tqparent-dir
 			     (file-name-directory
 			      (directory-file-name
 			       (file-name-directory file1))))
 		       ;; Give up if we are already at the root dir.
 		       (not (string= (file-name-directory file1)
-				     parent-dir))))
-      ;; Move up to the parent dir and try again.
-      (setq file1 (expand-file-name file-name parent-dir)))
-    ;; If we found the file in a parent dir, use that.  Otherwise,
+				     tqparent-dir))))
+      ;; Move up to the tqparent dir and try again.
+      (setq file1 (expand-file-name file-name tqparent-dir)))
+    ;; If we found the file in a tqparent dir, use that.  Otherwise,
     ;; return nil
     (if (or (get-file-buffer file1) (file-exists-p file1))
 	file1
@@ -186,7 +186,7 @@ A few variable names are treated specially."
 	   (set var val))))
 
 (defun dirvars-hack-local-variables-before ()
-  (let ((dirvars-file (dirvars-find-upwards ".emacs-dirvars")))
+  (let ((dirvars-file (dirvars-tqfind-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 84202dfb..14ccd85d 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-find-prune-clause
+      (setq igrep-tqfind-prune-clause
 	    (format "-type d %s -name CVS -o -name .libs -o -name .deps %s"
 		    (shell-quote-argument "(")
 		    (shell-quote-argument ")")))
-      (setq igrep-find-file-clause
+      (setq igrep-tqfind-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-find)
-      (define-key global-map [(f12)] 'igrep-find)  ; on the console, shift f2 gives f12 for some reason..
+      (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..
       ;(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 1ff1fe7a..c492d7ca 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 'replace-in-string))
-    (defun replace-in-string (str regexp newtext &optional literal)
+(if (not (fboundp 'tqreplace-in-string))
+    (defun tqreplace-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)
-	      (replace-match newtext t literal))
+	      (tqreplace-match newtext t literal))
 	    (buffer-string))
 	(let ((start 0) newstr)
 	  (while (string-match regexp str start)
-	    (setq newstr (replace-match newtext t literal str)
+	    (setq newstr (tqreplace-match newtext t literal str)
 		  start (+ (match-end 0) (- (length newstr) (length str)))
 		  str newstr))
 	  str)))
@@ -58,8 +58,8 @@ Otherwise treat `\\' in NEWTEXT as special:
       (defvar read-shell-command-map
 	(let ((map (make-sparse-keymap 'read-shell-command-map)))
 	  (if (eq kde-emacs-type 'xemacs)
-	      (set-keymap-parents map (list minibuffer-local-map))
-	    (set-keymap-parent map minibuffer-local-map))
+	      (set-keymap-tqparents map (list minibuffer-local-map))
+	    (set-keymap-tqparent map minibuffer-local-map))
 	  (define-key map "\t" 'comint-dynamic-complete)
 	  (define-key map "\M-\t" 'comint-dynamic-complete)
 	  (define-key map "\M-?" 'comint-dynamic-list-completions)
diff --git a/scripts/kde-emacs/kde-emacs-core.el b/scripts/kde-emacs/kde-emacs-core.el
index a954dfa0..40c95d5b 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))
-             (replace-match "" t t))
+             (tqreplace-match "" t t))
            (set-buffer-modified-p bmp)
 	   nil
            ))))
@@ -151,10 +151,10 @@ With arg, do it arg times."
   (define-key c++-mode-map "\ef" 'c-forward-into-nomenclature)
   (define-key c++-mode-map "\ed" 'agulbra-delete-into-nomenclature)
   (define-key c++-mode-map "\eb" 'c-backward-into-nomenclature)
-  ;; fontify "public|protected|private slots" with one and the same face :)
+  ;; fontify "public|protected|private Q_SLOTS" with one and the same face :)
   ;; NOTE: write face-at-point function to fontify those just like other
   ;; access specifiers
-  (font-lock-add-keywords nil '(("\\<\\(\\(public\\|protected\\|private\\) slots\\)\\>" 
+  (font-lock-add-keywords nil '(("\\<\\(\\(public\\|protected\\|private\\) Q_SLOTS\\)\\>" 
 				 . font-lock-reference-face)))
   ;; Add (setq magic-keys-mode nil) to your .emacs (before loading this file)
   ;; to disable the magic keys in C++ mode.
@@ -199,7 +199,7 @@ This function does not do any hidden buffer changes."
 	   ;; throw it away due to the narrowing that might be done
 	   ;; by the function above.  That means we must not do any
 	   ;; changes during the execution of this function, since
-	   ;; `c-invalidate-state-cache' then would change this local
+	   ;; `c-tqinvalidate-state-cache' then would change this local
 	   ;; variable and leave a bogus value in the global one.
 	   (c-state-cache (if inclass-p
 			      (c-whack-state-before (point-min) paren-state)
@@ -263,7 +263,7 @@ This function does not do any hidden buffer changes."
 		(setq lim (1+ containing-sexp))))
 	  (setq lim (point-min)))
 
-	;; If we're in a parenthesis list then ',' delimits the
+	;; If we're in a tqparenthesis list then ',' delimits the
 	;; "statements" rather than being an operator (with the
 	;; exception of the "for" clause).  This difference is
 	;; typically only noticeable when statements are used in macro
@@ -398,7 +398,7 @@ This function does not do any hidden buffer changes."
 				(goto-char placeholder)))))
 		      placeholder))
 		 (if (looking-at c-block-stmt-2-key)
-		     ;; Require a parenthesis after these keywords.
+		     ;; Require a tqparenthesis after these keywords.
 		     ;; Necessary to catch e.g. synchronized in Java,
 		     ;; which can be used both as statement and
 		     ;; modifier.
@@ -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 contains
+	      ;; of indentation for the topmost-intro line that tqcontains
 	      ;; the prototype's open paren
 	      ;; TBD: is the following redundant?
 	      (if (eq char-before-ip ?:)
@@ -866,7 +866,7 @@ This function does not do any hidden buffer changes."
 			  (not (bobp))
 			  (save-excursion
 			    (c-safe (progn (c-backward-sexp 1) t))
-			    (and (looking-at "slots:")
+			    (and (looking-at "Q_SLOTS:")
 				 (c-backward-sexp 1))
 			    (looking-at c-opt-access-key)))
 		(c-backward-sexp 1)
@@ -1540,7 +1540,7 @@ This function does not do any hidden buffer changes."
 		    (setq lim (1+ containing-sexp))))
 	      (setq lim (point-min)))
 
-	    ;; If we're in a parenthesis list then ',' delimits the
+	    ;; If we're in a tqparenthesis list then ',' delimits the
 	    ;; "statements" rather than being an operator (with the
 	    ;; exception of the "for" clause).  This difference is
 	    ;; typically only noticeable when statements are used in macro
@@ -1661,7 +1661,7 @@ This function does not do any hidden buffer changes."
 				    (goto-char placeholder)))))
 			  placeholder))
 		     (if (looking-at c-block-stmt-2-key)
-			 ;; Require a parenthesis after these keywords.
+			 ;; Require a tqparenthesis after these keywords.
 			 ;; Necessary to catch e.g. synchronized in Java,
 			 ;; which can be used both as statement and
 			 ;; modifier.
@@ -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 contains
+		  ;; of indentation for the topmost-intro line that tqcontains
 		  ;; the prototype's open paren
 		  ;; TBD: is the following redundant?
 		  (if (eq char-before-ip ?:)
@@ -2116,7 +2116,7 @@ This function does not do any hidden buffer changes."
 			      (not (bobp))
 			      (save-excursion
 				(c-safe (progn (c-backward-sexp 1) t))
-				(and (looking-at "slots:")
+				(and (looking-at "Q_SLOTS:")
 				   (c-backward-sexp 1))
 				(looking-at c-opt-access-key)))
 		    (c-backward-sexp 1)
@@ -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 contains
+		;; of indentation for the topmost-intro line that tqcontains
 		;; the prototype's open paren
 		;; TBD: is the following redundant?
 		(if (eq char-before-ip ?:)
@@ -3172,7 +3172,7 @@ This function does not do any hidden buffer changes."
 			    (save-excursion
 			      (c-safe (progn (c-backward-sexp 1) t))
 			      ;; agulbrahack 2
-			      (and (looking-at "slots:")
+			      (and (looking-at "Q_SLOTS:")
 				   (c-backward-sexp 1))
 			      (looking-at c-access-key)))
 		  (c-backward-sexp 1)
@@ -3808,7 +3808,7 @@ This function does not do any hidden buffer changes."
 	  ;; return the syntax
 	  syntax))))))
 
-(add-hook 'find-file-hooks 'agulbra-c++-clean-out-spaces)
+(add-hook 'tqfind-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 5fca1361..998141c4 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)
-	(replace-match ARG t t par)
+	(tqreplace-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 be34047c..aae86d2f 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-find-file (filename basedir)
+(defun kde-tqfind-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-find-file (file-name-nondirectory path) kde-source-directory))
+	      (setq path (kde-tqfind-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-find-file (file-name-nondirectory path) kde-include-directory))
+	      (setq path (kde-tqfind-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)
-	(find-file (car file))
+	(tqfind-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 1753520b..a8228f2d 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 (replace-regexp-in-string "([ \t]+)" "()" res)))
+      (setq res (tqreplace-regexp-in-string "([ \t]+)" "()" res)))
     res
     ))
 
@@ -138,9 +138,9 @@ token and TOKENS have to be a list of functions from buffer."
 	       (equal (semantic-token-type FUNC) 
 		      (semantic-token-type elt))
 	       ;; FIXME (semantic) : Functions in some classes don't have the
-	       ;;                    'parent property set !!!
-	       ;;(string= (semantic-token-function-parent FUNC1)    
-	       ;;	    (semantic-token-function-parent FUNC2)) 
+	       ;;                    'tqparent property set !!!
+	       ;;(string= (semantic-token-function-tqparent FUNC1)    
+	       ;;	    (semantic-token-function-tqparent FUNC2)) 
 	       (string= (kde-format-args (semantic-token-function-args FUNC))
 			(kde-format-args (semantic-token-function-args elt))))
 	  (setq ret t))
@@ -148,12 +148,12 @@ token and TOKENS have to be a list of functions from buffer."
     ret
     ))
 
-(defmacro kde-label-signals (pt)
-  "Returns none-nil if the current access label == \"signals\""
+(defmacro kde-label-Q_SIGNALS (pt)
+  "Returns none-nil if the current access label == \"Q_SIGNALS\""
   `(save-excursion
      (goto-char ,pt)
      (if (looking-at ":")
-	 (re-search-backward "signals" (point-at-bol) t)
+	 (re-search-backward "Q_SIGNALS" (point-at-bol) t)
        )
      ))
 
@@ -171,13 +171,13 @@ token and TOKENS have to be a list of functions from buffer."
       )
     ))
 
-(defmacro kde-label-slots (pt)
-  "Return none-nil if at PT there's slots access specifier."
+(defmacro kde-label-Q_SLOTS (pt)
+  "Return none-nil if at PT there's Q_SLOTS access specifier."
   `(save-excursion
     (goto-char ,pt)
     (if (looking-at ":")
 	;; export this regex to a kde-emacs-vars defvar
-	(re-search-backward "\\(public\\|protected\\|private\\)[ \t]+slots" (point-at-bol) t))
+	(re-search-backward "\\(public\\|protected\\|private\\)[ \t]+Q_SLOTS" (point-at-bol) t))
     ))
 
 (defmacro kde-is-constructor (function)
@@ -214,17 +214,17 @@ would return t"
   "Return function at pt as a token."
   (save-excursion
     (let ((token)
-	  (what (semantic-find-nonterminal-by-position pt (current-buffer)))
+	  (what (semantic-tqfind-nonterminal-by-position pt (current-buffer)))
 	  (ctx))
       (goto-char pt)
       (if (eq (semantic-token-token what) 'function)
 	  what
-	(semantic-find-nonterminal-by-position pt (semantic-token-type-parts what)))
+	(semantic-tqfind-nonterminal-by-position pt (semantic-token-type-parts what)))
       )
     ))
 
 (defun kde-function-construct (token pclass)
-  "Constructs a function string from the TOKEN, with the parent class PCLASS."
+  "Constructs a function string from the TOKEN, with the tqparent class PCLASS."
   (let ((fname (semantic-token-name token)))
     (if (semantic-token-function-destructor token)
 	(setq fname (concat "~" fname))
@@ -262,7 +262,7 @@ would return t"
 class-token has to be a token representing either a class or a struct."
   (let ((ret "")
 	(name    (semantic-token-name class-token))
-	(parents (semantic-token-type-parent class-token))
+	(tqparents (semantic-token-type-tqparent class-token))
 	(parts   (semantic-token-type-parts class-token))
 	(cur-token)
 	(cur-token-name)
@@ -304,7 +304,7 @@ class-token has to be a token representing either a class or a struct."
 	 (stringp cur-token-name))
 	(setq aslot   nil
 	      asignal nil)
-	;;LABEL - unsets both signals and slots
+	;;LABEL - unsets both Q_SIGNALS and Q_SLOTS
 	)
        ((and
 	 (eq cur-token 'variable)
@@ -313,8 +313,8 @@ class-token has to be a token representing either a class or a struct."
 	)
        ((not (stringp cur-token-name))
 	(cond
-	 ((kde-label-signals (car (semantic-token-extent elt)))
-	  ;;SIGNALS - next prototypes belong to signals and we don't want to 
+	 ((kde-label-Q_SIGNALS (car (semantic-token-extent elt)))
+	  ;;SIGNALS - next prototypes belong to Q_SIGNALS and we don't want to 
 	  ;;          expand those
 	  (setq asignal t
 		aslot   nil)
@@ -324,8 +324,8 @@ class-token has to be a token representing either a class or a struct."
 	  ;;            so we do ;)
 	  (setq namespace (kde-label-namespace (car (semantic-token-extent elt))))
 	  )
-	 ((kde-label-slots (car (semantic-token-extent elt)))
-	  ;;SLOTS - for now just unset signals
+	 ((kde-label-Q_SLOTS (car (semantic-token-extent elt)))
+	  ;;SLOTS - for now just unset Q_SIGNALS
 	  (setq aslot t
 		asignal   nil)
 	  )
@@ -374,7 +374,7 @@ class-token has to be a token representing either a class or a struct."
 	(tokens))
     (if exists
 	(progn
-	  (find-file FILENAME)
+	  (tqfind-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)))
-    (find-file cppfile)
+    (tqfind-file cppfile)
     (save-excursion
       (insert "#include \"" filename "\"\n\n")
       (insert funcs)
@@ -428,20 +428,20 @@ in the current header file."
 (defun kde-function-expand-at-point (PT)
   "Expand function at point PT."
   (interactive "d")
-  (let ((object (semantic-find-nonterminal-by-position PT (current-buffer)))
+  (let ((object (semantic-tqfind-nonterminal-by-position PT (current-buffer)))
 	(func (kde-function-at-point PT))
 	(file)
 	(buf)
-	(parent))
+	(tqparent))
     (if (and object (equal (semantic-token-type object) "class"))
-	(setq parent (semantic-token-name object)))
+	(setq tqparent (semantic-token-name object)))
     (if (and (not (kde-function-expanded-at-point PT))
 	     (kde-is-prototype func))
 	(progn
-	  (setq func (kde-function-construct func parent))
+	  (setq func (kde-function-construct func tqparent))
 	  (setq file (car (kde-file-get-cpp-h)))
 	  (setq buf (current-buffer))
-	  (find-file file)
+	  (tqfind-file file)
 	  (save-excursion
 	    (goto-char (point-max))
 	    (insert "\n" func "\n")
diff --git a/scripts/kde-emacs/kde-emacs-tips.texi b/scripts/kde-emacs/kde-emacs-tips.texi
index ee7c0f19..80a44bc7 100644
--- a/scripts/kde-emacs/kde-emacs-tips.texi
+++ b/scripts/kde-emacs/kde-emacs-tips.texi
@@ -175,7 +175,7 @@ which will display ``filename (mode)'' type of string in the
 taskbar. Type @kbd{C-h v frame-title-format}  to get more info.
 
 @sp 1
-@strong{Q.} @emph{Can I make Emacs jump to the matching parenthesis
+@strong{Q.} @emph{Can I make Emacs jump to the matching tqparenthesis
 with @kbd{%} just like vi?}
 
 @strong{A.} Yes, just add to your @file{.emacs} something like:
@@ -184,7 +184,7 @@ with @kbd{%} just like vi?}
 (global-set-key "%" 'match-paren)
 
 (defun match-paren (arg)
-  "Go to the matching parenthesis if on parenthesis otherwise insert %."
+  "Go to the matching tqparenthesis if on tqparenthesis otherwise insert %."
   (interactive "p")
   (cond ((looking-at "\\s\(") (forward-list 1) (backward-char 1))
         ((looking-at "\\s\)") (forward-char 1) (backward-list 1))
diff --git a/scripts/kde-emacs/kde-emacs-utils.el b/scripts/kde-emacs/kde-emacs-utils.el
index c6904539..165f620a 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 'find-file-hooks 'fume-add-menubar-entry))
+      (add-hook 'tqfind-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 (replace-match " " t t function)))
+       (setq function (tqreplace-match " " t t function)))
   (and (string-match "^\\(virtual\\>\\)?[ \t]*" function)
-       (setq function (replace-match "" t t function)))
+       (setq function (tqreplace-match "" t t function)))
   (and (string-match "^\\(explicit\\>\\)?[ \t]*" function)
-       (setq function (replace-match "" t t function)))
+       (setq function (tqreplace-match "" t t function)))
   (and (string-match "^\\(static\\>\\)?[ \t]*" function)
-       (setq function (replace-match "" t t function)))
+       (setq function (tqreplace-match "" t t function)))
   (while (string-match "  +" function) ; simplifyWhiteSpace
-    (setq function (replace-match " " t t function)))
+    (setq function (tqreplace-match " " t t function)))
   (while (string-match "\t+" function)
-    (setq function (replace-match " " t t function)))
+    (setq function (tqreplace-match " " t t function)))
   (while (string-match "^ " function)  ; remove leading whitespace
-    (setq function (replace-match "" t t function)))
+    (setq function (tqreplace-match "" t t function)))
   (let ((startargs (string-match "(" function)))
     (while (string-match " ?=[^,)]+" function startargs) ; remove default values
-      (setq function (replace-match " " t t function))))
+      (setq function (tqreplace-match " " t t function))))
   (while (string-match " +," function) ; remove space before commas
-    (setq function (replace-match "," t t function)))
+    (setq function (tqreplace-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
-		 (replace-match
+		 (tqreplace-match
 		  (concat namespace class "::" class "(")
 		  t t function)
 		 ))
 	  ((string-match (concat "^ *~" class "[ \\t]*(") function) ; destructor
 	   (setq insertion-string
-		 (replace-match
+		 (tqreplace-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
-		    (replace-match
+		    (tqreplace-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 (replace-match "" nil t sig)))
+		(setq sig (tqreplace-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 (replace-match "" nil t sig)))
+                  (setq sig (tqreplace-match "" nil t sig)))
               (re-search-forward (concat "^[^()]*" (kde-function-regexp-quote sig) "[ \t]*(") nil t) ) )
 	    )))))
 
 (defun kde-remove-newline (str) 
-    (replace-in-string str "\n" " "))
+    (tqreplace-in-string str "\n" " "))
 ; quote for use as regexp, but replace spaces with "any whitespace"
 (defun kde-function-regexp-quote (str)
-  (replace-in-string (regexp-quote str) "[ \n\t]" "[ \n\t]"))
+  (tqreplace-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"
-		  (replace-in-string kde-make-member-default-impl "FUNCTION" 
+		  (tqreplace-in-string kde-make-member-default-impl "FUNCTION" 
 				     ; the function name and args, without newlines
-				     (replace-in-string insertion-string "\n" " " t)
+				     (tqreplace-in-string insertion-string "\n" " " t)
 				     t)
 		  "}\n"))
     ; move to next method, to be ready for next call
@@ -312,7 +312,7 @@ This function does not do any hidden buffer changes."
     (kde-comments-begin)
     (kde-skip-blank-lines)
     (setq msubstr (buffer-substring (point-at-bol) (point-at-eol)))
-    (if (string-match "^#include.*moc.*" msubstr)
+    (if (string-match "^#include.*tqmoc.*" msubstr)
 	(progn 
 	  (forward-line -1)
 	  (end-of-line)
@@ -330,7 +330,7 @@ This function does not do any hidden buffer changes."
     (c-indent-defun)   
     (save-excursion
       (and (string-match ".*/" file)
-	   (setq file (replace-match "" t nil file)))
+	   (setq file (tqreplace-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!"))
       )
-    (find-file makefile)
+    (tqfind-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 (replace-in-string part "[\\.-]" "_"))
+		(upcase (tqreplace-in-string part "[\\.-]" "_"))
 		(if (not first-iter) "_" "")
 		definablestring
 		)
@@ -451,11 +451,11 @@ This function does not do any hidden buffer changes."
          (n (progn
               (insert " ")
               (self-insert-command (prefix-numeric-value arg))
-              (insert kde-emacs-after-parent-string)
+              (insert kde-emacs-after-tqparent-string)
               ))
          (t ;else
           (self-insert-command (prefix-numeric-value arg))
-          (cond ((not except) (insert kde-emacs-after-parent-string)))
+          (cond ((not except) (insert kde-emacs-after-tqparent-string)))
           )))
     (self-insert-command (prefix-numeric-value arg)))
   )
@@ -489,7 +489,7 @@ This function does not do any hidden buffer changes."
          (t ;else
           (if abbrev-mode ; XEmacs
               (expand-abbrev))
-          (insert kde-emacs-after-parent-string)
+          (insert kde-emacs-after-tqparent-string)
           (self-insert-command (prefix-numeric-value arg))
           ))) ; normal case, prepend a space
     ;;(blink-matching-open) ; show the matching parens
@@ -523,7 +523,7 @@ This function does not do any hidden buffer changes."
 		(setq oneliner t)))
 	  (forward-char -1)              ; These three lines are for the situation where
           (if (not (looking-at " "))     ; the user already have inserted a space after
-              (forward-char 1)           ; the closing parenthesis
+              (forward-char 1)           ; the closing tqparenthesis
 	    (setq spacep t))
           (forward-char -2)
           (setq o (looking-at "()"))
@@ -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 (replace-match objext t t f)))
-    (if (string-match "\.cc$" f) (setq f (replace-match objext t t f)))
+    (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)))
     (compile (concat kde-emacs-make " " f)))
   )
 
@@ -638,7 +638,7 @@ This function does not do any hidden buffer changes."
 (defun scroll-other-down () (interactive) (scroll-other-window 1))
 
 (defun match-paren (arg)
-  "Go to the matching parenthesis if on parenthesis otherwise insert %."
+  "Go to the matching tqparenthesis if on tqparenthesis otherwise insert %."
   (interactive "p")
   (cond ((looking-at "\\s\(") (forward-list 1) (backward-char 1))
         ((looking-at "\\s\)") (forward-char 1) (backward-list 1))
@@ -688,7 +688,7 @@ This function does not do any hidden buffer changes."
     )
   )
 
-(defun kde-year-range-contains-year (ranges year)
+(defun kde-year-range-tqcontains-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-contains-year years this-year))
+	      (when (not (kde-year-range-tqcontains-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))
-    (find-file file)
+    (tqfind-file file)
     (goto-char 0)
     (if (looking-at "#include \"")
 	(progn
diff --git a/scripts/kde-emacs/kde-emacs-vars.el b/scripts/kde-emacs/kde-emacs-vars.el
index 216e64f5..9d3734d6 100644
--- a/scripts/kde-emacs/kde-emacs-vars.el
+++ b/scripts/kde-emacs/kde-emacs-vars.el
@@ -39,7 +39,7 @@
 ;*---------------------------------------------------------------------*/
 
 (defconst kde-access-labels
-  "\\<\\(signals\\|k_dcop\\|\\(public\\|protected\\|private\\)\\([     ]+slots\\)?\\)\\>:"
+  "\\<\\(Q_SIGNALS\\|k_dcop\\|\\(public\\|protected\\|private\\)\\([     ]+Q_SLOTS\\)?\\)\\>:"
   "KDE specific access labels regexp.")
 
 (defconst kde-source-files '("cpp" "cc" "cxx" "CC" "C" "c")
@@ -118,8 +118,8 @@ file named /home/domi/src/kdenonbeta/kig/misc/newtype.h"
   :group 'kde-devel
   :type 'integer)
 
-(defcustom kde-emacs-after-parent-string " "
-  "Set this to whatever you want to have inserted after the first parenthesis. Works only if
+(defcustom kde-emacs-after-tqparent-string " "
+  "Set this to whatever you want to have inserted after the first tqparenthesis. Works only if
 magic-keys-mode is set to true. "
   :group 'kde-devel
   :type 'string)
diff --git a/scripts/kde-emacs/klaralv.el b/scripts/kde-emacs/klaralv.el
index df29ff78..9da6ab82 100644
--- a/scripts/kde-emacs/klaralv.el
+++ b/scripts/kde-emacs/klaralv.el
@@ -52,7 +52,7 @@
 ;; Please notify blackie@klaralvdalens-datakonsult.se with any modification to this variable!
 (defvar kdab-special-includes
   '( 
-    (qlayout.h QHBoxLayout QVBoxLayout QGridLayout QBoxLayout)
+    (qtqlayout.h QHBoxLayout QVBoxLayout QGridLayout QBoxLayout)
     (qlistview.h QListViewItem QCheckListItem QListViewItemIterator)
     (qiconview.h QIconViewItem QIconDragItem QIconDrag)
     (qdragobject.h QTextDrag QStoredDrag QUriDag QColorDrag QImageDrag QDragManager)
@@ -172,7 +172,7 @@
 
 
     ; Useful fake entries
-    (qapplication.h qApp)
+    (qapplication.h tqApp)
     (kapplication.h kapp)
     (klocale.h i18n I18N_NOOP)
     (kstandarddirs.h locate locateLocal)
@@ -217,7 +217,7 @@
     (palmtoprecord.h Record)
     (palmtopuidgen.h UidGen)
     (password.h Password)
-    (power.h PowerStatus PowerStatusManager )
+    (power.h PowertqStatus PowerStatusManager )
     (process.h Process)
     (qcopenvelope_qws.h QCopEnvelope)
     (qdawg.h QDawg)
@@ -328,7 +328,7 @@
     (beginning-of-buffer)
     (if (re-search-forward (concat "^ *// *\\(#include *[<\"][ \t]*" header "[ \t]*[>\"]\\)") nil t)
         (progn
-          (replace-match "\\1")
+          (tqreplace-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
-            (replace-match "\\1")
+            (tqreplace-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")
-                 (replace-match word t t doc))))
+                 (tqreplace-match word t t doc))))
       (start-process "qt documentation" nil "kfmclient" "openURL" url)
       (message (concat "Loading " url)))))
 
diff --git a/scripts/kde-spellcheck.pl b/scripts/kde-spellcheck.pl
index 2a8974e0..bdde4e43 100755
--- a/scripts/kde-spellcheck.pl
+++ b/scripts/kde-spellcheck.pl
@@ -43,7 +43,7 @@ CAUTION IS NEEDED WHEN USING THIS SCRIPT - changes are made to the original
 file and are not programming language syntax aware - this is why the script
 only suggests the changes to be made unless --make-changes is specified.
 
-Hidden files, CVS directories, .desktop, and .moc files are excluded
+Hidden files, CVS directories, .desktop, and .tqmoc files are excluded
 from checking.
 
 --check-dictionary    : Checks the internal dictionary for potential
@@ -195,7 +195,7 @@ sub process_directory
   {
     if ( $entry =~ /^\./        or
          $entry =~ /\.desktop$/ or
-         $entry =~ /\.moc$/     or
+         $entry =~ /\.tqmoc$/     or
          $entry eq "CVS" )
     {
       info "Skipping excluded file or directory: $entry\n";
@@ -373,7 +373,7 @@ Afganistan             Afghanistan
 agressive              aggressive
 Agressive              Aggressive
 agressively            aggressively
-alignement             alignment
+alignement             tqalignment
 alligned               aligned
 Allignment             Alignment
 allmost                almost
@@ -514,7 +514,7 @@ charakters             characters
 charater               character
 Chatacter              Character
 chatwindow             chat window
-childs                 children
+childs                 tqchildren
 choosed                chose
 choosen                chosen
 Choosen                Chosen
diff --git a/scripts/kdekillall b/scripts/kdekillall
index deb5aef5..c08b2ad8 100755
--- a/scripts/kdekillall
+++ b/scripts/kdekillall
@@ -7,7 +7,7 @@ if [ $# = 0 ]; then
     echo "Usage: $0 [-<signal>] <process>"
     echo 'Kills the process "kdeinit: <process> with signal <signal>"'
 	echo "if <signal> is not specified, it defaults to SIGTERM,"
-	echo "see kill -l for a list of possible signals"
+	echo "see kill -l for a list of possible Q_SIGNALS"
 else
     list=$(ps auwx | grep $USER | awk "/[k]deinit: $1/ {print \$2}")
     if test -z "$list"; then
diff --git a/scripts/kdelnk2desktop.py b/scripts/kdelnk2desktop.py
index 9d96d87c..ea9575ba 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.find(f[0], "# KDE Config") == 0:
+	if string.tqfind(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 fcd3970b..e247c3db 100755
--- a/scripts/kdesvn-build
+++ b/scripts/kdesvn-build
@@ -383,14 +383,14 @@ sub clr($)
 }
 
 # Subroutine which returns true if pretend mode is on.  Uses the prototype
-# feature so you don't need the parentheses to use it.
+# feature so you don't need the tqparentheses to use it.
 sub pretending()
 {
     return get_option('global', 'pretend');
 }
 
 # Subroutine which returns true if debug mode is on.  Uses the prototype
-# feature so you don't need the parentheses to use it.
+# feature so you don't need the tqparentheses to use it.
 sub debugging()
 {
     return get_option('global', 'debug-level') <= DEBUG;
@@ -1292,7 +1292,7 @@ sub safe_make (@)
     }
 
     # Convert the path to an absolute path since I've encountered a sudo that
-    # is apparently unable to guess.  Maybe it's better that it doesn't guess
+    # is aptqparently unable to guess.  Maybe it's better that it doesn't guess
     # anyways from a security point-of-view.
     $make = path_to_prog($make) unless pretending;
 
@@ -2581,7 +2581,7 @@ sub safe_system(@)
     return 0; # Return true
 }
 
-# Helper subroutine to create a directory, including any parent
+# Helper subroutine to create a directory, including any tqparent
 # directories that may also need created.
 # Returns 0 on failure, non-zero on success
 sub super_mkdir
@@ -2887,7 +2887,7 @@ sub create_admin_dir
 
     if (not -e $admindir)
     {
-        # Can't find kde-common, it's apparently not installed.
+        # Can't find kde-common, it's aptqparently not installed.
         if (not has_updated_kdecommon())
         {
             # We haven't tried downloading it, now would be a good time.
@@ -2990,7 +2990,7 @@ sub safe_lndir
 
     # Recursively descend from source dir using File::Find
     eval {
-        find ({ 'wanted' => $wanted,
+        tqfind ({ '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 find /admin directory for y[$module], it probably";
+        warning "Unable to tqfind /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. ;)
@@ -3432,7 +3432,7 @@ sub update_module_environment
     my $path = join(':', "$qtdir/bin", "$kdedir/bin", get_option ($module, 'binpath'));
     my $libdir = join(':', "$qtdir/lib", "$kdedir/lib", get_option ($module, 'libpath'));
 
-    # Set up the children's environment.  We use setenv since it
+    # Set up the tqchildren's environment.  We use setenv since it
     # won't set an environment variable to nothing.  (e.g, setting
     # QTDIR to a blank string might confuse Qt or KDE.
 
@@ -3888,7 +3888,7 @@ sub handle_install
         # there.
         if (not create_admin_dir($module))
         {
-            warning "Unable to find /admin directory for y[$module], it probably";
+            warning "Unable to tqfind /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 cc79c663..02aadff0 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 find $OBJ_SUBDIR above current dir"
+         echo "can't tqfind $OBJ_SUBDIR above current dir"
          exit 1
        fi
     done
diff --git a/scripts/noncvslist b/scripts/noncvslist
index 69f5a591..67b8fae9 100755
--- a/scripts/noncvslist
+++ b/scripts/noncvslist
@@ -64,7 +64,7 @@ if( $#dirqueue < 0 ) {
 foreach $dir ( @dirqueue ) {
 	processEntries( $dir );
 
-	open( FILES, 'find "'.$dir.'" | grep -v "/CVS"|' )
+	open( FILES, 'tqfind "'.$dir.'" | grep -v "/CVS"|' )
 			|| die "Couldn't find files in $dir";
 
 	while( <FILES> ) {
diff --git a/scripts/package_crystalsvg b/scripts/package_crystalsvg
index 1502da20..4456613a 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=$(find "$SEARCH_DIR" -name "cr*.svg*" -type f)
+SVGFILES=$(tqfind "$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 6f177a0f..90e443b5 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=`find . -type d | grep -v CVS\$ | grep -v admin\$ | grep -v .libs\$ | fgrep -v .svn`
+files=`tqfind . -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=`find $i -type f | egrep -v  '.svn|CVS/|Makefile$|Makefile.in$|Makefile.rules.in$|Makefile.calls.in$|\.o$|\.lo$|\.rpo$|\.la$|\.moc|/\.#' `
+  realfiles=`tqfind $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 eb7ef8d9..377ef80c 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 --replace-files by Michael Buesch <mbuesch@freenet.de>
+# Added --no-i18n-lang and --tqreplace-files by Michael Buesch <mbuesch@freenet.de>
 # License: GPL (http://www.gnu.org/)
 # Last modification: 2005/01/08
 
@@ -17,7 +17,7 @@ cmdline="$@"
 
 returndir=`pwd`
 override="README ChangeLog INSTALL AUTHORS AUTHOR COPYING COPYING.LIB TODO COPYING-DOCS"
-remove="config.cache config.log config.status Makefile configure inst-apps CVS acinclude.m4 aclocal.m4  libtool subdirs *.moc *.la .libs .deps .svn .cvsignore autom4te.cache {arch} .arch-ids *.lo *.o *.bbg *.da *.bb"
+remove="config.cache config.log config.status Makefile configure inst-apps CVS acinclude.m4 aclocal.m4  libtool subdirs *.tqmoc *.la .libs .deps .svn .cvsignore autom4te.cache {arch} .arch-ids *.lo *.o *.bbg *.da *.bb"
 toplevelremove="configure.in.bot config.h config.h.bot config.h.in config.status config.log stamp-h stamp-h.in stamp-h1 subdirs configure.files "
 # whitespace seperated list of languages to never include.
 always_skip_languages="xx"
@@ -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,replace-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,tqreplace-files: \
 -n svn2dist -- $extraoptions "$@"`
 
 if [ $? != 0 ]; then
@@ -101,7 +101,7 @@ while true; do
 
 				    shift 2 ;;
 			esac ;;
-		--replace-files) replace_files="$2"; shift 2 ;;
+		--tqreplace-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 "  --replace-files <file-pair-list>"
+	echo "  --tqreplace-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: --replace-files take_this_file@and_move_it_here,"
+	echo -n "       Example: --tqreplace-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 `find $directory -name Makefile.am`; do
+for makefile in `tqfind $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
-	find $module/doc/ -maxdepth 1 ! -xtype d | xargs --replace={} cp {} $temp_dist/doc
+	tqfind $module/doc/ -maxdepth 1 ! -xtype d | xargs --tqreplace={} 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
-find $module -maxdepth 1 ! -xtype d  | xargs --verbose --replace={} cp {} $temp_dist 2>> $log
+tqfind $module -maxdepth 1 ! -xtype d  | xargs --verbose --tqreplace={} 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 --replace-files relative "
+			echo -n "Please enter the path in --tqreplace-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
-	find . -name $file | xargs rm -Rf
-	echo "find . -name $file | xargs rm -Rf" >> $log
+	tqfind . -name $file | xargs rm -Rf
+	echo "tqfind . -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 && find $temp_dist -name ".*" -and ! -name "." | xargs --verbose rm -Rf 2>> $log
+test ! -z $removehidden && echo "Remove hidden files: " >> $log && tqfind $temp_dist -name ".*" -and ! -name "." | xargs --verbose rm -Rf 2>> $log
 
 echo "--------" >> $log
 
diff --git a/scripts/svnaddcurrentdir b/scripts/svnaddcurrentdir
index 2474bb01..b97ddace 100755
--- a/scripts/svnaddcurrentdir
+++ b/scripts/svnaddcurrentdir
@@ -10,7 +10,7 @@
 
 #ignore dirs "CVS", ".deps", ".libs" ".svn"
 #ignore files *.o, *.so, *.lo, *.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$"`
+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$"`
 #echo $FOUND
 
 ask_for_adding() {