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/progs/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/progs/gui')
-rw-r--r-- | src/progs/gui/hardware_config_widget.cpp | 8 | ||||
-rw-r--r-- | src/progs/gui/port_selector.cpp | 4 | ||||
-rw-r--r-- | src/progs/gui/port_selector.h | 4 | ||||
-rw-r--r-- | src/progs/gui/prog_config_center.cpp | 4 | ||||
-rw-r--r-- | src/progs/gui/prog_config_widget.cpp | 2 | ||||
-rw-r--r-- | src/progs/gui/prog_config_widget.h | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/src/progs/gui/hardware_config_widget.cpp b/src/progs/gui/hardware_config_widget.cpp index 82b0bab..193fdfb 100644 --- a/src/progs/gui/hardware_config_widget.cpp +++ b/src/progs/gui/hardware_config_widget.cpp @@ -47,7 +47,7 @@ Hardware::EditDialog::EditDialog(ConfigWidget *cwidget, const TQString &name, co _name = new TQLineEdit(name, plainPage()); grid->addWidget(_name, 0, 1); - label = new TQLabel(i18n("%1 at %2:").arg(pd.type.label()).arg(pd.device), plainPage()); + label = new TQLabel(i18n("%1 at %2:").tqarg(pd.type.label()).tqarg(pd.device), plainPage()); grid->addWidget(label, 1, 0); label = new TQLabel(plainPage()); grid->addWidget(label, 1, 1); @@ -73,7 +73,7 @@ void Hardware::EditDialog::slotOk() } TQStringList names = _cwidget->_config->hardwareNames(PortType::Nb_Types); // all hardwares if ( names.contains(_name->text()) ) { - if ( !MessageBox::askContinue(i18n("Do you want to overwrite this custom hardware \"%1\"?").arg(_name->text()), + if ( !MessageBox::askContinue(i18n("Do you want to overwrite this custom hardware \"%1\"?").tqarg(_name->text()), KStdGuiItem::save()) ) return; } delete _oldData; @@ -174,7 +174,7 @@ void Hardware::ConfigWidget::updateList(PortType type) _names = _config->hardwareNames(type); for (uint i=0; i<_names.count(); i++) { bool standard = _config->isStandardHardware(_names[i]); - TQString s = (standard ? _config->label(_names[i]) : i18n("%1 <custom>").arg(_names[i])); + TQString s = (standard ? _config->label(_names[i]) : i18n("%1 <custom>").tqarg(_names[i])); _configCombo->insertItem(s); } } @@ -196,7 +196,7 @@ void Hardware::ConfigWidget::editClicked() void Hardware::ConfigWidget::deleteClicked() { TQString name = _names[_configCombo->currentItem()]; - if ( !MessageBox::askContinue(i18n("Do you want to delete custom hardware \"%1\"?").arg(name), + if ( !MessageBox::askContinue(i18n("Do you want to delete custom hardware \"%1\"?").tqarg(name), KStdGuiItem::del()) ) return; _config->deleteCustomHardware(name); updateList(_hc->portDescription().type); diff --git a/src/progs/gui/port_selector.cpp b/src/progs/gui/port_selector.cpp index 27ecb12..f34d426 100644 --- a/src/progs/gui/port_selector.cpp +++ b/src/progs/gui/port_selector.cpp @@ -85,7 +85,7 @@ void PortSelector::addPortType(const Port::Description &pd) KTextBrowser *comment = new KTextBrowser(_main); TQString text = (notAvailable ? notAvailableMessage : noDeviceMessage); text += "<p>"; - text += i18n("<a href=\"%1\">See Piklab homepage for help</a>.").arg(Piklab::URLS[Piklab::Support]); + text += i18n("<a href=\"%1\">See Piklab homepage for help</a>.").tqarg(Piklab::URLS[Piklab::Support]); comment->setText(text); _grid->addMultiCellWidget(comment, 3*(_bgroup->count()-1)+1,3*(_bgroup->count()-1)+1, 0,3); } @@ -101,7 +101,7 @@ void PortSelector::addPortType(const Port::Description &pd) } } -void PortSelector::setStatus(PortType ptype, const TQString &message) +void PortSelector::settqStatus(PortType ptype, const TQString &message) { _pending = false; FOR_EACH(PortType, type) { diff --git a/src/progs/gui/port_selector.h b/src/progs/gui/port_selector.h index a9a53d0..5127976 100644 --- a/src/progs/gui/port_selector.h +++ b/src/progs/gui/port_selector.h @@ -11,7 +11,7 @@ #include <tqradiobutton.h> #include <tqcombobox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqbuttongroup.h> #include <tqlabel.h> @@ -27,7 +27,7 @@ public: void setGroup(const Programmer::Group &group); Port::Description portDescription() const { return Port::Description(type(), device(type())); } void saveConfig(); - void setStatus(PortType type, const TQString &message); + void settqStatus(PortType type, const TQString &message); signals: void changed(); diff --git a/src/progs/gui/prog_config_center.cpp b/src/progs/gui/prog_config_center.cpp index e2ab715..f781280 100644 --- a/src/progs/gui/prog_config_center.cpp +++ b/src/progs/gui/prog_config_center.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "prog_config_center.h" -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqwidgetstack.h> #include <tqcombobox.h> @@ -86,7 +86,7 @@ void Programmer::SelectConfigWidget::portChanged() delete config; TQWidget *w = _stack->item(_combo->currentItem()); bool ok = static_cast< ::Programmer::ConfigWidget *>(w)->setPort(hd); - _portSelector->setStatus(hd.port.type, ok ? i18n("Connection: Ok") : i18n("Connection: Error")); + _portSelector->settqStatus(hd.port.type, ok ? i18n("Connection: Ok") : i18n("Connection: Error")); } TQPixmap Programmer::SelectConfigWidget::pixmap() const diff --git a/src/progs/gui/prog_config_widget.cpp b/src/progs/gui/prog_config_widget.cpp index 01ee2f7..1578e3b 100644 --- a/src/progs/gui/prog_config_widget.cpp +++ b/src/progs/gui/prog_config_widget.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "prog_config_widget.h" -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqcombobox.h> #include <tqcheckbox.h> diff --git a/src/progs/gui/prog_config_widget.h b/src/progs/gui/prog_config_widget.h index 0ec3fd0..2da2330 100644 --- a/src/progs/gui/prog_config_widget.h +++ b/src/progs/gui/prog_config_widget.h @@ -32,7 +32,7 @@ public: virtual bool setPort(const HardwareDescription &hd); signals: - void updatePortStatus(bool ok); + void updatePorttqStatus(bool ok); protected: const Group &_group; |