summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/ccsc/ccsc.cpp2
-rw-r--r--src/tools/gui/toolchain_config_center.cpp2
-rw-r--r--src/tools/jal/jal.cpp2
-rw-r--r--src/tools/jal/jal_compile.cpp2
-rw-r--r--src/tools/jalv2/jalv2.cpp2
-rw-r--r--src/tools/list/compile_process.cpp36
-rw-r--r--src/tools/list/tools_config_widget.cpp4
-rw-r--r--src/tools/pic30/pic30.cpp2
-rw-r--r--src/tools/picc/picc.cpp2
9 files changed, 27 insertions, 27 deletions
diff --git a/src/tools/ccsc/ccsc.cpp b/src/tools/ccsc/ccsc.cpp
index c7b3098..0b817a3 100644
--- a/src/tools/ccsc/ccsc.cpp
+++ b/src/tools/ccsc/ccsc.cpp
@@ -100,7 +100,7 @@ VersionData CCSC::Group::getToolchainVersion()
{
if ( !Compile::Config::withWine(*this) ) {
TQStringList lines;
- if ( checkExecutable(Tool::Category::Compiler, lines) && lines.count()>=1 && lines[0].tqcontains("3.") ) return VersionData(3, 0, 0);
+ if ( checkExecutable(Tool::Category::Compiler, lines) && lines.count()>=1 && lines[0].contains("3.") ) return VersionData(3, 0, 0);
}
return VersionData(4, 0, 0); // default
}
diff --git a/src/tools/gui/toolchain_config_center.cpp b/src/tools/gui/toolchain_config_center.cpp
index 60df0f8..909c1f4 100644
--- a/src/tools/gui/toolchain_config_center.cpp
+++ b/src/tools/gui/toolchain_config_center.cpp
@@ -57,7 +57,7 @@ ToolchainsConfigCenter::ToolchainsConfigCenter(const Tool::Group &sgroup, TQWidg
void ToolchainsConfigCenter::aboutToShowPageSlot(TQWidget *page)
{
- if ( !_pages.tqcontains(page) ) _infoButton->hide();
+ if ( !_pages.contains(page) ) _infoButton->hide();
else {
_infoButton->show();
TQTimer::singleShot(0, _pages[page], TQT_SLOT(detect()));
diff --git a/src/tools/jal/jal.cpp b/src/tools/jal/jal.cpp
index 11e503d..973e0b8 100644
--- a/src/tools/jal/jal.cpp
+++ b/src/tools/jal/jal.cpp
@@ -20,7 +20,7 @@ bool JAL::Base::checkExecutableResult(bool, TQStringList &lines) const
{
TQStringList tmp;
for (uint i=0; i<lines.count(); i++)
- if ( !lines[i].tqcontains('\r') ) tmp += lines[i]; // ??
+ if ( !lines[i].contains('\r') ) tmp += lines[i]; // ??
lines = tmp;
return ( lines.count()>0 && lines[0].startsWith("jal") );
}
diff --git a/src/tools/jal/jal_compile.cpp b/src/tools/jal/jal_compile.cpp
index aa7d42f..e36ffc2 100644
--- a/src/tools/jal/jal_compile.cpp
+++ b/src/tools/jal/jal_compile.cpp
@@ -10,7 +10,7 @@
void JAL::CompileFile::logStderrLine(const TQString &line)
{
- if ( line.tqcontains('\r') ) return; // what are those lines ?
+ if ( line.contains('\r') ) return; // what are those lines ?
// #### TODO
doLog(Log::LineType::Normal, line, TQString(), 0); // unrecognized
}
diff --git a/src/tools/jalv2/jalv2.cpp b/src/tools/jalv2/jalv2.cpp
index 8ea6d1e..9bf0b26 100644
--- a/src/tools/jalv2/jalv2.cpp
+++ b/src/tools/jalv2/jalv2.cpp
@@ -20,7 +20,7 @@ bool JALV2::Base::checkExecutableResult(bool, TQStringList &lines) const
{
TQStringList tmp;
for (uint i=0; i<lines.count(); i++)
- if ( !lines[i].tqcontains('\r') ) tmp += lines[i]; // ??
+ if ( !lines[i].contains('\r') ) tmp += lines[i]; // ??
lines = tmp;
return ( lines.count()>0 && lines[0].startsWith("jal") );
}
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;
diff --git a/src/tools/list/tools_config_widget.cpp b/src/tools/list/tools_config_widget.cpp
index 43ca04c..3ec6235 100644
--- a/src/tools/list/tools_config_widget.cpp
+++ b/src/tools/list/tools_config_widget.cpp
@@ -97,7 +97,7 @@ void ToolsConfigWidget::toolChanged()
FOR_EACH(Tool::Category, k) {
_tabWidget->removePage(_stacks[k]->widget());
_stacks[k]->widget()->hide();
- if ( _stacks[k]->tqcontains(name) ) {
+ if ( _stacks[k]->contains(name) ) {
_stacks[k]->setCurrentItem(name);
_stacks[k]->widget()->show();
_tabWidget->addTab(_stacks[k]->widget(), i18n(k.data().title));
@@ -131,7 +131,7 @@ void ToolsConfigWidget::saveConfig()
_project->setOutputType(_output->currentItem());
Compile::Config::setCustomCommands(_project, _commandsEditor->texts());
FOR_EACH(Tool::Category, k) {
- if ( !_stacks[k]->tqcontains(name) ) continue;
+ if ( !_stacks[k]->contains(name) ) continue;
TQWidget *w = _stacks[k]->item(name);
static_cast<ToolConfigWidget *>(w)->saveConfig();
}
diff --git a/src/tools/pic30/pic30.cpp b/src/tools/pic30/pic30.cpp
index e846719..7fca15d 100644
--- a/src/tools/pic30/pic30.cpp
+++ b/src/tools/pic30/pic30.cpp
@@ -49,7 +49,7 @@ bool PIC30::Base::checkExecutableResult(bool, TQStringList &lines) const
case Tool::Category::Compiler: return lines[0].startsWith("pic30");
case Tool::Category::Assembler: return lines[0].startsWith("GNU assembler");
case Tool::Category::Linker: return lines[0].startsWith("GNU ld");
- case Tool::Category::BinToHex: return lines.join(" ").tqcontains("Microchip ");
+ case Tool::Category::BinToHex: return lines.join(" ").contains("Microchip ");
case Tool::Category::Librarian: return lines[0].startsWith("GNU ar");
case Tool::Category::Nb_Types: break;
}
diff --git a/src/tools/picc/picc.cpp b/src/tools/picc/picc.cpp
index 060aa4c..46ece11 100644
--- a/src/tools/picc/picc.cpp
+++ b/src/tools/picc/picc.cpp
@@ -19,7 +19,7 @@
//----------------------------------------------------------------------------
bool PICC::Base::checkExecutableResult(bool, TQStringList &lines) const
{
- return lines.join(" ").tqcontains("HI-TECH");
+ return lines.join(" ").contains("HI-TECH");
}
TQString PICC::BaseLite::baseExecutable(bool, Tool::OutputExecutableType) const
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-13 04:26:23 +0000