summaryrefslogtreecommitdiffstats
path: root/qmake/generators/unix
diff options
context:
space:
mode:
Diffstat (limited to 'qmake/generators/unix')
-rw-r--r--qmake/generators/unix/unixmake.cpp44
-rw-r--r--qmake/generators/unix/unixmake.h2
-rw-r--r--qmake/generators/unix/unixmake2.cpp46
3 files changed, 46 insertions, 46 deletions
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<MakefileDependDir> 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<void> processed;
TQPtrList<MakefileDependDir> 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));
diff --git a/qmake/generators/unix/unixmake.h b/qmake/generators/unix/unixmake.h
index e243e1a5f..f118bdd2b 100644
--- a/qmake/generators/unix/unixmake.h
+++ b/qmake/generators/unix/unixmake.h
@@ -72,7 +72,7 @@ protected:
virtual void init();
void writeMakeParts(TQTextStream &);
- void writeSubdirs(TQTextStream &, bool=TRUE);
+ void writeSubdirs(TQTextStream &, bool=true);
private:
void init2();
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index e29ca16a3..1efcb3d70 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -46,7 +46,7 @@
TQString mkdir_p_asstring(const TQString &dir);
-UnixMakefileGenerator::UnixMakefileGenerator(TQMakeProject *p) : MakefileGenerator(p), init_flag(FALSE), include_deps(FALSE)
+UnixMakefileGenerator::UnixMakefileGenerator(TQMakeProject *p) : MakefileGenerator(p), init_flag(false), include_deps(false)
{
}
@@ -85,7 +85,7 @@ UnixMakefileGenerator::writeMakefile(TQTextStream &t)
<< var("QMAKE_FAILED_REQUIREMENTS") << ") are not available.\"" << "\n\t"
<< "@echo \"Skipped.\"" << endl << endl;
writeMakeQmake(t);
- return TRUE;
+ return true;
}
if (project->variables()["TEMPLATE"].first() == "app" ||
@@ -94,24 +94,24 @@ UnixMakefileGenerator::writeMakefile(TQTextStream &t)
return MakefileGenerator::writeMakefile(t);
} else if(project->variables()["TEMPLATE"].first() == "subdirs") {
writeSubdirs(t);
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
void
UnixMakefileGenerator::writeExtraVariables(TQTextStream &t)
{
- bool first = TRUE;
+ bool first = true;
TQMap<TQString, TQStringList> &vars = project->variables();
TQStringList &exports = project->variables()["QMAKE_EXTRA_UNIX_VARIABLES"];
for(TQMap<TQString, TQStringList>::Iterator it = vars.begin(); it != vars.end(); ++it) {
for(TQStringList::Iterator exp_it = exports.begin(); exp_it != exports.end(); ++exp_it) {
- TQRegExp rx((*exp_it), FALSE, TRUE);
+ TQRegExp rx((*exp_it), false, true);
if(rx.exactMatch(it.key())) {
if(first) {
t << "\n####### Custom Variables" << endl;
- first = FALSE;
+ first = false;
}
t << "EXPORT_" << it.key() << " = " << it.data().join(" ") << endl;
}
@@ -129,7 +129,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
!project->variables()["QMAKE_INCREMENTAL"].isEmpty() &&
(!project->variables()["QMAKE_APP_FLAG"].isEmpty() ||
!project->isActiveConfig("staticlib"))),
- src_incremental=FALSE, moc_incremental=FALSE;
+ src_incremental=false, moc_incremental=false;
t << "####### Compiler, tools and options" << endl << endl;
if (varGlue("INCLUDEPATH", " -I", " -I", "").find("$(LOCALBASE)") != -1)
@@ -217,10 +217,10 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
TQStringList &objs = project->variables()["OBJECTS"], &incrs = project->variables()["QMAKE_INCREMENTAL"], incrs_out;
t << "OBJECTS = ";
for(TQStringList::Iterator objit = objs.begin(); objit != objs.end(); ++objit) {
- bool increment = FALSE;
+ bool increment = false;
for(TQStringList::Iterator incrit = incrs.begin(); incrit != incrs.end(); ++incrit) {
- if((*objit).find(TQRegExp((*incrit), TRUE, TRUE)) != -1) {
- increment = TRUE;
+ if((*objit).find(TQRegExp((*incrit), true, true)) != -1) {
+ increment = true;
incrs_out.append((*objit));
break;
}
@@ -233,7 +233,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
} else if(!incrs_out.count()) {
t << endl;
} else {
- src_incremental = TRUE;
+ src_incremental = true;
t << endl;
t << "INCREMENTAL_OBJECTS = " << incrs_out.join(" \\\n\t\t") << endl;
}
@@ -250,10 +250,10 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
&incrs = project->variables()["QMAKE_INCREMENTAL"], incrs_out;
t << "OBJMOC = ";
for(TQStringList::Iterator objit = objs.begin(); objit != objs.end(); ++objit) {
- bool increment = FALSE;
+ bool increment = false;
for(TQStringList::Iterator incrit = incrs.begin(); incrit != incrs.end(); ++incrit) {
- if((*objit).find(TQRegExp((*incrit), TRUE, TRUE)) != -1) {
- increment = TRUE;
+ if((*objit).find(TQRegExp((*incrit), true, true)) != -1) {
+ increment = true;
incrs_out.append((*objit));
break;
}
@@ -266,7 +266,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
} else if(!incrs_out.count()) {
t << endl;
} else {
- moc_incremental = TRUE;
+ moc_incremental = true;
t << endl;
t << "INCREMENTAL_OBJMOC = " << incrs_out.join(" \\\n\t\t") << endl;
}
@@ -274,7 +274,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
t << "OBJMOC = " << objMoc << endl;
}
if(do_incremental && !moc_incremental && !src_incremental)
- do_incremental = FALSE;
+ do_incremental = false;
if(!project->isEmpty("QMAKE_EXTRA_UNIX_COMPILERS")) {
t << "OBJCOMP = " << varList("OBJCOMP") << endl;
target_deps += " $(OBJCOMP)";
@@ -807,8 +807,8 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
dir = fileFixify(dir, TQDir::currentDirPath(), Option::output_dir);
if(!dir.isEmpty() && dir.right(Option::dir_sep.length()) != Option::dir_sep)
dir += Option::dir_sep;
- clean << ( dir + fi.baseName(TRUE) + Option::yacc_mod + Option::cpp_ext.first() );
- clean << ( dir + fi.baseName(TRUE) + Option::yacc_mod + Option::h_ext.first() );
+ clean << ( dir + fi.baseName(true) + Option::yacc_mod + Option::cpp_ext.first() );
+ clean << ( dir + fi.baseName(true) + Option::yacc_mod + Option::h_ext.first() );
}
if(!clean.isEmpty()) {
t << "\t-$(DEL_FILE) " << clean.join(" ") << "\n";
@@ -827,7 +827,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
dir = fileFixify(dir, TQDir::currentDirPath(), Option::output_dir);
if(!dir.isEmpty() && dir.right(Option::dir_sep.length()) != Option::dir_sep)
dir += Option::dir_sep;
- clean << ( dir + fi.baseName(TRUE) + Option::lex_mod + Option::cpp_ext.first() );
+ clean << ( dir + fi.baseName(true) + Option::lex_mod + Option::cpp_ext.first() );
}
if(!clean.isEmpty()) {
t << "\t-$(DEL_FILE) " << clean.join(" ") << "\n";
@@ -963,7 +963,7 @@ UnixMakefileGenerator::writeMakeParts(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());
@@ -1397,7 +1397,7 @@ void UnixMakefileGenerator::init2()
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());
@@ -1493,7 +1493,7 @@ UnixMakefileGenerator::writeLibtoolFile()
if(install_dir.isEmpty())
install_dir = project->first("DESTDIR");
t << "# Directory that this library needs to be installed in:\n"
- "libdir='" << Option::fixPathToTargetOS(install_dir, FALSE) << "'\n";
+ "libdir='" << Option::fixPathToTargetOS(install_dir, false) << "'\n";
}
TQString
generated by cgit v1.2.3 (git 2.46.0) at 2025-11-12 06:54:49 +0000