diff options
Diffstat (limited to 'qmake/generators/win32/mingw_make.cpp')
| -rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index a63d6454d..c72203e07 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -44,7 +44,7 @@ #include <time.h> -MingwMakefileGenerator::MingwMakefileGenerator(TQMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE) +MingwMakefileGenerator::MingwMakefileGenerator(TQMakeProject *p) : Win32MakefileGenerator(p), init_flag(false) { Option::obj_ext = ".o"; } @@ -52,7 +52,7 @@ MingwMakefileGenerator::MingwMakefileGenerator(TQMakeProject *p) : Win32Makefile bool MingwMakefileGenerator::findLibraries() // todo - pascal { - return TRUE; + return true; } bool @@ -65,7 +65,7 @@ MingwMakefileGenerator::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" || @@ -75,9 +75,9 @@ MingwMakefileGenerator::writeMakefile(TQTextStream &t) } else if(project->first("TEMPLATE") == "subdirs") { writeSubDirs(t); - return TRUE; + return true; } - return FALSE; + return false; } void createLdObjectScriptFile(const TQString & fileName, TQStringList & objList) @@ -136,15 +136,15 @@ MingwMakefileGenerator::writeMingwParts(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 << "TQUIC = " << (project->isEmpty("QMAKE_UIC") ? TQString("tquic") : - 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 << "DEF_FILE = " << varList("DEF_FILE") << endl; t << "COPY_FILE = " << var("QMAKE_COPY") << endl; @@ -312,7 +312,7 @@ MingwMakefileGenerator::writeMingwParts(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()); @@ -355,7 +355,7 @@ MingwMakefileGenerator::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") @@ -574,7 +574,7 @@ MingwMakefileGenerator::init() } if ( project->isActiveConfig("moc") ) - setTQMocAware(TRUE); + setTQMocAware(true); // add -L libs to libdir TQStringList &libs = project->variables()["QMAKE_LIBS"]; @@ -594,7 +594,7 @@ MingwMakefileGenerator::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->isActiveConfig("dll") ) { @@ -658,7 +658,7 @@ MingwMakefileGenerator::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()); @@ -676,7 +676,7 @@ MingwMakefileGenerator::writeSubDirs(TQTextStream &t) TQTextStream ts (&qs, IO_WriteOnly) ; Win32MakefileGenerator::writeSubDirs( ts ) ; TQRegExp rx("(\\n\\tcd [^\\n\\t]+)(\\n\\t.+)\\n\\t@cd ..") ; - rx.setMinimal(TRUE); + rx.setMinimal(true); int pos = 0 ; while ( -1 != (pos = rx.search( qs, pos))) { |
