Automated update from qt3

2 files changed, 36 insertions, 36 deletions

diff --git a/src/moc/moc.y b/src/moc/moc.y
index c9c3f0b9..0026ef2c 100644
--- a/src/moc/moc.y
+++ b/src/moc/moc.y
@@ -1816,7 +1816,7 @@ int main( int argc, char **argv )
     return ret;
 }
 #else
-bool qt_is_gui_used = FALSE;
+bool tqt_is_gui_used = FALSE;
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
@@ -2319,7 +2319,7 @@ char *straddSpc( const char *s1, const char *s2,
 
 
 /*
-  We call B::qt_invoke() rather than A::B::qt_invoke() to
+  We call B::tqt_invoke() rather than A::B::tqt_invoke() to
   work around a bug in MSVC 6. The bug occurs if the
   super-class is in a namespace and the sub-class isn't.
 
@@ -3065,7 +3065,7 @@ void generateClass()		      // generate C++ source code for a class
 //
 // Generate smart cast function
 //
-    fprintf( out, "\nvoid* %s::qt_cast( const char* clname )\n{\n",
+    fprintf( out, "\nvoid* %s::tqt_cast( const char* clname )\n{\n",
 	     (const char*)qualifiedClassName() );
     fprintf( out, "    if ( !qstrcmp( clname, \"%s\" ) )\n"
 		  "\treturn this;\n",
@@ -3078,7 +3078,7 @@ void generateClass()		      // generate C++ source code for a class
         fprintf( out, "\treturn (%s*)this;\n", fixed.data());
     }
     if ( !g->superClassName.isEmpty() && !isTQObject )
-	fprintf( out, "    return %s::qt_cast( clname );\n",
+	fprintf( out, "    return %s::tqt_cast( clname );\n",
 		 (const char*)purestSuperClassName() );
     else
 	fprintf( out, "    return 0;\n" );
@@ -3234,9 +3234,9 @@ void generateClass()		      // generate C++ source code for a class
 
 
 //
-// Generate internal qt_invoke()  function
+// Generate internal tqt_invoke()  function
 //
-    fprintf( out, "\nbool %s::qt_invoke( int _id, TQUObject* _o )\n{\n", qualifiedClassName().data() );
+    fprintf( out, "\nbool %s::tqt_invoke( int _id, TQUObject* _o )\n{\n", qualifiedClassName().data() );
 
     if( !g->slots.isEmpty() ) {
 	fprintf( out, "    switch ( _id - staticMetaObject()->slotOffset() ) {\n" );
@@ -3298,7 +3298,7 @@ void generateClass()		      // generate C++ source code for a class
 	fprintf( out, "    default:\n" );
 
 	if ( !g->superClassName.isEmpty() && !isTQObject ) {
-	    fprintf( out, "\treturn %s::qt_invoke( _id, _o );\n",
+	    fprintf( out, "\treturn %s::tqt_invoke( _id, _o );\n",
 		     (const char *) purestSuperClassName() );
 	} else {
 	    fprintf( out, "\treturn FALSE;\n" );
@@ -3307,7 +3307,7 @@ void generateClass()		      // generate C++ source code for a class
 	fprintf( out, "    return TRUE;\n}\n" );
     } else {
 	if ( !g->superClassName.isEmpty()  && !isTQObject )
-	    fprintf( out, "    return %s::qt_invoke(_id,_o);\n}\n",
+	    fprintf( out, "    return %s::tqt_invoke(_id,_o);\n}\n",
 		     (const char *) purestSuperClassName() );
 	else
 	    fprintf( out, "    return FALSE;\n}\n" );
@@ -3315,9 +3315,9 @@ void generateClass()		      // generate C++ source code for a class
 
 
 //
-// Generate internal qt_emit()  function
+// Generate internal tqt_emit()  function
 //
-    fprintf( out, "\nbool %s::qt_emit( int _id, TQUObject* _o )\n{\n", qualifiedClassName().data() );
+    fprintf( out, "\nbool %s::tqt_emit( int _id, TQUObject* _o )\n{\n", qualifiedClassName().data() );
 
     if ( !g->signals.isEmpty() ) {
 	fprintf( out, "    switch ( _id - staticMetaObject()->signalOffset() ) {\n" );
@@ -3369,7 +3369,7 @@ void generateClass()		      // generate C++ source code for a class
 	}
 	fprintf( out, "    default:\n" );
 	if ( !g->superClassName.isEmpty()  && !isTQObject )
-	    fprintf( out, "\treturn %s::qt_emit(_id,_o);\n",
+	    fprintf( out, "\treturn %s::tqt_emit(_id,_o);\n",
 		     (const char *) purestSuperClassName() );
 	else
 	    fprintf( out, "\treturn FALSE;\n" );
@@ -3377,7 +3377,7 @@ void generateClass()		      // generate C++ source code for a class
 	fprintf( out, "    return TRUE;\n}\n" );
     } else {
 	if ( !g->superClassName.isEmpty()  && !isTQObject )
-	    fprintf( out, "    return %s::qt_emit(_id,_o);\n}\n",
+	    fprintf( out, "    return %s::tqt_emit(_id,_o);\n}\n",
 		     (const char *) purestSuperClassName() );
 	else
 	    fprintf( out, "    return FALSE;\n}\n" );
@@ -3386,10 +3386,10 @@ void generateClass()		      // generate C++ source code for a class
 
     fprintf( out, "#ifndef QT_NO_PROPERTIES\n" );
 //
-// Generate internal qt_property()  functions
+// Generate internal tqt_property()  functions
 //
 
-    fprintf( out, "\nbool %s::qt_property( int id, int f, TQVariant* v)\n{\n", qualifiedClassName().data() );
+    fprintf( out, "\nbool %s::tqt_property( int id, int f, TQVariant* v)\n{\n", qualifiedClassName().data() );
 
     if ( !g->props.isEmpty() ) {
 	fprintf( out, "    switch ( id - staticMetaObject()->propertyOffset() ) {\n" );
@@ -3502,7 +3502,7 @@ void generateClass()		      // generate C++ source code for a class
 	}
 	fprintf( out, "    default:\n" );
 	if ( !g->superClassName.isEmpty()  && !isTQObject )
-	    fprintf( out, "\treturn %s::qt_property( id, f, v );\n",
+	    fprintf( out, "\treturn %s::tqt_property( id, f, v );\n",
 		     (const char *) purestSuperClassName() );
 	else
 	    fprintf( out, "\treturn FALSE;\n" );
@@ -3510,18 +3510,18 @@ void generateClass()		      // generate C++ source code for a class
 	fprintf( out, "    return TRUE;\n" );
 
 	if ( need_resolve )
-	    fprintf( out, "resolve:\n    return %s::qt_property( staticMetaObject()->resolveProperty(id), f, v );\n",
+	    fprintf( out, "resolve:\n    return %s::tqt_property( staticMetaObject()->resolveProperty(id), f, v );\n",
 		     (const char *) purestSuperClassName() );
 	fprintf( out, "}\n" );
     } else {
 	if ( !g->superClassName.isEmpty() &&  !isTQObject )
-	    fprintf( out, "    return %s::qt_property( id, f, v);\n}\n",
+	    fprintf( out, "    return %s::tqt_property( id, f, v);\n}\n",
 		     (const char *) purestSuperClassName() );
 	else
 	    fprintf( out, "    return FALSE;\n}\n" );
     }
 
-    fprintf( out, "\nbool %s::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; }\n", qualifiedClassName().data() );
+    fprintf( out, "\nbool %s::tqt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; }\n", qualifiedClassName().data() );
     fprintf( out, "#endif // QT_NO_PROPERTIES\n" );
 }
 
diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp
index f3c5c75c..d7f661fe 100644
--- a/src/moc/moc_yacc.cpp
+++ b/src/moc/moc_yacc.cpp
@@ -4642,7 +4642,7 @@ int main( int argc, char **argv )
     return ret;
 }
 #else
-bool qt_is_gui_used = FALSE;
+bool tqt_is_gui_used = FALSE;
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
@@ -5145,7 +5145,7 @@ char *straddSpc( const char *s1, const char *s2,
 
 
 /*
-  We call B::qt_invoke() rather than A::B::qt_invoke() to
+  We call B::tqt_invoke() rather than A::B::tqt_invoke() to
   work around a bug in MSVC 6. The bug occurs if the
   super-class is in a namespace and the sub-class isn't.
 
@@ -5891,7 +5891,7 @@ void generateClass()		      // generate C++ source code for a class
 //
 // Generate smart cast function
 //
-    fprintf( out, "\nvoid* %s::qt_cast( const char* clname )\n{\n",
+    fprintf( out, "\nvoid* %s::tqt_cast( const char* clname )\n{\n",
 	     (const char*)qualifiedClassName() );
     fprintf( out, "    if ( !qstrcmp( clname, \"%s\" ) )\n"
 		  "\treturn this;\n",
@@ -5904,7 +5904,7 @@ void generateClass()		      // generate C++ source code for a class
         fprintf( out, "\treturn (%s*)this;\n", fixed.data());
     }
     if ( !g->superClassName.isEmpty() && !isTQObject )
-	fprintf( out, "    return %s::qt_cast( clname );\n",
+	fprintf( out, "    return %s::tqt_cast( clname );\n",
 		 (const char*)purestSuperClassName() );
     else
 	fprintf( out, "    return 0;\n" );
@@ -6060,9 +6060,9 @@ void generateClass()		      // generate C++ source code for a class
 
 
 //
-// Generate internal qt_invoke()  function
+// Generate internal tqt_invoke()  function
 //
-    fprintf( out, "\nbool %s::qt_invoke( int _id, TQUObject* _o )\n{\n", qualifiedClassName().data() );
+    fprintf( out, "\nbool %s::tqt_invoke( int _id, TQUObject* _o )\n{\n", qualifiedClassName().data() );
 
     if( !g->slots.isEmpty() ) {
 	fprintf( out, "    switch ( _id - staticMetaObject()->slotOffset() ) {\n" );
@@ -6124,7 +6124,7 @@ void generateClass()		      // generate C++ source code for a class
 	fprintf( out, "    default:\n" );
 
 	if ( !g->superClassName.isEmpty() && !isTQObject ) {
-	    fprintf( out, "\treturn %s::qt_invoke( _id, _o );\n",
+	    fprintf( out, "\treturn %s::tqt_invoke( _id, _o );\n",
 		     (const char *) purestSuperClassName() );
 	} else {
 	    fprintf( out, "\treturn FALSE;\n" );
@@ -6133,7 +6133,7 @@ void generateClass()		      // generate C++ source code for a class
 	fprintf( out, "    return TRUE;\n}\n" );
     } else {
 	if ( !g->superClassName.isEmpty()  && !isTQObject )
-	    fprintf( out, "    return %s::qt_invoke(_id,_o);\n}\n",
+	    fprintf( out, "    return %s::tqt_invoke(_id,_o);\n}\n",
 		     (const char *) purestSuperClassName() );
 	else
 	    fprintf( out, "    return FALSE;\n}\n" );
@@ -6141,9 +6141,9 @@ void generateClass()		      // generate C++ source code for a class
 
 
 //
-// Generate internal qt_emit()  function
+// Generate internal tqt_emit()  function
 //
-    fprintf( out, "\nbool %s::qt_emit( int _id, TQUObject* _o )\n{\n", qualifiedClassName().data() );
+    fprintf( out, "\nbool %s::tqt_emit( int _id, TQUObject* _o )\n{\n", qualifiedClassName().data() );
 
     if ( !g->signals.isEmpty() ) {
 	fprintf( out, "    switch ( _id - staticMetaObject()->signalOffset() ) {\n" );
@@ -6195,7 +6195,7 @@ void generateClass()		      // generate C++ source code for a class
 	}
 	fprintf( out, "    default:\n" );
 	if ( !g->superClassName.isEmpty()  && !isTQObject )
-	    fprintf( out, "\treturn %s::qt_emit(_id,_o);\n",
+	    fprintf( out, "\treturn %s::tqt_emit(_id,_o);\n",
 		     (const char *) purestSuperClassName() );
 	else
 	    fprintf( out, "\treturn FALSE;\n" );
@@ -6203,7 +6203,7 @@ void generateClass()		      // generate C++ source code for a class
 	fprintf( out, "    return TRUE;\n}\n" );
     } else {
 	if ( !g->superClassName.isEmpty()  && !isTQObject )
-	    fprintf( out, "    return %s::qt_emit(_id,_o);\n}\n",
+	    fprintf( out, "    return %s::tqt_emit(_id,_o);\n}\n",
 		     (const char *) purestSuperClassName() );
 	else
 	    fprintf( out, "    return FALSE;\n}\n" );
@@ -6212,10 +6212,10 @@ void generateClass()		      // generate C++ source code for a class
 
     fprintf( out, "#ifndef QT_NO_PROPERTIES\n" );
 //
-// Generate internal qt_property()  functions
+// Generate internal tqt_property()  functions
 //
 
-    fprintf( out, "\nbool %s::qt_property( int id, int f, TQVariant* v)\n{\n", qualifiedClassName().data() );
+    fprintf( out, "\nbool %s::tqt_property( int id, int f, TQVariant* v)\n{\n", qualifiedClassName().data() );
 
     if ( !g->props.isEmpty() ) {
 	fprintf( out, "    switch ( id - staticMetaObject()->propertyOffset() ) {\n" );
@@ -6328,7 +6328,7 @@ void generateClass()		      // generate C++ source code for a class
 	}
 	fprintf( out, "    default:\n" );
 	if ( !g->superClassName.isEmpty()  && !isTQObject )
-	    fprintf( out, "\treturn %s::qt_property( id, f, v );\n",
+	    fprintf( out, "\treturn %s::tqt_property( id, f, v );\n",
 		     (const char *) purestSuperClassName() );
 	else
 	    fprintf( out, "\treturn FALSE;\n" );
@@ -6336,18 +6336,18 @@ void generateClass()		      // generate C++ source code for a class
 	fprintf( out, "    return TRUE;\n" );
 
 	if ( need_resolve )
-	    fprintf( out, "resolve:\n    return %s::qt_property( staticMetaObject()->resolveProperty(id), f, v );\n",
+	    fprintf( out, "resolve:\n    return %s::tqt_property( staticMetaObject()->resolveProperty(id), f, v );\n",
 		     (const char *) purestSuperClassName() );
 	fprintf( out, "}\n" );
     } else {
 	if ( !g->superClassName.isEmpty() &&  !isTQObject )
-	    fprintf( out, "    return %s::qt_property( id, f, v);\n}\n",
+	    fprintf( out, "    return %s::tqt_property( id, f, v);\n}\n",
 		     (const char *) purestSuperClassName() );
 	else
 	    fprintf( out, "    return FALSE;\n}\n" );
     }
 
-    fprintf( out, "\nbool %s::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; }\n", qualifiedClassName().data() );
+    fprintf( out, "\nbool %s::tqt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; }\n", qualifiedClassName().data() );
     fprintf( out, "#endif // QT_NO_PROPERTIES\n" );
 }