summaryrefslogtreecommitdiffstats
path: root/qmake/generators/unix/unixmake2.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'qmake/generators/unix/unixmake2.cpp')
-rw-r--r--qmake/generators/unix/unixmake2.cpp46
1 files changed, 23 insertions, 23 deletions
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