Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

10 files changed, 34 insertions, 34 deletions

diff --git a/src/progs/direct/gui/direct_config_widget.cpp b/src/progs/direct/gui/direct_config_widget.cpp
index fe46145..203cfc9 100644
--- a/src/progs/direct/gui/direct_config_widget.cpp
+++ b/src/progs/direct/gui/direct_config_widget.cpp
@@ -42,7 +42,7 @@ Direct::HConfigWidget::HConfigWidget(::Programmer::Base &base, TQWidget *parent,
     grid->addWidget(label, i, 0);
     _combos[i] = new TQComboBox(w);
     _combos[i]->setEnabled(edit);
-    connect(_combos[i], TQT_SIGNAL(activated(int)), TQT_SLOT(slotPinChanged()));
+    connect(_combos[i], TQ_SIGNAL(activated(int)), TQ_SLOT(slotPinChanged()));
     TQToolTip::add(_combos[i], PIN_DATA[i].comment);
     grid->addWidget(_combos[i], i, 1);
     _invcbs[i] = new TQCheckBox(i18n("Inverted"), w);
@@ -52,7 +52,7 @@ Direct::HConfigWidget::HConfigWidget(::Programmer::Base &base, TQWidget *parent,
     if (edit) {
       _testcbs[i] = new TQCheckBox(i18n("on"), w);
       TQToolTip::add(_testcbs[i], PIN_DATA[i].testComment);
-      connect(_testcbs[i], TQT_SIGNAL(clicked()), TQT_SLOT(slotTestPin()));
+      connect(_testcbs[i], TQ_SIGNAL(clicked()), TQ_SLOT(slotTestPin()));
       grid->addWidget(_testcbs[i], i, 3);
       _testLabels[i] = new TQLabel(w);
       TQToolTip::add(_testcbs[i], PIN_DATA[i].testComment);
@@ -77,7 +77,7 @@ Direct::HConfigWidget::HConfigWidget(::Programmer::Base &base, TQWidget *parent,
   if (edit) {
     _sendBitsButton = new TQPushButton(i18n("Send 0xA55A"), this);
     _sendBitsButton->setToggleButton(true);
-    connect(_sendBitsButton, TQT_SIGNAL(clicked()), TQT_SLOT(sendBits()));
+    connect(_sendBitsButton, TQ_SIGNAL(clicked()), TQ_SLOT(sendBits()));
     TQToolTip::add(_sendBitsButton, i18n("Continuously send 0xA55A on \"Data out\" pin."));
     _editVBox->addWidget(_sendBitsButton);
     _editVBox->addStretch(1);
@@ -85,11 +85,11 @@ Direct::HConfigWidget::HConfigWidget(::Programmer::Base &base, TQWidget *parent,
 
   // timer for sending bits
   _timerSendBits = new TQTimer(this);
-  connect(_timerSendBits, TQT_SIGNAL(timeout()), TQT_SLOT(slotSendBits()));
+  connect(_timerSendBits, TQ_SIGNAL(timeout()), TQ_SLOT(slotSendBits()));
 
   // timer for automatically polling DataOut pin
   _timerPollDataOut = new TQTimer(this);
-  connect(_timerPollDataOut, TQT_SIGNAL(timeout()), TQT_SLOT(updateDataIn()));
+  connect(_timerPollDataOut, TQ_SIGNAL(timeout()), TQ_SLOT(updateDataIn()));
 }
 
 void Direct::HConfigWidget::sendBits()
diff --git a/src/progs/gpsim/base/gpsim.cpp b/src/progs/gpsim/base/gpsim.cpp
index 6803686..71cf2a2 100644
--- a/src/progs/gpsim/base/gpsim.cpp
+++ b/src/progs/gpsim/base/gpsim.cpp
@@ -16,7 +16,7 @@
 GPSim::Process::Process(Log::Base *base)
   : ::Process::LineOutput(0, "gpsim_process"), Log::Base(base), _ready(false)
 {
-  connect(this, TQT_SIGNAL(stdoutDataReceived()), TQT_SLOT(stdoutDataReceivedSlot()));
+  connect(this, TQ_SIGNAL(stdoutDataReceived()), TQ_SLOT(stdoutDataReceivedSlot()));
 }
 
 void GPSim::Process::stdoutDataReceivedSlot()
diff --git a/src/progs/gpsim/gui/gpsim_group_ui.cpp b/src/progs/gpsim/gui/gpsim_group_ui.cpp
index aa404c3..69dd558 100644
--- a/src/progs/gpsim/gui/gpsim_group_ui.cpp
+++ b/src/progs/gpsim/gui/gpsim_group_ui.cpp
@@ -23,7 +23,7 @@ GPSim::ConfigWidget::ConfigWidget(const ::Programmer::Group &group, TQWidget *pa
   _status = new TQLabel(this);
   addWidget(_status, row,row, 1,1);
 
-  TQTimer::singleShot(0, this, TQT_SLOT(updateStatus()));
+  TQTimer::singleShot(0, this, TQ_SLOT(updateStatus()));
 }
 
 void GPSim::ConfigWidget::updateStatus()
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);
diff --git a/src/progs/icd2/gui/icd2_group_ui.cpp b/src/progs/icd2/gui/icd2_group_ui.cpp
index 82987b4..fd794b0 100644
--- a/src/progs/icd2/gui/icd2_group_ui.cpp
+++ b/src/progs/icd2/gui/icd2_group_ui.cpp
@@ -26,7 +26,7 @@ Icd2::AdvancedDialog::AdvancedDialog(ProgrammerBase &base, TQWidget *parent)
 
   row = _programmerContainer->numRows();
   if ( base.group().properties() & ::Programmer::Debugger ) {
-    ButtonContainer *container = new ::Programmer::ButtonContainer(i18n("Debug Executive"), this, TQT_SLOT(updateDebugExecutive()), _programmerContainer);
+    ButtonContainer *container = new ::Programmer::ButtonContainer(i18n("Debug Executive"), this, TQ_SLOT(updateDebugExecutive()), _programmerContainer);
     _programmerContainer->addWidget(container, row,row, 0,1);
     label = new TQLabel(i18n("Version:"), container);
     container->addWidget(label, 1,1, 0,0);
diff --git a/src/progs/manager/debug_manager.cpp b/src/progs/manager/debug_manager.cpp
index 0ae4e9f..4e00866 100644
--- a/src/progs/manager/debug_manager.cpp
+++ b/src/progs/manager/debug_manager.cpp
@@ -26,8 +26,8 @@ Debugger::Manager::Manager()
   :  TQObject(Programmer::manager, "debug_manager"), Log::Base(Programmer::manager), GenericView(Breakpoint::list()),
     _coff(0), _data(0)
 {
-  connect(&_runTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotRunTimeout()));
-  connect(&_stepTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doStep()));
+  connect(&_runTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotRunTimeout()));
+  connect(&_stepTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doStep()));
 }
 
 Debugger::Manager::~Manager()
diff --git a/src/progs/manager/prog_manager.cpp b/src/progs/manager/prog_manager.cpp
index dac29ee..8df43c5 100644
--- a/src/progs/manager/prog_manager.cpp
+++ b/src/progs/manager/prog_manager.cpp
@@ -39,11 +39,11 @@ void Programmer::Manager::createProgrammer(const Device::Data *data, const Hardw
   delete _programmer;
   _programmer = group().createProgrammer(isTargetSelfPowered(), data, hd);
   _programmer->Log::Base::setParent(this);
-  connect(_programmer, TQT_SIGNAL(actionMessage(const TQString &)), TQT_SIGNAL(actionMessage(const TQString &)));
-  connect(&_programmer->progressMonitor(), TQT_SIGNAL(setLabel(const TQString &)), TQT_SIGNAL(actionMessage(const TQString &)));
-  connect(&_programmer->progressMonitor(), TQT_SIGNAL(setTotalProgress(uint)), TQT_SIGNAL(setTotalProgress(uint)));
-  connect(&_programmer->progressMonitor(), TQT_SIGNAL(setProgress(uint)), TQT_SIGNAL(setProgress(uint)));
-  connect(&_programmer->progressMonitor(), TQT_SIGNAL(showProgress(bool)), TQT_SIGNAL(showProgress(bool)));
+  connect(_programmer, TQ_SIGNAL(actionMessage(const TQString &)), TQ_SIGNAL(actionMessage(const TQString &)));
+  connect(&_programmer->progressMonitor(), TQ_SIGNAL(setLabel(const TQString &)), TQ_SIGNAL(actionMessage(const TQString &)));
+  connect(&_programmer->progressMonitor(), TQ_SIGNAL(setTotalProgress(uint)), TQ_SIGNAL(setTotalProgress(uint)));
+  connect(&_programmer->progressMonitor(), TQ_SIGNAL(setProgress(uint)), TQ_SIGNAL(setProgress(uint)));
+  connect(&_programmer->progressMonitor(), TQ_SIGNAL(showProgress(bool)), TQ_SIGNAL(showProgress(bool)));
 }
 
 bool Programmer::Manager::initProgramming(bool debugging)