diff options
Diffstat (limited to 'experimental/tqtinterface/qt4/qmake/generators/win32/borland_bmake.cpp')
| -rw-r--r-- | experimental/tqtinterface/qt4/qmake/generators/win32/borland_bmake.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/experimental/tqtinterface/qt4/qmake/generators/win32/borland_bmake.cpp b/experimental/tqtinterface/qt4/qmake/generators/win32/borland_bmake.cpp index 640afdd11..31ab8821a 100644 --- a/experimental/tqtinterface/qt4/qmake/generators/win32/borland_bmake.cpp +++ b/experimental/tqtinterface/qt4/qmake/generators/win32/borland_bmake.cpp @@ -97,8 +97,8 @@ BorlandMakefileGenerator::writeBorlandParts(TQTextStream &t) TQStringList &incs = project->variables()["INCLUDEPATH"]; for(TQStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) { TQString inc = (*incit); - inc.tqreplace(TQRegExp("\\\\*$"), ""); - inc.tqreplace("\"", ""); + inc.replace(TQRegExp("\\\\*$"), ""); + inc.replace("\"", ""); t << " -I\"" << inc << "\""; } t << " -I\"" << specdir() << "\"" @@ -296,7 +296,7 @@ BorlandMakefileGenerator::writeBorlandParts(TQTextStream &t) deps += " " + dep; } if(!project->variables()["TQMAKE_NOFORCE"].isEmpty() && - project->variables()[(*it) + ".CONFIG"].tqfindIndex("phony") != -1) + project->variables()[(*it) + ".CONFIG"].findIndex("phony") != -1) deps += TQString(" ") + "FORCE"; t << "\n\n" << targ << ":" << deps << "\n\t" << cmd; @@ -319,17 +319,17 @@ BorlandMakefileGenerator::writeBorlandParts(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)); @@ -391,11 +391,11 @@ BorlandMakefileGenerator::init() if (project->isActiveConfig("shared")) project->variables()["DEFINES"].append("TQT_DLL"); if (project->isActiveConfig("qt_dll")) - if(configs.tqfindIndex("qt") == -1) configs.append("qt"); + if(configs.findIndex("qt") == -1) configs.append("qt"); 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("qt") ) { @@ -403,9 +403,9 @@ BorlandMakefileGenerator::init() project->variables()["CONFIG"].append("dll"); project->variables()["DEFINES"].append("TQT_PLUGIN"); } - if ( (project->variables()["DEFINES"].tqfindIndex("TQT_NODLL") == -1) && - ((project->variables()["DEFINES"].tqfindIndex("TQT_MAKEDLL") != -1 || - project->variables()["DEFINES"].tqfindIndex("TQT_DLL") != -1) || + if ( (project->variables()["DEFINES"].findIndex("TQT_NODLL") == -1) && + ((project->variables()["DEFINES"].findIndex("TQT_MAKEDLL") != -1 || + project->variables()["DEFINES"].findIndex("TQT_DLL") != -1) || (getenv("TQT_DLL") && !getenv("TQT_NODLL"))) ) { project->variables()["TQMAKE_TQT_DLL"].append("1"); if ( is_qt && !project->variables()["TQMAKE_LIB_FLAG"].isEmpty() ) @@ -492,15 +492,15 @@ BorlandMakefileGenerator::init() else project->variables()["TQMAKE_LIBS"] += project->variables()["TQMAKE_LIBS_QT"]; if ( !project->variables()["TQMAKE_TQT_DLL"].isEmpty() ) { - int hver = tqfindHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt"); + int hver = findHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt"); if ( hver == -1 ) - hver = tqfindHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qtmt"); + hver = findHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qtmt"); if(hver != -1) { TQString ver; ver.sprintf("qt%s" TQTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "mt" : ""), hver); TQStringList &libs = project->variables()["TQMAKE_LIBS"]; for(TQStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) - (*libit).tqreplace(TQRegExp("qt(mt)?\\.lib"), ver); + (*libit).replace(TQRegExp("qt(mt)?\\.lib"), ver); } } if ( project->isActiveConfig( "activeqt" ) ) { @@ -618,7 +618,7 @@ BorlandMakefileGenerator::init() exit(666); } project->variables()["RES_FILE"] = project->variables()["RC_FILE"]; - project->variables()["RES_FILE"].first().tqreplace(".rc",".res"); + project->variables()["RES_FILE"].first().replace(".rc",".res"); project->variables()["POST_TARGETDEPS"] += project->variables()["RES_FILE"]; project->variables()["CLEAN_FILES"] += project->variables()["RES_FILE"]; } @@ -654,9 +654,9 @@ BorlandMakefileGenerator::init() 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; } } |