diff options
Diffstat (limited to 'qmake/generators/mac/pbuilder_pbx.cpp')
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index 329b79967..efb20d6cd 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -64,7 +64,7 @@ ProjectBuilderMakefileGenerator::writeMakefile(TQTextStream &t) /* for now just dump, I need to generated an empty xml or something.. */ fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n", var("QMAKE_FAILED_REQUIREMENTS").latin1()); - return TRUE; + return true; } project->variables()["MAKEFILE"].clear(); @@ -72,8 +72,8 @@ ProjectBuilderMakefileGenerator::writeMakefile(TQTextStream &t) if(project->first("TEMPLATE") == "app" || project->first("TEMPLATE") == "lib") return writeMakeParts(t); else if(project->first("TEMPLATE") == "subdirs") - return writeSubdirs(t, FALSE); - return FALSE; + return writeSubdirs(t, false); + return false; } bool @@ -102,7 +102,7 @@ ProjectBuilderMakefileGenerator::writeSubdirs(TQTextStream &t, bool direct) TQString oldpwd = TQDir::currentDirPath(); TQMap<TQString, TQStringList> groups; for(TQStringList::Iterator it = subdirs.begin(); it != subdirs.end(); ++it) { - TQFileInfo fi(Option::fixPathToLocalOS((*it), TRUE)); + TQFileInfo fi(Option::fixPathToLocalOS((*it), true)); if(fi.exists()) { if(fi.isDir()) { TQString profile = (*it); @@ -138,17 +138,17 @@ ProjectBuilderMakefileGenerator::writeSubdirs(TQTextStream &t, bool direct) project->variables()["QMAKE_PBX_SUBDIRS"] += pbxproj; //PROJECTREF { - bool in_root = TRUE; + bool in_root = true; TQString name = TQDir::currentDirPath(); TQString project_key = keyFor(pbxproj + "_PROJECTREF"); if(project->isActiveConfig("flat")) { - TQString flat_file = fileFixify(name, oldpwd, Option::output_dir, TRUE); + TQString flat_file = fileFixify(name, oldpwd, Option::output_dir, true); if(flat_file.find(Option::dir_sep) != -1) { TQStringList dirs = TQStringList::split(Option::dir_sep, flat_file); name = dirs.back(); } } else { - TQString flat_file = fileFixify(name, oldpwd, Option::output_dir, TRUE); + TQString flat_file = fileFixify(name, oldpwd, Option::output_dir, true); if(TQDir::isRelativePath(flat_file) && flat_file.find(Option::dir_sep) != -1) { TQString last_grp("QMAKE_PBX_HEIR_GROUP"); TQStringList dirs = TQStringList::split(Option::dir_sep, flat_file); @@ -165,7 +165,7 @@ ProjectBuilderMakefileGenerator::writeSubdirs(TQTextStream &t, bool direct) last_grp = new_grp; } groups[last_grp] += project_key; - in_root = FALSE; + in_root = false; } } if(in_root) @@ -328,7 +328,7 @@ nextfile: << "\t" << "rootObject = " << keyFor("QMAKE_PBX_ROOT") << ";" << "\n" << "}" << endl; - return TRUE; + return true; } bool @@ -336,7 +336,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t) { int i; TQStringList tmp; - bool did_preprocess = FALSE; + bool did_preprocess = false; //HEADER const int pbVersion = pbuilderVersion(); @@ -411,14 +411,14 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t) for(TQStringList::Iterator it = tmp.begin(); it != tmp.end(); ++it) { TQStringList files = (*it); - bool buildable = TRUE; + bool buildable = true; if(srcs[i] == "FORMS") { TQString form_dot_h = (*it) + Option::h_ext.first(); if(TQFile::exists(form_dot_h)) files += form_dot_h; - buildable = FALSE; + buildable = false; } else if(srcs[i] == "HEADERS" || srcs[i] == "QMAKE_INTERNAL_INCLUDED_FILES") { - buildable = FALSE; + buildable = false; } files = fileFixify(files); @@ -428,16 +428,16 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t) file = file.mid(1, file.length()-2); if(file.endsWith(Option::cpp_moc_ext) || file.endsWith(Option::prl_ext)) continue; - bool in_root = TRUE; + bool in_root = true; TQString src_key = keyFor(file), name = file; if(project->isActiveConfig("flat")) { - TQString flat_file = fileFixify(file, TQDir::currentDirPath(), Option::output_dir, TRUE); + TQString flat_file = fileFixify(file, TQDir::currentDirPath(), Option::output_dir, true); if(flat_file.find(Option::dir_sep) != -1) { TQStringList dirs = TQStringList::split(Option::dir_sep, flat_file); name = dirs.back(); } } else { - TQString flat_file = fileFixify(file, TQDir::currentDirPath(), Option::output_dir, TRUE); + TQString flat_file = fileFixify(file, TQDir::currentDirPath(), Option::output_dir, true); if(TQDir::isRelativePath(flat_file) && flat_file.find(Option::dir_sep) != -1) { TQString last_grp("QMAKE_PBX_" + src_group + "_HEIR_GROUP"); TQStringList dirs = TQStringList::split(Option::dir_sep, flat_file); @@ -455,7 +455,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t) last_grp = new_grp; } groups[last_grp] += src_key; - in_root = FALSE; + in_root = false; } } if(in_root) @@ -540,7 +540,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t) TQString mkfile = pbx_dir + Option::dir_sep + "qt_preprocess.mak"; TQFile mkf(mkfile); if(mkf.open(IO_WriteOnly | IO_Translate)) { - did_preprocess = TRUE; + did_preprocess = true; debug_msg(1, "pbuilder: Creating file: %s", mkfile.latin1()); TQTextStream mkt(&mkf); writeHeader(mkt); @@ -560,7 +560,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t) TQStringList &yaccs = project->variables()["YACCSOURCES"]; for(TQStringList::Iterator yit = yaccs.begin(); yit != yaccs.end(); ++yit) { TQFileInfo fi((*yit)); - mkt << " " << fi.dirPath() << Option::dir_sep << fi.baseName(TRUE) + mkt << " " << fi.dirPath() << Option::dir_sep << fi.baseName(true) << Option::yacc_mod << Option::cpp_ext.first(); } } @@ -568,7 +568,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t) TQStringList &lexs = project->variables()["LEXSOURCES"]; for(TQStringList::Iterator lit = lexs.begin(); lit != lexs.end(); ++lit) { TQFileInfo fi((*lit)); - mkt << " " << fi.dirPath() << Option::dir_sep << fi.baseName(TRUE) + mkt << " " << fi.dirPath() << Option::dir_sep << fi.baseName(true) << Option::lex_mod << Option::cpp_ext.first(); } } @@ -637,7 +637,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t) for(i = 0; !libs[i].isNull(); i++) { tmp = project->variables()[libs[i]]; for(TQStringList::Iterator it = tmp.begin(); it != tmp.end();) { - bool remove = FALSE; + bool remove = false; TQString library, name, opt = (*it).stripWhiteSpace(); if(opt.length() >= 2 && (opt[0] == '"' || opt[0] == '\'') && opt[(int) opt.length()-1] == opt[0]) opt = opt.mid(1, opt.length()-2); @@ -647,7 +647,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t) libdirs.append(r); } else if(opt == "-prebind") { project->variables()["QMAKE_DO_PREBINDING"].append("TRUE"); - remove = TRUE; + remove = true; } else if(opt.startsWith("-l")) { name = opt.right(opt.length() - 2); TQString lib("lib" + name); @@ -668,7 +668,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t) library = (*lit) + Option::dir_sep + libinfo.first("QMAKE_PRL_TARGET"); debug_msg(1, "pbuilder: Found library (%s) via PRL %s (%s)", opt.latin1(), lib_file.latin1(), library.latin1()); - remove = TRUE; + remove = true; } } } @@ -681,7 +681,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t) library = tmp; debug_msg(1, "pbuilder: Found library (%s) via %s", opt.latin1(), library.latin1()); - remove = TRUE; + remove = true; } } } @@ -697,14 +697,14 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t) if(TQFile::exists((*fit) + TQDir::separator() + (*it) + ".framework")) { --it; it = tmp.remove(it); - remove = TRUE; + remove = true; library = (*fit) + Option::dir_sep + (*it) + ".framework"; break; } } } else if(opt.left(1) != "-") { if(TQFile::exists(opt)) { - remove = TRUE; + remove = true; library = opt; } } @@ -1248,7 +1248,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t) << pbx_dir << Option::dir_sep << "qt_preprocess.mak $@" << endl; } } - return TRUE; + return true; } TQString |
