From c03a4800879ab62692e017e01c825ba12a421ad0 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 1 Jul 2025 22:09:14 +0900 Subject: Replace TRUE/FALSE with boolean values true/false - part 2 Signed-off-by: Michele Calgaro --- qmake/project.cpp | 138 +++++++++++++++++++++++++++--------------------------- 1 file changed, 69 insertions(+), 69 deletions(-) (limited to 'qmake/project.cpp') diff --git a/qmake/project.cpp b/qmake/project.cpp index f6082f009..b1b470f50 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -163,7 +163,7 @@ static TQStringList split_arg_list(const TQString ¶ms) return args; } -static TQStringList split_value_list(const TQString &vals, bool do_semicolon=FALSE) +static TQStringList split_value_list(const TQString &vals, bool do_semicolon=false) { TQString build; TQStringList ret; @@ -215,7 +215,7 @@ TQMakeProject::parse(const TQString &t, TQMap &place) if(hash_mark != -1) //good bye comments s = s.left(hash_mark); if(s.isEmpty()) /* blank_line */ - return TRUE; + return true; if(s.stripWhiteSpace().left(1) == "}") { debug_msg(1, "Project Parser: %s:%d : Leaving block %d", parser.file.latin1(), @@ -224,7 +224,7 @@ TQMakeProject::parse(const TQString &t, TQMap &place) scope_block--; s = s.mid(1).stripWhiteSpace(); if(s.isEmpty()) - return TRUE; + return true; } if(!(scope_flag & (0x01 << scope_block))) { /* adjust scope for each block which appears on a single line */ @@ -232,7 +232,7 @@ TQMakeProject::parse(const TQString &t, TQMap &place) scope_flag &= ~(0x01 << (++scope_block)); debug_msg(1, "Project Parser: %s:%d : Ignored due to block being false.", parser.file.latin1(), parser.line_no); - return TRUE; + return true; } TQString scope, var, op; @@ -240,7 +240,7 @@ TQMakeProject::parse(const TQString &t, TQMap &place) #define SKIP_WS(d) while(*d && (*d == ' ' || *d == '\t')) d++ const char *d = s.latin1(); SKIP_WS(d); - bool scope_failed = FALSE, else_line = FALSE, or_op=FALSE; + bool scope_failed = false, else_line = false, or_op=false; int parens = 0, scope_count=0; while(*d) { if(!parens) { @@ -255,7 +255,7 @@ TQMakeProject::parse(const TQString &t, TQMap &place) if(*k == '=') { TQString msg; qmake_error_msg(*d + "must be followed immediately by ="); - return FALSE; + return false; } } } @@ -277,9 +277,9 @@ TQMakeProject::parse(const TQString &t, TQMap &place) if(scope.lower() == "else") { if(scope_count != 1 || test_status == TestNone) { qmake_error_msg("Unexpected " + scope + " ('" + s + "')"); - return FALSE; + return false; } - else_line = TRUE; + else_line = true; test = (test_status == TestSeek); debug_msg(1, "Project Parser: %s:%d : Else%s %s.", parser.file.latin1(), parser.line_no, scope == "else" ? "" : TQString(" (" + scope + ")").latin1(), @@ -298,7 +298,7 @@ TQMakeProject::parse(const TQString &t, TQMap &place) error.sprintf("Function missing right paren: %s ('%s')", comp_scope.latin1(), s.latin1()); qmake_error_msg(error); - return FALSE; + return false; } TQString func = comp_scope.left(lparen); test = doProjectTest(func, comp_scope.mid(lparen+1, rparen - lparen - 1), place); @@ -306,10 +306,10 @@ TQMakeProject::parse(const TQString &t, TQMap &place) if(invert_test) test = !test; test_status = (test ? TestFound : TestSeek); - return TRUE; /* assume we are done */ + return true; /* assume we are done */ } } else { - test = isActiveConfig(comp_scope.stripWhiteSpace(), TRUE, &place); + test = isActiveConfig(comp_scope.stripWhiteSpace(), true, &place); } if(invert_test) test = !test; @@ -373,7 +373,7 @@ TQMakeProject::parse(const TQString &t, TQMap &place) } doVariableReplace(vals, place); if(scope_failed) - return TRUE; /* oh well */ + return true; /* oh well */ #undef SKIP_WS if(!var.isEmpty() && Option::mkfile::do_preprocess) { @@ -401,22 +401,22 @@ TQMakeProject::parse(const TQString &t, TQMap &place) if(vallist.count() != 1) { qmake_error_msg("~= operator only accepts one right hand paramater ('" + s + "')"); - return FALSE; + return false; } TQString val(vallist.first()); if(val.length() < 4 || val.at(0) != 's') { qmake_error_msg("~= operator only can handle s/// function ('" + s + "')"); - return FALSE; + return false; } TQChar sep = val.at(1); - TQStringList func = TQStringList::split(sep, val, TRUE); + TQStringList func = TQStringList::split(sep, val, true); if(func.count() < 3 || func.count() > 4) { qmake_error_msg("~= operator only can handle s/// function ('" + s + "')"); - return FALSE; + return false; } - bool global = FALSE, case_sense = TRUE; + bool global = false, case_sense = true; if(func.count() == 4) { global = func[3].find('g') != -1; case_sense = func[3].find('i') == -1; @@ -451,7 +451,7 @@ TQMakeProject::parse(const TQString &t, TQMap &place) if(var == "REQUIRES") /* special case to get communicated to backends! */ doProjectCheckReqs(vallist, place); - return TRUE; + return true; } bool @@ -462,12 +462,12 @@ TQMakeProject::read(const TQString &file, TQMap &place) TQString filename = Option::fixPathToLocalOS(file); doVariableReplace(filename, place); - bool ret = FALSE, using_stdin = FALSE; + bool ret = false, using_stdin = false; TQFile tqfile; if(!strcmp(filename, "-")) { tqfile.setName(""); ret = tqfile.open(IO_ReadOnly, stdin); - using_stdin = TRUE; + using_stdin = true; } else { tqfile.setName(filename); ret = tqfile.open(IO_ReadOnly); @@ -564,16 +564,16 @@ TQMakeProject::read(uchar cmd) } if(Option::mkfile::qmakespec.isEmpty()) { fprintf(stderr, "QMAKESPEC has not been set, so configuration cannot be deduced.\n"); - return FALSE; + return false; } } if(TQDir::isRelativePath(Option::mkfile::qmakespec)) { - bool found_mkspec = FALSE; + bool found_mkspec = false; for(TQStringList::Iterator it = mkspec_roots.begin(); it != mkspec_roots.end(); ++it) { TQString mkspec = (*it) + TQDir::separator() + Option::mkfile::qmakespec; if(TQFile::exists(mkspec)) { - found_mkspec = TRUE; + found_mkspec = true; Option::mkfile::qmakespec = mkspec; break; } @@ -581,7 +581,7 @@ TQMakeProject::read(uchar cmd) if(!found_mkspec) { fprintf(stderr, "Could not find mkspecs for your QMAKESPEC after trying:\n\t%s\n", mkspec_roots.join("\n\t").latin1()); - return FALSE; + return false; } } @@ -595,7 +595,7 @@ TQMakeProject::read(uchar cmd) debug_msg(1, "QMAKESPEC conf: reading %s", spec.latin1()); if(!read(spec, base_vars)) { fprintf(stderr, "Failure to read QMAKESPEC conf file %s.\n", spec.latin1()); - return FALSE; + return false; } if(Option::mkfile::do_cache && !Option::mkfile::cachefile.isEmpty()) { debug_msg(1, "QMAKECACHE file: reading %s", Option::mkfile::cachefile.latin1()); @@ -612,7 +612,7 @@ TQMakeProject::read(uchar cmd) it != Option::before_user_vars.end(); ++it) { if(!parse((*it), base_vars)) { fprintf(stderr, "Argument failed to parse: %s\n", (*it).latin1()); - return FALSE; + return false; } parser.line_no++; } @@ -626,7 +626,7 @@ TQMakeProject::read(uchar cmd) if(pfile != "-" && !TQFile::exists(pfile) && !pfile.endsWith(".pro")) pfile += ".pro"; if(!read(pfile, vars)) - return FALSE; + return false; } if(cmd & ReadPostFiles) { /* parse post files */ @@ -643,7 +643,7 @@ TQMakeProject::read(uchar cmd) it != Option::after_user_vars.end(); ++it) { if(!parse((*it), vars)) { fprintf(stderr, "Argument failed to parse: %s\n", (*it).latin1()); - return FALSE; + return false; } parser.line_no++; } @@ -689,36 +689,36 @@ TQMakeProject::read(uchar cmd) } } } - return TRUE; + return true; } bool TQMakeProject::isActiveConfig(const TQString &x, bool regex, TQMap *place) { if(x.isEmpty()) - return TRUE; + return true; if((Option::target_mode == Option::TARG_MACX_MODE || Option::target_mode == Option::TARG_QNX6_MODE || Option::target_mode == Option::TARG_UNIX_MODE) && x == "unix") - return TRUE; + return true; else if(Option::target_mode == Option::TARG_MACX_MODE && x == "macx") - return TRUE; + return true; else if(Option::target_mode == Option::TARG_QNX6_MODE && x == "qnx6") - return TRUE; + return true; else if(Option::target_mode == Option::TARG_MAC9_MODE && x == "mac9") - return TRUE; + return true; else if((Option::target_mode == Option::TARG_MAC9_MODE || Option::target_mode == Option::TARG_MACX_MODE) && x == "mac") - return TRUE; + return true; else if(Option::target_mode == Option::TARG_WIN_MODE && x == "win32") - return TRUE; + return true; - TQRegExp re(x, FALSE, TRUE); + TQRegExp re(x, false, true); TQString spec = Option::mkfile::qmakespec.right(Option::mkfile::qmakespec.length() - (Option::mkfile::qmakespec.findRev(TQDir::separator())+1)); if((regex && re.exactMatch(spec)) || (!regex && spec == x)) - return TRUE; + return true; #ifdef Q_OS_UNIX else if(spec == "default") { static char *buffer = NULL; @@ -731,7 +731,7 @@ TQMakeProject::isActiveConfig(const TQString &x, bool regex, TQMap 3) { fprintf(stderr, "%s:%d: infile(file, var, val) requires at least 2 arguments.\n", parser.file.latin1(), parser.line_no); - return FALSE; + return false; } TQMakeProject proj; TQString file = args[0]; @@ -836,7 +836,7 @@ TQMakeProject::doProjectTest(const TQString& func, TQStringList args, TQMap tmp; if((r = read(file.latin1(), tmp))) @@ -1011,7 +1011,7 @@ TQMakeProject::doProjectTest(const TQString& func, TQStringList args, TQMap &place) { - bool ret = FALSE; + bool ret = false; for(TQStringList::ConstIterator it = deps.begin(); it != deps.end(); ++it) { TQString chk = (*it); if(chk.isEmpty()) @@ -1057,7 +1057,7 @@ TQMakeProject::doProjectCheckReqs(const TQStringList &deps, TQMap