diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:57:30 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:57:30 -0600 |
commit | ad1fc5fc8eadb9b63e8767e57ac41cbac84f7eb7 (patch) | |
tree | c47273eb6595f763c282d33fb89affe1f8866120 /src/tools/gui | |
parent | 9d6927a7d6a543332f828bffedf65eecf6774c6d (diff) | |
download | piklab-ad1fc5fc8eadb9b63e8767e57ac41cbac84f7eb7.tar.gz piklab-ad1fc5fc8eadb9b63e8767e57ac41cbac84f7eb7.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 9d6927a7d6a543332f828bffedf65eecf6774c6d.
Diffstat (limited to 'src/tools/gui')
-rw-r--r-- | src/tools/gui/tool_config_widget.h | 2 | ||||
-rw-r--r-- | src/tools/gui/toolchain_config_center.cpp | 2 | ||||
-rw-r--r-- | src/tools/gui/toolchain_config_widget.cpp | 26 |
3 files changed, 15 insertions, 15 deletions
diff --git a/src/tools/gui/tool_config_widget.h b/src/tools/gui/tool_config_widget.h index be01cdb..f9239b3 100644 --- a/src/tools/gui/tool_config_widget.h +++ b/src/tools/gui/tool_config_widget.h @@ -11,7 +11,7 @@ #define TOOL_CONFIG_WIDGET_H #include <tqcombobox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtabwidget.h> #include <tqvaluevector.h> #include <kcombobox.h> 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 <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <kiconloader.h> #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 <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtooltip.h> #include <tqgroupbox.h> #include <tqtabwidget.h> @@ -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<TQString> 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("<qt><b>Command for executable detection:</b><br>%1<br>").arg(_data[k].command); - s += i18n("<b>Version string:</b><br>%1<br></qt>").arg(_data[k].checkLines.join("<br>")); + s += i18n("<qt><b>Command for executable detection:</b><br>%1<br>").tqarg(_data[k].command); + s += i18n("<b>Version string:</b><br>%1<br></qt>").tqarg(_data[k].checkLines.join("<br>")); } 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; i<nb; i++) { - if ( nb==1 ) s += i18n("<qt><b>Command for devices detection:</b><br>%1<br>").arg(_devicesData[i].command); - else s += i18n("<qt><b>Command #%1 for devices detection:</b><br>%2<br>").arg(i+1).arg(_devicesData[i].command); + if ( nb==1 ) s += i18n("<qt><b>Command for devices detection:</b><br>%1<br>").tqarg(_devicesData[i].command); + else s += i18n("<qt><b>Command #%1 for devices detection:</b><br>%2<br>").tqarg(i+1).tqarg(_devicesData[i].command); TQString ss = _devicesData[i].checkLines.join("<br>"); - if ( nb==1 ) s += i18n("<b>Device string:</b><br>%1<br>").arg(ss); - else s += i18n("<b>Device string #%1:</b><br>%2<br>").arg(i+1).arg(ss); + if ( nb==1 ) s += i18n("<b>Device string:</b><br>%1<br>").tqarg(ss); + else s += i18n("<b>Device string #%1:</b><br>%2<br>").tqarg(i+1).tqarg(ss); } } MessageBox::text(s, Log::Show); |