diff options
Diffstat (limited to 'src/tools/list/compile_process.cpp')
-rw-r--r-- | src/tools/list/compile_process.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/tools/list/compile_process.cpp b/src/tools/list/compile_process.cpp index 4d24e88..6ac5d26 100644 --- a/src/tools/list/compile_process.cpp +++ b/src/tools/list/compile_process.cpp @@ -93,7 +93,7 @@ void Compile::LogWidget::appendLine(Log::DebugLevel level, const TQString &messa void Compile::LogWidget::lineClicked(int line) { - if ( !_map.tqcontains(line) ) return; + if ( !_map.contains(line) ) return; PURL::Url url = PURL::Url::fromPathOrUrl(_map[line].filepath); TextEditor *e = ::tqqt_cast<TextEditor *>(Main::editorManager().openEditor(url)); if ( e==0 ) return; @@ -230,7 +230,7 @@ Compile::FileData::List Compile::Process::files(bool *ok) const bool Compile::Process::checkIs(const TQString &s, const TQString &key) { - if ( !s.tqcontains(key) ) return false; + if ( !s.contains(key) ) return false; if ( s!=key ) qWarning("Argument should be only %s, the rest will be ignored...", key.latin1()); return true; } @@ -250,9 +250,9 @@ TQStringList Compile::Process::arguments() const PURL::Url lkr = Main::toolGroup().linkerScript(_data.project, _data.linkType); TQStringList nargs; for (uint i=0; i<args.count(); i++) { - if ( args[i].tqcontains("$(SRCPATH)") ) { - args[i].tqreplace("$(SRCPATH)", directory().path()); - args[i].tqreplace("//", "/"); + if ( args[i].contains("$(SRCPATH)") ) { + args[i].replace("$(SRCPATH)", directory().path()); + args[i].replace("//", "/"); } args[i] = replaceIf(args[i], "WINE", withWine); args[i] = replaceIf(args[i], "LKR", hasLinkerScript()); @@ -270,19 +270,19 @@ TQStringList Compile::Process::arguments() const if (_data.project) nargs += _data.project->librariesForLinker(TQString(), withWine); continue; } - args[i].tqreplace("%OBJECT", filepath(PURL::Object)); // before %O - args[i].tqreplace("%O", outputFilepath()); - args[i].tqreplace("%COFF", filepath(PURL::Coff)); - if (_data.project) args[i].tqreplace("%PROJECT", _data.project->name()); - else args[i].tqreplace("%PROJECT", url().basename()); - args[i].tqreplace("%MAP", filepath(PURL::Map)); - args[i].tqreplace("%SYM", url().toExtension("sym").relativeTo(directory(), withWine ? PURL::WindowsSeparator : PURL::UnixSeparator)); - args[i].tqreplace("%LIST", filepath(PURL::Lst)); - args[i].tqreplace("%DEVICE", deviceName()); - args[i].tqreplace("%FAMILY", familyName()); - args[i].tqreplace("%LKR_PATH", lkr.path()); // before %LKR - args[i].tqreplace("%LKR_NAME", lkr.filename()); // before LKR - args[i].tqreplace("%LKR", lkr.filepath()); + args[i].replace("%OBJECT", filepath(PURL::Object)); // before %O + args[i].replace("%O", outputFilepath()); + args[i].replace("%COFF", filepath(PURL::Coff)); + if (_data.project) args[i].replace("%PROJECT", _data.project->name()); + else args[i].replace("%PROJECT", url().basename()); + args[i].replace("%MAP", filepath(PURL::Map)); + args[i].replace("%SYM", url().toExtension("sym").relativeTo(directory(), withWine ? PURL::WindowsSeparator : PURL::UnixSeparator)); + args[i].replace("%LIST", filepath(PURL::Lst)); + args[i].replace("%DEVICE", deviceName()); + args[i].replace("%FAMILY", familyName()); + args[i].replace("%LKR_PATH", lkr.path()); // before %LKR + args[i].replace("%LKR_NAME", lkr.filename()); // before LKR + args[i].replace("%LKR", lkr.filepath()); if ( checkIs(args[i], "%I") ) { for (uint k=0; k<nbFiles(); k++) nargs += inputFilepath(k); continue; |