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

This reverts commit 40e50e6f20276afb557992a51d47618b014e388d.

16 files changed, 32 insertions, 32 deletions

diff --git a/tools/designer/designer.pro b/tools/designer/designer.pro
index a30070359..bbe68ada4 100644
--- a/tools/designer/designer.pro
+++ b/tools/designer/designer.pro
@@ -6,8 +6,8 @@ SUBDIRS	=  uic \
 	   uilib \
 	   designer \
 	   app \
-	   tools/tqttqtcreatecw \
-	   tools/tqtqtconv2ui
+	   tools/tqtcreatecw \
+	   tools/tqtconv2ui
 
 dll:SUBDIRS *=  editor plugins
 shared:SUBDIRS *=  editor plugins
diff --git a/tools/designer/designer/customwidgeteditor.ui b/tools/designer/designer/customwidgeteditor.ui
index 82744a88e..a8623cff2 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 TQt 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 tqttqtcreatecw tool which is in $QTDIR/tools/designer/tools/tqttqtcreatecw. Using tqttqtcreatecw 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 tqttqtcreatecw 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 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>
             </property>
         </widget>
         <widget class="TQPushButton" row="4" column="1">
diff --git a/tools/designer/designer/designer_de.ts b/tools/designer/designer/designer_de.ts
index e710619cd..f2c55cffd 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 tqttqtcreatecw which you can find in $QTDIR/tools/designer/tools/tqttqtcreatecw. 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 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>
         <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 e710619cd..f2c55cffd 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 tqttqtcreatecw which you can find in $QTDIR/tools/designer/tools/tqttqtcreatecw. 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 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>
         <translation type="unfinished"></translation>
     </message>
     <message encoding="UTF-8">
diff --git a/tools/designer/tools/tqtconv2ui/main.cpp b/tools/designer/tools/tqtconv2ui/main.cpp
index 9a8ee901f..208be173b 100644
--- a/tools/designer/tools/tqtconv2ui/main.cpp
+++ b/tools/designer/tools/tqtconv2ui/main.cpp
@@ -137,11 +137,11 @@ TQString Conv2ui::absName( const TQString & filename )
 
 void printHelpMessage( TQStringList & formats )
 {
-    printf( "Usage: tqtqtconv2ui [options] <file> <destination directory>\n\n" );
+    printf( "Usage: tqtconv2ui [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 tqtqtconv2ui\n");
+    printf( "\t-version\tDisplay version of tqtconv2ui\n");
     printf( "Supported file formats:\n" );
     for ( TQStringList::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( "TQt user interface file converter.\n" );
 	if ( unrecognized ) {
-	    printf( "tqtqtconv2ui: Unrecognized option\n" );
+	    printf( "tqtconv2ui: Unrecognized option\n" );
 	}
     }
     if ( version ) {
diff --git a/tools/designer/tools/tqtcreatecw/main.cpp b/tools/designer/tools/tqtcreatecw/main.cpp
index 57e869b47..fcfa43168 100644
--- a/tools/designer/tools/tqtcreatecw/main.cpp
+++ b/tools/designer/tools/tqtcreatecw/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): ./tqttqtcreatecw mywidgets.cw
-    // (win32): tqttqtcreatecw mywidgets.cw
+    // (unix): ./tqtcreatecw mywidgets.cw
+    // (win32): tqtcreatecw mywidgets.cw
     //
     // After that you can import this description file into the TQt
     // Designer using the Custom-Widget Dialog (See
diff --git a/tools/designer/tools/tqtcreatecw/tqtcreatecw.pro b/tools/designer/tools/tqtcreatecw/tqtcreatecw.pro
index e8b76edde..875a2e7b1 100644
--- a/tools/designer/tools/tqtcreatecw/tqtcreatecw.pro
+++ b/tools/designer/tools/tqtcreatecw/tqtcreatecw.pro
@@ -2,7 +2,7 @@ TEMPLATE	= app
 CONFIG		+= qt warn_on release
 HEADERS		=
 SOURCES		= main.cpp
-TARGET		= tqttqtcreatecw
+TARGET		= tqtcreatecw
 
 target.path = $$bins.path
 INSTALLS += target
diff --git a/tools/linguist/book/linguist-manager.leaf b/tools/linguist/book/linguist-manager.leaf
index b0b23b1f2..c35aa1af8 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 ttqm2ts, can be used for converting Qt 2.x message
+A third tool, \c tqm2ts, 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 a72b21599..d34c38608 100644
--- a/tools/linguist/linguist.pro
+++ b/tools/linguist/linguist.pro
@@ -5,7 +5,7 @@ SUBDIRS		= linguist \
 		  tutorial/tt3 \
 		  lrelease \
 		  lupdate \
-		  ttqm2ts
+		  tqm2ts
 CONFIG += ordered
 
 REQUIRES=full-config nocrosscompiler
diff --git a/tools/linguist/tqm2ts/main.cpp b/tools/linguist/tqm2ts/main.cpp
index 3dcd6bc25..6e71a3cbc 100644
--- a/tools/linguist/tqm2ts/main.cpp
+++ b/tools/linguist/tqm2ts/main.cpp
@@ -42,13 +42,13 @@ typedef TQValueList<TQTranslatorMessage> TML;
 static void printUsage()
 {
     fprintf( stderr, "Usage:\n"
-	     "    ttqm2ts [ options ] qm-files\n"
+	     "    tqm2ts [ 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 ttqm2ts and exit\n" );
+	     "           Display the version of tqm2ts 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, "ttqm2ts version %s\n", TQT_VERSION_STR );
+	    fprintf( stderr, "tqm2ts version %s\n", TQT_VERSION_STR );
 	    return 0;
 	}
 
@@ -99,7 +99,7 @@ int main( int argc, char **argv )
 
 	    if ( !metator.save(g) ) {
 		fprintf( stderr,
-			 "ttqm2ts warning: For some reason, I cannot save '%s'\n",
+			 "tqm2ts 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,
-			     "ttqm2ts warning: File '%s' is not a TQt 2.x .qm"
+			     "tqm2ts warning: File '%s' is not a TQt 2.x .qm"
 			     " file (some information is lost)\n",
 			     argv[i] );
 	    }
 	} else {
 	    fprintf( stderr,
-		     "ttqm2ts warning: For some reason, I cannot load '%s'\n",
+		     "tqm2ts warning: For some reason, I cannot load '%s'\n",
 		     argv[i] );
 	}
     }
diff --git a/tools/linguist/tqm2ts/tqm2ts.1 b/tools/linguist/tqm2ts/tqm2ts.1
index daf2a428e..bf49ca8ef 100644
--- a/tools/linguist/tqm2ts/tqm2ts.1
+++ b/tools/linguist/tqm2ts/tqm2ts.1
@@ -1,4 +1,4 @@
-.TH ttqm2ts 1 "18 October 2001" "Trolltech AS" \" -*- nroff -*-
+.TH tqm2ts 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
-ttqm2ts \- generate Qt Linguist translation files from Qt 2.x message files
+tqm2ts \- generate Qt Linguist translation files from Qt 2.x message files
 .SH SYNOPSIS
-.B ttqm2ts
+.B tqm2ts
 .RI "[ " options " ] " qm-files
 .SH DESCRIPTION
 This page documents the
@@ -25,11 +25,11 @@ used with version control systems if required. It is understood by
 and
 .B Qt Linguist.
 .PP
-.B ttqm2ts
+.B tqm2ts
 is provided to ease porting from the old internationalization
 tools
-.B (tqttqtfindtr,
-.B tqttqtmergetr
+.B (tqtfindtr,
+.B tqtmergetr
 and
 .B msg2tqm)
 to the new ones. It will not accept Qt message files generated by
@@ -47,7 +47,7 @@ Explain what is being done.
 .TP
 .I "-version"
 Display the version of
-.B ttqm2ts
+.B tqm2ts
 and exit.
 .SH "SEE ALSO"
 .BR http://doc.trolltech.com/i18n.html
diff --git a/tools/linguist/tqm2ts/tqm2ts.pro b/tools/linguist/tqm2ts/tqm2ts.pro
index a68a8b827..4d1ee8e1f 100644
--- a/tools/linguist/tqm2ts/tqm2ts.pro
+++ b/tools/linguist/tqm2ts/tqm2ts.pro
@@ -7,7 +7,7 @@ SOURCES		= main.cpp \
 DEFINES 	+= QT_INTERNAL_XML
 include( ../../../src/qt_professional.pri )
 
-TARGET		= ttqm2ts
+TARGET		= tqm2ts
 INCLUDEPATH	+= ../shared
 DESTDIR		= ../../../bin
 
diff --git a/tools/msg2tqm/msg2tqm.cpp b/tools/msg2tqm/msg2tqm.cpp
index 5b0e96a72..5bacda177 100644
--- a/tools/msg2tqm/msg2tqm.cpp
+++ b/tools/msg2tqm/msg2tqm.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** Copyright (C) 1998-2008 Trolltech ASA.  All rights reserved.
 **
-** This is a utility program for converting tqttqtfindtr msgfiles to
+** This is a utility program for converting tqtfindtr msgfiles to
 ** qtranslator message files
 **
 ** This file may be used under the terms of the GNU General
diff --git a/tools/tools.pro b/tools/tools.pro
index 2bd3da930..a790d7179 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -7,7 +7,7 @@ no-png {
 		      assistant \
 		      linguist
     unix:SUBDIRS	+= qtconfig \
-			tqttqtmergetr \
+			tqtmergetr \
 			qconfig \
 			maketqpf \
 			msg2tqm \
diff --git a/tools/tqtmergetr/tqtmergetr.cpp b/tools/tqtmergetr/tqtmergetr.cpp
index bf2ae4d31..91296e37b 100644
--- a/tools/tqtmergetr/tqtmergetr.cpp
+++ b/tools/tqtmergetr/tqtmergetr.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** Copyright (C) 1998-2008 Trolltech ASA.  All rights reserved.
 **
-** This is a utility program for merging tqttqtfindtr msgfiles
+** This is a utility program for merging tqtfindtr 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/tqtmergetr/tqtmergetr.pro b/tools/tqtmergetr/tqtmergetr.pro
index 767fa022a..57b34d345 100644
--- a/tools/tqtmergetr/tqtmergetr.pro
+++ b/tools/tqtmergetr/tqtmergetr.pro
@@ -1,8 +1,8 @@
 TEMPLATE	= app
 CONFIG		+= console qt warn_on release
 HEADERS		=
-SOURCES		= tqttqtmergetr.cpp
-TARGET		= tqttqtmergetr
+SOURCES		= tqtmergetr.cpp
+TARGET		= tqtmergetr
 REQUIRES=full-config nocrosscompiler
 
 target.path = $$bins.path