diff options
Diffstat (limited to 'tqtinterface/qt4/qmake/option.cpp')
| -rw-r--r-- | tqtinterface/qt4/qmake/option.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tqtinterface/qt4/qmake/option.cpp b/tqtinterface/qt4/qmake/option.cpp index 1d44b72..04c1771 100644 --- a/tqtinterface/qt4/qmake/option.cpp +++ b/tqtinterface/qt4/qmake/option.cpp @@ -107,7 +107,7 @@ TQString Option::mkfile::qmakespec_commandline; static Option::TQMAKE_MODE default_mode(TQString progname) { - int s = progname.tqfindRev(Option::dir_sep); + int s = progname.findRev(Option::dir_sep); if(s != -1) progname = progname.right(progname.length() - (s + 1)); if(progname == "qmakegen") @@ -134,7 +134,7 @@ bool usage(const char *a0) "\t defaults to %s\n" "\t-makefile Put qmake into makefile generation mode%s\n" "\t In this mode qmake interprets files as project files to\n" - "\t be processed, if skipped qmake will try to tqfind a project\n" + "\t be processed, if skipped qmake will try to find a project\n" "\t file in your current working directory\n" "\n" "Warnings Options:\n" @@ -275,7 +275,7 @@ Option::internalParseCommandLine(int argc, char **argv, int skip) } } else { TQString arg = argv[x]; - if(arg.tqfind('=') != -1) { + if(arg.find('=') != -1) { if(before) Option::before_user_vars.append(arg); else @@ -382,7 +382,7 @@ Option::parseCommandLine(int argc, char **argv) //try REALLY hard to do it for them, lazy.. if(Option::mkfile::project_files.isEmpty()) { TQString pwd = TQDir::currentDirPath(), - proj = pwd + "/" + pwd.right(pwd.length() - (pwd.tqfindRev('/') + 1)) + ".pro"; + proj = pwd + "/" + pwd.right(pwd.length() - (pwd.findRev('/') + 1)) + ".pro"; if(TQFile::exists(proj)) { Option::mkfile::project_files.append(proj); } else { //last try.. @@ -456,7 +456,7 @@ void fixEnvVariables(TQString &x) TQRegExp reg_var("\\$\\(.*\\)"); reg_var.setMinimal( TRUE ); while((rep = reg_var.search(x)) != -1) - x.tqreplace(rep, reg_var.matchedLength(), TQString(getenv(TQT_TQSTRING(x.mid(rep + 2, reg_var.matchedLength() - 3)).latin1()))); + x.replace(rep, reg_var.matchedLength(), TQString(getenv(TQT_TQSTRING(x.mid(rep + 2, reg_var.matchedLength() - 3)).latin1()))); } static TQString fixPath(TQString x) { @@ -486,11 +486,11 @@ Option::fixPathToTargetOS(const TQString& in, bool fix_env, bool canonical) tmp = fixPath(tmp); TQString rep; if(Option::target_mode == TARG_MAC9_MODE) - tmp = TQT_TQSTRING(tmp.tqreplace('/', Option::dir_sep)).tqreplace('\\', Option::dir_sep); + tmp = TQT_TQSTRING(tmp.replace('/', Option::dir_sep)).replace('\\', Option::dir_sep); else if(Option::target_mode == TARG_WIN_MODE) - tmp = tmp.tqreplace('/', Option::dir_sep); + tmp = tmp.replace('/', Option::dir_sep); else - tmp = tmp.tqreplace('\\', Option::dir_sep); + tmp = tmp.replace('\\', Option::dir_sep); return tmp; } @@ -503,9 +503,9 @@ Option::fixPathToLocalOS(const TQString& in, bool fix_env, bool canonical) if(canonical) tmp = fixPath(tmp); #if defined(TQ_OS_WIN32) - return tmp.tqreplace('/', '\\'); + return tmp.replace('/', '\\'); #else - return tmp.tqreplace('\\', '/'); + return tmp.replace('\\', '/'); #endif } |