diff options
Diffstat (limited to 'src/moc/moc.y')
| -rw-r--r-- | src/moc/moc.y | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/moc/moc.y b/src/moc/moc.y index 5744269a7..ce1867373 100644 --- a/src/moc/moc.y +++ b/src/moc/moc.y @@ -59,14 +59,14 @@ void yyerror( const char *msg ); #include "qplatformdefs.h" -#include "qasciidict.h" -#include "qdatetime.h" -#include "qdict.h" -#include "qfile.h" -#include "qdir.h" -#include "qptrlist.h" -#include "qregexp.h" -#include "qstrlist.h" +#include "ntqasciidict.h" +#include "ntqdatetime.h" +#include "ntqdict.h" +#include "ntqfile.h" +#include "ntqdir.h" +#include "ntqptrlist.h" +#include "ntqregexp.h" +#include "ntqstrlist.h" #ifdef MOC_MWERKS_PLUGIN # ifdef Q_OS_MACX # undef OLD_DEBUG @@ -569,7 +569,7 @@ class parser_reg { bool noInclude; // no #include <filename> bool generatedCode; // no code generated bool mocError; // moc parsing error occurred - bool hasVariantIncluded; //whether or not qvariant.h was included yet + bool hasVariantIncluded; //whether or not ntqvariant.h was included yet TQCString className; // name of parsed class TQCString superClassName; // name of first super class TQStrList multipleSuperClasses; // other superclasses @@ -646,10 +646,10 @@ int tmpYYStart; // Used to store the lexers current mode int tmpYYStart2; // Used to store the lexers current mode // (if tmpYYStart is already used) -// if the format revision changes, you MUST change it in qmetaobject.h too +// if the format revision changes, you MUST change it in ntqmetaobject.h too const int formatRevision = 26; // moc output format revision -// if the flags change, you HAVE to change it in qmetaobject.h too +// if the flags change, you HAVE to change it in ntqmetaobject.h too enum Flags { Invalid = 0x00000000, Readable = 0x00000001, @@ -2906,8 +2906,8 @@ void generateClass() // generate C++ source code for a class g->includeFiles.next(); } } - fprintf( out, "#include <%sqmetaobject.h>\n", (const char*)g->qtPath ); - fprintf( out, "#include <%sqapplication.h>\n\n", (const char*)g->qtPath ); + fprintf( out, "#include <%sntqmetaobject.h>\n", (const char*)g->qtPath ); + fprintf( out, "#include <%sntqapplication.h>\n\n", (const char*)g->qtPath ); fprintf( out, "#include <%sprivate/qucomextra_p.h>\n", (const char*)g->qtPath ); fprintf( out, "#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != %d)\n", formatRevision ); fprintf( out, "#error \"This file was generated using the moc from %s." @@ -2925,7 +2925,7 @@ void generateClass() // generate C++ source code for a class needToIncludeVariant = ( f->type != "void" && !validUType( f->type ) && isVariantType( f->type) ); if ( needToIncludeVariant ) { - fprintf( out, "#include <%sqvariant.h>\n", (const char*)g->qtPath ); + fprintf( out, "#include <%sntqvariant.h>\n", (const char*)g->qtPath ); g->hasVariantIncluded = TRUE; } } @@ -3115,8 +3115,8 @@ void generateClass() // generate C++ source code for a class if ( !predef_call_func && !included_list_headers ) { // yes we need it, because otherwise QT_VERSION may not be defined - fprintf( out, "\n#include <%sqobjectdefs.h>\n", (const char*)g->qtPath ); - fprintf( out, "#include <%sqsignalslotimp.h>\n", (const char*)g->qtPath ); + fprintf( out, "\n#include <%sntqobjectdefs.h>\n", (const char*)g->qtPath ); + fprintf( out, "#include <%sntqsignalslotimp.h>\n", (const char*)g->qtPath ); included_list_headers = TRUE; } |