diff options
Diffstat (limited to 'src/moc')
| -rw-r--r-- | src/moc/moc.pro | 16 | ||||
| -rw-r--r-- | src/moc/moc.y | 6 | ||||
| -rw-r--r-- | src/moc/moc_yacc.cpp | 6 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/moc/moc.pro b/src/moc/moc.pro index 95b2c796b..dabdef560 100644 --- a/src/moc/moc.pro +++ b/src/moc/moc.pro @@ -12,20 +12,20 @@ INCLUDEPATH += $$QT_SOURCE_TREE/include ../tools . DEPENDPATH += $$QT_SOURCE_TREE/include ../tools . LIBS = OBJECTS_DIR = . -SOURCES = ../tools/qbuffer.cpp \ +SOURCES = ../tools/tqbuffer.cpp \ ../tools/tqptrcollection.cpp \ ../tools/tqcstring.cpp \ - ../tools/qdatastream.cpp \ + ../tools/tqdatastream.cpp \ ../tools/tqdatetime.cpp \ - ../tools/qfile.cpp \ - ../tools/qdir.cpp \ - ../tools/qfileinfo.cpp \ + ../tools/tqfile.cpp \ + ../tools/tqdir.cpp \ + ../tools/tqfileinfo.cpp \ ../tools/qgarray.cpp \ ../tools/qgdict.cpp \ ../tools/qglist.cpp \ ../tools/qglobal.cpp \ ../tools/qgvector.cpp \ - ../tools/qiodevice.cpp \ + ../tools/tqiodevice.cpp \ ../tools/tqregexp.cpp \ ../tools/tqstring.cpp \ ../tools/qlocale.cpp \ @@ -45,8 +45,8 @@ isEmpty(QT_PRODUCT)|contains(QT_PRODUCT, qt-internal) { SOURCES += moc_yacc.cpp } -unix:SOURCES += ../tools/qfile_unix.cpp ../tools/qdir_unix.cpp ../tools/qfileinfo_unix.cpp -win32:SOURCES += ../tools/qfile_win.cpp ../tools/qdir_win.cpp ../tools/qfileinfo_win.cpp +unix:SOURCES += ../tools/tqfile_unix.cpp ../tools/tqdir_unix.cpp ../tools/tqfileinfo_unix.cpp +win32:SOURCES += ../tools/tqfile_win.cpp ../tools/tqdir_win.cpp ../tools/tqfileinfo_win.cpp macx:LIBS += -framework Carbon target.path=$$bins.path diff --git a/src/moc/moc.y b/src/moc/moc.y index e41c644f2..1691c5805 100644 --- a/src/moc/moc.y +++ b/src/moc/moc.y @@ -62,8 +62,8 @@ void yyerror( const char *msg ); #include "tqasciidict.h" #include "tqdatetime.h" #include "tqdict.h" -#include "ntqfile.h" -#include "ntqdir.h" +#include "tqfile.h" +#include "tqdir.h" #include "tqptrlist.h" #include "tqregexp.h" #include "tqstrlist.h" @@ -3117,7 +3117,7 @@ void generateClass() // generate C++ source code for a class if ( !predef_call_func && !included_list_headers ) { // yes we need it, because otherwise TQT_VERSION may not be defined fprintf( out, "\n#include <%stqobjectdefs.h>\n", (const char*)g->qtPath ); - fprintf( out, "#include <%sntqsignalslotimp.h>\n", (const char*)g->qtPath ); + fprintf( out, "#include <%stqsignalslotimp.h>\n", (const char*)g->qtPath ); included_list_headers = TRUE; } diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp index 9135ff29b..dcf19ab2a 100644 --- a/src/moc/moc_yacc.cpp +++ b/src/moc/moc_yacc.cpp @@ -75,8 +75,8 @@ void yyerror( const char *msg ); #include "tqasciidict.h" #include "tqdatetime.h" #include "tqdict.h" -#include "ntqfile.h" -#include "ntqdir.h" +#include "tqfile.h" +#include "tqdir.h" #include "tqptrlist.h" #include "tqregexp.h" #include "tqstrlist.h" @@ -5992,7 +5992,7 @@ void generateClass() // generate C++ source code for a class if ( !predef_call_func && !included_list_headers ) { // yes we need it, because otherwise TQT_VERSION may not be defined fprintf( out, "\n#include <%stqobjectdefs.h>\n", (const char*)g->qtPath ); - fprintf( out, "#include <%sntqsignalslotimp.h>\n", (const char*)g->qtPath ); + fprintf( out, "#include <%stqsignalslotimp.h>\n", (const char*)g->qtPath ); included_list_headers = TRUE; } |