From ad1fc5fc8eadb9b63e8767e57ac41cbac84f7eb7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:57:30 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 9d6927a7d6a543332f828bffedf65eecf6774c6d. --- src/tools/base/tool_group.cpp | 4 ++-- src/tools/boost/boostbasic.cpp | 2 +- src/tools/boost/boostc.cpp | 2 +- src/tools/boost/boostcpp.cpp | 2 +- src/tools/c18/c18.cpp | 2 +- src/tools/cc5x/cc5x.cpp | 2 +- src/tools/ccsc/ccsc.cpp | 2 +- src/tools/ccsc/ccsc_compile.cpp | 2 +- src/tools/gputils/gputils.cpp | 2 +- src/tools/gputils/gputils_generator.cpp | 4 ++-- src/tools/gui/tool_config_widget.h | 2 +- src/tools/gui/toolchain_config_center.cpp | 2 +- src/tools/gui/toolchain_config_widget.cpp | 26 +++++++++++++------------- src/tools/jal/jal.cpp | 2 +- src/tools/jalv2/jalv2.cpp | 2 +- src/tools/list/compile_manager.cpp | 6 +++--- src/tools/list/compile_process.cpp | 2 +- src/tools/mpc/mpc.cpp | 2 +- src/tools/mpc/mpc_compile.cpp | 2 +- src/tools/pic30/pic30.cpp | 2 +- src/tools/picc/picc.cpp | 6 +++--- src/tools/sdcc/sdcc.cpp | 2 +- 22 files changed, 40 insertions(+), 40 deletions(-) (limited to 'src/tools') diff --git a/src/tools/base/tool_group.cpp b/src/tools/base/tool_group.cpp index 9aacd24..ac5c75e 100644 --- a/src/tools/base/tool_group.cpp +++ b/src/tools/base/tool_group.cpp @@ -125,9 +125,9 @@ bool Tool::Group::check(const TQString &device, Log::Generic *log) const { const_cast(this)->checkInitSupported(); if ( hasCheckDevicesError() ) - return (log ? log->askContinue(i18n("There were errors detecting supported devices for the selected toolchain (%1). Please check the toolchain configuration. Continue anyway?").arg(label())) : false); + return (log ? log->askContinue(i18n("There were errors detecting supported devices for the selected toolchain (%1). Please check the toolchain configuration. Continue anyway?").tqarg(label())) : false); if ( !device.isEmpty() && device!=Device::AUTO_DATA.name && !isSupported(device) ) - return (log ? log->askContinue(i18n("The selected toolchain (%1) does not support device %2. Continue anyway?").arg(label()).arg(device)) : false); + return (log ? log->askContinue(i18n("The selected toolchain (%1) does not support device %2. Continue anyway?").tqarg(label()).tqarg(device)) : false); return true; } diff --git a/src/tools/boost/boostbasic.cpp b/src/tools/boost/boostbasic.cpp index 4bec1e9..dc449f8 100644 --- a/src/tools/boost/boostbasic.cpp +++ b/src/tools/boost/boostbasic.cpp @@ -19,7 +19,7 @@ bool Boost::CompilerBasic::checkExecutableResult(bool, TQStringList &lines) cons //---------------------------------------------------------------------------- TQString Boost::GroupBasic::informationText() const { - return i18n("BoostBasic Compiler is a Basic compiler distributed by SourceBoost Technologies.").arg("http://www.sourceboost.com/Products/BoostBasic/Overview.html"); + return i18n("BoostBasic Compiler is a Basic compiler distributed by SourceBoost Technologies.").tqarg("http://www.sourceboost.com/Products/BoostBasic/Overview.html"); } Tool::SourceGenerator *Boost::GroupBasic::sourceGeneratorFactory() const diff --git a/src/tools/boost/boostc.cpp b/src/tools/boost/boostc.cpp index 13d7ad2..74047a0 100644 --- a/src/tools/boost/boostc.cpp +++ b/src/tools/boost/boostc.cpp @@ -19,7 +19,7 @@ bool Boost::CompilerC::checkExecutableResult(bool, TQStringList &lines) const //---------------------------------------------------------------------------- TQString Boost::GroupC::informationText() const { - return i18n("BoostC Compiler is a C compiler distributed by SourceBoost Technologies.").arg("http://www.sourceboost.com/Products/BoostC/Overview.html"); + return i18n("BoostC Compiler is a C compiler distributed by SourceBoost Technologies.").tqarg("http://www.sourceboost.com/Products/BoostC/Overview.html"); } Tool::SourceGenerator *Boost::GroupC::sourceGeneratorFactory() const diff --git a/src/tools/boost/boostcpp.cpp b/src/tools/boost/boostcpp.cpp index 7e4b968..7b83314 100644 --- a/src/tools/boost/boostcpp.cpp +++ b/src/tools/boost/boostcpp.cpp @@ -20,7 +20,7 @@ bool Boost::CompilerCpp::checkExecutableResult(bool, TQStringList &lines) const //---------------------------------------------------------------------------- TQString Boost::GroupCpp::informationText() const { - return i18n("BoostC++ Compiler is a C compiler distributed by SourceBoost Technologies.").arg("http://www.sourceboost.com/Products/BoostCpp/Overview.html"); + return i18n("BoostC++ Compiler is a C compiler distributed by SourceBoost Technologies.").tqarg("http://www.sourceboost.com/Products/BoostCpp/Overview.html"); } Tool::SourceGenerator *Boost::GroupCpp::sourceGeneratorFactory() const diff --git a/src/tools/c18/c18.cpp b/src/tools/c18/c18.cpp index 8f23cb1..5c2b725 100644 --- a/src/tools/c18/c18.cpp +++ b/src/tools/c18/c18.cpp @@ -82,5 +82,5 @@ Tool::Group::BaseData C18::Group::baseFactory(Tool::Category category) const TQString C18::Group::informationText() const { - return i18n("C18 is a C compiler distributed by Microchip.").arg("http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&nodeId=1406&dDocName=en010014&part=SW006011"); + return i18n("C18 is a C compiler distributed by Microchip.").tqarg("http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&nodeId=1406&dDocName=en010014&part=SW006011"); } diff --git a/src/tools/cc5x/cc5x.cpp b/src/tools/cc5x/cc5x.cpp index 71025f8..65b7b98 100644 --- a/src/tools/cc5x/cc5x.cpp +++ b/src/tools/cc5x/cc5x.cpp @@ -52,7 +52,7 @@ Compile::Config *CC5X::Group::configFactory(::Project *project) const TQString CC5X::Group::informationText() const { - return i18n("CC5X is a C compiler distributed by B Knudsen Data.").arg("http://www.bknd.com/cc5x/index.shtml"); + return i18n("CC5X is a C compiler distributed by B Knudsen Data.").tqarg("http://www.bknd.com/cc5x/index.shtml"); } Tool::Group::BaseData CC5X::Group::baseFactory(Tool::Category category) const diff --git a/src/tools/ccsc/ccsc.cpp b/src/tools/ccsc/ccsc.cpp index 5973d6d..0b817a3 100644 --- a/src/tools/ccsc/ccsc.cpp +++ b/src/tools/ccsc/ccsc.cpp @@ -87,7 +87,7 @@ Compile::Config *CCSC::Group::configFactory(::Project *project) const TQString CCSC::Group::informationText() const { - return i18n("CCS Compiler is a C compiler distributed by CCS.").arg("http://www.ccsinfo.com/content.php?page=compilers"); + return i18n("CCS Compiler is a C compiler distributed by CCS.").tqarg("http://www.ccsinfo.com/content.php?page=compilers"); } Tool::Group::BaseData CCSC::Group::baseFactory(Tool::Category category) const diff --git a/src/tools/ccsc/ccsc_compile.cpp b/src/tools/ccsc/ccsc_compile.cpp index c988013..15ccedf 100644 --- a/src/tools/ccsc/ccsc_compile.cpp +++ b/src/tools/ccsc/ccsc_compile.cpp @@ -83,7 +83,7 @@ void CCSC::CompileFile::done(int code) PURL::Url url = PURL::Url(directory(), inputFilepath(0)).toExtension("err"); Log::StringView sview; PURL::File file(url, sview); - if ( !file.openForRead() ) doLog(Log::LineType::Error, i18n("Could not find error file (%1).").arg(url.pretty()), TQString(), 0); + if ( !file.openForRead() ) doLog(Log::LineType::Error, i18n("Could not find error file (%1).").tqarg(url.pretty()), TQString(), 0); else { TQStringList lines = file.readLines(); for (uint i=0; iGPUtils is an open-source assembler and linker suite.
").arg("http://gputils.sourceforge.net"); + return i18n("GPUtils is an open-source assembler and linker suite.
").tqarg("http://gputils.sourceforge.net"); } Tool::Group::BaseData GPUtils::Group::baseFactory(Tool::Category category) const diff --git a/src/tools/gputils/gputils_generator.cpp b/src/tools/gputils/gputils_generator.cpp index c3b67a8..7fd9a1f 100644 --- a/src/tools/gputils/gputils_generator.cpp +++ b/src/tools/gputils/gputils_generator.cpp @@ -77,8 +77,8 @@ SourceLine::List GPUtils::SourceGenerator::sourceFileContent(PURL::ToolType, con if ( !hasShared ) { for (uint i=1; i -#include +#include #include #include #include diff --git a/src/tools/gui/toolchain_config_center.cpp b/src/tools/gui/toolchain_config_center.cpp index f2a84fb..6948c3a 100644 --- a/src/tools/gui/toolchain_config_center.cpp +++ b/src/tools/gui/toolchain_config_center.cpp @@ -10,7 +10,7 @@ #include "toolchain_config_center.h" #include -#include +#include #include #include "tools/list/tools_config_widget.h" diff --git a/src/tools/gui/toolchain_config_widget.cpp b/src/tools/gui/toolchain_config_widget.cpp index e30a26d..1b92cc2 100644 --- a/src/tools/gui/toolchain_config_widget.cpp +++ b/src/tools/gui/toolchain_config_widget.cpp @@ -9,7 +9,7 @@ #include "toolchain_config_widget.h" #include -#include +#include #include #include #include @@ -162,8 +162,8 @@ void ToolchainConfigWidget::checkExecutableDone() _data[i].checkLines = _data[i].process->sout() + _data[i].process->serr(); const Tool::Base *base = _group.base(i); TQString exec = base->baseExecutable(withWine(), outputType()); - if ( base->checkExecutableResult(withWine(), _data[i].checkLines) ) _data[i].label->setText(i18n("\"%1\" found").arg(exec)); - else _data[i].label->setText(i18n("\"%1\" not recognized").arg(exec)); + if ( base->checkExecutableResult(withWine(), _data[i].checkLines) ) _data[i].label->setText(i18n("\"%1\" found").tqarg(exec)); + else _data[i].label->setText(i18n("\"%1\" not recognized").tqarg(exec)); break; } } @@ -185,7 +185,7 @@ void ToolchainConfigWidget::checkDevicesDone() if ( !_devicesData[i].done ) return; list += _group.getSupportedDevices(_devicesData[i].checkLines.join("\n")); } - _devicesLabel->setText(i18n("Detected (%1)").arg(list.count())); + _devicesLabel->setText(i18n("Detected (%1)").tqarg(list.count())); } bool ToolchainConfigWidget::withWine() const @@ -229,13 +229,13 @@ void ToolchainConfigWidget::detect() connect(_data[k].process, TQT_SIGNAL(done(int)), TQT_SLOT(checkExecutableDone())); connect(_data[k].process, TQT_SIGNAL(timeout()), TQT_SLOT(checkExecutableDone())); TQString exec = baseExecutable(k); - if ( !_data[k].process->start(10000) ) _data[k].label->setText(i18n("\"%1\" not found").arg(exec)); - else _data[k].label->setText(i18n("Detecting \"%1\"...").arg(exec)); + if ( !_data[k].process->start(10000) ) _data[k].label->setText(i18n("\"%1\" not found").tqarg(exec)); + else _data[k].label->setText(i18n("Detecting \"%1\"...").tqarg(exec)); } } if ( _group.checkDevicesCategory()==Tool::Category::Nb_Types ) { TQValueVector supported = _group.supportedDevices(); - _devicesLabel->setText(i18n("Hardcoded (%1)").arg(supported.count())); + _devicesLabel->setText(i18n("Hardcoded (%1)").tqarg(supported.count())); } else { for (uint i=0; i<_devicesData.count(); i++) { delete _devicesData[i].process; @@ -265,8 +265,8 @@ void ToolchainConfigWidget::showDetails() TQString s; const Tool::Base *base = _group.base(k); if ( base->checkExecutable() ) { - s += i18n("Command for executable detection:
%1
").arg(_data[k].command); - s += i18n("Version string:
%1
").arg(_data[k].checkLines.join("
")); + s += i18n("Command for executable detection:
%1
").tqarg(_data[k].command); + s += i18n("Version string:
%1
").tqarg(_data[k].checkLines.join("
")); } else s += i18n("This tool cannot be automatically detected."); MessageBox::text(s, Log::Show); break; @@ -290,11 +290,11 @@ void ToolchainConfigWidget::showDeviceDetails() } else { uint nb = _group.nbCheckDevices(); for (uint i=0; iCommand for devices detection:
%1
").arg(_devicesData[i].command); - else s += i18n("Command #%1 for devices detection:
%2
").arg(i+1).arg(_devicesData[i].command); + if ( nb==1 ) s += i18n("Command for devices detection:
%1
").tqarg(_devicesData[i].command); + else s += i18n("Command #%1 for devices detection:
%2
").tqarg(i+1).tqarg(_devicesData[i].command); TQString ss = _devicesData[i].checkLines.join("
"); - if ( nb==1 ) s += i18n("Device string:
%1
").arg(ss); - else s += i18n("Device string #%1:
%2
").arg(i+1).arg(ss); + if ( nb==1 ) s += i18n("Device string:
%1
").tqarg(ss); + else s += i18n("Device string #%1:
%2
").tqarg(i+1).tqarg(ss); } } MessageBox::text(s, Log::Show); diff --git a/src/tools/jal/jal.cpp b/src/tools/jal/jal.cpp index 57ba097..973e0b8 100644 --- a/src/tools/jal/jal.cpp +++ b/src/tools/jal/jal.cpp @@ -28,7 +28,7 @@ bool JAL::Base::checkExecutableResult(bool, TQStringList &lines) const //---------------------------------------------------------------------------- TQString JAL::Group::informationText() const { - return i18n("JAL is a high-level language for PIC microcontrollers.").arg("http://jal.sourceforge.net"); + return i18n("JAL is a high-level language for PIC microcontrollers.").tqarg("http://jal.sourceforge.net"); } Tool::Group::BaseData JAL::Group::baseFactory(Tool::Category category) const diff --git a/src/tools/jalv2/jalv2.cpp b/src/tools/jalv2/jalv2.cpp index ce06dbd..9bf0b26 100644 --- a/src/tools/jalv2/jalv2.cpp +++ b/src/tools/jalv2/jalv2.cpp @@ -28,7 +28,7 @@ bool JALV2::Base::checkExecutableResult(bool, TQStringList &lines) const //---------------------------------------------------------------------------- TQString JALV2::Group::informationText() const { - return i18n("JAL V2 is a new compiler for the high-level language JAL.").arg("http://www.casadeyork.com/jalv2"); + return i18n("JAL V2 is a new compiler for the high-level language JAL.").tqarg("http://www.casadeyork.com/jalv2"); } Tool::Group::BaseData JALV2::Group::baseFactory(Tool::Category category) const diff --git a/src/tools/list/compile_manager.cpp b/src/tools/list/compile_manager.cpp index 28f7aa6..db71eaf 100644 --- a/src/tools/list/compile_manager.cpp +++ b/src/tools/list/compile_manager.cpp @@ -108,7 +108,7 @@ bool Compile::Manager::setupCompile() if ( _operations!=Clean ) { TQString e = PURL::extensions(type); MessageBox::detailedSorry(i18n("The selected toolchain (%1) cannot compile file. It only supports files with extensions: %2") - .arg(Main::toolGroup().label()).arg(e), i18n("File: %1").arg(_items[i].url.pretty()), Log::Show); + .tqarg(Main::toolGroup().label()).tqarg(e), i18n("File: %1").tqarg(_items[i].url.pretty()), Log::Show); Log::Base::log(Log::LineType::Error, i18n("*** Aborted ***"), Log::Delayed); processFailed(); } @@ -133,7 +133,7 @@ bool Compile::Manager::setupAssemble() if ( type==PURL::Nb_FileTypes ) type = Main::toolGroup().implementationType(PURL::ToolType::Compiler); TQString e = PURL::extensions(type); MessageBox::detailedSorry(i18n("The selected toolchain (%1) cannot assemble file. It only supports files with extensions: %2") - .arg(Main::toolGroup().label()).arg(e), i18n("File: %1").arg(_items[i].url.pretty()), Log::Show); + .tqarg(Main::toolGroup().label()).tqarg(e), i18n("File: %1").tqarg(_items[i].url.pretty()), Log::Show); Log::Base::log(Log::LineType::Error, i18n("*** Aborted ***"), Log::Delayed); processFailed(); } @@ -274,7 +274,7 @@ void Compile::Manager::startCustomCommand() Compile::Data data(Tool::Category::Nb_Types, _todo, Main::device(), Main::project(), _type); _base->init(data, this); if ( !_base->start() ) { - Log::Base::log(Log::LineType::Error, i18n("Failed to execute custom command #%1.").arg(_customCommandIndex+1), Log::Delayed); + Log::Base::log(Log::LineType::Error, i18n("Failed to execute custom command #%1.").tqarg(_customCommandIndex+1), Log::Delayed); processFailed(); } } diff --git a/src/tools/list/compile_process.cpp b/src/tools/list/compile_process.cpp index 7ec09d8..a22f47d 100644 --- a/src/tools/list/compile_process.cpp +++ b/src/tools/list/compile_process.cpp @@ -137,7 +137,7 @@ bool Compile::BaseProcess::start() void Compile::BaseProcess::done(int code) { if ( code!=0 ) { - _manager->log(Log::LineType::Error, i18n("*** Exited with status: %1 ***").arg(code)); + _manager->log(Log::LineType::Error, i18n("*** Exited with status: %1 ***").tqarg(code)); _manager->processFailed(); } else if ( _manager->hasError() ) { _manager->log(Log::LineType::Error, i18n("*** Error ***")); diff --git a/src/tools/mpc/mpc.cpp b/src/tools/mpc/mpc.cpp index e170f30..8abb74e 100644 --- a/src/tools/mpc/mpc.cpp +++ b/src/tools/mpc/mpc.cpp @@ -47,7 +47,7 @@ Compile::Config *MPC::Group::configFactory(::Project *project) const TQString MPC::Group::informationText() const { - return i18n("MPC Compiler is a C compiler distributed by Byte Craft.").arg("http://www.bytecraft.com/mpccaps.html"); + return i18n("MPC Compiler is a C compiler distributed by Byte Craft.").tqarg("http://www.bytecraft.com/mpccaps.html"); } Tool::Group::BaseData MPC::Group::baseFactory(Tool::Category category) const diff --git a/src/tools/mpc/mpc_compile.cpp b/src/tools/mpc/mpc_compile.cpp index 22e0969..8c39e3c 100644 --- a/src/tools/mpc/mpc_compile.cpp +++ b/src/tools/mpc/mpc_compile.cpp @@ -37,7 +37,7 @@ void MPC::CompileFile::done(int code) PURL::Url url = PURL::Url(directory(), inputFilepath(0)).toExtension("err"); Log::StringView sview; PURL::File file(url, sview); - if ( !file.openForRead() ) doLog(Log::LineType::Error, i18n("Could not find error file (%1).").arg(url.pretty()), TQString(), 0); + if ( !file.openForRead() ) doLog(Log::LineType::Error, i18n("Could not find error file (%1).").tqarg(url.pretty()), TQString(), 0); else { TQStringList lines = file.readLines(); for (uint i=0; iPIC30 ToolChain is a toolsuite for 16-bit PICs available from Microchip. Most of it is available under the GNU Public License.").arg("http://microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&nodeId=1406&dDocName=en010065&part=SW006012"); + return i18n("The PIC30 ToolChain is a toolsuite for 16-bit PICs available from Microchip. Most of it is available under the GNU Public License.").tqarg("http://microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&nodeId=1406&dDocName=en010065&part=SW006012"); } Tool::Group::BaseData PIC30::Group::baseFactory(Tool::Category category) const diff --git a/src/tools/picc/picc.cpp b/src/tools/picc/picc.cpp index 4581af4..46ece11 100644 --- a/src/tools/picc/picc.cpp +++ b/src/tools/picc/picc.cpp @@ -90,7 +90,7 @@ PURL::FileType PICC::Group::implementationType(PURL::ToolType type) const //---------------------------------------------------------------------------- TQString PICC::PICCLiteGroup::informationText() const { - return i18n("PICC-Lite is a freeware C compiler distributed by HTSoft.").arg("http://www.htsoft.com"); + return i18n("PICC-Lite is a freeware C compiler distributed by HTSoft.").tqarg("http://www.htsoft.com"); } Tool::Group::BaseData PICC::PICCLiteGroup::baseFactory(Tool::Category category) const @@ -103,7 +103,7 @@ Tool::Group::BaseData PICC::PICCLiteGroup::baseFactory(Tool::Category category) //---------------------------------------------------------------------------- TQString PICC::PICCGroup::informationText() const { - return i18n("PICC is a C compiler distributed by HTSoft.").arg("http://www.htsoft.com"); + return i18n("PICC is a C compiler distributed by HTSoft.").tqarg("http://www.htsoft.com"); } Tool::Group::BaseData PICC::PICCGroup::baseFactory(Tool::Category category) const @@ -116,7 +116,7 @@ Tool::Group::BaseData PICC::PICCGroup::baseFactory(Tool::Category category) cons //---------------------------------------------------------------------------- TQString PICC::PICC18Group::informationText() const { - return i18n("PICC 18 is a C compiler distributed by HTSoft.").arg("http://www.htsoft.com"); + return i18n("PICC 18 is a C compiler distributed by HTSoft.").tqarg("http://www.htsoft.com"); } Tool::Group::BaseData PICC::PICC18Group::baseFactory(Tool::Category category) const diff --git a/src/tools/sdcc/sdcc.cpp b/src/tools/sdcc/sdcc.cpp index d61e0a9..bc3724d 100644 --- a/src/tools/sdcc/sdcc.cpp +++ b/src/tools/sdcc/sdcc.cpp @@ -25,7 +25,7 @@ bool SDCC::Base::checkExecutableResult(bool, TQStringList &lines) const //---------------------------------------------------------------------------- TQString SDCC::Group::informationText() const { - return i18n("The Small Devices C Compiler is an open-source C compiler for several families of microcontrollers.").arg("http://sdcc.sourceforge.net"); + return i18n("The Small Devices C Compiler is an open-source C compiler for several families of microcontrollers.").tqarg("http://sdcc.sourceforge.net"); } const ::Tool::Base *SDCC::Group::base(Tool::Category category) const -- cgit v1.2.1