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/libgui/device_gui.cpp | |
| 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/libgui/device_gui.cpp')
| -rw-r--r-- | src/libgui/device_gui.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libgui/device_gui.cpp b/src/libgui/device_gui.cpp index a064752..bb91cea 100644 --- a/src/libgui/device_gui.cpp +++ b/src/libgui/device_gui.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "device_gui.h" -#include <layout.h> +#include <tqlayout.h> #include <tqpainter.h> #include <tqcombobox.h> #include <tqlabel.h> @@ -147,7 +147,7 @@ DeviceChooser::Dialog::Dialog(const TQString &device, Type type, TQWidget *paren shbox = new TQHBoxLayout(vbox); // status filter - _statusCombo = new EnumComboBox<Device::Status>(i18n("<Status>"), "status", frame); + _statusCombo = new EnumComboBox<Device::tqStatus>(i18n("<Status>"), "status", frame); connect(_statusCombo->combo(), TQT_SIGNAL(activated(int)), TQT_SLOT(updateList())); shbox->addWidget(_statusCombo->combo()); @@ -260,12 +260,12 @@ void DeviceChooser::Dialog::updateList(const TQString &device) TQListViewItem *selected = 0; const Programmer::Group *pgroup = programmerGroup(); if ( pgroup && pgroup->supportedDevices().isEmpty() && pgroup->isSoftware() ) { - _deviceView->setText(i18n("Could not detect supported devices for \"%1\". Please check installation.").arg(pgroup->label())); + _deviceView->setText(i18n("Could not detect supported devices for \"%1\". Please check installation.").tqarg(pgroup->label())); return; } const Tool::Group *tgroup = toolGroup(); if ( tgroup && tgroup->supportedDevices().isEmpty() ) { - _deviceView->setText(i18n("Could not detect supported devices for toolchain \"%1\". Please check installation.").arg(tgroup->label())); + _deviceView->setText(i18n("Could not detect supported devices for toolchain \"%1\". Please check installation.").tqarg(tgroup->label())); return; } for (int i=list.count()-1; i>=0; i--) { @@ -274,7 +274,7 @@ void DeviceChooser::Dialog::updateList(const TQString &device) const Device::Data *data = Device::lister().data(list[i]); Q_ASSERT(data); if ( _memoryCombo->value()!=Device::MemoryTechnology::Nb_Types && data->memoryTechnology()!=_memoryCombo->value() ) continue; - if ( _statusCombo->value()!=Device::Status::Nb_Types && data->status()!=_statusCombo->value() ) continue; + if ( _statusCombo->value()!=Device::tqStatus::Nb_Types && data->status()!=_statusCombo->value() ) continue; if ( _featureCombo->value()!=Pic::Feature::Nb_Types ) { if ( data->group().name()!="pic" ) continue; if ( !static_cast<const Pic::Data *>(data)->hasFeature(_featureCombo->value()) ) continue; |