summaryrefslogtreecommitdiffstats
path: root/experimental/tqtinterface/qt4/qmake/generators/mac/pbuilder_pbx.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'experimental/tqtinterface/qt4/qmake/generators/mac/pbuilder_pbx.cpp')
-rw-r--r--experimental/tqtinterface/qt4/qmake/generators/mac/pbuilder_pbx.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/experimental/tqtinterface/qt4/qmake/generators/mac/pbuilder_pbx.cpp b/experimental/tqtinterface/qt4/qmake/generators/mac/pbuilder_pbx.cpp
index 7e072e232..ce1167f8a 100644
--- a/experimental/tqtinterface/qt4/qmake/generators/mac/pbuilder_pbx.cpp
+++ b/experimental/tqtinterface/qt4/qmake/generators/mac/pbuilder_pbx.cpp
@@ -143,23 +143,23 @@ ProjectBuilderMakefileGenerator::writeSubdirs(TQTextStream &t, bool direct)
TQString project_key = keyFor(pbxproj + "_PROJECTREF");
if(project->isActiveConfig("flat")) {
TQString flat_file = fileFixify(name, oldpwd, Option::output_dir, TRUE);
- if(flat_file.tqfind(Option::dir_sep) != -1) {
+ 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);
- if(TQDir::isRelativePath(flat_file) && flat_file.tqfind(Option::dir_sep) != -1) {
+ if(TQDir::isRelativePath(flat_file) && flat_file.find(Option::dir_sep) != -1) {
TQString last_grp("TQMAKE_PBX_HEIR_GROUP");
TQStringList dirs = TQStringList::split(Option::dir_sep, flat_file);
name = dirs.back();
for(TQStringList::Iterator dir_it = dirs.begin(); dir_it != dirs.end(); ++dir_it) {
TQString new_grp(last_grp + Option::dir_sep + (*dir_it)), new_grp_key(keyFor(new_grp));
if(dir_it == dirs.begin()) {
- if(!groups.tqcontains(new_grp))
+ if(!groups.contains(new_grp))
project->variables()["TQMAKE_PBX_GROUPS"].append(new_grp_key);
} else {
- if(!groups[last_grp].tqcontains(new_grp_key))
+ if(!groups[last_grp].contains(new_grp_key))
groups[last_grp] += new_grp_key;
}
last_grp = new_grp;
@@ -432,13 +432,13 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t)
TQString src_key = keyFor(file), name = file;
if(project->isActiveConfig("flat")) {
TQString flat_file = fileFixify(file, TQDir::currentDirPath(), Option::output_dir, TRUE);
- if(flat_file.tqfind(Option::dir_sep) != -1) {
+ 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);
- if(TQDir::isRelativePath(flat_file) && flat_file.tqfind(Option::dir_sep) != -1) {
+ if(TQDir::isRelativePath(flat_file) && flat_file.find(Option::dir_sep) != -1) {
TQString last_grp("TQMAKE_PBX_" + src_group + "_HEIR_GROUP");
TQStringList dirs = TQStringList::split(Option::dir_sep, flat_file);
name = dirs.back();
@@ -446,10 +446,10 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t)
for(TQStringList::Iterator dir_it = dirs.begin(); dir_it != dirs.end(); ++dir_it) {
TQString new_grp(last_grp + Option::dir_sep + (*dir_it)), new_grp_key(keyFor(new_grp));
if(dir_it == dirs.begin()) {
- if(!src_list.tqcontains(new_grp_key))
+ if(!src_list.contains(new_grp_key))
src_list.append(new_grp_key);
} else {
- if(!groups[last_grp].tqcontains(new_grp_key))
+ if(!groups[last_grp].contains(new_grp_key))
groups[last_grp] += new_grp_key;
}
last_grp = new_grp;
@@ -513,12 +513,12 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t)
}
TQString src_group_key = keyFor(src_group);
- if(root_group_list.tqfindIndex(src_group_key) == -1)
+ if(root_group_list.findIndex(src_group_key) == -1)
root_group_list += src_group_key;
TQStringList &group = groups[src_group];
for(TQStringList::Iterator src_it = src_list.begin(); src_it != src_list.end(); ++src_it) {
- if(group.tqfindIndex((*src_it)) == -1)
+ if(group.findIndex((*src_it)) == -1)
group += (*src_it);
}
}
@@ -710,7 +710,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t)
}
if(!library.isEmpty()) {
if(name.isEmpty()) {
- int slsh = library.tqfindRev(Option::dir_sep);
+ int slsh = library.findRev(Option::dir_sep);
if(slsh != -1)
name = library.right(library.length() - slsh - 1);
}
@@ -923,7 +923,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t)
else
lib = project->first("TARGET_");
}
- int slsh = lib.tqfindRev(Option::dir_sep);
+ int slsh = lib.findRev(Option::dir_sep);
if(slsh != -1)
lib = lib.right(lib.length() - slsh - 1);
t << "\t\t\t" << "isa = PBXLibraryReference;" << "\n"
@@ -994,8 +994,8 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t)
if(plist_in_file.open(IO_ReadOnly)) {
TQTextStream plist_in(&plist_in_file);
TQString plist_in_text = plist_in.read();
- plist_in_text = plist_in_text.tqreplace("@ICON@", (project->isEmpty("RC_FILE") ? TQString("") : project->first("RC_FILE").section(Option::dir_sep, -1)));
- plist_in_text = plist_in_text.tqreplace("@EXECUTABLE@", project->first("TQMAKE_ORIG_TARGET"));
+ plist_in_text = plist_in_text.replace("@ICON@", (project->isEmpty("RC_FILE") ? TQString("") : project->first("RC_FILE").section(Option::dir_sep, -1)));
+ plist_in_text = plist_in_text.replace("@EXECUTABLE@", project->first("TQMAKE_ORIG_TARGET"));
TQFile plist_out_file("Info.plist");
if(plist_out_file.open(IO_WriteOnly | IO_Translate)) {
TQTextStream plist_out(&plist_out_file);
@@ -1094,7 +1094,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t)
read_plist = true;
TQTextStream stream(&plist);
while(!stream.eof())
- t << stream.readLine().tqreplace('"', "\\\"") << endl;
+ t << stream.readLine().replace('"', "\\\"") << endl;
}
}
if(!read_plist) {
@@ -1255,7 +1255,7 @@ TQString
ProjectBuilderMakefileGenerator::fixQuotes(const TQString &val)
{
TQString ret(val);
- ret = ret.tqreplace(TQRegExp("('|\\\\|\")"), "\\\\1");
+ ret = ret.replace(TQRegExp("('|\\\\|\")"), "\\\\1");
return ret;
}
@@ -1264,7 +1264,7 @@ ProjectBuilderMakefileGenerator::fixEnvs(const TQString &file)
{
TQRegExp reg_var("\\$\\((.*)\\)");
for(int rep = 0; (rep = reg_var.search(file, rep)) != -1; ) {
- if(project->variables()["TQMAKE_PBX_VARS"].tqfindIndex(reg_var.cap(1)) == -1)
+ if(project->variables()["TQMAKE_PBX_VARS"].findIndex(reg_var.cap(1)) == -1)
project->variables()["TQMAKE_PBX_VARS"].append(reg_var.cap(1));
rep += reg_var.matchedLength();
}
@@ -1293,7 +1293,7 @@ ProjectBuilderMakefileGenerator::keyFor(const TQString &block)
return block;
#endif
TQString ret;
- if(!keys.tqcontains(block)) {
+ if(!keys.contains(block)) {
ret = TQT_TQSTRING(qtMD5(block.utf8()).left(24)).upper();
keys.insert(block, ret);
} else {
@@ -1346,7 +1346,7 @@ ProjectBuilderMakefileGenerator::pbuilderVersion() const
else
version_plist = "/Developer/Applications/Project Builder.app/Contents/version.plist";
} else {
- version_plist = version_plist.tqreplace(TQRegExp("\""), "");
+ version_plist = version_plist.replace(TQRegExp("\""), "");
}
TQFile version_file(version_plist);
if (version_file.open(IO_ReadOnly)) {
@@ -1371,7 +1371,7 @@ ProjectBuilderMakefileGenerator::pbuilderVersion() const
}
version_file.close();
} else { debug_msg(1, "pbuilder: version.plist: Failure to open %s", version_plist.latin1()); }
- if(version.isEmpty() && version_plist.tqcontains("Xcode")) {
+ if(version.isEmpty() && version_plist.contains("Xcode")) {
ret = "39";
} else {
if(version.startsWith("2."))