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/generators/unix/unixmake.cpp | 44 +++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'qmake/generators/unix/unixmake.cpp') diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 4a3b22785..405c0faf3 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -50,7 +50,7 @@ UnixMakefileGenerator::init() { if(init_flag) return; - init_flag = TRUE; + init_flag = true; if(!project->isEmpty("QMAKE_FAILED_REQUIREMENTS")) /* no point */ return; @@ -244,7 +244,7 @@ UnixMakefileGenerator::init() project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_THREAD"]; } if ( project->isActiveConfig("moc") ) - setTQMocAware(TRUE); + setTQMocAware(true); TQString compile_flag = var("QMAKE_COMPILE_FLAG"); if(compile_flag.isEmpty()) compile_flag = "-c"; @@ -271,7 +271,7 @@ UnixMakefileGenerator::init() project->variables()["QMAKE_RUN_CXX_IMP"].append("$(CXX) " + compile_flag + " $(CXXFLAGS) $(INCPATH) -o $@ $<"); project->variables()["QMAKE_FILETAGS"] += TQStringList::split("HEADERS SOURCES TARGET DESTDIR", " "); if( project->isActiveConfig("GNUmake") && !project->isEmpty("QMAKE_CFLAGS_DEPS")) - include_deps = TRUE; //do not generate deps + include_deps = true; //do not generate deps if(project->isActiveConfig("compile_libtool")) Option::obj_ext = ".lo"; //override the .o @@ -356,7 +356,7 @@ UnixMakefileGenerator::init() if(rpath.right(1) != Option::dir_sep) { rpath += Option::dir_sep; } - comp_flags += " -rpath " + Option::fixPathToTargetOS(rpath, FALSE); + comp_flags += " -rpath " + Option::fixPathToTargetOS(rpath, false); } } } @@ -396,14 +396,14 @@ UnixMakefileGenerator::combineSetLFlags(const TQStringList &list1, const TQStrin } ret.append((*it)); } else if(project->isActiveConfig("macx") && (*it).startsWith("-framework")) { - int as_one = TRUE; + int as_one = true; TQString framework_in; if((*it).length() > 11) { framework_in = (*it).mid(11); } else { if(it != lst->end()) { ++it; - as_one = FALSE; + as_one = false; framework_in = (*it); } } @@ -539,7 +539,7 @@ bool UnixMakefileGenerator::findLibraries() { TQPtrList libdirs; - libdirs.setAutoDelete(TRUE); + libdirs.setAutoDelete(true); const TQString lflags[] = { "QMAKE_LIBDIR_FLAGS", "QMAKE_LIBS", TQString::null }; for(int i = 0; !lflags[i].isNull(); i++) { TQStringList &l = project->variables()[lflags[i]]; @@ -581,7 +581,7 @@ UnixMakefileGenerator::findLibraries() if(!stub.isEmpty()) { const TQString modifs[] = { "", "-mt", TQString::null }; for(int modif = 0; !modifs[modif].isNull(); modif++) { - bool found = FALSE; + bool found = false; TQStringList extens; if(!extn.isNull()) extens << extn; @@ -599,13 +599,13 @@ UnixMakefileGenerator::findLibraries() } if(!lib_stub.isNull()) { (*it) = "-l" + lib_stub; - found = TRUE; + found = true; break; } } else { if(TQFile::exists("lib" + stub + modifs[modif] + "." + (*extit))) { (*it) = "lib" + stub + modifs[modif] + "." + (*extit); - found = TRUE; + found = true; break; } } @@ -614,7 +614,7 @@ UnixMakefileGenerator::findLibraries() for(MakefileDependDir *mdd = libdirs.first(); mdd; mdd = libdirs.next() ) { if(TQFile::exists(mdd->local_dir + Option::dir_sep + "lib" + stub + modifs[modif] + Option::libtool_ext)) { (*it) = mdd->real_dir + Option::dir_sep + "lib" + stub + modifs[modif] + Option::libtool_ext; - found = TRUE; + found = true; break; } } @@ -626,7 +626,7 @@ UnixMakefileGenerator::findLibraries() } } } - return FALSE; + return false; } TQString linkLib(const TQString &file, const TQString &libName) { @@ -642,10 +642,10 @@ UnixMakefileGenerator::processPrlFiles() { TQDict processed; TQPtrList libdirs; - libdirs.setAutoDelete(TRUE); + libdirs.setAutoDelete(true); const TQString lflags[] = { "QMAKE_LIBDIR_FLAGS", "QMAKE_LIBS", TQString::null }; for(int i = 0; !lflags[i].isNull(); i++) { - for(bool ret = FALSE; TRUE; ret = FALSE) { + for(bool ret = false; true; ret = false) { TQStringList l_out; TQStringList &l = project->variables()[lflags[i]]; for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) { @@ -675,7 +675,7 @@ UnixMakefileGenerator::processPrlFiles() prl.replace(0, mdd->local_dir.length(), mdd->real_dir); opt = linkLib(prl, lib); processed.insert(opt, (void*)1); - ret = TRUE; + ret = true; break; } } @@ -689,7 +689,7 @@ UnixMakefileGenerator::processPrlFiles() TQString prl = "/System/Library/Frameworks/" + opt + ".framework/" + opt; if(processPrlFile(prl)) - ret = TRUE; + ret = true; l_out.append("-framework"); } if(!opt.isEmpty()) @@ -699,7 +699,7 @@ UnixMakefileGenerator::processPrlFiles() TQString lib = opt; if(!processed[lib] && processPrlFile(lib)) { processed.insert(lib, (void*)1); - ret = TRUE; + ret = true; } #if 0 if(ret) @@ -724,11 +724,11 @@ UnixMakefileGenerator::defaultInstall(const TQString &t) if(t != "target" || project->first("TEMPLATE") == "subdirs") return TQString(); - bool resource = FALSE; + bool resource = false; const TQString root = "$(INSTALL_ROOT)"; TQStringList &uninst = project->variables()[t + ".uninstall"]; TQString ret, destdir=project->first("DESTDIR"); - TQString targetdir = Option::fixPathToTargetOS(project->first("target.path"), FALSE); + TQString targetdir = Option::fixPathToTargetOS(project->first("target.path"), false); if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep) destdir += Option::dir_sep; targetdir = fileFixify(targetdir); @@ -742,7 +742,7 @@ UnixMakefileGenerator::defaultInstall(const TQString &t) if(project->isActiveConfig("resource_fork") && !project->isActiveConfig("console")) { destdir += "../../../"; target += ".app"; - resource = TRUE; + resource = true; } } else if(project->first("TEMPLATE") == "lib") { if(project->isActiveConfig("create_prl") && !project->isActiveConfig("no_install_prl") && @@ -827,7 +827,7 @@ UnixMakefileGenerator::defaultInstall(const TQString &t) } else { TQString src_targ = target; if(!destdir.isEmpty()) - src_targ = Option::fixPathToTargetOS(destdir + target, FALSE); + src_targ = Option::fixPathToTargetOS(destdir + target, false); TQString dst_targ = root + targetdir + target; if(!ret.isEmpty()) ret += "\n\t"; @@ -861,7 +861,7 @@ UnixMakefileGenerator::defaultInstall(const TQString &t) Option::target_mode == Option::TARG_MAC9_MODE) { } else if(Option::target_mode == Option::TARG_UNIX_MODE || Option::target_mode == Option::TARG_MACX_MODE) { - TQString link = Option::fixPathToTargetOS(destdir + (*it), FALSE); + TQString link = Option::fixPathToTargetOS(destdir + (*it), false); int lslash = link.findRev(Option::dir_sep); if(lslash != -1) link = link.right(link.length() - (lslash + 1)); -- cgit v1.2.3