summaryrefslogtreecommitdiffstats
path: root/tqtinterface/qt4/qmake/generators/unix
diff options
context:
space:
mode:
Diffstat (limited to 'tqtinterface/qt4/qmake/generators/unix')
-rw-r--r--tqtinterface/qt4/qmake/generators/unix/unixmake.cpp70
-rw-r--r--tqtinterface/qt4/qmake/generators/unix/unixmake.h6
-rw-r--r--tqtinterface/qt4/qmake/generators/unix/unixmake2.cpp84
3 files changed, 80 insertions, 80 deletions
diff --git a/tqtinterface/qt4/qmake/generators/unix/unixmake.cpp b/tqtinterface/qt4/qmake/generators/unix/unixmake.cpp
index 4bee06b..82d7ef6 100644
--- a/tqtinterface/qt4/qmake/generators/unix/unixmake.cpp
+++ b/tqtinterface/qt4/qmake/generators/unix/unixmake.cpp
@@ -67,7 +67,7 @@ UnixMakefileGenerator::init()
project->variables()["MAKEFILE"].append("Makefile");
if(project->isEmpty("TQMAKE"))
project->variables()["TQMAKE"].append("qmake");
- if(project->variables()["TQMAKE_INTERNAL_TQMAKE_DEPS"].tqfindIndex("qmake_all") == -1)
+ if(project->variables()["TQMAKE_INTERNAL_TQMAKE_DEPS"].findIndex("qmake_all") == -1)
project->variables()["TQMAKE_INTERNAL_TQMAKE_DEPS"].append("qmake_all");
return; /* subdirs is done */
}
@@ -100,7 +100,7 @@ UnixMakefileGenerator::init()
//If the TARGET looks like a path split it into DESTDIR and the resulting TARGET
if(!project->isEmpty("TARGET")) {
TQString targ = project->first("TARGET");
- int slsh = TQMAX(targ.tqfindRev('/'), targ.tqfindRev(Option::dir_sep));
+ int slsh = TQMAX(targ.findRev('/'), targ.findRev(Option::dir_sep));
if(slsh != -1) {
if(project->isEmpty("DESTDIR"))
project->values("DESTDIR").append("");
@@ -122,7 +122,7 @@ UnixMakefileGenerator::init()
project->variables()["TQMAKE_LIBS"] += project->variables()["LIBS"];
if ( (!project->isEmpty("TQMAKE_LIB_FLAG") && !project->isActiveConfig("staticlib") ) ||
(project->isActiveConfig("qt") && project->isActiveConfig( "plugin" ) )) {
- if(configs.tqfindIndex("dll") == -1) configs.append("dll");
+ if(configs.findIndex("dll") == -1) configs.append("dll");
} else if ( !project->isEmpty("TQMAKE_APP_FLAG") || project->isActiveConfig("dll") ) {
configs.remove("staticlib");
}
@@ -157,9 +157,9 @@ UnixMakefileGenerator::init()
project->variables()["TQMAKE_LIBDIR_FLAGS"] += varGlue( "TQMAKE_LIBDIR", "-L", " -L", "" );
}
if ( project->isActiveConfig("qtopia") ) {
- if(configs.tqfindIndex("qtopialib") == -1)
+ if(configs.findIndex("qtopialib") == -1)
configs.append("qtopialib");
- if(configs.tqfindIndex("qtopiainc") == -1)
+ if(configs.findIndex("qtopiainc") == -1)
configs.append("qtopiainc");
}
if ( project->isActiveConfig("qtopiainc") )
@@ -174,7 +174,7 @@ UnixMakefileGenerator::init()
project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_ACCESSIBILITY_SUPPORT");
if ( project->isActiveConfig("tablet") )
project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_TABLET_SUPPORT");
- if(configs.tqfindIndex("tqmoc")) configs.append("tqmoc");
+ if(configs.findIndex("tqmoc")) configs.append("tqmoc");
project->variables()["INCLUDEPATH"] += project->variables()["TQMAKE_INCDIR_QT"];
if ( !project->isActiveConfig("debug") )
project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_NO_DEBUG");
@@ -205,15 +205,15 @@ UnixMakefileGenerator::init()
project->variables()["TQMAKE_LIBS"] += project->variables()["TQMAKE_LIBS_OPENGL"];
}
if ( extern_libs && (project->isActiveConfig("qt") || project->isActiveConfig("opengl")) ) {
- if(configs.tqfindIndex("x11lib") == -1)
+ if(configs.findIndex("x11lib") == -1)
configs.append("x11lib");
- if ( project->isActiveConfig("opengl") && configs.tqfindIndex("x11inc") == -1 )
+ if ( project->isActiveConfig("opengl") && configs.findIndex("x11inc") == -1 )
configs.append("x11inc");
}
if ( project->isActiveConfig("x11") ) {
- if(configs.tqfindIndex("x11lib") == -1)
+ if(configs.findIndex("x11lib") == -1)
configs.append("x11lib");
- if(configs.tqfindIndex("x11inc") == -1)
+ if(configs.findIndex("x11inc") == -1)
configs.append("x11inc");
}
if ( project->isActiveConfig("x11inc") )
@@ -387,11 +387,11 @@ UnixMakefileGenerator::combineSetLFlags(const TQStringList &list1, const TQStrin
for(TQStringList::ConstIterator it = lst->begin(); it != lst->end(); ++it) {
if((*it).startsWith("-")) {
if((*it).startsWith("-L")) {
- if(ret.tqfindIndex((*it)) == -1)
+ if(ret.findIndex((*it)) == -1)
ret.append((*it));
} else if((*it).startsWith("-l")) {
while(1) {
- TQStringList::Iterator idx = ret.tqfind((*it));
+ TQStringList::Iterator idx = ret.find((*it));
if(idx == ret.end())
break;
ret.remove(idx);
@@ -439,7 +439,7 @@ UnixMakefileGenerator::combineSetLFlags(const TQStringList &list1, const TQStrin
} else {
#if 1
while(1) {
- TQStringList::Iterator idx = ret.tqfind((*it));
+ TQStringList::Iterator idx = ret.find((*it));
if(idx == ret.end())
break;
ret.remove(idx);
@@ -449,7 +449,7 @@ UnixMakefileGenerator::combineSetLFlags(const TQStringList &list1, const TQStrin
}
} else /*if(TQFile::exists((*it)))*/ {
while(1) {
- TQStringList::Iterator idx = ret.tqfind((*it));
+ TQStringList::Iterator idx = ret.find((*it));
if(idx == ret.end())
break;
ret.remove(idx);
@@ -472,7 +472,7 @@ UnixMakefileGenerator::processPrlVariable(const TQString &var, const TQStringLis
}
TQString
-UnixMakefileGenerator::tqfindDependency(const TQString &dep)
+UnixMakefileGenerator::findDependency(const TQString &dep)
{
TQStringList::Iterator it;
{
@@ -498,21 +498,21 @@ UnixMakefileGenerator::tqfindDependency(const TQString &dep)
for(TQStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
TQString out = tmp_out;
TQFileInfo fi(Option::fixPathToLocalOS((*input)));
- out.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName());
- out.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath());
+ out.replace("${TQMAKE_FILE_BASE}", fi.baseName());
+ out.replace("${TQMAKE_FILE_NAME}", fi.filePath());
if(out.endsWith(dep))
return out;
}
}
}
}
- return MakefileGenerator::tqfindDependency(dep);
+ return MakefileGenerator::findDependency(dep);
}
TQStringList
-&UnixMakefileGenerator::tqfindDependencies(const TQString &file)
+&UnixMakefileGenerator::findDependencies(const TQString &file)
{
- TQStringList &ret = MakefileGenerator::tqfindDependencies(file);
+ TQStringList &ret = MakefileGenerator::findDependencies(file);
// Note: The TQMAKE_IMAGE_COLLECTION file have all images
// as dependency, so don't add precompiled header then
if(doPrecompiledHeaders() && !project->isEmpty("PRECOMPILED_HEADER")
@@ -521,13 +521,13 @@ TQStringList
header_prefix += project->first("TQMAKE_PRECOMP_PREFIX");
if(file.endsWith(".c")) {
TQString precomp_h = header_prefix + "c";
- if(!ret.tqcontains(precomp_h))
+ if(!ret.contains(precomp_h))
ret += precomp_h;
} else {
for(TQStringList::Iterator it = Option::cpp_ext.begin(); it != Option::cpp_ext.end(); ++it) {
if(file.endsWith(*it)) {
TQString precomp_h = header_prefix + "c++";
- if(!ret.tqcontains(precomp_h))
+ if(!ret.contains(precomp_h))
ret += precomp_h;
break;
}
@@ -538,7 +538,7 @@ TQStringList
}
bool
-UnixMakefileGenerator::tqfindLibraries()
+UnixMakefileGenerator::findLibraries()
{
TQPtrList<MakefileDependDir> libdirs;
libdirs.setAutoDelete(TRUE);
@@ -551,8 +551,8 @@ UnixMakefileGenerator::tqfindLibraries()
if(opt.startsWith("-L")) {
TQString r = opt.right(opt.length() - 2), l = r;
fixEnvVariables(l);
- libdirs.append(new MakefileDependDir(r.tqreplace("\"",""),
- l.tqreplace("\"","")));
+ libdirs.append(new MakefileDependDir(r.replace("\"",""),
+ l.replace("\"","")));
} else if(opt.startsWith("-l")) {
stub = opt.mid(2);
} else if(project->isActiveConfig("macx") && opt.startsWith("-framework")) {
@@ -569,7 +569,7 @@ UnixMakefileGenerator::tqfindLibraries()
} else {
extn = dir = "";
stub = opt;
- int slsh = opt.tqfindRev(Option::dir_sep);
+ int slsh = opt.findRev(Option::dir_sep);
if(slsh != -1) {
dir = opt.left(slsh);
stub = opt.mid(slsh+1);
@@ -657,8 +657,8 @@ UnixMakefileGenerator::processPrlFiles()
if(opt.startsWith("-L")) {
TQString r = opt.right(opt.length() - 2), l = r;
fixEnvVariables(l);
- libdirs.append(new MakefileDependDir(r.tqreplace("\"",""),
- l.tqreplace("\"","")));
+ libdirs.append(new MakefileDependDir(r.replace("\"",""),
+ l.replace("\"","")));
} else if(opt.startsWith("-l") && !processed[opt]) {
TQString lib = opt.right(opt.length() - 2);
for(MakefileDependDir *mdd = libdirs.first(); mdd; mdd = libdirs.next() ) {
@@ -674,7 +674,7 @@ UnixMakefileGenerator::processPrlFiles()
TQString prl = mdd->local_dir + Option::dir_sep + "lib" + lib;
if(processPrlFile(prl)) {
if(prl.startsWith(mdd->local_dir))
- prl.tqreplace(0, mdd->local_dir.length(), mdd->real_dir);
+ prl.replace(0, mdd->local_dir.length(), mdd->real_dir);
opt = linkLib(prl, lib);
processed.insert(opt, (void*)1);
ret = TRUE;
@@ -750,7 +750,7 @@ UnixMakefileGenerator::defaultInstall(const TQString &t)
if(project->isActiveConfig("create_prl") && !project->isActiveConfig("no_install_prl") &&
!project->isEmpty("TQMAKE_INTERNAL_PRL_FILE")) {
TQString dst_prl = project->first("TQMAKE_INTERNAL_PRL_FILE");
- int slsh = dst_prl.tqfindRev('/');
+ int slsh = dst_prl.findRev('/');
if(slsh != -1)
dst_prl = dst_prl.right(dst_prl.length() - slsh - 1);
dst_prl = root + targetdir + dst_prl;
@@ -761,10 +761,10 @@ UnixMakefileGenerator::defaultInstall(const TQString &t)
}
if(project->isActiveConfig("create_libtool") && !project->isActiveConfig("compile_libtool")) {
TQString src_lt = var("TQMAKE_ORIG_TARGET");
- int slsh = src_lt.tqfindRev(Option::dir_sep);
+ int slsh = src_lt.findRev(Option::dir_sep);
if(slsh != -1)
src_lt = src_lt.right(src_lt.length() - slsh);
- int dot = src_lt.tqfind('.');
+ int dot = src_lt.find('.');
if(dot != -1)
src_lt = src_lt.left(dot);
src_lt += Option::libtool_ext;
@@ -784,10 +784,10 @@ UnixMakefileGenerator::defaultInstall(const TQString &t)
}
if(project->isActiveConfig("create_pc")) {
TQString src_pc = var("TQMAKE_ORIG_TARGET");
- int slsh = src_pc.tqfindRev(Option::dir_sep);
+ int slsh = src_pc.findRev(Option::dir_sep);
if(slsh != -1)
src_pc = src_pc.right(src_pc.length() - slsh);
- int dot = src_pc.tqfind('.');
+ int dot = src_pc.find('.');
if(dot != -1)
src_pc = src_pc.left(dot);
src_pc += ".pc";
@@ -885,7 +885,7 @@ UnixMakefileGenerator::defaultInstall(const TQString &t)
} else if(Option::target_mode == Option::TARG_UNIX_MODE ||
Option::target_mode == Option::TARG_MACX_MODE) {
TQString link = Option::fixPathToTargetOS(destdir + (*it), FALSE);
- int lslash = link.tqfindRev(Option::dir_sep);
+ int lslash = link.findRev(Option::dir_sep);
if(lslash != -1)
link = link.right(link.length() - (lslash + 1));
TQString dst_link = root + targetdir + link;
diff --git a/tqtinterface/qt4/qmake/generators/unix/unixmake.h b/tqtinterface/qt4/qmake/generators/unix/unixmake.h
index 3b83317..a3a76de 100644
--- a/tqtinterface/qt4/qmake/generators/unix/unixmake.h
+++ b/tqtinterface/qt4/qmake/generators/unix/unixmake.h
@@ -70,9 +70,9 @@ protected:
virtual void processPrlVariable(const TQString &, const TQStringList &);
virtual void processPrlFiles();
- virtual bool tqfindLibraries();
- virtual TQString tqfindDependency(const TQString &);
- virtual TQStringList &tqfindDependencies(const TQString &);
+ virtual bool findLibraries();
+ virtual TQString findDependency(const TQString &);
+ virtual TQStringList &findDependencies(const TQString &);
virtual void init();
void writeMakeParts(TQTextStream &);
diff --git a/tqtinterface/qt4/qmake/generators/unix/unixmake2.cpp b/tqtinterface/qt4/qmake/generators/unix/unixmake2.cpp
index dc56d1e..b4a8a8b 100644
--- a/tqtinterface/qt4/qmake/generators/unix/unixmake2.cpp
+++ b/tqtinterface/qt4/qmake/generators/unix/unixmake2.cpp
@@ -221,7 +221,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
for(TQStringList::Iterator objit = objs.begin(); objit != objs.end(); ++objit) {
bool increment = FALSE;
for(TQStringList::Iterator incrit = incrs.begin(); incrit != incrs.end(); ++incrit) {
- if((*objit).tqfind(TQRegExp((*incrit), TRUE, TRUE)) != -1) {
+ if((*objit).find(TQRegExp((*incrit), TRUE, TRUE)) != -1) {
increment = TRUE;
incrs_out.append((*objit));
break;
@@ -254,7 +254,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
for(TQStringList::Iterator objit = objs.begin(); objit != objs.end(); ++objit) {
bool increment = FALSE;
for(TQStringList::Iterator incrit = incrs.begin(); incrit != incrs.end(); ++incrit) {
- if((*objit).tqfind(TQRegExp((*incrit), TRUE, TRUE)) != -1) {
+ if((*objit).find(TQRegExp((*incrit), TRUE, TRUE)) != -1) {
increment = TRUE;
incrs_out.append((*objit));
break;
@@ -371,7 +371,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
}
if(!d_file.isEmpty()) {
d_file = odir + ".deps/" + d_file + ".d";
- TQStringList deps = tqfindDependencies((*it)).grep(TQRegExp(Option::cpp_tqmoc_ext + "$"));
+ TQStringList deps = findDependencies((*it)).grep(TQRegExp(Option::cpp_tqmoc_ext + "$"));
if(!deps.isEmpty())
t << d_file << ": " << deps.join(" ") << endl;
t << var("TQMAKE_CFLAGS_USE_PRECOMPILE") << " " << d_file << endl;
@@ -399,7 +399,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
TQMakeMetaInfo libinfo;
if(libinfo.readLib((*it)) && !libinfo.isEmpty("TQMAKE_PRL_BUILD_DIR")) {
TQString dir;
- int slsh = (*it).tqfindRev(Option::dir_sep);
+ int slsh = (*it).findRev(Option::dir_sep);
if(slsh != -1)
dir = (*it).left(slsh + 1);
TQString targ = dir + libinfo.first("TQMAKE_PRL_TARGET");
@@ -416,9 +416,9 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
if(do_incremental) {
//incremental target
TQString incr_target = var("TARGET") + "_incremental";
- if(incr_target.tqfind(Option::dir_sep) != -1)
+ if(incr_target.find(Option::dir_sep) != -1)
incr_target = incr_target.right(incr_target.length() -
- (incr_target.tqfindRev(Option::dir_sep) + 1));
+ (incr_target.findRev(Option::dir_sep) + 1));
TQString incr_deps, incr_objs;
if(project->first("TQMAKE_INCREMENTAL_STYLE") == "ld") {
TQString incr_target_dir = var("OBJECTS_DIR") + incr_target + Option::obj_ext;
@@ -494,11 +494,11 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
TQString destdir = project->first("DESTDIR"), incr_deps;
if(do_incremental) {
TQString s_ext = project->variables()["TQMAKE_EXTENSION_SHLIB"].first();
- TQString incr_target = TQT_TQSTRING(var("TQMAKE_ORIG_TARGET").tqreplace(
- TQRegExp("\\." + s_ext), "")).tqreplace(TQRegExp("^lib"), "") + "_incremental";
- if(incr_target.tqfind(Option::dir_sep) != -1)
+ TQString incr_target = TQT_TQSTRING(var("TQMAKE_ORIG_TARGET").replace(
+ TQRegExp("\\." + s_ext), "")).replace(TQRegExp("^lib"), "") + "_incremental";
+ if(incr_target.find(Option::dir_sep) != -1)
incr_target = incr_target.right(incr_target.length() -
- (incr_target.tqfindRev(Option::dir_sep) + 1));
+ (incr_target.findRev(Option::dir_sep) + 1));
if(project->first("TQMAKE_INCREMENTAL_STYLE") == "ld") {
TQString incr_target_dir = var("OBJECTS_DIR") + incr_target + Option::obj_ext;
@@ -508,7 +508,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
<< "ld -r -o " << incr_target_dir << " " << link_deps << endl;
//communicated below
TQStringList &cmd = project->variables()["TQMAKE_LINK_SHLIB_CMD"];
- cmd.first().tqreplace("$(OBJECTS) $(OBJTQMOC)",
+ cmd.first().replace("$(OBJECTS) $(OBJTQMOC)",
"$(INCREMENTAL_OBJECTS) $(INCREMENTAL_OBJTQMOC)"); //ick
cmd.append(incr_target_dir);
deps.prepend(incr_target_dir + " ");
@@ -651,7 +651,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
t << var("DESTDIR") << "$(TARGET): " << var("PRE_TARGETDEPS")
<< " $(UICDECLS) " << var("POST_TARGETDEPS") << valList(build) << "\n\t";
ar = project->variables()["TQMAKE_AR_CMD"].first();
- ar = TQT_TQSTRING(ar.tqreplace("$(OBJTQMOC)", "")).tqreplace("$(OBJECTS)",
+ ar = TQT_TQSTRING(ar.replace("$(OBJTQMOC)", "")).replace("$(OBJECTS)",
build.join(" "));
} else {
t << (*libit) << ": " << valList(build) << "\n\t";
@@ -906,7 +906,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
outfile += header_prefix + "c++";
compiler = "$(CXX) ";
}
- t << outfile << ": " << precomph << " " << tqfindDependencies(precomph).join(" \\\n\t\t")
+ t << outfile << ": " << precomph << " " << findDependencies(precomph).join(" \\\n\t\t")
<< "\n\t" << "test -d " << outdir << " || mkdir -p " << outdir
<< "\n\t" << compiler << flags << " $(INCPATH) " << precomph << " -o " << outfile << endl << endl;
}
@@ -940,7 +940,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
dep = (*dep_it);
deps += " " + dep;
}
- if(project->variables()[(*it) + ".CONFIG"].tqfindIndex("phony") != -1)
+ if(project->variables()[(*it) + ".CONFIG"].findIndex("phony") != -1)
deps += TQString(" ") + "FORCE";
t << targ << ":" << deps << "\n\t"
<< cmd << endl << endl;
@@ -961,17 +961,17 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
TQFileInfo fi(Option::fixPathToLocalOS((*input)));
TQString in = Option::fixPathToTargetOS((*input), FALSE),
out = tmp_out, cmd = tmp_cmd, deps;
- out.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName());
- out.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath());
- cmd.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName());
- cmd.tqreplace("${TQMAKE_FILE_OUT}", out);
- cmd.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath());
+ out.replace("${TQMAKE_FILE_BASE}", fi.baseName());
+ out.replace("${TQMAKE_FILE_NAME}", fi.filePath());
+ cmd.replace("${TQMAKE_FILE_BASE}", fi.baseName());
+ cmd.replace("${TQMAKE_FILE_OUT}", out);
+ cmd.replace("${TQMAKE_FILE_NAME}", fi.filePath());
for(TQStringList::Iterator it3 = vars.begin(); it3 != vars.end(); ++it3)
- cmd.tqreplace("$(" + (*it3) + ")", "$(TQMAKE_COMP_" + (*it3)+")");
+ cmd.replace("$(" + (*it3) + ")", "$(TQMAKE_COMP_" + (*it3)+")");
if(!tmp_dep.isEmpty()) {
char buff[256];
TQString dep_cmd = tmp_dep;
- dep_cmd.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath());
+ dep_cmd.replace("${TQMAKE_FILE_NAME}", fi.filePath());
if(FILE *proc = TQT_POPEN(dep_cmd.latin1(), "r")) {
while(!feof(proc)) {
int read_in = int(fread(buff, 1, 255, proc));
@@ -1020,7 +1020,7 @@ UnixMakefileGenerator::writeSubdirs(TQTextStream &t, bool direct)
subdirs.append(sd);
sd->makefile = "$(MAKEFILE)";
if((*it).right(4) == ".pro") {
- int slsh = file.tqfindRev(Option::dir_sep);
+ int slsh = file.findRev(Option::dir_sep);
if(slsh != -1) {
sd->directory = file.left(slsh+1);
sd->profile = file.mid(slsh+1);
@@ -1036,22 +1036,22 @@ UnixMakefileGenerator::writeSubdirs(TQTextStream &t, bool direct)
sd->directory = sd->directory.left(sd->directory.length() - 1);
if(!sd->profile.isEmpty()) {
TQString basename = sd->directory;
- int new_slsh = basename.tqfindRev(Option::dir_sep);
+ int new_slsh = basename.findRev(Option::dir_sep);
if(new_slsh != -1)
basename = basename.mid(new_slsh+1);
if(sd->profile != basename + ".pro")
sd->makefile += "." + sd->profile.left(sd->profile.length() - 4); //no need for the .pro
}
sd->target = "sub-" + (*it);
- sd->target.tqreplace('/', '-');
- sd->target.tqreplace('.', '_');
+ sd->target.replace('/', '-');
+ sd->target.replace('.', '_');
}
}
TQPtrListIterator<SubDir> it(subdirs);
TQString ofile = Option::output.name();
- if(ofile.tqfindRev(Option::dir_sep) != -1)
- ofile = ofile.right(ofile.length() - ofile.tqfindRev(Option::dir_sep) -1);
+ if(ofile.findRev(Option::dir_sep) != -1)
+ ofile = ofile.right(ofile.length() - ofile.findRev(Option::dir_sep) -1);
t << "MAKEFILE = " << var("MAKEFILE") << endl;
t << "TQMAKE = " << var("TQMAKE") << endl;
t << "DEL_FILE = " << var("TQMAKE_DEL_FILE") << endl;
@@ -1173,7 +1173,7 @@ UnixMakefileGenerator::writeSubdirs(TQTextStream &t, bool direct)
dep = (*dep_it);
deps += " " + dep;
}
- if(project->variables()[(*qut_it) + ".CONFIG"].tqfindIndex("phony") != -1)
+ if(project->variables()[(*qut_it) + ".CONFIG"].findIndex("phony") != -1)
deps += TQString(" ") + "FORCE";
t << targ << ":" << deps << "\n";
if(!cmd.isEmpty())
@@ -1220,7 +1220,7 @@ void UnixMakefileGenerator::init2()
project->variables()["TARGET_la"] = TQT_TQSTRING(project->first("DESTDIR") + "lib" + project->first("TARGET") + Option::libtool_ext);
if ( !project->variables()["TQMAKE_AR_CMD"].isEmpty() )
- project->variables()["TQMAKE_AR_CMD"].first().tqreplace("(TARGET)","(TARGETA)");
+ project->variables()["TQMAKE_AR_CMD"].first().replace("(TARGET)","(TARGETA)");
else
project->variables()["TQMAKE_AR_CMD"].append("$(AR) $(TARGETA) $(OBJECTS) $(OBJTQMOC)");
if( project->isActiveConfig("compile_libtool") ) {
@@ -1396,9 +1396,9 @@ void UnixMakefileGenerator::init2()
TQFileInfo fi(Option::fixPathToLocalOS((*input)));
TQString in = Option::fixPathToTargetOS((*input), FALSE),
out = tmp_out;
- out.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName());
- out.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath());
- if(project->variables()[(*it) + ".CONFIG"].tqfindIndex("no_link") == -1)
+ out.replace("${TQMAKE_FILE_BASE}", fi.baseName());
+ out.replace("${TQMAKE_FILE_NAME}", fi.filePath());
+ if(project->variables()[(*it) + ".CONFIG"].findIndex("no_link") == -1)
project->variables()["OBJCOMP"] += out;
}
}
@@ -1409,10 +1409,10 @@ TQString
UnixMakefileGenerator::libtoolFileName()
{
TQString ret = var("TARGET");
- int slsh = ret.tqfindRev(Option::dir_sep);
+ int slsh = ret.findRev(Option::dir_sep);
if(slsh != -1)
ret = ret.right(ret.length() - slsh);
- int dot = ret.tqfind('.');
+ int dot = ret.find('.');
if(dot != -1)
ret = ret.left(dot);
ret += Option::libtool_ext;
@@ -1425,7 +1425,7 @@ void
UnixMakefileGenerator::writeLibtoolFile()
{
TQString fname = libtoolFileName(), lname = fname;
- int slsh = lname.tqfindRev(Option::dir_sep);
+ int slsh = lname.findRev(Option::dir_sep);
if(slsh != -1)
lname = lname.right(lname.length() - slsh - 1);
TQFile ft(fname);
@@ -1494,12 +1494,12 @@ TQString
UnixMakefileGenerator::pkgConfigFileName()
{
TQString ret = var("TARGET");
- int slsh = ret.tqfindRev(Option::dir_sep);
+ int slsh = ret.findRev(Option::dir_sep);
if(slsh != -1)
ret = ret.right(ret.length() - slsh);
if(ret.startsWith("lib"))
ret = ret.mid(3);
- int dot = ret.tqfind('.');
+ int dot = ret.find('.');
if(dot != -1)
ret = ret.left(dot);
ret += Option::pkgcfg_ext;
@@ -1545,7 +1545,7 @@ UnixMakefileGenerator::pkgConfigFixPath(TQString path) const
{
TQString prefix = pkgConfigPrefix();
if(path.startsWith(prefix))
- path = path.tqreplace(prefix, "${prefix}");
+ path = path.replace(prefix, "${prefix}");
return path;
}
@@ -1553,7 +1553,7 @@ void
UnixMakefileGenerator::writePkgConfigFile() // ### does make sense only for libtqt so far
{
TQString fname = pkgConfigFileName(), lname = fname;
- int slsh = lname.tqfindRev(Option::dir_sep);
+ int slsh = lname.findRev(Option::dir_sep);
if(slsh != -1)
lname = lname.right(lname.length() - slsh - 1);
TQFile ft(fname);
@@ -1588,7 +1588,7 @@ UnixMakefileGenerator::writePkgConfigFile() // ### does make sense only for
TQString desc = project->first("TQMAKE_PKGCONFIG_DESCRIPTION");
if(desc.isEmpty()) {
desc = project->first("TARGET").lower();
- desc.tqreplace(0, 1, TQT_TQCHAR(desc[0]).upper());
+ desc.replace(0, 1, TQT_TQCHAR(desc[0]).upper());
if(project->first("TEMPLATE") == "lib") {
if(project->isActiveConfig("plugin"))
desc += " Plugin";
@@ -1632,7 +1632,7 @@ void
UnixMakefileGenerator::writeTMOCFile()
{
TQString fname = TMOCFileName(), lname = fname;
- int slsh = lname.tqfindRev(Option::dir_sep);
+ int slsh = lname.findRev(Option::dir_sep);
if(slsh != -1)
lname = lname.right(lname.length() - slsh - 1);
TQFile ft(fname);
@@ -1672,7 +1672,7 @@ void
UnixMakefileGenerator::writeTMOCFile2()
{
TQString fname = TMOCFileName2(), lname = fname;
- int slsh = lname.tqfindRev(Option::dir_sep);
+ int slsh = lname.findRev(Option::dir_sep);
if(slsh != -1)
lname = lname.right(lname.length() - slsh - 1);
TQFile ft(fname);
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-24 01:07:03 +0000