From 69d87202cb139ffe9e4b3ce92e434523b7b09b64 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 17 Oct 2018 19:46:30 +0900 Subject: QT_NO_* -> TQT_NO_* renaming. Signed-off-by: Michele Calgaro --- src/moc/moc.pro | 4 ++-- src/moc/moc.y | 20 ++++++++++---------- src/moc/moc_yacc.cpp | 20 ++++++++++---------- 3 files changed, 22 insertions(+), 22 deletions(-) (limited to 'src/moc') diff --git a/src/moc/moc.pro b/src/moc/moc.pro index d94d596ec..c8abcf0d7 100644 --- a/src/moc/moc.pro +++ b/src/moc/moc.pro @@ -2,8 +2,8 @@ TEMPLATE = app 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 \ - TQT_NO_STL QT_NO_COMPRESS +DEFINES += QT_MOC TQT_NO_CODECS QT_LITE_UNICODE TQT_NO_COMPONENT \ + TQT_NO_STL TQT_NO_COMPRESS win32:DEFINES += QT_NODLL DESTDIR = ../../bin diff --git a/src/moc/moc.y b/src/moc/moc.y index 780669e9e..49fcc61f7 100644 --- a/src/moc/moc.y +++ b/src/moc/moc.y @@ -239,10 +239,10 @@ TQCString uTypeExtra( TQCString ctype ) typeExtra.sprintf( "parentObject->enumerator(\"%s\", TRUE )", ctype.data() ); } typeExtra = - "\n#ifndef QT_NO_PROPERTIES\n\t " + typeExtra + + "\n#ifndef TQT_NO_PROPERTIES\n\t " + typeExtra + "\n#else" "\n\t 0" - "\n#endif // QT_NO_PROPERTIES\n\t "; + "\n#endif // TQT_NO_PROPERTIES\n\t "; } return typeExtra; } @@ -2462,7 +2462,7 @@ int generateEnums() if ( g->enums.count() == 0 ) return 0; - fprintf( out, "#ifndef QT_NO_PROPERTIES\n" ); + fprintf( out, "#ifndef TQT_NO_PROPERTIES\n" ); int i = 0; for ( TQPtrListIterator it( g->enums ); it.current(); ++it, ++i ) { fprintf( out, " static const TQMetaEnum::Item enum_%i[] = {\n", i ); @@ -2486,7 +2486,7 @@ int generateEnums() it2.current()->set ? "TRUE" : "FALSE" ); } fprintf( out, "\n };\n" ); - fprintf( out, "#endif // QT_NO_PROPERTIES\n" ); + fprintf( out, "#endif // TQT_NO_PROPERTIES\n" ); return g->enums.count(); } @@ -2735,7 +2735,7 @@ int generateProps() moc_err("The declaration of the class \"%s\" contains properties" " but no TQ_OBJECT macro.", g->className.data()); - fprintf( out, "#ifndef QT_NO_PROPERTIES\n" ); + fprintf( out, "#ifndef TQT_NO_PROPERTIES\n" ); fprintf( out, " static const TQMetaProperty props_tbl[%d] = {\n ", g->props.count() ); for( TQPtrListIterator it( g->props ); it.current(); ++it ) { @@ -2800,7 +2800,7 @@ int generateProps() fprintf( out, "\n" ); } fprintf( out, " };\n" ); - fprintf( out, "#endif // QT_NO_PROPERTIES\n" ); + fprintf( out, "#endif // TQT_NO_PROPERTIES\n" ); } return g->props.count(); @@ -3037,7 +3037,7 @@ void generateClass() // generate C++ source code for a class else fprintf( out, "\t0, 0,\n" ); - fprintf( out, "#ifndef QT_NO_PROPERTIES\n" ); + fprintf( out, "#ifndef TQT_NO_PROPERTIES\n" ); if ( n_props ) fprintf( out, "\tprops_tbl, %d,\n", n_props ); else @@ -3046,7 +3046,7 @@ void generateClass() // generate C++ source code for a class fprintf( out, "\tenum_tbl, %d,\n", n_enums ); else fprintf( out, "\t0, 0,\n" ); - fprintf( out, "#endif // QT_NO_PROPERTIES\n" ); + fprintf( out, "#endif // TQT_NO_PROPERTIES\n" ); if ( n_infos ) fprintf( out, "\tclassinfo_tbl, %d );\n", n_infos ); @@ -3388,7 +3388,7 @@ void generateClass() // generate C++ source code for a class } - fprintf( out, "#ifndef QT_NO_PROPERTIES\n" ); + fprintf( out, "#ifndef TQT_NO_PROPERTIES\n" ); // // Generate internal tqt_property() functions // @@ -3526,7 +3526,7 @@ void generateClass() // generate C++ source code for a class } fprintf( out, "\nbool %s::tqt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; }\n", qualifiedClassName().data() ); - fprintf( out, "#endif // QT_NO_PROPERTIES\n" ); + fprintf( out, "#endif // TQT_NO_PROPERTIES\n" ); } diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp index d384e0baa..f2a5c53b1 100644 --- a/src/moc/moc_yacc.cpp +++ b/src/moc/moc_yacc.cpp @@ -252,10 +252,10 @@ TQCString uTypeExtra( TQCString ctype ) typeExtra.sprintf( "parentObject->enumerator(\"%s\", TRUE )", ctype.data() ); } typeExtra = - "\n#ifndef QT_NO_PROPERTIES\n\t " + typeExtra + + "\n#ifndef TQT_NO_PROPERTIES\n\t " + typeExtra + "\n#else" "\n\t 0" - "\n#endif // QT_NO_PROPERTIES\n\t "; + "\n#endif // TQT_NO_PROPERTIES\n\t "; } return typeExtra; } @@ -5337,7 +5337,7 @@ int generateEnums() if ( g->enums.count() == 0 ) return 0; - fprintf( out, "#ifndef QT_NO_PROPERTIES\n" ); + fprintf( out, "#ifndef TQT_NO_PROPERTIES\n" ); int i = 0; for ( TQPtrListIterator it( g->enums ); it.current(); ++it, ++i ) { fprintf( out, " static const TQMetaEnum::Item enum_%i[] = {\n", i ); @@ -5361,7 +5361,7 @@ int generateEnums() it2.current()->set ? "TRUE" : "FALSE" ); } fprintf( out, "\n };\n" ); - fprintf( out, "#endif // QT_NO_PROPERTIES\n" ); + fprintf( out, "#endif // TQT_NO_PROPERTIES\n" ); return g->enums.count(); } @@ -5610,7 +5610,7 @@ int generateProps() moc_err("The declaration of the class \"%s\" contains properties" " but no TQ_OBJECT macro.", g->className.data()); - fprintf( out, "#ifndef QT_NO_PROPERTIES\n" ); + fprintf( out, "#ifndef TQT_NO_PROPERTIES\n" ); fprintf( out, " static const TQMetaProperty props_tbl[%d] = {\n ", g->props.count() ); for( TQPtrListIterator it( g->props ); it.current(); ++it ) { @@ -5675,7 +5675,7 @@ int generateProps() fprintf( out, "\n" ); } fprintf( out, " };\n" ); - fprintf( out, "#endif // QT_NO_PROPERTIES\n" ); + fprintf( out, "#endif // TQT_NO_PROPERTIES\n" ); } return g->props.count(); @@ -5912,7 +5912,7 @@ void generateClass() // generate C++ source code for a class else fprintf( out, "\t0, 0,\n" ); - fprintf( out, "#ifndef QT_NO_PROPERTIES\n" ); + fprintf( out, "#ifndef TQT_NO_PROPERTIES\n" ); if ( n_props ) fprintf( out, "\tprops_tbl, %d,\n", n_props ); else @@ -5921,7 +5921,7 @@ void generateClass() // generate C++ source code for a class fprintf( out, "\tenum_tbl, %d,\n", n_enums ); else fprintf( out, "\t0, 0,\n" ); - fprintf( out, "#endif // QT_NO_PROPERTIES\n" ); + fprintf( out, "#endif // TQT_NO_PROPERTIES\n" ); if ( n_infos ) fprintf( out, "\tclassinfo_tbl, %d );\n", n_infos ); @@ -6263,7 +6263,7 @@ void generateClass() // generate C++ source code for a class } - fprintf( out, "#ifndef QT_NO_PROPERTIES\n" ); + fprintf( out, "#ifndef TQT_NO_PROPERTIES\n" ); // // Generate internal tqt_property() functions // @@ -6401,7 +6401,7 @@ void generateClass() // generate C++ source code for a class } fprintf( out, "\nbool %s::tqt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; }\n", qualifiedClassName().data() ); - fprintf( out, "#endif // QT_NO_PROPERTIES\n" ); + fprintf( out, "#endif // TQT_NO_PROPERTIES\n" ); } -- cgit v1.2.1