Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

5 files changed, 29 insertions, 29 deletions

diff --git a/src/devices/gui/memory_editor.cpp b/src/devices/gui/memory_editor.cpp
index db53341..de5da8e 100644
--- a/src/devices/gui/memory_editor.cpp
+++ b/src/devices/gui/memory_editor.cpp
@@ -75,22 +75,22 @@ void Device::MemoryRangeEditor::init()
     for (uint i = 0; i<_nbCols; ++i) {
       HexWordEditor *h = createHexWordEditor(grid);
       _editors.append(h);
-      connect(h, TQT_SIGNAL(modified()), TQT_SIGNAL(modified()));
-      connect(h, TQT_SIGNAL(moveNext()), TQT_SLOT(moveNext()));
-      connect(h, TQT_SIGNAL(movePrev()), TQT_SLOT(movePrev()));
-      connect(h, TQT_SIGNAL(moveFirst()), TQT_SLOT(moveFirst()));
-      connect(h, TQT_SIGNAL(moveLast()), TQT_SLOT(moveLast()));
-      connect(h, TQT_SIGNAL(moveUp()), TQT_SLOT(moveUp()));
-      connect(h, TQT_SIGNAL(moveDown()), TQT_SLOT(moveDown()));
-      connect(h, TQT_SIGNAL(moveNextPage()), TQT_SLOT(moveNextPage()));
-      connect(h, TQT_SIGNAL(movePrevPage()), TQT_SLOT(movePrevPage()));
+      connect(h, TQ_SIGNAL(modified()), TQ_SIGNAL(modified()));
+      connect(h, TQ_SIGNAL(moveNext()), TQ_SLOT(moveNext()));
+      connect(h, TQ_SIGNAL(movePrev()), TQ_SLOT(movePrev()));
+      connect(h, TQ_SIGNAL(moveFirst()), TQ_SLOT(moveFirst()));
+      connect(h, TQ_SIGNAL(moveLast()), TQ_SLOT(moveLast()));
+      connect(h, TQ_SIGNAL(moveUp()), TQ_SLOT(moveUp()));
+      connect(h, TQ_SIGNAL(moveDown()), TQ_SLOT(moveDown()));
+      connect(h, TQ_SIGNAL(moveNextPage()), TQ_SLOT(moveNextPage()));
+      connect(h, TQ_SIGNAL(movePrevPage()), TQ_SLOT(movePrevPage()));
     }
   }
 
   //  scrollbar if there are more lines to display than visible
   _scrollbar = new TQScrollBar(0, TQMAX(_nbLines, totalNbLines)-_nbLines, 1, _nbLines, 0,
                               TQt::Vertical, frame, "memory_range_editor_scrollbar");
-  connect(_scrollbar, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(setIndex(int))) ;
+  connect(_scrollbar, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(setIndex(int))) ;
   if ( totalNbLines<=_nbLines ) _scrollbar->hide();
   fbox->addWidget(_scrollbar);
   fbox->addStretch(1);
@@ -254,7 +254,7 @@ Device::MemoryEditorGroup::MemoryEditorGroup(Device::Memory *memory, TQWidget *p
 
 void Device::MemoryEditorGroup::addEditor(MemoryEditor *editor)
 {
-  connect(editor, TQT_SIGNAL(modified()), TQT_SIGNAL(modified()));
+  connect(editor, TQ_SIGNAL(modified()), TQ_SIGNAL(modified()));
   _editors.append(editor);
 }
 
@@ -300,7 +300,7 @@ void Device::MemoryTypeEditor::init(bool first)
   for (uint i=0; i<Nb_Actions; i++) {
     if ( hasAction(Action(i)) ) {
       _actions[i] = new TDEAction(i18n(ACTION_DATA[i].label), ACTION_DATA[i].icon, 0,
-                                this, TQT_SLOT(doAction()), Main::toplevel().actionCollection());
+                                this, TQ_SLOT(doAction()), Main::toplevel().actionCollection());
       addAction(_actions[i]);
     }
     if ( ACTION_DATA[i].properties & SeparatorAfter ) _title->appendSeparator();
@@ -312,7 +312,7 @@ void Device::MemoryTypeEditor::init(bool first)
   hbox->addWidget(_comment);
   hbox->addStretch(1);
 
-  connect(&Main::toplevel(), TQT_SIGNAL(stateChanged()), TQT_SLOT(stateChanged()));
+  connect(&Main::toplevel(), TQ_SIGNAL(stateChanged()), TQ_SLOT(stateChanged()));
 }
 
 void Device::MemoryTypeEditor::addAction(TDEAction *action)
diff --git a/src/devices/gui/register_view.cpp b/src/devices/gui/register_view.cpp
index a290508..6e5c268 100644
--- a/src/devices/gui/register_view.cpp
+++ b/src/devices/gui/register_view.cpp
@@ -167,8 +167,8 @@ void Register::ListViewItem::editDone(int col, const TQWidget *edit)
 Register::LineEdit::LineEdit(TQWidget *parent, const char *name)
   : NumberLineEdit(parent, name), _base(NumberBase::Nb_Types)
 {
-  connect(this, TQT_SIGNAL(lostFocus()), TQT_SLOT(updateText()));
-  connect(this, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressedSlot()));
+  connect(this, TQ_SIGNAL(lostFocus()), TQ_SLOT(updateText()));
+  connect(this, TQ_SIGNAL(returnPressed()), TQ_SLOT(returnPressedSlot()));
 }
 
 void Register::LineEdit::updateText()
diff --git a/src/devices/pic/gui/pic_config_word_editor.cpp b/src/devices/pic/gui/pic_config_word_editor.cpp
index b40adf5..9413c3a 100644
--- a/src/devices/pic/gui/pic_config_word_editor.cpp
+++ b/src/devices/pic/gui/pic_config_word_editor.cpp
@@ -110,12 +110,12 @@ Pic::ConfigWordEditor::ConfigWordEditor(Memory &memory, uint ci, bool withWordEd
     TQHBoxLayout *hbox = new TQHBoxLayout(_top);
     _mdb = new MemoryRangeEditor(MemoryRangeType::Config, memory, 1, 1, ci, 1, this);
     _mdb->init();
-    connect(_mdb, TQT_SIGNAL(modified()), TQT_SIGNAL(modified()));
-    connect(_mdb, TQT_SIGNAL(modified()), TQT_SLOT(updateDisplay()));
+    connect(_mdb, TQ_SIGNAL(modified()), TQ_SIGNAL(modified()));
+    connect(_mdb, TQ_SIGNAL(modified()), TQ_SLOT(updateDisplay()));
     hbox->addWidget(_mdb);
     KPushButton *button = new KPushButton(i18n("Details..."), this);
     button->setFixedHeight(button->sizeHint().height());
-    connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(showDialog()));
+    connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(showDialog()));
     hbox->addWidget(button);
     hbox->addStretch(1);
   } else _mdb = 0;
@@ -138,7 +138,7 @@ Pic::ConfigWordEditor::ConfigWordEditor(Memory &memory, uint ci, bool withWordEd
       label += " (" + toHexLabel(cmask.values[i].value, nbChars) + ")";
       _combos[k]->appendItem(label, i);
     }
-    connect(_combos[k], TQT_SIGNAL(activated(int)), TQT_SLOT(slotModified()));
+    connect(_combos[k], TQ_SIGNAL(activated(int)), TQ_SLOT(slotModified()));
     grid->addWidget(_combos[k], k, 2);
   }
 }
diff --git a/src/devices/pic/gui/pic_memory_editor.cpp b/src/devices/pic/gui/pic_memory_editor.cpp
index 0c9e188..8ea8057 100644
--- a/src/devices/pic/gui/pic_memory_editor.cpp
+++ b/src/devices/pic/gui/pic_memory_editor.cpp
@@ -38,10 +38,10 @@ Pic::MemoryEditorLegend::Data::Data(const TQString &text, TQWidget *parent)
 {
   button = new PopupButton(text, parent);
   TDEActionCollection *ac = 0;
-  TDEAction *a = new TDEAction(i18n("Go to start"), "go-top", 0, parent, TQT_SLOT(gotoStart()), ac);
+  TDEAction *a = new TDEAction(i18n("Go to start"), "go-top", 0, parent, TQ_SLOT(gotoStart()), ac);
   actions.append(a);
   button->appendAction(a);
-  a = new TDEAction(i18n("Go to end"), "go-bottom", 0, parent, TQT_SLOT(gotoEnd()), ac);
+  a = new TDEAction(i18n("Go to end"), "go-bottom", 0, parent, TQ_SLOT(gotoEnd()), ac);
   actions.append(a);
   button->appendAction(a);
   label = new TQLabel(parent);
@@ -193,8 +193,8 @@ void Pic::MemoryRangeEditor::addLegend(TQVBoxLayout *vbox)
 {
   if ( type()==MemoryRangeType::Code || type()==MemoryRangeType::Eeprom ) {
     _legend = new MemoryEditorLegend(type(), memory(), this);
-    connect(_legend, TQT_SIGNAL(setStartWord(int)), TQT_SLOT(setStartWord(int)));
-    connect(_legend, TQT_SIGNAL(setEndWord(int)), TQT_SLOT(setEndWord(int)));
+    connect(_legend, TQ_SIGNAL(setStartWord(int)), TQ_SLOT(setStartWord(int)));
+    connect(_legend, TQ_SIGNAL(setEndWord(int)), TQ_SLOT(setEndWord(int)));
     vbox->addWidget(_legend);
   }
 }
@@ -317,7 +317,7 @@ void Pic::MemoryUserIdEditor::init(bool first)
 {
   MemoryTypeRangeEditor::init(first);
   _setToChecksum = new TDEToggleAction(i18n("Set to unprotected checksum"), 0, 0,
-    this, TQT_SLOT(toggleSetToChecksum()), Main::toplevel().actionCollection());
+    this, TQ_SLOT(toggleSetToChecksum()), Main::toplevel().actionCollection());
   addAction(_setToChecksum);
   if ( readConfigEntry(BaseGlobalConfig::UserIdSetToChecksum).toBool() && memory().isClear(MemoryRangeType::UserId) ) {
     _setToChecksum->activate();
diff --git a/src/devices/pic/gui/pic_register_view.cpp b/src/devices/pic/gui/pic_register_view.cpp
index 8848d85..7c2a422 100644
--- a/src/devices/pic/gui/pic_register_view.cpp
+++ b/src/devices/pic/gui/pic_register_view.cpp
@@ -54,7 +54,7 @@ Pic::BankWidget::BankWidget(uint i, TQWidget *parent)
 	  _bankCombo->insertItem((k%2)==0 ? i18n("Bank %1 (low)").arg(k/2) : i18n("Bank %1 (high)").arg(k/2));
 	}
         if ( _bindex==3 ) _bankCombo->setCurrentItem(1);
-        connect(_bankCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(bankChanged()));
+        connect(_bankCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(bankChanged()));
         top->addMultiCellWidget(_bankCombo, row,row, 0,6, AlignHCenter);
       }
     } else {
@@ -83,10 +83,10 @@ Pic::BankWidget::BankWidget(uint i, TQWidget *parent)
       _registers[k].button->appendItem(i18n("Read"), readIcon, ReadId);
       _registers[k].button->appendItem(i18n("Edit"), editIcon, EditId);
       _registers[k].button->appendItem(i18n("Watch"), WatchId);
-      connect(_registers[k].button, TQT_SIGNAL(activated(int)), TQT_SLOT(buttonActivated(int)));
+      connect(_registers[k].button, TQ_SIGNAL(activated(int)), TQ_SLOT(buttonActivated(int)));
       top->addWidget(_registers[k].button, row, 2);
       _registers[k].edit = new Register::LineEdit(this);
-      connect(_registers[k].edit, TQT_SIGNAL(modified()), TQT_SLOT(write()));
+      connect(_registers[k].edit, TQ_SIGNAL(modified()), TQ_SLOT(write()));
       _registers[k].edit->setFont(f);
       top->addWidget(_registers[k].edit, row, 6);
     } else {
@@ -260,10 +260,10 @@ Pic::RegisterView::RegisterView(TQWidget *parent)
     hbox->addWidget(w);
     TQGridLayout *grid = new TQGridLayout(w, 1, 1, 0, 10);
     _readAllButton = new TQPushButton(i18n("Read All"), w);
-    connect(_readAllButton, TQT_SIGNAL(clicked()), Debugger::manager, TQT_SLOT(readAllRegisters()));
+    connect(_readAllButton, TQ_SIGNAL(clicked()), Debugger::manager, TQ_SLOT(readAllRegisters()));
     grid->addWidget(_readAllButton, 0, 0);
     _clearAllButton = new TQPushButton(i18n("Clear all watching"), w);
-    connect(_clearAllButton, TQT_SIGNAL(clicked()), TQT_SLOT(stopWatchAllRegisters()));
+    connect(_clearAllButton, TQ_SIGNAL(clicked()), TQ_SLOT(stopWatchAllRegisters()));
     grid->addWidget(_clearAllButton, 0, 1);
     grid->setColStretch(2, 1);
   }