Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 35fbd60457d1e51e6a0df5d181d1a0f00ad75a2c)

49 files changed, 566 insertions, 566 deletions

diff --git a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp
index 39b6e5af..8ce81310 100644
--- a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp
+++ b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp
@@ -37,17 +37,17 @@
     openIcon = TQPixmap( fileopen );
     TQToolButton * fileOpen
 	= new TQToolButton( openIcon, tr("Open File"), TQString(),
-			   this, TQT_SLOT(choose()), fileTools, "open file" );
+			   this, TQ_SLOT(choose()), fileTools, "open file" );
 
     saveIcon = TQPixmap( filesave );
     TQToolButton * fileSave
 	= new TQToolButton( saveIcon, tr("Save File"), TQString(),
-			   this, TQT_SLOT(save()), fileTools, "save file" );
+			   this, TQ_SLOT(save()), fileTools, "save file" );
 
     printIcon = TQPixmap( fileprint );
     TQToolButton * filePrint
 	= new TQToolButton( printIcon, tr("Print File"), TQString(),
-			   this, TQT_SLOT(print()), fileTools, "print file" );
+			   this, TQ_SLOT(print()), fileTools, "print file" );
 
 
     (void)TQWhatsThis::whatsThisButton( fileTools );
@@ -79,41 +79,41 @@
     menuBar()->insertItem( tr("&File"), file );
 
 
-    file->insertItem( tr("&New"), this, TQT_SLOT(newDoc()), CTRL+Key_N );
+    file->insertItem( tr("&New"), this, TQ_SLOT(newDoc()), CTRL+Key_N );
 
     int id;
     id = file->insertItem( openIcon, tr("&Open..."),
-			   this, TQT_SLOT(choose()), CTRL+Key_O );
+			   this, TQ_SLOT(choose()), CTRL+Key_O );
     file->setWhatsThis( id, fileOpenText );
 
     id = file->insertItem( saveIcon, tr("&Save"),
-			   this, TQT_SLOT(save()), CTRL+Key_S );
+			   this, TQ_SLOT(save()), CTRL+Key_S );
     file->setWhatsThis( id, fileSaveText );
 
-    id = file->insertItem( tr("Save &As..."), this, TQT_SLOT(saveAs()) );
+    id = file->insertItem( tr("Save &As..."), this, TQ_SLOT(saveAs()) );
     file->setWhatsThis( id, fileSaveText );
 
     file->insertSeparator();
 
     id = file->insertItem( printIcon, tr("&Print..."),
-			   this, TQT_SLOT(print()), CTRL+Key_P );
+			   this, TQ_SLOT(print()), CTRL+Key_P );
     file->setWhatsThis( id, filePrintText );
 
     file->insertSeparator();
 
-    file->insertItem( tr("&Close"), this, TQT_SLOT(close()), CTRL+Key_W );
+    file->insertItem( tr("&Close"), this, TQ_SLOT(close()), CTRL+Key_W );
 
-    file->insertItem( tr("&Quit"), tqApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q );
+    file->insertItem( tr("&Quit"), tqApp, TQ_SLOT( closeAllWindows() ), CTRL+Key_Q );
 
     menuBar()->insertSeparator();
 
     TQPopupMenu * help = new TQPopupMenu( this );
     menuBar()->insertItem( tr("&Help"), help );
 
-    help->insertItem( tr("&About"), this, TQT_SLOT(about()), Key_F1 );
-    help->insertItem( tr("About &TQt"), this, TQT_SLOT(aboutTQt()) );
+    help->insertItem( tr("&About"), this, TQ_SLOT(about()), Key_F1 );
+    help->insertItem( tr("About &TQt"), this, TQ_SLOT(aboutTQt()) );
     help->insertSeparator();
-    help->insertItem( tr("What's &This"), this, TQT_SLOT(whatsThis()), SHIFT+Key_F1 );
+    help->insertItem( tr("What's &This"), this, TQ_SLOT(whatsThis()), SHIFT+Key_F1 );
 
     e = new TQTextEdit( this, "editor" );
     e->setFocus();
diff --git a/languages/cpp/app_templates/cmakeqt3app/main.cpp b/languages/cpp/app_templates/cmakeqt3app/main.cpp
index 8938adc5..ba45c728 100644
--- a/languages/cpp/app_templates/cmakeqt3app/main.cpp
+++ b/languages/cpp/app_templates/cmakeqt3app/main.cpp
@@ -8,6 +8,6 @@ int main( int argc, char ** argv ) {
     %{APPNAME} * mw = new %{APPNAME}();
     mw->setCaption( "%{APPNAME}" );
     mw->show();
-    a.connect( &a, TQT_SIGNAL(lastWindowClosed()), &a, TQT_SLOT(quit()) );
+    a.connect( &a, TQ_SIGNAL(lastWindowClosed()), &a, TQ_SLOT(quit()) );
     return a.exec();
 }
diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp
index 774efe8e..d801904f 100644
--- a/languages/cpp/app_templates/kapp/app.cpp
+++ b/languages/cpp/app_templates/kapp/app.cpp
@@ -49,10 +49,10 @@
     setupGUI();
 
     // allow the view to change the statusbar and caption
-    connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)),
-            this,   TQT_SLOT(changeStatusbar(const TQString&)));
-    connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)),
-            this,   TQT_SLOT(changeCaption(const TQString&)));
+    connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)),
+            this,   TQ_SLOT(changeStatusbar(const TQString&)));
+    connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)),
+            this,   TQ_SLOT(changeCaption(const TQString&)));
 
 }
 
@@ -88,19 +88,19 @@ void %{APPNAME}::load(const KURL& url)
 
 void %{APPNAME}::setupActions()
 {
-    KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection());
-    KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
-    KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection());
-    KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection());
-    KStdAction::print(this, TQT_SLOT(filePrint()), actionCollection());
-    KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
+    KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection());
+    KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
+    KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection());
+    KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection());
+    KStdAction::print(this, TQ_SLOT(filePrint()), actionCollection());
+    KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
 
-    KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
+    KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection());
 
     // this doesn't do anything useful.  it's just here to illustrate
     // how to insert a custom menu and menu item
     TDEAction *custom = new TDEAction(i18n("Cus&tom Menuitem"), 0,
-                                  this, TQT_SLOT(optionsPreferences()),
+                                  this, TQ_SLOT(optionsPreferences()),
                                   actionCollection(), "custom_action");
 }
 
diff --git a/languages/cpp/app_templates/kapp/appview.cpp b/languages/cpp/app_templates/kapp/appview.cpp
index 16c05a3f..244f4a75 100644
--- a/languages/cpp/app_templates/kapp/appview.cpp
+++ b/languages/cpp/app_templates/kapp/appview.cpp
@@ -63,10 +63,10 @@
         return;
     }
 
-    connect(m_html, TQT_SIGNAL(setWindowCaption(const TQString&)),
-            this,   TQT_SLOT(slotSetTitle(const TQString&)));
-    connect(m_html, TQT_SIGNAL(setStatusBarText(const TQString&)),
-            this,   TQT_SLOT(slotOnURL(const TQString&)));
+    connect(m_html, TQ_SIGNAL(setWindowCaption(const TQString&)),
+            this,   TQ_SLOT(slotSetTitle(const TQString&)));
+    connect(m_html, TQ_SIGNAL(setStatusBarText(const TQString&)),
+            this,   TQ_SLOT(slotOnURL(const TQString&)));
 
 }
 
diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.cpp b/languages/cpp/app_templates/kateplugin/plugin_app.cpp
index 4d80a74c..351fca4e 100644
--- a/languages/cpp/app_templates/kateplugin/plugin_app.cpp
+++ b/languages/cpp/app_templates/kateplugin/plugin_app.cpp
@@ -55,7 +55,7 @@ void KatePlugin%{APPNAME}::addView(Kate::MainWindow *win)
     PluginView *view = new PluginView ();
 
      (void) new TDEAction ( i18n("Insert Hello World"), 0, this,
-                      TQT_SLOT( slotInsertHello() ), view->actionCollection(),
+                      TQ_SLOT( slotInsertHello() ), view->actionCollection(),
                       "edit_insert_%{APPNAMELC}" );
 
     view->setInstance (new TDEInstance("kate"));
diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
index 8845fae3..19b31c71 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
+++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
@@ -59,7 +59,7 @@ void KatePlugin%{APPNAME}::addView(Kate::MainWindow *win)
     PluginView *view = new PluginView ();
 
     (void) new TDEAction ( i18n("Insert Hello World"), 0, this,
-                         TQT_SLOT( slotInsertHello() ), view->actionCollection(),
+                         TQ_SLOT( slotInsertHello() ), view->actionCollection(),
                          "edit_insert_%{APPNAMELC}" );
 
     view->setInstance (new TDEInstance("kate"));
@@ -94,7 +94,7 @@ Kate::PluginConfigPage* KatePlugin%{APPNAME}::configPage (uint, TQWidget *w, con
 {
     %{APPNAME}ConfigPage* p = new %{APPNAME}ConfigPage(this, w);
     initConfigPage( p );
-    connect( p, TQT_SIGNAL(configPageApplyRequest(%{APPNAME}ConfigPage*)), this, TQT_SLOT(slotApplyConfig(%{APPNAME}ConfigPage*)) );
+    connect( p, TQ_SIGNAL(configPageApplyRequest(%{APPNAME}ConfigPage*)), this, TQ_SLOT(slotApplyConfig(%{APPNAME}ConfigPage*)) );
     return (Kate::PluginConfigPage*)p;
 }
 
@@ -124,7 +124,7 @@ void KatePlugin%{APPNAME}::slotApplyConfig( %{APPNAME}ConfigPage* p )
 
     lo->addWidget(lab);
 
-    // TODO: add connection to emit TQT_SLOT( changed() )
+    // TODO: add connection to emit TQ_SLOT( changed() )
 }
 
 %{APPNAME}ConfigPage::~%{APPNAME}ConfigPage()
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
index 69dcd7d8..c96ffbf1 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
+++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
@@ -28,17 +28,17 @@ static const KDevPluginInfo data("kdev%{APPNAMELC}");
 	setXMLFile("kdevlang_%{APPNAMELC}.rc");
 
 
-	m_build = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" );
+	m_build = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQ_SLOT(slotRun()),actionCollection(), "build_execute" );
 
 	kdDebug() << "Creating %{APPNAMELC} Part" << endl;
 
-	connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)),
-		this, TQT_SLOT(projectConfigWidget(KDialogBase*)) );
-	connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) );
-	connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) );
-	connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), this, TQT_SLOT(savedFile(const KURL&)) );
-	connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
-		this, TQT_SLOT(slotActivePartChanged(KParts::Part *)));
+	connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)),
+		this, TQ_SLOT(projectConfigWidget(KDialogBase*)) );
+	connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) );
+	connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) );
+	connect( partController(), TQ_SIGNAL(savedFile(const KURL&)), this, TQ_SLOT(savedFile(const KURL&)) );
+	connect(partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)),
+		this, TQ_SLOT(slotActivePartChanged(KParts::Part *)));
 }
 
 
@@ -74,14 +74,14 @@ void %{APPNAME}Part::projectOpened()
 {
 	kdDebug(9014) << "projectOpened()" << endl;
 
-	connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)),
-		this, TQT_SLOT(addedFilesToProject(const TQStringList &)) );
-	connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)),
-		this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) );
+	connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList &)),
+		this, TQ_SLOT(addedFilesToProject(const TQStringList &)) );
+	connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList &)),
+		this, TQ_SLOT(removedFilesFromProject(const TQStringList &)) );
 
 	// We want to parse only after all components have been
 	// properly initialized
-	TQTimer::singleShot(0, this, TQT_SLOT(parse()));
+	TQTimer::singleShot(0, this, TQ_SLOT(parse()));
 }
 void %{APPNAME}Part::projectClosed()
 {
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
index 6a2559ba..4c940738 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
+++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
@@ -60,16 +60,16 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( pluginData )
     m_configProxy = new ConfigWidgetProxy(core());
     m_configProxy->createGlobalConfigPage(i18n("%{APPNAME}"), GLOBALDOC_OPTIONS, info()->icon());
     m_configProxy->createProjectConfigPage(i18n("%{APPNAME}"), PROJECTDOC_OPTIONS, info()->icon());
-    connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )),
-        this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int)));
+    connect(m_configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )),
+        this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int)));
 
-    connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
-        this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)));
-    connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()));
-    connect(core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()));
+    connect(core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
+        this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)));
+    connect(core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()));
+    connect(core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()));
   
         
-    TQTimer::singleShot(0, this, TQT_SLOT(init()));
+    TQTimer::singleShot(0, this, TQ_SLOT(init()));
 }
 
 %{APPNAME}Part::~%{APPNAME}Part()
@@ -92,7 +92,7 @@ void %{APPNAME}Part::setupActions()
 {
 // create XMLGUI actions here
     action = new TDEAction(i18n("&Do Something..."), 0,
-        this, TQT_SLOT(doSomething()), actionCollection(), "plugin_action" );
+        this, TQ_SLOT(doSomething()), actionCollection(), "plugin_action" );
     action->setToolTip(i18n("Do something"));
     action->setWhatsThis(i18n("<b>Do something</b><p>Describe here what does this action do."));
 }
@@ -105,13 +105,13 @@ void %{APPNAME}Part::insertConfigWidget(const KDialogBase *dlg, TQWidget *page,
         case GLOBALDOC_OPTIONS:
         {
             %{APPNAME}GlobalConfig *w = new %{APPNAME}GlobalConfig(this, page, "global config");
-            connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()));
+            connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()));
             break;
         }
         case PROJECTDOC_OPTIONS:
         {
             %{APPNAME}ProjectConfig *w = new %{APPNAME}ProjectConfig(this, page, "project config");
-            connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()));
+            connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()));
             break;
         }
     }
@@ -131,7 +131,7 @@ void %{APPNAME}Part::contextMenu(TQPopupMenu *popup, const Context *context)
         // or create menu items on the fly
         // int id = -1;
         // id = popup->insertItem(i18n("Do Something Here"),
-        //     this, TQT_SLOT(doSomething()) );
+        //     this, TQ_SLOT(doSomething()) );
         // popup->setWhatsThis(id, i18n("<b>Do something here</b><p>Describe here what does this action do."
     }
     else if (context->hasType(Context::FileContext)) 
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
index 6a2559ba..4c940738 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
+++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
@@ -60,16 +60,16 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( pluginData )
     m_configProxy = new ConfigWidgetProxy(core());
     m_configProxy->createGlobalConfigPage(i18n("%{APPNAME}"), GLOBALDOC_OPTIONS, info()->icon());
     m_configProxy->createProjectConfigPage(i18n("%{APPNAME}"), PROJECTDOC_OPTIONS, info()->icon());
-    connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )),
-        this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int)));
+    connect(m_configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )),
+        this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int)));
 
-    connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
-        this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)));
-    connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()));
-    connect(core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()));
+    connect(core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
+        this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)));
+    connect(core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()));
+    connect(core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()));
   
         
-    TQTimer::singleShot(0, this, TQT_SLOT(init()));
+    TQTimer::singleShot(0, this, TQ_SLOT(init()));
 }
 
 %{APPNAME}Part::~%{APPNAME}Part()
@@ -92,7 +92,7 @@ void %{APPNAME}Part::setupActions()
 {
 // create XMLGUI actions here
     action = new TDEAction(i18n("&Do Something..."), 0,
-        this, TQT_SLOT(doSomething()), actionCollection(), "plugin_action" );
+        this, TQ_SLOT(doSomething()), actionCollection(), "plugin_action" );
     action->setToolTip(i18n("Do something"));
     action->setWhatsThis(i18n("<b>Do something</b><p>Describe here what does this action do."));
 }
@@ -105,13 +105,13 @@ void %{APPNAME}Part::insertConfigWidget(const KDialogBase *dlg, TQWidget *page,
         case GLOBALDOC_OPTIONS:
         {
             %{APPNAME}GlobalConfig *w = new %{APPNAME}GlobalConfig(this, page, "global config");
-            connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()));
+            connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()));
             break;
         }
         case PROJECTDOC_OPTIONS:
         {
             %{APPNAME}ProjectConfig *w = new %{APPNAME}ProjectConfig(this, page, "project config");
-            connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()));
+            connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()));
             break;
         }
     }
@@ -131,7 +131,7 @@ void %{APPNAME}Part::contextMenu(TQPopupMenu *popup, const Context *context)
         // or create menu items on the fly
         // int id = -1;
         // id = popup->insertItem(i18n("Do Something Here"),
-        //     this, TQT_SLOT(doSomething()) );
+        //     this, TQ_SLOT(doSomething()) );
         // popup->setWhatsThis(id, i18n("<b>Do something here</b><p>Describe here what does this action do."
     }
     else if (context->hasType(Context::FileContext)) 
diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.cpp b/languages/cpp/app_templates/kofficepart/kopart_view.cpp
index 601413ef..2cf5ff06 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_view.cpp
+++ b/languages/cpp/app_templates/kofficepart/kopart_view.cpp
@@ -18,9 +18,9 @@
 {
     setInstance( %{APPNAME}Factory::global() );
     setXMLFile( "%{APPNAMELC}.rc" );
-    KStdAction::cut(this, TQT_SLOT( cut() ), actionCollection(), "cut" );
+    KStdAction::cut(this, TQ_SLOT( cut() ), actionCollection(), "cut" );
     // Note: Prefer KStdAction::* to any custom action if possible.
-    //m_cut = new TDEAction( i18n("&Cut"), "edit-cut", 0, this, TQT_SLOT( cut() ),
+    //m_cut = new TDEAction( i18n("&Cut"), "edit-cut", 0, this, TQ_SLOT( cut() ),
     //                   actionCollection(), "cut");
 }
 
diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp
index 759cbf5a..f963714e 100644
--- a/languages/cpp/app_templates/kpartapp/app.cpp
+++ b/languages/cpp/app_templates/kpartapp/app.cpp
@@ -76,16 +76,16 @@ void %{APPNAME}::load(const KURL& url)
 
 void %{APPNAME}::setupActions()
 {
-    KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection());
-    KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
+    KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection());
+    KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
 
-    KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
+    KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
 
-    m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection());
-    m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection());
+    m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection());
+    m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection());
 
-    KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
-    KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
+    KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection());
+    KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection());
 }
 
 void %{APPNAME}::saveProperties(TDEConfig* /*config*/)
@@ -159,8 +159,8 @@ void %{APPNAME}::optionsConfigureToolbars()
 
     // use the standard toolbar editor
     KEditToolbar dlg(factory());
-    connect(&dlg, TQT_SIGNAL(newToolbarConfig()),
-            this, TQT_SLOT(applyNewToolbarConfig()));
+    connect(&dlg, TQ_SIGNAL(newToolbarConfig()),
+            this, TQ_SLOT(applyNewToolbarConfig()));
     dlg.exec();
 }
 
diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp
index adf210b3..f4f866b1 100644
--- a/languages/cpp/app_templates/kpartapp/app_part.cpp
+++ b/languages/cpp/app_templates/kpartapp/app_part.cpp
@@ -26,9 +26,9 @@
     setWidget(m_widget);
 
     // create our actions
-    KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
-    KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection());
-    KStdAction::save(this, TQT_SLOT(save()), actionCollection());
+    KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
+    KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection());
+    KStdAction::save(this, TQ_SLOT(save()), actionCollection());
 
     // set our XML-UI resource file
     setXMLFile("%{APPNAMELC}_part.rc");
@@ -49,12 +49,12 @@ void %{APPNAME}Part::setReadWrite(bool rw)
     // notify your internal widget of the read-write state
     m_widget->setReadOnly(!rw);
     if (rw)
-        connect(m_widget, TQT_SIGNAL(textChanged()),
-                this,     TQT_SLOT(setModified()));
+        connect(m_widget, TQ_SIGNAL(textChanged()),
+                this,     TQ_SLOT(setModified()));
     else
     {
-        disconnect(m_widget, TQT_SIGNAL(textChanged()),
-                   this,     TQT_SLOT(setModified()));
+        disconnect(m_widget, TQ_SIGNAL(textChanged()),
+                   this,     TQ_SLOT(setModified()));
     }
 
     ReadWritePart::setReadWrite(rw);
diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
index c395d983..ecda7fb0 100644
--- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
+++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
@@ -14,7 +14,7 @@ Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* parent, const char* name )
     // Instantiate all of your actions here.  These will appear in
     // Konqueror's menu and toolbars.
     (void) new TDEAction( i18n("&Plugin Action"), "%{APPNAMELC}", 0,
-                        this, TQT_SLOT(slotAction()),
+                        this, TQ_SLOT(slotAction()),
                         actionCollection(), "plugin_action" );
 }
 
diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp
index 00e1adea..44a90d53 100644
--- a/languages/cpp/app_templates/kscons_kxt/app.cpp
+++ b/languages/cpp/app_templates/kscons_kxt/app.cpp
@@ -48,10 +48,10 @@
     setAutoSaveSettings();
 
     // allow the view to change the statusbar and caption
-    connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)),
-            this,   TQT_SLOT(changeStatusbar(const TQString&)));
-    connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)),
-            this,   TQT_SLOT(changeCaption(const TQString&)));
+    connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)),
+            this,   TQ_SLOT(changeStatusbar(const TQString&)));
+    connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)),
+            this,   TQ_SLOT(changeCaption(const TQString&)));
 
     showTipOnStart();
 }
@@ -62,22 +62,22 @@
 
 void %{APPNAME}::setupActions()
 {
-    KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection());
-    KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
+    KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection());
+    KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
 
-    m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection());
-    m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection());
+    m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection());
+    m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection());
 
-    KStdAction::tipOfDay( this, TQT_SLOT( showTip() ), actionCollection()
+    KStdAction::tipOfDay( this, TQ_SLOT( showTip() ), actionCollection()
             )->setWhatsThis(i18n("This shows useful tips on the use of this application."));
 
-    KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
-    KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
-    KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
+    KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection());
+    KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection());
+    KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection());
 
     // custom menu and menu item - the slot is in the class %{APPNAME}View
     TDEAction *custom = new TDEAction(i18n("Swi&tch Colors"), 0,
-                                  m_view, TQT_SLOT(switchColors()),
+                                  m_view, TQ_SLOT(switchColors()),
                                   actionCollection(), "switch_action");
 
     createGUI();
@@ -140,7 +140,7 @@ void %{APPNAME}::optionsPreferences()
 	// to the names of the variables in the .kcfg file
         TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow);
         dialog->addPage(new Prefs(), i18n("General"), "package_settings");
-        connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged()));
+        connect(dialog, TQ_SIGNAL(settingsChanged()), m_view, TQ_SLOT(settingsChanged()));
         dialog->show();
 }
 
diff --git a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
index cde31592..daa8b078 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
@@ -31,9 +31,9 @@ K_EXPORT_COMPONENT_FACTORY( lib%{APPNAMELC}part, %{APPNAMELC}PartFactory );
     setWidget(m_widget);
 
     // create our actions
-    KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
-    KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection());
-    KStdAction::save(this, TQT_SLOT(save()), actionCollection());
+    KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
+    KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection());
+    KStdAction::save(this, TQ_SLOT(save()), actionCollection());
 
     // set our XML-UI resource file
     setXMLFile("%{APPNAMELC}_part.rc");
@@ -63,12 +63,12 @@ void %{APPNAMELC}Part::setReadWrite(bool rw)
     // notify your internal widget of the read-write state
     m_widget->setReadOnly(!rw);
     if (rw)
-        connect(m_widget, TQT_SIGNAL(textChanged()),
-                this,     TQT_SLOT(setModified()));
+        connect(m_widget, TQ_SIGNAL(textChanged()),
+                this,     TQ_SLOT(setModified()));
     else
     {
-        disconnect(m_widget, TQT_SIGNAL(textChanged()),
-                   this,     TQT_SLOT(setModified()));
+        disconnect(m_widget, TQ_SIGNAL(textChanged()),
+                   this,     TQ_SLOT(setModified()));
     }
 
     ReadWritePart::setReadWrite(rw);
diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
index c63cb223..51639f36 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
@@ -53,8 +53,8 @@
 	setStandardMDIMenuEnabled(false);
 
 	m_manager = new KParts::PartManager(this);
-	connect(m_manager, TQT_SIGNAL(activePartChanged(KParts::Part*)),
-			this, TQT_SLOT(createGUI(KParts::Part*)) );
+	connect(m_manager, TQ_SIGNAL(activePartChanged(KParts::Part*)),
+			this, TQ_SLOT(createGUI(KParts::Part*)) );
 
 #if KDE_IS_VERSION(3, 3, 0)
 	setToolviewStyle( KMdi::TextAndIcon );
@@ -77,7 +77,7 @@
 	// and a status bar
 	statusBar()->show();
 
-	connect( this, TQT_SIGNAL( viewActivated( KMdiChildView * ) ), this, TQT_SLOT( currentChanged( KMdiChildView * ) ) );
+	connect( this, TQ_SIGNAL( viewActivated( KMdiChildView * ) ), this, TQ_SLOT( currentChanged( KMdiChildView * ) ) );
 
 	m_console = new tdemdikonsole(this, "konsole");
 	m_console->setIcon( SmallIcon("konsole") );
@@ -92,7 +92,7 @@
 		but->setIconSet(SmallIcon("tab_remove"));
 		but->adjustSize();
 		but->hide();
-		connect(but, TQT_SIGNAL(clicked()), actionCollection()->action( "file_close" ), TQT_SIGNAL(activated()));
+		connect(but, TQ_SIGNAL(clicked()), actionCollection()->action( "file_close" ), TQ_SIGNAL(activated()));
 		tabWidget()->setCornerWidget(but, TopRight);
 	}
 #endif
@@ -124,22 +124,22 @@ void %{APPNAMELC}tdemdi::setupActions()
 {
 	setXMLFile("%{APPNAMELC}_shell.rc");
 
-	KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection());
+	KStdAction::openNew(this, TQ_SLOT(slotFileNew()), actionCollection());
 
-	KStdAction::tipOfDay( this, TQT_SLOT( showTip() ), actionCollection() 
+	KStdAction::tipOfDay( this, TQ_SLOT( showTip() ), actionCollection() 
 			)->setWhatsThis(i18n("This shows useful tips on the use of this application."));
 
-	KStdAction::close(this, TQT_SLOT(slotFileClose()), actionCollection());
-	KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection());
+	KStdAction::close(this, TQ_SLOT(slotFileClose()), actionCollection());
+	KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection());
 
-	m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection());
-	m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection());
+	m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection());
+	m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection());
 
-	KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
-	KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
+	KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection());
+	KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection());
 
 	TDEAction* action = KStdAction::configureToolbars(this, 
-	         TQT_SLOT(optionsConfigureToolbars()), actionCollection());
+	         TQ_SLOT(optionsConfigureToolbars()), actionCollection());
 
 	createGUI( NULL );
 }
@@ -320,7 +320,7 @@ void %{APPNAMELC}tdemdi::optionsPreferences()
 
 	TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow);
 	dialog->addPage(new prefs(), i18n("General"), "package_settings");
-	connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChanged()));
+	connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(settingsChanged()));
 	dialog->show();
 }
 
diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp
index 1feb1b8b..24b1a974 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp
@@ -39,7 +39,7 @@
 			part()->widget()->reparent( this, TQPoint(0, 0) );
 			layout->addWidget( part()->widget() );
 
-			// connect( m_part, TQT_SIGNAL(stateChanged()), this, TQT_SLOT(updateCaption()) );
+			// connect( m_part, TQ_SIGNAL(stateChanged()), this, TQ_SLOT(updateCaption()) );
 		}
 		else
 		{
diff --git a/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp
index d4092b03..22c399ef 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp
@@ -35,7 +35,7 @@ void tdemdikonsole::respawn()
 		((TQFrame*)m_part->widget())->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
 
 	m_haskonsole=true;
-	connect( m_part, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) );
+	connect( m_part, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()) );
 
 	m_part->widget()->show();
 	show();
diff --git a/languages/cpp/app_templates/kxt/app.cpp b/languages/cpp/app_templates/kxt/app.cpp
index ecdd5127..e9edb6d5 100644
--- a/languages/cpp/app_templates/kxt/app.cpp
+++ b/languages/cpp/app_templates/kxt/app.cpp
@@ -47,10 +47,10 @@
     setAutoSaveSettings();
 
     // allow the view to change the statusbar and caption
-    connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)),
-            this,   TQT_SLOT(changeStatusbar(const TQString&)));
-    connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)),
-            this,   TQT_SLOT(changeCaption(const TQString&)));
+    connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)),
+            this,   TQ_SLOT(changeStatusbar(const TQString&)));
+    connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)),
+            this,   TQ_SLOT(changeCaption(const TQString&)));
 
 }
 
@@ -60,19 +60,19 @@
 
 void %{APPNAMELC}::setupActions()
 {
-    KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection());
-    KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
+    KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection());
+    KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
 
-    m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection());
-    m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection());
+    m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection());
+    m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection());
 
-    KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
-    KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
-    KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
+    KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection());
+    KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection());
+    KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection());
 
     // custom menu and menu item - the slot is in the class %{APPNAMELC}View
     TDEAction *custom = new TDEAction(i18n("Swi&tch Colors"), 0,
-                                  m_view, TQT_SLOT(switchColors()),
+                                  m_view, TQ_SLOT(switchColors()),
                                   actionCollection(), "switch_action");
 
     createGUI();
@@ -135,7 +135,7 @@ void %{APPNAMELC}::optionsPreferences()
 	// to the names of the variables in the .kcfg file
         TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow);
         dialog->addPage(new Prefs(), i18n("General"), "package_settings");
-        connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged()));
+        connect(dialog, TQ_SIGNAL(settingsChanged()), m_view, TQ_SLOT(settingsChanged()));
         dialog->show();
 }
 
diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.cpp b/languages/cpp/app_templates/noatunui/plugin_impl.cpp
index 89ad08e5..a0c0d0ee 100644
--- a/languages/cpp/app_templates/noatunui/plugin_impl.cpp
+++ b/languages/cpp/app_templates/noatunui/plugin_impl.cpp
@@ -33,45 +33,45 @@
     mBack=new TQPushButton(this);
     mBack->setFixedSize(buttonSize,buttonSize);
     mBack->setPixmap(BarIcon("noatunback"));
-    connect(mBack, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back()));
+    connect(mBack, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(back()));
     TQToolTip::add(mBack,i18n("Back"));
 
     mStop=new TQPushButton(this);
     mStop->setFixedSize(buttonSize,buttonSize);
     mStop->setPixmap(BarIcon("noatunstop"));
-    connect(mStop, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop()));
+    connect(mStop, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(stop()));
     TQToolTip::add(mStop, i18n("Stop"));
 
     mPlay=new TQPushButton(this);
     mPlay->setToggleButton(true);
     mPlay->setFixedSize(buttonSize,buttonSize);
     mPlay->setPixmap(BarIcon("noatunplay"));
-    connect(mPlay, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()));
+    connect(mPlay, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(playpause()));
     TQToolTip::add(mPlay, i18n("Play"));
 
     mForward=new TQPushButton(this);
     mForward->setFixedSize(buttonSize,buttonSize);
     mForward->setPixmap(BarIcon("noatunforward"));
-    connect(mForward, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward()));
+    connect(mForward, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(forward()));
     TQToolTip::add(mForward, i18n("Forward"));
 
     mPlaylist=new TQPushButton(this);
     mPlaylist->setToggleButton(true);
     mPlaylist->setFixedSize(buttonSize,buttonSize);
     mPlaylist->setPixmap(BarIcon("noatunplaylist"));
-    connect(mPlaylist, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(toggleListView()));
+    connect(mPlaylist, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(toggleListView()));
     TQToolTip::add(mPlaylist, i18n("Playlist"));
 
     mLoop=new TQPushButton(this);
     mLoop->setFixedSize(buttonSize,buttonSize);
     mLoop->setPixmap(BarIcon("noatunloopnone"));
-    connect(mLoop, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(loop()));
+    connect(mLoop, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(loop()));
     TQToolTip::add(mLoop, i18n("Change loop style"));
 
     mPopup=new TQPushButton(this);
     mPopup->setFixedSize(buttonSize,buttonSize);
     mPopup->setPixmap(BarIcon("noatun"));
-    connect(mPopup, TQT_SIGNAL(clicked()), TQT_SLOT(popup()));
+    connect(mPopup, TQ_SIGNAL(clicked()), TQ_SLOT(popup()));
 
 
     mVolume=new L33tSlider(0,100,10,0,TQt::Horizontal, this);
@@ -98,30 +98,30 @@
     statusBar()->message(i18n("No File Loaded"));
     statusBar()->insertItem("--:--/--:--", 1, 0, true);
 
-    connect(napp, TQT_SIGNAL(hideYourself()), this, TQT_SLOT(hide()) );
-    connect(napp, TQT_SIGNAL(showYourself()), this, TQT_SLOT(show()) );
+    connect(napp, TQ_SIGNAL(hideYourself()), this, TQ_SLOT(hide()) );
+    connect(napp, TQ_SIGNAL(showYourself()), this, TQ_SLOT(show()) );
 
-    connect(napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(slotPlaying()));
-    connect(napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(slotStopped()));
-    connect(napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(slotPaused()));
+    connect(napp->player(), TQ_SIGNAL(playing()), this, TQ_SLOT(slotPlaying()));
+    connect(napp->player(), TQ_SIGNAL(stopped()), this, TQ_SLOT(slotStopped()));
+    connect(napp->player(), TQ_SIGNAL(paused()), this, TQ_SLOT(slotPaused()));
     napp->player()->handleButtons();
 
-    connect(napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()));
-    connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(changeLoopType(int)));
+    connect(napp->player(), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout()));
+    connect(napp->player(), TQ_SIGNAL(loopTypeChange(int)), this, TQ_SLOT(changeLoopType(int)));
 
     /* This skipToWrapper is needed to pass milliseconds to Player() as everybody
      * below the GUI is based on milliseconds instead of some unprecise thingy
      * like seconds or mille */
-    connect(seeker(), TQT_SIGNAL(userChanged(int)), this, TQT_SLOT(skipToWrapper(int)));
-    connect(this, TQT_SIGNAL(skipTo(int)), napp->player(), TQT_SLOT(skipTo(int)));
-    connect(seeker(), TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(sliderMoved(int)));
+    connect(seeker(), TQ_SIGNAL(userChanged(int)), this, TQ_SLOT(skipToWrapper(int)));
+    connect(this, TQ_SIGNAL(skipTo(int)), napp->player(), TQ_SLOT(skipTo(int)));
+    connect(seeker(), TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(sliderMoved(int)));
 
-    connect(mVolume, TQT_SIGNAL(sliderMoved(int)), napp->player(), TQT_SLOT(setVolume(int)));
-    connect(mVolume, TQT_SIGNAL(userChanged(int)), napp->player(), TQT_SLOT(setVolume(int)));
+    connect(mVolume, TQ_SIGNAL(sliderMoved(int)), napp->player(), TQ_SLOT(setVolume(int)));
+    connect(mVolume, TQ_SIGNAL(userChanged(int)), napp->player(), TQ_SLOT(setVolume(int)));
 
 
-    connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(playlistShown()));
-    connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(playlistHidden()));
+    connect(napp->player(), TQ_SIGNAL(playlistShown()), TQ_SLOT(playlistShown()));
+    connect(napp->player(), TQ_SIGNAL(playlistHidden()), TQ_SLOT(playlistHidden()));
 
     // Event Filter for the RMB
     for (TQPtrListIterator<TQObject> i(*children()); i.current(); ++i)
diff --git a/languages/cpp/app_templates/opieapp/example.cpp b/languages/cpp/app_templates/opieapp/example.cpp
index 6a0d616e..f0be7179 100644
--- a/languages/cpp/app_templates/opieapp/example.cpp
+++ b/languages/cpp/app_templates/opieapp/example.cpp
@@ -12,7 +12,7 @@ OPIE_EXPORT_APP( %{APPNAME}Factory )
 %{APPNAME}::%{APPNAME}( TQWidget* parent,  const char* name, WFlags fl )
     : %{APPNAME}Base( parent, name, fl )
 {
-    connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye()));
+    connect(quit, TQ_SIGNAL(clicked()), this, TQ_SLOT(goodBye()));
 }
 
 /*
diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.cpp b/languages/cpp/app_templates/opieinput/simpleimpl.cpp
index a77f413b..dd3475e1 100644
--- a/languages/cpp/app_templates/opieinput/simpleimpl.cpp
+++ b/languages/cpp/app_templates/opieinput/simpleimpl.cpp
@@ -11,33 +11,33 @@
 	: TQHBox(par, "name", fl )
 {
 	TQCheckBox *box1 = new TQCheckBox(tr("Alt"),this);
-	connect(box1,TQT_SIGNAL(toggled(bool)),
-			this,TQT_SLOT(slotAlt(bool)));
+	connect(box1,TQ_SIGNAL(toggled(bool)),
+			this,TQ_SLOT(slotAlt(bool)));
 	m_alt = box1;
 	box1 = new TQCheckBox(tr("Shift"),this );
-	connect(box1,TQT_SIGNAL(toggled(bool)),
-			this,TQT_SLOT(slotShift(bool)));
+	connect(box1,TQ_SIGNAL(toggled(bool)),
+			this,TQ_SLOT(slotShift(bool)));
 	m_shi = box1;
 	box1 = new TQCheckBox(tr("Ctrl","Control Shortcut on keyboard"),this );
-	connect(box1,TQT_SIGNAL(toggled(bool)),
-			this,TQT_SLOT(slotCtrl(bool)));
+	connect(box1,TQ_SIGNAL(toggled(bool)),
+			this,TQ_SLOT(slotCtrl(bool)));
 	m_ctrl = box1;
 			
 	TQSignalMapper *map = new TQSignalMapper(this);
 	TQPushButton *btn = new TQPushButton("a",this);
 	map->setMapping(btn,0);
-	connect(btn,TQT_SIGNAL(clicked()),map,TQT_SLOT(map()));
+	connect(btn,TQ_SIGNAL(clicked()),map,TQ_SLOT(map()));
 	
 	btn = new TQPushButton("b",this);
 	map->setMapping(btn,1);
-	connect(btn,TQT_SIGNAL(clicked()),map,TQT_SLOT(map()));
+	connect(btn,TQ_SIGNAL(clicked()),map,TQ_SLOT(map()));
 	
 	btn = new TQPushButton("c",this);
 	map->setMapping(btn,2);
-	connect(btn,TQT_SIGNAL(clicked()),map,TQT_SLOT(map()));
+	connect(btn,TQ_SIGNAL(clicked()),map,TQ_SLOT(map()));
 	
-	connect(map,TQT_SIGNAL(mapped(int)),
-			this,TQT_SLOT(slotKey(int)));
+	connect(map,TQ_SIGNAL(mapped(int)),
+			this,TQ_SLOT(slotKey(int)));
 	resetState();
 }
 
@@ -130,7 +130,7 @@ TQString %{APPNAME}Impl::name()
 void %{APPNAME}Impl::onKeyPress( TQObject *receiver, const char *slot )
 {
     if ( m_pickboard )
-	TQObject::connect( m_pickboard, TQT_SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
+	TQObject::connect( m_pickboard, TQ_SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
 }
 
 #ifndef TQT_NO_COMPONENT
diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp b/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp
index 2f491481..fdbbf4dd 100644
--- a/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp
+++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp
@@ -17,7 +17,7 @@
    // that should be triggered when clicked are defined in  slotClicked()
    // of course also normal widgets can be used.
     m_exampleLabel = new OClickableLabel( this );
-    connect( m_exampleLabel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClicked() ) );
+    connect( m_exampleLabel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClicked() ) );
 
     if ( m_layout )  {
         delete m_layout;
diff --git a/languages/cpp/app_templates/qmakeapp/main.cpp b/languages/cpp/app_templates/qmakeapp/main.cpp
index 8938adc5..ba45c728 100644
--- a/languages/cpp/app_templates/qmakeapp/main.cpp
+++ b/languages/cpp/app_templates/qmakeapp/main.cpp
@@ -8,6 +8,6 @@ int main( int argc, char ** argv ) {
     %{APPNAME} * mw = new %{APPNAME}();
     mw->setCaption( "%{APPNAME}" );
     mw->show();
-    a.connect( &a, TQT_SIGNAL(lastWindowClosed()), &a, TQT_SLOT(quit()) );
+    a.connect( &a, TQ_SIGNAL(lastWindowClosed()), &a, TQ_SLOT(quit()) );
     return a.exec();
 }
diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp
index 39b6e5af..8ce81310 100644
--- a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp
+++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp
@@ -37,17 +37,17 @@
     openIcon = TQPixmap( fileopen );
     TQToolButton * fileOpen
 	= new TQToolButton( openIcon, tr("Open File"), TQString(),
-			   this, TQT_SLOT(choose()), fileTools, "open file" );
+			   this, TQ_SLOT(choose()), fileTools, "open file" );
 
     saveIcon = TQPixmap( filesave );
     TQToolButton * fileSave
 	= new TQToolButton( saveIcon, tr("Save File"), TQString(),
-			   this, TQT_SLOT(save()), fileTools, "save file" );
+			   this, TQ_SLOT(save()), fileTools, "save file" );
 
     printIcon = TQPixmap( fileprint );
     TQToolButton * filePrint
 	= new TQToolButton( printIcon, tr("Print File"), TQString(),
-			   this, TQT_SLOT(print()), fileTools, "print file" );
+			   this, TQ_SLOT(print()), fileTools, "print file" );
 
 
     (void)TQWhatsThis::whatsThisButton( fileTools );
@@ -79,41 +79,41 @@
     menuBar()->insertItem( tr("&File"), file );
 
 
-    file->insertItem( tr("&New"), this, TQT_SLOT(newDoc()), CTRL+Key_N );
+    file->insertItem( tr("&New"), this, TQ_SLOT(newDoc()), CTRL+Key_N );
 
     int id;
     id = file->insertItem( openIcon, tr("&Open..."),
-			   this, TQT_SLOT(choose()), CTRL+Key_O );
+			   this, TQ_SLOT(choose()), CTRL+Key_O );
     file->setWhatsThis( id, fileOpenText );
 
     id = file->insertItem( saveIcon, tr("&Save"),
-			   this, TQT_SLOT(save()), CTRL+Key_S );
+			   this, TQ_SLOT(save()), CTRL+Key_S );
     file->setWhatsThis( id, fileSaveText );
 
-    id = file->insertItem( tr("Save &As..."), this, TQT_SLOT(saveAs()) );
+    id = file->insertItem( tr("Save &As..."), this, TQ_SLOT(saveAs()) );
     file->setWhatsThis( id, fileSaveText );
 
     file->insertSeparator();
 
     id = file->insertItem( printIcon, tr("&Print..."),
-			   this, TQT_SLOT(print()), CTRL+Key_P );
+			   this, TQ_SLOT(print()), CTRL+Key_P );
     file->setWhatsThis( id, filePrintText );
 
     file->insertSeparator();
 
-    file->insertItem( tr("&Close"), this, TQT_SLOT(close()), CTRL+Key_W );
+    file->insertItem( tr("&Close"), this, TQ_SLOT(close()), CTRL+Key_W );
 
-    file->insertItem( tr("&Quit"), tqApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q );
+    file->insertItem( tr("&Quit"), tqApp, TQ_SLOT( closeAllWindows() ), CTRL+Key_Q );
 
     menuBar()->insertSeparator();
 
     TQPopupMenu * help = new TQPopupMenu( this );
     menuBar()->insertItem( tr("&Help"), help );
 
-    help->insertItem( tr("&About"), this, TQT_SLOT(about()), Key_F1 );
-    help->insertItem( tr("About &TQt"), this, TQT_SLOT(aboutTQt()) );
+    help->insertItem( tr("&About"), this, TQ_SLOT(about()), Key_F1 );
+    help->insertItem( tr("About &TQt"), this, TQ_SLOT(aboutTQt()) );
     help->insertSeparator();
-    help->insertItem( tr("What's &This"), this, TQT_SLOT(whatsThis()), SHIFT+Key_F1 );
+    help->insertItem( tr("What's &This"), this, TQ_SLOT(whatsThis()), SHIFT+Key_F1 );
 
     e = new TQTextEdit( this, "editor" );
     e->setFocus();
diff --git a/languages/cpp/app_templates/qtopiaapp/example.cpp b/languages/cpp/app_templates/qtopiaapp/example.cpp
index d68f6c6d..f03ea5c3 100644
--- a/languages/cpp/app_templates/qtopiaapp/example.cpp
+++ b/languages/cpp/app_templates/qtopiaapp/example.cpp
@@ -9,7 +9,7 @@
 %{APPNAME}::%{APPNAME}( TQWidget* parent,  const char* name, WFlags fl )
     : %{APPNAME}Base( parent, name, fl )
 {
-    connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye()));
+    connect(quit, TQ_SIGNAL(clicked()), this, TQ_SLOT(goodBye()));
 }
 
 /*
diff --git a/languages/cpp/app_templates/tdeconfig35/app.cpp b/languages/cpp/app_templates/tdeconfig35/app.cpp
index 1aab14b5..ce638d20 100644
--- a/languages/cpp/app_templates/tdeconfig35/app.cpp
+++ b/languages/cpp/app_templates/tdeconfig35/app.cpp
@@ -34,10 +34,10 @@
     setAutoSaveSettings();
 
     // allow the view to change the statusbar and caption
-    connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)),
-            this,   TQT_SLOT(changeStatusbar(const TQString&)));
-    connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)),
-            this,   TQT_SLOT(changeCaption(const TQString&)));
+    connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)),
+            this,   TQ_SLOT(changeStatusbar(const TQString&)));
+    connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)),
+            this,   TQ_SLOT(changeCaption(const TQString&)));
 
 }
 
@@ -47,14 +47,14 @@
 
 void %{APPNAMELC}::setupActions()
 {
-    KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection());
-    KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
+    KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection());
+    KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
 
-    KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
+    KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection());
 
     // custom menu and menu item 
     TDEAction *custom = new TDEAction(i18n("Swi&tch Colors"), 0,
-                                  m_view, TQT_SLOT(switchColors()),
+                                  m_view, TQ_SLOT(switchColors()),
                                   actionCollection(), "switch_action");
 
     setupGUI();
@@ -75,7 +75,7 @@ void %{APPNAMELC}::optionsPreferences()
 	// to the names of the variables in the .kcfg file
         TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow);
         dialog->addPage(new Prefs(), i18n("General"), "package_settings");
-        connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged()));
+        connect(dialog, TQ_SIGNAL(settingsChanged()), m_view, TQ_SLOT(settingsChanged()));
         dialog->show();
 }
 
diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp
index 0d2bf1ff..168cd8c4 100644
--- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp
@@ -38,10 +38,10 @@ extern "C"
 {
     /// @todo
     //Connect your signals and slots here to configure the screen saver.
-    connect( OkayPushButton, TQT_SIGNAL( released() ),
-             TQT_SLOT( slotOkPressed() ) );
-    connect( CancelPushButton, TQT_SIGNAL( released() ),
-             TQT_SLOT( slotCancelPressed() ) );
+    connect( OkayPushButton, TQ_SIGNAL( released() ),
+             TQ_SLOT( slotOkPressed() ) );
+    connect( CancelPushButton, TQ_SIGNAL( released() ),
+             TQ_SLOT( slotCancelPressed() ) );
 }
 
 
diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp
index 9067d1e9..abd282f4 100644
--- a/languages/cpp/ccconfigwidget.cpp
+++ b/languages/cpp/ccconfigwidget.cpp
@@ -64,15 +64,15 @@ CCConfigWidget::CCConfigWidget( CppSupportPart* part, TQWidget* parent, const ch
 		: CCConfigWidgetBase( parent, name )
 {
 	m_pPart = part;
-	connect( m_pPart->codeRepository(), TQT_SIGNAL( catalogRegistered( Catalog* ) ),
-	         this, TQT_SLOT( catalogRegistered( Catalog* ) ) );
-	connect( m_pPart->codeRepository(), TQT_SIGNAL( catalogUnregistered( Catalog* ) ),
-	         this, TQT_SLOT( catalogUnregistered( Catalog* ) ) );
+	connect( m_pPart->codeRepository(), TQ_SIGNAL( catalogRegistered( Catalog* ) ),
+	         this, TQ_SLOT( catalogRegistered( Catalog* ) ) );
+	connect( m_pPart->codeRepository(), TQ_SIGNAL( catalogUnregistered( Catalog* ) ),
+	         this, TQ_SLOT( catalogUnregistered( Catalog* ) ) );
 
-	connect( m_qtDir, TQT_SIGNAL(urlSelected(const TQString &)),
-		 this, TQT_SLOT(isValidTQtDir(const TQString &)));
-	connect( m_qtDir, TQT_SIGNAL(textChanged(const TQString &)),
-		 this, TQT_SLOT(isValidTQtDir(const TQString &)));
+	connect( m_qtDir, TQ_SIGNAL(urlSelected(const TQString &)),
+		 this, TQ_SLOT(isValidTQtDir(const TQString &)));
+	connect( m_qtDir, TQ_SIGNAL(textChanged(const TQString &)),
+		 this, TQ_SLOT(isValidTQtDir(const TQString &)));
 
 	initGeneralTab( );
 	initTQtTab();
@@ -510,9 +510,9 @@ void CCConfigWidget::openPluginPaths()
     KDialog d( this );
     TQVBoxLayout* mainlayout = new TQVBoxLayout( &d );
     KPushButton* ok = new KPushButton( KStdGuiItem::ok(), &d );
-    connect( ok, TQT_SIGNAL(clicked()), &d, TQT_SLOT(accept()));
+    connect( ok, TQ_SIGNAL(clicked()), &d, TQ_SLOT(accept()));
     KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), &d );
-    connect( cancel, TQT_SIGNAL(clicked()), &d, TQT_SLOT(reject()));
+    connect( cancel, TQ_SIGNAL(clicked()), &d, TQ_SLOT(reject()));
     TQHBoxLayout* btns = new TQHBoxLayout( &d );
     btns->addItem( new TQSpacerItem(10,10,TQSizePolicy::Expanding) );
     btns->addWidget(ok);
diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp
index a62087ac..7f97ba1e 100644
--- a/languages/cpp/cppcodecompletion.cpp
+++ b/languages/cpp/cppcodecompletion.cpp
@@ -358,7 +358,7 @@ struct PopupFillerHelpStruct {
       memType = "enum";
 
     TQString txt = i18n( "Jump to %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) );
-    int id = parent->insertItem( txt, receiver, TQT_SLOT( popupAction( int ) ) );
+    int id = parent->insertItem( txt, receiver, TQ_SLOT( popupAction( int ) ) );
 
     receiver->m_popupActions.insert( id, d.decl );
   }
@@ -448,12 +448,12 @@ struct PopupFillerHelpStruct {
 			}
     }
 
-    int id = parent->insertItem( txt1, receiver, TQT_SLOT( popupAction( int ) ) );
+    int id = parent->insertItem( txt1, receiver, TQ_SLOT( popupAction( int ) ) );
     if ( d.resolved() )
       receiver->m_popupActions.insert( id, d.resolved() ->getDeclarationInfo() );
 
     if ( !txt2.isEmpty() ) {
-      int id2 = parent->insertItem( txt2, receiver, TQT_SLOT( popupDefinitionAction( int ) ) );
+      int id2 = parent->insertItem( txt2, receiver, TQ_SLOT( popupDefinitionAction( int ) ) );
       if ( d.resolved() )
         receiver->m_popupDefinitionActions.insert( id2, d.resolved() ->getDeclarationInfo() );
     }
@@ -538,7 +538,7 @@ struct PopupClassViewFillerHelpStruct {
       memType = "enum";
 
     TQString txt = i18n( "Show %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) );
-    int id = parent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) );
+    int id = parent->insertItem( txt, receiver, TQ_SLOT( popupClassViewAction( int ) ) );
 
     receiver->m_popupClassViewActions.insert( id, dom );
   }
@@ -597,7 +597,7 @@ struct PopupClassViewFillerHelpStruct {
 			}
     }
 
-    int id = parent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) );
+    int id = parent->insertItem( txt, receiver, TQ_SLOT( popupClassViewAction( int ) ) );
 
     if ( dom )
       receiver->m_popupClassViewActions.insert( id, dom );
@@ -645,7 +645,7 @@ class PopupFiller {
 
 					//kdDebug( 9007 ) << "found include-file \"" << includeFile << "\"" << endl;
 				}
-				int id = parent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).arg ( includeFile ).arg( decl.name ), struk.receiver, TQT_SLOT( popupAction( int ) ) );
+				int id = parent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).arg ( includeFile ).arg( decl.name ), struk.receiver, TQ_SLOT( popupAction( int ) ) );
 				DeclarationInfo fakeDec;
 				fakeDec.name = decl.name;
 				fakeDec.file = includeFile;
@@ -671,7 +671,7 @@ class PopupFiller {
         f.type = d.desc();
         f.memberType = SimpleTypeImpl::MemberInfo::Variable;
 
-        /*int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) );
+        /*int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQ_SLOT( popupAction( int ) ) );
 
         m_popupActions.insert( id, type.sourceVariable );*/
         struk.insertItem( parent, f, prefix );
@@ -683,7 +683,7 @@ class PopupFiller {
           parent->insertItem( i18n( "Comment on %1" ).arg( sourceVariable.name ), m );
           TQStringList ls = prepareTextForMenu( sourceVariable.comment, 15, 100 );
           for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) {
-            m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) );
+            m->insertItem( *it, 0, TQ_SLOT( popupClassViewAction( int ) ) );
           }
           parent->insertSeparator();
         }
@@ -764,7 +764,7 @@ class PopupFiller {
               mo->insertItem( i18n( "Comment" ), m );
               TQStringList ls = prepareTextForMenu( ( *it ).first.decl.comment, 15, 100 );
               for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) {
-                m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) );
+                m->insertItem( *it, 0, TQ_SLOT( popupClassViewAction( int ) ) );
               }
             }
 
@@ -796,7 +796,7 @@ class PopupFiller {
           parent->insertItem( i18n( "Comment on %1" ).arg( cleanForMenu( d->name() ) ), m );
           TQStringList ls = prepareTextForMenu( d->resolved() ->comment(), 15, 100 );
           for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) {
-            m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) );
+            m->insertItem( *it, 0, TQ_SLOT( popupClassViewAction( int ) ) );
           }
         }
       }
@@ -896,7 +896,7 @@ m_codeCompleteCh2Rx( "(->)|(\\:\\:)" ) {
 
   m_pSupport = part;
 
-  connect( m_pSupport->codeCompletionConfig(), TQT_SIGNAL( stored() ), this, TQT_SLOT( emptyCache() ) );
+  connect( m_pSupport->codeCompletionConfig(), TQ_SIGNAL( stored() ), this, TQ_SLOT( emptyCache() ) );
 
   m_activeCursor = 0;
   m_activeEditor = 0;
@@ -908,17 +908,17 @@ m_codeCompleteCh2Rx( "(->)|(\\:\\:)" ) {
 
   m_ccLine = 0;
   m_ccColumn = 0;
-  connect( m_ccTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimeout() ) );
-  connect( m_showStatusTextTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotStatusTextTimeout() ) );
+  connect( m_ccTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTimeout() ) );
+  connect( m_showStatusTextTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotStatusTextTimeout() ) );
 
   computeFileEntryList();
 
   CppSupportPart* cppSupport = m_pSupport;
-  connect( cppSupport->project(), TQT_SIGNAL( addedFilesToProject( const TQStringList& ) ),
-           this, TQT_SLOT( computeFileEntryList() ) );
-  connect( cppSupport->project(), TQT_SIGNAL( removedFilesFromProject( const TQStringList& ) ),
-           this, TQT_SLOT( computeFileEntryList() ) );
-  connect( cppSupport, TQT_SIGNAL( synchronousParseReady( const TQString&, ParsedFilePointer ) ), this, TQT_SLOT( synchronousParseReady( const TQString&, ParsedFilePointer ) ) );
+  connect( cppSupport->project(), TQ_SIGNAL( addedFilesToProject( const TQStringList& ) ),
+           this, TQ_SLOT( computeFileEntryList() ) );
+  connect( cppSupport->project(), TQ_SIGNAL( removedFilesFromProject( const TQStringList& ) ),
+           this, TQ_SLOT( computeFileEntryList() ) );
+  connect( cppSupport, TQ_SIGNAL( synchronousParseReady( const TQString&, ParsedFilePointer ) ), this, TQ_SLOT( synchronousParseReady( const TQString&, ParsedFilePointer ) ) );
 
   m_bArgHintShow = false;
   m_bCompletionBoxShow = false;
@@ -928,9 +928,9 @@ m_codeCompleteCh2Rx( "(->)|(\\:\\:)" ) {
 
   m_repository = new CodeInformationRepository( cppSupport->codeRepository() );
 
-	connect( cppSupport->codeRepository(), TQT_SIGNAL(catalogRegistered( Catalog* )), this, TQT_SLOT( emptyCache() ) );
-	connect( cppSupport->codeRepository(), TQT_SIGNAL(catalogUnregistered( Catalog* )), this, TQT_SLOT( emptyCache() ) );
-	connect( cppSupport->codeRepository(), TQT_SIGNAL(catalogChanged( Catalog* )), this, TQT_SLOT( emptyCache() ) );
+	connect( cppSupport->codeRepository(), TQ_SIGNAL(catalogRegistered( Catalog* )), this, TQ_SLOT( emptyCache() ) );
+	connect( cppSupport->codeRepository(), TQ_SIGNAL(catalogUnregistered( Catalog* )), this, TQ_SLOT( emptyCache() ) );
+	connect( cppSupport->codeRepository(), TQ_SIGNAL(catalogChanged( Catalog* )), this, TQ_SLOT( emptyCache() ) );
   
 	setupCodeInformationRepository();
 
@@ -945,22 +945,22 @@ m_codeCompleteCh2Rx( "(->)|(\\:\\:)" ) {
   if ( part->partController() ->activePart() )
     slotActivePartChanged( part->partController() ->activePart() );
 
-  connect( part->partController( ), TQT_SIGNAL( partAdded( KParts::Part* ) ),
-           this, TQT_SLOT( slotPartAdded( KParts::Part* ) ) );
-  connect( part->partController( ), TQT_SIGNAL( activePartChanged( KParts::Part* ) ),
-           this, TQT_SLOT( slotActivePartChanged( KParts::Part* ) ) );
+  connect( part->partController( ), TQ_SIGNAL( partAdded( KParts::Part* ) ),
+           this, TQ_SLOT( slotPartAdded( KParts::Part* ) ) );
+  connect( part->partController( ), TQ_SIGNAL( activePartChanged( KParts::Part* ) ),
+           this, TQ_SLOT( slotActivePartChanged( KParts::Part* ) ) );
 
-  connect( part, TQT_SIGNAL( fileParsed( const TQString& ) ),
-           this, TQT_SLOT( slotFileParsed( const TQString& ) ) );
-  connect( part, TQT_SIGNAL( codeModelUpdated( const TQString& ) ),
-           this, TQT_SLOT( slotCodeModelUpdated( const TQString& ) ) );
+  connect( part, TQ_SIGNAL( fileParsed( const TQString& ) ),
+           this, TQ_SLOT( slotFileParsed( const TQString& ) ) );
+  connect( part, TQ_SIGNAL( codeModelUpdated( const TQString& ) ),
+           this, TQ_SLOT( slotCodeModelUpdated( const TQString& ) ) );
 
   TDEAction * action = new TDEAction( i18n("Jump to declaration under cursor"), 0, CTRL + Key_Comma,
-    this, TQT_SLOT(slotJumpToDeclCursorContext()), part->actionCollection(), "jump_to_declaration_cursor_context" );
+    this, TQ_SLOT(slotJumpToDeclCursorContext()), part->actionCollection(), "jump_to_declaration_cursor_context" );
   action->plug( &m_DummyActionWidget );
 
   action = new TDEAction( i18n("Jump to definition under cursor"), 0, CTRL + Key_Period, 
-    this, TQT_SLOT(slotJumpToDefCursorContext()), part->actionCollection(), "jump_to_defintion_cursor_context" );
+    this, TQ_SLOT(slotJumpToDefCursorContext()), part->actionCollection(), "jump_to_defintion_cursor_context" );
   action->plug( &m_DummyActionWidget );
 }
 
@@ -1028,13 +1028,13 @@ void CppCodeCompletion::integratePart( KParts::Part * part ) {
 
 	  if ( m_pSupport ) { //The slot should connected even when automatic completion is disabled, so it can be enabled any time
       kdDebug( 9007 ) << k_funcinfo << "enabling code completion" << endl;
-      connect( part, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( slotTextChanged() ) );
-      connect( part->widget(), TQT_SIGNAL( completionDone() ), this,
-               TQT_SLOT( slotCompletionBoxHidden() ) );
-      connect( part->widget(), TQT_SIGNAL( completionAborted() ), this,
-               TQT_SLOT( slotCompletionBoxHidden() ) );
-      connect( part->widget(), TQT_SIGNAL( argHintHidden() ), this,
-               TQT_SLOT( slotArgHintHidden() ) );
+      connect( part, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( slotTextChanged() ) );
+      connect( part->widget(), TQ_SIGNAL( completionDone() ), this,
+               TQ_SLOT( slotCompletionBoxHidden() ) );
+      connect( part->widget(), TQ_SIGNAL( completionAborted() ), this,
+               TQ_SLOT( slotCompletionBoxHidden() ) );
+      connect( part->widget(), TQ_SIGNAL( argHintHidden() ), this,
+               TQ_SLOT( slotArgHintHidden() ) );
     }
   }
 }
@@ -1047,7 +1047,7 @@ void CppCodeCompletion::slotActivePartChanged( KParts::Part * part ) {
   emptyCache();
 	this->d->recoveryPoints.clear();
   if ( m_activeHintInterface && m_activeView ) {
-    disconnect( m_activeView , TQT_SIGNAL( needTextHint( int, int, TQString & ) ), this, TQT_SLOT( slotTextHint( int, int, TQString& ) ) );
+    disconnect( m_activeView , TQ_SIGNAL( needTextHint( int, int, TQString & ) ), this, TQ_SLOT( slotTextHint( int, int, TQString& ) ) );
 
     m_activeHintInterface = 0;
   }
@@ -1094,7 +1094,7 @@ void CppCodeCompletion::slotActivePartChanged( KParts::Part * part ) {
   if ( m_activeHintInterface ) {
 #ifndef DISABLETOOLTIPS
     m_activeHintInterface->enableTextHints( 500 );
-    connect( m_activeView, TQT_SIGNAL( needTextHint( int, int, TQString & ) ), this, TQT_SLOT( slotTextHint( int, int, TQString& ) ) );
+    connect( m_activeView, TQ_SIGNAL( needTextHint( int, int, TQString & ) ), this, TQ_SLOT( slotTextHint( int, int, TQString& ) ) );
 #endif
 
   } else {
@@ -1537,7 +1537,7 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte
 		else
 			gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).arg( cleanForMenu( type.macro.name() ) ), m );
 
-		int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( type.macro.name() ) ), this, TQT_SLOT( popupAction( int ) ) );
+		int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( type.macro.name() ) ), this, TQ_SLOT( popupAction( int ) ) );
 		TQPopupMenu * b = PopupTracker::createPopup( m );
 		m->insertItem( i18n( "Body" ), b );
 
@@ -1551,7 +1551,7 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte
 
 		TQStringList ls = prepareTextForMenu( type.macro.body(), 20, 100 );
 		for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) {
-			b->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) );
+			b->insertItem( *it, 0, TQ_SLOT( popupClassViewAction( int ) ) );
 		}
 	}
 
@@ -1569,7 +1569,7 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte
 			else
 				gid = popup->insertItem( i18n( "Goto Include File: %1" ).arg( cleanForMenu( includeFileName ) ), m );
 
-			int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( includeFilePath ) ), this, TQT_SLOT( popupAction( int ) ) );
+			int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( includeFilePath ) ), this, TQ_SLOT( popupAction( int ) ) );
 
 			DeclarationInfo i;
 			i.file = includeFilePath;
@@ -1617,7 +1617,7 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte
     popup->setWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to navigate to positions of items that are involved in this expression" ) );
 
     /*if( type.sourceVariable && type.sourceVariable.name != "this" ) {
-    	int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) );
+    	int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQ_SLOT( popupAction( int ) ) );
 
     	m_popupActions.insert( id, type.sourceVariable );
     }*/
@@ -2500,8 +2500,8 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) {
           if ( start_expr != int( contents.length() ) )
             expr = contents.mid( start_expr, contents.length() - start_expr ).stripWhiteSpace();
 
-          if ( expr.startsWith( "SIGNAL" ) || expr.startsWith( "SLOT" ) ) {
-            m_completionMode = expr.startsWith( "SIGNAL" ) ? SignalCompletion : SlotCompletion;
+          if ( expr.startsWith( "TQ_SIGNAL" ) || expr.startsWith( "TQ_SLOT" ) ) {
+            m_completionMode = expr.startsWith( "TQ_SIGNAL" ) ? SignalCompletion : SlotCompletion;
 
             showArguments = false;
             int end_expr = start_expr - 1;
@@ -2705,8 +2705,8 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) {
         if ( start_expr != int( contents.length() ) )
           expr = contents.mid( start_expr, contents.length() - start_expr ).stripWhiteSpace();
 
-        if ( expr.startsWith( "SIGNAL" ) || expr.startsWith( "SLOT" ) ) {
-          m_completionMode = expr.startsWith( "SIGNAL" ) ? SignalCompletion : SlotCompletion;
+        if ( expr.startsWith( "TQ_SIGNAL" ) || expr.startsWith( "TQ_SLOT" ) ) {
+          m_completionMode = expr.startsWith( "TQ_SIGNAL" ) ? SignalCompletion : SlotCompletion;
 
           showArguments = false;
           int end_expr = start_expr - 1;
diff --git a/languages/cpp/cppcodecompletion.h b/languages/cpp/cppcodecompletion.h
index 7350a996..1ebee6ba 100644
--- a/languages/cpp/cppcodecompletion.h
+++ b/languages/cpp/cppcodecompletion.h
@@ -56,7 +56,7 @@ public:
 		if( !pt ) pt = new PopupTracker();
 		TQPopupMenu* m = new TQPopupMenu( parent );
 		++pendingPopups;
-		connect( m, TQT_SIGNAL(destroyed()), pt, TQT_SLOT(destroyedPopup()) );
+		connect( m, TQ_SIGNAL(destroyed()), pt, TQ_SLOT(destroyedPopup()) );
 		return m;
 	}
 	
diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp
index f04db100..514974fe 100644
--- a/languages/cpp/cppnewclassdlg.cpp
+++ b/languages/cpp/cppnewclassdlg.cpp
@@ -79,20 +79,20 @@ CppNewClassDialog::CppNewClassDialog( CppSupportPart *part, TQWidget *parent, co
 
 	accessMenu = new TQPopupMenu( this );
 	accessMenu->insertItem( i18n( "Use as Private" ),
-	                        this, TQT_SLOT( changeToPrivate() ), 0, 1 );
+	                        this, TQ_SLOT( changeToPrivate() ), 0, 1 );
 	accessMenu->insertItem( i18n( "Use as Protected" ),
-	                        this, TQT_SLOT( changeToProtected() ), 0, 2 );
+	                        this, TQ_SLOT( changeToProtected() ), 0, 2 );
 	accessMenu->insertItem( i18n( "Use as Public" ),
-	                        this, TQT_SLOT( changeToPublic() ), 0, 3 );
+	                        this, TQ_SLOT( changeToPublic() ), 0, 3 );
 	accessMenu->insertSeparator();
 	accessMenu->insertItem( i18n( "Unset" ),
-	                        this, TQT_SLOT( changeToInherited() ), 0, 5 );
+	                        this, TQ_SLOT( changeToInherited() ), 0, 5 );
 
 	overMenu = new TQPopupMenu( this );
 	overMenu->insertItem( i18n( "Extend Base Class Functionality" ),
-	                      this, TQT_SLOT( extendFunctionality() ), 0, 11 );
+	                      this, TQ_SLOT( extendFunctionality() ), 0, 11 );
 	overMenu->insertItem( i18n( "Replace Base Class Method" ),
-	                      this, TQT_SLOT( replaceFunctionality() ), 0, 12 );
+	                      this, TQ_SLOT( replaceFunctionality() ), 0, 12 );
 
 	compBasename = basename_edit->completionObject();
 	setCompletionBasename( m_part->codeModel() );
diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp
index bd35d649..01b34a43 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -201,10 +201,10 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri
 
 	m_pCompletionConfig = new CppCodeCompletionConfig( this, projectDom() );
 	m_pSplitHeaderSourceConfig = new CppSplitHeaderSourceConfig( this, projectDom() );
-	m_pCreateGetterSetterConfiguration = new CreateGetterSetterConfiguration( this );	connect( m_pSplitHeaderSourceConfig, TQT_SIGNAL( stored() ),
-		this, TQT_SLOT( splitHeaderSourceConfigStored() ) );
-	connect( m_pCompletionConfig, TQT_SIGNAL( stored() ),
-	         this, TQT_SLOT( codeCompletionConfigStored() ) );
+	m_pCreateGetterSetterConfiguration = new CreateGetterSetterConfiguration( this );	connect( m_pSplitHeaderSourceConfig, TQ_SIGNAL( stored() ),
+		this, TQ_SLOT( splitHeaderSourceConfigStored() ) );
+	connect( m_pCompletionConfig, TQ_SIGNAL( stored() ),
+	         this, TQ_SLOT( codeCompletionConfigStored() ) );
 	m_qtBuildConfig = new QtBuildConfig( this, projectDom() );
     m_qtBuildConfig->store();
 
@@ -215,44 +215,44 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri
 	m_problemReporter = 0;
 
 	m_textChangedTimer = new TQTimer( this );
-	connect( m_textChangedTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotParseCurrentFile()) );
+	connect( m_textChangedTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotParseCurrentFile()) );
 
 	m_cursorMovedTimer = new TQTimer( this );
-	connect( m_cursorMovedTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCursorPositionChanged()) );
+	connect( m_cursorMovedTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCursorPositionChanged()) );
 
 
 // 	m_deleteParserStoreTimer = new TQTimer( this );
 	m_saveMemoryTimer = new TQTimer( this );
 	m_buildSafeFileSetTimer = new TQTimer( this );
 // 	m_functionHintTimer = new TQTimer( this );
-	connect( m_buildSafeFileSetTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(buildSafeFileSet()) );
-	connect( m_saveMemoryTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSaveMemory()) );
-// 	connect( m_deleteParserStoreTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDeleteParserStore()) );
+	connect( m_buildSafeFileSetTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(buildSafeFileSet()) );
+	connect( m_saveMemoryTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSaveMemory()) );
+// 	connect( m_deleteParserStoreTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDeleteParserStore()) );
 	resetParserStoreTimer();
 	m_saveMemoryTimer->start( 240000, false ); //Free some memory every 4 minutes
-	//    connect( m_functionHintTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotFunctionHint()) );
+	//    connect( m_functionHintTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotFunctionHint()) );
 
 	setXMLFile( "kdevcppsupport.rc" );
 
 	m_catalogList.setAutoDelete( true );
 
-	connect( core(), TQT_SIGNAL( projectOpened() ), this, TQT_SLOT( projectOpened() ) );
-	connect( core(), TQT_SIGNAL( projectClosed() ), this, TQT_SLOT( projectClosed() ) );
-	connect( core(), TQT_SIGNAL( languageChanged() ), this, TQT_SLOT( projectOpened() ) );
-	connect( partController(), TQT_SIGNAL( savedFile( const KURL& ) ),
-	         this, TQT_SLOT( savedFile( const KURL& ) ) );
-	connect( core(), TQT_SIGNAL( contextMenu( TQPopupMenu *, const Context * ) ),
-	         this, TQT_SLOT( contextMenu( TQPopupMenu *, const Context * ) ) );
-	connect( partController(), TQT_SIGNAL( activePartChanged( KParts::Part* ) ),
-	         this, TQT_SLOT( activePartChanged( KParts::Part* ) ) );
-	connect( partController(), TQT_SIGNAL( partRemoved( KParts::Part* ) ),
-	         this, TQT_SLOT( partRemoved( KParts::Part* ) ) );
-
-	connect( core(), TQT_SIGNAL( configWidget( KDialogBase* ) ),
-	         this, TQT_SLOT( configWidget( KDialogBase* ) ) );
+	connect( core(), TQ_SIGNAL( projectOpened() ), this, TQ_SLOT( projectOpened() ) );
+	connect( core(), TQ_SIGNAL( projectClosed() ), this, TQ_SLOT( projectClosed() ) );
+	connect( core(), TQ_SIGNAL( languageChanged() ), this, TQ_SLOT( projectOpened() ) );
+	connect( partController(), TQ_SIGNAL( savedFile( const KURL& ) ),
+	         this, TQ_SLOT( savedFile( const KURL& ) ) );
+	connect( core(), TQ_SIGNAL( contextMenu( TQPopupMenu *, const Context * ) ),
+	         this, TQ_SLOT( contextMenu( TQPopupMenu *, const Context * ) ) );
+	connect( partController(), TQ_SIGNAL( activePartChanged( KParts::Part* ) ),
+	         this, TQ_SLOT( activePartChanged( KParts::Part* ) ) );
+	connect( partController(), TQ_SIGNAL( partRemoved( KParts::Part* ) ),
+	         this, TQ_SLOT( partRemoved( KParts::Part* ) ) );
+
+	connect( core(), TQ_SIGNAL( configWidget( KDialogBase* ) ),
+	         this, TQ_SLOT( configWidget( KDialogBase* ) ) );
 
 	m_switchHeaderSourceAction = new TDEAction( i18n( "Switch Header/Implementation" ), SHIFT + Key_F12,
-	                      this, TQT_SLOT( slotSwitchHeader() ),
+	                      this, TQ_SLOT( slotSwitchHeader() ),
 	                      actionCollection(), "edit_switchheader" );
 	m_switchHeaderSourceAction->setToolTip( i18n( "Switch between header and implementation files" ) );
 	m_switchHeaderSourceAction->setWhatsThis( i18n( "<b>Switch Header/Implementation</b><p>"
@@ -265,7 +265,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri
 	TDEAction *action;
 
 	action = new TDEAction( i18n( "Complete Text" ), CTRL + Key_Space,
-	                      this, TQT_SLOT( slotCompleteText() ),
+	                      this, TQ_SLOT( slotCompleteText() ),
 	                      actionCollection(), "edit_complete_text" );
 	action->setToolTip( i18n( "Complete current expression" ) );
 	action->setWhatsThis( i18n( "<b>Complete Text</p><p>Completes current expression using "
@@ -274,11 +274,11 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri
 	action->setEnabled( false );
 
 	m_createGetterSetterAction = new TDEAction( i18n( "Create Accessor Methods" ), 0,
-	                                          this, TQT_SLOT( slotCreateAccessMethods() ), actionCollection(),
+	                                          this, TQ_SLOT( slotCreateAccessMethods() ), actionCollection(),
 	                                          "edit_create_getter_setter" );
 
 	action = new TDEAction( i18n( "Make Member" ), 0, Key_F2,
-	                      this, TQT_SLOT( slotMakeMember() ),
+	                      this, TQ_SLOT( slotMakeMember() ),
 	                      actionCollection(), "edit_make_member" );
 	action->setToolTip( i18n( "Make member" ) );
 	action->setWhatsThis( i18n( "<b>Make member</b><p>Creates a class member function in implementation file "
@@ -286,7 +286,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri
 	action->plug( &m_DummyActionWidget );
 
 	action = new TDEAction( i18n( "Navigation Menu" ), 0, CTRL + ALT + Key_Space,
-	                      this, TQT_SLOT( slotNavigate() ),
+	                      this, TQ_SLOT( slotNavigate() ),
 	                      actionCollection(), "edit_navigate" );
 	action->setToolTip( i18n( "Show the navigation-menu" ) );
 	action->setWhatsThis( i18n( "<b>Navigate</b><p>Shows a navigation-menu based on the type-evaluation of the item under the cursor." ) );
@@ -294,7 +294,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri
 
 
 	action = new TDEAction( i18n( "New Class..." ), "classnew", 0,
-	                      this, TQT_SLOT( slotNewClass() ),
+	                      this, TQ_SLOT( slotNewClass() ),
 	                      actionCollection(), "project_newclass" );
 	action->setToolTip( i18n( "Generate a new class" ) );
 	action->setWhatsThis( i18n( "<b>New Class</b><p>Calls the <b>New Class</b> wizard." ) );
@@ -306,8 +306,8 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri
 		withcpp = true;
 
 	// daniel
-	connect( core( ), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this,
-	         TQT_SLOT( projectConfigWidget( KDialogBase* ) ) );
+	connect( core( ), TQ_SIGNAL( projectConfigWidget( KDialogBase* ) ), this,
+	         TQ_SLOT( projectConfigWidget( KDialogBase* ) ) );
 
 	new KDevCppSupportIface( this );
 	//(void) dcopClient();
@@ -438,7 +438,7 @@ void CppSupportPart::projectConfigWidget( KDialogBase* dlg )
 	vbox = dlg->addVBoxPage( i18n( "C++ Support" ), i18n( "C++ Support" ),
 	                         BarIcon( info() ->icon(), TDEIcon::SizeMedium ) );
 	CCConfigWidget* w = new CCConfigWidget( this, vbox );
-	connect( dlg, TQT_SIGNAL( okClicked( ) ), w, TQT_SLOT( accept( ) ) );
+	connect( dlg, TQ_SIGNAL( okClicked( ) ), w, TQ_SLOT( accept( ) ) );
 }
 
 void CppSupportPart::configWidget( KDialogBase *dlg )
@@ -446,13 +446,13 @@ void CppSupportPart::configWidget( KDialogBase *dlg )
 	TQVBox * vbox = dlg->addVBoxPage( i18n( "C++ Class Generator" ), i18n( "C++ Class Generator" ),
 	                                 BarIcon( info() ->icon(), TDEIcon::SizeMedium ) );
 	ClassGeneratorConfig *w = new ClassGeneratorConfig( vbox, "classgenerator config widget" );
-	connect( dlg, TQT_SIGNAL( okClicked() ), w, TQT_SLOT( storeConfig() ) );
+	connect( dlg, TQ_SIGNAL( okClicked() ), w, TQ_SLOT( storeConfig() ) );
 
 	vbox = dlg->addVBoxPage(i18n("C++ Parsing"), i18n("C++ Parsing"),
 	                               BarIcon( "text-x-c++src", TDEIcon::SizeMedium) );
 	ConfigureProblemReporter* ww = new ConfigureProblemReporter( vbox );
 	ww->setPart( this );
-	connect(dlg, TQT_SIGNAL(okClicked()), ww, TQT_SLOT(accept()));
+	connect(dlg, TQ_SIGNAL(okClicked()), ww, TQ_SLOT(accept()));
 }
 
 void CppSupportPart::activePartChanged( KParts::Part *part )
@@ -465,11 +465,11 @@ void CppSupportPart::activePartChanged( KParts::Part *part )
 
 	if ( m_activeView )
 	{
-		disconnect( m_activeView, TQT_SIGNAL( cursorPositionChanged() ), this, 0 );
+		disconnect( m_activeView, TQ_SIGNAL( cursorPositionChanged() ), this, 0 );
 	}
 	if ( m_activeDocument )
 	{
-		disconnect( m_activeDocument, TQT_SIGNAL(textChanged()), this, 0 );
+		disconnect( m_activeDocument, TQ_SIGNAL(textChanged()), this, 0 );
 	}
 
 	m_isTyping = false;
@@ -500,14 +500,14 @@ void CppSupportPart::activePartChanged( KParts::Part *part )
 
 	if ( m_activeDocument )
 	{
-		connect( m_activeDocument, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) );
+		connect( m_activeDocument, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()) );
 		m_textChangedTimer->start( 250, true ); // kick the parse timer, we might want to parse the current file
 	}
 
 	if ( m_activeViewCursor )
 	{
-		connect( m_activeView, TQT_SIGNAL( cursorPositionChanged() ), this, TQT_SLOT(slotCursorMoved()) );
-// 		         this, TQT_SLOT( slotCursorPositionChanged() ) );
+		connect( m_activeView, TQ_SIGNAL( cursorPositionChanged() ), this, TQ_SLOT(slotCursorMoved()) );
+// 		         this, TQ_SLOT( slotCursorPositionChanged() ) );
 	}
 
 
@@ -516,8 +516,8 @@ void CppSupportPart::activePartChanged( KParts::Part *part )
 	if ( !textHintIface )
 		return ;
 
-	connect( view, TQT_SIGNAL( needTextHint( int, int, TQString& ) ),
-	         this, TQT_SLOT( slotNeedTextHint( int, int, TQString& ) ) );
+	connect( view, TQ_SIGNAL( needTextHint( int, int, TQString& ) ),
+	         this, TQ_SLOT( slotNeedTextHint( int, int, TQString& ) ) );
 
 	textHintIface->enableTextHints( 1000 );
 #endif
@@ -551,17 +551,17 @@ void CppSupportPart::projectOpened( )
 
 	embedProblemReporter();
 
-	connect( core(), TQT_SIGNAL( configWidget( KDialogBase* ) ),
-	         m_problemReporter, TQT_SLOT( configWidget( KDialogBase* ) ) );
+	connect( core(), TQ_SIGNAL( configWidget( KDialogBase* ) ),
+	         m_problemReporter, TQ_SLOT( configWidget( KDialogBase* ) ) );
 
-	connect( project( ), TQT_SIGNAL( addedFilesToProject( const TQStringList & ) ),
-	         this, TQT_SLOT( addedFilesToProject( const TQStringList & ) ) );
-	connect( project( ), TQT_SIGNAL( removedFilesFromProject( const TQStringList & ) ),
-	         this, TQT_SLOT( removedFilesFromProject( const TQStringList & ) ) );
-	connect( project( ), TQT_SIGNAL( changedFilesInProject( const TQStringList & ) ),
-	         this, TQT_SLOT( changedFilesInProject( const TQStringList & ) ) );
-	connect( project(), TQT_SIGNAL( projectCompiled() ),
-	         this, TQT_SLOT( slotProjectCompiled() ) );
+	connect( project( ), TQ_SIGNAL( addedFilesToProject( const TQStringList & ) ),
+	         this, TQ_SLOT( addedFilesToProject( const TQStringList & ) ) );
+	connect( project( ), TQ_SIGNAL( removedFilesFromProject( const TQStringList & ) ),
+	         this, TQ_SLOT( removedFilesFromProject( const TQStringList & ) ) );
+	connect( project( ), TQ_SIGNAL( changedFilesInProject( const TQStringList & ) ),
+	         this, TQ_SLOT( changedFilesInProject( const TQStringList & ) ) );
+	connect( project(), TQ_SIGNAL( projectCompiled() ),
+	         this, TQ_SLOT( slotProjectCompiled() ) );
 
 	m_timestamp.clear();
 	m_parseEmitWaiting.clear();
@@ -573,7 +573,7 @@ void CppSupportPart::projectOpened( )
 	m_buildSafeFileSetTimer->start( 500, true );
 	updateParserConfiguration(); //Necessary to respect custom include-paths and such
 
-	TQTimer::singleShot( 500, this, TQT_SLOT( initialParse( ) ) );
+	TQTimer::singleShot( 500, this, TQ_SLOT( initialParse( ) ) );
 }
 
 void CppSupportPart::embedProblemReporter( bool force )
@@ -687,7 +687,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 		MakeMemberHelper( text, atline, atcol );
 		if ( !text.isEmpty() )
 		{
-			id = popup->insertItem( i18n( "Make Member" ), this, TQT_SLOT( slotMakeMember() ) );
+			id = popup->insertItem( i18n( "Make Member" ), this, TQ_SLOT( slotMakeMember() ) );
 			popup->setWhatsThis( id, i18n( "<b>Make member</b><p>Creates a class member function in implementation file "
 			                               "based on the member declaration at the current line." ) );
 		}
@@ -754,7 +754,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 					}
 					text += formatModelItem( *it, true );
 					text = text.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&&" ) );
-					int id = m2->insertItem( text, this, TQT_SLOT( gotoDeclarationLine( int ) ) );
+					int id = m2->insertItem( text, this, TQ_SLOT( gotoDeclarationLine( int ) ) );
 					int line, column;
 					( *it ) ->getStartPosition( &line, &column );
 					m2->setItemParameter( id, line );
@@ -795,7 +795,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 					}
 					text += formatModelItem( *it, true );
 					text = text.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&&" ) );
-					int id = m->insertItem( text, this, TQT_SLOT( gotoLine( int ) ) );
+					int id = m->insertItem( text, this, TQ_SLOT( gotoLine( int ) ) );
 					int line, column;
 					( *it ) ->getStartPosition( &line, &column );
 					m->setItemParameter( id, line );
@@ -821,7 +821,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 		if ( mcontext->item() ->isClass() )
 		{
 			m_activeClass = ( ClassModel* ) mcontext->item();
-			int id = popup->insertItem( i18n( "Extract Interface..." ), this, TQT_SLOT( slotExtractInterface() ) );
+			int id = popup->insertItem( i18n( "Extract Interface..." ), this, TQ_SLOT( slotExtractInterface() ) );
 			popup->setWhatsThis( id, i18n( "<b>Extract interface</b><p>Extracts interface from the selected class and creates a new class with this interface. "
 			                               "No implementation code is extracted and no implementation code is created." ) );
 		}
@@ -839,7 +839,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 		if ( url.fileName().endsWith( ".ui" ) )
 		{
 			m_contextFileName = url.path();
-			int id = popup->insertItem( i18n( "Create or Select Implementation..." ), this, TQT_SLOT( slotCreateSubclass() ) );
+			int id = popup->insertItem( i18n( "Create or Select Implementation..." ), this, TQ_SLOT( slotCreateSubclass() ) );
 			popup->setWhatsThis( id, i18n( "<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner." ) );
 		}
 	}
@@ -1526,7 +1526,7 @@ bool CppSupportPart::parseProject( bool force )
 	_jd->backgroundCount = 0;
 	_jd->cycle = 0;
 
-	TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) );
+	TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) );
 
 	m_saveMemoryTimer->stop(); //Do not regularly remove cached files that may still be needed while parsing(the cache anyway be full for the whole parsing-process)
 	return true;
@@ -1583,7 +1583,7 @@ void CppSupportPart::slotParseFiles()
 		}
 
 		++( _jd->it );
-		TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) );
+		TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) );
 
 		if( _jd->it == _jd->files.end()) {
 			if( _jd->reparseList.isEmpty() ) {
@@ -1639,11 +1639,11 @@ void CppSupportPart::slotParseFiles()
 			_jd->progressBar->setTotalSteps( _jd->backgroundCount );
 			if( _jd->lastParse.msecsTo( TQTime::currentTime()) > 60000 && !m_backgroundParser->filesInQueue()) {
 				_jd->backgroundCount = _jd->backgroundState;   ///Stop waiting if there is no progress and no file in the background-parser
-				TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) );
+				TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) );
 			} else {
 				int timeStep = 0;
 				if( alwaysParseInBackground ) {
-					TQTimer::singleShot( 10, this, TQT_SLOT( slotParseFiles() ) );
+					TQTimer::singleShot( 10, this, TQ_SLOT( slotParseFiles() ) );
 				} else {
 					if( _jd->it == _jd->reparseList.end() ) {
 						/*_jd->it = _jd->files.end();
@@ -1659,7 +1659,7 @@ void CppSupportPart::slotParseFiles()
 							timeStep = 1;
 						}*/
 					}
-					TQTimer::singleShot( timeStep, this, TQT_SLOT( slotParseFiles() ) );
+					TQTimer::singleShot( timeStep, this, TQ_SLOT( slotParseFiles() ) );
 				}
 			}
 		}
@@ -3165,7 +3165,7 @@ void UIBlockTester::UIBlockTesterThread::stop() {
 UIBlockTester::UIBlockTester( uint milliseconds ) : m_thread( *this ), m_msecs( milliseconds ) {
 	m_timer = new TQTimer( this );
 	m_timer->start( milliseconds/10 );
-	connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timer()) );
+	connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timer()) );
 	timer();
 	m_thread.start();
 }
diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp
index 39103db9..a87ed5b6 100644
--- a/languages/cpp/createpcsdialog.cpp
+++ b/languages/cpp/createpcsdialog.cpp
@@ -276,7 +276,7 @@ void CreatePCSDialog::slotSelected( const TQString & )
 		m_settings = importer->createSettingsPage( settingsPage );
 		setNextEnabled( currentPage(), false );
 		setHelpEnabled( currentPage(), false );
-		connect( m_settings, TQT_SIGNAL( enabled( int ) ), this, TQT_SLOT( setNextPageEnabled( int ) ) );
+		connect( m_settings, TQ_SIGNAL( enabled( int ) ), this, TQ_SLOT( setNextPageEnabled( int ) ) );
 
 		if ( m_settings )
 		{
@@ -307,7 +307,7 @@ void CreatePCSDialog::slotSelected( const TQString & )
 		m_part->removeCatalog( dbName );
 		
 		m_jobData = new PCSJobData( dbName, fileList );
-		TQTimer::singleShot( 0, this, TQT_SLOT(parseNext()) );
+		TQTimer::singleShot( 0, this, TQ_SLOT(parseNext()) );
 	}
 }
 
@@ -340,7 +340,7 @@ void CreatePCSDialog::parseNext( )
 	
 	++(m_jobData->it);
 	
-	TQTimer::singleShot( 0, this, TQT_SLOT(parseNext()) );	
+	TQTimer::singleShot( 0, this, TQ_SLOT(parseNext()) );	
 }
 
 
diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp
index 63f6229b..f6791209 100644
--- a/languages/cpp/debugger/dbgpsdlg.cpp
+++ b/languages/cpp/debugger/dbgpsdlg.cpp
@@ -80,14 +80,14 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name)
     buttonbox->layout();
     topLayout->addWidget(buttonbox);
 
-    connect(ok,     TQT_SIGNAL(clicked()),  TQT_SLOT(accept()));
-    connect(cancel, TQT_SIGNAL(clicked()),  TQT_SLOT(reject()));  
+    connect(ok,     TQ_SIGNAL(clicked()),  TQ_SLOT(accept()));
+    connect(cancel, TQ_SIGNAL(clicked()),  TQ_SLOT(reject()));  
 
     // Default display to 40 chars wide, default height is okay
     resize( ((TDEGlobalSettings::fixedFont()).pointSize())*40, height());
     topLayout->activate();
 
-    TQTimer::singleShot(0, this, TQT_SLOT(slotInit()));
+    TQTimer::singleShot(0, this, TQ_SLOT(slotInit()));
 
 }
 
@@ -133,8 +133,8 @@ void Dbg_PS_Dialog::slotInit()
     }
 #endif
 
-    connect( psProc_, TQT_SIGNAL(processExited(TDEProcess *)),                TQT_SLOT(slotProcessExited()) );
-    connect( psProc_, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),  TQT_SLOT(slotReceivedOutput(TDEProcess *, char *, int)) );
+    connect( psProc_, TQ_SIGNAL(processExited(TDEProcess *)),                TQ_SLOT(slotProcessExited()) );
+    connect( psProc_, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),  TQ_SLOT(slotReceivedOutput(TDEProcess *, char *, int)) );
 
     psProc_->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
 }
diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp
index 13d01768..f9143fc0 100644
--- a/languages/cpp/debugger/dbgtoolbar.cpp
+++ b/languages/cpp/debugger/dbgtoolbar.cpp
@@ -111,9 +111,9 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e)
         TDEPopupMenu *menu = new TDEPopupMenu(this);
 	menu->insertTitle(i18n("Debug Toolbar"));
         menu->insertItem(i18n("Dock to Panel"),
-                         parent(), TQT_SLOT(slotDock()));
+                         parent(), TQ_SLOT(slotDock()));
         menu->insertItem(i18n("Dock to Panel && Iconify TDevelop"),
-                         parent(), TQT_SLOT(slotIconifyAndDock()));
+                         parent(), TQ_SLOT(slotIconifyAndDock()));
         menu->popup(e->globalPos());
     } else {
         moving_ = true;
@@ -243,8 +243,8 @@ void DbgDocker::mousePressEvent(TQMouseEvent *e)
         {
             TDEPopupMenu* menu = new TDEPopupMenu(this);
 	    menu->insertTitle(i18n("Debug Toolbar"));
-            menu->insertItem(i18n("Activate"),                        toolBar_, TQT_SLOT(slotUndock()));
-            menu->insertItem(i18n("Activate (TDevelop gets focus)"),  toolBar_, TQT_SLOT(slotActivateAndUndock()));
+            menu->insertItem(i18n("Activate"),                        toolBar_, TQ_SLOT(slotUndock()));
+            menu->insertItem(i18n("Activate (TDevelop gets focus)"),  toolBar_, TQ_SLOT(slotActivateAndUndock()));
             menu->popup(e->globalPos());
             break;
         }
@@ -272,7 +272,7 @@ DbgToolBar::DbgToolBar(DebuggerPart* part,
 {
     winModule_  = new KWinModule(this);
     docker_ = new DbgDocker(parent, this, BarIcon("dbgnext"));
-    connect(docker_, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver()));
+    connect(docker_, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepOver()));
 
     // Must have noFocus set so that we can see what window was active.
     // see slotDbgKdevFocus() for more comments
@@ -310,17 +310,17 @@ DbgToolBar::DbgToolBar(DebuggerPart* part,
     bKDevFocus_ = new DbgButton(BarIcon("tdevelop"),      TQString(),      this);
     bPrevFocus_ = new DbgButton(BarIcon("dbgmemview"),    TQString(),      this);
 
-  connect(bRun,        TQT_SIGNAL(clicked()), part_,  TQT_SLOT(slotRun()));
-  connect(bInterrupt,  TQT_SIGNAL(clicked()), part_,  TQT_SLOT(slotPause()));
-  connect(bNext,       TQT_SIGNAL(clicked()), part_,  TQT_SLOT(slotStepOver()));
-  connect(bNexti,      TQT_SIGNAL(clicked()), part_,  TQT_SLOT(slotStepOverInstruction()));
-  connect(bStep,       TQT_SIGNAL(clicked()), part_,  TQT_SLOT(slotStepInto()));
-  connect(bStepi,      TQT_SIGNAL(clicked()), part_,  TQT_SLOT(slotStepIntoInstruction()));
-  connect(bFinish,     TQT_SIGNAL(clicked()), part_,  TQT_SLOT(slotStepOut()));
-  connect(bRunTo,      TQT_SIGNAL(clicked()), part_,  TQT_SLOT(slotRunToCursor()));
-  connect(bView,       TQT_SIGNAL(clicked()), part_,  TQT_SLOT(slotMemoryView()));
-  connect(bKDevFocus_, TQT_SIGNAL(clicked()), this,   TQT_SLOT(slotKdevFocus()));
-  connect(bPrevFocus_, TQT_SIGNAL(clicked()), this,   TQT_SLOT(slotPrevFocus()));
+  connect(bRun,        TQ_SIGNAL(clicked()), part_,  TQ_SLOT(slotRun()));
+  connect(bInterrupt,  TQ_SIGNAL(clicked()), part_,  TQ_SLOT(slotPause()));
+  connect(bNext,       TQ_SIGNAL(clicked()), part_,  TQ_SLOT(slotStepOver()));
+  connect(bNexti,      TQ_SIGNAL(clicked()), part_,  TQ_SLOT(slotStepOverInstruction()));
+  connect(bStep,       TQ_SIGNAL(clicked()), part_,  TQ_SLOT(slotStepInto()));
+  connect(bStepi,      TQ_SIGNAL(clicked()), part_,  TQ_SLOT(slotStepIntoInstruction()));
+  connect(bFinish,     TQ_SIGNAL(clicked()), part_,  TQ_SLOT(slotStepOut()));
+  connect(bRunTo,      TQ_SIGNAL(clicked()), part_,  TQ_SLOT(slotRunToCursor()));
+  connect(bView,       TQ_SIGNAL(clicked()), part_,  TQ_SLOT(slotMemoryView()));
+  connect(bKDevFocus_, TQ_SIGNAL(clicked()), this,   TQ_SLOT(slotKdevFocus()));
+  connect(bPrevFocus_, TQ_SIGNAL(clicked()), this,   TQ_SLOT(slotPrevFocus()));
 
     TQToolTip::add( bRun,        i18n("Continue with application execution, may start the application") );
     TQToolTip::add( bInterrupt,  i18n("Interrupt the application execution") );
diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp
index 6621cbf8..e2efd7b0 100644
--- a/languages/cpp/debugger/debuggerpart.cpp
+++ b/languages/cpp/debugger/debuggerpart.cpp
@@ -166,12 +166,12 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi
     mainWindow()->setViewAvailable(gdbOutputWidget, false);
 
     // gdbBreakpointWidget -> this
-    connect( gdbBreakpointWidget, TQT_SIGNAL(refreshBPState(const Breakpoint&)),
-             this,             TQT_SLOT(slotRefreshBPState(const Breakpoint&)));
-    connect( gdbBreakpointWidget, TQT_SIGNAL(publishBPState(const Breakpoint&)),
-             this,             TQT_SLOT(slotRefreshBPState(const Breakpoint&)));
-    connect( gdbBreakpointWidget, TQT_SIGNAL(gotoSourcePosition(const TQString&, int)),
-             this,             TQT_SLOT(slotGotoSource(const TQString&, int)) );
+    connect( gdbBreakpointWidget, TQ_SIGNAL(refreshBPState(const Breakpoint&)),
+             this,             TQ_SLOT(slotRefreshBPState(const Breakpoint&)));
+    connect( gdbBreakpointWidget, TQ_SIGNAL(publishBPState(const Breakpoint&)),
+             this,             TQ_SLOT(slotRefreshBPState(const Breakpoint&)));
+    connect( gdbBreakpointWidget, TQ_SIGNAL(gotoSourcePosition(const TQString&, int)),
+             this,             TQ_SLOT(slotGotoSource(const TQString&, int)) );
 
 
     viewerWidget = new ViewerWidget( controller, 0, "viewerWidget");
@@ -179,15 +179,15 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi
                                   i18n("Debug views"),
                                   i18n("Special debugger views"));
     mainWindow()->setViewAvailable(viewerWidget, false);
-    connect(viewerWidget, TQT_SIGNAL(setViewShown(bool)),
-            this, TQT_SLOT(slotShowView(bool)));
+    connect(viewerWidget, TQ_SIGNAL(setViewShown(bool)),
+            this, TQ_SLOT(slotShowView(bool)));
 
     // Now setup the actions
     TDEAction *action;
 
 //    action = new TDEAction(i18n("&Start"), "1rightarrow", CTRL+SHIFT+Key_F9,
     action = new TDEAction(i18n("&Start"), "dbgrun", Key_F9,
-                         this, TQT_SLOT(slotRun()),
+                         this, TQ_SLOT(slotRun()),
                          actionCollection(), "debug_run");
     action->setToolTip( i18n("Start in debugger") );
     action->setWhatsThis( i18n("<b>Start in debugger</b><p>"
@@ -198,7 +198,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi
                                "about variables, frame stack, and so on.") );
 
     action = new TDEAction(i18n("&Restart"), "dbgrestart", 0,
-                         this, TQT_SLOT(slotRestart()),
+                         this, TQ_SLOT(slotRestart()),
                          actionCollection(), "debug_restart");
     action->setToolTip( i18n("Restart program") );
     action->setWhatsThis( i18n("<b>Restarts application</b><p>"
@@ -208,33 +208,33 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi
 
 
     action = new TDEAction(i18n("Sto&p"), "process-stop", 0,
-                         this, TQT_SLOT(slotStop()),
+                         this, TQ_SLOT(slotStop()),
                          actionCollection(), "debug_stop");
     action->setToolTip( i18n("Stop debugger") );
     action->setWhatsThis(i18n("<b>Stop debugger</b><p>Kills the executable and exits the debugger."));
 
     action = new TDEAction(i18n("Interrupt"), "media-playback-pause", 0,
-                         this, TQT_SLOT(slotPause()),
+                         this, TQ_SLOT(slotPause()),
                          actionCollection(), "debug_pause");
     action->setToolTip( i18n("Interrupt application") );
     action->setWhatsThis(i18n("<b>Interrupt application</b><p>Interrupts the debugged process or current GDB command."));
 
     action = new TDEAction(i18n("Run to &Cursor"), "dbgrunto", 0,
-                         this, TQT_SLOT(slotRunToCursor()),
+                         this, TQ_SLOT(slotRunToCursor()),
                          actionCollection(), "debug_runtocursor");
     action->setToolTip( i18n("Run to cursor") );
     action->setWhatsThis(i18n("<b>Run to cursor</b><p>Continues execution until the cursor position is reached."));
 
 
     action = new TDEAction(i18n("Set E&xecution Position to Cursor"), "dbgjumpto", 0,
-                         this, TQT_SLOT(slotJumpToCursor()),
+                         this, TQ_SLOT(slotJumpToCursor()),
                          actionCollection(), "debug_jumptocursor");
     action->setToolTip( i18n("Jump to cursor") );
     action->setWhatsThis(i18n("<b>Set Execution Position </b><p>Set the execution pointer to the current cursor position."));
 
 
     action = new TDEAction(i18n("Step &Over"), "dbgnext", Key_F10,
-                         this, TQT_SLOT(slotStepOver()),
+                         this, TQ_SLOT(slotStepOver()),
                          actionCollection(), "debug_stepover");
     action->setToolTip( i18n("Step over the next line") );
     action->setWhatsThis( i18n("<b>Step over</b><p>"
@@ -245,14 +245,14 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi
 
 
     action = new TDEAction(i18n("Step over Ins&truction"), "dbgnextinst", 0,
-                         this, TQT_SLOT(slotStepOverInstruction()),
+                         this, TQ_SLOT(slotStepOverInstruction()),
                          actionCollection(), "debug_stepoverinst");
     action->setToolTip( i18n("Step over instruction") );
     action->setWhatsThis(i18n("<b>Step over instruction</b><p>Steps over the next assembly instruction."));
 
 
     action = new TDEAction(i18n("Step &Into"), "dbgstep", Key_F11,
-                         this, TQT_SLOT(slotStepInto()),
+                         this, TQ_SLOT(slotStepInto()),
                          actionCollection(), "debug_stepinto");
     action->setToolTip( i18n("Step into the next statement") );
     action->setWhatsThis( i18n("<b>Step into</b><p>"
@@ -262,14 +262,14 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi
 
 
     action = new TDEAction(i18n("Step into I&nstruction"), "dbgstepinst", 0,
-                         this, TQT_SLOT(slotStepIntoInstruction()),
+                         this, TQ_SLOT(slotStepIntoInstruction()),
                          actionCollection(), "debug_stepintoinst");
     action->setToolTip( i18n("Step into instruction") );
     action->setWhatsThis(i18n("<b>Step into instruction</b><p>Steps into the next assembly instruction."));
 
 
     action = new TDEAction(i18n("Step O&ut"), "dbgstepout", Key_F12,
-                         this, TQT_SLOT(slotStepOut()),
+                         this, TQ_SLOT(slotStepOut()),
                          actionCollection(), "debug_stepout");
     action->setToolTip( i18n("Steps out of the current function") );
     action->setWhatsThis( i18n("<b>Step out</b><p>"
@@ -281,7 +281,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi
 
 
     action = new TDEAction(i18n("Viewers"), "dbgmemview", 0,
-                         this, TQT_SLOT(slotMemoryView()),
+                         this, TQ_SLOT(slotMemoryView()),
                          actionCollection(), "debug_memview");
     action->setToolTip( i18n("Debugger viewers") );
     action->setWhatsThis(i18n("<b>Debugger viewers</b><p>Various information about application being executed. There are 4 views available:<br>"
@@ -292,7 +292,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi
 
 
     action = new TDEAction(i18n("Examine Core File..."), "application-x-core", 0,
-                         this, TQT_SLOT(slotExamineCore()),
+                         this, TQ_SLOT(slotExamineCore()),
                          actionCollection(), "debug_core");
     action->setToolTip( i18n("Examine core file") );
     action->setWhatsThis( i18n("<b>Examine core file</b><p>"
@@ -304,72 +304,72 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi
 
 
     action = new TDEAction(i18n("Attach to Process"), "connect_creating", 0,
-                         this, TQT_SLOT(slotAttachProcess()),
+                         this, TQ_SLOT(slotAttachProcess()),
                          actionCollection(), "debug_attach");
     action->setToolTip( i18n("Attach to process") );
     action->setWhatsThis(i18n("<b>Attach to process</b><p>Attaches the debugger to a running process."));
 
     action = new TDEAction(i18n("Toggle Breakpoint"), 0, 0,
-                         this, TQT_SLOT(toggleBreakpoint()),
+                         this, TQ_SLOT(toggleBreakpoint()),
                          actionCollection(), "debug_toggle_breakpoint");
     action->setToolTip(i18n("Toggle breakpoint"));
     action->setWhatsThis(i18n("<b>Toggle breakpoint</b><p>Toggles the breakpoint at the current line in editor."));
 
-    connect( mainWindow()->main()->guiFactory(), TQT_SIGNAL(clientAdded(KXMLGUIClient*)),
-             this, TQT_SLOT(guiClientAdded(KXMLGUIClient*)) );
+    connect( mainWindow()->main()->guiFactory(), TQ_SIGNAL(clientAdded(KXMLGUIClient*)),
+             this, TQ_SLOT(guiClientAdded(KXMLGUIClient*)) );
 
-    connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)),
-             this, TQT_SLOT(projectConfigWidget(KDialogBase*)) );
+    connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)),
+             this, TQ_SLOT(projectConfigWidget(KDialogBase*)) );
 
-    connect( partController(), TQT_SIGNAL(loadedFile(const KURL &)),
-             gdbBreakpointWidget, TQT_SLOT(slotRefreshBP(const KURL &)) );
-    connect( debugger(), TQT_SIGNAL(toggledBreakpoint(const TQString &, int)),
-             gdbBreakpointWidget, TQT_SLOT(slotToggleBreakpoint(const TQString &, int)) );
-    connect( debugger(), TQT_SIGNAL(editedBreakpoint(const TQString &, int)),
-             gdbBreakpointWidget, TQT_SLOT(slotEditBreakpoint(const TQString &, int)) );
-    connect( debugger(), TQT_SIGNAL(toggledBreakpointEnabled(const TQString &, int)),
-             gdbBreakpointWidget, TQT_SLOT(slotToggleBreakpointEnabled(const TQString &, int)) );
+    connect( partController(), TQ_SIGNAL(loadedFile(const KURL &)),
+             gdbBreakpointWidget, TQ_SLOT(slotRefreshBP(const KURL &)) );
+    connect( debugger(), TQ_SIGNAL(toggledBreakpoint(const TQString &, int)),
+             gdbBreakpointWidget, TQ_SLOT(slotToggleBreakpoint(const TQString &, int)) );
+    connect( debugger(), TQ_SIGNAL(editedBreakpoint(const TQString &, int)),
+             gdbBreakpointWidget, TQ_SLOT(slotEditBreakpoint(const TQString &, int)) );
+    connect( debugger(), TQ_SIGNAL(toggledBreakpointEnabled(const TQString &, int)),
+             gdbBreakpointWidget, TQ_SLOT(slotToggleBreakpointEnabled(const TQString &, int)) );
 
-    connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
-             this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
+    connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
+             this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
 
-    connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)),
-             this, TQT_SLOT(slotStop(KDevPlugin*)) );
-    connect( core(), TQT_SIGNAL(projectClosed()),
-             this, TQT_SLOT(projectClosed()) );
+    connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)),
+             this, TQ_SLOT(slotStop(KDevPlugin*)) );
+    connect( core(), TQ_SIGNAL(projectClosed()),
+             this, TQ_SLOT(projectClosed()) );
 
-    connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
-             this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) );
+    connect( partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)),
+             this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) );
 
     procLineMaker = new ProcessLineMaker();
 
-    connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)),
-             appFrontend(), TQT_SLOT(insertStdoutLine(const TQCString&)) );
-    connect( procLineMaker, TQT_SIGNAL(receivedStderrLine(const TQCString&)),
-             appFrontend(), TQT_SLOT(insertStderrLine(const TQCString&)) );
+    connect( procLineMaker, TQ_SIGNAL(receivedStdoutLine(const TQCString&)),
+             appFrontend(), TQ_SLOT(insertStdoutLine(const TQCString&)) );
+    connect( procLineMaker, TQ_SIGNAL(receivedStderrLine(const TQCString&)),
+             appFrontend(), TQ_SLOT(insertStderrLine(const TQCString&)) );
     
-    connect( procLineMaker, TQT_SIGNAL(receivedPartialStdoutLine(const TQCString&)),
-             appFrontend(), TQT_SLOT(addPartialStdoutLine(const TQCString&)));
-    connect( procLineMaker, TQT_SIGNAL(receivedPartialStderrLine(const TQCString&)),
-             appFrontend(), TQT_SLOT(addPartialStderrLine(const TQCString&)));
+    connect( procLineMaker, TQ_SIGNAL(receivedPartialStdoutLine(const TQCString&)),
+             appFrontend(), TQ_SLOT(addPartialStdoutLine(const TQCString&)));
+    connect( procLineMaker, TQ_SIGNAL(receivedPartialStderrLine(const TQCString&)),
+             appFrontend(), TQ_SLOT(addPartialStderrLine(const TQCString&)));
 
     // The output from tracepoints goes to "application" window, because
     // we don't have any better alternative, and using yet another window
     // is undesirable. Besides, this makes tracepoint look even more similar
     // to printf debugging.
-    connect( gdbBreakpointWidget,   TQT_SIGNAL(tracingOutput(const char*)),
-             procLineMaker,         TQT_SLOT(slotReceivedStdout(const char*)));
+    connect( gdbBreakpointWidget,   TQ_SIGNAL(tracingOutput(const char*)),
+             procLineMaker,         TQ_SLOT(slotReceivedStdout(const char*)));
 
 
-    connect(partController(), TQT_SIGNAL(savedFile(const KURL &)),
-            this, TQT_SLOT(slotFileSaved()));
+    connect(partController(), TQ_SIGNAL(savedFile(const KURL &)),
+            this, TQ_SLOT(slotFileSaved()));
 
     if (project())
-        connect(project(), TQT_SIGNAL(projectCompiled()),
-                this, TQT_SLOT(slotProjectCompiled()));
+        connect(project(), TQ_SIGNAL(projectCompiled()),
+                this, TQ_SLOT(slotProjectCompiled()));
 
     setupController();
-    TQTimer::singleShot(0, this, TQT_SLOT(setupDcop()));
+    TQTimer::singleShot(0, this, TQ_SLOT(setupDcop()));
 }
 
 void DebuggerPart::setupDcop()
@@ -379,7 +379,7 @@ void DebuggerPart::setupDcop()
         if ((*it).find("drkonqi-") == 0)
             slotDCOPApplicationRegistered(*it);
 
-    connect(kapp->dcopClient(), TQT_SIGNAL(applicationRegistered(const TQCString&)), TQT_SLOT(slotDCOPApplicationRegistered(const TQCString&)));
+    connect(kapp->dcopClient(), TQ_SIGNAL(applicationRegistered(const TQCString&)), TQ_SLOT(slotDCOPApplicationRegistered(const TQCString&)));
     kapp->dcopClient()->setNotifications(true);
 }
 
@@ -415,7 +415,7 @@ ASYNC DebuggerPart::slotDebugExternalProcess()
 
     if (attachProcess(pid) && m_drkonqi.isEmpty()) {
         m_drkonqi = kapp->dcopClient()->senderId();
-        TQTimer::singleShot(15000, this, TQT_SLOT(slotCloseDrKonqi()));
+        TQTimer::singleShot(15000, this, TQ_SLOT(slotCloseDrKonqi()));
         mainWindow()->raiseView(framestackWidget);
     }
 
@@ -497,7 +497,7 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context)
         if (act)
         {
             int id = popup->insertItem( act->iconSet(), i18n("Run to &Cursor"),
-                                        this, TQT_SLOT(slotRunToCursor()),
+                                        this, TQ_SLOT(slotRunToCursor()),
                                         0, -1, index);
 
             popup->setWhatsThis(id, act->whatsThis());
@@ -507,7 +507,7 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context)
     if (econtext->url().isLocalFile())
     {
         int id = popup->insertItem( i18n("Toggle Breakpoint"),
-                                    this, TQT_SLOT(toggleBreakpoint()),
+                                    this, TQ_SLOT(toggleBreakpoint()),
                                     0, -1, index);
         index += running;
         popup->setWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line."));
@@ -516,12 +516,12 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context)
     {
         TQString squeezed = KStringHandler::csqueeze(m_contextIdent, 30);
         int id = popup->insertItem( i18n("Evaluate: %1").arg(squeezed),
-                                    this, TQT_SLOT(contextEvaluate()),
+                                    this, TQ_SLOT(contextEvaluate()),
                                     0, -1, index);
         index += running;
         popup->setWhatsThis(id, i18n("<b>Evaluate expression</b><p>Shows the value of the expression under the cursor."));
         int id2 = popup->insertItem( i18n("Watch: %1").arg(squeezed),
-                                     this, TQT_SLOT(contextWatch()),
+                                     this, TQ_SLOT(contextWatch()),
                                     0, -1, index);
         index += running;
         popup->setWhatsThis(id2, i18n("<b>Watch expression</b><p>Adds an expression under the cursor to the Variables/Watch list."));
@@ -562,8 +562,8 @@ void DebuggerPart::projectConfigWidget(KDialogBase *dlg)
 {
     TQVBox *vbox = dlg->addVBoxPage(i18n("Debugger"), i18n("Debugger"), BarIcon( info()->icon(), TDEIcon::SizeMedium) );
     DebuggerConfigWidget *w = new DebuggerConfigWidget(this, vbox, "debugger config widget");
-    connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) );
-    connect( dlg, TQT_SIGNAL(finished()), controller, TQT_SLOT(configure()) );
+    connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) );
+    connect( dlg, TQ_SIGNAL(finished()), controller, TQ_SLOT(configure()) );
 }
 
 
@@ -572,57 +572,57 @@ void DebuggerPart::setupController()
     VariableTree *variableTree = variableWidget->varTree();
 
     // variableTree -> gdbBreakpointWidget
-    connect( variableTree,          TQT_SIGNAL(toggleWatchpoint(const TQString &)),
-             gdbBreakpointWidget,   TQT_SLOT(slotToggleWatchpoint(const TQString &)));
+    connect( variableTree,          TQ_SIGNAL(toggleWatchpoint(const TQString &)),
+             gdbBreakpointWidget,   TQ_SLOT(slotToggleWatchpoint(const TQString &)));
 
     // gdbOutputWidget -> controller
-    connect( gdbOutputWidget,       TQT_SIGNAL(userGDBCmd(const TQString &)),
-             controller,            TQT_SLOT(slotUserGDBCmd(const TQString&)));
-    connect( gdbOutputWidget,       TQT_SIGNAL(breakInto()),
-             controller,            TQT_SLOT(slotBreakInto()));
+    connect( gdbOutputWidget,       TQ_SIGNAL(userGDBCmd(const TQString &)),
+             controller,            TQ_SLOT(slotUserGDBCmd(const TQString&)));
+    connect( gdbOutputWidget,       TQ_SIGNAL(breakInto()),
+             controller,            TQ_SLOT(slotBreakInto()));
 
-    connect( controller,            TQT_SIGNAL(breakpointHit(int)),
-             gdbBreakpointWidget,   TQT_SLOT(slotBreakpointHit(int)));
+    connect( controller,            TQ_SIGNAL(breakpointHit(int)),
+             gdbBreakpointWidget,   TQ_SLOT(slotBreakpointHit(int)));
 
     // controller -> disassembleWidget
-    connect( controller,            TQT_SIGNAL(showStepInSource(const TQString&, int, const TQString&)),
-             disassembleWidget,     TQT_SLOT(slotShowStepInSource(const TQString&, int, const TQString&)));
+    connect( controller,            TQ_SIGNAL(showStepInSource(const TQString&, int, const TQString&)),
+             disassembleWidget,     TQ_SLOT(slotShowStepInSource(const TQString&, int, const TQString&)));
 
     // controller -> this
-    connect( controller,            TQT_SIGNAL(dbgStatus(const TQString&, int)),
-             this,                  TQT_SLOT(slotStatus(const TQString&, int)));
-    connect( controller,            TQT_SIGNAL(showStepInSource(const TQString&, int, const TQString&)),
-             this,                  TQT_SLOT(slotShowStep(const TQString&, int)));
-    connect( controller,            TQT_SIGNAL(debuggerAbnormalExit()),
-         this,                  TQT_SLOT(slotDebuggerAbnormalExit()));
+    connect( controller,            TQ_SIGNAL(dbgStatus(const TQString&, int)),
+             this,                  TQ_SLOT(slotStatus(const TQString&, int)));
+    connect( controller,            TQ_SIGNAL(showStepInSource(const TQString&, int, const TQString&)),
+             this,                  TQ_SLOT(slotShowStep(const TQString&, int)));
+    connect( controller,            TQ_SIGNAL(debuggerAbnormalExit()),
+         this,                  TQ_SLOT(slotDebuggerAbnormalExit()));
 
-    connect(controller, TQT_SIGNAL(event(GDBController::event_t)),
-            this,       TQT_SLOT(slotEvent(GDBController::event_t)));
+    connect(controller, TQ_SIGNAL(event(GDBController::event_t)),
+            this,       TQ_SLOT(slotEvent(GDBController::event_t)));
 
     // controller -> procLineMaker
-    connect( controller,            TQT_SIGNAL(ttyStdout(const char*)),
-             procLineMaker,         TQT_SLOT(slotReceivedStdout(const char*)));
-    connect( controller,            TQT_SIGNAL(ttyStderr(const char*)),
-             procLineMaker,         TQT_SLOT(slotReceivedStderr(const char*)));
+    connect( controller,            TQ_SIGNAL(ttyStdout(const char*)),
+             procLineMaker,         TQ_SLOT(slotReceivedStdout(const char*)));
+    connect( controller,            TQ_SIGNAL(ttyStderr(const char*)),
+             procLineMaker,         TQ_SLOT(slotReceivedStderr(const char*)));
 
     // controller -> gdbOutputWidget
-    connect( controller,            TQT_SIGNAL(gdbInternalCommandStdout(const char*)),
-             gdbOutputWidget,       TQT_SLOT(slotInternalCommandStdout(const char*)) );
-    connect( controller,            TQT_SIGNAL(gdbUserCommandStdout(const char*)),
-             gdbOutputWidget,       TQT_SLOT(slotUserCommandStdout(const char*)) );
+    connect( controller,            TQ_SIGNAL(gdbInternalCommandStdout(const char*)),
+             gdbOutputWidget,       TQ_SLOT(slotInternalCommandStdout(const char*)) );
+    connect( controller,            TQ_SIGNAL(gdbUserCommandStdout(const char*)),
+             gdbOutputWidget,       TQ_SLOT(slotUserCommandStdout(const char*)) );
 
-    connect( controller,            TQT_SIGNAL(gdbStderr(const char*)),
-             gdbOutputWidget,       TQT_SLOT(slotReceivedStderr(const char*)) );
-    connect( controller,            TQT_SIGNAL(dbgStatus(const TQString&, int)),
-             gdbOutputWidget,       TQT_SLOT(slotDbgStatus(const TQString&, int)));
+    connect( controller,            TQ_SIGNAL(gdbStderr(const char*)),
+             gdbOutputWidget,       TQ_SLOT(slotReceivedStderr(const char*)) );
+    connect( controller,            TQ_SIGNAL(dbgStatus(const TQString&, int)),
+             gdbOutputWidget,       TQ_SLOT(slotDbgStatus(const TQString&, int)));
 
     // controller -> viewerWidget
-    connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)),
-             viewerWidget, TQT_SLOT(slotDebuggerState(const TQString&, int)));
+    connect( controller, TQ_SIGNAL(dbgStatus(const TQString&, int)),
+             viewerWidget, TQ_SLOT(slotDebuggerState(const TQString&, int)));
 
 
-    connect(statusBarIndicator, TQT_SIGNAL(doubleClicked()),
-            controller, TQT_SLOT(explainDebuggerStatus()));
+    connect(statusBarIndicator, TQ_SIGNAL(doubleClicked()),
+            controller, TQ_SLOT(explainDebuggerStatus()));
 
 }
 
@@ -857,18 +857,18 @@ void DebuggerPart::slotRun()
 
             if (rebuild)
             {
-                disconnect(TQT_SIGNAL(buildProject()));
+                disconnect(TQ_SIGNAL(buildProject()));
                 // The KDevProject has no method to build the project,
                 // so try connecting to a slot has is present to all
                 // existing project managers.
                 // Note: this assumes that 'slotBuild' will save
                 // modified files.
 
-                if (connect(this, TQT_SIGNAL(buildProject()),
-                            project(), TQT_SLOT(slotBuild())))
+                if (connect(this, TQ_SIGNAL(buildProject()),
+                            project(), TQ_SLOT(slotBuild())))
                 {
-                    connect(project(), TQT_SIGNAL(projectCompiled()),
-                            this, TQT_SLOT(slotRun_part2()));
+                    connect(project(), TQ_SIGNAL(projectCompiled()),
+                            this, TQ_SLOT(slotRun_part2()));
 
                     emit buildProject();
                     rebuild = true;
@@ -894,8 +894,8 @@ void DebuggerPart::slotRun_part2()
 {
     needRebuild_ = false;
 
-    disconnect(project(), TQT_SIGNAL(projectCompiled()),
-               this, TQT_SLOT(slotRun_part2()));
+    disconnect(project(), TQ_SIGNAL(projectCompiled()),
+               this, TQ_SLOT(slotRun_part2()));
 
     if (controller->stateIsOn( s_dbgNotStarted ))
     {
diff --git a/languages/cpp/debugger/debuggertracingdialog.cpp b/languages/cpp/debugger/debuggertracingdialog.cpp
index 90657b29..6d1122ee 100644
--- a/languages/cpp/debugger/debuggertracingdialog.cpp
+++ b/languages/cpp/debugger/debuggertracingdialog.cpp
@@ -19,11 +19,11 @@ namespace GDBDebugger
     {
         expressions->setButtons(KEditListBox::Add | KEditListBox::Remove);
 
-        connect(enable, TQT_SIGNAL(stateChanged(int)),
-                this, TQT_SLOT(enableOrDisable(int)));        
+        connect(enable, TQ_SIGNAL(stateChanged(int)),
+                this, TQ_SLOT(enableOrDisable(int)));        
         
-        connect(enableCustomFormat, TQT_SIGNAL(stateChanged(int)),
-                this, TQT_SLOT(enableOrDisableCustomFormat(int)));
+        connect(enableCustomFormat, TQ_SIGNAL(stateChanged(int)),
+                this, TQ_SLOT(enableOrDisableCustomFormat(int)));
 
         enable->setChecked(bp_->tracingEnabled());
         expressions->setItems(bp_->tracedExpressions());
diff --git a/languages/cpp/debugger/framestackwidget.cpp b/languages/cpp/debugger/framestackwidget.cpp
index 423fae89..e81bf590 100644
--- a/languages/cpp/debugger/framestackwidget.cpp
+++ b/languages/cpp/debugger/framestackwidget.cpp
@@ -57,11 +57,11 @@ FramestackWidget::FramestackWidget(GDBController* controller,
 
     // FIXME: maybe, all debugger components should derive from
     // a base class that does this connect.
-    connect(controller, TQT_SIGNAL(event(GDBController::event_t)),
-            this,       TQT_SLOT(slotEvent(GDBController::event_t)));
+    connect(controller, TQ_SIGNAL(event(GDBController::event_t)),
+            this,       TQ_SLOT(slotEvent(GDBController::event_t)));
 
-    connect( this, TQT_SIGNAL(clicked(TQListViewItem*)),
-             this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) );
+    connect( this, TQ_SIGNAL(clicked(TQListViewItem*)),
+             this, TQ_SLOT(slotSelectionChanged(TQListViewItem*)) );
 }
 
 
diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp
index c777226a..c8064711 100644
--- a/languages/cpp/debugger/gdbbreakpointwidget.cpp
+++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp
@@ -145,8 +145,8 @@ void BreakpointTableRow::appendEmptyRow()
 
     ComplexEditCell* act = new ComplexEditCell(table());
     table()->setItem(row, Tracing, act);
-    TQObject::connect(act, TQT_SIGNAL(edit(TQTableItem*)),
-                     table()->parent(), TQT_SLOT(editTracing(TQTableItem*)));
+    TQObject::connect(act, TQ_SIGNAL(edit(TQTableItem*)),
+                     table()->parent(), TQ_SLOT(editTracing(TQTableItem*)));
 }
 
 /***************************************************************************/
@@ -251,39 +251,39 @@ controller_(controller)
 
     m_table->show();
 
-    connect( newBreakpoint,       TQT_SIGNAL(activated(int)),
-             this,          TQT_SLOT(slotAddBlankBreakpoint(int)) );
+    connect( newBreakpoint,       TQ_SIGNAL(activated(int)),
+             this,          TQ_SLOT(slotAddBlankBreakpoint(int)) );
 
-    connect( m_table,       TQT_SIGNAL(contextMenuRequested(int, int, const TQPoint &)),
-             this,          TQT_SLOT(slotContextMenuShow(int, int, const TQPoint & )) );
-    connect( m_ctxMenu,     TQT_SIGNAL(activated(int)),
-             this,          TQT_SLOT(slotContextMenuSelect(int)) );
+    connect( m_table,       TQ_SIGNAL(contextMenuRequested(int, int, const TQPoint &)),
+             this,          TQ_SLOT(slotContextMenuShow(int, int, const TQPoint & )) );
+    connect( m_ctxMenu,     TQ_SIGNAL(activated(int)),
+             this,          TQ_SLOT(slotContextMenuSelect(int)) );
 
-    connect( m_table,       TQT_SIGNAL(doubleClicked(int, int, int, const TQPoint &)),
-             this,          TQT_SLOT(slotRowDoubleClicked(int, int, int, const TQPoint &)));
+    connect( m_table,       TQ_SIGNAL(doubleClicked(int, int, int, const TQPoint &)),
+             this,          TQ_SLOT(slotRowDoubleClicked(int, int, int, const TQPoint &)));
 
-    connect( m_table,       TQT_SIGNAL(valueChanged(int, int)),
-             this,          TQT_SLOT(slotNewValue(int, int)));
+    connect( m_table,       TQ_SIGNAL(valueChanged(int, int)),
+             this,          TQ_SLOT(slotNewValue(int, int)));
 
-    connect( m_table,       TQT_SIGNAL(returnPressed()),
-             this,          TQT_SLOT(slotEditBreakpoint()));
-//    connect( m_table,       TQT_SIGNAL(f2Pressed()),
-//             this,          TQT_SLOT(slotEditBreakpoint()));
-    connect( m_table,       TQT_SIGNAL(deletePressed()),
-             this,          TQT_SLOT(slotRemoveBreakpoint()));
+    connect( m_table,       TQ_SIGNAL(returnPressed()),
+             this,          TQ_SLOT(slotEditBreakpoint()));
+//    connect( m_table,       TQ_SIGNAL(f2Pressed()),
+//             this,          TQ_SLOT(slotEditBreakpoint()));
+    connect( m_table,       TQ_SIGNAL(deletePressed()),
+             this,          TQ_SLOT(slotRemoveBreakpoint()));
 // This slot doesn't exist anymore
-//     connect( m_table,       TQT_SIGNAL(insertPressed()),
-//              this,          TQT_SLOT(slotAddBlankBreakpoint()));
+//     connect( m_table,       TQ_SIGNAL(insertPressed()),
+//              this,          TQ_SLOT(slotAddBlankBreakpoint()));
 
     // FIXME: maybe, all debugger components should derive from
     // a base class that does this connect.
-    connect(controller, TQT_SIGNAL(event(GDBController::event_t)),
-            this,       TQT_SLOT(slotEvent(GDBController::event_t)));
+    connect(controller, TQ_SIGNAL(event(GDBController::event_t)),
+            this,       TQ_SLOT(slotEvent(GDBController::event_t)));
 
     connect(controller,
-            TQT_SIGNAL(watchpointHit(int, const TQString&, const TQString&)),
+            TQ_SIGNAL(watchpointHit(int, const TQString&, const TQString&)),
             this,
-            TQT_SLOT(slotWatchpointHit(int, const TQString&, const TQString&)));
+            TQ_SLOT(slotWatchpointHit(int, const TQString&, const TQString&)));
 }
 
 /***************************************************************************/
@@ -453,8 +453,8 @@ BreakpointTableRow* GDBBreakpointWidget::addBreakpoint(Breakpoint *bp)
     BreakpointTableRow* btr =
         new BreakpointTableRow( m_table, TQTableItem::WhenCurrent, bp );
 
-    connect(bp, TQT_SIGNAL(modified(Breakpoint*)),
-            this, TQT_SLOT(slotBreakpointModified(Breakpoint*)));
+    connect(bp, TQ_SIGNAL(modified(Breakpoint*)),
+            this, TQ_SLOT(slotBreakpointModified(Breakpoint*)));
 
     sendToGdb(*bp);
 
@@ -1238,7 +1238,7 @@ TQWidget* ComplexEditCell::createEditor() const
     // than 20.
     b->setFixedWidth( 20 );
 
-    connect(b, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEdit()));
+    connect(b, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEdit()));
 
     return box;
 }
diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp
index bca8b98d..c89eb46b 100644
--- a/languages/cpp/debugger/gdbcontroller.cpp
+++ b/languages/cpp/debugger/gdbcontroller.cpp
@@ -798,17 +798,17 @@ bool GDBController::start(const TQString& shell, const DomUtil::PairList& run_en
 
     dbgProcess_ = new TDEProcess;
 
-    connect( dbgProcess_, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-             this,        TQT_SLOT(slotDbgStdout(TDEProcess *, char *, int)) );
+    connect( dbgProcess_, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+             this,        TQ_SLOT(slotDbgStdout(TDEProcess *, char *, int)) );
 
-    connect( dbgProcess_, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
-             this,        TQT_SLOT(slotDbgStderr(TDEProcess *, char *, int)) );
+    connect( dbgProcess_, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+             this,        TQ_SLOT(slotDbgStderr(TDEProcess *, char *, int)) );
 
-    connect( dbgProcess_, TQT_SIGNAL(wroteStdin(TDEProcess *)),
-             this,        TQT_SLOT(slotDbgWroteStdin(TDEProcess *)) );
+    connect( dbgProcess_, TQ_SIGNAL(wroteStdin(TDEProcess *)),
+             this,        TQ_SLOT(slotDbgWroteStdin(TDEProcess *)) );
 
-    connect( dbgProcess_, TQT_SIGNAL(processExited(TDEProcess*)),
-             this,        TQT_SLOT(slotDbgProcessExited(TDEProcess*)) );
+    connect( dbgProcess_, TQ_SIGNAL(processExited(TDEProcess*)),
+             this,        TQ_SLOT(slotDbgProcessExited(TDEProcess*)) );
 
     application_ = application;
 
@@ -1101,8 +1101,8 @@ void GDBController::slotRun()
         tty_ = new STTY(config_dbgTerminal_, Settings::terminalEmulatorName( *kapp->config() ));
         if (!config_dbgTerminal_)
         {
-            connect( tty_, TQT_SIGNAL(OutOutput(const char*)), TQT_SIGNAL(ttyStdout(const char*)) );
-            connect( tty_, TQT_SIGNAL(ErrOutput(const char*)), TQT_SIGNAL(ttyStderr(const char*)) );
+            connect( tty_, TQ_SIGNAL(OutOutput(const char*)), TQ_SIGNAL(ttyStdout(const char*)) );
+            connect( tty_, TQ_SIGNAL(ErrOutput(const char*)), TQ_SIGNAL(ttyStderr(const char*)) );
         }
 
         TQString tty(tty_->getSlave());
diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp
index deabf2c8..74ce3dc1 100644
--- a/languages/cpp/debugger/gdboutputwidget.cpp
+++ b/languages/cpp/debugger/gdboutputwidget.cpp
@@ -78,11 +78,11 @@ GDBOutputWidget::GDBOutputWidget( TQWidget *parent, const char *name) :
 
     slotDbgStatus( "", s_dbgNotStarted);
 
-    connect( m_userGDBCmdEditor, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotGDBCmd()) );
-    connect( m_Interrupt,        TQT_SIGNAL(clicked()),       TQT_SIGNAL(breakInto()));
+    connect( m_userGDBCmdEditor, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotGDBCmd()) );
+    connect( m_Interrupt,        TQ_SIGNAL(clicked()),       TQ_SIGNAL(breakInto()));
 
-    connect( &updateTimer_, TQT_SIGNAL(timeout()),
-             this,  TQT_SLOT(flushPending()));
+    connect( &updateTimer_, TQ_SIGNAL(timeout()),
+             this,  TQ_SLOT(flushPending()));
 }
 
 /***************************************************************************/
@@ -325,7 +325,7 @@ TQPopupMenu* OutputText::createPopupMenu(const TQPoint&)
 
     int id = popup->insertItem(i18n("Show Internal Commands"),
                                this,
-                               TQT_SLOT(toggleShowInternalCommands()));
+                               TQ_SLOT(toggleShowInternalCommands()));
 
     popup->setItemChecked(id, parent_->showInternalCommands_);
     popup->setWhatsThis(
@@ -338,7 +338,7 @@ TQPopupMenu* OutputText::createPopupMenu(const TQPoint&)
 
     popup->insertItem(i18n("Copy All"),
                       this,
-                      TQT_SLOT(copyAll()));
+                      TQ_SLOT(copyAll()));
 
 
     return popup;
diff --git a/languages/cpp/debugger/memviewdlg.cpp b/languages/cpp/debugger/memviewdlg.cpp
index 42ad9d4c..86f7e61c 100644
--- a/languages/cpp/debugger/memviewdlg.cpp
+++ b/languages/cpp/debugger/memviewdlg.cpp
@@ -116,11 +116,11 @@ namespace GDBDebugger
 
             l->addSpacing(2);
 
-            connect(startAddressLineEdit, TQT_SIGNAL(returnPressed()),
-                    okButton, TQT_SLOT(animateClick()));
+            connect(startAddressLineEdit, TQ_SIGNAL(returnPressed()),
+                    okButton, TQ_SLOT(animateClick()));
 
-            connect(amountLineEdit, TQT_SIGNAL(returnPressed()),
-                    okButton, TQT_SLOT(animateClick()));
+            connect(amountLineEdit, TQ_SIGNAL(returnPressed()),
+                    okButton, TQ_SLOT(animateClick()));
         }
     };
 
@@ -162,8 +162,8 @@ namespace GDBDebugger
             {
                 ok_ = true;
 
-                connect(real_widget, TQT_SIGNAL(bufferChanged(int, int)),
-                        this, TQT_SLOT(memoryEdited(int, int)));
+                connect(real_widget, TQ_SIGNAL(bufferChanged(int, int)),
+                        this, TQ_SLOT(memoryEdited(int, int)));
                 
                 khexedit2_real_widget = real_widget;
 
@@ -197,22 +197,22 @@ namespace GDBDebugger
             rangeSelector_ = new MemoryRangeSelector(this);
             l->addWidget(rangeSelector_);
             
-            connect(rangeSelector_->okButton, TQT_SIGNAL(clicked()),
-                    this,                     TQT_SLOT(slotChangeMemoryRange()));
+            connect(rangeSelector_->okButton, TQ_SIGNAL(clicked()),
+                    this,                     TQ_SLOT(slotChangeMemoryRange()));
             
             
-            connect(rangeSelector_->cancelButton,  TQT_SIGNAL(clicked()), 
-                    this,                         TQT_SLOT(slotHideRangeDialog()));
+            connect(rangeSelector_->cancelButton,  TQ_SIGNAL(clicked()), 
+                    this,                         TQ_SLOT(slotHideRangeDialog()));
             
             connect(rangeSelector_->startAddressLineEdit,
-                    TQT_SIGNAL(textChanged(const TQString&)),
+                    TQ_SIGNAL(textChanged(const TQString&)),
                     this,
-                    TQT_SLOT(slotEnableOrDisable()));
+                    TQ_SLOT(slotEnableOrDisable()));
             
             connect(rangeSelector_->amountLineEdit,
-                    TQT_SIGNAL(textChanged(const TQString&)),
+                    TQ_SIGNAL(textChanged(const TQString&)),
                     this,
-                    TQT_SLOT(slotEnableOrDisable()));
+                    TQ_SLOT(slotEnableOrDisable()));
 
             l->addWidget(khexedit2_widget);
 
@@ -436,11 +436,11 @@ namespace GDBDebugger
         toolBox_->setCurrentItem(widget);
         memoryViews_.push_back(widget);
 
-        connect(widget, TQT_SIGNAL(captionChanged(const TQString&)),
-                this, TQT_SLOT(slotChildCaptionChanged(const TQString&)));
+        connect(widget, TQ_SIGNAL(captionChanged(const TQString&)),
+                this, TQ_SLOT(slotChildCaptionChanged(const TQString&)));
 
-        connect(widget, TQT_SIGNAL(destroyed(TQObject*)),
-                this, TQT_SLOT(slotChildDestroyed(TQObject*)));
+        connect(widget, TQ_SIGNAL(destroyed(TQObject*)),
+                this, TQ_SLOT(slotChildDestroyed(TQObject*)));
     }
 
     void ViewerWidget::slotDebuggerState(const TQString&, int state)
diff --git a/languages/cpp/debugger/stty.cpp b/languages/cpp/debugger/stty.cpp
index 6960ad6d..9d95ad0d 100644
--- a/languages/cpp/debugger/stty.cpp
+++ b/languages/cpp/debugger/stty.cpp
@@ -132,7 +132,7 @@ STTY::STTY(bool ext, const TQString &termAppName)
         if (fout >= 0) {
             ttySlave = TQString(tty_slave);
             out = new TQSocketNotifier(fout, TQSocketNotifier::Read, this);
-            connect( out, TQT_SIGNAL(activated(int)), this, TQT_SLOT(OutReceived(int)) );
+            connect( out, TQ_SIGNAL(activated(int)), this, TQ_SLOT(OutReceived(int)) );
         }
     }
 }
diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp
index 5750d243..e46db5dc 100644
--- a/languages/cpp/debugger/variablewidget.cpp
+++ b/languages/cpp/debugger/variablewidget.cpp
@@ -104,14 +104,14 @@ VariableWidget::VariableWidget(GDBController*  controller,
     topLayout->addItem(buttons);
 
 
-    connect( addButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddWatchVariable()) );
-    connect( evalButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEvaluateExpression()) );
+    connect( addButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddWatchVariable()) );
+    connect( evalButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEvaluateExpression()) );
 
-    connect( watchVarEditor_, TQT_SIGNAL(returnPressed()),
-             TQT_SLOT(slotEvaluateExpression()) );
+    connect( watchVarEditor_, TQ_SIGNAL(returnPressed()),
+             TQ_SLOT(slotEvaluateExpression()) );
 
-    connect(controller, TQT_SIGNAL(event(GDBController::event_t)),
-            varTree_,       TQT_SLOT(slotEvent(GDBController::event_t)));
+    connect(controller, TQ_SIGNAL(event(GDBController::event_t)),
+            varTree_,       TQ_SLOT(slotEvent(GDBController::event_t)));
 
 
     // Setup help items.
@@ -223,10 +223,10 @@ VariableTree::VariableTree(VariableWidget *parent,
     addColumn(i18n("Value"));
 //     setResizeMode(AllColumns);
 
-    connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
-             TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*)) );
-    connect( this, TQT_SIGNAL(itemRenamed( TQListViewItem*, int, const TQString&)),
-             this, TQT_SLOT(slotItemRenamed( TQListViewItem*, int, const TQString&)));
+    connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+             TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*)) );
+    connect( this, TQ_SIGNAL(itemRenamed( TQListViewItem*, int, const TQString&)),
+             this, TQ_SLOT(slotItemRenamed( TQListViewItem*, int, const TQString&)));
 }
 
 // **************************************************************************
@@ -1085,9 +1085,9 @@ VarItem::VarItem(TrimmableItem *parent,
       baseClassMember_(false),
       alive_(true)
 {
-    connect(this, TQT_SIGNAL(varobjNameChange(const TQString&, const TQString&)),
+    connect(this, TQ_SIGNAL(varobjNameChange(const TQString&, const TQString&)),
             varTree(),
-            TQT_SLOT(slotVarobjNameChanged(const TQString&, const TQString&)));
+            TQ_SLOT(slotVarobjNameChanged(const TQString&, const TQString&)));
 
 
     // User might have entered format together with expression: like
@@ -1130,9 +1130,9 @@ VarItem::VarItem(TrimmableItem *parent, const GDBMI::Value& varobj,
   baseClassMember_(baseClassMember),
   alive_(true)
 {
-    connect(this, TQT_SIGNAL(varobjNameChange(const TQString&, const TQString&)),
+    connect(this, TQ_SIGNAL(varobjNameChange(const TQString&, const TQString&)),
             varTree(),
-            TQT_SLOT(slotVarobjNameChanged(const TQString&, const TQString&)));
+            TQ_SLOT(slotVarobjNameChanged(const TQString&, const TQString&)));
 
     expression_ = varobj["exp"].literal();
     varobjName_ = varobj["name"].literal();
diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
index cdaf65b9..f08703b0 100644
--- a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
@@ -45,10 +45,10 @@ SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl )
 
 	grid->addMultiCellWidget( elb, 3, 3, 0, grid->numCols() );
 
-	//	connect( dbName_edit, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( validate() ) );
-	connect( elb->addButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( validate() ) );
-	connect( elb->removeButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( validate() ) );
-	connect( elb, TQT_SIGNAL( added( const TQString& ) ), this, TQT_SLOT( validateDirectory( const TQString& ) ) );
+	//	connect( dbName_edit, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( validate() ) );
+	connect( elb->addButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( validate() ) );
+	connect( elb->removeButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( validate() ) );
+	connect( elb, TQ_SIGNAL( added( const TQString& ) ), this, TQ_SLOT( validateDirectory( const TQString& ) ) );
 }
 
 SettingsDialog::~SettingsDialog()
diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
index 2993c789..b79e4b17 100644
--- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
@@ -56,7 +56,7 @@ SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl )
 
 	qtUrl->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly );
 
-	connect( addUrlButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addUrlButton_clicked()) );
+	connect( addUrlButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addUrlButton_clicked()) );
 }
 
 SettingsDialog::~SettingsDialog()
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp
index 631d50d0..0c2ea291 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp
@@ -53,7 +53,7 @@ SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl )
 
 	kdeUrl->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly );
 
-	connect( addUrlButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addUrlButton_clicked()) );
+	connect( addUrlButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addUrlButton_clicked()) );
 }
 
 SettingsDialog::~SettingsDialog()
diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp
index 49cb66f7..34a7fd9e 100644
--- a/languages/cpp/problemreporter.cpp
+++ b/languages/cpp/problemreporter.cpp
@@ -96,7 +96,7 @@ m_markIface( 0 )
 	                           "<tt>//FIXME fix this</tt>"));
 
 	m_initCurrentTimer = new TQTimer( this );
-	connect( m_initCurrentTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(initCurrentList()) );
+	connect( m_initCurrentTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(initCurrentList()) );
 	m_gridLayout = new TQGridLayout(this,2,3);
 
 	m_errorList = new TDEListView(this);
@@ -145,16 +145,16 @@ m_markIface( 0 )
 	m_gridLayout->addWidget(m_filterLabel,0,1,TQt::AlignRight);
 	m_gridLayout->addWidget(m_filterEdit,0,2,TQt::AlignLeft);
 
-	connect( m_filterEdit, TQT_SIGNAL(returnPressed()),
-	         this, TQT_SLOT(slotFilter()) );
-	connect( m_filterEdit, TQT_SIGNAL(textChanged( const TQString & )),
-	         this, TQT_SLOT(slotFilter()) );
-	connect( m_tabBar, TQT_SIGNAL(selected(int)),
-	         this, TQT_SLOT(slotTabSelected(int)) );
-	connect( part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
-	         this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) );
-	connect( part->partController(), TQT_SIGNAL(partAdded(KParts::Part*)),
-	         this, TQT_SLOT(slotPartAdded(KParts::Part*)) );
+	connect( m_filterEdit, TQ_SIGNAL(returnPressed()),
+	         this, TQ_SLOT(slotFilter()) );
+	connect( m_filterEdit, TQ_SIGNAL(textChanged( const TQString & )),
+	         this, TQ_SLOT(slotFilter()) );
+	connect( m_tabBar, TQ_SIGNAL(selected(int)),
+	         this, TQ_SLOT(slotTabSelected(int)) );
+	connect( part->partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)),
+	         this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) );
+	connect( part->partController(), TQ_SIGNAL(partAdded(KParts::Part*)),
+	         this, TQ_SLOT(slotPartAdded(KParts::Part*)) );
 
 	// any editors that were open when we loaded the project needs to have their markType07 icon set too..
 	TQPtrListIterator<KParts::Part> it( *m_cppSupport->partController()->parts() );
@@ -225,11 +225,11 @@ void ProblemReporter::InitListView(TDEListView* listview)
 	listview->addColumn( i18n("Problem") );
 	listview->setAllColumnsShowFocus( TRUE );
 
-	connect( listview, TQT_SIGNAL(executed(TQListViewItem*)),
-	         this, TQT_SLOT(slotSelected(TQListViewItem*)) );
+	connect( listview, TQ_SIGNAL(executed(TQListViewItem*)),
+	         this, TQ_SLOT(slotSelected(TQListViewItem*)) );
 
-	connect( listview, TQT_SIGNAL(returnPressed(TQListViewItem*)),
-	         this, TQT_SLOT(slotSelected(TQListViewItem* )) );
+	connect( listview, TQ_SIGNAL(returnPressed(TQListViewItem*)),
+	         this, TQ_SLOT(slotSelected(TQListViewItem* )) );
 
 }