Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

20 files changed, 163 insertions, 163 deletions

diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
index a8175d2..24153a4 100644
--- a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
+++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
@@ -55,7 +55,7 @@ K_EXPORT_COMPONENT_FACTORY( katecppsymbolviewerplugin, KGenericFactory<KatePlugi
 KatePluginSymbolViewerView::KatePluginSymbolViewerView(Kate::MainWindow *w)
 {
     TDEGlobal::locale()->insertCatalogue("katecppsymbolviewer");
-    TDEToggleAction* act = new TDEToggleAction ( i18n("Hide Symbols"), 0, this, TQT_SLOT( slotInsertSymbol() ), actionCollection(),      "view_insert_symbolviewer" );
+    TDEToggleAction* act = new TDEToggleAction ( i18n("Hide Symbols"), 0, this, TQ_SLOT( slotInsertSymbol() ), actionCollection(),      "view_insert_symbolviewer" );
     act->setCheckedState(i18n("Show Symbols"));
 
     setInstance (new TDEInstance("kate"));
@@ -66,14 +66,14 @@ KatePluginSymbolViewerView::KatePluginSymbolViewerView(Kate::MainWindow *w)
 
  m_Active = false;
  popup = new TQPopupMenu();
- popup->insertItem(i18n("Refresh List"), this, TQT_SLOT(slotRefreshSymbol()));
+ popup->insertItem(i18n("Refresh List"), this, TQ_SLOT(slotRefreshSymbol()));
  popup->insertSeparator();
- m_macro = popup->insertItem(i18n("Show Macros"), this, TQT_SLOT(toggleShowMacros()));
- m_struct = popup->insertItem(i18n("Show Structures"), this, TQT_SLOT(toggleShowStructures()));
- m_func = popup->insertItem(i18n("Show Functions"), this, TQT_SLOT(toggleShowFunctions()));
+ m_macro = popup->insertItem(i18n("Show Macros"), this, TQ_SLOT(toggleShowMacros()));
+ m_struct = popup->insertItem(i18n("Show Structures"), this, TQ_SLOT(toggleShowStructures()));
+ m_func = popup->insertItem(i18n("Show Functions"), this, TQ_SLOT(toggleShowFunctions()));
  popup->insertSeparator();
- popup->insertItem(i18n("List/Tree Mode"), this, TQT_SLOT(slotChangeMode()));
- m_sort = popup->insertItem(i18n("Enable sorting"), this, TQT_SLOT(slotEnableSorting()));
+ popup->insertItem(i18n("List/Tree Mode"), this, TQ_SLOT(slotChangeMode()));
+ m_sort = popup->insertItem(i18n("Enable sorting"), this, TQ_SLOT(slotEnableSorting()));
 
  popup->setItemChecked(m_macro, true);
  popup->setItemChecked(m_struct, true);
@@ -126,11 +126,11 @@ void KatePluginSymbolViewerView::slotInsertSymbol()
       symbols = new TDEListView(dock);
       treeMode = 0;
 
-      connect(symbols, TQT_SIGNAL(executed(TQListViewItem *)), this, TQT_SLOT(goToSymbol(TQListViewItem *)));
-      connect(symbols, TQT_SIGNAL(rightButtonClicked(TQListViewItem *, const TQPoint&, int)),
-               TQT_SLOT(slotShowContextMenu(TQListViewItem *, const TQPoint&, int)));
-      connect(win->viewManager(), TQT_SIGNAL(viewChanged()), this, TQT_SLOT(slotDocChanged()));
-      //connect(symbols, TQT_SIGNAL(resizeEvent(TQResizeEvent *)), this, TQT_SLOT(slotViewChanged(TQResizeEvent *)));
+      connect(symbols, TQ_SIGNAL(executed(TQListViewItem *)), this, TQ_SLOT(goToSymbol(TQListViewItem *)));
+      connect(symbols, TQ_SIGNAL(rightButtonClicked(TQListViewItem *, const TQPoint&, int)),
+               TQ_SLOT(slotShowContextMenu(TQListViewItem *, const TQPoint&, int)));
+      connect(win->viewManager(), TQ_SIGNAL(viewChanged()), this, TQ_SLOT(slotDocChanged()));
+      //connect(symbols, TQ_SIGNAL(resizeEvent(TQResizeEvent *)), this, TQ_SLOT(slotViewChanged(TQResizeEvent *)));
 
       m_Active = true;
       //symbols->addColumn(i18n("Symbols"), symbols->parentWidget()->width());
@@ -280,8 +280,8 @@ Kate::PluginConfigPage* KatePluginSymbolViewer::configPage(
 {
   KatePluginSymbolViewerConfigPage* p = new KatePluginSymbolViewerConfigPage(this, w);
   initConfigPage( p );
-  connect( p, TQT_SIGNAL(configPageApplyRequest(KatePluginSymbolViewerConfigPage*)),
-      TQT_SLOT(applyConfig(KatePluginSymbolViewerConfigPage *)) );
+  connect( p, TQ_SIGNAL(configPageApplyRequest(KatePluginSymbolViewerConfigPage*)),
+      TQ_SLOT(applyConfig(KatePluginSymbolViewerConfigPage *)) );
   return (Kate::PluginConfigPage*)p;
 }
 
@@ -323,8 +323,8 @@ KatePluginSymbolViewerConfigPage::KatePluginSymbolViewerConfigPage(
   top->add(gb);
   top->addStretch(1);
 //  throw signal changed
-  connect(viewReturns, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed()));
-  connect(expandTree, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed()));
+  connect(viewReturns, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(changed()));
+  connect(expandTree, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(changed()));
 }
 
 KatePluginSymbolViewerConfigPage::~KatePluginSymbolViewerConfigPage() {}
diff --git a/kate/filelistloader/katefll_initplugin.cpp b/kate/filelistloader/katefll_initplugin.cpp
index 7837b33..e7d56c1 100644
--- a/kate/filelistloader/katefll_initplugin.cpp
+++ b/kate/filelistloader/katefll_initplugin.cpp
@@ -79,11 +79,11 @@ int InitPluginKateFileListLoader::initKate()
 	Kate::Plugin *pl=application()->pluginManager()->plugin("katefll_plugin");
 	if (pl) 
 	{
-			connect(this,TQT_SIGNAL(updateInit()),pl,TQT_SLOT(updateInit()));
+			connect(this,TQ_SIGNAL(updateInit()),pl,TQ_SLOT(updateInit()));
 			updateInit();
-			disconnect(this,TQT_SIGNAL(updateInit()),pl,TQT_SLOT(updateInit()));
+			disconnect(this,TQ_SIGNAL(updateInit()),pl,TQ_SLOT(updateInit()));
 			
-/*      		int id = pl->metaObject()->findSlot( TQT_SLOT(updateInit()) );
+/*      		int id = pl->metaObject()->findSlot( TQ_SLOT(updateInit()) );
 	        if ( id != -1 )
 		{
         		kdDebug()<<"Action slot was found, it will be called now"<<endl;
diff --git a/kate/filelistloader/katefll_plugin.cpp b/kate/filelistloader/katefll_plugin.cpp
index 381c5b1..916e73a 100644
--- a/kate/filelistloader/katefll_plugin.cpp
+++ b/kate/filelistloader/katefll_plugin.cpp
@@ -75,20 +75,20 @@ void PluginKateFileListLoader::addView(Kate::MainWindow *win)
   PluginView *view = new PluginView ();
 
   (void) new TDEAction( i18n("Open File List..."), 0,
-    this, TQT_SLOT( slotOpenList() ),
+    this, TQ_SLOT( slotOpenList() ),
     view->actionCollection(), "file_kfllopen" );
 
   view->recentFiles = new TDERecentFilesAction( i18n("Open Recent"), TDEShortcut::null(),
-    this, TQT_SLOT(slotOpenList(const KURL&)), view->actionCollection(),
+    this, TQ_SLOT(slotOpenList(const KURL&)), view->actionCollection(),
     "file_kfllopenrecent");
   view->recentFiles->loadEntries(m_config, "Recent Files");
 
   (void) new TDEAction( i18n("Save File List"), 0,
-    this, TQT_SLOT( slotSaveList() ),
+    this, TQ_SLOT( slotSaveList() ),
     view->actionCollection(), "file_kfllsave" );
 
   (void) new TDEAction( i18n("Save File List As..."), 0,
-    this, TQT_SLOT( slotSaveListAs() ),
+    this, TQ_SLOT( slotSaveListAs() ),
     view->actionCollection(), "file_kfllsaveas" );
 
   view->setInstance (new TDEInstance("kate"));
diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp
index 6604461..68076fd 100644
--- a/kate/filetemplates/plugin/filetemplates.cpp
+++ b/kate/filetemplates/plugin/filetemplates.cpp
@@ -133,11 +133,11 @@ KateFileTemplates::KateFileTemplates( TQObject* parent, const char* name )
   // We plug them into each view's menus, and update them centrally, so that
   // new plugins can automatically become visible in all windows.
   (void) new TDEAction ( i18n("Any File..."), 0, this,
-                        TQT_SLOT( slotAny() ), m_actionCollection,
+                        TQ_SLOT( slotAny() ), m_actionCollection,
                         "file_template_any" );
   // recent templates
   m_acRecentTemplates = new TDERecentFilesAction( i18n("&Use Recent"), 0, this,
-                        TQT_SLOT(slotOpenTemplate(const KURL &)),
+                        TQ_SLOT(slotOpenTemplate(const KURL &)),
                         m_actionCollection,
                         "file_templates_recent" );
   m_acRecentTemplates->loadEntries( kapp->config(), "Recent Templates" );
@@ -150,12 +150,12 @@ KateFileTemplates::KateFileTemplates( TQObject* parent, const char* name )
     m_dw->addDir( *it, true );
   }
 
-  connect( m_dw, TQT_SIGNAL(dirty(const TQString&)),
-           this, TQT_SLOT(updateTemplateDirs(const TQString&)) );
-  connect( m_dw, TQT_SIGNAL(created(const TQString&)),
-           this, TQT_SLOT(updateTemplateDirs(const TQString&)) );
-  connect( m_dw, TQT_SIGNAL(deleted(const TQString&)),
-           this, TQT_SLOT(updateTemplateDirs(const TQString&)) );
+  connect( m_dw, TQ_SIGNAL(dirty(const TQString&)),
+           this, TQ_SLOT(updateTemplateDirs(const TQString&)) );
+  connect( m_dw, TQ_SIGNAL(created(const TQString&)),
+           this, TQ_SLOT(updateTemplateDirs(const TQString&)) );
+  connect( m_dw, TQ_SIGNAL(deleted(const TQString&)),
+           this, TQ_SLOT(updateTemplateDirs(const TQString&)) );
 
   m_templates.setAutoDelete( true );
   updateTemplateDirs();
@@ -249,7 +249,7 @@ void KateFileTemplates::addView(Kate::MainWindow *win)
   PluginView *view = new PluginView ();
 
   (void) new TDEAction( i18n("&Manage Templates..."), 0,
-      this, TQT_SLOT(slotEditTemplate()),
+      this, TQ_SLOT(slotEditTemplate()),
       view->actionCollection(), "settings_manage_templates" );
 
   (void)new TDEActionMenu( i18n("New From &Template"), "text-x-makefile",
@@ -316,10 +316,10 @@ void KateFileTemplates::refreshMenu( PluginView *v )
     if ( ! m_templates.at( i )->icon.isEmpty() )
       submenus[m_templates.at( i )->group]->insertItem(
         SmallIconSet( m_templates.at( i )->icon ),
-        m_templates.at( i )->tmplate, this, TQT_SLOT(slotOpenTemplate( int )), 0, i );
+        m_templates.at( i )->tmplate, this, TQ_SLOT(slotOpenTemplate( int )), 0, i );
     else
       submenus[m_templates.at( i )->group]->insertItem(
-        m_templates.at( i )->tmplate, this, TQT_SLOT(slotOpenTemplate( int )), 0, i );
+        m_templates.at( i )->tmplate, this, TQ_SLOT(slotOpenTemplate( int )), 0, i );
 
     // add whatsthis containing the description and author
     TQString w ( m_templates.at( i )->description );
@@ -623,7 +623,7 @@ KateTemplateInfoWidget::KateTemplateInfoWidget( TQWidget *parent, TemplateInfo *
   if ( doc )
   {
     TQPopupMenu *m = new TQPopupMenu( btnHighlight );
-    connect( m, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotHlSet( int ) ) );
+    connect( m, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotHlSet( int ) ) );
     TQDict<TQPopupMenu> submenus;
     for ( uint n = 0; n < doc->hlModeCount(); n++ )
     {
@@ -635,7 +635,7 @@ KateTemplateInfoWidget::KateTemplateInfoWidget( TQWidget *parent, TemplateInfo *
         {
           TQPopupMenu *sm = new TQPopupMenu();
           submenus.insert( text, sm );
-          connect( sm, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotHlSet( int ) ) );
+          connect( sm, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotHlSet( int ) ) );
           m->insertItem( text, sm );
         }
 
@@ -699,7 +699,7 @@ KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft
   btnTmpl = new TQPushButton( page );
   glo->addWidget( btnTmpl, 6, 2 );
   TQPopupMenu *m = new TQPopupMenu( btnTmpl );
-  connect( m, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotTmplateSet( int ) ) );
+  connect( m, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotTmplateSet( int ) ) );
 
   TQDict<TQPopupMenu> submenus;
   for ( uint i = 0; i < kft->templates().count(); i++ )
@@ -707,7 +707,7 @@ KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft
     if ( ! submenus[ kft->templates().at( i )->group ] )
     {
       TQPopupMenu *sm = new TQPopupMenu();
-      connect( sm, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotTmplateSet( int ) ) );
+      connect( sm, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotTmplateSet( int ) ) );
       submenus.insert( kft->templates().at( i )->group, sm );
       m->insertItem( kft->templates().at( i )->group, sm );
     }
@@ -717,8 +717,8 @@ KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft
   }
   btnTmpl->setPopup( m );
 
-  connect( bgOrigin, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotStateChanged(int)) );
-  connect( urOrigin, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotStateChanged(const TQString&)) );
+  connect( bgOrigin, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotStateChanged(int)) );
+  connect( urOrigin, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotStateChanged(const TQString&)) );
 
   glo->addMultiCell( new TQSpacerItem( 1, 1, TQSizePolicy::Expanding, TQSizePolicy::Expanding ), 7, 7, 1, 2 );
 
@@ -775,9 +775,9 @@ KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft
   urLocation = new KURLRequester( page );
   glo->addWidget( urLocation, 6, 2 );
 
-  connect( bgLocation, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotStateChanged(int)) );
-  connect( urLocation, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotStateChanged(const TQString&)) );
-  connect( leTemplateFileName, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotStateChanged(const TQString &)) );
+  connect( bgLocation, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotStateChanged(int)) );
+  connect( urLocation, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotStateChanged(const TQString&)) );
+  connect( leTemplateFileName, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotStateChanged(const TQString &)) );
 
   glo->addMultiCell( new TQSpacerItem( 1, 1, TQSizePolicy::Expanding, TQSizePolicy::Expanding ), 7, 7, 1, 2 );
 
@@ -827,7 +827,7 @@ KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft
 
   addPage( page, i18n("Create Template") );
   kdDebug()<<"=== Adding summary page at "<<endl;
-  connect( this, TQT_SIGNAL(selected(const TQString&)), this, TQT_SLOT(slotStateChanged(const TQString&)) );
+  connect( this, TQ_SIGNAL(selected(const TQString&)), this, TQ_SLOT(slotStateChanged(const TQString&)) );
 }
 
 void KateTemplateWizard::slotTmplateSet( int idx )
@@ -1108,26 +1108,26 @@ KateTemplateManager::KateTemplateManager( KateFileTemplates *kft, TQWidget *pare
   lvTemplates = new TDEListView( this );
   lvTemplates->addColumn( i18n("Template") );
   lo->addMultiCellWidget( lvTemplates, 1, 1, 1, 6 );
-  connect( lvTemplates, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotUpdateState()) );
+  connect( lvTemplates, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotUpdateState()) );
 
   btnNew = new TQPushButton( i18n("New..."), this );
-  connect( btnNew, TQT_SIGNAL(clicked()), kft, TQT_SLOT(slotCreateTemplate()) );
+  connect( btnNew, TQ_SIGNAL(clicked()), kft, TQ_SLOT(slotCreateTemplate()) );
   lo->addWidget( btnNew, 2, 2 );
 
   btnEdit = new TQPushButton( i18n("Edit..."), this );
-  connect( btnEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotEditTemplate()) );
+  connect( btnEdit, TQ_SIGNAL(clicked()), this, TQ_SLOT( slotEditTemplate()) );
   lo->addWidget( btnEdit, 2, 3 );
 
   btnRemove = new TQPushButton( i18n("Remove"), this );
-  connect( btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveTemplate()) );
+  connect( btnRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveTemplate()) );
   lo->addWidget( btnRemove, 2, 4 );
 
   btnUpload = new TQPushButton( i18n("Upload..."), this );
-  connect( btnUpload, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpload()) );
+  connect( btnUpload, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUpload()) );
   lo->addWidget( btnUpload, 2, 5 );
 
   btnDownload = new TQPushButton( i18n("Download..."), this );
-  connect( btnDownload, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDownload()) );
+  connect( btnDownload, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDownload()) );
   lo->addWidget( btnDownload, 2, 6 );
 
   lo->setColStretch( 1, 1 );
diff --git a/kate/helloworld/plugin_katehelloworld.cpp b/kate/helloworld/plugin_katehelloworld.cpp
index 45424ab..5b32af4 100644
--- a/kate/helloworld/plugin_katehelloworld.cpp
+++ b/kate/helloworld/plugin_katehelloworld.cpp
@@ -31,7 +31,7 @@ void KatePluginHelloWorld::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_helloworld" );
     
     view->setInstance (new TDEInstance("kate"));
diff --git a/kate/htmltools/plugin_katehtmltools.cpp b/kate/htmltools/plugin_katehtmltools.cpp
index d6fc512..3ab22e4 100644
--- a/kate/htmltools/plugin_katehtmltools.cpp
+++ b/kate/htmltools/plugin_katehtmltools.cpp
@@ -51,7 +51,7 @@ void PluginKateHtmlTools::addView(Kate::MainWindow *win)
     PluginView *view = new PluginView ();
 
      (void)  new TDEAction ( i18n("HT&ML Tag..."), /*"edit_HTML_tag",*/ ALT + Key_Minus, this,
-                                TQT_SLOT( slotEditHTMLtag() ), view->actionCollection(), "edit_HTML_tag" );
+                                TQ_SLOT( slotEditHTMLtag() ), view->actionCollection(), "edit_HTML_tag" );
 
     view->setInstance (new TDEInstance("kate"));
     view->setXMLFile( "plugins/katehtmltools/ui.rc" );
diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp
index cdbe0a2..c83a751 100644
--- a/kate/insertcommand/plugin_kateinsertcommand.cpp
+++ b/kate/insertcommand/plugin_kateinsertcommand.cpp
@@ -84,7 +84,7 @@ void PluginKateInsertCommand::addView(Kate::MainWindow *win)
     PluginView *view = new PluginView ();
 
     (void) new TDEAction ( i18n("Insert Command..."), "", 0, this,
-                      TQT_SLOT( slotInsertCommand() ), view->actionCollection(),
+                      TQ_SLOT( slotInsertCommand() ), view->actionCollection(),
                       "edit_insert_command" );
 
     view->setInstance (new TDEInstance("kate"));
@@ -148,12 +148,12 @@ void PluginKateInsertCommand::slotInsertCommand()
     if ( ! sh ) {
     sh = new KShellProcess;
 
-    connect ( sh, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
-              this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)) );
-    connect ( sh, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
-              this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)) );
-    connect ( sh, TQT_SIGNAL(processExited(TDEProcess*)),
-              this, TQT_SLOT(slotProcessExited(TDEProcess*)) ) ;
+    connect ( sh, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+              this, TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int)) );
+    connect ( sh, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+              this, TQ_SLOT(slotReceivedStderr(TDEProcess*, char*, int)) );
+    connect ( sh, TQ_SIGNAL(processExited(TDEProcess*)),
+              this, TQ_SLOT(slotProcessExited(TDEProcess*)) ) ;
     }
 
     sh->clearArguments();
@@ -209,7 +209,7 @@ void PluginKateInsertCommand::slotShowWaitDlg()
     if ( sh->isRunning() ) {
       wdlg = new WaitDlg( (TQWidget*)kv, i18n(
         "Executing command:\n%1\n\nPress 'Cancel' to abort.").arg(cmd)  );
-      connect(wdlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotAbort()) );
+      connect(wdlg, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotAbort()) );
     }
     if ( sh->isRunning() )    // we may have finished while creating the dialog.
       wdlg->show();
@@ -254,8 +254,8 @@ Kate::PluginConfigPage* PluginKateInsertCommand::configPage (uint,
 {
   InsertCommandConfigPage* p = new InsertCommandConfigPage(this, w);
   initConfigPage( p );
-  connect( p, TQT_SIGNAL(configPageApplyRequest(InsertCommandConfigPage*)),
-           this, TQT_SLOT(applyConfig(InsertCommandConfigPage*)) );
+  connect( p, TQ_SIGNAL(configPageApplyRequest(InsertCommandConfigPage*)),
+           this, TQ_SLOT(applyConfig(InsertCommandConfigPage*)) );
   return (Kate::PluginConfigPage*)p;
 }
 
@@ -299,8 +299,8 @@ CmdPrompt::CmdPrompt(TQWidget* parent,
    l->setBuddy(cmb_cmd);
    cmb_cmd->setFocus();
    lo->addWidget(cmb_cmd);
-   connect( cmb_cmd->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )),
-            this, TQT_SLOT( slotTextChanged(const TQString &)));
+   connect( cmb_cmd->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )),
+            this, TQ_SLOT( slotTextChanged(const TQString &)));
 
    TQLabel *lwd = new TQLabel( i18n("Choose &working folder:"), page );
    lo->addWidget( lwd );
diff --git a/kate/katesort/plugin_sort.cpp b/kate/katesort/plugin_sort.cpp
index fa55734..38dd4b1 100644
--- a/kate/katesort/plugin_sort.cpp
+++ b/kate/katesort/plugin_sort.cpp
@@ -77,7 +77,7 @@ void KatePluginSort::addView(Kate::MainWindow *win)
     PluginView *view = new PluginView ();
 
      (void) new TDEAction ( i18n("Sort"), 0, this,
-                      SLOT( slotSort() ), view->actionCollection(),
+                      TQ_SLOT( slotSort() ), view->actionCollection(),
                       "edit_insert_sort" );
 
     view->setInstance (new TDEInstance("kate"));
diff --git a/kate/kjswrapper/bindings.cpp b/kate/kjswrapper/bindings.cpp
index 13af0c7..be8a1ae 100644
--- a/kate/kjswrapper/bindings.cpp
+++ b/kate/kjswrapper/bindings.cpp
@@ -394,7 +394,7 @@ KJS::Object  Kate::JS::RefCountedObjectDict::jsObject(KJS::ExecState *exec, TQOb
 	if (oe==0) {
 		oe=new ObjectEntry;
 		oe->obj=proxy->part()->factory()->createProxy(exec,obj,proxy);
-		connect(obj,TQT_SIGNAL(destroyed()),this,TQT_SLOT(removeSender()));
+		connect(obj,TQ_SIGNAL(destroyed()),this,TQ_SLOT(removeSender()));
 		insert(obj,oe);
 		return oe->obj;
 	} else return oe->obj;
diff --git a/kate/kjswrapper/plugin_katekjswrapper.cpp b/kate/kjswrapper/plugin_katekjswrapper.cpp
index 04b5a96..7dd33c4 100644
--- a/kate/kjswrapper/plugin_katekjswrapper.cpp
+++ b/kate/kjswrapper/plugin_katekjswrapper.cpp
@@ -197,8 +197,8 @@ Kate::PluginConfigPage* PluginKateKJSWrapper::configPage (uint id,
 /*
   KateKJSWrapperConfigPage* p = new KateKJSWrapperConfigPage(this, w);
   //init
-  connect( p, TQT_SIGNAL(configPageApplyRequest(KateKJSWrapperConfigPage*)), 
-           this, TQT_SLOT(applyConfig(KateKJSWrapperConfigPage*)) );
+  connect( p, TQ_SIGNAL(configPageApplyRequest(KateKJSWrapperConfigPage*)), 
+           this, TQ_SLOT(applyConfig(KateKJSWrapperConfigPage*)) );
   return (Kate::PluginConfigPage*);*/
 }
 
@@ -260,7 +260,7 @@ PluginKateKJSWrapperView *PluginKateKJSWrapper::getViewObject(Kate::MainWindow *
     if (!view) {
     	view=new PluginKateKJSWrapperView();
     	view->win=win;
-	connect(win,TQT_SIGNAL(destroyed()),this,TQT_SLOT(slotWindowDestroyed()));
+	connect(win,TQ_SIGNAL(destroyed()),this,TQ_SLOT(slotWindowDestroyed()));
     	m_views.insert(win,view);
         KJS::Interpreter *js = m_part->interpreter();
         KJS::ExecState *exec = js->globalExec();
diff --git a/kate/kpybrowser/kpybrowser.cpp b/kate/kpybrowser/kpybrowser.cpp
index f7cef15..b1fa86a 100644
--- a/kate/kpybrowser/kpybrowser.cpp
+++ b/kate/kpybrowser/kpybrowser.cpp
@@ -196,8 +196,8 @@ TDEListView (parent, name)
 		      PYOTHER);
   function_root->setPixmap (0, TQPixmap (container_xpm));
   setRootIsDecorated (1);
-  connect (this, TQT_SIGNAL (executed (TQListViewItem *)), this,
-	   TQT_SLOT (nodeSelected (TQListViewItem *)));
+  connect (this, TQ_SIGNAL (executed (TQListViewItem *)), this,
+	   TQ_SLOT (nodeSelected (TQListViewItem *)));
   setTooltipColumn (1);
   setShowToolTips (1);
   tooltip = new KPBToolTip (this);
diff --git a/kate/kpybrowser/pybrowse_part.cpp b/kate/kpybrowser/pybrowse_part.cpp
index af71679..2729533 100644
--- a/kate/kpybrowser/pybrowse_part.cpp
+++ b/kate/kpybrowser/pybrowse_part.cpp
@@ -34,7 +34,7 @@ PluginViewPyBrowse::PluginViewPyBrowse (Kate::MainWindow *w)
  : win (w)
 {
    (void) new TDEAction ( i18n("Update Python Browser"), 0, this,
-                      TQT_SLOT( slotUpdatePyBrowser() ), actionCollection(),
+                      TQ_SLOT( slotUpdatePyBrowser() ), actionCollection(),
                       "python_update_pybrowse" );
 
    //set up the menus
@@ -53,7 +53,7 @@ PluginViewPyBrowse::PluginViewPyBrowse (Kate::MainWindow *w)
    my_dock = tool_view_manager->createToolView("kate_plugin_kpybrowser", Kate::ToolViewManager::Left, (*py_pixmap), i18n("Python Browser"));
    kpybrowser = new KPyBrowser(my_dock, "kpybrowser");
 
-   connect(kpybrowser, TQT_SIGNAL(selected(TQString, int)), this, TQT_SLOT(slotSelected(TQString, int)));
+   connect(kpybrowser, TQ_SIGNAL(selected(TQString, int)), this, TQ_SLOT(slotSelected(TQString, int)));
 }
 
 PluginViewPyBrowse::~PluginViewPyBrowse ()
diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp
index b6c2084..d935fa7 100644
--- a/kate/make/plugin_katemake.cpp
+++ b/kate/make/plugin_katemake.cpp
@@ -334,19 +334,19 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent,
 
 	m_proc=0;
 	(void) new TDEAction ( i18n("Next Error"), TDEShortcut(ALT+CTRL+Key_Right),
-		this, TQT_SLOT( slotNext() ),
+		this, TQ_SLOT( slotNext() ),
 		actionCollection(), "make_right" );
 
 	(void) new TDEAction ( i18n("Previous Error"), TDEShortcut(ALT+CTRL+Key_Left),
-		this, TQT_SLOT( slotPrev() ),
+		this, TQ_SLOT( slotPrev() ),
 		actionCollection(), "make_left" );
 
 	(void) new TDEAction ( i18n("Make"), TDEShortcut(ALT+Key_R),
-		this, TQT_SLOT( slotValidate() ),
+		this, TQ_SLOT( slotValidate() ),
 		actionCollection(), "make_check" );
 
 	(void) new TDEAction ( i18n("Configure..."), TDEShortcut(),
-		this, TQT_SLOT( slotConfigure() ),
+		this, TQ_SLOT( slotConfigure() ),
 		actionCollection(), "make_settings" );
 
 	setInstance(new TDEInstance("kate"));
@@ -362,13 +362,13 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent,
 	addColumn(i18n("Message"), -1);
 	setAllColumnsShowFocus(true);
 	setResizeMode(TQListView::LastColumn);
-	connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(slotClicked(TQListViewItem *)));
+	connect(this, TQ_SIGNAL(clicked(TQListViewItem *)), TQ_SLOT(slotClicked(TQListViewItem *)));
 
 	m_proc = new TDEProcess();
 
-	connect(m_proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcExited(TDEProcess*)));
-	connect(m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
-		this, TQT_SLOT(slotReceivedProcStderr(TDEProcess*, char*, int)));
+	connect(m_proc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotProcExited(TDEProcess*)));
+	connect(m_proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+		this, TQ_SLOT(slotReceivedProcStderr(TDEProcess*, char*, int)));
 
 
 	TDEConfig c("katemakepluginrc");
diff --git a/kate/modeline/ModelinePlugin.cpp b/kate/modeline/ModelinePlugin.cpp
index b077ccf..0be6fce 100644
--- a/kate/modeline/ModelinePlugin.cpp
+++ b/kate/modeline/ModelinePlugin.cpp
@@ -56,7 +56,7 @@ void ModelinePlugin::addView(Kate::MainWindow *win)
     PluginView *view = new PluginView ();
                
     new TDEAction( i18n("Apply Modeline"), 0,
-		this, TQT_SLOT(applyModeline()),
+		this, TQ_SLOT(applyModeline()),
 		view->actionCollection(), "edit_apply_modeline" );   
        
     view->setInstance (new TDEInstance("kate"));
diff --git a/kate/openheader/plugin_kateopenheader.cpp b/kate/openheader/plugin_kateopenheader.cpp
index 8e98207..77233a5 100644
--- a/kate/openheader/plugin_kateopenheader.cpp
+++ b/kate/openheader/plugin_kateopenheader.cpp
@@ -51,7 +51,7 @@ void PluginKateOpenHeader::addView(Kate::MainWindow *win)
     PluginView *view = new PluginView ();
 
     (void) new TDEAction( i18n("Open .h/.cpp/.c"), Key_F12,
-      this, TQT_SLOT( slotOpenHeader() ),
+      this, TQ_SLOT( slotOpenHeader() ),
       view->actionCollection(), "file_openheader" );
 
     view->setInstance (new TDEInstance("kate"));
diff --git a/kate/snippets/plugin_katesnippets.cpp b/kate/snippets/plugin_katesnippets.cpp
index f6c173e..5249a44 100644
--- a/kate/snippets/plugin_katesnippets.cpp
+++ b/kate/snippets/plugin_katesnippets.cpp
@@ -35,29 +35,29 @@ KatePluginSnippetsView::KatePluginSnippetsView(Kate::MainWindow *w, TQWidget *do
 
   //<make connections>
   connect (
-    lvSnippets, TQT_SIGNAL( selectionChanged(TQListViewItem *) ),
-    this, TQT_SLOT( slot_lvSnippetsSelectionChanged(TQListViewItem *) )
+    lvSnippets, TQ_SIGNAL( selectionChanged(TQListViewItem *) ),
+    this, TQ_SLOT( slot_lvSnippetsSelectionChanged(TQListViewItem *) )
   );
   connect (
-    lvSnippets, TQT_SIGNAL( doubleClicked (TQListViewItem *) ),
-    this, TQT_SLOT( slot_lvSnippetsClicked(TQListViewItem  *) )
+    lvSnippets, TQ_SIGNAL( doubleClicked (TQListViewItem *) ),
+    this, TQ_SLOT( slot_lvSnippetsClicked(TQListViewItem  *) )
   );
   connect (
-    lvSnippets, TQT_SIGNAL( itemRenamed(TQListViewItem *, int, const TQString &) ),
-    this, TQT_SLOT( slot_lvSnippetsItemRenamed(TQListViewItem *, int, const TQString &) )
+    lvSnippets, TQ_SIGNAL( itemRenamed(TQListViewItem *, int, const TQString &) ),
+    this, TQ_SLOT( slot_lvSnippetsItemRenamed(TQListViewItem *, int, const TQString &) )
   );
 
   connect (
-    btnNew, TQT_SIGNAL( clicked () ),
-    this, TQT_SLOT( slot_btnNewClicked() )
+    btnNew, TQ_SIGNAL( clicked () ),
+    this, TQ_SLOT( slot_btnNewClicked() )
   );
   connect (
-    btnSave, TQT_SIGNAL( clicked () ),
-    this, TQT_SLOT( slot_btnSaveClicked() )
+    btnSave, TQ_SIGNAL( clicked () ),
+    this, TQ_SLOT( slot_btnSaveClicked() )
   );
   connect (
-    btnDelete, TQT_SIGNAL( clicked () ),
-    this, TQT_SLOT( slot_btnDeleteClicked() )
+    btnDelete, TQ_SIGNAL( clicked () ),
+    this, TQ_SLOT( slot_btnDeleteClicked() )
   );
   //</make connections>
 
diff --git a/kate/tabbarextension/plugin_katetabbarextension.cpp b/kate/tabbarextension/plugin_katetabbarextension.cpp
index e26524c..2951d1f 100644
--- a/kate/tabbarextension/plugin_katetabbarextension.cpp
+++ b/kate/tabbarextension/plugin_katetabbarextension.cpp
@@ -112,8 +112,8 @@ void KatePluginTabBarExtension::addView(Kate::MainWindow *win)
   TDEToolBar* toolbar = dynamic_cast<TDEToolBar*>
       (win->guiFactory()->container("tabbarExtensionToolBar", view));
   if (toolbar) {
-    connect(toolbar, TQT_SIGNAL(orientationChanged(TQt::Orientation)),
-        view->tabbar, TQT_SLOT(slotMoved(TQt::Orientation)));
+    connect(toolbar, TQ_SIGNAL(orientationChanged(TQt::Orientation)),
+        view->tabbar, TQ_SLOT(slotMoved(TQt::Orientation)));
   }
 }
 
@@ -147,8 +147,8 @@ Kate::PluginConfigPage* KatePluginTabBarExtension::configPage(
 {
   KateTabBarExtensionConfigPage* p = new KateTabBarExtensionConfigPage(this, w);
   initConfigPage( p );
-  connect( p, TQT_SIGNAL(configPageApplyRequest(KateTabBarExtensionConfigPage*)),
-      TQT_SLOT(applyConfig(KateTabBarExtensionConfigPage*)) );
+  connect( p, TQ_SIGNAL(configPageApplyRequest(KateTabBarExtensionConfigPage*)),
+      TQ_SLOT(applyConfig(KateTabBarExtensionConfigPage*)) );
   return (Kate::PluginConfigPage*)p;
 }
 
@@ -181,7 +181,7 @@ KateTabBarButton::KateTabBarButton(Kate::ViewManager* pViewManager,
 
   setText(pDoc->docName());
 
-  connect(this, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setOn(bool)));
+  connect(this, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setOn(bool)));
 }
 
 void KateTabBarButton::setDirty(bool d)
@@ -246,7 +246,7 @@ void KateTabBarButton::triggerModified()
 
 void KateTabBarButton::setOn(bool on)
 {
-  disconnect( TQT_SIGNAL(toggled(bool)));
+  disconnect( TQ_SIGNAL(toggled(bool)));
 //  kdDebug() << "setOn: " << (int)on << endl;
   if ((!on) && viewManager->activeView()->document()->documentNumber()
       == documentNumber()) {
@@ -257,7 +257,7 @@ void KateTabBarButton::setOn(bool on)
 
     if (on) emit myToggled(this);
   }
-  connect(this, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setOn(bool)));
+  connect(this, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setOn(bool)));
 }
 // END KateTabBarButton
 
@@ -282,13 +282,13 @@ KateTabBarExtension::KateTabBarExtension(Kate::DocumentManager *pDocManager,
     slotDocumentCreated (pDocManager->document(i));
   }
 
-  connect(m_win->viewManager(), TQT_SIGNAL(viewChanged()), TQT_SLOT(slotViewChanged()));
+  connect(m_win->viewManager(), TQ_SIGNAL(viewChanged()), TQ_SLOT(slotViewChanged()));
   connect(pDocManager,
-      TQT_SIGNAL(documentCreated(Kate::Document *)),
-      TQT_SLOT(slotDocumentCreated(Kate::Document *)));
+      TQ_SIGNAL(documentCreated(Kate::Document *)),
+      TQ_SLOT(slotDocumentCreated(Kate::Document *)));
   connect(pDocManager,
-      TQT_SIGNAL(documentDeleted(uint)),
-      TQT_SLOT(slotDocumentDeleted(uint)));
+      TQ_SIGNAL(documentDeleted(uint)),
+      TQ_SLOT(slotDocumentDeleted(uint)));
 
   setSortByName(bSort);
   setCloseOnMiddleClick(bCloseOnMiddleClick);
@@ -346,17 +346,17 @@ void KateTabBarExtension::slotDocumentCreated (Kate::Document *doc)
   if (!doc) return;
 
   KateTabBarButton* tab = new KateTabBarButton(m_win->viewManager(), doc, this);
-  connect(tab, TQT_SIGNAL(myToggled(KateTabBarButton*)),
-      TQT_SLOT(slotActivateView(KateTabBarButton*)));
-  connect(tab, TQT_SIGNAL(middleButtonPressed(KateTabBarButton*)),
-          TQT_SLOT(slotRequestDocClose(KateTabBarButton*)));
-  connect(doc, TQT_SIGNAL(nameChanged(Kate::Document *)),
-      TQT_SLOT(slotNameChanged(Kate::Document *)));
-  connect(doc, TQT_SIGNAL(modStateChanged(Kate::Document *)),
-      TQT_SLOT(slotModChanged(Kate::Document *)));
+  connect(tab, TQ_SIGNAL(myToggled(KateTabBarButton*)),
+      TQ_SLOT(slotActivateView(KateTabBarButton*)));
+  connect(tab, TQ_SIGNAL(middleButtonPressed(KateTabBarButton*)),
+          TQ_SLOT(slotRequestDocClose(KateTabBarButton*)));
+  connect(doc, TQ_SIGNAL(nameChanged(Kate::Document *)),
+      TQ_SLOT(slotNameChanged(Kate::Document *)));
+  connect(doc, TQ_SIGNAL(modStateChanged(Kate::Document *)),
+      TQ_SLOT(slotModChanged(Kate::Document *)));
   connect(doc,
-      TQT_SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)),
-      TQT_SLOT(slotModifiedOnDisc(Kate::Document *, bool, unsigned char)));
+      TQ_SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)),
+      TQ_SLOT(slotModifiedOnDisc(Kate::Document *, bool, unsigned char)));
   if(doc->isModified()) tab->triggerModified();
   tab->show();
   top->addWidget(tab);
@@ -489,8 +489,8 @@ KateTabBarExtensionConfigPage::KateTabBarExtensionConfigPage(
   top->add(gb);
   top->addStretch(1);
 //  throw signal changed
-  connect(pSortAlpha, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed()));
-  connect(pCloseOnMiddleClick, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed()));
+  connect(pSortAlpha, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(changed()));
+  connect(pCloseOnMiddleClick, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(changed()));
 }
 // END KateTabBarExtensionConfigPage
 
diff --git a/kate/textfilter/plugin_katetextfilter.cpp b/kate/textfilter/plugin_katetextfilter.cpp
index 4103df2..f5bb625 100644
--- a/kate/textfilter/plugin_katetextfilter.cpp
+++ b/kate/textfilter/plugin_katetextfilter.cpp
@@ -64,7 +64,7 @@ void PluginKateTextFilter::addView(Kate::MainWindow *win)
     PluginView *view = new PluginView ();
 
     (void)  new TDEAction ( i18n("Filter Te&xt..."), /*"edit_filter",*/ CTRL + Key_Backslash, this,
-  TQT_SLOT( slotEditFilter() ), view->actionCollection(), "edit_filter" );
+  TQ_SLOT( slotEditFilter() ), view->actionCollection(), "edit_filter" );
 
     view->setInstance (new TDEInstance("kate"));
     view->setXMLFile( "plugins/katetextfilter/ui.rc" );
@@ -283,17 +283,17 @@ void PluginKateTextFilter::runFilter( Kate::View *kv, const TQString &filter )
   {
     m_pFilterShellProcess = new KShellProcess;
 
-    connect ( m_pFilterShellProcess, TQT_SIGNAL(wroteStdin(TDEProcess *)),
-              this, TQT_SLOT(slotFilterCloseStdin (TDEProcess *)));
+    connect ( m_pFilterShellProcess, TQ_SIGNAL(wroteStdin(TDEProcess *)),
+              this, TQ_SLOT(slotFilterCloseStdin (TDEProcess *)));
 
-    connect ( m_pFilterShellProcess, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
-              this, TQT_SLOT(slotFilterReceivedStdout(TDEProcess*,char*,int)) );
+    connect ( m_pFilterShellProcess, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+              this, TQ_SLOT(slotFilterReceivedStdout(TDEProcess*,char*,int)) );
 
-    connect ( m_pFilterShellProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
-              this, TQT_SLOT(slotFilterReceivedStderr(TDEProcess*,char*,int)) );
+    connect ( m_pFilterShellProcess, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+              this, TQ_SLOT(slotFilterReceivedStderr(TDEProcess*,char*,int)) );
 
-    connect ( m_pFilterShellProcess, TQT_SIGNAL(processExited(TDEProcess*)),
-              this, TQT_SLOT(slotFilterProcessExited(TDEProcess*) ) ) ;
+    connect ( m_pFilterShellProcess, TQ_SIGNAL(processExited(TDEProcess*)),
+              this, TQ_SLOT(slotFilterProcessExited(TDEProcess*) ) ) ;
   }
 
   slipInFilter (*m_pFilterShellProcess, *kv, filter);
diff --git a/kate/xmlcheck/plugin_katexmlcheck.cpp b/kate/xmlcheck/plugin_katexmlcheck.cpp
index 4ab18da..abad13d 100644
--- a/kate/xmlcheck/plugin_katexmlcheck.cpp
+++ b/kate/xmlcheck/plugin_katexmlcheck.cpp
@@ -100,10 +100,10 @@ PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow
 	m_tmp_file=0;
 	m_proc=0;
 	(void) new TDEAction ( i18n("Validate XML"), 0, this,
-		TQT_SLOT( slotValidate() ), actionCollection(), "xml_check" );
+		TQ_SLOT( slotValidate() ), actionCollection(), "xml_check" );
 	// TODO?:
 	//(void)  new TDEAction ( i18n("Indent XML"), 0, this,
-	//	TQT_SLOT( slotIndent() ), actionCollection(), "xml_indent" );
+	//	TQ_SLOT( slotIndent() ), actionCollection(), "xml_indent" );
 
 	setInstance(new TDEInstance("kate"));
 	setXMLFile("plugins/katexmlcheck/ui.rc");
@@ -118,7 +118,7 @@ PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow
 	addColumn(i18n("Message"), -1);
 	setAllColumnsShowFocus(true);
 	setResizeMode(TQListView::LastColumn);
-	connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(slotClicked(TQListViewItem *)));
+	connect(this, TQ_SIGNAL(clicked(TQListViewItem *)), TQ_SLOT(slotClicked(TQListViewItem *)));
 
 /* TODO?: invalidate the listview when document has changed
 	Kate::View *kv = application()->activeMainWindow()->viewManager()->activeView();
@@ -126,17 +126,17 @@ PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow
 		kdDebug() << "Warning: no Kate::View" << endl;
 		return;
 	}
-	connect(kv, TQT_SIGNAL(modifiedChanged()), this, TQT_SLOT(slotUpdate()));
+	connect(kv, TQ_SIGNAL(modifiedChanged()), this, TQ_SLOT(slotUpdate()));
 */
 
 	m_proc_stderr = "";
 	m_proc = new TDEProcess();
-	connect(m_proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcExited(TDEProcess*)));
+	connect(m_proc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotProcExited(TDEProcess*)));
 	// we currently only want errors:
-	//connect(m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
-	//	this, TQT_SLOT(receivedProcStdout(TDEProcess*, char*, int)));
-	connect(m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
-		this, TQT_SLOT(slotReceivedProcStderr(TDEProcess*, char*, int)));
+	//connect(m_proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+	//	this, TQ_SLOT(receivedProcStdout(TDEProcess*, char*, int)));
+	connect(m_proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+		this, TQ_SLOT(slotReceivedProcStderr(TDEProcess*, char*, int)));
 
 }
 
diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp
index 7dc1cdf..0bbc029 100644
--- a/kate/xmltools/plugin_katexmltools.cpp
+++ b/kate/xmltools/plugin_katexmltools.cpp
@@ -134,10 +134,10 @@ PluginKateXMLTools::PluginKateXMLTools( TQObject* parent, const char* name, cons
 
   m_documentManager = ((Kate::Application*)parent)->documentManager();
 
-//   connect( m_documentManager, TQT_SIGNAL(documentCreated()),
-//             this, TQT_SLOT(slotDocumentCreated()) );
-  connect( m_documentManager, TQT_SIGNAL(documentDeleted(uint)),
-            this, TQT_SLOT(slotDocumentDeleted(uint)) );
+//   connect( m_documentManager, TQ_SIGNAL(documentCreated()),
+//             this, TQ_SLOT(slotDocumentCreated()) );
+  connect( m_documentManager, TQ_SIGNAL(documentDeleted(uint)),
+            this, TQ_SLOT(slotDocumentDeleted(uint)) );
 }
 
 PluginKateXMLTools::~PluginKateXMLTools()
@@ -150,11 +150,11 @@ void PluginKateXMLTools::addView( Kate::MainWindow *win )
   // TODO: doesn't this have to be deleted?
   PluginView *view = new PluginView ();
   ( void) new TDEAction ( i18n("&Insert Element..."), CTRL+Key_Return, this,
-                        TQT_SLOT( slotInsertElement()), view->actionCollection(), "xml_tool_insert_element" );
+                        TQ_SLOT( slotInsertElement()), view->actionCollection(), "xml_tool_insert_element" );
   ( void) new TDEAction ( i18n("&Close Element"), CTRL+Key_Less, this,
-                        TQT_SLOT( slotCloseElement()), view->actionCollection(), "xml_tool_close_element" );
+                        TQ_SLOT( slotCloseElement()), view->actionCollection(), "xml_tool_close_element" );
   ( void) new TDEAction ( i18n("Assign Meta &DTD..." ), 0, this,
-                        TQT_SLOT( getDTD()), view->actionCollection(), "xml_tool_assign" );
+                        TQ_SLOT( getDTD()), view->actionCollection(), "xml_tool_assign" );
 
   view->setInstance( new TDEInstance("kate") );
   view->setXMLFile( "plugins/katexmltools/ui.rc" );
@@ -361,9 +361,9 @@ PluginKateXMLTools::stringListToCompletionEntryList( TQStringList list )
  */
 void  PluginKateXMLTools::disconnectSlots( Kate::View *kv )
 {
-  disconnect( kv, TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)), this, 0 );
-  disconnect( kv, TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry)), this, 0 );
-  disconnect( kv, TQT_SIGNAL(completionAborted()), this, 0 );
+  disconnect( kv, TQ_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)), this, 0 );
+  disconnect( kv, TQ_SIGNAL(completionDone(KTextEditor::CompletionEntry)), this, 0 );
+  disconnect( kv, TQ_SIGNAL(completionAborted()), this, 0 );
 }
 
 /**
@@ -372,11 +372,11 @@ void  PluginKateXMLTools::disconnectSlots( Kate::View *kv )
  */
 void PluginKateXMLTools::connectSlots( Kate::View *kv )
 {
-  connect( kv, TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*) ),
-          this, TQT_SLOT(filterInsertString(KTextEditor::CompletionEntry*,TQString*)) );
-  connect( kv, TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry) ),
-          this, TQT_SLOT(completionDone(KTextEditor::CompletionEntry)) );
-  connect( kv, TQT_SIGNAL(completionAborted()), this, TQT_SLOT(completionAborted()) );
+  connect( kv, TQ_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*) ),
+          this, TQ_SLOT(filterInsertString(KTextEditor::CompletionEntry*,TQString*)) );
+  connect( kv, TQ_SIGNAL(completionDone(KTextEditor::CompletionEntry) ),
+          this, TQ_SLOT(completionDone(KTextEditor::CompletionEntry)) );
+  connect( kv, TQ_SIGNAL(completionAborted()), this, TQ_SLOT(completionAborted()) );
 }
 
 /**
@@ -485,9 +485,9 @@ void PluginKateXMLTools::getDTD()
 
     TQApplication::setOverrideCursor( KCursor::waitCursor() );
     TDEIO::Job *job = TDEIO::get( url );
-    connect( job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotFinished(TDEIO::Job *)) );
-    connect( job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
-             this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)) );
+    connect( job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotFinished(TDEIO::Job *)) );
+    connect( job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+             this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &)) );
   }
   kdDebug()<<"XMLTools::getDTD: Documents: "<<m_docDtds.count()<<", DTDs: "<<m_dtds.count()<<endl;
 }
@@ -529,12 +529,12 @@ void PluginKateXMLTools::slotData( TDEIO::Job *, const TQByteArray &data )
 void PluginKateXMLTools::assignDTD( PseudoDTD *dtd, KTextEditor::Document *doc )
 {
   m_docDtds.replace( doc->documentNumber(), dtd );
-  connect( doc, TQT_SIGNAL(charactersInteractivelyInserted(int,int,const TQString&) ),
-           this, TQT_SLOT(keyEvent(int,int,const TQString&)) );
+  connect( doc, TQ_SIGNAL(charactersInteractivelyInserted(int,int,const TQString&) ),
+           this, TQ_SLOT(keyEvent(int,int,const TQString&)) );
 
-  disconnect( doc, TQT_SIGNAL(backspacePressed()), this, 0 );
-  connect( doc, TQT_SIGNAL(backspacePressed() ),
-           this, TQT_SLOT(backspacePressed()) );
+  disconnect( doc, TQ_SIGNAL(backspacePressed()), this, 0 );
+  connect( doc, TQ_SIGNAL(backspacePressed() ),
+           this, TQ_SLOT(backspacePressed()) );
 }
 
 /**
@@ -782,7 +782,7 @@ void PluginKateXMLTools::completionDone( KTextEditor::CompletionEntry )
   if( m_mode == attributes )
   {
     // immediately show attribute values:
-    TQTimer::singleShot( 10, this, TQT_SLOT(emptyKeyEvent()) );
+    TQTimer::singleShot( 10, this, TQ_SLOT(emptyKeyEvent()) );
   }
 
 }
@@ -1122,8 +1122,8 @@ TQString InsertElement::showDialog( TQStringList &completions )
 
   KHistoryCombo *combo = new KHistoryCombo( page, "value" );
   combo->setHistoryItems( completions, true );
-  connect( combo->lineEdit(), TQT_SIGNAL(textChanged ( const TQString & )),
-           this, TQT_SLOT(slotHistoryTextChanged(const TQString &)) );
+  connect( combo->lineEdit(), TQ_SIGNAL(textChanged ( const TQString & )),
+           this, TQ_SLOT(slotHistoryTextChanged(const TQString &)) );
   TQString text = i18n( "Enter XML tag name and attributes (\"<\", \">\" and closing tag will be supplied):" );
   TQLabel *label = new TQLabel( text, page, "insert" );