qt -> tqt conversion:

QT_NO_ASCII_CAST -> TQT_NO_ASCII_CAST
QT_NO_STL -> TQT_NO_STL
QT_NO_COMPAT -> TQT_NO_COMPAT
QT_NO_TRANSLATION -> TQT_NO_TRANSLATION

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

3 files changed, 17 insertions, 17 deletions

diff --git a/src/moc/moc.pro b/src/moc/moc.pro
index efa808104..d94d596ec 100644
--- a/src/moc/moc.pro
+++ b/src/moc/moc.pro
@@ -3,7 +3,7 @@ TARGET		= tqmoc
 
 CONFIG 		= console release qtinc yacc lex_included yacc_no_name_mangle
 DEFINES	       += QT_MOC QT_NO_CODECS QT_LITE_UNICODE QT_NO_COMPONENT \
-		  QT_NO_STL QT_NO_COMPRESS
+		  TQT_NO_STL QT_NO_COMPRESS
 win32:DEFINES  += QT_NODLL
 DESTDIR         = ../../bin
 
diff --git a/src/moc/moc.y b/src/moc/moc.y
index e75546058..780669e9e 100644
--- a/src/moc/moc.y
+++ b/src/moc/moc.y
@@ -2879,15 +2879,15 @@ void generateClass()		      // generate C++ source code for a class
 	if ( !g->noInclude ) {
 	    /*
 	      The header file might be a TQt header file with
-	      QT_NO_COMPAT macros around signals, slots or
+	      TQT_NO_COMPAT macros around signals, slots or
 	      properties. Without the #undef, we cannot compile the
-	      TQt library with QT_NO_COMPAT defined.
+	      TQt library with TQT_NO_COMPAT defined.
 
 	      Header files of libraries build around TQt can also use
-	      QT_NO_COMPAT, so this #undef might be beneficial to
+	      TQT_NO_COMPAT, so this #undef might be beneficial to
 	      users of TQt, and not only to developers of TQt.
 	    */
-	    fprintf( out, "#undef QT_NO_COMPAT\n" );
+	    fprintf( out, "#undef TQT_NO_COMPAT\n" );
 
 	    if ( !g->pchFile.isEmpty() )
 	    	fprintf( out, "#include \"%s\" // PCH include\n", (const char*)g->pchFile );
@@ -2959,7 +2959,7 @@ void generateClass()		      // generate C++ source code for a class
 //
 // Generate tr and trUtf8 member functions
 //
-    fprintf( out, "#ifndef QT_NO_TRANSLATION\n" );
+    fprintf( out, "#ifndef TQT_NO_TRANSLATION\n" );
     fprintf( out, "TQString %s::tr( const char *s, const char *c )\n{\n",
 	     (const char*)qualifiedClassName() );
     fprintf( out, "    if ( tqApp )\n" );
@@ -2969,7 +2969,7 @@ void generateClass()		      // generate C++ source code for a class
     fprintf( out, "    else\n" );
     fprintf( out, "\treturn TQString::fromLatin1( s );\n");
     fprintf( out, "}\n" );
-    fprintf( out, "#ifndef QT_NO_TRANSLATION_UTF8\n" );
+    fprintf( out, "#ifndef TQT_NO_TRANSLATION_UTF8\n" );
     fprintf( out, "TQString %s::trUtf8( const char *s, const char *c )\n{\n",
 	     (const char*)qualifiedClassName() );
     fprintf( out, "    if ( tqApp )\n" );
@@ -2979,8 +2979,8 @@ void generateClass()		      // generate C++ source code for a class
     fprintf( out, "    else\n" );
     fprintf( out, "\treturn TQString::fromUtf8( s );\n" );
     fprintf( out, "}\n" );
-    fprintf( out, "#endif // QT_NO_TRANSLATION_UTF8\n\n" );
-    fprintf( out, "#endif // QT_NO_TRANSLATION\n\n" );
+    fprintf( out, "#endif // TQT_NO_TRANSLATION_UTF8\n\n" );
+    fprintf( out, "#endif // TQT_NO_TRANSLATION\n\n" );
 
 //
 // Generate staticMetaObject member function
diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp
index abeab2d71..8ae53116a 100644
--- a/src/moc/moc_yacc.cpp
+++ b/src/moc/moc_yacc.cpp
@@ -5754,15 +5754,15 @@ void generateClass()		      // generate C++ source code for a class
 	if ( !g->noInclude ) {
 	    /*
 	      The header file might be a TQt header file with
-	      QT_NO_COMPAT macros around signals, slots or
+	      TQT_NO_COMPAT macros around signals, slots or
 	      properties. Without the #undef, we cannot compile the
-	      TQt library with QT_NO_COMPAT defined.
+	      TQt library with TQT_NO_COMPAT defined.
 
 	      Header files of libraries build around TQt can also use
-	      QT_NO_COMPAT, so this #undef might be beneficial to
+	      TQT_NO_COMPAT, so this #undef might be beneficial to
 	      users of TQt, and not only to developers of TQt.
 	    */
-	    fprintf( out, "#undef QT_NO_COMPAT\n" );
+	    fprintf( out, "#undef TQT_NO_COMPAT\n" );
 
 	    if ( !g->pchFile.isEmpty() )
 	    	fprintf( out, "#include \"%s\" // PCH include\n", (const char*)g->pchFile );
@@ -5834,7 +5834,7 @@ void generateClass()		      // generate C++ source code for a class
 //
 // Generate tr and trUtf8 member functions
 //
-    fprintf( out, "#ifndef QT_NO_TRANSLATION\n" );
+    fprintf( out, "#ifndef TQT_NO_TRANSLATION\n" );
     fprintf( out, "TQString %s::tr( const char *s, const char *c )\n{\n",
 	     (const char*)qualifiedClassName() );
     fprintf( out, "    if ( tqApp )\n" );
@@ -5844,7 +5844,7 @@ void generateClass()		      // generate C++ source code for a class
     fprintf( out, "    else\n" );
     fprintf( out, "\treturn TQString::fromLatin1( s );\n");
     fprintf( out, "}\n" );
-    fprintf( out, "#ifndef QT_NO_TRANSLATION_UTF8\n" );
+    fprintf( out, "#ifndef TQT_NO_TRANSLATION_UTF8\n" );
     fprintf( out, "TQString %s::trUtf8( const char *s, const char *c )\n{\n",
 	     (const char*)qualifiedClassName() );
     fprintf( out, "    if ( tqApp )\n" );
@@ -5854,8 +5854,8 @@ void generateClass()		      // generate C++ source code for a class
     fprintf( out, "    else\n" );
     fprintf( out, "\treturn TQString::fromUtf8( s );\n" );
     fprintf( out, "}\n" );
-    fprintf( out, "#endif // QT_NO_TRANSLATION_UTF8\n\n" );
-    fprintf( out, "#endif // QT_NO_TRANSLATION\n\n" );
+    fprintf( out, "#endif // TQT_NO_TRANSLATION_UTF8\n\n" );
+    fprintf( out, "#endif // TQT_NO_TRANSLATION\n\n" );
 
 //
 // Generate staticMetaObject member function