diff options
Diffstat (limited to 'qmake/generators/win32/msvc_nmake.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index a1ada25f5..145ee41e0 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -44,7 +44,7 @@ #include <stdlib.h> #include <time.h> -NmakeMakefileGenerator::NmakeMakefileGenerator(TQMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE) +NmakeMakefileGenerator::NmakeMakefileGenerator(TQMakeProject *p) : Win32MakefileGenerator(p), init_flag(false) { } @@ -64,7 +64,7 @@ NmakeMakefileGenerator::writeMakefile(TQTextStream &t) << var("QMAKE_FAILED_REQUIREMENTS") << ") are not available.\"" << "\n\t" << "@echo \"Skipped.\"" << endl << endl; writeMakeQmake(t); - return TRUE; + return true; } if(project->first("TEMPLATE") == "app" || @@ -74,9 +74,9 @@ NmakeMakefileGenerator::writeMakefile(TQTextStream &t) } else if(project->first("TEMPLATE") == "subdirs") { writeSubDirs(t); - return TRUE; + return true; } - return FALSE; + return false; } TQStringList @@ -146,15 +146,15 @@ NmakeMakefileGenerator::writeNmakeParts(TQTextStream &t) t << "LIB = " << var("QMAKE_LIB") << endl; } t << "MOC = " << (project->isEmpty("QMAKE_MOC") ? TQString("moc") : - Option::fixPathToTargetOS(var("QMAKE_MOC"), FALSE)) << endl; + Option::fixPathToTargetOS(var("QMAKE_MOC"), false)) << endl; t << "UIC = " << (project->isEmpty("QMAKE_UIC") ? TQString("uic") : - Option::fixPathToTargetOS(var("QMAKE_UIC"), FALSE)) << endl; + Option::fixPathToTargetOS(var("QMAKE_UIC"), false)) << endl; t << "QMAKE = " << (project->isEmpty("QMAKE_QMAKE") ? TQString("qmake") : - Option::fixPathToTargetOS(var("QMAKE_QMAKE"), FALSE)) << endl; + Option::fixPathToTargetOS(var("QMAKE_QMAKE"), false)) << endl; t << "IDC = " << (project->isEmpty("QMAKE_IDC") ? TQString("idc") : - Option::fixPathToTargetOS(var("QMAKE_IDC"), FALSE)) << endl; + Option::fixPathToTargetOS(var("QMAKE_IDC"), false)) << endl; t << "IDL = " << (project->isEmpty("QMAKE_IDL") ? TQString("midl") : - Option::fixPathToTargetOS(var("QMAKE_IDL"), FALSE)) << endl; + Option::fixPathToTargetOS(var("QMAKE_IDL"), false)) << endl; t << "ZIP = " << var("QMAKE_ZIP") << endl; t << "COPY_FILE = " << var("QMAKE_COPY") << endl; t << "COPY_DIR = " << var("QMAKE_COPY") << endl; @@ -377,7 +377,7 @@ NmakeMakefileGenerator::writeNmakeParts(TQTextStream &t) TQStringList &inputs = project->variables()[(*it2)]; for(TQStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) { TQFileInfo fi(Option::fixPathToLocalOS((*input))); - TQString in = Option::fixPathToTargetOS((*input), FALSE), + TQString in = Option::fixPathToTargetOS((*input), false), out = tmp_out, cmd = tmp_cmd, deps; out.replace("${QMAKE_FILE_BASE}", fi.baseName()); out.replace("${QMAKE_FILE_NAME}", fi.filePath()); @@ -461,7 +461,7 @@ NmakeMakefileGenerator::init() { if(init_flag) return; - init_flag = TRUE; + init_flag = true; /* this should probably not be here, but I'm using it to wrap the .t files */ if(project->first("TEMPLATE") == "app") @@ -680,7 +680,7 @@ NmakeMakefileGenerator::init() if ( project->isActiveConfig("moc") ) - setMocAware(TRUE); + setMocAware(true); project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"]; TQStringList &libList = project->variables()["QMAKE_LIBS"]; @@ -704,7 +704,7 @@ NmakeMakefileGenerator::init() for(it = l.begin(); it != l.end(); ++it) { TQStringList &gdmf = project->variables()[(*it)]; for(TQStringList::Iterator inner = gdmf.begin(); inner != gdmf.end(); ++inner) - (*inner) = Option::fixPathToTargetOS((*inner), FALSE); + (*inner) = Option::fixPathToTargetOS((*inner), false); } if ( !project->variables()["DEF_FILE"].isEmpty() ) @@ -780,7 +780,7 @@ NmakeMakefileGenerator::init() TQStringList &inputs = project->variables()[(*it2)]; for(TQStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) { TQFileInfo fi(Option::fixPathToLocalOS((*input))); - TQString in = Option::fixPathToTargetOS((*input), FALSE), + TQString in = Option::fixPathToTargetOS((*input), false), out = tmp_out; out.replace("${QMAKE_FILE_BASE}", fi.baseName()); out.replace("${QMAKE_FILE_NAME}", fi.filePath()); |