1 files changed, 35 insertions, 35 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;