diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-08-09 22:25:47 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-08-09 22:25:47 -0500 |
| commit | eaa7ee2e0bbca40ba3173c4304f81957e8964291 (patch) | |
| tree | 4f793aa48a5080aedc94ce6e519c3b86708f2b88 /tqtinterface/qt4/qmake/generators/win32 | |
| parent | 79a9d7a46a20d4a0923bc06fc471fdc2176ef865 (diff) | |
| download | experimental-eaa7ee2e0bbca40ba3173c4304f81957e8964291.tar.gz experimental-eaa7ee2e0bbca40ba3173c4304f81957e8964291.zip | |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
Diffstat (limited to 'tqtinterface/qt4/qmake/generators/win32')
12 files changed, 265 insertions, 265 deletions
diff --git a/tqtinterface/qt4/qmake/generators/win32/borland_bmake.cpp b/tqtinterface/qt4/qmake/generators/win32/borland_bmake.cpp index 640afdd..31ab882 100644 --- a/tqtinterface/qt4/qmake/generators/win32/borland_bmake.cpp +++ b/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; } } diff --git a/tqtinterface/qt4/qmake/generators/win32/mingw_make.cpp b/tqtinterface/qt4/qmake/generators/win32/mingw_make.cpp index c4f8736..4053e5d 100644 --- a/tqtinterface/qt4/qmake/generators/win32/mingw_make.cpp +++ b/tqtinterface/qt4/qmake/generators/win32/mingw_make.cpp @@ -50,7 +50,7 @@ MingwMakefileGenerator::MingwMakefileGenerator(TQMakeProject *p) : Win32Makefile } bool -MingwMakefileGenerator::tqfindLibraries() // todo - pascal +MingwMakefileGenerator::findLibraries() // todo - pascal { return TRUE; } @@ -119,8 +119,8 @@ MingwMakefileGenerator::writeMingwParts(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(TQRegExp("\""), ""); + inc.replace(TQRegExp("\\\\$"), ""); + inc.replace(TQRegExp("\""), ""); t << " -I" << "\"" << inc << "\""; } t << " -I" << "\"" << specdir() << "\"" << endl; @@ -130,7 +130,7 @@ MingwMakefileGenerator::writeMingwParts(TQTextStream &t) t << "LIBS = "; if ( !project->variables()["TQMAKE_LIBDIR"].isEmpty() ) t << varGlue("TQMAKE_LIBDIR","-L\"","\" -L\"","\"") << " "; - t << var("TQMAKE_LIBS").tqreplace(TQRegExp("(\\slib|^lib)")," -l") << endl; + t << var("TQMAKE_LIBS").replace(TQRegExp("(\\slib|^lib)")," -l") << endl; } else { t << "LIB = " << var("TQMAKE_LIB") << endl; @@ -160,11 +160,11 @@ MingwMakefileGenerator::writeMingwParts(TQTextStream &t) t << "####### Output directory" << endl << endl; if (! project->variables()["OBJECTS_DIR"].isEmpty()) - t << "OBJECTS_DIR = " << var("OBJECTS_DIR").tqreplace(TQRegExp("\\\\$"),"") << endl; + t << "OBJECTS_DIR = " << var("OBJECTS_DIR").replace(TQRegExp("\\\\$"),"") << endl; else t << "OBJECTS_DIR = . " << endl; if (! project->variables()["TQMOC_DIR"].isEmpty()) - t << "TQMOC_DIR = " << var("TQMOC_DIR").tqreplace(TQRegExp("\\\\$"),"") << endl; + t << "TQMOC_DIR = " << var("TQMOC_DIR").replace(TQRegExp("\\\\$"),"") << endl; else t << "TQMOC_DIR = . " << endl; t << endl; @@ -264,9 +264,9 @@ MingwMakefileGenerator::writeMingwParts(TQTextStream &t) if(!project->variables()["RC_FILE"].isEmpty()) { t << var("RES_FILE") << ": " << var("RC_FILE") << "\n\t" - << var("TQMAKE_RC") << " -i " << var("RC_FILE") << " -o " << var("RC_FILE").tqreplace(TQRegExp("\\.rc"),".o") << " --include-dir=" << TQFileInfo(var("RC_FILE")).dirPath() << endl << endl; + << var("TQMAKE_RC") << " -i " << var("RC_FILE") << " -o " << var("RC_FILE").replace(TQRegExp("\\.rc"),".o") << " --include-dir=" << TQFileInfo(var("RC_FILE")).dirPath() << endl << endl; } - project->variables()["RES_FILE"].first().tqreplace(TQRegExp("\\.rc"),".o"); + project->variables()["RES_FILE"].first().replace(TQRegExp("\\.rc"),".o"); t << "tqmocables: $(SRCTQMOC)" << endl << endl; @@ -283,9 +283,9 @@ MingwMakefileGenerator::writeMingwParts(TQTextStream &t) << var("PROJECT") << ".pro $(SOURCES) $(HEADERS) $(DIST) $(FORMS)" << endl << endl; t << "clean:" - << varGlue("OBJECTS","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","").tqreplace(TQRegExp("\\.obj"),".o") + << varGlue("OBJECTS","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","").replace(TQRegExp("\\.obj"),".o") << varGlue("SRCTQMOC" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") - << varGlue("OBJTQMOC" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","").tqreplace(TQRegExp("\\.obj"),".o") + << varGlue("OBJTQMOC" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","").replace(TQRegExp("\\.obj"),".o") << varGlue("UICDECLS" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") << varGlue("UICIMPLS" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") << "\n\t-$(DEL_FILE) $(TARGET)" @@ -335,17 +335,17 @@ MingwMakefileGenerator::writeMingwParts(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)); @@ -410,7 +410,7 @@ MingwMakefileGenerator::init() project->variables()["DEFINES"].append("TQT_DLL"); if (project->isActiveConfig("qt_dll")) - if (configs.tqfindIndex("qt") == -1) + if (configs.findIndex("qt") == -1) configs.append("qt"); if ( project->isActiveConfig("qt") ) { @@ -419,9 +419,9 @@ MingwMakefileGenerator::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() ) @@ -457,7 +457,7 @@ MingwMakefileGenerator::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 { @@ -470,7 +470,7 @@ MingwMakefileGenerator::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 { @@ -507,16 +507,16 @@ MingwMakefileGenerator::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("-lqt%s" TQTDLL_POSTFIX "%d", (project->isActiveConfig("thread") ? "-mt" : ""), hver); TQStringList &libs = project->variables()["TQMAKE_LIBS"]; -// @@@HGTODO maybe we must change the tqreplace regexp if we understand what's going on +// @@@HGTODO maybe we must change the replace regexp if we understand what's going on for(TQStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) - (*libit).tqreplace(TQRegExp("-lqt(-mt)?"), ver); + (*libit).replace(TQRegExp("-lqt(-mt)?"), ver); } } if ( project->isActiveConfig( "activeqt" ) ) { @@ -641,10 +641,10 @@ MingwMakefileGenerator::init() #if 0 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 ); } #endif @@ -656,7 +656,7 @@ MingwMakefileGenerator::init() exit(666); } project->variables()["RES_FILE"] = project->variables()["RC_FILE"]; - project->variables()["RES_FILE"].first().tqreplace(".rc",".o"); + project->variables()["RES_FILE"].first().replace(".rc",".o"); project->variables()["POST_TARGETDEPS"] += project->variables()["RES_FILE"]; project->variables()["CLEAN_FILES"] += project->variables()["RES_FILE"]; } @@ -688,9 +688,9 @@ MingwMakefileGenerator::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; } } @@ -709,8 +709,8 @@ MingwMakefileGenerator::writeSubDirs(TQTextStream &t) while ( -1 != (pos = rx.search( qs, pos))) { TQString qsMatch = rx.cap(2); - qsMatch.tqreplace("\n\t"," && \\\n\t"); - qs.tqreplace(pos+rx.cap(1).length(), rx.cap(2).length(), qsMatch ); + qsMatch.replace("\n\t"," && \\\n\t"); + qs.replace(pos+rx.cap(1).length(), rx.cap(2).length(), qsMatch ); pos += (rx.cap(1).length()+qsMatch.length()); } t << qs ; diff --git a/tqtinterface/qt4/qmake/generators/win32/mingw_make.h b/tqtinterface/qt4/qmake/generators/win32/mingw_make.h index 5d437fb..db5a580 100644 --- a/tqtinterface/qt4/qmake/generators/win32/mingw_make.h +++ b/tqtinterface/qt4/qmake/generators/win32/mingw_make.h @@ -50,7 +50,7 @@ class MingwMakefileGenerator : public Win32MakefileGenerator bool writeMakefile(TQTextStream &); void init(); - virtual bool tqfindLibraries(); + virtual bool findLibraries(); public: MingwMakefileGenerator(TQMakeProject *p); diff --git a/tqtinterface/qt4/qmake/generators/win32/msvc_dsp.cpp b/tqtinterface/qt4/qmake/generators/win32/msvc_dsp.cpp index e50c136..52fa2af 100644 --- a/tqtinterface/qt4/qmake/generators/win32/msvc_dsp.cpp +++ b/tqtinterface/qt4/qmake/generators/win32/msvc_dsp.cpp @@ -81,7 +81,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) } if (dspfile.startsWith("\"") && dspfile.endsWith("\"")) dspfile = dspfile.mid(1, dspfile.length() - 2); - TQString dspfile_loc = tqfindTemplate(dspfile); + TQString dspfile_loc = findTemplate(dspfile); TQFile file(dspfile_loc); if(!file.open(IO_ReadOnly)) { @@ -101,11 +101,11 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) if (usePCH) { // Created files TQString origTarget = project->first("TQMAKE_ORIG_TARGET"); - origTarget.tqreplace(TQRegExp("-"), "_"); + origTarget.replace(TQRegExp("-"), "_"); precompObj = "\"$(IntDir)\\" + origTarget + Option::obj_ext + "\""; precompPch = "\"$(IntDir)\\" + origTarget + ".pch\""; // Add PRECOMPILED_HEADER to HEADERS - if (!project->variables()["HEADERS"].tqcontains(precompH)) + if (!project->variables()["HEADERS"].contains(precompH)) project->variables()["HEADERS"] += precompH; // Add precompile compiler options project->variables()["PRECOMPILED_FLAGS_REL"] = TQString("/Yu\"" + namePCH + "\" /FI\"" + namePCH + "\" "); @@ -118,8 +118,8 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) TQString line; while ( !dsp.eof() ) { line = dsp.readLine(); - while((rep = line.tqfind(TQRegExp("\\$\\$[a-zA-Z0-9_-]*"))) != -1) { - TQString torep = line.mid(rep, line.tqfind(TQRegExp("[^\\$a-zA-Z0-9_-]"), rep) - rep); + while((rep = line.find(TQRegExp("\\$\\$[a-zA-Z0-9_-]*"))) != -1) { + TQString torep = line.mid(rep, line.find(TQRegExp("[^\\$a-zA-Z0-9_-]"), rep) - rep); TQString variable = torep.right(torep.length()-2); t << line.left(rep); //output the left side @@ -129,7 +129,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) continue; TQString tqmocpath = var( "TQMAKE_TQMOC" ); - tqmocpath = tqmocpath.tqreplace( TQRegExp( "\\..*$" ), "" ) + " "; + tqmocpath = tqmocpath.replace( TQRegExp( "\\..*$" ), "" ) + " "; TQStringList list = project->variables()["SOURCES"] + project->variables()["DEF_FILE"]; if(!project->isActiveConfig("flat")) @@ -142,16 +142,16 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) t << "# SUBTRACT CPP /FI\"" << namePCH << "\" /Yu\"" << namePCH << "\" /Fp" << endl; if ( project->isActiveConfig("tqmoc") && (*it).endsWith(Option::cpp_tqmoc_ext)) { TQString base = (*it); - TQT_TQSTRING(base.tqreplace(TQRegExp("\\..*$"), "")).upper(); - base.tqreplace(TQRegExp("[^a-zA-Z]"), "_"); + TQT_TQSTRING(base.replace(TQRegExp("\\..*$"), "")).upper(); + base.replace(TQRegExp("[^a-zA-Z]"), "_"); - TQString build = "\n\n# Begin Custom Build - Moc'ing " + tqfindMocSource((*it)) + + TQString build = "\n\n# Begin Custom Build - Moc'ing " + findMocSource((*it)) + "...\n" "InputPath=.\\" + (*it) + "\n\n" "\"" + (*it) + "\"" " : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n" - "\t" + tqmocpath + tqfindMocSource((*it)) + " -o " + + "\t" + tqmocpath + findMocSource((*it)) + " -o " + (*it) + "\n\n" "# End Custom Build\n\n"; - t << "USERDEP_" << base << "=\".\\" << tqfindMocSource((*it)) << "\" \"$(TQTDIR)\\bin\\tqmoc.exe\"" << endl << endl; + t << "USERDEP_" << base << "=\".\\" << findMocSource((*it)) << "\" \"$(TQTDIR)\\bin\\tqmoc.exe\"" << endl << endl; t << "!IF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Release\"" << build << "!ELSEIF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Debug\"" @@ -183,8 +183,8 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) // Create unique baseID TQString base = (*it); { - TQT_TQSTRING(base.tqreplace(TQRegExp("\\..*$"), "")).upper(); - base.tqreplace(TQRegExp("[^a-zA-Z]"), "_"); + TQT_TQSTRING(base.replace(TQRegExp("\\..*$"), "")).upper(); + base.replace(TQRegExp("[^a-zA-Z]"), "_"); } if (usePCH && precompH.endsWith(*it)) { TQString basicBuildCmd = TQString("\tcl.exe /TP /W3 /FD /c /D \"WIN32\" /Yc /Fp\"%1\" /Fo\"%2\" %3 %4 %5 %6 %7 %8 %9 /D \"") @@ -218,15 +218,15 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) compilePCH = precompPch + " : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n $(BuildCmds)\n\n"; - TQStringList &tmp = tqfindDependencies(precompH); + TQStringList &tmp = findDependencies(precompH); if(!tmp.isEmpty()) // Got Deps for PCH customDependencies += tmp; } - if (project->isActiveConfig("tqmoc") && !tqfindMocDestination((*it)).isEmpty()) { + if (project->isActiveConfig("tqmoc") && !findMocDestination((*it)).isEmpty()) { TQString tqmocpath = var( "TQMAKE_TQMOC" ); - tqmocpath = tqmocpath.tqreplace( TQRegExp( "\\..*$" ), "" ) + " "; - buildCmds += "\t" + tqmocpath + (*it) + " -o " + tqfindMocDestination((*it)) + " \\\n"; - createTQMOC = "\"" + tqfindMocDestination((*it)) + "\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n $(BuildCmds)\n\n"; + tqmocpath = tqmocpath.replace( TQRegExp( "\\..*$" ), "" ) + " "; + buildCmds += "\t" + tqmocpath + (*it) + " -o " + findMocDestination((*it)) + " \\\n"; + createTQMOC = "\"" + findMocDestination((*it)) + "\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n $(BuildCmds)\n\n"; customDependencies += "\"$(TQTDIR)\\bin\\tqmoc.exe\""; } if (!createTQMOC.isEmpty() || !compilePCH.isEmpty()) { @@ -276,11 +276,11 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) TQString ext = variable == "MSVCDSP_FORMSOURCES" ? ".cpp" : ".h"; for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) { TQString base = (*it); - int dot = base.tqfindRev("."); - base.tqreplace( dot, base.length() - dot, ext ); + int dot = base.findRev("."); + base.replace( dot, base.length() - dot, ext ); TQString fname = base; - int lbs = fname.tqfindRev( "\\" ); + int lbs = fname.findRev( "\\" ); TQString fpath; if ( lbs != -1 ) fpath = fname.left( lbs + 1 ); @@ -309,10 +309,10 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) list.sort(); for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) { TQString sify = *it; - sify.tqreplace('/', '\\' ); + sify.replace('/', '\\' ); TQString base = (*it); - TQT_TQSTRING(base.tqreplace(TQRegExp("\\..*$"), "")).upper(); - base.tqreplace(TQRegExp("[^a-zA-Z]"), "_"); + TQT_TQSTRING(base.replace(TQRegExp("\\..*$"), "")).upper(); + base.replace(TQRegExp("[^a-zA-Z]"), "_"); // beginGroupForFile(sify, t); t << "# Begin Source File\n\nSOURCE=" << sify << endl; @@ -325,7 +325,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) continue; TQString tqmocpath = var( "TQMAKE_TQMOC" ); - tqmocpath = tqmocpath.tqreplace( TQRegExp( "\\..*$" ), "" ) + " "; + tqmocpath = tqmocpath.replace( TQRegExp( "\\..*$" ), "" ) + " "; TQStringList list = project->variables()["SRCTQMOC"]; if(!project->isActiveConfig("flat")) @@ -335,16 +335,16 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) t << "# Begin Source File\n\nSOURCE=" << (*it) << endl; if ( project->isActiveConfig("tqmoc") && (*it).endsWith(Option::cpp_tqmoc_ext)) { TQString base = (*it); - TQT_TQSTRING(base.tqreplace(TQRegExp("\\..*$"), "")).upper(); - base.tqreplace(TQRegExp("[^a-zA-Z]"), "_"); + TQT_TQSTRING(base.replace(TQRegExp("\\..*$"), "")).upper(); + base.replace(TQRegExp("[^a-zA-Z]"), "_"); - TQString build = "\n\n# Begin Custom Build - Moc'ing " + tqfindMocSource((*it)) + + TQString build = "\n\n# Begin Custom Build - Moc'ing " + findMocSource((*it)) + "...\n" "InputPath=.\\" + (*it) + "\n\n" "\"" + (*it) + "\"" " : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n" - "\t" + tqmocpath + tqfindMocSource((*it)) + " -o " + + "\t" + tqmocpath + findMocSource((*it)) + " -o " + (*it) + "\n\n" "# End Custom Build\n\n"; - t << "USERDEP_" << base << "=\".\\" << tqfindMocSource((*it)) << "\" \"$(TQTDIR)\\bin\\tqmoc.exe\"" << endl << endl; + t << "USERDEP_" << base << "=\".\\" << findMocSource((*it)) << "\" \"$(TQTDIR)\\bin\\tqmoc.exe\"" << endl << endl; t << "!IF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Release\"" << build << "!ELSEIF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Debug\"" @@ -381,7 +381,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) TQString base = (*it); TQString uicpath = var("TQMAKE_UIC"); - uicpath = uicpath.tqreplace(TQRegExp("\\..*$"), "") + " "; + uicpath = uicpath.replace(TQRegExp("\\..*$"), "") + " "; if ( !imagesBuildDone ) { imagesBuildDone = TRUE; @@ -420,9 +420,9 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) << "# Prop Default_Filter \"ui\"\n"; TQString uicpath = var("TQMAKE_UIC"); - uicpath = uicpath.tqreplace(TQRegExp("\\..*$"), "") + " "; + uicpath = uicpath.replace(TQRegExp("\\..*$"), "") + " "; TQString tqmocpath = var( "TQMAKE_TQMOC" ); - tqmocpath = tqmocpath.tqreplace( TQRegExp( "\\..*$" ), "" ) + " "; + tqmocpath = tqmocpath.replace( TQRegExp( "\\..*$" ), "" ) + " "; TQStringList list = project->variables()["FORMS"]; if(!project->isActiveConfig("flat")) @@ -433,8 +433,8 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) t << "# Begin Source File\n\nSOURCE=" << base << endl; TQString fname = base; - fname.tqreplace(".ui", ""); - int lbs = fname.tqfindRev( "\\" ); + fname.replace(".ui", ""); + int lbs = fname.findRev( "\\" ); TQString fpath; if ( lbs != -1 ) fpath = fname.left( lbs + 1 ); @@ -502,7 +502,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) TQString fname = (*it); // beginGroupForFile(fname, t); t << "# Begin Source File\n\nSOURCE=" << fname << endl; - fname.tqreplace(".l", Option::lex_mod + Option::cpp_ext.first()); + fname.replace(".l", Option::lex_mod + Option::cpp_ext.first()); TQString build = "\n\n# Begin Custom Build - Lex'ing " + (*it) + "...\n" "InputPath=.\\" + (*it) + "\n\n" @@ -535,7 +535,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) TQString fname = (*it); // beginGroupForFile(fname, t); t << "# Begin Source File\n\nSOURCE=" << fname << endl; - fname.tqreplace(".y", Option::yacc_mod); + fname.replace(".y", Option::yacc_mod); TQString build = "\n\n# Begin Custom Build - Yacc'ing " + (*it) + "...\n" "InputPath=.\\" + (*it) + "\n\n" @@ -630,11 +630,11 @@ DspMakefileGenerator::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") ) { @@ -642,9 +642,9 @@ DspMakefileGenerator::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() ) @@ -663,10 +663,10 @@ DspMakefileGenerator::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()["MSVCDSP_VERSION"].append( "/VERSION:" + major + "." + minor ); } @@ -694,15 +694,15 @@ DspMakefileGenerator::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", (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" ) ) { @@ -757,7 +757,7 @@ DspMakefileGenerator::init() project->variables()["MSVCDSP_MTDEFD"] += project->variables()["TQMAKE_CXXFLAGS_MT_DBG"]; project->variables()["MSVCDSP_MTDEF"] += project->variables()["TQMAKE_CXXFLAGS_MT"]; } - if ( !project->variables()["DEFINES"].tqcontains("TQT_DLL") && is_qt + if ( !project->variables()["DEFINES"].contains("TQT_DLL") && is_qt && project->first("TARGET") != "qtmain" ) project->variables()["TQMAKE_LFLAGS"].append("/NODEFAULTLIB:\"libc\""); } @@ -775,7 +775,7 @@ DspMakefileGenerator::init() project->variables()["TQMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["TQMAKE_LFLAGS_WINDOWS_DLL"]; if ( !project->variables()["TQMAKE_LIB_FLAG"].isEmpty() ) { TQString ver_xyz(project->first("VERSION")); - ver_xyz.tqreplace(".", ""); + ver_xyz.replace(".", ""); project->variables()["TARGET_EXT"].append(ver_xyz + ".dll"); } else { project->variables()["TARGET_EXT"].append(".dll"); @@ -840,15 +840,15 @@ DspMakefileGenerator::init() if ( msvcdsp_project.isEmpty() ) msvcdsp_project = Option::output.name(); - msvcdsp_project = msvcdsp_project.right( msvcdsp_project.length() - msvcdsp_project.tqfindRev( "\\" ) - 1 ); - msvcdsp_project = msvcdsp_project.left( msvcdsp_project.tqfindRev( "." ) ); - msvcdsp_project.tqreplace("-", ""); + msvcdsp_project = msvcdsp_project.right( msvcdsp_project.length() - msvcdsp_project.findRev( "\\" ) - 1 ); + msvcdsp_project = msvcdsp_project.left( msvcdsp_project.findRev( "." ) ); + msvcdsp_project.replace("-", ""); project->variables()["MSVCDSP_PROJECT"].append(msvcdsp_project); TQStringList &proj = project->variables()["MSVCDSP_PROJECT"]; for(it = proj.begin(); it != proj.end(); ++it) - (*it).tqreplace(TQRegExp("\\.[a-zA-Z0-9_]*$"), ""); + (*it).replace(TQRegExp("\\.[a-zA-Z0-9_]*$"), ""); if ( !project->variables()["TQMAKE_APP_FLAG"].isEmpty() ) { project->variables()["MSVCDSP_TEMPLATE"].append("win32app" + project->first( "DSP_EXTENSION" ) ); @@ -901,14 +901,14 @@ DspMakefileGenerator::init() TQStringList &libs = project->variables()["TQMAKE_LIBS"]; for(TQStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) { TQString lib = (*libit); - lib.tqreplace(TQRegExp("\""), ""); + lib.replace(TQRegExp("\""), ""); project->variables()["MSVCDSP_LIBS"].append(" \"" + lib + "\""); } TQStringList &incs = project->variables()["INCLUDEPATH"]; for(TQStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) { TQString inc = (*incit); - inc.tqreplace("\"", ""); + inc.replace("\"", ""); if(inc.endsWith("\\")) // Remove trailing \'s from paths inc.truncate(inc.length()-1); if (inc.startsWith("\"") && inc.endsWith("\"")) @@ -941,12 +941,12 @@ DspMakefileGenerator::init() Option::fixPathToTargetOS(project->first("TARGET")); dest = project->first("TARGET"); if ( project->first("TARGET").startsWith("$(TQTDIR)") ) - dest.tqreplace( "$(TQTDIR)", getenv("TQTDIR") ); + dest.replace( "$(TQTDIR)", getenv("TQTDIR") ); project->variables()["MSVCDSP_TARGET"].append( TQString("/out:\"") + dest + "\""); if ( project->isActiveConfig("dll") ) { TQString imp = dest; - imp.tqreplace(".dll", ".lib"); + imp.replace(".dll", ".lib"); project->variables()["MSVCDSP_TARGET"].append(TQString(" /implib:\"") + imp + "\""); } } @@ -1028,7 +1028,7 @@ DspMakefileGenerator::init() TQString -DspMakefileGenerator::tqfindTemplate(const TQString &file) +DspMakefileGenerator::findTemplate(const TQString &file) { TQString ret; if(!TQFile::exists((ret = file)) && @@ -1046,7 +1046,7 @@ DspMakefileGenerator::processPrlVariable(const TQString &var, const TQStringList if(var == "TQMAKE_PRL_DEFINES") { TQStringList &out = project->variables()["MSVCDSP_DEFINES"]; for(TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it) { - if(out.tqfindIndex((*it)) == -1) + if(out.findIndex((*it)) == -1) out.append((" /D \"" + *it + "\"")); } } else { @@ -1076,11 +1076,11 @@ DspMakefileGenerator::beginGroupForFile(TQString file, TQTextStream &t, TQString tempFile = file; if(tempFile.startsWith(currentGroup)) tempFile = tempFile.mid(currentGroup.length()); - int dirSep = currentGroup.tqfindRev( Option::dir_sep ); + int dirSep = currentGroup.findRev( Option::dir_sep ); while( !tempFile.startsWith( currentGroup ) && dirSep != -1 ) { currentGroup.truncate( dirSep ); - dirSep = currentGroup.tqfindRev( Option::dir_sep ); + dirSep = currentGroup.findRev( Option::dir_sep ); if ( !tempFile.startsWith( currentGroup ) && dirSep != -1 ) t << "\n# End Group\n"; } @@ -1129,14 +1129,14 @@ DspMakefileGenerator::openOutput(TQFile &file) const if(TQDir::isRelativePath(file.name())) { TQString ofile; ofile = file.name(); - int slashtqfind = ofile.tqfindRev('\\'); - if (slashtqfind == -1) { - ofile = ofile.tqreplace(TQRegExp("-"), "_"); + int slashfind = ofile.findRev('\\'); + if (slashfind == -1) { + ofile = ofile.replace(TQRegExp("-"), "_"); } else { - int hypentqfind = ofile.tqfind('-', slashtqfind); - while (hypentqfind != -1 && slashtqfind < hypentqfind) { - ofile = ofile.tqreplace(hypentqfind, 1, "_"); - hypentqfind = ofile.tqfind('-', hypentqfind + 1); + int hypenfind = ofile.find('-', slashfind); + while (hypenfind != -1 && slashfind < hypenfind) { + ofile = ofile.replace(hypenfind, 1, "_"); + hypenfind = ofile.find('-', hypenfind + 1); } } file.setName(Option::fixPathToLocalOS(TQDir::currentDirPath() + Option::dir_sep + ofile)); diff --git a/tqtinterface/qt4/qmake/generators/win32/msvc_dsp.h b/tqtinterface/qt4/qmake/generators/win32/msvc_dsp.h index fb1afb2..f35798d 100644 --- a/tqtinterface/qt4/qmake/generators/win32/msvc_dsp.h +++ b/tqtinterface/qt4/qmake/generators/win32/msvc_dsp.h @@ -52,7 +52,7 @@ class DspMakefileGenerator : public Win32MakefileGenerator bool writeDspParts(TQTextStream &); bool writeMakefile(TQTextStream &); - TQString tqfindTemplate(const TQString &file); + TQString findTemplate(const TQString &file); void init(); public: @@ -63,7 +63,7 @@ public: protected: virtual void processPrlVariable(const TQString &, const TQStringList &); - virtual bool tqfindLibraries(); + virtual bool findLibraries(); TQString precompH, precompObj, precompPch; @@ -73,7 +73,7 @@ protected: inline DspMakefileGenerator::~DspMakefileGenerator() { } -inline bool DspMakefileGenerator::tqfindLibraries() -{ return Win32MakefileGenerator::tqfindLibraries("MSVCDSP_LIBS"); } +inline bool DspMakefileGenerator::findLibraries() +{ return Win32MakefileGenerator::findLibraries("MSVCDSP_LIBS"); } #endif /* __MSVC_DSP_H__ */ diff --git a/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.cpp b/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.cpp index 6add6e7..ef12545 100644 --- a/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.cpp +++ b/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; } } diff --git a/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.h b/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.h index 858f92c..adc29a0 100644 --- a/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.h +++ b/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.h @@ -50,7 +50,7 @@ class NmakeMakefileGenerator : public Win32MakefileGenerator void init(); protected: - TQStringList &tqfindDependencies(const TQString &file); + TQStringList &findDependencies(const TQString &file); TQString var(const TQString &value); TQString precompH, precompObj, precompPch; bool usePCH; diff --git a/tqtinterface/qt4/qmake/generators/win32/msvc_objectmodel.cpp b/tqtinterface/qt4/qmake/generators/win32/msvc_objectmodel.cpp index cedcb01..b114ced 100644 --- a/tqtinterface/qt4/qmake/generators/win32/msvc_objectmodel.cpp +++ b/tqtinterface/qt4/qmake/generators/win32/msvc_objectmodel.cpp @@ -317,7 +317,7 @@ TQTextStream &operator<<( TQTextStream &strm, const XPair &prop ) { if ( !prop.value.isEmpty() ) { TQString outText = prop.value.join(prop.sep); - strm << prop.name << outText.tqreplace('\"', """) << "\""; + strm << prop.name << outText.replace('\"', """) << "\""; } return strm; } @@ -1883,7 +1883,7 @@ VCFilter::VCFilter() void VCFilter::addTQMOCstage( TQTextStream & /*strm*/, TQString filename ) { - TQString tqmocOutput = Project->tqfindMocDestination( filename ); + TQString tqmocOutput = Project->findMocDestination( filename ); TQString tqmocApp = Project->var( "TQMAKE_TQMOC" ); bool inputMoc = false; @@ -1891,7 +1891,7 @@ void VCFilter::addTQMOCstage( TQTextStream & /*strm*/, TQString filename ) // In specialcases we DO tqmoc .cpp files // when the result is an .tqmoc file tqmocOutput = filename; - filename = Project->tqfindMocSource( tqmocOutput ); + filename = Project->findMocSource( tqmocOutput ); inputMoc = true; } @@ -1923,7 +1923,7 @@ void VCFilter::addUICstage( TQTextStream & /*strm*/, TQString str ) TQString uiSources; // Determining the paths for the output files. - int slash = str.tqfindRev( '\\' ); + int slash = str.findRev( '\\' ); TQString pname = ( slash != -1 ) ? str.left( slash+1 ) : TQString( ".\\" ); if( !uiDir.isEmpty() ) { uiHeaders = uiDir; @@ -1942,7 +1942,7 @@ void VCFilter::addUICstage( TQTextStream & /*strm*/, TQString str ) uiSources += "\\"; // Determine the file name. - int dot = fname.tqfindRev( '.' ); + int dot = fname.findRev( '.' ); if( dot != -1 ) fname.truncate( dot ); @@ -2035,9 +2035,9 @@ bool VCFilter::addIMGstage( TQTextStream &/*strm*/, TQString str ) + " -f .imgcol -o " + collectionName; // The loop below is to avoid the resulting CommandLine buffer - // from being a size of between 2071-#char_tqreplaced and 2102, + // from being a size of between 2071-#char_replaced and 2102, // as this triggers a buffer overflow bug in VS2003. As we only - // the only tqreplacement we use in this buffer is one $(TQTDIR), + // the only replacement we use in this buffer is one $(TQTDIR), // we assume this can be upto 256 characters long, making the // lower-bound to be 1814 characters. So, if the buffer is // between 1814 and 2103 bytes, the buffer is "padded" til it's diff --git a/tqtinterface/qt4/qmake/generators/win32/msvc_vcproj.cpp b/tqtinterface/qt4/qmake/generators/win32/msvc_vcproj.cpp index 5e80188..f646962 100644 --- a/tqtinterface/qt4/qmake/generators/win32/msvc_vcproj.cpp +++ b/tqtinterface/qt4/qmake/generators/win32/msvc_vcproj.cpp @@ -109,7 +109,7 @@ DotNET which_dotnet_version() continue; TQStringList::iterator it; for(it = pathlist.begin(); it != pathlist.end(); ++it) { - if((*it).tqcontains(productPath)) { + if((*it).contains(productPath)) { ++installed; current_version = dotNetCombo[i].version; warnPath += TQString("%1 in path").arg(dotNetCombo[i].versionStr); @@ -142,7 +142,7 @@ const char* _slnHeader80 = "Microsoft Visual Studio Solution File, Format // The following UUID _may_ change for later servicepacks... // If so we need to search through the registry at // HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\7.0\Projects - // to tqfind the subkey that tqcontains a "PossibleProjectExtension" + // to find the subkey that contains a "PossibleProjectExtension" // containing "vcproj"... // Use the hardcoded value for now so projects generated on other // platforms are actually usable. @@ -233,7 +233,7 @@ TQUuid VcprojGenerator::getProjectUUID(const TQString &filename) if (uuid.isNull() || !validUUID) { uuid = TQUuid::createUuid(); fprintf(stderr, - "qmake couldn't create a GUID based on filepath, and we couldn't\ntqfind a valid GUID in the .pro file (Consider adding\n'GUID = %s' to the .pro file)\n", + "qmake couldn't create a GUID based on filepath, and we couldn't\nfind a valid GUID in the .pro file (Consider adding\n'GUID = %s' to the .pro file)\n", uuid.toString().upper().latin1()); } @@ -519,7 +519,7 @@ void VcprojGenerator::init() precompObj = origTarget + Option::obj_ext; precompPch = origTarget + ".pch"; // Add PRECOMPILED_HEADER to HEADERS - if (!project->variables()["HEADERS"].tqcontains(precompH)) + if (!project->variables()["HEADERS"].contains(precompH)) project->variables()["HEADERS"] += precompH; // Return to variable pool project->variables()["PRECOMPILED_OBJECT"] = precompObj; @@ -645,10 +645,10 @@ void VcprojGenerator::initConfiguration() RConf.linker.parseOptions(project->variables()["TQMAKE_LFLAGS_RELEASE"]); RConf.compiler.parseOptions(project->variables()["TQMAKE_CFLAGS_RELEASE"]); RConf.compiler.parseOptions(project->variables()["TQMAKE_CXXFLAGS_RELEASE"]); - if (!project->variables()["TQMAKE_CXXFLAGS_RELEASE"].tqcontains("Gm") - && project->variables()["TQMAKE_CXXFLAGS_DEBUG"].tqcontains("Gm")) + if (!project->variables()["TQMAKE_CXXFLAGS_RELEASE"].contains("Gm") + && project->variables()["TQMAKE_CXXFLAGS_DEBUG"].contains("Gm")) RConf.compiler.parseOption("-Gm-"); - if (RConf.compiler.PreprocessorDefinitions.tqfindIndex("TQT_NO_DEBUG") == -1) + if (RConf.compiler.PreprocessorDefinitions.findIndex("TQT_NO_DEBUG") == -1) RConf.compiler.PreprocessorDefinitions += "TQT_NO_DEBUG"; } else { DConf.IntermediateDirectory = @@ -733,7 +733,7 @@ void VcprojGenerator::initCompilerTool() for(it=RConf.compiler.PreprocessorDefinitions.begin(); it!=RConf.compiler.PreprocessorDefinitions.end(); ++it) - (*it).tqreplace('\"', """); + (*it).replace('\"', """); RConf.compiler.parseOptions( project->variables()["MSVCPROJ_INCPATH"] ); } @@ -741,7 +741,7 @@ void VcprojGenerator::initCompilerTool() void VcprojGenerator::initLibrarianTool() { VCConfiguration &RConf = vcProject.Configuration[0]; - RConf.librarian.OutputFile = project->first( "DESTDIR" ).tqreplace("&", "&"); + RConf.librarian.OutputFile = project->first( "DESTDIR" ).replace("&", "&"); if( RConf.librarian.OutputFile.isEmpty() ) RConf.librarian.OutputFile = ".\\"; @@ -813,8 +813,8 @@ void VcprojGenerator::initPostBuildEventTools() if ( !project->variables()["TQMAKE_POST_LINK"].isEmpty() ) { RConf.postBuild.Description = var("TQMAKE_POST_LINK"); RConf.postBuild.CommandLine = var("TQMAKE_POST_LINK"); - RConf.postBuild.Description.tqreplace(" && ", " && "); - RConf.postBuild.CommandLine.tqreplace(" && ", " && "); + RConf.postBuild.Description.replace(" && ", " && "); + RConf.postBuild.CommandLine.replace(" && ", " && "); } if ( !project->variables()["MSVCPROJ_COPY_DLL"].isEmpty() ) { if ( !RConf.postBuild.CommandLine.isEmpty() ) @@ -838,7 +838,7 @@ void VcprojGenerator::initPostBuildEventTools() idc + " "$(TargetPath)" -idl " + objdir + name + ".idl -version 1.0 && " + // call midl to create implementations of the .idl file project->first( "TQMAKE_IDL" ) + " /nologo " + objdir + name + ".idl /tlb " + objdir + name + ".tlb && " + - // call idc to tqreplace tlb... + // call idc to replace tlb... idc + " "$(TargetPath)" /tlb " + objdir + name + ".tlb && " + // register server idc + " "$(TargetPath)" /regserver"; @@ -848,7 +848,7 @@ void VcprojGenerator::initPostBuildEventTools() ""$(TargetPath)" -dumpidl " + objdir + name + ".idl -version 1.0 && " + // call midl to create implementations of the .idl file project->first( "TQMAKE_IDL" ) + " /nologo " + objdir + name + ".idl /tlb " + objdir + name + ".tlb && " + - // call idc to tqreplace tlb... + // call idc to replace tlb... idc + " "$(TargetPath)" /tlb " + objdir + name + ".tlb && " + // call app to register ""$(TargetPath)" -regserver"; @@ -867,8 +867,8 @@ void VcprojGenerator::initPreLinkEventTools() inline bool XLessThanY( TQString &x, TQString &y, bool flat_mode ) { if ( flat_mode ) { - TQString subX = x.mid( x.tqfindRev('\\')+1 ); - TQString subY = y.mid( y.tqfindRev('\\')+1 ); + TQString subX = x.mid( x.findRev('\\')+1 ); + TQString subY = y.mid( y.findRev('\\')+1 ); return TQString::compare(subX, subY) < 0; } @@ -877,8 +877,8 @@ inline bool XLessThanY( TQString &x, TQString &y, bool flat_mode ) int xSlashPos; int ySlashPos; for (;;) { - xSlashPos = x.tqfind('\\', xPos); - ySlashPos = y.tqfind('\\', yPos); + xSlashPos = x.find('\\', xPos); + ySlashPos = y.find('\\', yPos); if (xSlashPos == -1 && ySlashPos != -1) { return FALSE; @@ -954,7 +954,7 @@ void VcprojGenerator::initHeaderFiles() vcProject.HeaderFiles.Filter = "h;hpp;hxx;hm;inl"; vcProject.HeaderFiles.Files += project->variables()["HEADERS"]; if (usePCH) { // Generated PCH cpp file - if (!vcProject.HeaderFiles.Files.tqcontains(precompH)) + if (!vcProject.HeaderFiles.Files.contains(precompH)) vcProject.HeaderFiles.Files += precompH; } nonflatDir_BubbleSort( vcProject.HeaderFiles.Files, @@ -1106,7 +1106,7 @@ void VcprojGenerator::initOld() project->variables()["DEFINES"].append( "TQT_DLL" ); if ( project->isActiveConfig( "qt_dll" ) && - configs.tqfindIndex("qt") == -1 ) + configs.findIndex("qt") == -1 ) configs.append("qt"); if ( project->isActiveConfig( "qt" ) ) { @@ -1114,9 +1114,9 @@ void VcprojGenerator::initOld() 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() ) @@ -1140,10 +1140,10 @@ void VcprojGenerator::initOld() // Decode version, and add it to $$MSVCPROJ_VERSION -------------- 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( TQRegExp( "\\." ), "" ); + minor.replace( TQRegExp( "\\." ), "" ); project->variables()["MSVCPROJ_VERSION"].append( "/VERSION:" + major + "." + minor ); } @@ -1164,9 +1164,9 @@ void VcprojGenerator::initOld() 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) { @@ -1174,7 +1174,7 @@ void VcprojGenerator::initOld() 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" ) ) { @@ -1210,7 +1210,7 @@ void VcprojGenerator::initOld() if ( project->isActiveConfig("thread") ) { if(project->isActiveConfig("qt")) project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT" ); - if ( !project->variables()["DEFINES"].tqcontains("TQT_DLL") && is_qt + if ( !project->variables()["DEFINES"].contains("TQT_DLL") && is_qt && project->first("TARGET") != "qtmain" ) project->variables()["TQMAKE_LFLAGS"].append("/NODEFAULTLIB:libc"); } @@ -1227,7 +1227,7 @@ void VcprojGenerator::initOld() if ( project->isActiveConfig("dll") ) { if ( !project->variables()["TQMAKE_LIB_FLAG"].isEmpty() ) { TQString ver_xyz(project->first("VERSION")); - ver_xyz.tqreplace(TQRegExp("\\."), ""); + ver_xyz.replace(TQRegExp("\\."), ""); project->variables()["TARGET_EXT"].append(ver_xyz + ".dll"); } else { project->variables()["TARGET_EXT"].append(".dll"); @@ -1258,10 +1258,10 @@ void VcprojGenerator::initOld() // /VERSION:x.yz ------------------------------------------------- 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 ); } @@ -1270,7 +1270,7 @@ void VcprojGenerator::initOld() TQStringList &libList = project->variables()["TQMAKE_LIBS"]; for( it = libList.begin(); it != libList.end(); ) { TQString s = *it; - s.tqreplace("&", "&"); + s.replace("&", "&"); if( s.startsWith( "-l" ) ) { it = libList.remove( it ); it = libList.insert( it, s.mid( 2 ) + ".lib" ); @@ -1313,15 +1313,15 @@ void VcprojGenerator::initOld() if ( msvcproj_project.isEmpty() ) msvcproj_project = Option::output.name(); - msvcproj_project = msvcproj_project.right( msvcproj_project.length() - msvcproj_project.tqfindRev( "\\" ) - 1 ); - msvcproj_project = msvcproj_project.left( msvcproj_project.tqfindRev( "." ) ); - msvcproj_project.tqreplace(TQRegExp("-"), ""); + msvcproj_project = msvcproj_project.right( msvcproj_project.length() - msvcproj_project.findRev( "\\" ) - 1 ); + msvcproj_project = msvcproj_project.left( msvcproj_project.findRev( "." ) ); + msvcproj_project.replace(TQRegExp("-"), ""); project->variables()["MSVCPROJ_PROJECT"].append(msvcproj_project); TQStringList &proj = project->variables()["MSVCPROJ_PROJECT"]; for(it = proj.begin(); it != proj.end(); ++it) - (*it).tqreplace(TQRegExp("\\.[a-zA-Z0-9_]*$"), ""); + (*it).replace(TQRegExp("\\.[a-zA-Z0-9_]*$"), ""); // SUBSYSTEM ----------------------------------------------------- if ( !project->variables()["TQMAKE_APP_FLAG"].isEmpty() ) { @@ -1353,7 +1353,7 @@ void VcprojGenerator::initOld() TQStringList strl = project->variables()["TQMAKE_LIBDIR"]; TQStringList::iterator stri; for ( stri = strl.begin(); stri != strl.end(); ++stri ) { - (*stri).tqreplace("&", "&"); + (*stri).replace("&", "&"); if ( !(*stri).startsWith("/LIBPATH:") ) (*stri).prepend( "/LIBPATH:" ); } @@ -1366,8 +1366,8 @@ void VcprojGenerator::initOld() TQStringList &incs = project->variables()["INCLUDEPATH"]; for(TQStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) { TQString inc = (*incit); - inc.tqreplace("&", "&"); - inc.tqreplace(TQRegExp("\""), ""); + inc.replace("&", "&"); + inc.replace(TQRegExp("\""), ""); project->variables()["MSVCPROJ_INCPATH"].append("/I" + inc ); } project->variables()["MSVCPROJ_INCPATH"].append("/I" + specdir()); @@ -1377,7 +1377,7 @@ void VcprojGenerator::initOld() Option::fixPathToTargetOS(project->first("TARGET")); dest = project->first("TARGET") + project->first( "TARGET_EXT" ); if ( project->first("TARGET").startsWith("$(TQTDIR)") ) - dest.tqreplace( TQRegExp("\\$\\(TQTDIR\\)"), getenv("TQTDIR") ); + dest.replace( TQRegExp("\\$\\(TQTDIR\\)"), getenv("TQTDIR") ); project->variables()["MSVCPROJ_TARGET"] = dest; // DLL COPY ------------------------------------------------------ @@ -1491,20 +1491,20 @@ bool VcprojGenerator::openOutput(TQFile &file) const TQString VcprojGenerator::fixFilename(TQString ofile) const { - int slashtqfind = ofile.tqfindRev('\\'); - if (slashtqfind == -1) { - ofile = ofile.tqreplace('-', '_'); + int slashfind = ofile.findRev('\\'); + if (slashfind == -1) { + ofile = ofile.replace('-', '_'); } else { - int hypentqfind = ofile.tqfind('-', slashtqfind); - while (hypentqfind != -1 && slashtqfind < hypentqfind) { - ofile = ofile.tqreplace(hypentqfind, 1, '_'); - hypentqfind = ofile.tqfind('-', hypentqfind + 1); + int hypenfind = ofile.find('-', slashfind); + while (hypenfind != -1 && slashfind < hypenfind) { + ofile = ofile.replace(hypenfind, 1, '_'); + hypenfind = ofile.find('-', hypenfind + 1); } } return ofile; } -TQString VcprojGenerator::tqfindTemplate(TQString file) +TQString VcprojGenerator::findTemplate(TQString file) { TQString ret; if(!TQFile::exists((ret = file)) && @@ -1522,7 +1522,7 @@ void VcprojGenerator::processPrlVariable(const TQString &var, const TQStringList if(var == "TQMAKE_PRL_DEFINES") { TQStringList &out = project->variables()["MSVCPROJ_DEFINES"]; for(TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it) { - if(out.tqfindIndex((*it)) == -1) + if(out.findIndex((*it)) == -1) out.append((" /D " + *it )); } } else { diff --git a/tqtinterface/qt4/qmake/generators/win32/msvc_vcproj.h b/tqtinterface/qt4/qmake/generators/win32/msvc_vcproj.h index 9042d31..96f701b 100644 --- a/tqtinterface/qt4/qmake/generators/win32/msvc_vcproj.h +++ b/tqtinterface/qt4/qmake/generators/win32/msvc_vcproj.h @@ -57,7 +57,7 @@ class VcprojGenerator : public Win32MakefileGenerator bool writeMakefile(TQTextStream &); virtual void writeSubDirs(TQTextStream &t); - TQString tqfindTemplate(TQString file); + TQString findTemplate(TQString file); void init(); public: @@ -73,7 +73,7 @@ public: protected: virtual bool openOutput(TQFile &file) const; virtual void processPrlVariable(const TQString &, const TQStringList &); - virtual bool tqfindLibraries(); + virtual bool findLibraries(); virtual void outputVariables(); TQString fixFilename(TQString ofile) const; @@ -114,9 +114,9 @@ inline TQString VcprojGenerator::defaultMakefile() const return project->first("TARGET") + project->first("VCPROJ_EXTENSION"); } -inline bool VcprojGenerator::tqfindLibraries() +inline bool VcprojGenerator::findLibraries() { - return Win32MakefileGenerator::tqfindLibraries("MSVCVCPROJ_LIBS"); + return Win32MakefileGenerator::findLibraries("MSVCVCPROJ_LIBS"); } #endif /* __MSVC_VCPROJ_H__ */ diff --git a/tqtinterface/qt4/qmake/generators/win32/winmakefile.cpp b/tqtinterface/qt4/qmake/generators/win32/winmakefile.cpp index 1cf1cbe..30701bd 100644 --- a/tqtinterface/qt4/qmake/generators/win32/winmakefile.cpp +++ b/tqtinterface/qt4/qmake/generators/win32/winmakefile.cpp @@ -72,7 +72,7 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t) 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); @@ -86,15 +86,15 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t) 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); @@ -120,7 +120,7 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t) t << "\n\t" << "$(TQMAKE) " << (*it)->profile << " " << buildArgs(); t << " -o " << (*it)->makefile; if(have_dir) { - int subLevels = it.current()->directory.tqcontains(Option::dir_sep) + 1; + int subLevels = it.current()->directory.contains(Option::dir_sep) + 1; t << "\n\t" << "@cd .."; for(int i = 1; i < subLevels; i++ ) t << Option::dir_sep << ".."; @@ -136,7 +136,7 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t) t << "\n\t" << "$(MAKE)"; t << " -f " << (*it)->makefile; if(have_dir) { - int subLevels = it.current()->directory.tqcontains(Option::dir_sep) + 1; + int subLevels = it.current()->directory.contains(Option::dir_sep) + 1; t << "\n\t" << "@cd .."; for(int i = 1; i < subLevels; i++ ) t << Option::dir_sep << ".."; @@ -154,7 +154,7 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t) t << endl; } - 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"); writeMakeQmake(t); @@ -164,11 +164,11 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t) bool have_dir = !(*it)->directory.isEmpty(); TQString subdir = (*it)->directory; TQString profile = (*it)->profile; - int subLevels = subdir.tqcontains(Option::dir_sep) + 1; + int subLevels = subdir.contains(Option::dir_sep) + 1; t << "\n\t"; if(have_dir) t << "cd " << subdir << "\n\t"; - int lastSlash = subdir.tqfindRev(Option::dir_sep); + int lastSlash = subdir.findRev(Option::dir_sep); if(lastSlash != -1) subdir = subdir.mid( lastSlash + 1 ); t << "$(TQMAKE) " @@ -202,7 +202,7 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t) t << varGlue("TQMAKE_CLEAN","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ", ""); if (!subdirs.isEmpty()) { for( it.toFirst(); it.current(); ++it) { - int subLevels = (*it)->directory.tqcontains(Option::dir_sep) + 1; + int subLevels = (*it)->directory.contains(Option::dir_sep) + 1; bool have_dir = !(*it)->directory.isEmpty(); if(have_dir) t << "\n\t" << "cd " << (*it)->directory; @@ -242,7 +242,7 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t) deps += " " + dep; } if(!project->variables()["TQMAKE_NOFORCE"].isEmpty() && - project->variables()[(*sit) + ".CONFIG"].tqfindIndex("phony") != -1) + project->variables()[(*sit) + ".CONFIG"].findIndex("phony") != -1) deps += TQString(" ") + "FORCE"; t << targ << ":" << deps << "\n"; if(!cmd.isEmpty()) @@ -257,7 +257,7 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t) int -Win32MakefileGenerator::tqfindHighestVersion(const TQString &d, const TQString &stem) +Win32MakefileGenerator::findHighestVersion(const TQString &d, const TQString &stem) { TQString bd = Option::fixPathToLocalOS(d, TRUE); if(!TQFile::exists(bd)) @@ -278,13 +278,13 @@ Win32MakefileGenerator::tqfindHighestVersion(const TQString &d, const TQString & TQMakeMetaInfo libinfo; if(libinfo.readLib(bd + dllStem)) { if(!libinfo.isEmpty("TQMAKE_PRL_VERSION")) - biggest = TQMAX(biggest, libinfo.first("TQMAKE_PRL_VERSION").tqreplace(".", "").toInt()); + biggest = TQMAX(biggest, libinfo.first("TQMAKE_PRL_VERSION").replace(".", "").toInt()); } return biggest; } TQString -Win32MakefileGenerator::tqfindDependency(const TQString &dep) +Win32MakefileGenerator::findDependency(const TQString &dep) { { TQStringList &qut = project->variables()["TQMAKE_EXTRA_WIN_TARGETS"]; @@ -309,19 +309,19 @@ Win32MakefileGenerator::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); } bool -Win32MakefileGenerator::tqfindLibraries(const TQString &where) +Win32MakefileGenerator::findLibraries(const TQString &where) { TQStringList &l = project->variables()[where]; @@ -331,7 +331,7 @@ Win32MakefileGenerator::tqfindLibraries(const TQString &where) for(TQStringList::Iterator libpathit = libpaths.begin(); libpathit != libpaths.end(); ++libpathit) { TQString r = (*libpathit), l = r; fixEnvVariables(l); - dirs.append(new MakefileDependDir(r.tqreplace("\"",""), l.tqreplace("\"",""))); + dirs.append(new MakefileDependDir(r.replace("\"",""), l.replace("\"",""))); } } dirs.setAutoDelete(TRUE); @@ -345,19 +345,19 @@ Win32MakefileGenerator::tqfindLibraries(const TQString &where) } if(opt.startsWith("/LIBPATH:")) { TQString r = opt.mid(9), l = Option::fixPathToLocalOS(r); - dirs.append(new MakefileDependDir(r.tqreplace("\"",""), - l.tqreplace("\"",""))); + dirs.append(new MakefileDependDir(r.replace("\"",""), + l.replace("\"",""))); } else if(opt.startsWith("-L") || opt.startsWith("/L")) { TQString r = opt.mid(2), l = Option::fixPathToLocalOS(r); - dirs.append(new MakefileDependDir(r.tqreplace("\"",""), - l.tqreplace("\"",""))); + dirs.append(new MakefileDependDir(r.replace("\"",""), + l.replace("\"",""))); remove = TRUE; //we eat this switch } else if(opt.startsWith("-l") || opt.startsWith("/l")) { TQString lib = opt.right(opt.length() - 2), out; if(!lib.isEmpty()) { for(MakefileDependDir *mdd = dirs.first(); mdd; mdd = dirs.next() ) { TQString extension; - int ver = tqfindHighestVersion(mdd->local_dir, lib); + int ver = findHighestVersion(mdd->local_dir, lib); if(ver > 0) extension += TQString::number(ver); extension += ".lib"; @@ -369,7 +369,7 @@ Win32MakefileGenerator::tqfindLibraries(const TQString &where) } } if(out.isEmpty()) { - remove = TRUE; //just eat it since we cannot tqfind one.. + remove = TRUE; //just eat it since we cannot find one.. } else { modified_opt = TRUE; (*it) = out; @@ -377,11 +377,11 @@ Win32MakefileGenerator::tqfindLibraries(const TQString &where) } else if(!TQFile::exists(Option::fixPathToLocalOS(opt))) { TQPtrList<MakefileDependDir> lib_dirs; TQString file = opt; - int slsh = file.tqfindRev(Option::dir_sep); + int slsh = file.findRev(Option::dir_sep); if(slsh != -1) { TQString r = file.left(slsh+1), l = r; fixEnvVariables(l); - lib_dirs.append(new MakefileDependDir(r.tqreplace("\"",""), l.tqreplace("\"",""))); + lib_dirs.append(new MakefileDependDir(r.replace("\"",""), l.replace("\"",""))); file = file.right(file.length() - slsh - 1); } else { lib_dirs = dirs; @@ -393,7 +393,7 @@ Win32MakefileGenerator::tqfindLibraries(const TQString &where) if(!file.at(file.length()-1).isNumber()) { for(MakefileDependDir *mdd = lib_dirs.first(); mdd; mdd = lib_dirs.next() ) { TQString lib_tmpl(file + "%1" + ".lib"); - int ver = tqfindHighestVersion(mdd->local_dir, file); + int ver = findHighestVersion(mdd->local_dir, file); if(ver != -1) { if(ver) lib_tmpl = lib_tmpl.arg(ver); @@ -437,8 +437,8 @@ Win32MakefileGenerator::processPrlFiles() for(TQStringList::Iterator libpathit = libpaths.begin(); libpathit != libpaths.end(); ++libpathit) { TQString r = (*libpathit), l = r; fixEnvVariables(l); - libdirs.append(new MakefileDependDir(r.tqreplace("\"",""), - l.tqreplace("\"",""))); + libdirs.append(new MakefileDependDir(r.replace("\"",""), + l.replace("\"",""))); } } for(bool ret = FALSE; TRUE; ret = FALSE) { @@ -454,8 +454,8 @@ Win32MakefileGenerator::processPrlFiles() if(opt.startsWith("/LIBPATH:")) { TQString r = opt.mid(9), l = r; fixEnvVariables(l); - libdirs.append(new MakefileDependDir(r.tqreplace("\"",""), - l.tqreplace("\"",""))); + libdirs.append(new MakefileDependDir(r.replace("\"",""), + l.replace("\"",""))); } } else { if(!processed[opt]) { diff --git a/tqtinterface/qt4/qmake/generators/win32/winmakefile.h b/tqtinterface/qt4/qmake/generators/win32/winmakefile.h index 67a4ee9..6233f4c 100644 --- a/tqtinterface/qt4/qmake/generators/win32/winmakefile.h +++ b/tqtinterface/qt4/qmake/generators/win32/winmakefile.h @@ -53,10 +53,10 @@ class Win32MakefileGenerator : public MakefileGenerator { protected: virtual void writeSubDirs(TQTextStream &t); - int tqfindHighestVersion(const TQString &dir, const TQString &stem); - bool tqfindLibraries(const TQString &); - TQString tqfindDependency(const TQString &); - virtual bool tqfindLibraries(); + int findHighestVersion(const TQString &dir, const TQString &stem); + bool findLibraries(const TQString &); + TQString findDependency(const TQString &); + virtual bool findLibraries(); virtual void processPrlFiles(); public: @@ -67,8 +67,8 @@ public: inline Win32MakefileGenerator::~Win32MakefileGenerator() { } -inline bool Win32MakefileGenerator::tqfindLibraries() -{ return tqfindLibraries("TQMAKE_LIBS"); } +inline bool Win32MakefileGenerator::findLibraries() +{ return findLibraries("TQMAKE_LIBS"); } |