summaryrefslogtreecommitdiffstats
path: root/experimental/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'experimental/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.cpp')
-rw-r--r--experimental/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.cpp68
1 files changed, 34 insertions, 34 deletions
diff --git a/experimental/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.cpp b/experimental/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.cpp
index 6add6e73b..ef1254570 100644
--- a/experimental/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.cpp
+++ b/experimental/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.cpp
@@ -80,16 +80,16 @@ NmakeMakefileGenerator::writeMakefile(TQTextStream &t)
}
TQStringList
-&NmakeMakefileGenerator::tqfindDependencies(const TQString &file)
+&NmakeMakefileGenerator::findDependencies(const TQString &file)
{
- TQStringList &aList = MakefileGenerator::tqfindDependencies(file);
+ TQStringList &aList = MakefileGenerator::findDependencies(file);
// Note: The TQMAKE_IMAGE_COLLECTION file have all images
// as dependency, so don't add precompiled header then
if (file == project->first("TQMAKE_IMAGE_COLLECTION"))
return aList;
for(TQStringList::Iterator it = Option::cpp_ext.begin(); it != Option::cpp_ext.end(); ++it) {
if(file.endsWith(*it)) {
- if(!precompObj.isEmpty() && !aList.tqcontains(precompObj))
+ if(!precompObj.isEmpty() && !aList.contains(precompObj))
aList += precompObj;
break;
}
@@ -229,7 +229,7 @@ NmakeMakefileGenerator::writeNmakeParts(TQTextStream &t)
TQStringList &l = project->variables()[srcs[x]];
for(TQStringList::Iterator sit = l.begin(); sit != l.end(); ++sit) {
TQString sep = "\\";
- if((*sit).tqfind(sep) == -1)
+ if((*sit).find(sep) == -1)
sep = "/";
TQString dir = (*sit).section(sep, 0, -2);
if(!dir.isEmpty() && !source_directories[dir])
@@ -242,9 +242,9 @@ NmakeMakefileGenerator::writeNmakeParts(TQTextStream &t)
continue;
for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit)
t << "{" << it.currentKey() << "}" << (*cppit) << "{" << var("OBJECTS_DIR") << "}" << Option::obj_ext << "::\n\t"
- << var("TQMAKE_RUN_CXX_IMP_BATCH").tqreplace( TQRegExp( "\\$@" ), var("OBJECTS_DIR") ) << endl << "\t$<" << endl << "<<" << endl << endl;
+ << var("TQMAKE_RUN_CXX_IMP_BATCH").replace( TQRegExp( "\\$@" ), var("OBJECTS_DIR") ) << endl << "\t$<" << endl << "<<" << endl << endl;
t << "{" << it.currentKey() << "}" << ".c{" << var("OBJECTS_DIR") << "}" << Option::obj_ext << "::\n\t"
- << var("TQMAKE_RUN_CC_IMP_BATCH").tqreplace( TQRegExp( "\\$@" ), var("OBJECTS_DIR") ) << endl << "\t$<" << endl << "<<" << endl << endl;
+ << var("TQMAKE_RUN_CC_IMP_BATCH").replace( TQRegExp( "\\$@" ), var("OBJECTS_DIR") ) << endl << "\t$<" << endl << "<<" << endl << endl;
}
} else {
for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit)
@@ -357,7 +357,7 @@ NmakeMakefileGenerator::writeNmakeParts(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;
@@ -379,17 +379,17 @@ NmakeMakefileGenerator::writeNmakeParts(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));
@@ -423,7 +423,7 @@ NmakeMakefileGenerator::writeNmakeParts(TQTextStream &t)
// precompiled header
if(usePCH) {
TQString precompRule = TQString("-c -Yc -Fp%1 -Fo%2").arg(precompPch).arg(precompObj);
- t << precompObj << ": " << precompH << " " << tqfindDependencies(precompH).join(" \\\n\t\t")
+ t << precompObj << ": " << precompH << " " << findDependencies(precompH).join(" \\\n\t\t")
<< "\n\t" << ("$(CXX) " + precompRule + " $(CXXFLAGS) $(INCPATH) -TP ") << precompH << endl << endl;
}
}
@@ -441,7 +441,7 @@ NmakeMakefileGenerator::var(const TQString &value)
.arg(precompHInfo.fileName())
.arg(precompPch);
TQString p = MakefileGenerator::var(value);
- p.tqreplace("-c", precompRule);
+ p.replace("-c", precompRule);
// Cannot use -Gm with -FI & -Yu, as this gives an
// internal compiler error, on the newer compilers
p.remove("-Gm");
@@ -490,11 +490,11 @@ NmakeMakefileGenerator::init()
if (project->isActiveConfig("qt") && 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") ) {
@@ -503,9 +503,9 @@ NmakeMakefileGenerator::init()
if(project->isActiveConfig("qt"))
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() )
@@ -534,7 +534,7 @@ NmakeMakefileGenerator::init()
if ( project->isActiveConfig("debug") ) {
if ( project->isActiveConfig("thread") ) {
// use the DLL RT even here
- if ( project->variables()["DEFINES"].tqcontains("TQT_DLL") ) {
+ if ( project->variables()["DEFINES"].contains("TQT_DLL") ) {
project->variables()["TQMAKE_CFLAGS"] += project->variables()["TQMAKE_CFLAGS_MT_DLLDBG"];
project->variables()["TQMAKE_CXXFLAGS"] += project->variables()["TQMAKE_CXXFLAGS_MT_DLLDBG"];
} else {
@@ -547,7 +547,7 @@ NmakeMakefileGenerator::init()
project->variables()["TQMAKE_LFLAGS"] += project->variables()["TQMAKE_LFLAGS_DEBUG"];
} else {
if ( project->isActiveConfig("thread") ) {
- if ( project->variables()["DEFINES"].tqcontains("TQT_DLL") ) {
+ if ( project->variables()["DEFINES"].contains("TQT_DLL") ) {
project->variables()["TQMAKE_CFLAGS"] += project->variables()["TQMAKE_CFLAGS_MT_DLL"];
project->variables()["TQMAKE_CXXFLAGS"] += project->variables()["TQMAKE_CXXFLAGS_MT_DLL"];
} else {
@@ -559,7 +559,7 @@ NmakeMakefileGenerator::init()
project->variables()["TQMAKE_CXXFLAGS"] += project->variables()["TQMAKE_CXXFLAGS_RELEASE"];
project->variables()["TQMAKE_LFLAGS"] += project->variables()["TQMAKE_LFLAGS_RELEASE"];
}
- if ( project->isActiveConfig("thread") && !project->variables()["DEFINES"].tqcontains("TQT_DLL")
+ if ( project->isActiveConfig("thread") && !project->variables()["DEFINES"].contains("TQT_DLL")
&& !is_qt && project->first("TARGET") != "qtmain") {
project->variables()["TQMAKE_LFLAGS"].append("/NODEFAULTLIB:\"libc\"");
}
@@ -592,15 +592,15 @@ NmakeMakefileGenerator::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"), "qt-mt");
+ hver = findHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt-mt");
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" ) ) {
@@ -714,10 +714,10 @@ NmakeMakefileGenerator::init()
if ( !project->variables()["VERSION"].isEmpty() ) {
TQString version = project->variables()["VERSION"][0];
- int firstDot = version.tqfind( "." );
+ int firstDot = version.find( "." );
TQString major = version.left( firstDot );
TQString minor = version.right( version.length() - firstDot - 1 );
- minor.tqreplace( ".", "" );
+ minor.replace( ".", "" );
project->variables()["TQMAKE_LFLAGS"].append( "/VERSION:" + major + "." + minor );
}
if ( !project->variables()["RC_FILE"].isEmpty()) {
@@ -727,7 +727,7 @@ NmakeMakefileGenerator::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"];
}
@@ -782,9 +782,9 @@ NmakeMakefileGenerator::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;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 08:25:37 +0000