Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

17 files changed, 190 insertions, 190 deletions

diff --git a/src/libgui/breakpoint_view.cpp b/src/libgui/breakpoint_view.cpp
index a8454ea..6b78301 100644
--- a/src/libgui/breakpoint_view.cpp
+++ b/src/libgui/breakpoint_view.cpp
@@ -40,9 +40,9 @@ Breakpoint::View::View(TQWidget *parent)
 {
   TQVBoxLayout *top = new TQVBoxLayout(this);
   _listview = new ListView(this);
-  connect(_listview, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(itemClicked(TQListViewItem *)));
-  connect(_listview, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),
-          TQT_SLOT(contextMenu(TQListViewItem *, const TQPoint &, int)));
+  connect(_listview, TQ_SIGNAL(clicked(TQListViewItem *)), TQ_SLOT(itemClicked(TQListViewItem *)));
+  connect(_listview, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),
+          TQ_SLOT(contextMenu(TQListViewItem *, const TQPoint &, int)));
   _listview->setAllColumnsShowFocus(true);
   _listview->addColumn(i18n("Status"));
   _listview->addColumn(i18n("Location"));
diff --git a/src/libgui/config_gen.cpp b/src/libgui/config_gen.cpp
index d58be6e..4517879 100644
--- a/src/libgui/config_gen.cpp
+++ b/src/libgui/config_gen.cpp
@@ -32,7 +32,7 @@ GeneratorDialog::GeneratorDialog(const TQString &title, TQWidget *parent, const
   TQLabel *label = new TQLabel(i18n("Device:"), mainWidget());
   hbox->addWidget(label);
   _deviceChooser = new DeviceChooser::Button(false, mainWidget());
-  connect(_deviceChooser, TQT_SIGNAL(changed()), TQT_SLOT(reset()));
+  connect(_deviceChooser, TQ_SIGNAL(changed()), TQ_SLOT(reset()));
   hbox->addWidget(_deviceChooser);
   hbox->addSpacing(20);
 
@@ -42,7 +42,7 @@ GeneratorDialog::GeneratorDialog(const TQString &title, TQWidget *parent, const
   Tool::Lister::ConstIterator it;
   for (it=Tool::lister().begin(); it!=Tool::lister().end(); ++it)
     _configType->appendItem(it.key(), it.data()->label());
-  connect(_configType->widget(), TQT_SIGNAL(activated(int)), TQT_SLOT(typeChanged()));
+  connect(_configType->widget(), TQ_SIGNAL(activated(int)), TQ_SLOT(typeChanged()));
   hbox->addWidget(_configType->widget());
 
   label = new TQLabel(i18n("Tool Type:"), mainWidget());
@@ -50,7 +50,7 @@ GeneratorDialog::GeneratorDialog(const TQString &title, TQWidget *parent, const
   _toolType = new KeyComboBox<PURL::ToolType>(mainWidget());
   FOR_EACH(PURL::ToolType, type) _toolType->appendItem(type, type.label());
   _toolType->fixMinimumWidth();
-  connect(_toolType->widget(), TQT_SIGNAL(activated(int)), TQT_SLOT(compute()));
+  connect(_toolType->widget(), TQ_SIGNAL(activated(int)), TQ_SLOT(compute()));
   hbox->addWidget(_toolType->widget());
   hbox->addStretch(1);
 
@@ -159,7 +159,7 @@ void ConfigGenerator::reset()
   _configEditor = Device::groupui(*data).createConfigEditor(*_memory, mainWidget());
   if (_configEditor) {
     _configEditor->show();
-    connect(_configEditor, TQT_SIGNAL(modified()), TQT_SLOT(compute()));
+    connect(_configEditor, TQ_SIGNAL(modified()), TQ_SLOT(compute()));
     _configEditor->updateDisplay();
     _hbox->addWidget(_configEditor);
   }
diff --git a/src/libgui/device_editor.cpp b/src/libgui/device_editor.cpp
index c48ffb2..4b8df1d 100644
--- a/src/libgui/device_editor.cpp
+++ b/src/libgui/device_editor.cpp
@@ -50,7 +50,7 @@ void DeviceEditor::init()
   _top->addWidget(_labelWarning);
   _vbox = new TQVBoxLayout(_top);
 
-  connect(&Main::toplevel(), TQT_SIGNAL(stateChanged()), TQT_SLOT(updateDevice()));
+  connect(&Main::toplevel(), TQ_SIGNAL(stateChanged()), TQ_SLOT(updateDevice()));
 }
 
 void DeviceEditor::setDevice(bool force)
diff --git a/src/libgui/device_gui.cpp b/src/libgui/device_gui.cpp
index 2c60c90..1eb90dc 100644
--- a/src/libgui/device_gui.cpp
+++ b/src/libgui/device_gui.cpp
@@ -94,10 +94,10 @@ DeviceChooser::Dialog::Dialog(const TQString &device, Type type, TQWidget *paren
   TQHBoxLayout *hbox = new TQHBoxLayout(top, 10);
   TQVBoxLayout *vbox = new TQVBoxLayout(hbox);
   _listTypeCombo = new EnumComboBox<ListType>("list_type", mainWidget());
-  connect(_listTypeCombo->combo(), TQT_SIGNAL(activated(int)), TQT_SLOT(updateList()));
+  connect(_listTypeCombo->combo(), TQ_SIGNAL(activated(int)), TQ_SLOT(updateList()));
   vbox->addWidget(_listTypeCombo->combo());
   TQPushButton *button = new KPushButton(KGuiItem(i18n("Reset Filters"), "reload"), mainWidget());
-  connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(resetFilters()));
+  connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(resetFilters()));
   vbox->addWidget(button);
   vbox->addStretch(1);
 
@@ -122,7 +122,7 @@ DeviceChooser::Dialog::Dialog(const TQString &device, Type type, TQWidget *paren
   Config config;
   const Programmer::Group *pgroup = config.programmerGroup();
   if (pgroup) _programmerCombo->setCurrentItem(pgroup->name());
-  connect(_programmerCombo->widget(), TQT_SIGNAL(activated(int)), TQT_SLOT(updateList()));
+  connect(_programmerCombo->widget(), TQ_SIGNAL(activated(int)), TQ_SLOT(updateList()));
   shbox->addWidget(_programmerCombo->widget());
 
   // tool filter
@@ -135,12 +135,12 @@ DeviceChooser::Dialog::Dialog(const TQString &device, Type type, TQWidget *paren
   }
   const Tool::Group *tgroup = config.toolGroup();
   if (tgroup) _toolCombo->setCurrentItem(tgroup->name());
-  connect(_toolCombo->widget(), TQT_SIGNAL(activated(int)), TQT_SLOT(updateList()));
+  connect(_toolCombo->widget(), TQ_SIGNAL(activated(int)), TQ_SLOT(updateList()));
   shbox->addWidget(_toolCombo->widget());
 
   // memory filter
   _memoryCombo = new EnumComboBox<Device::MemoryTechnology>(i18n("<Memory Type>"), "memory_technology", frame);
-  connect(_memoryCombo->combo(), TQT_SIGNAL(activated(int)), TQT_SLOT(updateList()));
+  connect(_memoryCombo->combo(), TQ_SIGNAL(activated(int)), TQ_SLOT(updateList()));
   shbox->addWidget(_memoryCombo->combo());
 
   shbox->addStretch(1);
@@ -148,12 +148,12 @@ DeviceChooser::Dialog::Dialog(const TQString &device, Type type, TQWidget *paren
 
   // status filter
   _statusCombo = new EnumComboBox<Device::Status>(i18n("<Status>"), "status", frame);
-  connect(_statusCombo->combo(), TQT_SIGNAL(activated(int)), TQT_SLOT(updateList()));
+  connect(_statusCombo->combo(), TQ_SIGNAL(activated(int)), TQ_SLOT(updateList()));
   shbox->addWidget(_statusCombo->combo());
 
   // features filter
   _featureCombo = new EnumComboBox<Pic::Feature>(i18n("<Feature>"), "feature", frame);
-  connect(_featureCombo->combo(), TQT_SIGNAL(activated(int)), TQT_SLOT(updateList()));
+  connect(_featureCombo->combo(), TQ_SIGNAL(activated(int)), TQ_SLOT(updateList()));
   shbox->addWidget(_featureCombo->combo());
 
   shbox->addStretch(1);
@@ -165,10 +165,10 @@ DeviceChooser::Dialog::Dialog(const TQString &device, Type type, TQWidget *paren
   Splitter *splitter = new Splitter(widths,TQt::Horizontal, mainWidget(), "device_shooser_splitter");
   top->addWidget(splitter, 1);
   _listView = new TDEListView(splitter);
-  connect(_listView, TQT_SIGNAL(currentChanged(TQListViewItem *)),
-          TQT_SLOT(currentChanged(TQListViewItem *)));
-  connect(_listView, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)),
-          TQT_SLOT(listDoubleClicked(TQListViewItem *)));
+  connect(_listView, TQ_SIGNAL(currentChanged(TQListViewItem *)),
+          TQ_SLOT(currentChanged(TQListViewItem *)));
+  connect(_listView, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)),
+          TQ_SLOT(listDoubleClicked(TQListViewItem *)));
   _listView->setAllColumnsShowFocus(true);
   _listView->setRootIsDecorated(true);
   _listView->setSorting(-1);
@@ -177,8 +177,8 @@ DeviceChooser::Dialog::Dialog(const TQString &device, Type type, TQWidget *paren
 
   // device view
   _deviceView = new View(splitter);
-  connect(_deviceView, TQT_SIGNAL(deviceChanged(const TQString &)),
-          TQT_SLOT(deviceChange(const TQString &)));
+  connect(_deviceView, TQ_SIGNAL(deviceChanged(const TQString &)),
+          TQ_SLOT(deviceChange(const TQString &)));
 
   updateList(device);
 }
@@ -343,12 +343,12 @@ DeviceChooser::Button::Button(bool withAuto, TQWidget *parent)
 {
   TQHBoxLayout *hbox = new TQHBoxLayout(this, 0, 10);
   _combo = new ComboBox(withAuto, this);
-  connect(_combo, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
+  connect(_combo, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed()));
   hbox->addWidget(_combo);
   TDEIconLoader loader;
   TQIconSet iconset = loader.loadIcon("document-open", TDEIcon::Toolbar);
   KPushButton *button = new KPushButton(iconset, TQString(), this);
-  connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(chooseDevice()));
+  connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(chooseDevice()));
   hbox->addWidget(button);
 }
 
@@ -399,8 +399,8 @@ DeviceChooser::View::View(TQWidget *parent)
   _info = new Browser(this);
   _info->setMimeSourceFactory(&_msf);
   insertTab(_info, i18n("Information"));
-  connect(_info, TQT_SIGNAL(deviceChanged(const TQString &)),
-          TQT_SIGNAL(deviceChanged(const TQString &)));
+  connect(_info, TQ_SIGNAL(deviceChanged(const TQString &)),
+          TQ_SIGNAL(deviceChanged(const TQString &)));
 
   // Memory Map
   _memory = new Browser(this);
@@ -457,7 +457,7 @@ DeviceChooser::Editor::Editor(const TQString &title, const TQString &tag, TQWidg
 TQWidget *DeviceChooser::Editor::createView(const Device::Data *, TQWidget *parent)
 {
   DeviceChooser::View *view = new DeviceChooser::View(parent);
-  connect(view, TQT_SIGNAL(deviceChanged(const TQString &)), TQT_SIGNAL(deviceChanged(const TQString &)));
+  connect(view, TQ_SIGNAL(deviceChanged(const TQString &)), TQ_SIGNAL(deviceChanged(const TQString &)));
   view->setDevice(_device, true);
   return view;
 }
diff --git a/src/libgui/editor_manager.cpp b/src/libgui/editor_manager.cpp
index d6747f3..3e17daf 100644
--- a/src/libgui/editor_manager.cpp
+++ b/src/libgui/editor_manager.cpp
@@ -96,7 +96,7 @@ EditorManager::EditorManager(TQWidget *parent)
   : TabWidget(parent, "editor_manager"), _current(0)
 {
   setTabBar(new EditorTabBar(this));
-  connect(this, TQT_SIGNAL(currentChanged(TQWidget *)), TQT_SLOT(showEditor(TQWidget *)));
+  connect(this, TQ_SIGNAL(currentChanged(TQWidget *)), TQ_SLOT(showEditor(TQWidget *)));
   setHoverCloseButton(readConfigEntry(BaseGlobalConfig::ShowTabCloseButton).toBool());
   setHoverCloseButtonDelayed(false);
 }
@@ -127,10 +127,10 @@ void EditorManager::connectEditor(Editor *editor)
     disconnectEditor(currentEditor());
     if ( editor==0 ) return;
     editor->addGui();
-    connect(editor, TQT_SIGNAL(modified()), TQT_SLOT(modifiedSlot()));
-    connect(editor, TQT_SIGNAL(guiChanged()), TQT_SIGNAL(guiChanged()));
-    connect(editor, TQT_SIGNAL(dropEventPass(TQDropEvent *)), TQT_SLOT(slotDropEvent(TQDropEvent *)));
-    connect(editor, TQT_SIGNAL(statusTextChanged(const TQString &)), TQT_SIGNAL(statusChanged(const TQString &)));
+    connect(editor, TQ_SIGNAL(modified()), TQ_SLOT(modifiedSlot()));
+    connect(editor, TQ_SIGNAL(guiChanged()), TQ_SIGNAL(guiChanged()));
+    connect(editor, TQ_SIGNAL(dropEventPass(TQDropEvent *)), TQ_SLOT(slotDropEvent(TQDropEvent *)));
+    connect(editor, TQ_SIGNAL(statusTextChanged(const TQString &)), TQ_SIGNAL(statusChanged(const TQString &)));
 }
 
 void EditorManager::modifiedSlot()
diff --git a/src/libgui/gui_debug_manager.cpp b/src/libgui/gui_debug_manager.cpp
index 4b607ab..0aa3e64 100644
--- a/src/libgui/gui_debug_manager.cpp
+++ b/src/libgui/gui_debug_manager.cpp
@@ -26,7 +26,7 @@
 bool Debugger::GuiManager::addEditor(Editor &editor)
 {
   if ( _editors.find(&editor)!=_editors.end() ) return false;
-  connect(&editor, TQT_SIGNAL(destroyed()), TQT_SLOT(editorDestroyed()));
+  connect(&editor, TQ_SIGNAL(destroyed()), TQ_SLOT(editorDestroyed()));
   _editors.append(&editor);
   return true;
 }
diff --git a/src/libgui/hex_editor.cpp b/src/libgui/hex_editor.cpp
index a0f11fb..2245f51 100644
--- a/src/libgui/hex_editor.cpp
+++ b/src/libgui/hex_editor.cpp
@@ -34,9 +34,9 @@ HexEditorPart::HexEditorPart(HexEditor *editor)
 {
   setXMLFile("hexeditorpartui.rc");
 
-  (void)KStdAction::save(editor, TQT_SLOT(save()), actionCollection());
-  (void)KStdAction::saveAs(editor, TQT_SLOT(saveAs()), actionCollection());
-  (void)new TDEToggleAction(i18n("Read Only Mode"), 0, 0, editor, TQT_SLOT(toggleReadOnly()), actionCollection(), "tools_toggle_write_lock");
+  (void)KStdAction::save(editor, TQ_SLOT(save()), actionCollection());
+  (void)KStdAction::saveAs(editor, TQ_SLOT(saveAs()), actionCollection());
+  (void)new TDEToggleAction(i18n("Read Only Mode"), 0, 0, editor, TQ_SLOT(toggleReadOnly()), actionCollection(), "tools_toggle_write_lock");
 }
 
 void HexEditorPart::setReadWrite(bool rw)
@@ -85,9 +85,9 @@ TQWidget *HexEditor::createView(const Device::Data *data, TQWidget *parent)
   }
   if ( data==0 ) return new TQWidget(parent);
   Device::HexView *hv = Device::groupui(*data).createHexView(*this, parent);
-  connect(hv, TQT_SIGNAL(modified()), TQT_SLOT(slotModified()));
+  connect(hv, TQ_SIGNAL(modified()), TQ_SLOT(slotModified()));
   _dirty = true;
-  TQTimer::singleShot(0, this, TQT_SLOT(simpleLoad()));
+  TQTimer::singleShot(0, this, TQ_SLOT(simpleLoad()));
   return hv;
 }
 
diff --git a/src/libgui/likeback.cpp b/src/libgui/likeback.cpp
index 02e2fc4..ea30824 100644
--- a/src/libgui/likeback.cpp
+++ b/src/libgui/likeback.cpp
@@ -66,21 +66,21 @@ LikeBack::LikeBack(Button buttons)
         m_likeButton->setIconSet(likeIconSet);
         m_likeButton->setTextLabel(i18n("I Like..."));
         m_likeButton->setAutoRaise(true);
-        connect( m_likeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(iLike()) );
+        connect( m_likeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(iLike()) );
         layout->add(m_likeButton);
 
         TQToolButton *m_dislikeButton = new TQToolButton(this, "idonotlike");
         m_dislikeButton->setIconSet(dislikeIconSet);
         m_dislikeButton->setTextLabel(i18n("I Do not Like..."));
         m_dislikeButton->setAutoRaise(true);
-        connect( m_dislikeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(iDoNotLike()) );
+        connect( m_dislikeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(iDoNotLike()) );
         layout->add(m_dislikeButton);
 
         TQToolButton *m_bugButton = new TQToolButton(this, "ifoundabug");
         m_bugButton->setIconSet(bugIconSet);
         m_bugButton->setTextLabel(i18n("I Found a Bug..."));
         m_bugButton->setAutoRaise(true);
-        connect( m_bugButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(iFoundABug()) );
+        connect( m_bugButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(iFoundABug()) );
         layout->add(m_bugButton);
 
         m_configureButton = new TQToolButton(this, "configure");
@@ -88,17 +88,17 @@ LikeBack::LikeBack(Button buttons)
         m_configureButton->setIconSet(helpIconSet);
         m_configureButton->setTextLabel(i18n("Configure..."));
         m_configureButton->setAutoRaise(true);
-        connect( m_likeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(configure()) );
+        connect( m_likeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(configure()) );
         layout->add(m_configureButton);
 
         TQPopupMenu *configureMenu = new TQPopupMenu(this);
-        configureMenu->insertItem(helpIconSet, i18n("What's &This?"), this , TQT_SLOT(showWhatsThisMessage()) );
+        configureMenu->insertItem(helpIconSet, i18n("What's &This?"), this , TQ_SLOT(showWhatsThisMessage()) );
         TQIconSet changeEmailIconSet = kapp->iconLoader()->loadIconSet("mail_generic", TDEIcon::Small);
-        configureMenu->insertItem(changeEmailIconSet, i18n("&Configure Email Address..."), this , TQT_SLOT(askEMail()) );
+        configureMenu->insertItem(changeEmailIconSet, i18n("&Configure Email Address..."), this , TQ_SLOT(askEMail()) );
 //        TQIconSet dontHelpIconSet = kapp->iconLoader()->loadIconSet("process-stop", TDEIcon::Small);
-//        configureMenu->insertItem( dontHelpIconSet, i18n("&Do not Help Anymore"), this , TQT_SLOT(doNotHelpAnymore()) );
+//        configureMenu->insertItem( dontHelpIconSet, i18n("&Do not Help Anymore"), this , TQ_SLOT(doNotHelpAnymore()) );
         m_configureButton->setPopup(configureMenu);
-        connect( m_configureButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(openConfigurePopup()) );
+        connect( m_configureButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(openConfigurePopup()) );
 
         if (!emailAddressAlreadyProvided())
                 //beginFetchingEmail(); // Begin before showing the message, so we have time!
@@ -112,7 +112,7 @@ LikeBack::LikeBack(Button buttons)
 
         resize(sizeHint());
 
-        connect( &m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(autoMove()) );
+        connect( &m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(autoMove()) );
         m_timer.start(10);
 
         s_instance = this;
@@ -453,7 +453,7 @@ void LikeBack::init(bool isDevelopmentVersion, Button buttons)
                 return;
         m_process = new TDEProcess();
         *m_process << TQString::fromLatin1("tdecmshell") << TQString::fromLatin1("kcm_useraccount");
-        connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(endFetchingEmailFrom()) );
+        connect( m_process, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(endFetchingEmailFrom()) );
         if (!m_process->start()) {
                 kdDebug() << "Couldn't start tdecmshell.." << endl;
                 delete m_process;
@@ -582,8 +582,8 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, TQString windowName, TQS
         m_sendButton = new TQPushButton(sendIconSet, i18n("Send"), coloredWidget);
         m_sendButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding);
         m_sendButton->setEnabled(false);
-        connect( m_sendButton, TQT_SIGNAL(clicked()),     this, TQT_SLOT(send())           );
-        connect( m_comment,    TQT_SIGNAL(textChanged()), this, TQT_SLOT(commentChanged()) );
+        connect( m_sendButton, TQ_SIGNAL(clicked()),     this, TQ_SLOT(send())           );
+        connect( m_comment,    TQ_SIGNAL(textChanged()), this, TQ_SLOT(commentChanged()) );
         commentLayout->addWidget(m_comment);
         commentLayout->addWidget(m_sendButton);
         coloredWidgetLayout->addLayout(commentLayout);
@@ -635,7 +635,7 @@ void LikeBackDialog::send()
 
 //        std::cout << "http://" << LikeBack::hostName() << ":" << LikeBack::hostPort() << LikeBack::remotePath() << std::endl;
 //        std::cout << data << std::endl;
-        connect( http, TQT_SIGNAL(requestFinished(int, bool)), this, TQT_SLOT(requestFinished(int, bool)) );
+        connect( http, TQ_SIGNAL(requestFinished(int, bool)), this, TQ_SLOT(requestFinished(int, bool)) );
 //      http->post(LikeBack::remotePath(), data.utf8());
 
         TQHttpRequestHeader header("POST", LikeBack::remotePath());
diff --git a/src/libgui/log_view.cpp b/src/libgui/log_view.cpp
index 3c3d75c..6365f51 100644
--- a/src/libgui/log_view.cpp
+++ b/src/libgui/log_view.cpp
@@ -77,18 +77,18 @@ TQPopupMenu *Log::Widget::createPopupMenu(const TQPoint &pos)
   _popup = TQTextEdit::createPopupMenu(pos);
   TDEIconLoader loader;
   TQIconSet iset = loader.loadIconSet("document-save", TDEIcon::Small, 0);
-  _popup->insertItem(iset, "Save As...", this, TQT_SLOT(saveAs()));
+  _popup->insertItem(iset, "Save As...", this, TQ_SLOT(saveAs()));
   iset = loader.loadIconSet("window-close", TDEIcon::Small, 0);
-  _popup->insertItem(iset, "Clear", this, TQT_SLOT(clear()));
+  _popup->insertItem(iset, "Clear", this, TQ_SLOT(clear()));
   _popup->insertSeparator();
   FOR_EACH(DebugLevel, level) {
     _id[level.type()] = _popup->insertItem(level.label());
     _popup->setItemChecked(_id[level.type()], _debugLevel==level);
   }
   _popup->insertSeparator();
-  int id = _popup->insertItem(i18n("Output in console"), this, TQT_SLOT(toggleConsoleOutput()));
+  int id = _popup->insertItem(i18n("Output in console"), this, TQ_SLOT(toggleConsoleOutput()));
   _popup->setItemChecked(id, GlobalConfig::logOutputType()==GuiConsole);
-  connect(_popup, TQT_SIGNAL(activated(int)), TQT_SLOT(toggleVisible(int)));
+  connect(_popup, TQ_SIGNAL(activated(int)), TQ_SLOT(toggleVisible(int)));
   return _popup;
 }
 
diff --git a/src/libgui/new_dialogs.cpp b/src/libgui/new_dialogs.cpp
index 2ffc16f..919ad51 100644
--- a/src/libgui/new_dialogs.cpp
+++ b/src/libgui/new_dialogs.cpp
@@ -26,18 +26,18 @@ NewDialog::NewDialog(const TQString &caption, TQWidget *parent)
   _fLabel = new TQLabel(mainWidget());
   _top->addWidget(_fLabel, 0, 0);
   _filename = new TQLineEdit(mainWidget());
-  connect(_filename, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(changed()));
+  connect(_filename, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(changed()));
   _top->addMultiCellWidget(_filename, 0,0, 1,3);
 
   TQLabel *label= new TQLabel(i18n("Location:"), mainWidget());
   _top->addWidget(label, 1, 0);
   _dir = new TQLineEdit(mainWidget());
-  connect(_dir, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(changed()));
+  connect(_dir, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(changed()));
   _top->addMultiCellWidget(_dir, 1,1, 1,2);
   TDEIconLoader loader;
   TQIconSet iconset = loader.loadIcon("document-open", TDEIcon::Toolbar);
   KPushButton *button = new KPushButton(iconset, TQString(), mainWidget());
-  connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(browse()));
+  connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(browse()));
   _top->addWidget(button, 1, 3);
 
   _filename->setFocus();
diff --git a/src/libgui/project_manager.cpp b/src/libgui/project_manager.cpp
index fd10d0d..8fa9586 100644
--- a/src/libgui/project_manager.cpp
+++ b/src/libgui/project_manager.cpp
@@ -38,13 +38,13 @@
 ProjectManager::View::View(TQWidget *parent)
   : ListView(parent, "project_manager"), _project(0), _modified(false)
 {
-  connect(this, TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem *, const TQPoint &, int)),
-          TQT_SLOT(clicked(int, TQListViewItem *, const TQPoint &, int)));
-  connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),
-          TQT_SLOT(contextMenu(TQListViewItem *, const TQPoint &, int)));
-  connect(this, TQT_SIGNAL(itemRenamed(TQListViewItem *, int, const TQString &)),
-          TQT_SLOT(renamed(TQListViewItem *, int, const TQString &)));
-  connect(this, TQT_SIGNAL(moved()), TQT_SLOT(filesReordered()));
+  connect(this, TQ_SIGNAL(mouseButtonClicked(int, TQListViewItem *, const TQPoint &, int)),
+          TQ_SLOT(clicked(int, TQListViewItem *, const TQPoint &, int)));
+  connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),
+          TQ_SLOT(contextMenu(TQListViewItem *, const TQPoint &, int)));
+  connect(this, TQ_SIGNAL(itemRenamed(TQListViewItem *, int, const TQString &)),
+          TQ_SLOT(renamed(TQListViewItem *, int, const TQString &)));
+  connect(this, TQ_SIGNAL(moved()), TQ_SLOT(filesReordered()));
 
   header()->hide();
   setSorting(-1);
@@ -54,7 +54,7 @@ ProjectManager::View::View(TQWidget *parent)
   setAcceptDrops(true);
   setDragEnabled(true);
   setDropVisualizer(true);
-  TQTimer::singleShot(0, this, TQT_SLOT(init()));;
+  TQTimer::singleShot(0, this, TQ_SLOT(init()));;
 }
 
 ProjectManager::View::~View()
@@ -178,8 +178,8 @@ void ProjectManager::View::contextMenu(TQListViewItem *item, const TQPoint &p, i
     RootItem *ri = static_cast<RootItem *>(item);
     if ( _project==0 ) {
       if ( ri->url().isEmpty() ) {
-        pop.insertItem("piklab_createproject", i18n("New Project..."), &Main::toplevel(), TQT_SLOT(newProject()));
-        pop.insertItem("piklab_openproject", i18n("Open Project..."), &Main::toplevel(), TQT_SLOT(openProject()));
+        pop.insertItem("piklab_createproject", i18n("New Project..."), &Main::toplevel(), TQ_SLOT(newProject()));
+        pop.insertItem("piklab_openproject", i18n("Open Project..."), &Main::toplevel(), TQ_SLOT(openProject()));
         pop.exec(p);
       } else {
         pop.insertTitle(i18n("Standalone File"));
@@ -188,16 +188,16 @@ void ProjectManager::View::contextMenu(TQListViewItem *item, const TQPoint &p, i
       }
     } else {
       pop.insertTitle(i18n("Project"));
-      pop.insertItem("configure", i18n("Options..."), &Main::toplevel(), TQT_SLOT(configureProject()));
-      pop.insertItem("edit-find", i18n("Find Files..."),   &Main::toplevel(), TQT_SLOT(runKfind()));
+      pop.insertItem("configure", i18n("Options..."), &Main::toplevel(), TQ_SLOT(configureProject()));
+      pop.insertItem("edit-find", i18n("Find Files..."),   &Main::toplevel(), TQ_SLOT(runKfind()));
       pop.insertSeparator();
-      pop.insertItem("piklab_compile", i18n("Build Project"), &Main::toplevel(), TQT_SLOT(buildProject()));
-      pop.insertItem("trashcan_empty", i18n("Clean Project"), &Main::toplevel(), TQT_SLOT(cleanBuild()));
+      pop.insertItem("piklab_compile", i18n("Build Project"), &Main::toplevel(), TQ_SLOT(buildProject()));
+      pop.insertItem("trashcan_empty", i18n("Clean Project"), &Main::toplevel(), TQ_SLOT(cleanBuild()));
       pop.insertSeparator();
-      pop.insertItem("document-new", i18n("New Source File..."), &Main::toplevel(), TQT_SLOT(newSourceFile()));
-      pop.insertItem("piklab_addfile", i18n("Add Source Files..."), this, TQT_SLOT(insertSourceFiles()));
-      pop.insertItem("piklab_addfile", i18n("Add Object Files..."), this, TQT_SLOT(insertObjectFiles()));
-      if ( Main::currentEditor() ) pop.insertItem("piklab_addcurrentfile", i18n("Add Current File"), this, TQT_SLOT(insertCurrentFile()));
+      pop.insertItem("document-new", i18n("New Source File..."), &Main::toplevel(), TQ_SLOT(newSourceFile()));
+      pop.insertItem("piklab_addfile", i18n("Add Source Files..."), this, TQ_SLOT(insertSourceFiles()));
+      pop.insertItem("piklab_addfile", i18n("Add Object Files..."), this, TQ_SLOT(insertObjectFiles()));
+      if ( Main::currentEditor() ) pop.insertItem("piklab_addcurrentfile", i18n("Add Current File"), this, TQ_SLOT(insertCurrentFile()));
       pop.exec(p);
     }
   } else if ( item->rtti()==FileRtti ) {
@@ -211,15 +211,15 @@ void ProjectManager::View::contextMenu(TQListViewItem *item, const TQPoint &p, i
     if ( _project==0 ) return;
     if ( group==LinkerObjectGroup ) {
       pop.insertTitle(i18n("Objects"));
-      pop.insertItem("piklab_addfile", i18n("Add Object Files..."), this, TQT_SLOT(insertObjectFiles()));
+      pop.insertItem("piklab_addfile", i18n("Add Object Files..."), this, TQ_SLOT(insertObjectFiles()));
       pop.exec(p);
     } else if ( group==SourceGroup || group==HeaderGroup ) {
       pop.insertTitle(i18n("Sources"));
-      pop.insertItem("document-new", i18n("New File..."), &Main::toplevel(), TQT_SLOT(newSourceFile()));
-      pop.insertItem("piklab_addfile", i18n("Add Source Files..."), this, TQT_SLOT(insertSourceFiles()));
+      pop.insertItem("document-new", i18n("New File..."), &Main::toplevel(), TQ_SLOT(newSourceFile()));
+      pop.insertItem("piklab_addfile", i18n("Add Source Files..."), this, TQ_SLOT(insertSourceFiles()));
       pop.exec(p);
     } else if ( group==DeviceGroup ) {
-      pop.insertItem("document-new", i18n("Select Device..."), &Main::toplevel(), TQT_SLOT(showDeviceInfo()));
+      pop.insertItem("document-new", i18n("Select Device..."), &Main::toplevel(), TQ_SLOT(showDeviceInfo()));
       pop.exec(p);
     }
   }
diff --git a/src/libgui/project_manager_ui.cpp b/src/libgui/project_manager_ui.cpp
index f0c6178..173b550 100644
--- a/src/libgui/project_manager_ui.cpp
+++ b/src/libgui/project_manager_ui.cpp
@@ -136,7 +136,7 @@ TQWidget *ProjectManager::DeviceItem::editWidgetFactory(int) const
   TQComboBox *combo = new DeviceChooser::ComboBox(Main::project()==0, 0);
   TQString device = Main::device();
   if ( device!=Device::AUTO_DATA.name ) combo->setCurrentText(device);
-  TQObject::connect(combo, TQT_SIGNAL(activated(int)), listView(), TQT_SLOT(finishRenaming()));
+  TQObject::connect(combo, TQ_SIGNAL(activated(int)), listView(), TQ_SLOT(finishRenaming()));
   return combo;
 }
 
diff --git a/src/libgui/project_wizard.cpp b/src/libgui/project_wizard.cpp
index 3fd8732..b0d0c51 100644
--- a/src/libgui/project_wizard.cpp
+++ b/src/libgui/project_wizard.cpp
@@ -81,7 +81,7 @@ FileListBox::FileListBox(TQWidget *parent)
   _listView->header()->resizeSection(0, fm.width(i18n("Copy")) + 2*spacing); // hack
   _listView->setColumnText(1, i18n("Filename"));
   _listView->setAllColumnsShowFocus(true);
-  connect(_listView, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int)), TQT_SLOT(clicked(TQListViewItem *, const TQPoint &, int)));
+  connect(_listView, TQ_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int)), TQ_SLOT(clicked(TQListViewItem *, const TQPoint &, int)));
 }
 
 void FileListBox::addItem()
@@ -150,7 +150,7 @@ ProjectWizard::ProjectWizard(TQWidget *parent)
   _templateButton = new TQRadioButton(i18n("Create template source file."), _bgroup);
   _addButton = new TQRadioButton(i18n("Add existing files."), _bgroup);
   (void)new TQRadioButton(i18n("Do not add files now."), _bgroup);
-  connect(_bgroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(buttonClicked(int)));
+  connect(_bgroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(buttonClicked(int)));
   grid->addWidget(_bgroup, 0, 0);
 
   // third page
diff --git a/src/libgui/text_editor.cpp b/src/libgui/text_editor.cpp
index bad8ee0..41f4396 100644
--- a/src/libgui/text_editor.cpp
+++ b/src/libgui/text_editor.cpp
@@ -56,14 +56,14 @@ TextEditor::TextEditor(bool withDebugger, TQWidget *parent, const char *name)
   _split->setFrameStyle(TQFrame::TabWidgetPanel |  TQFrame::Sunken);
   top->addWidget(_split);
 
-  connect(_document, TQT_SIGNAL(hlChanged()), TQT_SLOT(highlightChanged()));
+  connect(_document, TQ_SIGNAL(hlChanged()), TQ_SLOT(highlightChanged()));
   setAcceptDrops(true);
   addView();
 
   for (uint i=0; i<Breakpoint::Nb_MarkTypes; i++)
     _document->setPixmap(KTextEditor::MarkInterface::MarkTypes(MARK_TYPE_DATA[i].type), pixmap(Breakpoint::MarkType(i)));
 
-  if (withDebugger) TQTimer::singleShot(0, this, TQT_SLOT(addToDebugManager()));
+  if (withDebugger) TQTimer::singleShot(0, this, TQ_SLOT(addToDebugManager()));
 }
 
 bool TextEditor::open(const PURL::Url &url)
@@ -93,10 +93,10 @@ void TextEditor::addView()
     KTextEditor::View *v = _document->createView(_split);
     if ( _view==0 ) _view = static_cast<Kate::View *>(v);
     Q_ASSERT(v);
-    connect(v, TQT_SIGNAL(gotFocus(Kate::View *)), TQT_SLOT(gotFocus(Kate::View *)));
-    connect(v, TQT_SIGNAL(cursorPositionChanged()), TQT_SLOT(statusChanged()));
-    connect(v, TQT_SIGNAL(dropEventPass(TQDropEvent *)), TQT_SIGNAL(dropEventPass(TQDropEvent *)));
-    connect(v, TQT_SIGNAL(newStatus()), TQT_SLOT(statusChanged()));
+    connect(v, TQ_SIGNAL(gotFocus(Kate::View *)), TQ_SLOT(gotFocus(Kate::View *)));
+    connect(v, TQ_SIGNAL(cursorPositionChanged()), TQ_SLOT(statusChanged()));
+    connect(v, TQ_SIGNAL(dropEventPass(TQDropEvent *)), TQ_SIGNAL(dropEventPass(TQDropEvent *)));
+    connect(v, TQ_SIGNAL(newStatus()), TQ_SLOT(statusChanged()));
     v->show();
     v->setFocus();
     v->child(0, "KateViewInternal")->installEventFilter(this);
diff --git a/src/libgui/toplevel.cpp b/src/libgui/toplevel.cpp
index 9244d20..9febe6e 100644
--- a/src/libgui/toplevel.cpp
+++ b/src/libgui/toplevel.cpp
@@ -78,7 +78,7 @@ KDockWidget *MainWindow::createDock(const TQString &name, const TQPixmap &icon,
   ddata.position = position;
   ddata.dock = dock;
   ddata.action = new ViewMenuAction(dock);
-  connect(ddata.action, TQT_SIGNAL(activated(TQWidget *)), TQT_SLOT(toggleToolView(TQWidget *)));
+  connect(ddata.action, TQ_SIGNAL(activated(TQWidget *)), TQ_SLOT(toggleToolView(TQWidget *)));
   _docks += ddata;
   initDockPosition(ddata);
   return dock;
@@ -100,13 +100,13 @@ MainWindow::MainWindow()
     _editorStatus = new TQLabel(statusBar());
     statusBar()->addWidget(_editorStatus, 0, true);
     _programmerStatus = new ProgrammerStatusWidget(statusBar());
-    connect(_programmerStatus, TQT_SIGNAL(configure()), TQT_SLOT(configureProgrammer()));
-    connect(_programmerStatus, TQT_SIGNAL(selected(const Programmer::Group &)), TQT_SLOT(selectProgrammer(const Programmer::Group &)));
+    connect(_programmerStatus, TQ_SIGNAL(configure()), TQ_SLOT(configureProgrammer()));
+    connect(_programmerStatus, TQ_SIGNAL(selected(const Programmer::Group &)), TQ_SLOT(selectProgrammer(const Programmer::Group &)));
     statusBar()->addWidget(_programmerStatus->widget(), 0, true);
     _toolStatus = new ToolStatusWidget(statusBar());
-    connect(_toolStatus, TQT_SIGNAL(configureToolchain()), TQT_SLOT(configureToolchains()));
-    connect(_toolStatus, TQT_SIGNAL(configure()), TQT_SLOT(configureProject()));
-    connect(_toolStatus, TQT_SIGNAL(selected(const Tool::Group &)), TQT_SLOT(selectTool(const Tool::Group &)));
+    connect(_toolStatus, TQ_SIGNAL(configureToolchain()), TQ_SLOT(configureToolchains()));
+    connect(_toolStatus, TQ_SIGNAL(configure()), TQ_SLOT(configureProject()));
+    connect(_toolStatus, TQ_SIGNAL(selected(const Tool::Group &)), TQ_SLOT(selectTool(const Tool::Group &)));
     statusBar()->addWidget(_toolStatus->widget(), 0, true);
 
 // interface
@@ -120,7 +120,7 @@ MainWindow::MainWindow()
     KDockWidget *dock = createDock("project_manager_dock_widget", PURL::icon(PURL::Project),
                                    i18n("Project Manager"), DockPosition(KDockWidget::DockLeft, 20));
     Main::_projectManager = new ProjectManager::View(dock);
-    connect(Main::_projectManager, TQT_SIGNAL(guiChanged()), TQT_SLOT(updateGUI()));
+    connect(Main::_projectManager, TQ_SIGNAL(guiChanged()), TQ_SLOT(updateGUI()));
     dock->setWidget(Main::_projectManager);
 
     dock = createDock("watch_view_dock_widget", loader.loadIcon("viewmag", TDEIcon::Small),
@@ -130,9 +130,9 @@ MainWindow::MainWindow()
 
     Main::_editorManager = new EditorManager(_mainDock);
     _mainDock->setWidget(Main::_editorManager);
-    connect(Main::_editorManager, TQT_SIGNAL(guiChanged()), TQT_SLOT(updateGUI()));
-    connect(Main::_editorManager, TQT_SIGNAL(modified(const PURL::Url &)), Main::_projectManager, TQT_SLOT(modified(const PURL::Url &)));
-    connect(Main::_editorManager, TQT_SIGNAL(statusChanged(const TQString &)), _editorStatus, TQT_SLOT(setText(const TQString &)));
+    connect(Main::_editorManager, TQ_SIGNAL(guiChanged()), TQ_SLOT(updateGUI()));
+    connect(Main::_editorManager, TQ_SIGNAL(modified(const PURL::Url &)), Main::_projectManager, TQ_SLOT(modified(const PURL::Url &)));
+    connect(Main::_editorManager, TQ_SIGNAL(statusChanged(const TQString &)), _editorStatus, TQ_SLOT(setText(const TQString &)));
 
     dock = createDock("compile_log_dock_widget", loader.loadIcon("piklab_compile", TDEIcon::Small),
                       i18n("Compile Log"), DockPosition(KDockWidget::DockBottom, 80));
@@ -160,63 +160,63 @@ MainWindow::MainWindow()
 // managers
     Programmer::manager = new Programmer::GuiManager(this);
     Programmer::manager->setView(_programLog);
-    connect(Programmer::manager, TQT_SIGNAL(actionMessage(const TQString &)), _actionStatus, TQT_SLOT(setText(const TQString &)));
-    connect(Programmer::manager, TQT_SIGNAL(showProgress(bool)), TQT_SLOT(showProgress(bool)));
-    connect(Programmer::manager, TQT_SIGNAL(setTotalProgress(uint)), TQT_SLOT(setTotalProgress(uint)));
-    connect(Programmer::manager, TQT_SIGNAL(setProgress(uint)), TQT_SLOT(setProgress(uint)));
+    connect(Programmer::manager, TQ_SIGNAL(actionMessage(const TQString &)), _actionStatus, TQ_SLOT(setText(const TQString &)));
+    connect(Programmer::manager, TQ_SIGNAL(showProgress(bool)), TQ_SLOT(showProgress(bool)));
+    connect(Programmer::manager, TQ_SIGNAL(setTotalProgress(uint)), TQ_SLOT(setTotalProgress(uint)));
+    connect(Programmer::manager, TQ_SIGNAL(setProgress(uint)), TQ_SLOT(setProgress(uint)));
 
     Debugger::manager = new Debugger::GuiManager;
-    connect(Debugger::manager, TQT_SIGNAL(targetStateChanged()), TQT_SLOT(updateGUI()));
-    connect(Debugger::manager, TQT_SIGNAL(statusChanged(const TQString &)), _debugStatus, TQT_SLOT(setText(const TQString &)));
-    connect(Debugger::manager, TQT_SIGNAL(actionMessage(const TQString &)), _actionStatus, TQT_SLOT(setText(const TQString &)));
+    connect(Debugger::manager, TQ_SIGNAL(targetStateChanged()), TQ_SLOT(updateGUI()));
+    connect(Debugger::manager, TQ_SIGNAL(statusChanged(const TQString &)), _debugStatus, TQ_SLOT(setText(const TQString &)));
+    connect(Debugger::manager, TQ_SIGNAL(actionMessage(const TQString &)), _actionStatus, TQ_SLOT(setText(const TQString &)));
 
     Main::_compileManager = new Compile::Manager(this);
     Main::_compileManager->setView(Main::_compileLog);
-    connect(Main::_compileManager, TQT_SIGNAL(success()), TQT_SLOT(compileSuccess()));
-    connect(Main::_compileManager, TQT_SIGNAL(failure()), TQT_SLOT(compileFailure()));
-    connect(Main::_compileManager, TQT_SIGNAL(updateFile(const Compile::FileData &)),
-            TQT_SLOT(updateFile(const Compile::FileData &)));
+    connect(Main::_compileManager, TQ_SIGNAL(success()), TQ_SLOT(compileSuccess()));
+    connect(Main::_compileManager, TQ_SIGNAL(failure()), TQ_SLOT(compileFailure()));
+    connect(Main::_compileManager, TQ_SIGNAL(updateFile(const Compile::FileData &)),
+            TQ_SLOT(updateFile(const Compile::FileData &)));
 
 // actions
     // file actions
-    TDEAction *a = KStdAction::openNew(this, TQT_SLOT(newSourceFile()), actionCollection());
+    TDEAction *a = KStdAction::openNew(this, TQ_SLOT(newSourceFile()), actionCollection());
     a->setText(i18n("&New Source File..."));
-    (void)new TDEAction(i18n("New hex File..."), "document-new", 0, this, TQT_SLOT(newHexFile()),
+    (void)new TDEAction(i18n("New hex File..."), "document-new", 0, this, TQ_SLOT(newHexFile()),
                       actionCollection(), "file_new_hex");
-    KStdAction::open(this, TQT_SLOT(openFile()), actionCollection());
-    TDERecentFilesAction *recent = KStdAction::openRecent(this, TQT_SLOT(openRecentFile(const KURL &)), actionCollection());
+    KStdAction::open(this, TQ_SLOT(openFile()), actionCollection());
+    TDERecentFilesAction *recent = KStdAction::openRecent(this, TQ_SLOT(openRecentFile(const KURL &)), actionCollection());
     recent->setMaxItems(20);
     recent->loadEntries(kapp->config(), "recent-files");
-    (void)new TDEAction(i18n("Save All"), 0, 0, Main::_editorManager, TQT_SLOT(saveAllFiles()),
+    (void)new TDEAction(i18n("Save All"), 0, 0, Main::_editorManager, TQ_SLOT(saveAllFiles()),
                       actionCollection(), "file_save_all");
-    KStdAction::close(Main::_editorManager, TQT_SLOT(closeCurrentEditor()), actionCollection());
-    (void)new TDEAction(i18n("C&lose All"), 0, 0, Main::_editorManager, TQT_SLOT(closeAllEditors()),
+    KStdAction::close(Main::_editorManager, TQ_SLOT(closeCurrentEditor()), actionCollection());
+    (void)new TDEAction(i18n("C&lose All"), 0, 0, Main::_editorManager, TQ_SLOT(closeAllEditors()),
                       actionCollection(), "file_close_all");
-    (void)new TDEAction(i18n("Close All Others"), 0, 0, Main::_editorManager, TQT_SLOT(closeAllOtherEditors()),
+    (void)new TDEAction(i18n("Close All Others"), 0, 0, Main::_editorManager, TQ_SLOT(closeAllOtherEditors()),
                       actionCollection(), "file_closeother");
-    KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
+    KStdAction::quit(this, TQ_SLOT(close()), actionCollection());
 
     // edit actions
 
     // view actions
     (void)new TDEAction(i18n("Back"), "back", TQt::ALT + TQt::Key_Left,
-                      Main::_editorManager, TQT_SLOT(goBack()), actionCollection(), "history_back");
+                      Main::_editorManager, TQ_SLOT(goBack()), actionCollection(), "history_back");
     (void)new TDEAction(i18n("Forward"), "forward", TQt::ALT + TQt::Key_Right,
-                      Main::_editorManager, TQT_SLOT(goForward()), actionCollection(), "history_forward");
+                      Main::_editorManager, TQ_SLOT(goForward()), actionCollection(), "history_forward");
     (void)new TDEAction(i18n("Switch to..."), 0, TQt::CTRL + TQt::Key_Slash,
-                      Main::_editorManager, TQT_SLOT(switchToEditor()), actionCollection(), "file_switchto");
+                      Main::_editorManager, TQ_SLOT(switchToEditor()), actionCollection(), "file_switchto");
     (void)new TDEAction(i18n("Switch Header/Implementation"), 0, TQt::SHIFT + TQt::Key_F12,
-                      Main::_editorManager, TQT_SLOT(switchHeaderImplementation()), actionCollection(), "view_switch_source");
+                      Main::_editorManager, TQ_SLOT(switchHeaderImplementation()), actionCollection(), "view_switch_source");
     (void)new TDEAction(TQString(), 0, 0,
-                      Debugger::manager, TQT_SLOT(toggleBreakpoint()), actionCollection(), "toggle_breakpoint");
+                      Debugger::manager, TQ_SLOT(toggleBreakpoint()), actionCollection(), "toggle_breakpoint");
     (void)new TDEAction(TQString(), 0, 0,
-                      Debugger::manager, TQT_SLOT(toggleEnableBreakpoint()), actionCollection(), "enable_breakpoint");
+                      Debugger::manager, TQ_SLOT(toggleEnableBreakpoint()), actionCollection(), "enable_breakpoint");
     (void)new TDEAction(i18n("Show disassembly location"), 0, 0,
-                      Debugger::manager, TQT_SLOT(showDisassemblyLocation()), actionCollection(), "show_disassembly_location");
+                      Debugger::manager, TQ_SLOT(showDisassemblyLocation()), actionCollection(), "show_disassembly_location");
     TDEActionMenu *toolViewsMenu = new TDEActionMenu( i18n("Tool Views"), 0, "view_tool_views");
-    connect(toolViewsMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(updateToolViewsActions()));
+    connect(toolViewsMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(updateToolViewsActions()));
     actionCollection()->insert(toolViewsMenu);
-    a = new TDEAction(i18n("&Reset Layout"), 0, 0, this, TQT_SLOT(resetDockLayout()), actionCollection(), "view_reset_layout");
+    a = new TDEAction(i18n("&Reset Layout"), 0, 0, this, TQ_SLOT(resetDockLayout()), actionCollection(), "view_reset_layout");
     toolViewsMenu->insert(a);
     toolViewsMenu->popupMenu()->insertSeparator();
     TQValueList<DockData>::iterator it;
@@ -224,106 +224,106 @@ MainWindow::MainWindow()
 
     // project actions
     (void)new TDEAction(i18n("New Project..."), "piklab_createproject", 0,
-                      this, TQT_SLOT(newProject()), actionCollection(), "project_new");
+                      this, TQ_SLOT(newProject()), actionCollection(), "project_new");
     (void)new TDEAction(i18n("Open Project..."), "piklab_openproject", 0,
-                      this, TQT_SLOT(openProject()), actionCollection(), "project_open");
+                      this, TQ_SLOT(openProject()), actionCollection(), "project_open");
     recent = new TDERecentFilesAction(i18n("Open Recent Project"), 0,
-                      this, TQT_SLOT(openRecentProject(const KURL &)), actionCollection(), "project_open_recent");
+                      this, TQ_SLOT(openRecentProject(const KURL &)), actionCollection(), "project_open_recent");
     recent->setMaxItems(20);
     recent->loadEntries(kapp->config(), "recent-projects");
     (void)new TDEAction(i18n("Project Options..."), "configure", 0,
-                      this, TQT_SLOT(configureProject()), actionCollection(), "project_options");
+                      this, TQ_SLOT(configureProject()), actionCollection(), "project_options");
     (void)new TDEAction(i18n("Close Project"), "window-close", 0,
-                      this, TQT_SLOT(closeProject()), actionCollection(), "project_close");
+                      this, TQ_SLOT(closeProject()), actionCollection(), "project_close");
     (void)new TDEAction(i18n("Add Source File..."), "piklab_addfile", 0,
-                      Main::_projectManager, TQT_SLOT(insertSourceFiles()), actionCollection(), "project_add_source_file");
+                      Main::_projectManager, TQ_SLOT(insertSourceFiles()), actionCollection(), "project_add_source_file");
     (void)new TDEAction(i18n("Add Object File..."), "piklab_addfile", 0,
-                      Main::_projectManager, TQT_SLOT(insertObjectFiles()), actionCollection(), "project_add_object_file");
+                      Main::_projectManager, TQ_SLOT(insertObjectFiles()), actionCollection(), "project_add_object_file");
     (void)new TDEAction(i18n("Add Current File"), "piklab_addcurrentfile", 0,
-                      Main::_projectManager, TQT_SLOT(insertCurrentFile()), actionCollection(), "project_add_current_file");
+                      Main::_projectManager, TQ_SLOT(insertCurrentFile()), actionCollection(), "project_add_current_file");
 
     // build actions
     (void)new TDEAction(i18n("&Build Project"), "piklab_compile", TQt::Key_F8,
-                      this, TQT_SLOT(buildProject()), actionCollection(), "build_build_project");
+                      this, TQ_SLOT(buildProject()), actionCollection(), "build_build_project");
     (void)new TDEAction(i18n("&Compile File"), 0, TQt::SHIFT + TQt::Key_F8,
-                      this, TQT_SLOT(compileFile()), actionCollection(), "build_compile_file");
+                      this, TQ_SLOT(compileFile()), actionCollection(), "build_compile_file");
     (void)new TDEAction(i18n("Clean"), "trashcan_empty", 0,
-                      this, TQT_SLOT(cleanBuild()), actionCollection(), "build_clean");
+                      this, TQ_SLOT(cleanBuild()), actionCollection(), "build_clean");
     (void)new TDEAction(i18n("Stop"), "process-stop", 0,
-                      this, TQT_SLOT(stopBuild()), actionCollection(), "build_stop");
+                      this, TQ_SLOT(stopBuild()), actionCollection(), "build_stop");
 
     // programmer actions
     (void)new TDEAction(i18n("&Connect"), "connect_creating", 0,
-                      Programmer::manager, TQT_SLOT(connectDevice()), actionCollection(), "prog_connect");
+                      Programmer::manager, TQ_SLOT(connectDevice()), actionCollection(), "prog_connect");
     (void)new TDEToggleAction(i18n("Device Power"), "piklab_power", 0,
-                            Programmer::manager, TQT_SLOT(toggleDevicePower()), actionCollection(), "prog_power");
+                            Programmer::manager, TQ_SLOT(toggleDevicePower()), actionCollection(), "prog_power");
     (void)new TDEAction(i18n("&Disconnect"), "connect_no", 0,
-                      Programmer::manager, TQT_SLOT(disconnectDevice()), actionCollection(), "prog_disconnect");
+                      Programmer::manager, TQ_SLOT(disconnectDevice()), actionCollection(), "prog_disconnect");
     (void)new TDEAction(i18n("&Program"), "piklab_burnchip", TQt::SHIFT + TQt::Key_F5,
-                      this, TQT_SLOT(program()), actionCollection(), "prog_program");
+                      this, TQ_SLOT(program()), actionCollection(), "prog_program");
     (void)new TDEAction(i18n("&Verify"), "piklab_verifychip", TQt::SHIFT + TQt::Key_F6,
-                      this, TQT_SLOT(verify()), actionCollection(), "prog_verify");
+                      this, TQ_SLOT(verify()), actionCollection(), "prog_verify");
     (void)new TDEAction(i18n("&Read"), "piklab_readchip", TQt::SHIFT + TQt::Key_F7,
-                      this, TQT_SLOT(read()), actionCollection(), "prog_read");
+                      this, TQ_SLOT(read()), actionCollection(), "prog_read");
     (void)new TDEAction(i18n("&Erase"), "piklab_erasechip", 0,
-                      this, TQT_SLOT(erase()), actionCollection(), "prog_erase");
+                      this, TQ_SLOT(erase()), actionCollection(), "prog_erase");
     (void)new TDEAction(i18n("&Blank Check"), "piklab_blankcheck", 0,
-                      this, TQT_SLOT(blankCheck()), actionCollection(), "prog_blank_check");
+                      this, TQ_SLOT(blankCheck()), actionCollection(), "prog_blank_check");
     (void)new TDEAction(i18n("&Run"), "launch", TQt::SHIFT + TQt::Key_F9,
-                      Programmer::manager, TQT_SLOT(run()), actionCollection(), "prog_run");
+                      Programmer::manager, TQ_SLOT(run()), actionCollection(), "prog_run");
     (void)new TDEAction(i18n("&Stop"), "piklab_stop", 0,
-                      Programmer::manager, TQT_SLOT(halt()), actionCollection(), "prog_stop");
+                      Programmer::manager, TQ_SLOT(halt()), actionCollection(), "prog_stop");
     (void)new TDEAction(i18n("R&estart"), "piklab_restart", 0,
-                      Programmer::manager, TQT_SLOT(restart()), actionCollection(), "prog_restart");
+                      Programmer::manager, TQ_SLOT(restart()), actionCollection(), "prog_restart");
     (void)new TDEAction(i18n("&Advanced..."), 0, 0,
-                      Programmer::manager , TQT_SLOT(showAdvancedDialog()), actionCollection(), "prog_advanced");
+                      Programmer::manager , TQ_SLOT(showAdvancedDialog()), actionCollection(), "prog_advanced");
     (void)new TDEAction(i18n("Settings..."), "configure", 0,
-                      this, TQT_SLOT(showProgrammerSettings()), actionCollection(), "prog_settings");
+                      this, TQ_SLOT(showProgrammerSettings()), actionCollection(), "prog_settings");
 
     // debugger actions
     (void)new TDEAction(i18n("&Start"), "launch", TQt::SHIFT + TQt::Key_F9,
-                      Programmer::manager, TQT_SLOT(restart()), actionCollection(), "debug_start");
+                      Programmer::manager, TQ_SLOT(restart()), actionCollection(), "debug_start");
     (void)new TDEAction(i18n("&Run"), "piklab_run", TQt::SHIFT + TQt::Key_F9,
-                      Programmer::manager, TQT_SLOT(run()), actionCollection(), "debug_run");
+                      Programmer::manager, TQ_SLOT(run()), actionCollection(), "debug_run");
     (void)new TDEAction(i18n("&Step"), "piklab_debug_step", 0,
-                      Programmer::manager, TQT_SLOT(step()), actionCollection(), "debug_next");
+                      Programmer::manager, TQ_SLOT(step()), actionCollection(), "debug_next");
     //(void)new TDEAction(i18n("Step &In"), "piklab_debug_stepin",
-    //             0, this, TQT_SLOT(debugStepIn()), actionCollection(), "debug_step_in");
+    //             0, this, TQ_SLOT(debugStepIn()), actionCollection(), "debug_step_in");
     //(void)new TDEAction(i18n("Step &Out"), "piklab_debug_stepout",
-    //             0, this, TQT_SLOT(debugStepOut()), actionCollection(), "debug_step_out");
+    //             0, this, TQ_SLOT(debugStepOut()), actionCollection(), "debug_step_out");
     (void)new TDEAction(i18n("&Break<Translators: it is the verb>", "&Halt"), "piklab_debughalt", 0,
-                      Programmer::manager, TQT_SLOT(halt()), actionCollection(), "debug_halt");
+                      Programmer::manager, TQ_SLOT(halt()), actionCollection(), "debug_halt");
     (void)new TDEAction(i18n("&Disconnect/Stop"), "piklab_stop", 0,
-                      Programmer::manager, TQT_SLOT(disconnectDevice()), actionCollection(), "debug_stop");
+                      Programmer::manager, TQ_SLOT(disconnectDevice()), actionCollection(), "debug_stop");
     (void)new TDEAction(i18n("R&eset"), "piklab_restart", 0,
-                      Programmer::manager, TQT_SLOT(restart()), actionCollection(), "debug_reset");
+                      Programmer::manager, TQ_SLOT(restart()), actionCollection(), "debug_reset");
     (void)new TDEAction(i18n("Show Program Counter"), "piklab_program_counter", 0,
-                      Debugger::manager, TQT_SLOT(showPC()), actionCollection(), "debug_show_pc");
+                      Debugger::manager, TQ_SLOT(showPC()), actionCollection(), "debug_show_pc");
     (void)new TDEAction(i18n("Clear All Breakpoints"), "remove", 0,
-                      Debugger::manager, TQT_SLOT(clearBreakpoints()), actionCollection(), "debug_clear_breakpoints");
+                      Debugger::manager, TQ_SLOT(clearBreakpoints()), actionCollection(), "debug_clear_breakpoints");
     (void)new TDEAction(i18n("Settings..."), "configure", 0,
-                      this, TQT_SLOT(showDebuggerSettings()), actionCollection(), "debug_settings");
+                      this, TQ_SLOT(showDebuggerSettings()), actionCollection(), "debug_settings");
 
     // tools
     (void)new TDEAction(i18n("&Pikloops..."), 0, 0,
-                      this, TQT_SLOT(runPikloops()), actionCollection(), "tools_pikloops");
+                      this, TQ_SLOT(runPikloops()), actionCollection(), "tools_pikloops");
     (void)new TDEAction(i18n("&Find Files..."), "edit-find", 0,
-                      this, TQT_SLOT(runKfind()), actionCollection(), "tools_kfind");
+                      this, TQ_SLOT(runKfind()), actionCollection(), "tools_kfind");
     (void)new TDEAction(i18n("&Device Information..."), "application-vnd.tde.info", 0,
-                      this, TQT_SLOT(showDeviceInfo()), actionCollection(), "tools_device_information");
+                      this, TQ_SLOT(showDeviceInfo()), actionCollection(), "tools_device_information");
     (void)new TDEAction(i18n("&Config Generator..."), 0, 0,
-                      this, TQT_SLOT(configGenerator()), actionCollection(), "tools_config_generator");
+                      this, TQ_SLOT(configGenerator()), actionCollection(), "tools_config_generator");
     (void)new TDEAction(i18n("&Template Generator..."), 0, 0,
-                      this, TQT_SLOT(templateGenerator()), actionCollection(), "tools_template_generator");
+                      this, TQ_SLOT(templateGenerator()), actionCollection(), "tools_template_generator");
 
     // settings actions
     (void)new TDEAction(i18n("Configure Toolchains..."), 0, 0,
-                      this, TQT_SLOT(configureToolchains()), actionCollection(), "options_configure_toolchains");
-    (void)KStdAction::preferences(this, TQT_SLOT(configure()), actionCollection());
+                      this, TQ_SLOT(configureToolchains()), actionCollection(), "options_configure_toolchains");
+    (void)KStdAction::preferences(this, TQ_SLOT(configure()), actionCollection());
 
     // help
     (void)new TDEAction(i18n("Report Bug..."), "likeback_bug", 0,
-                      LikeBack::instance(), TQT_SLOT(iFoundABug()), actionCollection(), "help_report_bug_piklab");
+                      LikeBack::instance(), TQ_SLOT(iFoundABug()), actionCollection(), "help_report_bug_piklab");
 
     setupGUI();
     readDockConfig();
@@ -332,25 +332,25 @@ MainWindow::MainWindow()
     menuBar()->insertItem(new TQLabel(menuBar())); // #### first widget is put left-most...
     MenuBarButton *button = new MenuBarButton("likeback_like", menuBar());
     TQToolTip::add(button, i18n("I like..."));
-    connect(button, TQT_SIGNAL(clicked()), LikeBack::instance(), TQT_SLOT(iLike()));
+    connect(button, TQ_SIGNAL(clicked()), LikeBack::instance(), TQ_SLOT(iLike()));
     menuBar()->insertItem(button);
     button = new MenuBarButton("likeback_dislike", menuBar());
     TQToolTip::add(button, i18n("I do not like..."));
-    connect(button, TQT_SIGNAL(clicked()), LikeBack::instance(), TQT_SLOT(iDoNotLike()));
+    connect(button, TQ_SIGNAL(clicked()), LikeBack::instance(), TQ_SLOT(iDoNotLike()));
     menuBar()->insertItem(button);
     button = new MenuBarButton("likeback_bug", menuBar());
     TQToolTip::add(button, i18n("I found a bug..."));
-    connect(button, TQT_SIGNAL(clicked()), LikeBack::instance(), TQT_SLOT(iFoundABug()));
+    connect(button, TQ_SIGNAL(clicked()), LikeBack::instance(), TQ_SLOT(iFoundABug()));
     menuBar()->insertItem(button);
     button = new MenuBarButton("configure", menuBar());
     TQToolTip::add(button, i18n("Configure email..."));
-    connect(button, TQT_SIGNAL(clicked()), LikeBack::instance(), TQT_SLOT(askEMail()));
+    connect(button, TQ_SIGNAL(clicked()), LikeBack::instance(), TQ_SLOT(askEMail()));
     menuBar()->insertItem(button);
     button = new MenuBarButton("help", menuBar());
-    connect(button, TQT_SIGNAL(clicked()), LikeBack::instance(), TQT_SLOT(showWhatsThisMessage()));
+    connect(button, TQ_SIGNAL(clicked()), LikeBack::instance(), TQ_SLOT(showWhatsThisMessage()));
     menuBar()->insertItem(button);
 
-    TQTimer::singleShot(0, this, TQT_SLOT(initialLoading()));
+    TQTimer::singleShot(0, this, TQ_SLOT(initialLoading()));
 }
 
 MainWindow::~MainWindow()
@@ -404,7 +404,7 @@ void MainWindow::configureToolbar()
 {
   saveMainWindowSettings(TDEGlobal::config(), "MainWindow");
   KEditToolbar dlg(actionCollection());
-  connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(applyToolbarSettings()));
+  connect(&dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(applyToolbarSettings()));
   dlg.exec();
 }
 
@@ -710,7 +710,7 @@ void MainWindow::runKfind()
   PURL::Url url = Main::projectManager().projectUrl();
   if ( !url.isEmpty() ) path = url.path();
   _kfindProcess->setup("kfind", path, false);
-  connect(_kfindProcess, TQT_SIGNAL(done(int)), TQT_SLOT(kfindDone()));
+  connect(_kfindProcess, TQ_SIGNAL(done(int)), TQ_SLOT(kfindDone()));
   if ( !_kfindProcess->start(0) )
     MessageBox::sorry(i18n("Could not run \"kfind\""), Log::Show);
 }
@@ -726,7 +726,7 @@ void MainWindow::runPikloops()
   if (_pikloopsProcess) return;
   _pikloopsProcess = new ::Process::StringOutput;
   _pikloopsProcess->setup("pikloops", TQStringList(), false);
-  connect(_pikloopsProcess, TQT_SIGNAL(done(int)), TQT_SLOT(pikloopsDone()));
+  connect(_pikloopsProcess, TQ_SIGNAL(done(int)), TQ_SLOT(pikloopsDone()));
   if ( !_pikloopsProcess->start(0) )
     MessageBox::detailedSorry(i18n("Could not run \"pikloops\""), i18n("The Pikloops utility (%1) is not installed in your system.").arg("http://pikloops.sourceforge.net"), Log::Show);
 }
diff --git a/src/libgui/toplevel_ui.cpp b/src/libgui/toplevel_ui.cpp
index 41f993c..c0d24a4 100644
--- a/src/libgui/toplevel_ui.cpp
+++ b/src/libgui/toplevel_ui.cpp
@@ -18,8 +18,8 @@
 ProgrammerStatusWidget::ProgrammerStatusWidget(TQWidget *parent)
   : TQObject(parent), KeyPopupButton<TQString>(parent)
 {
-  connect(widget(), TQT_SIGNAL(activated(int)), TQT_SLOT(activatedSlot(int)));
-  widget()->appendAction(i18n("Configure..."), "configure", this, TQT_SIGNAL(configure()));
+  connect(widget(), TQ_SIGNAL(activated(int)), TQ_SLOT(activatedSlot(int)));
+  widget()->appendAction(i18n("Configure..."), "configure", this, TQ_SIGNAL(configure()));
   widget()->appendSeparator();
   Programmer::Lister::ConstIterator it;
   for (it=Programmer::lister().begin(); it!=Programmer::lister().end(); ++it)
@@ -35,9 +35,9 @@ void ProgrammerStatusWidget::activatedSlot(int id)
 ToolStatusWidget::ToolStatusWidget(TQWidget *parent)
   : TQObject(parent), KeyPopupButton<TQString>(parent)
 {
-  connect(widget(), TQT_SIGNAL(activated(int)), TQT_SLOT(activatedSlot(int)));
-  widget()->appendAction(i18n("Configure Toolchain..."), "configure", this, TQT_SIGNAL(configureToolchain()));
-  widget()->appendAction(i18n("Configure Compilation..."), "configure", this, TQT_SIGNAL(configure()));
+  connect(widget(), TQ_SIGNAL(activated(int)), TQ_SLOT(activatedSlot(int)));
+  widget()->appendAction(i18n("Configure Toolchain..."), "configure", this, TQ_SIGNAL(configureToolchain()));
+  widget()->appendAction(i18n("Configure Compilation..."), "configure", this, TQ_SIGNAL(configure()));
   widget()->appendSeparator();
   Tool::Lister::ConstIterator it;
   for (it=Tool::lister().begin(); it!=Tool::lister().end(); ++it)
diff --git a/src/libgui/watch_view.cpp b/src/libgui/watch_view.cpp
index b76587a..7f838e8 100644
--- a/src/libgui/watch_view.cpp
+++ b/src/libgui/watch_view.cpp
@@ -29,10 +29,10 @@ Register::BaseListView::BaseListView(TQWidget *parent)
   setFullWidth(true);
   setRootIsDecorated(false);
   setAllColumnsShowFocus(true);
-  connect(this, TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem *, const TQPoint &, int)),
-          TQT_SLOT(itemClicked(int, TQListViewItem *, const TQPoint &, int)));
-  connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),
-          TQT_SLOT(contextMenu(TQListViewItem *, const TQPoint &, int)));
+  connect(this, TQ_SIGNAL(mouseButtonClicked(int, TQListViewItem *, const TQPoint &, int)),
+          TQ_SLOT(itemClicked(int, TQListViewItem *, const TQPoint &, int)));
+  connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),
+          TQ_SLOT(contextMenu(TQListViewItem *, const TQPoint &, int)));
 }
 
 //-----------------------------------------------------------------------------
@@ -113,7 +113,7 @@ void Register::WatchedListView::init(const Device::Data *data)
   _formatPopup = appendFormatMenu(_popup, _ids.count());
   TDEIconLoader loader;
   TQPixmap icon = loader.loadIcon("cancel", TDEIcon::Small);
-  _popup->insertItem(icon, i18n("Clear"), Debugger::manager, TQT_SLOT(stopWatchAll()));
+  _popup->insertItem(icon, i18n("Clear"), Debugger::manager, TQ_SLOT(stopWatchAll()));
 }
 
 void Register::WatchedListView::updateView()