diff options
Diffstat (limited to 'qmake/generators/win32/winmakefile.cpp')
| -rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 7c635d32c..1fffbf44b 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -259,7 +259,7 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t) int Win32MakefileGenerator::findHighestVersion(const TQString &d, const TQString &stem) { - TQString bd = Option::fixPathToLocalOS(d, TRUE); + TQString bd = Option::fixPathToLocalOS(d, true); if(!TQFile::exists(bd)) return -1; if(!project->variables()["QMAKE_" + stem.upper() + "_VERSION_OVERRIDE"].isEmpty()) @@ -269,7 +269,7 @@ Win32MakefileGenerator::findHighestVersion(const TQString &d, const TQString &st int biggest=-1; TQStringList entries = dir.entryList(); TQString dllStem = stem + TQTDLL_POSTFIX; - TQRegExp regx( "(" + dllStem + "([0-9]*)).lib", FALSE ); + TQRegExp regx( "(" + dllStem + "([0-9]*)).lib", false ); for(TQStringList::Iterator it = entries.begin(); it != entries.end(); ++it) { if(regx.exactMatch((*it))) biggest = TQMAX(biggest, (regx.cap(1) == dllStem || @@ -334,10 +334,10 @@ Win32MakefileGenerator::findLibraries(const TQString &where) dirs.append(new MakefileDependDir(r.replace("\"",""), l.replace("\"",""))); } } - dirs.setAutoDelete(TRUE); + dirs.setAutoDelete(true); for(TQStringList::Iterator it = l.begin(); it != l.end(); ) { TQChar quote; - bool modified_opt = FALSE, remove = FALSE; + bool modified_opt = false, remove = false; TQString opt = (*it).stripWhiteSpace(); if((opt[0] == '\'' || opt[0] == '"') && opt[(int)opt.length()-1] == opt[0]) { quote = opt[0]; @@ -351,7 +351,7 @@ Win32MakefileGenerator::findLibraries(const TQString &where) TQString r = opt.mid(2), l = Option::fixPathToLocalOS(r); dirs.append(new MakefileDependDir(r.replace("\"",""), l.replace("\"",""))); - remove = TRUE; //we eat this switch + remove = true; //we eat this switch } else if(opt.startsWith("-l") || opt.startsWith("/l")) { TQString lib = opt.right(opt.length() - 2), out; if(!lib.isEmpty()) { @@ -369,9 +369,9 @@ Win32MakefileGenerator::findLibraries(const TQString &where) } } if(out.isEmpty()) { - remove = TRUE; //just eat it since we cannot find one.. + remove = true; //just eat it since we cannot find one.. } else { - modified_opt = TRUE; + modified_opt = true; (*it) = out; } } else if(!TQFile::exists(Option::fixPathToLocalOS(opt))) { @@ -405,7 +405,7 @@ Win32MakefileGenerator::findLibraries(const TQString &where) dir += Option::dir_sep; lib_tmpl.prepend(dir); } - modified_opt = TRUE; + modified_opt = true; (*it) = lib_tmpl; break; } @@ -423,7 +423,7 @@ Win32MakefileGenerator::findLibraries(const TQString &where) ++it; } } - return TRUE; + return true; } void @@ -431,7 +431,7 @@ Win32MakefileGenerator::processPrlFiles() { TQDict<void> processed; TQPtrList<MakefileDependDir> libdirs; - libdirs.setAutoDelete(TRUE); + libdirs.setAutoDelete(true); { TQStringList &libpaths = project->variables()["QMAKE_LIBDIR"]; for(TQStringList::Iterator libpathit = libpaths.begin(); libpathit != libpaths.end(); ++libpathit) { @@ -441,7 +441,7 @@ Win32MakefileGenerator::processPrlFiles() l.replace("\"",""))); } } - for(bool ret = FALSE; TRUE; ret = FALSE) { + for(bool ret = false; true; ret = false) { //read in any prl files included.. TQStringList l_out; TQString where = "QMAKE_LIBS"; @@ -461,7 +461,7 @@ Win32MakefileGenerator::processPrlFiles() if(!processed[opt]) { if(processPrlFile(opt)) { processed.insert(opt, (void*)1); - ret = TRUE; + ret = true; } else { for(MakefileDependDir *mdd = libdirs.first(); mdd; mdd = libdirs.next() ) { TQString prl = mdd->local_dir + Option::dir_sep + opt; @@ -469,7 +469,7 @@ Win32MakefileGenerator::processPrlFiles() break; } else if(processPrlFile(prl)) { processed.insert(prl, (void*)1); - ret = TRUE; + ret = true; break; } } |