Revert "Update minor TQt3 tool names to match current TQt3 sources in GIT"

62 files changed, 177 insertions, 177 deletions

diff --git a/bin/findtr b/bin/findtr
index c7b82d1..7df3325 100755
--- a/bin/findtr
+++ b/bin/findtr
@@ -37,7 +37,7 @@ msgstr ""
 $scope = "";
 
 if ( $#ARGV < 0 ) {
-    print STDERR "Usage:  tqtfindtr sourcefile ...  >project.po\n";
+    print STDERR "Usage:  findtr sourcefile ...  >project.po\n";
     exit 1;
 }
 
diff --git a/bin/qt20fix b/bin/qt20fix
index 9fc7f9e..d7cba30 100755
--- a/bin/qt20fix
+++ b/bin/qt20fix
@@ -1,14 +1,14 @@
 #!/usr/bin/perl -w
 #
 # in sh/bash/zsh:
-#    make 2>&1 | .../qt/bin/tqt20fix
+#    make 2>&1 | .../qt/bin/qt20fix
 # in csh/tcsh
-#    make |& .../qt/bin/tqt20fix
+#    make |& .../qt/bin/qt20fix
 #
-# repeat as long as tqt20fix says to.  if your make supports the -k
+# repeat as long as qt20fix says to.  if your make supports the -k
 # flag, that speeds up the process a bit.
 #
-# tqt20fix tends to fix a bit over half of the remaining problems in
+# qt20fix tends to fix a bit over half of the remaining problems in
 # each run.
 #
 # if you don't use gcc, you will need to change parseline.
@@ -222,7 +222,7 @@ while( <STDIN> ) {
 	    if ( defined( $lastfile ) ) {
 		open( O, "> $lastfile" ) ||
 		  die "cannot write to $lastfile, stopped";
-		print "tqt20fix: writing $lastfile (changes: $changes)\n";
+		print "qt20fix: writing $lastfile (changes: $changes)\n";
 		print O @currentfile;
 		close O;
 	    }
@@ -248,12 +248,12 @@ while( <STDIN> ) {
 if ( defined( $changes) && $changes > 0 && defined( $lastfile ) ) {
     open( O, "> $lastfile" ) ||
       die "cannot write to $lastfile, stopped";
-    print "tqt20fix: writing $lastfile (changes: $changes)\n";
+    print "qt20fix: writing $lastfile (changes: $changes)\n";
     print O @currentfile;
     close O;
 }
 
 
 if ( defined( $totalchanges) && $totalchanges > 0 ) {
-    print "tqt20fix: total changes: $totalchanges\ntqt20fix: rerun recommended\n";
+    print "qt20fix: total changes: $totalchanges\nqt20fix: rerun recommended\n";
 }
diff --git a/configure b/configure
index 9d33b07..6032cc7 100755
--- a/configure
+++ b/configure
@@ -226,7 +226,7 @@ while [ "$#" -gt 0 ]; do
 	VAL=no
 	;;
     #Qt style yes options
-    -incremental|-tqvfb|-profile|-shared|-static|-sm|-thread|-xinerama|-xshape|-tablet|-pch|-stl|-ipv6|-freetype|-big-codecs|-xcursor|-xrandr|-xrender|-xft|-xkb|-nis|-cups|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-version-script|-dlopen-opengl|-glibmainloop)
+    -incremental|-qvfb|-profile|-shared|-static|-sm|-thread|-xinerama|-xshape|-tablet|-pch|-stl|-ipv6|-freetype|-big-codecs|-xcursor|-xrandr|-xrender|-xft|-xkb|-nis|-cups|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-version-script|-dlopen-opengl|-glibmainloop)
 	VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
 	VAL=yes
 	;;
@@ -405,9 +405,9 @@ while [ "$#" -gt 0 ]; do
     depths)
 	CFG_QWS_DEPTHS="$VAL"
 	;;
-    tqvfb) # left for commandline compatibility, not documented
+    qvfb) # left for commandline compatibility, not documented
 	if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
-	    [ "$VAL" = "yes" ] && QMAKE_VARS="$QMAKE_VARS \"gfx-drivers += tqvfb\""
+	    [ "$VAL" = "yes" ] && QMAKE_VARS="$QMAKE_VARS \"gfx-drivers += qvfb\""
 	else
 	    UNKNOWN_OPT=yes
         fi
diff --git a/doc/html/emb-fonts.html b/doc/html/emb-fonts.html
index 234c53f..6583963 100644
--- a/doc/html/emb-fonts.html
+++ b/doc/html/emb-fonts.html
@@ -61,7 +61,7 @@ enabled) can be enabled or disabled independently by using the <a href="emb-feat
 support in Qt/Embedded for writing a QPF font file from any font, so
 you can initially enable TTF and BDF formats, save QPF files for the
 fonts and sizes you need, then remove TTF and BDF support.
-<p> See <a href="maketqpf.html">tools/maketqpf</a> for a tool that helps
+<p> See <a href="makeqpf.html">tools/makeqpf</a> for a tool that helps
 produce QPF files from the TTF and BDF, or just run your application
 with the <tt>-savefonts</tt> option.
 <p> <h2> Memory Requirements
@@ -151,7 +151,7 @@ generate all 4 rotations of fonts would be to run the following at a real frameb
 <pre>
 for dpy in LinuxFb Transformed:Rot90 Transformed:Rot180 Transformed:Rot270
 do
-    QWS_DISPLAY=$dpy ./maketqpf "$@"
+    QWS_DISPLAY=$dpy ./makeqpf "$@"
 done
 </pre><p> If programs are only ever run in one orientation on a device, only the one
 appropriate set of fonts is needed.
diff --git a/doc/html/emb-install.html b/doc/html/emb-install.html
index d04a04a..47ae22a 100644
--- a/doc/html/emb-install.html
+++ b/doc/html/emb-install.html
@@ -144,7 +144,7 @@ named pipe <tt>/tmp/qtembedded-username/QtEmbedded-0</tt>; sometimes it may need
 <p> The Qt/Embedded library can be reduced in size by
 <a href="emb-features.html">removing unnecessary features</a>.
 <p> <li> This document shows how to use Qt/Embedded with the Linux framebuffer. For
-development and debugging purposes it is often easier to use the <a href="emb-tqvfb.html">Qt/Embedded virtual framebuffer</a> instead.
+development and debugging purposes it is often easier to use the <a href="emb-qvfb.html">Qt/Embedded virtual framebuffer</a> instead.
 <p> </ol>
 <p> 
 <!-- eof -->
diff --git a/doc/html/emb-qvfb.html b/doc/html/emb-qvfb.html
index c2a301e..df971cc 100644
--- a/doc/html/emb-qvfb.html
+++ b/doc/html/emb-qvfb.html
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/doc/tqvfb.doc:36 -->
+<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/doc/qvfb.doc:36 -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -34,17 +34,17 @@ body { background: #ffffff; color: black; }
  
 <p> The virtual framebuffer allows Qt/Embedded programs to be developed on
 a desktop machine, without switching between consoles and X11.
-<p> The virtual framebuffer is located in <tt>$QTDIR/tools/tqvfb</tt>.
+<p> The virtual framebuffer is located in <tt>$QTDIR/tools/qvfb</tt>.
 <p> <h2> Using the Virtual Framebuffer
 </h2>
 <a name="1"></a><p> <ol type=1> 
-<li> Configure Qt/Embedded with the <tt>-tqvfb</tt> argument and compile the library:
+<li> Configure Qt/Embedded with the <tt>-qvfb</tt> argument and compile the library:
 <pre>
-    ./configure -tqvfb
+    ./configure -qvfb
     make
     </pre>
  
-<li> Compile <tt>tqvfb</tt> as a normal Qt/X11 application and run it. Do <em>not</em>
+<li> Compile <tt>qvfb</tt> as a normal Qt/X11 application and run it. Do <em>not</em>
 compile it as a Qt/Embedded application.
 <li> Start a Qt/Embedded master application (i.e., construct
 <a href="qapplication.html">QApplication</a> with the QApplication::GuiServer flag or use the <tt>-qws</tt> command line parameter). You can specify to the server that
@@ -53,13 +53,13 @@ you wish to use the virtual framebuffer driver, e.g.:
     masterapp -qws -display QVFb:0
     </pre>
  
-<li> Qt/Embedded will autodetect tqvfb, so you can omit the <tt>-display</tt>
-command line parameter if you know that tqvfb is running, and that
-the Qt/Embedded library supports tqvfb. (If this is not the case,
+<li> Qt/Embedded will autodetect qvfb, so you can omit the <tt>-display</tt>
+command line parameter if you know that qvfb is running, and that
+the Qt/Embedded library supports qvfb. (If this is not the case,
 Qt/Embedded will write to the real framebuffer, and your X11
 display will be corrupted.)
 <p> </ol>
-<p> <tt>tqvfb</tt> supports the following command line options:
+<p> <tt>qvfb</tt> supports the following command line options:
 <p> <center><table cellpadding="4" cellspacing="2" border="0">
 <tr bgcolor="#a2c511"> <th valign="top">Option <th valign="top">Meaning
 <tr bgcolor="#f0f0f0">
@@ -82,23 +82,23 @@ display will be corrupted.)
 </h2>
 <a name="2"></a><p> The virtual framebuffer emulates a framebuffer using a shared memory region
 (the virtual frame buffer) and a utility to display the framebuffer in a
-window (<tt>tqvfb</tt>). The regions of the display that have changed are updated
+window (<tt>qvfb</tt>). The regions of the display that have changed are updated
 periodically, so you will see discrete snapshots of the framebuffer rather
 than each individual drawing operation. For this reason drawing problems
 such as flickering may not be apparent until the program is run using a real
 framebuffer.
 <p> The target refresh rate can be set via the <b>View|Refresh Rate</b>
-menu item. This will cause <tt>tqvfb</tt> to check for updated regions more
+menu item. This will cause <tt>qvfb</tt> to check for updated regions more
 frequently. The rate is a target only. If little drawing is being
 done, the framebuffer will not show any updates between drawing
 events. If an application is displaying an animation the updates will
-be frequent, then the application and <tt>tqvfb</tt> will compete for
+be frequent, then the application and <tt>qvfb</tt> will compete for
 processor time.
 <p> Mouse and keyboard events are passed to the Qt/Embedded master process via
 named pipes.
 <p> The virtual framebuffer is a development tool only. No security issues have
 been considered in the virtual framebuffer design. It should be avoided
-in a production environment; do not configure production libraries with <tt>-tqvfb</tt>.
+in a production environment; do not configure production libraries with <tt>-qvfb</tt>.
 <p> 
 <!-- eof -->
 <p><address><hr><div align=center>
diff --git a/doc/html/emb-running.html b/doc/html/emb-running.html
index 499d99e..fae839b 100644
--- a/doc/html/emb-running.html
+++ b/doc/html/emb-running.html
@@ -43,7 +43,7 @@ command line option.
 <p> This document assumes you have the Linux framebuffer configured correctly
 and no master process is running. If you do not have a working Linux
 framebuffer you can use the
-<a href="emb-tqvfb.html">Qt/Embedded virtual framebuffer</a>, or you can
+<a href="emb-qvfb.html">Qt/Embedded virtual framebuffer</a>, or you can
 run Qt/Embedded as a <a href="emb-vnc.html">VNC server</a>.
 <p> Change to a Linux console and select an example to run, e.g. <tt>examples/widgets</tt>. Make sure $QTDIR is set to the directory where you
 installed Qt/Embedded and add the $QTDIR/lib directory to
diff --git a/doc/html/emb-vnc.html b/doc/html/emb-vnc.html
index 8a1a09a..6d88dba 100644
--- a/doc/html/emb-vnc.html
+++ b/doc/html/emb-vnc.html
@@ -54,7 +54,7 @@ can change this by setting the <tt>QWS_SIZE</tt> environment variable to
 another size, e.g. <tt>QWS_SIZE=240x320</tt>.
 <p> VNC clients are available for a vast array of display systems: X11,
 Windows, Amiga, DOS, VMS, and dozens of others.
-<p> The <a href="emb-tqvfb.html">Qt Virtual Framebuffer</a> is an alternative
+<p> The <a href="emb-qvfb.html">Qt Virtual Framebuffer</a> is an alternative
 technique. It uses shared memory and thus is much faster and smoother, but
 it does not operate over a network.
 <p> 
diff --git a/doc/html/i18n.html b/doc/html/i18n.html
index 3efb156..2b3803a 100644
--- a/doc/html/i18n.html
+++ b/doc/html/i18n.html
@@ -347,7 +347,7 @@ file for <em>lupdate</em>; your <tt>qmake</tt> project file will work fine once
 you add the <tt>TRANSLATIONS</tt> entry.
 <p> In your application, you must <a href="qtranslator.html#load">QTranslator::load</a>() the translation
 files appropriate for the user's language, and install them using <a href="qapplication.html#installTranslator">QApplication::installTranslator</a>().
-<p> If you have been using the old Qt tools (<tt>tqtfindtr</tt>, <tt>msg2tqm</tt> and <tt>tqtmergetr</tt>), you can use <em>tqm2ts</em> to convert your old <tt>.qm</tt> files.
+<p> If you have been using the old Qt tools (<tt>findtr</tt>, <tt>msg2qm</tt> and <tt>mergetr</tt>), you can use <em>qm2ts</em> to convert your old <tt>.qm</tt> files.
 <p> <em>linguist</em>, <em>lupdate</em> and <em>lrelease</em> are installed in the <tt>bin</tt>
 subdirectory of the base directory Qt is installed into. Click Help|Manual
 in <em>Qt Linguist</em> to access the user's manual; it contains a tutorial
diff --git a/doc/html/index b/doc/html/index
index c98b4c2..cc7ca30 100644
--- a/doc/html/index
+++ b/doc/html/index
@@ -8140,7 +8140,7 @@
 "Qt's Tools" tools-list.html
 "Qt/Embedded Performance Tuning" emb-performance.html
 "Qt/Embedded Pointer Handling" emb-pointer.html
-"Qt/Embedded Virtual Framebuffer" emb-tqvfb.html
+"Qt/Embedded Virtual Framebuffer" emb-qvfb.html
 "Qt/Embedded as a VNC Server" emb-vnc.html
 "Qt/Embedded environment variables" emb-envvars.html
 "Qt/Mac Issues" mac-differences.html
@@ -8282,7 +8282,7 @@
 "i18n" i18n.html
 "images" images.html
 "io" io.html
-"maketqpf" maketqpf.html
+"makeqpf" makeqpf.html
 "misc" misc.html
 "motif-examples" motif-examples.html
 "multimedia" multimedia.html
diff --git a/doc/html/linguist-manual-2.html b/doc/html/linguist-manual-2.html
index 79dc168..e95e386 100644
--- a/doc/html/linguist-manual-2.html
+++ b/doc/html/linguist-manual-2.html
@@ -32,7 +32,7 @@ body { background: #ffffff; color: black; }
 <td align="right" valign="center"><img src="logo32.png" align="right" width="64" height="32" border="0"></td></tr></table><p align="right">[<a href="linguist-manual-1.html">Prev: Introduction</a>] [<a href="linguist-manual.html">Home</a>] [<a href="linguist-manual-3.html">Next: Translators</a>]</p>
 <h2 align="center">Release Manager</h2>
 <!-- index Release Manager --><p>Two tools are provided for the release manager, <a href="linguist-manual-2.html#2">lupdate</a> and <a href="linguist-manual-2.html#3">lrelease</a>. These tools depend on <em>qmake</em> project files. You don't have to use <em>qmake</em>, though.</p>
-<p>A third tool, <tt>tqm2ts</tt>, can be used for converting Qt 2.x message files to <tt>.ts</tt> files.</p>
+<p>A third tool, <tt>qm2ts</tt>, can be used for converting Qt 2.x message files to <tt>.ts</tt> files.</p>
 <h3><a name="1"></a>Qt Project Files</h3>
 <!-- index .pro Files --><!-- index Project Files --><!-- index qmake!Project Files --><p><a href="linguist-manual-2.html#2">lupdate</a> and <a href="linguist-manual-2.html#3">lrelease</a> depend on information in the application's <tt>.pro</tt> Qt project file. There must be an entry in the <tt>TRANSLATIONS</tt> section of the project file for each language that is additional to the native language. A typical entry looks like this:</p>
 <!-- index TRANSLATIONS!in Project Files --><pre>    TRANSLATIONS    = tt2_fr.ts \
diff --git a/doc/html/makeqpf.html b/doc/html/makeqpf.html
index e56614f..54e1c11 100644
--- a/doc/html/makeqpf.html
+++ b/doc/html/makeqpf.html
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/doc/maketqpf.doc:36 -->
+<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/doc/makeqpf.doc:36 -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>maketqpf</title>
+<title>makeqpf</title>
 <style type="text/css"><!--
 fn { margin-left: 1cm; text-indent: -1cm; }
 a:link { color: #004faf; text-decoration: none }
@@ -29,7 +29,7 @@ body { background: #ffffff; color: black; }
  | <a href="functions.html">
 <font color="#004faf">Functions</font></a>
 </td>
-<td align="right" valign="center"><img src="logo32.png" align="right" width="64" height="32" border="0"></td></tr></table><h1 align=center>maketqpf</h1>
+<td align="right" valign="center"><img src="logo32.png" align="right" width="64" height="32" border="0"></td></tr></table><h1 align=center>makeqpf</h1>
 
 
 
@@ -37,7 +37,7 @@ body { background: #ffffff; color: black; }
 <p> <h2> Usage
 </h2>
 <a name="1"></a><p> <pre>
-maketqpf [-A] [-f spec-file] [font ...]
+makeqpf [-A] [-f spec-file] [font ...]
 </pre>
  
 <p> <ul>
diff --git a/doc/html/overviews-list.html b/doc/html/overviews-list.html
index c47d38b..8630ec1 100644
--- a/doc/html/overviews-list.html
+++ b/doc/html/overviews-list.html
@@ -95,7 +95,7 @@ body { background: #ffffff; color: black; }
 </ul>
 <p> <td valign="top">
 <ul>
-<li> <a href="emb-tqvfb.html">QVFb tool - virtual framebuffer for Qt/Embedded</a>
+<li> <a href="emb-qvfb.html">QVFb tool - virtual framebuffer for Qt/Embedded</a>
 <p>&nbsp;</p>
 <li> <a href="emb-install.html">Installing Qt/Embedded</a>
 <li> <a href="emb-features.html">The Feature Definition File</a>
diff --git a/doc/html/porting2.html b/doc/html/porting2.html
index 70dbcb5..cfa84fd 100644
--- a/doc/html/porting2.html
+++ b/doc/html/porting2.html
@@ -134,7 +134,7 @@ etc. are totally unaffected, but code that is
 <em>not</em> in functions of classes inherited from <code>Qt</code>,
 you must qualify these identifiers like this: <code>Qt::red,
 Qt::LeftButton, Qt::AlignRight</code>, etc.
-<p> <p>The <code>qt/bin/tqt20fix</code> script helps to fix the code that
+<p> <p>The <code>qt/bin/qt20fix</code> script helps to fix the code that
 needs adaption, though most code does not need changing.
 <p> Compiling with -DQT1COMPATIBILITY will help you get going with Qt 2.x
 - it allows all the old "dirty namespace" identifiers from Qt 1.x to
diff --git a/doc/html/qt.dcf b/doc/html/qt.dcf
index 1a8617c..0882ceb 100644
--- a/doc/html/qt.dcf
+++ b/doc/html/qt.dcf
@@ -9984,8 +9984,8 @@
 <section ref="tutorial2-04.html" title="Mainly Easy">
     <keyword ref="tutorial2-04.html">Mainly Easy</keyword>
 </section>
-<section ref="maketqpf.html" title="maketqpf">
-    <keyword ref="maketqpf.html">maketqpf</keyword>
+<section ref="makeqpf.html" title="makeqpf">
+    <keyword ref="makeqpf.html">makeqpf</keyword>
 </section>
 <section ref="functions.html" title="Member Function Index">
     <keyword ref="functions.html">Member Function Index</keyword>
@@ -10269,8 +10269,8 @@
 <section ref="emb-pointer.html" title="Qt/Embedded Pointer Handling">
     <keyword ref="emb-pointer.html">Qt/Embedded Pointer Handling</keyword>
 </section>
-<section ref="emb-tqvfb.html" title="Qt/Embedded Virtual Framebuffer">
-    <keyword ref="emb-tqvfb.html">Qt/Embedded Virtual Framebuffer</keyword>
+<section ref="emb-qvfb.html" title="Qt/Embedded Virtual Framebuffer">
+    <keyword ref="emb-qvfb.html">Qt/Embedded Virtual Framebuffer</keyword>
 </section>
 <section ref="qtmac-as-native.html" title="Qt/Mac is Mac OS X Native">
     <keyword ref="qtmac-as-native.html">Qt/Mac is Mac OS X Native</keyword>
diff --git a/doc/html/titleindex b/doc/html/titleindex
index 5addadb..28a1f3a 100644
--- a/doc/html/titleindex
+++ b/doc/html/titleindex
@@ -1061,7 +1061,7 @@ Qt's Tools | tools-list.html
 Qt/Embedded | qws.html
 Qt/Embedded Performance Tuning | emb-performance.html
 Qt/Embedded Pointer Handling | emb-pointer.html
-Qt/Embedded Virtual Framebuffer | emb-tqvfb.html
+Qt/Embedded Virtual Framebuffer | emb-qvfb.html
 Qt/Embedded as a VNC Server | emb-vnc.html
 Qt/Embedded environment variables | emb-envvars.html
 Qt/Mac Issues | mac-differences.html
@@ -1175,7 +1175,7 @@ chart/setdataform.cpp Example File | chart-setdataform-cpp.html
 chart/setdataform.h Example File | chart-setdataform-h.html
 iconview/simple_dd/main.cpp Example File | iconview-simple_dd-main-cpp.html
 iconview/simple_dd/main.h Example File | iconview-simple_dd-main-h.html
-maketqpf | maketqpf.html
+makeqpf | makeqpf.html
 qaccel.h Include File | qaccel-h.html
 qaccessible.h Include File | qaccessible-h.html
 qaction.h Include File | qaction-h.html
diff --git a/doc/html/tools-list.html b/doc/html/tools-list.html
index 6f0dec8..15657e0 100644
--- a/doc/html/tools-list.html
+++ b/doc/html/tools-list.html
@@ -46,9 +46,9 @@ help you need
 <li> <a href="qmake-manual.html">qmake</a> - create Makefiles from
 simple platform-independent project files
 <li> <a href="qembed.html">qembed</a> - convert data, e.g. images, into C++ code
-<li> <a href="emb-tqvfb.html">tqvfb</a> - run and test embedded
+<li> <a href="emb-qvfb.html">qvfb</a> - run and test embedded
 applications on the desktop
-<li> <a href="maketqpf.html">maketqpf</a> - create pre-rendered fonts
+<li> <a href="makeqpf.html">makeqpf</a> - create pre-rendered fonts
 for embedded devices
 <li> <a href="moc.html">moc</a> - the Meta Object Compiler
 <li> <a href="uic.html">uic</a> - the User Interface Compiler
diff --git a/doc/i18n.doc b/doc/i18n.doc
index c1800af..02bb195 100644
--- a/doc/i18n.doc
+++ b/doc/i18n.doc
@@ -372,8 +372,8 @@ In your application, you must \l QTranslator::load() the translation
 files appropriate for the user's language, and install them using \l
 QApplication::installTranslator().
 
-If you have been using the old Qt tools (\c tqtfindtr, \c msg2tqm and \c
-tqtmergetr), you can use \e tqm2ts to convert your old \c .qm files.
+If you have been using the old Qt tools (\c findtr, \c msg2qm and \c
+mergetr), you can use \e qm2ts to convert your old \c .qm files.
 
 \e linguist, \e lupdate and \e lrelease are installed in the \c bin
 subdirectory of the base directory Qt is installed into. Click Help|Manual
diff --git a/doc/makeqpf.doc b/doc/makeqpf.doc
index b293c95..74600ba 100644
--- a/doc/makeqpf.doc
+++ b/doc/makeqpf.doc
@@ -37,16 +37,16 @@
 **********************************************************************/
 
 /*!
-    \page maketqpf.html
+    \page makeqpf.html
 
-    \title maketqpf
+    \title makeqpf
 
 Saves QPF font files by rendering and saving fonts.
 
 \section1 Usage
 
 \code
-maketqpf [-A] [-f spec-file] [font ...]
+makeqpf [-A] [-f spec-file] [font ...]
 \endcode
 
 \list
diff --git a/doc/man/README b/doc/man/README
index e9e38cf..de4ddcd 100644
--- a/doc/man/README
+++ b/doc/man/README
@@ -36,14 +36,14 @@ Debian distribution
     (http://ftp.de.debian.org/debian/pool/main/q/qt-x11-free/)
         qt-x11-free_3.3.8b-11.*
         qt-x11-free_3.3.8b.orig.tar.gz
-  man1/tqtcreatecw.1
+  man1/createcw.1
   man1/designer.1
-  man1/tqtfindtr.1
+  man1/findtr.1
   man1/linguist.1
-  man1/maketqpf.1
-  man1/tqtmergetr.1
-  man1/msg2tqm.1
+  man1/makeqpf.1
+  man1/mergetr.1
+  man1/msg2qm.1
   man1/qembed.1
-  man1/tqt20fix.1
+  man1/qt20fix.1
   man1/qtconfig.1
-  man1/tqvfb.1
+  man1/qvfb.1
diff --git a/doc/man/man1/createcw.1 b/doc/man/man1/createcw.1
index 4567e5f..0959a2d 100644
--- a/doc/man/man1/createcw.1
+++ b/doc/man/man1/createcw.1
@@ -1,10 +1,10 @@
-.TH "tqtcreatecw" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.TH "createcw" "1" "3.0.3" "Troll Tech AS, Norway." ""
 .SH "NAME"
 .LP 
-tqtcreatecw \- custom widget description creater for Qt Designer
+createcw \- custom widget description creater for Qt Designer
 .SH "SYNTAX"
 .LP 
-tqtcreatecw <\fIfilename.cw\fP>
+createcw <\fIfilename.cw\fP>
 .SH "DESCRIPTION"
 .LP 
 This small application makes it much easier to create
@@ -44,8 +44,8 @@ would write here
 After that compile the program, link it with your custom
 widget (library or object file) and run it like this:
 
- (unix): ./tqtcreatecw mywidgets.cw
- (win32): tqtcreatecw mywidgets.cw
+ (unix): ./createcw mywidgets.cw
+ (win32): createcw mywidgets.cw
 
 After that you can import this description file into the
 Qt Designer using the Custom\-Widget Dialog (See
diff --git a/doc/man/man1/findtr.1 b/doc/man/man1/findtr.1
index 163af79..f1d3a87 100644
--- a/doc/man/man1/findtr.1
+++ b/doc/man/man1/findtr.1
@@ -1,10 +1,10 @@
-.TH "tqtfindtr" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.TH "findtr" "1" "3.0.3" "Troll Tech AS, Norway." ""
 .SH "NAME"
 .LP 
-tqtfindtr \- Extracts information about text to be translated
+findtr \- Extracts information about text to be translated
 .SH "SYNTAX"
 .LP 
-tqtfindtr *.cpp *.h >myapp.po
+findtr *.cpp *.h >myapp.po
 .SH "DESCRIPTION"
 .LP 
 
@@ -17,7 +17,7 @@ translated versions of the file would then be
 myapp_de.po, myapp_fr.po, and myapp_ja.po for
 translations in German, French and Japanese respectively.
 
-  tqtfindtr *.cpp *.h >myapp.po
+  findtr *.cpp *.h >myapp.po
   copy myapp.po myapp_de.po
   edit myapp_de.po
 .SH "AUTHORS"
diff --git a/doc/man/man1/makeqpf.1 b/doc/man/man1/makeqpf.1
index 641639c..37ddcfd 100644
--- a/doc/man/man1/makeqpf.1
+++ b/doc/man/man1/makeqpf.1
@@ -1,11 +1,11 @@
-.TH "maketqpf" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.TH "makeqpf" "1" "3.0.3" "Troll Tech AS, Norway." ""
 .SH "NAME"
 .LP 
-maketqpf \- Create qpf files from TTF and BDF files.
+makeqpf \- Create qpf files from TTF and BDF files.
 .SH "DESCRIPTION"
 .LP 
 Qt Prerendered Font (QPF) is a light\-weight non\-scalable
-font format specific to Qt/Embedded.  maketqpf is a tool
+font format specific to Qt/Embedded.  makeqpf is a tool
 that assists producing QPF files from TTF and BDF files.
 
 
diff --git a/doc/man/man1/mergetr.1 b/doc/man/man1/mergetr.1
index a2c574f..9ed2a9f 100644
--- a/doc/man/man1/mergetr.1
+++ b/doc/man/man1/mergetr.1
@@ -1,21 +1,21 @@
-.TH "tqtmergetr" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.TH "mergetr" "1" "3.0.3" "Troll Tech AS, Norway." ""
 .SH "NAME"
 .LP 
-tqtmergetr \- Merge changes in translations
+mergetr \- Merge changes in translations
 .SH "SYNTAX"
 .LP 
-tqtmergetr myapp_de.po myapp.po
+mergetr myapp_de.po myapp.po
 
 .SH "DESCRIPTION"
 .LP 
 When the texts in your program change as it is developed,
-a the base .po file can be regenerated using tqtfindtr,
-then tqtmergetr can be used to merge the changes into the
+a the base .po file can be regenerated using findtr,
+then mergetr can be used to merge the changes into the
 other .po files: 
 
-                tqtmergetr myapp_de.po myapp.po
-                tqtmergetr myapp_fr.po myapp.po
-                tqtmergetr myapp_ja.po myapp.po
+                mergetr myapp_de.po myapp.po
+                mergetr myapp_fr.po myapp.po
+                mergetr myapp_ja.po myapp.po
 
 
 The translation team then edits the new .po files to
diff --git a/doc/man/man1/msg2qm.1 b/doc/man/man1/msg2qm.1
index c350854..7d22bbb 100644
--- a/doc/man/man1/msg2qm.1
+++ b/doc/man/man1/msg2qm.1
@@ -1,10 +1,10 @@
-.TH "msg2tqm" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.TH "msg2qm" "1" "3.0.3" "Troll Tech AS, Norway." ""
 .SH "NAME"
 .LP 
-msg2tqm \- Converts translated .po files to a Qt\-specific binary format.
+msg2qm \- Converts translated .po files to a Qt\-specific binary format.
 .SH "SYNTAX"
 .LP 
-msg2tqm myapp_de.po myapp_de.qm
+msg2qm myapp_de.po myapp_de.qm
 .SH "DESCRIPTION"
 .LP 
 
@@ -14,9 +14,9 @@ are platform and locale independent, containing
 translations in Unicode and various hash tables to
 provide fast look\-up. 
 
-                msg2tqm myapp_de.po myapp_de.qm
-                msg2tqm myapp_fr.po myapp_fr.qm
-                msg2tqm myapp_ja.po myapp_ja.qm
+                msg2qm myapp_de.po myapp_de.qm
+                msg2qm myapp_fr.po myapp_fr.qm
+                msg2qm myapp_ja.po myapp_ja.qm
 
 
 In your application, use QTranslator::load() to load
diff --git a/doc/man/man1/qt20fix.1 b/doc/man/man1/qt20fix.1
index 247bb74..352921b 100644
--- a/doc/man/man1/qt20fix.1
+++ b/doc/man/man1/qt20fix.1
@@ -1,10 +1,10 @@
-.TH "tqt20fix" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.TH "qt20fix" "1" "3.0.3" "Troll Tech AS, Norway." ""
 .SH "NAME"
 .LP 
-tqt20fix \- Helps clean namespace when porting an app from Qt1 to Qt2
+qt20fix \- Helps clean namespace when porting an app from Qt1 to Qt2
 .SH "SYNTAX"
 .LP 
-tqt20fix myapp.cpp
+qt20fix myapp.cpp
 
 .SH "DESCRIPTION"
 .LP 
@@ -19,7 +19,7 @@ functions of classes inherited from Qt, you must qualify
 these identifiers like this: Qt::red, Qt::LeftButton,
 Qt::AlignRight, etc. 
 
-The qt/bin/tqt20fix script helps to fix the code that
+The qt/bin/qt20fix script helps to fix the code that
 needs adaption, though most code does not need changing.
 
 Compiling with \-DQT1COMPATIBILITY will help you get going
diff --git a/doc/man/man1/qvfb.1 b/doc/man/man1/qvfb.1
index acf02e1..0ae800d 100644
--- a/doc/man/man1/qvfb.1
+++ b/doc/man/man1/qvfb.1
@@ -1,7 +1,7 @@
-.TH "tqvfb" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.TH "qvfb" "1" "3.0.3" "Troll Tech AS, Norway." ""
 .SH "NAME"
 .LP 
-tqvfb \- Virtual framebuffer for Qt
+qvfb \- Virtual framebuffer for Qt
 .SH "DESCRIPTION"
 .LP 
 The virtual framebuffer allows Qt/Embedded programs to be
@@ -19,7 +19,7 @@ driver, e.g.:
 You may prefer to set the QWS_DISPLAY environment
 variable to be QVFb:0. 
 
-tqvfb supports the following command line options: 
+qvfb supports the following command line options: 
 
  \-width width: the width of the virtual framebuffer
   (default: 240). 
@@ -36,7 +36,7 @@ tqvfb supports the following command line options:
 
 The virtual framebuffer emulates a framebuffer using a
 shared memory region (the virtual frame buffer) and a
-utility to display the framebuffer in a window (tqvfb).
+utility to display the framebuffer in a window (qvfb).
 The regions of the display that have changed are updated
 periodically, so you will see discrete snapshots of the
 framebuffer rather than each individual drawing
@@ -45,12 +45,12 @@ flickering may not be apparent until the program is run
 using a real framebuffer. 
 
 The target refresh rate can be set via the "View|Refresh
-Rate" menu item. This will cause tqvfb to check for
+Rate" menu item. This will cause qvfb to check for
 updated regions more quickly. The rate is a target only.
 If little drawing is being done, the framebuffer will not
 show any updates between drawing events. If an
 application is displaying an animation the updates will
-be frequent, and the application and tqvfb will compete
+be frequent, and the application and qvfb will compete
 for processor time. 
 
 Mouse and keyboard events are passed to the Qt/Embedded
diff --git a/doc/overviews-list.doc b/doc/overviews-list.doc
index 4f36978..9cfe3cd 100644
--- a/doc/overviews-list.doc
+++ b/doc/overviews-list.doc
@@ -113,7 +113,7 @@
 
 \i
     \list
-    \i \link emb-tqvfb.html  QVFb tool - virtual framebuffer for Qt/Embedded \endlink
+    \i \link emb-qvfb.html  QVFb tool - virtual framebuffer for Qt/Embedded \endlink
     <p>&nbsp;</p>
     \i \link emb-install.html Installing Qt/Embedded \endlink
     \i \link emb-features.html The Feature Definition File \endlink
diff --git a/doc/porting2.doc b/doc/porting2.doc
index 1ce8f51..1877446 100644
--- a/doc/porting2.doc
+++ b/doc/porting2.doc
@@ -157,7 +157,7 @@ etc. are totally unaffected, but code that is
 you must qualify these identifiers like this: <code>Qt::red,
 Qt::LeftButton, Qt::AlignRight</code>, etc.
 
-<p>The <code>qt/bin/tqt20fix</code> script helps to fix the code that
+<p>The <code>qt/bin/qt20fix</code> script helps to fix the code that
 needs adaption, though most code does not need changing.
 
 Compiling with -DQT1COMPATIBILITY will help you get going with Qt 2.x
diff --git a/doc/qvfb.doc b/doc/qvfb.doc
index e63ba51..7bc1546 100644
--- a/doc/qvfb.doc
+++ b/doc/qvfb.doc
@@ -36,24 +36,24 @@
 **
 **********************************************************************/
  
-/*! \page emb-tqvfb.html
+/*! \page emb-qvfb.html
 
 \title Qt/Embedded Virtual Framebuffer
 
 The virtual framebuffer allows Qt/Embedded programs to be developed on
 a desktop machine, without switching between consoles and X11.
 
-The virtual framebuffer is located in \c $QTDIR/tools/tqvfb.
+The virtual framebuffer is located in \c $QTDIR/tools/qvfb.
 
 \section1 Using the Virtual Framebuffer
 
 \list 1 
-\i Configure Qt/Embedded with the \c -tqvfb argument and compile the library:
+\i Configure Qt/Embedded with the \c -qvfb argument and compile the library:
     \code
-    ./configure -tqvfb
+    ./configure -qvfb
     make
     \endcode
-\i Compile \c tqvfb as a normal Qt/X11 application and run it. Do \e not
+\i Compile \c qvfb as a normal Qt/X11 application and run it. Do \e not
     compile it as a Qt/Embedded application.
 \i Start a Qt/Embedded master application (i.e., construct
     QApplication with the QApplication::GuiServer flag or use the \c
@@ -62,15 +62,15 @@ The virtual framebuffer is located in \c $QTDIR/tools/tqvfb.
     \code
     masterapp -qws -display QVFb:0
     \endcode
-\i Qt/Embedded will autodetect tqvfb, so you can omit the \c -display
-   command line parameter if you know that tqvfb is running, and that
-   the Qt/Embedded library supports tqvfb. (If this is not the case,
+\i Qt/Embedded will autodetect qvfb, so you can omit the \c -display
+   command line parameter if you know that qvfb is running, and that
+   the Qt/Embedded library supports qvfb. (If this is not the case,
    Qt/Embedded will write to the real framebuffer, and your X11
    display will be corrupted.)
 
 \endlist
 
-\c tqvfb supports the following command line options:
+\c qvfb supports the following command line options:
  
 \table
 \header \i Option \i Meaning
@@ -95,18 +95,18 @@ The virtual framebuffer is located in \c $QTDIR/tools/tqvfb.
 
 The virtual framebuffer emulates a framebuffer using a shared memory region
 (the virtual frame buffer) and a utility to display the framebuffer in a
-window (\c tqvfb). The regions of the display that have changed are updated
+window (\c qvfb). The regions of the display that have changed are updated
 periodically, so you will see discrete snapshots of the framebuffer rather
 than each individual drawing operation. For this reason drawing problems
 such as flickering may not be apparent until the program is run using a real
 framebuffer.
 
 The target refresh rate can be set via the <b>View|Refresh Rate</b>
-menu item. This will cause \c tqvfb to check for updated regions more
+menu item. This will cause \c qvfb to check for updated regions more
 frequently. The rate is a target only. If little drawing is being
 done, the framebuffer will not show any updates between drawing
 events. If an application is displaying an animation the updates will
-be frequent, then the application and \c tqvfb will compete for
+be frequent, then the application and \c qvfb will compete for
 processor time.
 
 Mouse and keyboard events are passed to the Qt/Embedded master process via
@@ -114,6 +114,6 @@ named pipes.
 
 The virtual framebuffer is a development tool only. No security issues have
 been considered in the virtual framebuffer design. It should be avoided
-in a production environment; do not configure production libraries with \c -tqvfb.
+in a production environment; do not configure production libraries with \c -qvfb.
 
 */
diff --git a/doc/qws.doc b/doc/qws.doc
index 6f82d31..746baa9 100644
--- a/doc/qws.doc
+++ b/doc/qws.doc
@@ -178,7 +178,7 @@ make, edit \c $QTDIR/include/qconfig.h and change the definition of
 
 \i This document shows how to use Qt/Embedded with the Linux framebuffer. For
 development and debugging purposes it is often easier to use the \link
-emb-tqvfb.html Qt/Embedded virtual framebuffer\endlink instead.
+emb-qvfb.html Qt/Embedded virtual framebuffer\endlink instead.
 
 
 \endlist
@@ -222,7 +222,7 @@ support in Qt/Embedded for writing a QPF font file from any font, so
 you can initially enable TTF and BDF formats, save QPF files for the
 fonts and sizes you need, then remove TTF and BDF support.
 
-See \link maketqpf.html tools/maketqpf\endlink for a tool that helps
+See \link makeqpf.html tools/makeqpf\endlink for a tool that helps
 produce QPF files from the TTF and BDF, or just run your application
 with the \c -savefonts option.
 
@@ -326,7 +326,7 @@ generate all 4 rotations of fonts would be to run the following at a real frameb
 <pre>
 for dpy in LinuxFb Transformed:Rot90 Transformed:Rot180 Transformed:Rot270
 do
-    QWS_DISPLAY=$dpy ./maketqpf "$@"
+    QWS_DISPLAY=$dpy ./makeqpf "$@"
 done
 </pre>
 If programs are only ever run in one orientation on a device, only the one
@@ -354,7 +354,7 @@ command line option.
 This document assumes you have the Linux framebuffer configured correctly
 and no master process is running. If you do not have a working Linux
 framebuffer you can use the
-\link emb-tqvfb.html Qt/Embedded virtual framebuffer\endlink, or you can
+\link emb-qvfb.html Qt/Embedded virtual framebuffer\endlink, or you can
 run Qt/Embedded as a \link emb-vnc.html VNC server\endlink.
 
 Change to a Linux console and select an example to run, e.g. \c
@@ -663,7 +663,7 @@ another size, e.g. \c QWS_SIZE=240x320.
 VNC clients are available for a vast array of display systems: X11,
 Windows, Amiga, DOS, VMS, and dozens of others.
 
-The \link emb-tqvfb.html Qt Virtual Framebuffer \endlink is an alternative
+The \link emb-qvfb.html Qt Virtual Framebuffer \endlink is an alternative
 technique. It uses shared memory and thus is much faster and smoother, but
 it does not operate over a network.
 
diff --git a/doc/tools-list.doc b/doc/tools-list.doc
index e3e16a0..096417a 100644
--- a/doc/tools-list.doc
+++ b/doc/tools-list.doc
@@ -16,9 +16,9 @@
     \i \link qmake-manual.book  qmake \endlink - create Makefiles from
     simple platform-independent project files
     \i \link qembed.html  qembed\endlink - convert data, e.g. images, into C++ code
-    \i \link emb-tqvfb.html  tqvfb\endlink - run and test embedded
+    \i \link emb-qvfb.html  qvfb\endlink - run and test embedded
     applications on the desktop
-    \i \link maketqpf.html maketqpf\endlink - create pre-rendered fonts
+    \i \link makeqpf.html makeqpf\endlink - create pre-rendered fonts
     for embedded devices
     \i \link moc.html moc\endlink - the Meta Object Compiler
     \i \link uic.html uic\endlink - the User Interface Compiler
diff --git a/src/embedded/qt_embedded.pri b/src/embedded/qt_embedded.pri
index d02bdfb..a4e2223 100644
--- a/src/embedded/qt_embedded.pri
+++ b/src/embedded/qt_embedded.pri
@@ -33,7 +33,7 @@ embedded {
 	}
 	else:DEFINES += QT_NO_QWS_LINUXFB
 
-	contains( gfx-drivers, tqvfb ) {
+	contains( gfx-drivers, qvfb ) {
 		HEADERS += $$EMBEDDED_H/qgfxvfb_qws.h
 		SOURCES += $$EMBEDDED_CPP/qgfxvfb_qws.cpp
 	}
diff --git a/src/kernel/q1xcompatibility.h b/src/kernel/q1xcompatibility.h
index e3a1095..c28f33d 100644
--- a/src/kernel/q1xcompatibility.h
+++ b/src/kernel/q1xcompatibility.h
@@ -43,7 +43,7 @@
 #define Q1XCOMPATIBILITY_H
 
 #error "Compatibility with Qt 1.x is no longer guaranteed. Please"
-#error "update your code (for example using tqt20fix script). We"
+#error "update your code (for example using qt20fix script). We"
 #error "apologize for any inconvenience."
 
 #endif // Q1XCOMPATIBILITY_H
diff --git a/src/kernel/qt.h b/src/kernel/qt.h
index ad421ae..2145d8c 100644
--- a/src/kernel/qt.h
+++ b/src/kernel/qt.h
@@ -258,7 +258,7 @@
 #include <qdatatable.h>
 #include <qvbox.h>
 #include <qvbuttongroup.h>
-#include <tqvfbhdr.h>
+#include <qvfbhdr.h>
 #include <qvgroupbox.h>
 #include <qthread.h>
 #include <qwhatsthis.h>
diff --git a/tools/designer/designer.pro b/tools/designer/designer.pro
index bbe68ad..337bbb4 100644
--- a/tools/designer/designer.pro
+++ b/tools/designer/designer.pro
@@ -6,8 +6,8 @@ SUBDIRS	=  uic \
 	   uilib \
 	   designer \
 	   app \
-	   tools/tqtcreatecw \
-	   tools/tqtconv2ui
+	   tools/createcw \
+	   tools/conv2ui
 
 dll:SUBDIRS *=  editor plugins
 shared:SUBDIRS *=  editor plugins
diff --git a/tools/designer/designer/customwidgeteditor.ui b/tools/designer/designer/customwidgeteditor.ui
index 127ab4a..6f025fc 100644
--- a/tools/designer/designer/customwidgeteditor.ui
+++ b/tools/designer/designer/customwidgeteditor.ui
@@ -186,7 +186,7 @@
             </property>
             <property name="whatsThis" stdset="0">
                 <string>&lt;b&gt;Load Descriptions&lt;/b&gt;&lt;p&gt;Loads a file which contains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.&lt;/p&gt;
-&lt;p&gt;Since it is a lot of work to type in all the information for custom widgets, you should consider using the tqtcreatecw tool which is in $QTDIR/tools/designer/tools/tqtcreatecw. Using tqtcreatecw you can create custom widget description files for your custom widgets without the need to type in all the information manually. For more information about the README file in the tqtcreatecw directory&lt;/p&gt;</string>
+&lt;p&gt;Since it is a lot of work to type in all the information for custom widgets, you should consider using the createcw tool which is in $QTDIR/tools/designer/tools/createcw. Using createcw you can create custom widget description files for your custom widgets without the need to type in all the information manually. For more information about the README file in the createcw directory&lt;/p&gt;</string>
             </property>
         </widget>
         <widget class="QPushButton" row="4" column="1">
diff --git a/tools/designer/designer/designer_de.ts b/tools/designer/designer/designer_de.ts
index f2c55cf..64f3cf3 100644
--- a/tools/designer/designer/designer_de.ts
+++ b/tools/designer/designer/designer_de.ts
@@ -424,7 +424,7 @@ so it is not possible to rename it to this name.</source>
     </message>
     <message encoding="UTF-8">
         <source>&lt;b&gt;Load Descriptions&lt;/b&gt;&lt;p&gt;Loads a file which contains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.&lt;/p&gt;
-&lt;p&gt;As it is a lot of work to type in all the information for custom widgets, you should check the tool tqtcreatecw which you can find in $QTDIR/tools/designer/tools/tqtcreatecw. Using that tool you can create custom widget description files for your custom widgets without the need of typing in all that information. For more information about that see the README file in that directory&lt;/p&gt;</source>
+&lt;p&gt;As it is a lot of work to type in all the information for custom widgets, you should check the tool createcw which you can find in $QTDIR/tools/designer/tools/createcw. Using that tool you can create custom widget description files for your custom widgets without the need of typing in all that information. For more information about that see the README file in that directory&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message encoding="UTF-8">
diff --git a/tools/designer/designer/designer_fr.ts b/tools/designer/designer/designer_fr.ts
index f2c55cf..64f3cf3 100644
--- a/tools/designer/designer/designer_fr.ts
+++ b/tools/designer/designer/designer_fr.ts
@@ -424,7 +424,7 @@ so it is not possible to rename it to this name.</source>
     </message>
     <message encoding="UTF-8">
         <source>&lt;b&gt;Load Descriptions&lt;/b&gt;&lt;p&gt;Loads a file which contains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.&lt;/p&gt;
-&lt;p&gt;As it is a lot of work to type in all the information for custom widgets, you should check the tool tqtcreatecw which you can find in $QTDIR/tools/designer/tools/tqtcreatecw. Using that tool you can create custom widget description files for your custom widgets without the need of typing in all that information. For more information about that see the README file in that directory&lt;/p&gt;</source>
+&lt;p&gt;As it is a lot of work to type in all the information for custom widgets, you should check the tool createcw which you can find in $QTDIR/tools/designer/tools/createcw. Using that tool you can create custom widget description files for your custom widgets without the need of typing in all that information. For more information about that see the README file in that directory&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message encoding="UTF-8">
diff --git a/tools/designer/tools/conv2ui/main.cpp b/tools/designer/tools/conv2ui/main.cpp
index 2859c3a..7ede6c7 100644
--- a/tools/designer/tools/conv2ui/main.cpp
+++ b/tools/designer/tools/conv2ui/main.cpp
@@ -137,11 +137,11 @@ QString Conv2ui::absName( const QString & filename )
 
 void printHelpMessage( QStringList & formats )
 {
-    printf( "Usage: tqtconv2ui [options] <file> <destination directory>\n\n" );
+    printf( "Usage: conv2ui [options] <file> <destination directory>\n\n" );
     printf( "Options:\n");
     printf( "\t-help\t\tDisplay this information\n" );
     printf( "\t-silent\t\tDon't write any messages\n");
-    printf( "\t-version\tDisplay version of tqtconv2ui\n");
+    printf( "\t-version\tDisplay version of conv2ui\n");
     printf( "Supported file formats:\n" );
     for ( QStringList::Iterator it = formats.begin(); it != formats.end(); ++it )
 	printf( "\t%s\n", (*it).latin1() );
@@ -201,7 +201,7 @@ int main( int argc, char ** argv )
     if ( !silent ) {
         printf( "Qt user interface file converter.\n" );
 	if ( unrecognized ) {
-	    printf( "tqtconv2ui: Unrecognized option\n" );
+	    printf( "conv2ui: Unrecognized option\n" );
 	}
     }
     if ( version ) {
diff --git a/tools/designer/tools/createcw/createcw.pro b/tools/designer/tools/createcw/createcw.pro
index 875a2e7..415c0be 100644
--- a/tools/designer/tools/createcw/createcw.pro
+++ b/tools/designer/tools/createcw/createcw.pro
@@ -2,7 +2,7 @@ TEMPLATE	= app
 CONFIG		+= qt warn_on release
 HEADERS		=
 SOURCES		= main.cpp
-TARGET		= tqtcreatecw
+TARGET		= createcw
 
 target.path = $$bins.path
 INSTALLS += target
diff --git a/tools/designer/tools/createcw/main.cpp b/tools/designer/tools/createcw/main.cpp
index 3322ee6..78f8562 100644
--- a/tools/designer/tools/createcw/main.cpp
+++ b/tools/designer/tools/createcw/main.cpp
@@ -172,8 +172,8 @@ int main( int argc, char **argv )
     //
     // After that compile the program, link it with your custom widget
     // (library or object file) and run it like this:
-    // (unix): ./tqtcreatecw mywidgets.cw
-    // (win32): tqtcreatecw mywidgets.cw
+    // (unix): ./createcw mywidgets.cw
+    // (win32): createcw mywidgets.cw
     //
     // After that you can import this description file into the Qt
     // Designer using the Custom-Widget Dialog (See
diff --git a/tools/linguist/book/linguist-manager.leaf b/tools/linguist/book/linguist-manager.leaf
index c35aa1a..aa99e01 100644
--- a/tools/linguist/book/linguist-manager.leaf
+++ b/tools/linguist/book/linguist-manager.leaf
@@ -6,7 +6,7 @@ Two tools are provided for the release manager, \l lupdate and \l
 lrelease. These tools depend on \e qmake project files. You don't
 have to use \e qmake, though.
 
-A third tool, \c tqm2ts, can be used for converting Qt 2.x message
+A third tool, \c qm2ts, can be used for converting Qt 2.x message
 files to \c .ts files.
 
 \section1 Qt Project Files
diff --git a/tools/linguist/linguist.pro b/tools/linguist/linguist.pro
index d34c386..3f1f286 100644
--- a/tools/linguist/linguist.pro
+++ b/tools/linguist/linguist.pro
@@ -5,7 +5,7 @@ SUBDIRS		= linguist \
 		  tutorial/tt3 \
 		  lrelease \
 		  lupdate \
-		  tqm2ts
+		  qm2ts
 CONFIG += ordered
 
 REQUIRES=full-config nocrosscompiler
diff --git a/tools/linguist/qm2ts/main.cpp b/tools/linguist/qm2ts/main.cpp
index 3cd00ca..e04c99c 100644
--- a/tools/linguist/qm2ts/main.cpp
+++ b/tools/linguist/qm2ts/main.cpp
@@ -42,13 +42,13 @@ typedef QValueList<QTranslatorMessage> TML;
 static void printUsage()
 {
     fprintf( stderr, "Usage:\n"
-	     "    tqm2ts [ options ] qm-files\n"
+	     "    qm2ts [ options ] qm-files\n"
 	     "Options:\n"
 	     "    -help  Display this information and exit\n"
 	     "    -verbose\n"
 	     "           Explain what is being done\n"
 	     "    -version\n"
-	     "           Display the version of tqm2ts and exit\n" );
+	     "           Display the version of qm2ts and exit\n" );
 }
 
 int main( int argc, char **argv )
@@ -64,7 +64,7 @@ int main( int argc, char **argv )
 	    verbose = TRUE;
 	    continue;
 	} else if ( qstrcmp(argv[i], "-version") == 0 ) {
-	    fprintf( stderr, "tqm2ts version %s\n", QT_VERSION_STR );
+	    fprintf( stderr, "qm2ts version %s\n", QT_VERSION_STR );
 	    return 0;
 	}
 
@@ -99,7 +99,7 @@ int main( int argc, char **argv )
 
 	    if ( !metator.save(g) ) {
 		fprintf( stderr,
-			 "tqm2ts warning: For some reason, I cannot save '%s'\n",
+			 "qm2ts warning: For some reason, I cannot save '%s'\n",
 			 g.latin1() );
 	    } else {
 		if ( verbose ) {
@@ -109,13 +109,13 @@ int main( int argc, char **argv )
 		}
 		if ( ignored > 0 )
 		    fprintf( stderr,
-			     "tqm2ts warning: File '%s' is not a Qt 2.x .qm"
+			     "qm2ts warning: File '%s' is not a Qt 2.x .qm"
 			     " file (some information is lost)\n",
 			     argv[i] );
 	    }
 	} else {
 	    fprintf( stderr,
-		     "tqm2ts warning: For some reason, I cannot load '%s'\n",
+		     "qm2ts warning: For some reason, I cannot load '%s'\n",
 		     argv[i] );
 	}
     }
diff --git a/tools/linguist/qm2ts/qm2ts.1 b/tools/linguist/qm2ts/qm2ts.1
index bf49ca8..e1eb472 100644
--- a/tools/linguist/qm2ts/qm2ts.1
+++ b/tools/linguist/qm2ts/qm2ts.1
@@ -1,4 +1,4 @@
-.TH tqm2ts 1 "18 October 2001" "Trolltech AS" \" -*- nroff -*-
+.TH qm2ts 1 "18 October 2001" "Trolltech AS" \" -*- nroff -*-
 .\"
 .\" Copyright (C) 2001-2008 Trolltech ASA.  All rights reserved.
 .\"
@@ -6,9 +6,9 @@
 .\" the terms and conditions described in the LICENSE file.
 .\"
 .SH NAME
-tqm2ts \- generate Qt Linguist translation files from Qt 2.x message files
+qm2ts \- generate Qt Linguist translation files from Qt 2.x message files
 .SH SYNOPSIS
-.B tqm2ts
+.B qm2ts
 .RI "[ " options " ] " qm-files
 .SH DESCRIPTION
 This page documents the
@@ -25,13 +25,13 @@ used with version control systems if required. It is understood by
 and
 .B Qt Linguist.
 .PP
-.B tqm2ts
+.B qm2ts
 is provided to ease porting from the old internationalization
 tools
-.B (tqtfindtr,
-.B tqtmergetr
+.B (findtr,
+.B mergetr
 and
-.B msg2tqm)
+.B msg2qm)
 to the new ones. It will not accept Qt message files generated by
 .B lrelease,
 as
@@ -47,7 +47,7 @@ Explain what is being done.
 .TP
 .I "-version"
 Display the version of
-.B tqm2ts
+.B qm2ts
 and exit.
 .SH "SEE ALSO"
 .BR http://doc.trolltech.com/i18n.html
diff --git a/tools/linguist/qm2ts/qm2ts.pro b/tools/linguist/qm2ts/qm2ts.pro
index 4d1ee8e..3868e30 100644
--- a/tools/linguist/qm2ts/qm2ts.pro
+++ b/tools/linguist/qm2ts/qm2ts.pro
@@ -7,7 +7,7 @@ SOURCES		= main.cpp \
 DEFINES 	+= QT_INTERNAL_XML
 include( ../../../src/qt_professional.pri )
 
-TARGET		= tqm2ts
+TARGET		= qm2ts
 INCLUDEPATH	+= ../shared
 DESTDIR		= ../../../bin
 
diff --git a/tools/makeqpf/main.cpp b/tools/makeqpf/main.cpp
index 8734d5a..0dceee3 100644
--- a/tools/makeqpf/main.cpp
+++ b/tools/makeqpf/main.cpp
@@ -242,7 +242,7 @@ private slots:
 
 static void usage()
 {
-    qWarning("Usage: maketqpf [-A] [-f spec-file] [font ...]");
+    qWarning("Usage: makeqpf [-A] [-f spec-file] [font ...]");
     qWarning("");
     qWarning("   Saves QPF font files by rendering and saving fonts.");
     qWarning("");
diff --git a/tools/makeqpf/makeall b/tools/makeqpf/makeall
index bb167f3..cd5008c 100755
--- a/tools/makeqpf/makeall
+++ b/tools/makeqpf/makeall
@@ -1,4 +1,4 @@
 for dpy in LinuxFb Transformed:Rot90 Transformed:Rot180 Transformed:Rot270
 do
-    QWS_DISPLAY=$dpy ./maketqpf
+    QWS_DISPLAY=$dpy ./makeqpf
 done
diff --git a/tools/makeqpf/makeqpf.pro b/tools/makeqpf/makeqpf.pro
index 2fa9d75..8a61af6 100644
--- a/tools/makeqpf/makeqpf.pro
+++ b/tools/makeqpf/makeqpf.pro
@@ -3,7 +3,7 @@ CONFIG		+= qt warn_on release
 HEADERS		=
 SOURCES		= main.cpp
 INTERFACES	=
-TARGET		= maketqpf
+TARGET		= makeqpf
 REQUIRES=full-config nocrosscompiler
 
 target.path = $$bins.path
diff --git a/tools/mergetr/mergetr.cpp b/tools/mergetr/mergetr.cpp
index 6061aac..8588b3c 100644
--- a/tools/mergetr/mergetr.cpp
+++ b/tools/mergetr/mergetr.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** Copyright (C) 1998-2008 Trolltech ASA.  All rights reserved.
 **
-** This is a utility program for merging tqtfindtr msgfiles
+** This is a utility program for merging findtr msgfiles
 **
 ** This file may be used under the terms of the GNU General
 ** Public License versions 2.0 or 3.0 as published by the Free
diff --git a/tools/mergetr/mergetr.pro b/tools/mergetr/mergetr.pro
index 57b34d3..4fbdae1 100644
--- a/tools/mergetr/mergetr.pro
+++ b/tools/mergetr/mergetr.pro
@@ -1,8 +1,8 @@
 TEMPLATE	= app
 CONFIG		+= console qt warn_on release
 HEADERS		=
-SOURCES		= tqtmergetr.cpp
-TARGET		= tqtmergetr
+SOURCES		= mergetr.cpp
+TARGET		= mergetr
 REQUIRES=full-config nocrosscompiler
 
 target.path = $$bins.path
diff --git a/tools/msg2qm/msg2qm.cpp b/tools/msg2qm/msg2qm.cpp
index d2a1c80..6ac8c36 100644
--- a/tools/msg2qm/msg2qm.cpp
+++ b/tools/msg2qm/msg2qm.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** Copyright (C) 1998-2008 Trolltech ASA.  All rights reserved.
 **
-** This is a utility program for converting tqtfindtr msgfiles to
+** This is a utility program for converting findtr msgfiles to
 ** qtranslator message files
 **
 ** This file may be used under the terms of the GNU General
diff --git a/tools/msg2qm/msg2qm.pro b/tools/msg2qm/msg2qm.pro
index a92f5b9..f81f03e 100644
--- a/tools/msg2qm/msg2qm.pro
+++ b/tools/msg2qm/msg2qm.pro
@@ -2,8 +2,8 @@ TEMPLATE	= app
 DEPENDPATH      = ../../include
 CONFIG		+= console qt warn_on release
 HEADERS		=
-SOURCES		= msg2tqm.cpp
-TARGET		= msg2tqm
+SOURCES		= msg2qm.cpp
+TARGET		= msg2qm
 REQUIRES=full-config nocrosscompiler
 
 target.path = $$bins.path
diff --git a/tools/qvfb/README b/tools/qvfb/README
index 5f35b26..c627041 100644
--- a/tools/qvfb/README
+++ b/tools/qvfb/README
@@ -1,7 +1,7 @@
 Qt/Embedded Virtual Framebuffer
 ===============================
 
-Please note that the tqvfb program needs to be compiled with the X11 version
+Please note that the qvfb program needs to be compiled with the X11 version
 of Qt.
 
 The virtual frame buffer allows a Qt/Embedded program to be developed on your
@@ -16,20 +16,20 @@ framebuffer.
 To use the virtual framebuffer:
 
 1. Ensure QT_NO_QWS_VFB is not set in qconfig.h (when you configure Qt,
-   add the -tqvfb option).
-2. Start tqvfb (tqvfb should be compiled as a normal Qt/X11 application,
+   add the -qvfb option).
+2. Start qvfb (qvfb should be compiled as a normal Qt/X11 application,
    NOT as a Qt/Embedded application!).
 3. Start a Qt/Embedded server (i.e. construct QApplication with
    QApplication::GuiServer flag, or run a client with the -qws option).
 
-tqvfb supports the following command line options:
+qvfb supports the following command line options:
 
 [-width width]   the width of the virtual framebuffer (default: 240).
 [-height height] the height of the virtual framebuffer (default: 320).
 [-depth depth]   the depth of the virtual framebuffer (1,4,8 or 32, default: 8).
 [-nocursor]      do not display the X11 cursor in the framebuffer window.
 [-qwsdisplay]    the Qt/Embedded display ID, e.g. -qwsdisplay :1 (default :0).
-[-skin skinfile] tells tqvfb to load a skin file, e.g. -skin pda.skin
+[-skin skinfile] tells qvfb to load a skin file, e.g. -skin pda.skin
 
 Please refer to the file "pda.skin" for an example of what a skin file looks like.
 The format for skin files is:
diff --git a/tools/qvfb/main.cpp b/tools/qvfb/main.cpp
index dd25031..50e11ec 100644
--- a/tools/qvfb/main.cpp
+++ b/tools/qvfb/main.cpp
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include "tqvfb.h"
+#include "qvfb.h"
 
 #include <qapplication.h>
 #include <qpainter.h>
diff --git a/tools/qvfb/qvfb.cpp b/tools/qvfb/qvfb.cpp
index 9483177..1be15f8 100644
--- a/tools/qvfb/qvfb.cpp
+++ b/tools/qvfb/qvfb.cpp
@@ -31,9 +31,9 @@
 **
 **********************************************************************/
 
-#include "tqvfb.h"
-#include "tqvfbview.h"
-#include "tqvfbratedlg.h"
+#include "qvfb.h"
+#include "qvfbview.h"
+#include "qvfbratedlg.h"
 #include "config.h"
 #include "skin.h"
 
diff --git a/tools/qvfb/qvfb.pro b/tools/qvfb/qvfb.pro
index 33e6a3f..7896e7c 100644
--- a/tools/qvfb/qvfb.pro
+++ b/tools/qvfb/qvfb.pro
@@ -1,11 +1,11 @@
 TEMPLATE	= app
 CONFIG		+= qt warn_on release
-HEADERS		= tqvfb.h tqvfbview.h tqvfbratedlg.h qanimationwriter.h \
+HEADERS		= qvfb.h qvfbview.h qvfbratedlg.h qanimationwriter.h \
 		  gammaview.h skin.h
-SOURCES		= tqvfb.cpp tqvfbview.cpp tqvfbratedlg.cpp \
+SOURCES		= qvfb.cpp qvfbview.cpp qvfbratedlg.cpp \
 		  main.cpp qanimationwriter.cpp skin.cpp
 INTERFACES	= config.ui
 IMAGES		= images/logo.png
-TARGET		= tqvfb
+TARGET		= qvfb
 INCLUDEPATH	+= $$QT_SOURCE_TREE/src/3rdparty/libpng $$QT_SOURCE_TREE/src/3rdparty/zlib
 DEPENDPATH	= ../../include
diff --git a/tools/qvfb/qvfbratedlg.cpp b/tools/qvfb/qvfbratedlg.cpp
index 159d241..65c0fe2 100644
--- a/tools/qvfb/qvfbratedlg.cpp
+++ b/tools/qvfb/qvfbratedlg.cpp
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include "tqvfbratedlg.h"
+#include "qvfbratedlg.h"
 
 #include <qlayout.h>
 #include <qlabel.h>
diff --git a/tools/qvfb/qvfbview.cpp b/tools/qvfb/qvfbview.cpp
index 7afc2fc..32ac3d9 100644
--- a/tools/qvfb/qvfbview.cpp
+++ b/tools/qvfb/qvfbview.cpp
@@ -40,8 +40,8 @@
 #include "qlock_p.h"
 #endif
 
-#include "tqvfbview.h"
-#include "tqvfbhdr.h"
+#include "qvfbview.h"
+#include "qvfbhdr.h"
 
 #define QTE_PIPE "QtEmbedded-%1"
 
diff --git a/tools/qvfb/skin.cpp b/tools/qvfb/skin.cpp
index 955b4c0..6322750 100644
--- a/tools/qvfb/skin.cpp
+++ b/tools/qvfb/skin.cpp
@@ -32,8 +32,8 @@
 **********************************************************************/
 
 #include "skin.h"
-#include "tqvfb.h"
-#include "tqvfbview.h"
+#include "qvfb.h"
+#include "qvfbview.h"
 
 #include <qbitmap.h>
 #include <qpixmap.h>
diff --git a/tools/tools.pro b/tools/tools.pro
index a790d71..e10c970 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -7,10 +7,10 @@ no-png {
 		      assistant \
 		      linguist
     unix:SUBDIRS	+= qtconfig \
-			tqtmergetr \
+			mergetr \
 			qconfig \
-			maketqpf \
-			msg2tqm \
+			makeqpf \
+			msg2qm \
 			qembed
 }