diff options
Diffstat (limited to 'src/progs/gui')
-rw-r--r-- | src/progs/gui/hardware_config_widget.cpp | 6 | ||||
-rw-r--r-- | src/progs/gui/port_selector.cpp | 8 | ||||
-rw-r--r-- | src/progs/gui/prog_config_center.cpp | 8 | ||||
-rw-r--r-- | src/progs/gui/prog_group_ui.cpp | 16 |
4 files changed, 19 insertions, 19 deletions
diff --git a/src/progs/gui/hardware_config_widget.cpp b/src/progs/gui/hardware_config_widget.cpp index 82b0bab..12ab6e2 100644 --- a/src/progs/gui/hardware_config_widget.cpp +++ b/src/progs/gui/hardware_config_widget.cpp @@ -100,7 +100,7 @@ Hardware::ConfigWidget::ConfigWidget(::Programmer::Base *base, Config *config, T // programmer combo uint row = numRows(); _configCombo = new TQComboBox(this); - connect(_configCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(configChanged(int))); + connect(_configCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(configChanged(int))); addWidget(_configCombo, row,row, 0,0); row++; @@ -119,10 +119,10 @@ Hardware::ConfigWidget::ConfigWidget(::Programmer::Base *base, Config *config, T // buttons TQVBoxLayout *vbox = new TQVBoxLayout(hbox); _editButton = new KPushButton(this); - connect(_editButton, TQT_SIGNAL(clicked()), TQT_SLOT(editClicked())); + connect(_editButton, TQ_SIGNAL(clicked()), TQ_SLOT(editClicked())); vbox->addWidget(_editButton); _deleteButton = new KPushButton(i18n("Delete"), this); - connect(_deleteButton, TQT_SIGNAL(clicked()), TQT_SLOT(deleteClicked())); + connect(_deleteButton, TQ_SIGNAL(clicked()), TQ_SLOT(deleteClicked())); vbox->addWidget(_deleteButton); vbox->addStretch(1); } diff --git a/src/progs/gui/port_selector.cpp b/src/progs/gui/port_selector.cpp index 27ecb12..9c06de1 100644 --- a/src/progs/gui/port_selector.cpp +++ b/src/progs/gui/port_selector.cpp @@ -28,7 +28,7 @@ PortSelector::PortSelector(TQWidget *parent) _top->setRowStretch(1, 1); _bgroup = new TQButtonGroup; - connect(_bgroup, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(changed())); + connect(_bgroup, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(changed())); } void PortSelector::setGroup(const Programmer::Group &group) @@ -95,8 +95,8 @@ void PortSelector::addPortType(const Port::Description &pd) for (uint i=0; i<list.count(); i++) _combos[pd.type.type()]->insertItem(list[i]); if ( !pd.device.isEmpty() && !list.contains(pd.device) ) _combos[pd.type.type()]->insertItem(pd.device); _combos[pd.type.type()]->setCurrentText(pd.device); - connect(_combos[pd.type.type()], TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); - connect(_combos[pd.type.type()], TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChanged())); + connect(_combos[pd.type.type()], TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); + connect(_combos[pd.type.type()], TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(textChanged())); _grid->addWidget(_combos[pd.type.type()], 3*(_bgroup->count()-1), 1); } } @@ -140,5 +140,5 @@ void PortSelector::textChanged() if (_pending) return; _status[type().type()]->hide(); _pending = true; - TQTimer::singleShot(1000, this, TQT_SIGNAL(changed())); + TQTimer::singleShot(1000, this, TQ_SIGNAL(changed())); } diff --git a/src/progs/gui/prog_config_center.cpp b/src/progs/gui/prog_config_center.cpp index bd876c2..75723a5 100644 --- a/src/progs/gui/prog_config_center.cpp +++ b/src/progs/gui/prog_config_center.cpp @@ -40,7 +40,7 @@ Programmer::SelectConfigWidget::SelectConfigWidget() TQLabel *label = new TQLabel(i18n("Programmer in use:"), this); addWidget(label, row,row, 0,0); _combo = new KeyComboBox<TQString>(this); - connect(_combo->widget(), TQT_SIGNAL(activated(int)), TQT_SLOT(programmerChanged())); + connect(_combo->widget(), TQ_SIGNAL(activated(int)), TQ_SLOT(programmerChanged())); addWidget(_combo->widget(), row,row, 1,1); row++; @@ -53,7 +53,7 @@ Programmer::SelectConfigWidget::SelectConfigWidget() _portSelectorContainer = new Container; _portSelectorContainer->setMargin(10); _portSelector = new PortSelector(_portSelectorContainer); - connect(_portSelector, TQT_SIGNAL(changed()), TQT_SLOT(portChanged())); + connect(_portSelector, TQ_SIGNAL(changed()), TQ_SLOT(portChanged())); _portSelectorContainer->addWidget(_portSelector, 0,0, 0,0); // specific programmer config @@ -73,7 +73,7 @@ Programmer::SelectConfigWidget::SelectConfigWidget() // init _combo->setCurrentItem(GlobalConfig::programmerGroup().name()); _stack->setCurrentItem(GlobalConfig::programmerGroup().name()); - TQTimer::singleShot(0, this, TQT_SLOT(programmerChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(programmerChanged())); } void Programmer::SelectConfigWidget::portChanged() @@ -118,5 +118,5 @@ void Programmer::SelectConfigWidget::programmerChanged() } else if (hasTab) _tabWidget->removePage(_portSelectorContainer); _portSelector->setGroup(group); _stack->setCurrentItem(key); - if (isHardware) TQTimer::singleShot(0, this, TQT_SLOT(portChanged())); + if (isHardware) TQTimer::singleShot(0, this, TQ_SLOT(portChanged())); } diff --git a/src/progs/gui/prog_group_ui.cpp b/src/progs/gui/prog_group_ui.cpp index 80f8ac3..c1a6566 100644 --- a/src/progs/gui/prog_group_ui.cpp +++ b/src/progs/gui/prog_group_ui.cpp @@ -31,9 +31,9 @@ Programmer::StandaloneMemoryCalibrationEditor::StandaloneMemoryCalibrationEditor void Programmer::StandaloneMemoryCalibrationEditor::init(bool first) { Pic::MemoryCalibrationEditor::init(first); - TDEAction *action = new TDEAction(i18n("Read"), "reload", 0, this, TQT_SIGNAL(updateCalibration()), Main::toplevel().actionCollection()); + TDEAction *action = new TDEAction(i18n("Read"), "reload", 0, this, TQ_SIGNAL(updateCalibration()), Main::toplevel().actionCollection()); addAction(action); - action = new TDEAction(i18n("Regenerating..."), 0, 0, this, TQT_SIGNAL(regenerate()), Main::toplevel().actionCollection()); + action = new TDEAction(i18n("Regenerating..."), 0, 0, this, TQ_SIGNAL(regenerate()), Main::toplevel().actionCollection()); addAction(action); } @@ -61,10 +61,10 @@ Programmer::AdvancedDialog::AdvancedDialog(Base &base, TQWidget *parent, const c Properties properties = _base.group().properties(); uint row = _programmerContainer->numRows(); if ( properties & HasFirmware ) { - _firmwareContainer = new ButtonContainer(i18n("Firmware"), this, TQT_SLOT(updateFirmware()), _programmerContainer); + _firmwareContainer = new ButtonContainer(i18n("Firmware"), this, TQ_SLOT(updateFirmware()), _programmerContainer); _programmerContainer->addWidget(_firmwareContainer, row,row, 0,1); if ( _base.group().properties() & CanUploadFirmware ) - _firmwareContainer->button().appendAction(i18n("Uploading..."), "piklab_burnchip", this, TQT_SLOT(uploadFirmware())); + _firmwareContainer->button().appendAction(i18n("Uploading..."), "piklab_burnchip", this, TQ_SLOT(uploadFirmware())); TQLabel *label = new TQLabel(i18n("Version:"), _firmwareContainer); _firmwareContainer->addWidget(label, 1,1, 0,0); _firmwareLabel = new TQLabel(_firmwareContainer); @@ -76,13 +76,13 @@ Programmer::AdvancedDialog::AdvancedDialog(Base &base, TQWidget *parent, const c } if ( _base.group().canReadVoltages() ) { - _voltagesContainer = new ButtonContainer(i18n("Voltages"), this, TQT_SLOT(updateVoltages()), _programmerContainer); + _voltagesContainer = new ButtonContainer(i18n("Voltages"), this, TQ_SLOT(updateVoltages()), _programmerContainer); _programmerContainer->addWidget(_voltagesContainer, row,row, 0,1); row++; } else _voltagesContainer = 0; if ( properties & HasSelfTest ) { - _selfTestContainer = new ButtonContainer(i18n("Self-test"), this, TQT_SLOT(updateSelfTest()), _programmerContainer); + _selfTestContainer = new ButtonContainer(i18n("Self-test"), this, TQ_SLOT(updateSelfTest()), _programmerContainer); _programmerContainer->addWidget(_selfTestContainer, row,row, 0,1); row++; } else _selfTestContainer = 0; @@ -102,8 +102,8 @@ Programmer::AdvancedDialog::AdvancedDialog(Base &base, TQWidget *parent, const c else { const ::Programmer::PicBase &pbase = static_cast<const ::Programmer::PicBase &>(_base); _calEditor = new StandaloneMemoryCalibrationEditor(pbase.deviceMemory(), _calibrationContainer); - connect(_calEditor, TQT_SIGNAL(updateCalibration()), TQT_SLOT(updateCalibration())); - connect(_calEditor, TQT_SIGNAL(regenerate()), TQT_SLOT(regenerateCalibration())); + connect(_calEditor, TQ_SIGNAL(updateCalibration()), TQ_SLOT(updateCalibration())); + connect(_calEditor, TQ_SIGNAL(regenerate()), TQ_SLOT(regenerateCalibration())); _calEditor->init(true); _calEditor->setReadOnly(true); _calibrationContainer->addWidget(_calEditor, 0,0, 0,0); |