diff options
Diffstat (limited to 'qmake/generators/makefile.cpp')
-rw-r--r-- | qmake/generators/makefile.cpp | 206 |
1 files changed, 103 insertions, 103 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index cf76fef63..8a68d7dee 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -76,16 +76,16 @@ TQString mkdir_p_asstring(const TQString &dir) static bool createDir(const TQString& fullPath) { if(TQFile::exists(fullPath)) - return FALSE; + return false; TQDir dirTmp; - bool ret = TRUE; + bool ret = true; TQString pathComponent, tmpPath; - TQStringList hierarchy = TQStringList::split(TQString(Option::dir_sep), fullPath, TRUE); + TQStringList hierarchy = TQStringList::split(TQString(Option::dir_sep), fullPath, true); for(TQStringList::Iterator it = hierarchy.begin(); it != hierarchy.end(); ++it) { pathComponent = *it + TQDir::separator(); tmpPath += pathComponent; if(!dirTmp.mkdir(tmpPath)) { - ret = FALSE; + ret = false; // break; } } @@ -93,9 +93,9 @@ static bool createDir(const TQString& fullPath) } -MakefileGenerator::MakefileGenerator(TQMakeProject *p) : init_opath_already(FALSE), - init_already(FALSE), tqmoc_aware(FALSE), - no_io(FALSE), project(p) +MakefileGenerator::MakefileGenerator(TQMakeProject *p) : init_opath_already(false), + init_already(false), tqmoc_aware(false), + no_io(false), project(p) { } @@ -112,17 +112,17 @@ bool MakefileGenerator::generateMocList(const TQString &fn_target) { if(!findMocDestination(fn_target).isEmpty()) - return TRUE; + return true; TQString fn_local = Option::fixPathToLocalOS(fileFixify(fn_target, TQDir::currentDirPath(), Option::output_dir)); int file = open(fn_local.latin1(), O_RDONLY); if(file == -1) - return FALSE; + return false; struct stat fst; if(fstat(file, &fst) || S_ISDIR(fst.st_mode)) - return FALSE; //shouldn't happen + return false; //shouldn't happen char *big_buffer = gimme_buffer(fst.st_size); int total_size_read; @@ -132,7 +132,7 @@ MakefileGenerator::generateMocList(const TQString &fn_target) total_size_read += have_read); close(file); - bool ignore_tqobject = FALSE; + bool ignore_tqobject = false; int line_count = 1; /* qmake ignore TQ_OBJECT */ #define COMP_LEN 9 //strlen("TQ_OBJECT") @@ -154,7 +154,7 @@ MakefileGenerator::generateMocList(const TQString &fn_target) debug_msg(2, "Mocgen: %s:%d Found \"qmake ignore TQ_OBJECT\"", fn_target.latin1(), line_count); x += 20; - ignore_tqobject = TRUE; + ignore_tqobject = true; } } } else if(*(big_buffer + x) == '*') { @@ -179,14 +179,14 @@ MakefileGenerator::generateMocList(const TQString &fn_target) if(!strncmp(big_buffer+x, "TQ_OBJECT", OBJ_LEN)) { if(ignore_tqobject) { debug_msg(2, "Mocgen: %s:%d Ignoring TQ_OBJECT", fn_target.latin1(), line_count); - interesting = FALSE; + interesting = false; } len=OBJ_LEN; } else if(!strncmp(big_buffer+x, "Q_DISPATCH", DIS_LEN)) { len=DIS_LEN; } if(SYMBOL_CHAR(*(big_buffer+x+len))) - interesting = FALSE; + interesting = false; if(interesting) { *(big_buffer+x+len) = '\0'; debug_msg(2, "Mocgen: %s:%d Found MOC symbol %s", fn_target.latin1(), @@ -201,7 +201,7 @@ MakefileGenerator::generateMocList(const TQString &fn_target) else if(dir_pos != -1) mocFile = fn_target.left(dir_pos+1); - bool cpp_ext = FALSE; + bool cpp_ext = false; for(TQStringList::Iterator cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit) { if((cpp_ext = (fn_target.right(ext_len) == (*cppit)))) @@ -239,26 +239,26 @@ MakefileGenerator::generateMocList(const TQString &fn_target) } #undef OBJ_LEN #undef DIS_LEN - return TRUE; + return true; } bool MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, const TQString &f, bool recurse) { if(processedDependencies(f)) - return TRUE; - setProcessedDependencies(f, TRUE); + return true; + setProcessedDependencies(f, true); TQStringList &fndeps = findDependencies(f); TQString fn = fileFixify(f, TQDir::currentDirPath(), Option::output_dir); - fn = Option::fixPathToLocalOS(fn, FALSE); + fn = Option::fixPathToLocalOS(fn, false); TQString fix_env_fn = Option::fixPathToLocalOS(fn); int file = open(fix_env_fn.latin1(), O_RDONLY); if(file == -1) - return FALSE; + return false; struct stat fst; if(fstat(file, &fst) || S_ISDIR(fst.st_mode)) - return FALSE; //shouldn't happen + return false; //shouldn't happen TQString fndir, fix_env_fndir; int dl = fn.findRev(Option::dir_sep); @@ -394,7 +394,7 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons x++; } int val_len; - for(val_len = 0; TRUE; val_len++) { + for(val_len = 0; true; val_len++) { if(quote) { if(*(big_buffer+x+val_len) == quote) break; @@ -423,17 +423,17 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons } if(!inc.isEmpty()) { - bool from_source_dir = TRUE; + bool from_source_dir = true; debug_msg(5, "%s:%d Found dependency to %s", fix_env_fn.latin1(), line_count, inc.latin1()); if(!project->isEmpty("SKIP_DEPENDS")) { - bool found = FALSE; + bool found = false; TQStringList &nodeplist = project->values("SKIP_DEPENDS"); for(TQStringList::Iterator it = nodeplist.begin(); it != nodeplist.end(); ++it) { TQRegExp regx((*it)); if(regx.search(inc) != -1) { - found = TRUE; + found = true; break; } } @@ -472,7 +472,7 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons //and see if they go away.. if(depHeuristics.contains(inc)) { fqn = depHeuristics[inc]; - from_source_dir = FALSE; + from_source_dir = false; } else if(Option::mkfile::do_dep_heuristics) { //some heuristics.. //is it a file from a .ui? TQString inc_file = inc.section(Option::dir_sep, -1); @@ -493,7 +493,7 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons if(!fqn.isEmpty() && !fqn.endsWith(Option::dir_sep)) fqn += Option::dir_sep; fqn += inc_file; - from_source_dir = FALSE; //uics go in the output_dir (so don't fix them) + from_source_dir = false; //uics go in the output_dir (so don't fix them) fqn = fileFixify(fqn, TQDir::currentDirPath(), Option::output_dir); goto cache_fqn; } @@ -515,7 +515,7 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons d = project->first("QMAKE_ABSOLUTE_SOURCE_PATH"); if(s == lhs) { fqn = d + inc; - from_source_dir = FALSE; //uics go in the output_dir (so don't fix them) + from_source_dir = false; //uics go in the output_dir (so don't fix them) fqn = fileFixify(fqn, TQDir::currentDirPath(), Option::output_dir); goto cache_fqn; } @@ -538,7 +538,7 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons d = project->first("QMAKE_ABSOLUTE_SOURCE_PATH"); if(s == lhs) { fqn = d + inc; - from_source_dir = FALSE; //uics go in the output_dir (so don't fix them) + from_source_dir = false; //uics go in the output_dir (so don't fix them) fqn = fileFixify(fqn, TQDir::currentDirPath(), Option::output_dir); goto cache_fqn; } @@ -567,7 +567,7 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons "Found potential multiple MOC include %s (%s) in '%s'", inc.latin1(), fqn.latin1(), fix_env_fn.latin1()); } - from_source_dir = FALSE; //mocs go in the output_dir (so don't fix them) + from_source_dir = false; //mocs go in the output_dir (so don't fix them) goto cache_fqn; } } @@ -577,7 +577,7 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons cache_fqn: if(from_source_dir) { fqn = fileFixify(fqn); - from_source_dir = FALSE; + from_source_dir = false; } depHeuristics.insert(inc, fqn); } @@ -585,7 +585,7 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons handle_fqn: if(fqn.isEmpty()) //I give up continue; - fqn = Option::fixPathToTargetOS(fqn, FALSE); + fqn = Option::fixPathToTargetOS(fqn, false); if(from_source_dir) fqn = fileFixify(fqn); debug_msg(4, "Resolved dependency of %s to %s", inc.latin1(), fqn.latin1()); @@ -607,7 +607,7 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons } } debug_msg(2, "Dependencies: %s -> %s", fn.latin1(), fndeps.join(" :: ").latin1()); - return TRUE; + return true; } void @@ -615,7 +615,7 @@ MakefileGenerator::initOutPaths() { if(init_opath_already) return; - init_opath_already = TRUE; + init_opath_already = true; TQMap<TQString, TQStringList> &v = project->variables(); if(!v.contains("QMAKE_ABSOLUTE_SOURCE_PATH")) { if(Option::mkfile::do_cache && !Option::mkfile::cachefile.isEmpty() && @@ -672,7 +672,7 @@ MakefileGenerator::initOutPaths() path = path.right(path.length() - 1); } #ifdef TQ_WS_WIN - bool driveExists = TRUE; + bool driveExists = true; if ( !TQDir::isRelativePath( path ) ) { if ( TQFile::exists( path.left( 3 ) ) ) { d.cd( path.left( 3 ) ); @@ -680,7 +680,7 @@ MakefileGenerator::initOutPaths() } else { warn_msg(WarnLogic, "%s: Cannot access drive '%s' (%s)", dirs[x].latin1(), path.left( 3 ).latin1(), path.latin1() ); - driveExists = FALSE; + driveExists = false; } } if ( driveExists ) { @@ -717,7 +717,7 @@ MakefileGenerator::init() initOutPaths(); if(init_already) return; - init_already = TRUE; + init_already = true; TQMap<TQString, TQStringList> &v = project->variables(); TQString paths[] = { TQString("SOURCES"), TQString("FORMS"), TQString("YACCSOURCES"), TQString("INCLUDEPATH"), @@ -744,7 +744,7 @@ MakefileGenerator::init() if((Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT || Option::mkfile::do_deps || Option::mkfile::do_mocs) && !noIO()) { TQPtrList<MakefileDependDir> deplist; - deplist.setAutoDelete(TRUE); + deplist.setAutoDelete(true); if((Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT || Option::mkfile::do_deps) && doDepends()) { TQStringList incDirs = v["DEPENDPATH"] + v["QMAKE_ABSOLUTE_SOURCE_PATH"]; @@ -792,7 +792,7 @@ MakefileGenerator::init() TQFileInfo fi(fileFixify(file, TQDir::currentDirPath(), Option::output_dir)); if(fi.exists() && fi.lastModified() < cachefi.lastModified()) { cache_found_files.insert(file, (void *)1); - found = TRUE; + found = true; } } if(found) { @@ -804,7 +804,7 @@ MakefileGenerator::init() fi.lastModified() < cachefi.lastModified()) { cache_found_files.insert((*dep_it), (void *)1); } else { - found = FALSE; + found = false; break; } } @@ -813,7 +813,7 @@ MakefileGenerator::init() debug_msg(2, "Dependencies (cached): %s -> %s", file.latin1(), files.join(" :: ").latin1()); findDependencies(file) = files; - setProcessedDependencies(file, TRUE); + setProcessedDependencies(file, true); } } } else { @@ -831,7 +831,7 @@ MakefileGenerator::init() } if(found && line != "*qmake_ignore*") { int ext_len = file.length() - file.findRev('.'); - bool cpp_ext = FALSE; + bool cpp_ext = false; for(TQStringList::Iterator cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit) { if((cpp_ext = (file.right(ext_len) == (*cppit)))) @@ -865,7 +865,7 @@ MakefileGenerator::init() TQString("HEADERS"), TQString("SOURCES"), TQString("FORMS"), TQString("PRECOMPILED_HEADER"), TQString::null }; depHeuristics.clear(); - bool write_cache = FALSE, read_cache = TQFile::exists(cache_file); + bool write_cache = false, read_cache = TQFile::exists(cache_file); int x; for(x = 0; sources[x] != TQString::null; x++) { TQStringList vpath, &l = v[sources[x]]; @@ -873,7 +873,7 @@ MakefileGenerator::init() if(!(*val_it).isEmpty()) { TQString file = fileFixify((*val_it), TQDir::currentDirPath(), Option::output_dir); if(!TQFile::exists(file)) { - bool found = FALSE; + bool found = false; if(TQDir::isRelativePath((*val_it))) { if(vpath.isEmpty()) vpath = v["VPATH_" + sources[x]] + v["VPATH"] + @@ -887,7 +887,7 @@ MakefileGenerator::init() if(dir.right(Option::dir_sep.length()) != Option::dir_sep) dir += Option::dir_sep; (*val_it) = fileFixify(dir + (*val_it)); - found = TRUE; + found = true; debug_msg(1, "Found file through vpath %s -> %s", file.latin1(), (*val_it).latin1()); break; @@ -934,15 +934,15 @@ MakefileGenerator::init() for(x = 0; sources[x] != TQString::null; x++) { TQStringList &l = v[sources[x]]; for(TQStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) { - bool found_cache_moc = FALSE, found_cache_dep = FALSE; + bool found_cache_moc = false, found_cache_dep = false; if(read_cache && Option::output.name() != "-" && project->isActiveConfig("qmake_cache")) { if(processedDependencies((*val_it))) - found_cache_dep = TRUE; + found_cache_dep = true; if(cache_found_files[(*val_it)] == (void *)2) - found_cache_moc = TRUE; + found_cache_moc = true; if(!found_cache_moc || !found_cache_dep) - write_cache = TRUE; + write_cache = true; } /* Do tqmoc before dependency checking since some includes can come from tqmoc_*.cpp files */ @@ -1020,7 +1020,7 @@ MakefileGenerator::init() dir = fileFixify(dir, TQDir::currentDirPath(), Option::output_dir); if(!dir.isEmpty() && dir.right(Option::dir_sep.length()) != Option::dir_sep) dir += Option::dir_sep; - TQString impl = dir + fi.baseName(TRUE) + Option::lex_mod + Option::cpp_ext.first(); + TQString impl = dir + fi.baseName(true) + Option::lex_mod + Option::cpp_ext.first(); logicWarn(impl, "SOURCES"); logicWarn(impl, "SOURCES"); impls.append(impl); @@ -1051,9 +1051,9 @@ MakefileGenerator::init() dir = fileFixify(dir, TQDir::currentDirPath(), Option::output_dir); if(!dir.isEmpty() && dir.right(Option::dir_sep.length()) != Option::dir_sep) dir += Option::dir_sep; - TQString impl = dir + fi.baseName(TRUE) + Option::yacc_mod + Option::cpp_ext.first(); + TQString impl = dir + fi.baseName(true) + Option::yacc_mod + Option::cpp_ext.first(); logicWarn(impl, "SOURCES"); - TQString decl = dir + fi.baseName(TRUE) + Option::yacc_mod + Option::h_ext.first(); + TQString decl = dir + fi.baseName(true) + Option::yacc_mod + Option::h_ext.first(); logicWarn(decl, "HEADERS"); decls.append(decl); @@ -1069,11 +1069,11 @@ MakefileGenerator::init() } if( project->isActiveConfig("lex_included")) { // is there a matching lex file ? Transfer its dependencies. - TQString lexsrc = fi.baseName(TRUE) + Option::lex_ext; + TQString lexsrc = fi.baseName(true) + Option::lex_ext; if(fi.dirPath() != ".") lexsrc.prepend(fi.dirPath() + Option::dir_sep); if(v["LEXSOURCES"].findIndex(lexsrc) != -1) { - TQString trg = dir + fi.baseName(TRUE) + Option::lex_mod + Option::cpp_ext.first(); + TQString trg = dir + fi.baseName(true) + Option::lex_mod + Option::cpp_ext.first(); impldeps.append(trg); impldeps += findDependencies(lexsrc); depends[lexsrc].clear(); @@ -1128,7 +1128,7 @@ MakefileGenerator::init() impl = fileFixify(impl, TQDir::currentDirPath(), Option::output_dir); if(!impl.isEmpty() && !impl.endsWith(Option::dir_sep)) impl += Option::dir_sep; - impl += fi.baseName(TRUE) + Option::cpp_ext.first(); + impl += fi.baseName(true) + Option::cpp_ext.first(); if(Option::output_dir != TQDir::currentDirPath() && project->isEmpty("UI_DIR") && project->isEmpty("UI_HEADERS_DIR")) { TQString decl_fixed = fileFixify(decl, TQDir::currentDirPath(), Option::output_dir); @@ -1140,14 +1140,14 @@ MakefileGenerator::init() decl = fileFixify(decl, TQDir::currentDirPath(), Option::output_dir); if(!decl.isEmpty() && !decl.endsWith(Option::dir_sep)) decl += Option::dir_sep; - decl += fi.baseName(TRUE) + Option::h_ext.first(); + decl += fi.baseName(true) + Option::h_ext.first(); logicWarn(impl, "SOURCES"); logicWarn(decl, "HEADERS"); decls.append(decl); impls.append(impl); findDependencies(impl).append(decl); - TQString mocable = Option::h_moc_mod + fi.baseName(TRUE) + Option::h_moc_ext; + TQString mocable = Option::h_moc_mod + fi.baseName(true) + Option::h_moc_ext; if(!v["MOC_DIR"].isEmpty()) mocable.prepend(v["MOC_DIR"].first()); else if(fi.dirPath() != ".") @@ -1209,7 +1209,7 @@ MakefileGenerator::init() l = v["_HDRMOC"] + v["_UIMOC"] + v["_SRCMOC"]; for(TQStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) { if(!(*val_it).isEmpty()) - (*val_it) = Option::fixPathToTargetOS((*val_it), FALSE); + (*val_it) = Option::fixPathToTargetOS((*val_it), false); } } @@ -1218,7 +1218,7 @@ MakefileGenerator::init() TQStringList &l = v[fixpaths[path]]; for(TQStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) { if(!(*val_it).isEmpty()) - (*val_it) = Option::fixPathToTargetOS((*val_it), FALSE); + (*val_it) = Option::fixPathToTargetOS((*val_it), false); } } @@ -1235,10 +1235,10 @@ MakefileGenerator::init() bool MakefileGenerator::processPrlFile(TQString &file) { - bool ret = FALSE, try_replace_file=FALSE; + bool ret = false, try_replace_file=false; TQString meta_file, orig_file = file; if(TQMakeMetaInfo::libExists(file)) { - try_replace_file = TRUE; + try_replace_file = true; meta_file = file; file = ""; } else { @@ -1275,12 +1275,12 @@ MakefileGenerator::processPrlFile(TQString &file) if(hadlib) meta_file += "lib"; meta_file += stem + extn; - try_replace_file = TRUE; + try_replace_file = true; } } TQString real_meta_file = Option::fixPathToLocalOS(meta_file); if(project->variables()["QMAKE_PRL_INTERNAL_FILES"].findIndex(TQMakeMetaInfo::findLib(meta_file)) != -1) { - ret = TRUE; + ret = true; } else if(!meta_file.isEmpty()) { TQString f = fileFixify(real_meta_file, TQDir::currentDirPath(), Option::output_dir); if(TQMakeMetaInfo::libExists(f)) { @@ -1291,7 +1291,7 @@ MakefileGenerator::processPrlFile(TQString &file) } else if(project->isActiveConfig("no_read_prl_" + libinfo.type().lower())) { debug_msg(2, "Ignored meta file %s [%s]", real_meta_file.latin1(), libinfo.type().latin1()); } else { - ret = TRUE; + ret = true; TQMap<TQString, TQStringList> &vars = libinfo.variables(); for( TQMap<TQString, TQStringList>::Iterator it = vars.begin(); it != vars.end(); ++it) processPrlVariable(it.key(), it.data()); @@ -1348,7 +1348,7 @@ void MakefileGenerator::processPrlFiles() { TQDict<void> processed; - 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"; @@ -1359,7 +1359,7 @@ MakefileGenerator::processPrlFiles() TQString file = (*it); if(!processed[file] && processPrlFile(file)) { processed.insert(file, (void*)1); - ret = TRUE; + ret = true; } if(!file.isEmpty()) l_out.append(file); @@ -1452,7 +1452,7 @@ MakefileGenerator::write() TQTextStream t(&Option::output); writeMakefile(t); } - return TRUE; + return true; } // Manipulate directories, so it's possible to build @@ -1554,11 +1554,11 @@ MakefileGenerator::writeObj(TQTextStream &t, const TQString &obj, const TQString bool use_implicit_rule = !project->isEmpty(cimp); if(use_implicit_rule) { if(!project->isEmpty("OBJECTS_DIR")) { - use_implicit_rule = FALSE; + use_implicit_rule = false; } else { int dot = (*sit).findRev('.'); if(dot == -1 || ((*sit).left(dot) + Option::obj_ext != (*oit))) - use_implicit_rule = FALSE; + use_implicit_rule = false; } } if (!use_implicit_rule && !project->isEmpty(comp)) { @@ -1646,11 +1646,11 @@ MakefileGenerator::writeMocObj(TQTextStream &t, const TQString &obj, const TQStr bool use_implicit_rule = !project->isEmpty("QMAKE_RUN_CXX_IMP"); if(use_implicit_rule) { if(!project->isEmpty("OBJECTS_DIR") || !project->isEmpty("MOC_DIR")) { - use_implicit_rule = FALSE; + use_implicit_rule = false; } else { int dot = (*sit).findRev('.'); if(dot == -1 || ((*sit).left(dot) + Option::obj_ext != (*oit))) - use_implicit_rule = FALSE; + use_implicit_rule = false; } } if (!use_implicit_rule && !project->isEmpty("QMAKE_RUN_CXX")) { @@ -1704,12 +1704,12 @@ MakefileGenerator::writeYaccSrc(TQTextStream &t, const TQString &src) if(!dir.isEmpty() && dir.right(Option::dir_sep.length()) != Option::dir_sep) dir += Option::dir_sep; - TQString impl = dir + fi.baseName(TRUE) + Option::yacc_mod + Option::cpp_ext.first(); - TQString decl = dir + fi.baseName(TRUE) + Option::yacc_mod + Option::h_ext.first(); + TQString impl = dir + fi.baseName(true) + Option::yacc_mod + Option::cpp_ext.first(); + TQString decl = dir + fi.baseName(true) + Option::yacc_mod + Option::h_ext.first(); TQString yaccflags = "$(YACCFLAGS)", mangle = "y"; if(!project->isActiveConfig("yacc_no_name_mangle")) { - mangle = fi.baseName(TRUE); + mangle = fi.baseName(true); if(!project->isEmpty("QMAKE_YACCFLAGS_MANGLE")) yaccflags += " " + var("QMAKE_YACCFLAGS_MANGLE").replace(stringBase, mangle); else @@ -1749,11 +1749,11 @@ MakefileGenerator::writeLexSrc(TQTextStream &t, const TQString &src) dir = fileFixify(dir, TQDir::currentDirPath(), Option::output_dir); if(!dir.isEmpty() && dir.right(Option::dir_sep.length()) != Option::dir_sep) dir += Option::dir_sep; - TQString impl = dir + fi.baseName(TRUE) + Option::lex_mod + Option::cpp_ext.first(); + TQString impl = dir + fi.baseName(true) + Option::lex_mod + Option::cpp_ext.first(); TQString lexflags = "$(LEXFLAGS)", stub="yy"; if(!project->isActiveConfig("yacc_no_name_mangle")) { - stub = fi.baseName(TRUE); + stub = fi.baseName(true); lexflags += " -P" + stub; } TQString out_c = default_out_c; @@ -1781,11 +1781,11 @@ MakefileGenerator::writeImageObj(TQTextStream &t, const TQString &obj) bool use_implicit_rule = !project->isEmpty("QMAKE_RUN_CXX_IMP"); if(use_implicit_rule) { if(!project->isEmpty("OBJECTS_DIR") || !project->isEmpty("UI_DIR") || !project->isEmpty("UI_SOURCES_DIR")) { - use_implicit_rule = FALSE; + use_implicit_rule = false; } else { int dot = src.findRev('.'); if(dot == -1 || (src.left(dot) + Option::obj_ext != (*oit))) - use_implicit_rule = FALSE; + use_implicit_rule = false; } } if(!use_implicit_rule && !project->isEmpty("QMAKE_RUN_CXX")) { @@ -1831,7 +1831,7 @@ MakefileGenerator::writeInstalls(TQTextStream &t, const TQString &installs) continue; } - bool do_default = TRUE; + bool do_default = true; const TQString root = "$(INSTALL_ROOT)"; TQString target, dst= fileFixify(project->variables()[pvar].first()); if(dst.right(1) != Option::dir_sep) @@ -1842,7 +1842,7 @@ MakefileGenerator::writeInstalls(TQTextStream &t, const TQString &installs) if(tmp.isEmpty()) tmp = project->variables()[(*it) + ".commands"]; //to allow compatible name if(!tmp.isEmpty()) { - do_default = FALSE; + do_default = false; if(!target.isEmpty()) target += "\n\t"; target += tmp.join(" "); @@ -1852,9 +1852,9 @@ MakefileGenerator::writeInstalls(TQTextStream &t, const TQString &installs) if(!tmp.isEmpty()) { if(!target.isEmpty()) target += "\n"; - do_default = FALSE; + do_default = false; for(TQStringList::Iterator wild_it = tmp.begin(); wild_it != tmp.end(); ++wild_it) { - TQString wild = Option::fixPathToLocalOS((*wild_it), FALSE), wild_var = fileFixify(wild); + TQString wild = Option::fixPathToLocalOS((*wild_it), false), wild_var = fileFixify(wild); TQString dirstr = TQDir::currentDirPath(), filestr = wild; int slsh = filestr.findRev(Option::dir_sep); if(slsh != -1) { @@ -1870,13 +1870,13 @@ MakefileGenerator::writeInstalls(TQTextStream &t, const TQString &installs) target += "\t"; TQString cmd = TQString(fi.isDir() ? "-$(INSTALL_DIR)" : "-$(INSTALL_FILE)") + " \"" + Option::fixPathToTargetOS(fileFixify(wild, TQString::null, - TQString::null, FALSE, FALSE), FALSE) + + TQString::null, false, false), false) + "\" \"" + root + dst + "\"\n"; target += cmd; if(!project->isActiveConfig("debug") && !fi.isDir() && fi.isExecutable() && !project->isEmpty("QMAKE_STRIP")) target += TQString("\t-") + var("QMAKE_STRIP") + " \"" + - root + fileFixify(dst + filestr, TQString::null, TQString::null, FALSE, FALSE) + + root + fileFixify(dst + filestr, TQString::null, TQString::null, false, false) + "\"\n"; if(!uninst.isEmpty()) uninst.append("\n\t"); @@ -1886,7 +1886,7 @@ MakefileGenerator::writeInstalls(TQTextStream &t, const TQString &installs) #else TQString("-$(DEL_FILE) -r") #endif - + " \"" + root + fileFixify(dst + filestr, TQString::null, TQString::null, FALSE, FALSE) + "\""); + + " \"" + root + fileFixify(dst + filestr, TQString::null, TQString::null, false, false) + "\""); continue; } fixEnvVariables(dirstr); @@ -1903,20 +1903,20 @@ MakefileGenerator::writeInstalls(TQTextStream &t, const TQString &installs) #else TQString("-$(DEL_FILE) -r") #endif - + " \"" + root + fileFixify(dst + file, TQString::null, TQString::null, FALSE, FALSE) + + + " \"" + root + fileFixify(dst + file, TQString::null, TQString::null, false, false) + "\""); - TQFileInfo fi(Option::fixPathToTargetOS(fileFixify(dirstr + file), TRUE)); + TQFileInfo fi(Option::fixPathToTargetOS(fileFixify(dirstr + file), true)); if(!target.isEmpty()) target += "\t"; TQString cmd = TQString(fi.isDir() ? "-$(INSTALL_DIR)" : "-$(INSTALL_FILE)") + " \"" + Option::fixPathToTargetOS(fileFixify(dirstr + file, TQString::null, - TQString::null, FALSE, FALSE), FALSE) + + TQString::null, false, false), false) + "\" \"" + root + dst + "\"\n"; target += cmd; if(!project->isActiveConfig("debug") && !fi.isDir() && fi.isExecutable() && !project->isEmpty("QMAKE_STRIP")) target += TQString("\t-") + var("QMAKE_STRIP") + " \"" + - root + fileFixify(dst + file, TQString::null, TQString::null, FALSE, FALSE) + + root + fileFixify(dst + file, TQString::null, TQString::null, false, false) + "\"\n"; } } @@ -2025,14 +2025,14 @@ MakefileGenerator::createObjectList(const TQString &var) for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) { TQFileInfo fi(Option::fixPathToLocalOS((*it))); if(objdir.isEmpty() && project->isActiveConfig("object_with_source")) { - TQString fName = Option::fixPathToTargetOS((*it), FALSE); + TQString fName = Option::fixPathToTargetOS((*it), false); int dl = fName.findRev(Option::dir_sep); if(dl != -1) dir = fName.left(dl + 1); } else { dir = objdir; } - ret.append(dir + fi.baseName(TRUE) + Option::obj_ext); + ret.append(dir + fi.baseName(true) + Option::obj_ext); } return ret; } @@ -2055,7 +2055,7 @@ MakefileGenerator::writeMakefile(TQTextStream &t) t << "####### Install" << endl << endl; writeInstalls(t, "INSTALLS"); - return TRUE; + return true; } TQString MakefileGenerator::buildArgs() @@ -2139,7 +2139,7 @@ MakefileGenerator::writeHeader(TQTextStream &t) t << "# Command: " << build_args() << endl; t << "#############################################################################" << endl; t << endl; - return TRUE; + return true; } @@ -2177,7 +2177,7 @@ MakefileGenerator::writeMakeQmake(TQTextStream &t) << "@" << qmake << endl << endl; } } - return TRUE; + return true; } TQStringList @@ -2227,7 +2227,7 @@ MakefileGenerator::fileFixify(const TQString& file0, const TQString &out_d, TQString orig_file = file; if(!force_fix && project->isActiveConfig("no_fixpath")) { if(!project->isEmpty("QMAKE_ABSOLUTE_SOURCE_PATH")) { //absoluteify it - TQString tqfile = Option::fixPathToLocalOS(file, TRUE, canon); + TQString tqfile = Option::fixPathToLocalOS(file, true, canon); if(TQDir::isRelativePath(file)) { //already absolute TQFileInfo fi(tqfile); if(!fi.convertToAbs()) //strange @@ -2235,7 +2235,7 @@ MakefileGenerator::fileFixify(const TQString& file0, const TQString &out_d, } } } else { //fix it.. - TQString tqfile(Option::fixPathToLocalOS(file, TRUE, canon)), in_dir(in_d), out_dir(out_d); + TQString tqfile(Option::fixPathToLocalOS(file, true, canon)), in_dir(in_d), out_dir(out_d); { if(out_dir.isNull() || TQDir::isRelativePath(out_dir)) out_dir.prepend(Option::output_dir + TQDir::separator()); @@ -2268,13 +2268,13 @@ MakefileGenerator::fileFixify(const TQString& file0, const TQString &out_d, file.prepend(Option::dir_sep); file.prepend(in_dir); } - file = Option::fixPathToTargetOS(file, FALSE, canon); - if(canon && TQFile::exists(file) && file == Option::fixPathToTargetOS(file, TRUE, canon)) { + file = Option::fixPathToTargetOS(file, false, canon); + if(canon && TQFile::exists(file) && file == Option::fixPathToTargetOS(file, true, canon)) { TQString real_file = TQDir(file).canonicalPath(); if(!real_file.isEmpty()) file = Option::fixPathToTargetOS(real_file, false, canon); } - TQString match_dir = Option::fixPathToTargetOS(out_dir, FALSE, canon); + TQString match_dir = Option::fixPathToTargetOS(out_dir, false, canon); if(file == match_dir) { file = ""; } else if(file.startsWith(match_dir) && @@ -2303,7 +2303,7 @@ MakefileGenerator::fileFixify(const TQString& file0, const TQString &out_d, } } } - file = Option::fixPathToTargetOS(file, FALSE, canon); + file = Option::fixPathToTargetOS(file, false, canon); if(file.isEmpty()) file = "."; if(!quote.isNull()) @@ -2363,7 +2363,7 @@ MakefileGenerator::processedDependencies(const TQString &file) { TQString key = dependencyKey(file); if(!depProcessed.contains(key)) - return FALSE; + return false; return depProcessed[key]; } @@ -2433,9 +2433,9 @@ MakefileGenerator::openOutput(TQFile &file) const if(TQDir::isRelativePath(od)) od.prepend(Option::output_dir); Option::output_dir = od; - return TRUE; + return true; } - return FALSE; + return false; } |