Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

20 files changed, 395 insertions, 395 deletions

diff --git a/kate/part/katearbitraryhighlight.cpp b/kate/part/katearbitraryhighlight.cpp
index 927380979..1f526b7af 100644
--- a/kate/part/katearbitraryhighlight.cpp
+++ b/kate/part/katearbitraryhighlight.cpp
@@ -73,8 +73,8 @@ KateAttribute KateArbitraryHighlightRange::merge(TQPtrList<KateSuperRange> range
 void KateArbitraryHighlight::addHighlightToDocument(KateSuperRangeList* list)
 {
   m_docHLs.append(list);
-  connect(list, TQT_SIGNAL(rangeEliminated(KateSuperRange*)), TQT_SLOT(slotRangeEliminated(KateSuperRange*)));
-  connect(list, TQT_SIGNAL(destroyed(TQObject*)),TQT_SLOT(slotRangeListDeleted(TQObject*)));
+  connect(list, TQ_SIGNAL(rangeEliminated(KateSuperRange*)), TQ_SLOT(slotRangeEliminated(KateSuperRange*)));
+  connect(list, TQ_SIGNAL(destroyed(TQObject*)),TQ_SLOT(slotRangeListDeleted(TQObject*)));
 }
 
 void KateArbitraryHighlight::addHighlightToView(KateSuperRangeList* list, KateView* view)
@@ -84,9 +84,9 @@ void KateArbitraryHighlight::addHighlightToView(KateSuperRangeList* list, KateVi
 
   m_viewHLs[view]->append(list);
 
-  connect(list, TQT_SIGNAL(rangeEliminated(KateSuperRange*)), TQT_SLOT(slotTagRange(KateSuperRange*)));
-  connect(list, TQT_SIGNAL(tagRange(KateSuperRange*)), TQT_SLOT(slotTagRange(KateSuperRange*)));
-  connect(list, TQT_SIGNAL(destroyed(TQObject*)),TQT_SLOT(slotRangeListDeleted(TQObject*)));
+  connect(list, TQ_SIGNAL(rangeEliminated(KateSuperRange*)), TQ_SLOT(slotTagRange(KateSuperRange*)));
+  connect(list, TQ_SIGNAL(tagRange(KateSuperRange*)), TQ_SLOT(slotTagRange(KateSuperRange*)));
+  connect(list, TQ_SIGNAL(destroyed(TQObject*)),TQ_SLOT(slotRangeListDeleted(TQObject*)));
 }
 
 void KateArbitraryHighlight::slotRangeListDeleted(TQObject* obj) {
diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp
index e39aba16c..b6abe9b84 100644
--- a/kate/part/kateautoindent.cpp
+++ b/kate/part/kateautoindent.cpp
@@ -161,7 +161,7 @@ KateAutoIndent::~KateAutoIndent ()
 KateViewIndentationAction::KateViewIndentationAction(KateDocument *_doc, const TQString& text, TQObject* parent, const char* name)
        : TDEActionMenu (text, parent, name), doc(_doc)
 {
-  connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow()));
+  connect(popupMenu(),TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotAboutToShow()));
 }
 
 void KateViewIndentationAction::slotAboutToShow()
@@ -170,7 +170,7 @@ void KateViewIndentationAction::slotAboutToShow()
 
   popupMenu()->clear ();
   for (uint z=0; z<modes.size(); ++z)
-    popupMenu()->insertItem ( '&' + KateAutoIndent::modeDescription(z).replace('&', "&&"), this, TQT_SLOT(setMode(int)), 0,  z);
+    popupMenu()->insertItem ( '&' + KateAutoIndent::modeDescription(z).replace('&', "&&"), this, TQ_SLOT(setMode(int)), 0,  z);
 
   popupMenu()->setItemChecked (doc->config()->indentationMode(), true);
 }
@@ -187,7 +187,7 @@ KateNormalIndent::KateNormalIndent (KateDocument *_doc)
  : KateAutoIndent (_doc)
 {
   // if highlighting changes, update attributes
-  connect(_doc, TQT_SIGNAL(hlChanged()), this, TQT_SLOT(updateConfig()));
+  connect(_doc, TQ_SIGNAL(hlChanged()), this, TQ_SLOT(updateConfig()));
 }
 
 KateNormalIndent::~KateNormalIndent ()
@@ -2174,8 +2174,8 @@ KateVarIndent::KateVarIndent( KateDocument *doc )
   slotVariableChanged( "var-indent-handle-couples", doc->variable( "var-indent-handle-couples" ) );
 
   // update if a setting is changed
-  connect( doc, TQT_SIGNAL(variableChanged( const TQString&, const TQString&) ),
-           this, TQT_SLOT(slotVariableChanged( const TQString&, const TQString& )) );
+  connect( doc, TQ_SIGNAL(variableChanged( const TQString&, const TQString&) ),
+           this, TQ_SLOT(slotVariableChanged( const TQString&, const TQString& )) );
 }
 
 KateVarIndent::~KateVarIndent()
diff --git a/kate/part/katebookmarks.cpp b/kate/part/katebookmarks.cpp
index cc1dcf4c5..25f00d71b 100644
--- a/kate/part/katebookmarks.cpp
+++ b/kate/part/katebookmarks.cpp
@@ -62,7 +62,7 @@ KateBookmarks::KateBookmarks( KateView* view, Sorting sort )
   , m_view( view )
   , m_sorting( sort )
 {
-  connect (view->getDoc(), TQT_SIGNAL(marksChanged()), this, TQT_SLOT(marksChanged()));
+  connect (view->getDoc(), TQ_SIGNAL(marksChanged()), this, TQ_SLOT(marksChanged()));
   _tries=0;
   m_bookmarksMenu = 0L;
 }
@@ -75,26 +75,26 @@ void KateBookmarks::createActions( TDEActionCollection* ac )
 {
   m_bookmarkToggle = new TDEToggleAction(
     i18n("Set &Bookmark"), "bookmark", CTRL+Key_B,
-    this, TQT_SLOT(toggleBookmark()),
+    this, TQ_SLOT(toggleBookmark()),
     ac, "bookmarks_toggle" );
   m_bookmarkToggle->setWhatsThis(i18n("If a line has no bookmark then add one, otherwise remove it."));
   m_bookmarkToggle->setCheckedState( i18n("Clear &Bookmark") );
 
   m_bookmarkClear = new TDEAction(
     i18n("Clear &All Bookmarks"), 0,
-    this, TQT_SLOT(clearBookmarks()),
+    this, TQ_SLOT(clearBookmarks()),
     ac, "bookmarks_clear");
   m_bookmarkClear->setWhatsThis(i18n("Remove all bookmarks of the current document."));
 
   m_goNext = new TDEAction(
     i18n("Next Bookmark"), "go-next", ALT + Key_PageDown,
-    this, TQT_SLOT(goNext()),
+    this, TQ_SLOT(goNext()),
     ac, "bookmarks_next");
   m_goNext->setWhatsThis(i18n("Go to the next bookmark."));
 
   m_goPrevious = new TDEAction(
     i18n("Previous Bookmark"), "go-previous", ALT + Key_PageUp,
-    this, TQT_SLOT(goPrevious()),
+    this, TQ_SLOT(goPrevious()),
     ac, "bookmarks_previous");
   m_goPrevious->setWhatsThis(i18n("Go to the previous bookmark."));
 
@@ -102,14 +102,14 @@ void KateBookmarks::createActions( TDEActionCollection* ac )
 
   //connect the aboutToShow() and aboutToHide() signals with
   //the bookmarkMenuAboutToShow() and bookmarkMenuAboutToHide() slots
-  connect( m_bookmarksMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(bookmarkMenuAboutToShow()));
-  connect( m_bookmarksMenu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(bookmarkMenuAboutToHide()) );
+  connect( m_bookmarksMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(bookmarkMenuAboutToShow()));
+  connect( m_bookmarksMenu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(bookmarkMenuAboutToHide()) );
 
   marksChanged ();
   bookmarkMenuAboutToHide();
 
-  connect( m_view, TQT_SIGNAL( gotFocus( Kate::View * ) ), this, TQT_SLOT( slotViewGotFocus( Kate::View * ) ) );
-  connect( m_view, TQT_SIGNAL( lostFocus( Kate::View * ) ), this, TQT_SLOT( slotViewLostFocus( Kate::View * ) ) );
+  connect( m_view, TQ_SIGNAL( gotFocus( Kate::View * ) ), this, TQ_SLOT( slotViewGotFocus( Kate::View * ) ) );
+  connect( m_view, TQ_SIGNAL( lostFocus( Kate::View * ) ), this, TQ_SLOT( slotViewLostFocus( Kate::View * ) ) );
 }
 
 void KateBookmarks::toggleBookmark ()
@@ -181,7 +181,7 @@ void KateBookmarks::insertBookmarks( TQPopupMenu& menu )
 
       menu.insertItem(
           TQString("%1 - \"%2\"").arg( (*it)->line+1 ).arg( bText ),
-          m_view, TQT_SLOT(gotoLineNumber(int)), 0, (*it)->line, idx );
+          m_view, TQ_SLOT(gotoLineNumber(int)), 0, (*it)->line, idx );
 
       if ( (*it)->line < line )
       {
diff --git a/kate/part/katecodecompletion.cpp b/kate/part/katecodecompletion.cpp
index 41d57dc29..0a3dfe771 100644
--- a/kate/part/katecodecompletion.cpp
+++ b/kate/part/katecodecompletion.cpp
@@ -129,11 +129,11 @@ KateCodeCompletion::KateCodeCompletion( KateView* view )
   m_completionPopup->setFocusProxy( m_view->m_viewInternal );
 
   m_pArgHint = new KateArgHint( m_view );
-  connect( m_pArgHint, TQT_SIGNAL(argHintHidden()),
-           this, TQT_SIGNAL(argHintHidden()) );
+  connect( m_pArgHint, TQ_SIGNAL(argHintHidden()),
+           this, TQ_SIGNAL(argHintHidden()) );
 
-  connect( m_view, TQT_SIGNAL(cursorPositionChanged()),
-           this, TQT_SLOT(slotCursorPosChanged()) );
+  connect( m_view, TQ_SIGNAL(cursorPositionChanged()),
+           this, TQ_SLOT(slotCursorPosChanged()) );
 }
 
 KateCodeCompletion::~KateCodeCompletion()
@@ -185,7 +185,7 @@ bool KateCodeCompletion::eventFilter( TQObject *o, TQEvent *e )
    }
 
    if ( e->type() == TQEvent::MouseButtonPress ) {
-    TQTimer::singleShot(0, this, TQT_SLOT(showComment()));
+    TQTimer::singleShot(0, this, TQ_SLOT(showComment()));
     return false;
    }
 
@@ -207,7 +207,7 @@ void KateCodeCompletion::handleKey (TQKeyEvent *e)
         (e->key() == Key_Home ) || (e->key() == Key_End)   ||
         (e->key() == Key_Prior) || (e->key() == Key_Next ))
   {
-    TQTimer::singleShot(0,this,TQT_SLOT(showComment()));
+    TQTimer::singleShot(0,this,TQ_SLOT(showComment()));
     TQApplication::sendEvent( m_completionListBox, (TQEvent*)e );
     return;
   }
@@ -324,7 +324,7 @@ void KateCodeCompletion::updateBox( bool )
   m_completionListBox->setFocus();
   m_completionPopup->show();
 
-  TQTimer::singleShot(0,this,TQT_SLOT(showComment()));
+  TQTimer::singleShot(0,this,TQ_SLOT(showComment()));
 }
 
 void KateCodeCompletion::showArgHint ( TQStringList functionList, const TQString& strWrapping, const TQString& strDelimiter )
diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp
index a56e1a728..a77ecf8d7 100644
--- a/kate/part/katedialogs.cpp
+++ b/kate/part/katedialogs.cpp
@@ -117,7 +117,7 @@ KateConfigPage::KateConfigPage ( TQWidget *parent, const char *name )
   : Kate::ConfigPage (parent, name)
   , m_changed (false)
 {
-  connect (this, TQT_SIGNAL(changed()), this, TQT_SLOT(somethingHasChanged ()));
+  connect (this, TQ_SIGNAL(changed()), this, TQ_SLOT(somethingHasChanged ()));
 }
 
 KateConfigPage::~KateConfigPage ()
@@ -235,27 +235,27 @@ KateIndentConfigTab::KateIndentConfigTab(TQWidget *parent)
   // after initial reload, connect the stuff for the changed () signal
   //
 
-  connect(m_indentMode, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChanged()));
-  connect(m_indentMode, TQT_SIGNAL(activated(int)), this, TQT_SLOT(indenterSelected(int)));
+  connect(m_indentMode, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChanged()));
+  connect(m_indentMode, TQ_SIGNAL(activated(int)), this, TQ_SLOT(indenterSelected(int)));
 
-  connect( opt[0], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(somethingToggled()));
+  connect( opt[0], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(somethingToggled()));
 
-  connect( opt[0], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) );
-  connect( opt[1], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) );
-  connect( opt[2], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) );
-  connect( opt[3], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) );
-  connect( opt[4], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) );
-  connect( opt[5], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) );
-  connect( opt[6], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) );
-  connect( opt[7], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) );
+  connect( opt[0], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) );
+  connect( opt[1], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) );
+  connect( opt[2], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) );
+  connect( opt[3], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) );
+  connect( opt[4], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) );
+  connect( opt[5], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) );
+  connect( opt[6], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) );
+  connect( opt[7], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) );
 
-  connect(indentationWidth, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged()));
+  connect(indentationWidth, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged()));
 
-  connect(rb1, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect(rb2, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect(rb3, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
+  connect(rb1, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect(rb2, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect(rb3, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
 
-  connect(m_configPage, TQT_SIGNAL(clicked()), this, TQT_SLOT(configPage()));
+  connect(m_configPage, TQ_SIGNAL(clicked()), this, TQ_SLOT(configPage()));
 }
 
 void KateIndentConfigTab::somethingToggled() {
@@ -292,7 +292,7 @@ void KateIndentConfigTab::configPage()
     if (!page) return;
     box->setStretchFactor(page, 1);
 
-    connect( &dlg, TQT_SIGNAL(okClicked()), page, TQT_SLOT(apply()) );
+    connect( &dlg, TQ_SIGNAL(okClicked()), page, TQ_SLOT(apply()) );
 
     dlg.resize(400, 300);
     dlg.exec();
@@ -357,20 +357,20 @@ KateSelectConfigTab::KateSelectConfigTab(TQWidget *parent)
 
   opt[0] = new TQCheckBox(i18n("Smart ho&me and smart end"), gbCursor);
   opt[0]->setChecked(configFlags & KateDocumentConfig::cfSmartHome);
-  connect(opt[0], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
+  connect(opt[0], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
 
   opt[1] = new TQCheckBox(i18n("Wrap c&ursor"), gbCursor);
   opt[1]->setChecked(configFlags & KateDocumentConfig::cfWrapCursor);
-  connect(opt[1], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
+  connect(opt[1], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
 
   e6 = new TQCheckBox(i18n("&PageUp/PageDown moves cursor"), gbCursor);
   e6->setChecked(KateDocumentConfig::global()->pageUpDownMovesCursor());
-  connect(e6, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
+  connect(e6, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
 
   e4 = new KIntNumInput(KateViewConfig::global()->autoCenterLines(), gbCursor);
   e4->setRange(0, 1000000, 1, false);
   e4->setLabel(i18n("Autocenter cursor (lines):"), AlignVCenter);
-  connect(e4, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged()));
+  connect(e4, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged()));
 
   layout->addWidget(gbCursor);
 
@@ -416,8 +416,8 @@ KateSelectConfigTab::KateSelectConfigTab(TQWidget *parent)
   // after initial reload, connect the stuff for the changed () signal
   //
 
-  connect(rb1, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect(rb2, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
+  connect(rb1, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect(rb2, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
 }
 
 void KateSelectConfigTab::apply ()
@@ -473,16 +473,16 @@ KateEditConfigTab::KateEditConfigTab(TQWidget *parent)
 
   opt[3] = new TQCheckBox( i18n("&Insert spaces instead of tabulators"), gbWhiteSpace );
   opt[3]->setChecked( configFlags & KateDocumentConfig::cfReplaceTabsDyn );
-  connect( opt[3], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()) );
+  connect( opt[3], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()) );
 
   opt[2] = new TQCheckBox(i18n("&Show tabulators"), gbWhiteSpace);
   opt[2]->setChecked(configFlags & flags[2]);
-  connect(opt[2], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
+  connect(opt[2], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
 
   e2 = new KIntNumInput(KateDocumentConfig::global()->tabWidth(), gbWhiteSpace);
   e2->setRange(1, 16, 1, false);
   e2->setLabel(i18n("Tab width:"), AlignVCenter);
-  connect(e2, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged()));
+  connect(e2, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged()));
 
   mainLayout->addWidget(gbWhiteSpace);
 
@@ -490,35 +490,35 @@ KateEditConfigTab::KateEditConfigTab(TQWidget *parent)
 
   opt[0] = new TQCheckBox(i18n("Enable static &word wrap"), gbWordWrap);
   opt[0]->setChecked(KateDocumentConfig::global()->wordWrap());
-  connect(opt[0], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
+  connect(opt[0], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
 
   m_wwmarker = new TQCheckBox( i18n("&Show static word wrap marker (if applicable)"), gbWordWrap );
   m_wwmarker->setChecked( KateRendererConfig::global()->wordWrapMarker() );
-  connect(m_wwmarker, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
+  connect(m_wwmarker, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
 
   e1 = new KIntNumInput(KateDocumentConfig::global()->wordWrapAt(), gbWordWrap);
   e1->setRange(20, 200, 1, false);
   e1->setLabel(i18n("Wrap words at:"), AlignVCenter);
-  connect(e1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged()));
+  connect(e1, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged()));
 
   mainLayout->addWidget(gbWordWrap);
 
   opt[4] = new TQCheckBox( i18n("Remove &trailing spaces"), this );
   mainLayout->addWidget( opt[4] );
   opt[4]->setChecked( configFlags & KateDocumentConfig::cfRemoveTrailingDyn );
-  connect( opt[4], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()) );
+  connect( opt[4], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()) );
 
   opt[1] = new TQCheckBox(i18n("Auto &brackets"), this);
   mainLayout->addWidget(opt[1]);
   opt[1]->setChecked(configFlags & flags[1]);
-  connect(opt[1], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
+  connect(opt[1], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
 
   e3 = new KIntNumInput(e2, KateDocumentConfig::global()->undoSteps(), this);
   e3->setRange(0, 1000000, 1, false);
   e3->setSpecialValueText( i18n("Unlimited") );
   e3->setLabel(i18n("Maximum undo steps:"), AlignVCenter);
   mainLayout->addWidget(e3);
-  connect(e3, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged()));
+  connect(e3, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged()));
 
   TQHBoxLayout *e5Layout = new TQHBoxLayout(mainLayout);
   TQLabel *e5Label = new TQLabel(i18n("Smart search t&ext from:"), this);
@@ -532,7 +532,7 @@ KateEditConfigTab::KateEditConfigTab(TQWidget *parent)
   e5->setCurrentItem(KateViewConfig::global()->textToSearchMode());
   e5Layout->addWidget(e5);
   e5Label->setBuddy(e5);
-  connect(e5, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChanged()));
+  connect(e5, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChanged()));
 
   mainLayout->addStretch();
 
@@ -744,17 +744,17 @@ KateViewDefaultsConfig::KateViewDefaultsConfig(TQWidget *parent)
   // after initial reload, connect the stuff for the changed () signal
   //
 
-  connect(m_dynwrap, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect(m_dynwrapIndicatorsCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChanged()));
-  connect(m_dynwrapAlignLevel, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged()));
-  connect(m_icons, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect(m_scrollBarMarks, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect(m_line, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect(m_folding, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect(m_collapseTopLevel, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()) );
-  connect(rb1, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect(rb2, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect(m_showIndentLines, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
+  connect(m_dynwrap, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect(m_dynwrapIndicatorsCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChanged()));
+  connect(m_dynwrapAlignLevel, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged()));
+  connect(m_icons, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect(m_scrollBarMarks, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect(m_line, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect(m_folding, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect(m_collapseTopLevel, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()) );
+  connect(rb1, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect(rb2, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect(m_showIndentLines, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
 }
 
 KateViewDefaultsConfig::~KateViewDefaultsConfig()
@@ -821,7 +821,7 @@ void KateEditKeyConfiguration::showEvent ( TQShowEvent * )
     KateView* view = (KateView*)m_doc->views().at(0);
     m_ac = view->editActionCollection();
     m_keyChooser = new KKeyChooser( m_ac, this, false );
-    connect( m_keyChooser, TQT_SIGNAL( keyChange() ), this, TQT_SLOT( slotChanged() ) );
+    connect( m_keyChooser, TQ_SIGNAL( keyChange() ), this, TQ_SLOT( slotChanged() ) );
     m_keyChooser->show ();
 
     m_ready = true;
@@ -947,16 +947,16 @@ KateSaveConfigTab::KateSaveConfigTab( TQWidget *parent )
   // after initial reload, connect the stuff for the changed () signal
   //
 
-  connect(m_encoding, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChanged()));
-  connect(m_eol, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChanged()));
-  connect( allowEolDetection, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) );
-  connect(blockCount, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged()));
-  connect(removeSpaces, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect( cbLocalFiles, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) );
-  connect( cbRemoteFiles, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) );
-  connect(dirSearchDepth, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged()));
-  connect( leBuPrefix, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) );
-  connect( leBuSuffix, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) );
+  connect(m_encoding, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChanged()));
+  connect(m_eol, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChanged()));
+  connect( allowEolDetection, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) );
+  connect(blockCount, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged()));
+  connect(removeSpaces, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect( cbLocalFiles, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) );
+  connect( cbRemoteFiles, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) );
+  connect(dirSearchDepth, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged()));
+  connect( leBuPrefix, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( leBuSuffix, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) );
 }
 
 void KateSaveConfigTab::apply()
@@ -1131,12 +1131,12 @@ KatePartPluginConfigPage::KatePartPluginConfigPage (TQWidget *parent) : KateConf
   btnConfigure = new TQPushButton( i18n("Configure..."), this );
   btnConfigure->setEnabled( false );
   grid->addWidget( btnConfigure, 1, 0, TQt::AlignRight );
-  connect( btnConfigure, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConfigure()) );
+  connect( btnConfigure, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotConfigure()) );
 
-  connect( listView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotCurrentChanged(TQListViewItem*)) );
-  connect( listView, TQT_SIGNAL(stateChange(KatePartPluginListItem *, bool)),
-    this, TQT_SLOT(slotStateChanged(KatePartPluginListItem *, bool)));
-  connect(listView, TQT_SIGNAL(stateChange(KatePartPluginListItem *, bool)), this, TQT_SLOT(slotChanged()));
+  connect( listView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(slotCurrentChanged(TQListViewItem*)) );
+  connect( listView, TQ_SIGNAL(stateChange(KatePartPluginListItem *, bool)),
+    this, TQ_SLOT(slotStateChanged(KatePartPluginListItem *, bool)));
+  connect(listView, TQ_SIGNAL(stateChange(KatePartPluginListItem *, bool)), this, TQ_SLOT(slotChanged()));
 }
 
 KatePartPluginConfigPage::~KatePartPluginConfigPage ()
@@ -1266,8 +1266,8 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc)
   TQLabel *lHl = new TQLabel( i18n("H&ighlight:"), hbHl );
   hlCombo = new TQComboBox( false, hbHl );
   lHl->setBuddy( hlCombo );
-  connect( hlCombo, TQT_SIGNAL(activated(int)),
-           this, TQT_SLOT(hlChanged(int)) );
+  connect( hlCombo, TQ_SIGNAL(activated(int)),
+           this, TQ_SLOT(hlChanged(int)) );
 
   for( int i = 0; i < KateHlManager::self()->highlights(); i++) {
     if (KateHlManager::self()->hlSection(i).length() > 0)
@@ -1312,7 +1312,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc)
 
   TQToolButton *btnMTW = new TQToolButton(hbMT);
   btnMTW->setIconSet(TQIconSet(SmallIcon("wizard")));
-  connect(btnMTW, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMTDlg()));
+  connect(btnMTW, TQ_SIGNAL(clicked()), this, TQ_SLOT(showMTDlg()));
 
   // download/new buttons
   TQHBox *hbBtns = new TQHBox( this );
@@ -1321,7 +1321,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc)
   ((TQBoxLayout*)hbBtns->layout())->addStretch(1); // hmm.
   hbBtns->setSpacing( KDialog::spacingHint() );
   TQPushButton *btnDl = new TQPushButton(i18n("Do&wnload..."), hbBtns);
-  connect( btnDl, TQT_SIGNAL(clicked()), this, TQT_SLOT(hlDownload()) );
+  connect( btnDl, TQ_SIGNAL(clicked()), this, TQ_SLOT(hlDownload()) );
 
   int currentHl = m_doc ? m_doc->hlMode() : 0;
   hlCombo->setCurrentItem( currentHl );
@@ -1347,9 +1347,9 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc)
 
   layout->addStretch ();
 
-  connect( wildcards, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) );
-  connect( mimetypes, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) );
-  connect( priority, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) );
+  connect( wildcards, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( mimetypes, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( priority, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) );
 }
 
 KateHlConfigPage::~KateHlConfigPage ()
@@ -1453,8 +1453,8 @@ KateHlDownloadDialog::KateHlDownloadDialog(TQWidget *parent, const char *name, b
   actionButton (User1)->setIconSet(SmallIconSet("ok"));
 
   transferJob = TDEIO::get(KURL(TQString(HLDOWNLOADPATH)), true, true);
-  connect(transferJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
-    this, TQT_SLOT(listDataReceived(TDEIO::Job *, const TQByteArray &)));
+  connect(transferJob, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+    this, TQ_SLOT(listDataReceived(TDEIO::Job *, const TQByteArray &)));
 //        void data( TDEIO::Job *, const TQByteArray &data);
   resize(450, 400);
 }
@@ -1616,7 +1616,7 @@ KateModOnHdPrompt::KateModOnHdPrompt( KateDocument *doc,
     TQPushButton *btnDiff = new TQPushButton( i18n("&View Difference"), w );
     lo2->addStretch( 1 );
     lo2->addWidget( btnDiff );
-    connect( btnDiff, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDiff()) );
+    connect( btnDiff, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDiff()) );
     TQWhatsThis::add( btnDiff, i18n(
         "Calculates the difference between the editor contents and the disk "
         "file using diff(1) and opens the diff file with the default application "
@@ -1639,8 +1639,8 @@ void KateModOnHdPrompt::slotDiff()
   KProcIO *p = new KProcIO();
   p->setComm( TDEProcess::All );
   *p << "diff" << "-u" << "-" <<  m_doc->url().path();
-  connect( p, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotPDone(TDEProcess*)) );
-  connect( p, TQT_SIGNAL(readReady(KProcIO*)), this, TQT_SLOT(slotPRead(KProcIO*)) );
+  connect( p, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotPDone(TDEProcess*)) );
+  connect( p, TQ_SIGNAL(readReady(KProcIO*)), this, TQ_SLOT(slotPRead(KProcIO*)) );
 
   setCursor( WaitCursor );
 
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index 4309386e2..1dc57a1ac 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -171,7 +171,7 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView,
   setMarksUserChangable( markType01 );
 
   m_undoMergeTimer = new TQTimer(this);
-  connect(m_undoMergeTimer, TQT_SIGNAL(timeout()), TQT_SLOT(undoCancel()));
+  connect(m_undoMergeTimer, TQ_SIGNAL(timeout()), TQ_SLOT(undoCancel()));
 
   clearMarks ();
   clearUndo ();
@@ -189,24 +189,24 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView,
   m_indenter->updateConfig ();
 
   // some nice signals from the buffer
-  connect(m_buffer, TQT_SIGNAL(tagLines(int,int)), this, TQT_SLOT(tagLines(int,int)));
-  connect(m_buffer, TQT_SIGNAL(codeFoldingUpdated()),this,TQT_SIGNAL(codeFoldingUpdated()));
+  connect(m_buffer, TQ_SIGNAL(tagLines(int,int)), this, TQ_SLOT(tagLines(int,int)));
+  connect(m_buffer, TQ_SIGNAL(codeFoldingUpdated()),this,TQ_SIGNAL(codeFoldingUpdated()));
 
   // if the user changes the highlight with the dialog, notify the doc
-  connect(KateHlManager::self(),TQT_SIGNAL(changed()),TQT_SLOT(internalHlChanged()));
+  connect(KateHlManager::self(),TQ_SIGNAL(changed()),TQ_SLOT(internalHlChanged()));
 
   // signal for the arbitrary HL
-  connect(m_arbitraryHL, TQT_SIGNAL(tagLines(KateView*, KateSuperRange*)), TQT_SLOT(tagArbitraryLines(KateView*, KateSuperRange*)));
+  connect(m_arbitraryHL, TQ_SIGNAL(tagLines(KateView*, KateSuperRange*)), TQ_SLOT(tagArbitraryLines(KateView*, KateSuperRange*)));
 
   // signals for mod on hd
-  connect( KateFactory::self()->dirWatch(), TQT_SIGNAL(dirty (const TQString &)),
-           this, TQT_SLOT(slotModOnHdDirty (const TQString &)) );
+  connect( KateFactory::self()->dirWatch(), TQ_SIGNAL(dirty (const TQString &)),
+           this, TQ_SLOT(slotModOnHdDirty (const TQString &)) );
 
-  connect( KateFactory::self()->dirWatch(), TQT_SIGNAL(created (const TQString &)),
-           this, TQT_SLOT(slotModOnHdCreated (const TQString &)) );
+  connect( KateFactory::self()->dirWatch(), TQ_SIGNAL(created (const TQString &)),
+           this, TQ_SLOT(slotModOnHdCreated (const TQString &)) );
 
-  connect( KateFactory::self()->dirWatch(), TQT_SIGNAL(deleted (const TQString &)),
-           this, TQT_SLOT(slotModOnHdDeleted (const TQString &)) );
+  connect( KateFactory::self()->dirWatch(), TQ_SIGNAL(deleted (const TQString &)),
+           this, TQ_SLOT(slotModOnHdDeleted (const TQString &)) );
 
   // update doc name
   setDocName ("");
@@ -220,7 +220,7 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView,
     setWidget( view );
   }
 
-  connect(this,TQT_SIGNAL(sigQueryClose(bool *, bool*)),this,TQT_SLOT(slotQueryClose_save(bool *, bool*)));
+  connect(this,TQ_SIGNAL(sigQueryClose(bool *, bool*)),this,TQ_SLOT(slotQueryClose_save(bool *, bool*)));
 
   m_isasking = 0;
 
@@ -356,9 +356,9 @@ void KateDocument::disablePluginGUI (KTextEditor::Plugin *plugin)
 KTextEditor::View *KateDocument::createView( TQWidget *parent, const char *name )
 {
   KateView* newView = new KateView( this, parent, name);
-  connect(newView, TQT_SIGNAL(cursorPositionChanged()), TQT_SLOT(undoCancel()));
+  connect(newView, TQ_SIGNAL(cursorPositionChanged()), TQ_SLOT(undoCancel()));
   if ( s_fileChangedDialogsActivated )
-    connect( newView, TQT_SIGNAL(gotFocus( Kate::View * )), this, TQT_SLOT(slotModifiedOnDisk()) );
+    connect( newView, TQ_SIGNAL(gotFocus( Kate::View * )), this, TQ_SLOT(slotModifiedOnDisk()) );
   return newView;
 }
 
@@ -2305,11 +2305,11 @@ bool KateDocument::openURL( const KURL &url )
     m_job = TDEIO::get ( url, false, isProgressInfoEnabled() );
 
     // connect to slots
-    connect( m_job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
-           TQT_SLOT( slotDataKate( TDEIO::Job*, const TQByteArray& ) ) );
+    connect( m_job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+           TQ_SLOT( slotDataKate( TDEIO::Job*, const TQByteArray& ) ) );
 
-    connect( m_job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-           TQT_SLOT( slotFinishedKate( TDEIO::Job* ) ) );
+    connect( m_job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+           TQ_SLOT( slotFinishedKate( TDEIO::Job* ) ) );
 
     TQWidget *w = widget ();
     if (!w && !m_views.isEmpty ())
diff --git a/kate/part/katedocumenthelpers.cpp b/kate/part/katedocumenthelpers.cpp
index ff4184685..9296773d5 100644
--- a/kate/part/katedocumenthelpers.cpp
+++ b/kate/part/katedocumenthelpers.cpp
@@ -31,8 +31,8 @@ KateBrowserExtension::KateBrowserExtension( KateDocument* doc )
 : KParts::BrowserExtension( doc, "katepartbrowserextension" ),
   m_doc (doc)
 {
-  connect( doc, TQT_SIGNAL( selectionChanged() ),
-           this, TQT_SLOT( slotSelectionChanged() ) );
+  connect( doc, TQ_SIGNAL( selectionChanged() ),
+           this, TQ_SLOT( slotSelectionChanged() ) );
   emit enableAction( "print", true );
 }
 
diff --git a/kate/part/katefiletype.cpp b/kate/part/katefiletype.cpp
index 7df5b6be5..eeecce36a 100644
--- a/kate/part/katefiletype.cpp
+++ b/kate/part/katefiletype.cpp
@@ -273,14 +273,14 @@ KateFileTypeConfigTab::KateFileTypeConfigTab( TQWidget *parent )
   TQLabel *lHl = new TQLabel( i18n("&Filetype:"), hbHl );
   typeCombo = new TQComboBox( false, hbHl );
   lHl->setBuddy( typeCombo );
-  connect( typeCombo, TQT_SIGNAL(activated(int)),
-           this, TQT_SLOT(typeChanged(int)) );
+  connect( typeCombo, TQ_SIGNAL(activated(int)),
+           this, TQ_SLOT(typeChanged(int)) );
 
   TQPushButton *btnnew = new TQPushButton( i18n("&New"), hbHl );
-  connect( btnnew, TQT_SIGNAL(clicked()), this, TQT_SLOT(newType()) );
+  connect( btnnew, TQ_SIGNAL(clicked()), this, TQ_SLOT(newType()) );
 
   btndel = new TQPushButton( i18n("&Delete"), hbHl );
-  connect( btndel, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteType()) );
+  connect( btndel, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteType()) );
 
   gbProps = new TQGroupBox( 2, TQt::Horizontal, i18n("Properties"), this );
   layout->add (gbProps);
@@ -312,7 +312,7 @@ KateFileTypeConfigTab::KateFileTypeConfigTab( TQWidget *parent )
 
   TQToolButton *btnMTW = new TQToolButton(hbMT);
   btnMTW->setIconSet(TQIconSet(SmallIcon("wizard")));
-  connect(btnMTW, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMTDlg()));
+  connect(btnMTW, TQ_SIGNAL(clicked()), this, TQ_SLOT(showMTDlg()));
 
   TQLabel *lprio = new TQLabel( i18n("Prio&rity:"), gbProps);
   priority = new KIntNumInput( gbProps );
@@ -322,12 +322,12 @@ KateFileTypeConfigTab::KateFileTypeConfigTab( TQWidget *parent )
 
   reload();
 
-  connect( name, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) );
-  connect( section, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) );
-  connect( varLine, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) );
-  connect( wildcards, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) );
-  connect( mimetypes, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) );
-  connect( priority, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) );
+  connect( name, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( section, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( varLine, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( wildcards, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( mimetypes, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( priority, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) );
 
   TQWhatsThis::add( btnnew, i18n("Create a new file type.") );
   TQWhatsThis::add( btndel, i18n("Delete the current file type.") );
@@ -519,9 +519,9 @@ void KateViewFileTypeAction::init()
   m_doc = 0;
   subMenus.setAutoDelete( true );
 
-  popupMenu()->insertItem ( i18n("None"), this, TQT_SLOT(setType(int)), 0,  0);
+  popupMenu()->insertItem ( i18n("None"), this, TQ_SLOT(setType(int)), 0,  0);
 
-  connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow()));
+  connect(popupMenu(),TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotAboutToShow()));
 }
 
 void KateViewFileTypeAction::updateMenu (Kate::Document *doc)
@@ -551,12 +551,12 @@ void KateViewFileTypeAction::slotAboutToShow()
 
       int m = subMenusName.findIndex (hlSection);
       names << hlName;
-      subMenus.at(m)->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0,  z+1);
+      subMenus.at(m)->insertItem ( hlName, this, TQ_SLOT(setType(int)), 0,  z+1);
     }
     else if (names.contains(hlName) < 1)
     {
       names << hlName;
-      popupMenu()->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0,  z+1);
+      popupMenu()->insertItem ( hlName, this, TQ_SLOT(setType(int)), 0,  z+1);
     }
   }
 
diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp
index 9e453aca1..1f432468d 100644
--- a/kate/part/katehighlight.cpp
+++ b/kate/part/katehighlight.cpp
@@ -3405,7 +3405,7 @@ void KateViewHighlightAction::init()
   m_doc = 0;
   subMenus.setAutoDelete( true );
 
-  connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow()));
+  connect(popupMenu(),TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotAboutToShow()));
 }
 
 void KateViewHighlightAction::updateMenu (Kate::Document *doc)
@@ -3437,12 +3437,12 @@ void KateViewHighlightAction::slotAboutToShow()
 
         int m = subMenusName.findIndex (hlSection);
         names << hlName;
-        subMenus.at(m)->insertItem ( '&' + hlName, this, TQT_SLOT(setHl(int)), 0,  z);
+        subMenus.at(m)->insertItem ( '&' + hlName, this, TQ_SLOT(setHl(int)), 0,  z);
       }
       else if (names.contains(hlName) < 1)
       {
         names << hlName;
-        popupMenu()->insertItem ( '&' + hlName, this, TQT_SLOT(setHl(int)), 0,  z);
+        popupMenu()->insertItem ( '&' + hlName, this, TQ_SLOT(setHl(int)), 0,  z);
       }
     }
   }
diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp
index 45fc60c25..09debacb6 100644
--- a/kate/part/kateprinter.cpp
+++ b/kate/part/kateprinter.cpp
@@ -719,7 +719,7 @@ KatePrintHeaderFooter::KatePrintHeaderFooter( KPrinter * /*printer*/, TQWidget *
   lo2->setStretchFactor( lFontPreview, 1 );
   TQPushButton *btnChooseFont = new TQPushButton( i18n("Choo&se Font..."), this );
   lo2->addWidget( btnChooseFont );
-  connect( btnChooseFont, TQT_SIGNAL(clicked()), this, TQT_SLOT(setHFFont()) );
+  connect( btnChooseFont, TQ_SIGNAL(clicked()), this, TQ_SLOT(setHFFont()) );
   // header
   gbHeader = new TQGroupBox( 2, TQt::Horizontal, i18n("Header Properties"), this );
   lo->addWidget( gbHeader );
@@ -764,10 +764,10 @@ KatePrintHeaderFooter::KatePrintHeaderFooter( KPrinter * /*printer*/, TQWidget *
   lo->addStretch( 1 );
 
   // user friendly
-  connect( cbEnableHeader, TQT_SIGNAL(toggled(bool)), gbHeader, TQT_SLOT(setEnabled(bool)) );
-  connect( cbEnableFooter, TQT_SIGNAL(toggled(bool)), gbFooter, TQT_SLOT(setEnabled(bool)) );
-  connect( cbHeaderEnableBgColor, TQT_SIGNAL(toggled(bool)), kcbtnHeaderBg, TQT_SLOT(setEnabled(bool)) );
-  connect( cbFooterEnableBgColor, TQT_SIGNAL(toggled(bool)), kcbtnFooterBg, TQT_SLOT(setEnabled(bool)) );
+  connect( cbEnableHeader, TQ_SIGNAL(toggled(bool)), gbHeader, TQ_SLOT(setEnabled(bool)) );
+  connect( cbEnableFooter, TQ_SIGNAL(toggled(bool)), gbFooter, TQ_SLOT(setEnabled(bool)) );
+  connect( cbHeaderEnableBgColor, TQ_SIGNAL(toggled(bool)), kcbtnHeaderBg, TQ_SLOT(setEnabled(bool)) );
+  connect( cbFooterEnableBgColor, TQ_SIGNAL(toggled(bool)), kcbtnFooterBg, TQ_SLOT(setEnabled(bool)) );
 
   // set defaults
   cbEnableHeader->setChecked( true );
@@ -937,7 +937,7 @@ KatePrintLayout::KatePrintLayout( KPrinter * /*printer*/, TQWidget *parent, cons
   kcbtnBoxColor = new KColorButton( gbBoxProps );
   lBoxColor->setBuddy( kcbtnBoxColor );
 
-  connect( cbEnableBox, TQT_SIGNAL(toggled(bool)), gbBoxProps, TQT_SLOT(setEnabled(bool)) );
+  connect( cbEnableBox, TQ_SIGNAL(toggled(bool)), gbBoxProps, TQ_SLOT(setEnabled(bool)) );
 
   lo->addStretch( 1 );
   // set defaults:
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index cea62b652..6716d079d 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -310,7 +310,7 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char
   m_combobox->insertItem(i18n("Error"));               // markType07
   m_combobox->setCurrentItem(0);
   m_markers = new KColorButton(b, "marker_color_button");
-  connect( m_combobox, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotComboBoxChanged( int ) ) );
+  connect( m_combobox, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotComboBoxChanged( int ) ) );
 
   blay->addWidget(gbTextArea);
 
@@ -351,7 +351,7 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char
   blay->addStretch();
 
   // connect signal changed(); changed is emitted by a ColorButton change!
-  connect( this, TQT_SIGNAL( changed() ), parent->parentWidget(), TQT_SLOT( slotChanged() ) );
+  connect( this, TQ_SIGNAL( changed() ), parent->parentWidget(), TQ_SLOT( slotChanged() ) );
 
   // TQWhatsThis help
   TQWhatsThis::add(m_back, i18n("<p>Sets the background color of the editing area.</p>"));
@@ -405,15 +405,15 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema )
   m_schema = newSchema;
 
   // first disconnect all signals otherwise setColor emits changed
-  m_back      ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) );
-  m_selected  ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) );
-  m_current   ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) );
-  m_bracket   ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) );
-  m_wwmarker  ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) );
-  m_iconborder->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) );
-  m_tmarker   ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) );
-  m_markers   ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) );
-  m_linenumber->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) );
+  m_back      ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) );
+  m_selected  ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) );
+  m_current   ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) );
+  m_bracket   ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) );
+  m_wwmarker  ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) );
+  m_iconborder->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) );
+  m_tmarker   ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) );
+  m_markers   ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) );
+  m_linenumber->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) );
 
   // If we havent this schema, read in from config file
   if ( ! m_schemas.contains( newSchema ) )
@@ -475,15 +475,15 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema )
   }
   m_markers->setColor(  m_schemas [ newSchema ].markerColors[ m_combobox->currentItem() ] );
 
-  connect( m_back      , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) );
-  connect( m_selected  , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) );
-  connect( m_current   , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) );
-  connect( m_bracket   , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) );
-  connect( m_wwmarker  , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) );
-  connect( m_iconborder, TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) );
-  connect( m_tmarker   , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) );
-  connect( m_linenumber, TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) );
-  connect( m_markers   , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SLOT( slotMarkerColorChanged( const TQColor& ) ) );
+  connect( m_back      , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) );
+  connect( m_selected  , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) );
+  connect( m_current   , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) );
+  connect( m_bracket   , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) );
+  connect( m_wwmarker  , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) );
+  connect( m_iconborder, TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) );
+  connect( m_tmarker   , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) );
+  connect( m_linenumber, TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) );
+  connect( m_markers   , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SLOT( slotMarkerColorChanged( const TQColor& ) ) );
 }
 
 void KateSchemaConfigColorTab::apply ()
@@ -527,9 +527,9 @@ void KateSchemaConfigColorTab::slotMarkerColorChanged( const TQColor& color)
 void KateSchemaConfigColorTab::slotComboBoxChanged(int index)
 {
   // temporarily disconnect the changed-signal because setColor emits changed as well
-  m_markers->disconnect( TQT_SIGNAL( changed( const TQColor& ) ) );
+  m_markers->disconnect( TQ_SIGNAL( changed( const TQColor& ) ) );
   m_markers->setColor( m_schemas[m_schema].markerColors[index] );
-  connect( m_markers, TQT_SIGNAL( changed( const TQColor& ) ), TQT_SLOT( slotMarkerColorChanged( const TQColor& ) ) );
+  connect( m_markers, TQ_SIGNAL( changed( const TQColor& ) ), TQ_SLOT( slotMarkerColorChanged( const TQColor& ) ) );
 }
 
 //END KateSchemaConfigColorTab
@@ -544,7 +544,7 @@ KateSchemaConfigFontTab::KateSchemaConfigFontTab( TQWidget *parent, const char *
   m_fontchooser = new TDEFontChooser ( this, 0L, false, TQStringList(), false );
   grid->addWidget( m_fontchooser, 0, 0);
 
-  connect (this, TQT_SIGNAL( changed()), parent->parentWidget(), TQT_SLOT (slotChanged()));
+  connect (this, TQ_SIGNAL( changed()), parent->parentWidget(), TQ_SLOT (slotChanged()));
   m_schema = -1;
 }
 
@@ -582,7 +582,7 @@ void KateSchemaConfigFontTab::schemaChanged( int newSchema )
   m_fontchooser->disconnect ( this );
   m_fontchooser->setFont ( KateFactory::self()->schemaManager()->schema( newSchema )->readFontEntry("Font", &f) );
   m_fonts[ newSchema ] = m_fontchooser->font();
-  connect (m_fontchooser, TQT_SIGNAL (fontSelected( const TQFont & )), this, TQT_SLOT (slotFontSelected( const TQFont & )));
+  connect (m_fontchooser, TQ_SIGNAL (fontSelected( const TQFont & )), this, TQ_SLOT (slotFontSelected( const TQFont & )));
 }
 //END FontConfig
 
@@ -598,7 +598,7 @@ KateSchemaConfigFontColorTab::KateSchemaConfigFontColorTab( TQWidget *parent, co
   m_defaultStyles = new KateStyleListView( this, false );
   grid->addWidget( m_defaultStyles, 0, 0);
 
-  connect (m_defaultStyles, TQT_SIGNAL (changed()), parent->parentWidget(), TQT_SLOT (slotChanged()));
+  connect (m_defaultStyles, TQ_SIGNAL (changed()), parent->parentWidget(), TQ_SLOT (slotChanged()));
 
   TQWhatsThis::add( m_defaultStyles,  i18n(
       "This list displays the default styles for the current schema and "
@@ -688,8 +688,8 @@ KateSchemaConfigHighlightTab::KateSchemaConfigHighlightTab( TQWidget *parent, co
   TQLabel *lHl = new TQLabel( i18n("H&ighlight:"), hbHl );
   hlCombo = new TQComboBox( false, hbHl );
   lHl->setBuddy( hlCombo );
-  connect( hlCombo, TQT_SIGNAL(activated(int)),
-           this, TQT_SLOT(hlChanged(int)) );
+  connect( hlCombo, TQ_SIGNAL(activated(int)),
+           this, TQ_SLOT(hlChanged(int)) );
 
   for( int i = 0; i < KateHlManager::self()->highlights(); i++) {
     if (KateHlManager::self()->hlSection(i).length() > 0)
@@ -715,7 +715,7 @@ KateSchemaConfigHighlightTab::KateSchemaConfigHighlightTab( TQWidget *parent, co
     "to edit from the popup menu.<p>You can unset the Background and Selected "
     "Background colors from the context menu when appropriate.") );
 
-  connect (m_styles, TQT_SIGNAL (changed()), parent->parentWidget(), TQT_SLOT (slotChanged()));
+  connect (m_styles, TQ_SIGNAL (changed()), parent->parentWidget(), TQ_SLOT (slotChanged()));
 }
 
 KateSchemaConfigHighlightTab::~KateSchemaConfigHighlightTab()
@@ -833,20 +833,20 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc
   TQLabel *lHl = new TQLabel( i18n("&Schema:"), hbHl );
   schemaCombo = new TQComboBox( false, hbHl );
   lHl->setBuddy( schemaCombo );
-  connect( schemaCombo, TQT_SIGNAL(activated(int)),
-           this, TQT_SLOT(schemaChanged(int)) );
+  connect( schemaCombo, TQ_SIGNAL(activated(int)),
+           this, TQ_SLOT(schemaChanged(int)) );
 
   TQPushButton *btnnew = new TQPushButton( i18n("&New..."), hbHl );
-  connect( btnnew, TQT_SIGNAL(clicked()), this, TQT_SLOT(newSchema()) );
+  connect( btnnew, TQ_SIGNAL(clicked()), this, TQ_SLOT(newSchema()) );
 
   btndel = new TQPushButton( i18n("&Delete"), hbHl );
-  connect( btndel, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSchema()) );
+  connect( btndel, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSchema()) );
 
   m_tabWidget = new TQTabWidget ( this );
   m_tabWidget->setMargin (KDialog::marginHint());
   layout->add (m_tabWidget);
 
-  connect (m_tabWidget, TQT_SIGNAL (currentChanged (TQWidget *)), this, TQT_SLOT (newCurrentPage (TQWidget *)));
+  connect (m_tabWidget, TQ_SIGNAL (currentChanged (TQWidget *)), this, TQ_SLOT (newCurrentPage (TQWidget *)));
 
   m_colorTab = new KateSchemaConfigColorTab (m_tabWidget);
   m_tabWidget->addTab (m_colorTab, i18n("Colors"));
@@ -873,8 +873,8 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc
 
   reload();
 
-  connect( defaultSchemaCombo, TQT_SIGNAL(activated(int)),
-           this, TQT_SLOT(slotChanged()) );
+  connect( defaultSchemaCombo, TQ_SIGNAL(activated(int)),
+           this, TQ_SLOT(slotChanged()) );
 }
 
 KateSchemaConfigPage::~KateSchemaConfigPage ()
@@ -1003,7 +1003,7 @@ void KateViewSchemaAction::init()
   m_view = 0;
   last = 0;
 
-  connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow()));
+  connect(popupMenu(),TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotAboutToShow()));
 }
 
 void KateViewSchemaAction::updateMenu (KateView *view)
@@ -1023,7 +1023,7 @@ void KateViewSchemaAction::slotAboutToShow()
     if (names.contains(hlName) < 1)
     {
       names << hlName;
-      popupMenu()->insertItem ( hlName, this, TQT_SLOT(setSchema(int)), 0,  z+1);
+      popupMenu()->insertItem ( hlName, this, TQ_SLOT(setSchema(int)), 0,  z+1);
     }
   }
 
@@ -1060,10 +1060,10 @@ KateStyleListView::KateStyleListView( TQWidget *parent, bool showUseDefaults )
   addColumn( i18n("Background Selected") );
   if ( showUseDefaults )
     addColumn( i18n("Use Default Style") );
-  connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)),
-           this, TQT_SLOT(slotMousePressed(int, TQListViewItem*, const TQPoint&, int)) );
-  connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&, int)),
-           this, TQT_SLOT(showPopupMenu(TQListViewItem*, const TQPoint&)) );
+  connect( this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)),
+           this, TQ_SLOT(slotMousePressed(int, TQListViewItem*, const TQPoint&, int)) );
+  connect( this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&, int)),
+           this, TQ_SLOT(showPopupMenu(TQListViewItem*, const TQPoint&)) );
   // grap the bg color, selected color and default font
   normalcol = TDEGlobalSettings::textColor();
   bgcol = KateRendererConfig::global()->backgroundColor();
@@ -1093,21 +1093,21 @@ void KateStyleListView::showPopupMenu( KateStyleListItem *i, const TQPoint &glob
 
   if ( showtitle )
     m.insertTitle( i->contextName(), KateStyleListItem::ContextName );
-  id = m.insertItem( i18n("&Bold"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Bold );
+  id = m.insertItem( i18n("&Bold"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Bold );
   m.setItemChecked( id, is->bold() );
-  id = m.insertItem( i18n("&Italic"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Italic );
+  id = m.insertItem( i18n("&Italic"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Italic );
   m.setItemChecked( id, is->italic() );
-  id = m.insertItem( i18n("&Underline"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Underline );
+  id = m.insertItem( i18n("&Underline"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Underline );
   m.setItemChecked( id, is->underline() );
-  id = m.insertItem( i18n("S&trikeout"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Strikeout );
+  id = m.insertItem( i18n("S&trikeout"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Strikeout );
   m.setItemChecked( id, is->strikeOut() );
 
   m.insertSeparator();
 
-  m.insertItem( TQIconSet(cl), i18n("Normal &Color..."), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Color );
-  m.insertItem( TQIconSet(scl), i18n("&Selected Color..."), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::SelColor );
-  m.insertItem( TQIconSet(bgcl), i18n("&Background Color..."), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::BgColor );
-  m.insertItem( TQIconSet(sbgcl), i18n("S&elected Background Color..."), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::SelBgColor );
+  m.insertItem( TQIconSet(cl), i18n("Normal &Color..."), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Color );
+  m.insertItem( TQIconSet(scl), i18n("&Selected Color..."), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::SelColor );
+  m.insertItem( TQIconSet(bgcl), i18n("&Background Color..."), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::BgColor );
+  m.insertItem( TQIconSet(sbgcl), i18n("S&elected Background Color..."), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::SelBgColor );
 
   // Unset [some] colors. I could show one only if that button was clicked, but that
   // would disable setting this with the keyboard (how many aren't doing just
@@ -1118,14 +1118,14 @@ void KateStyleListView::showPopupMenu( KateStyleListItem *i, const TQPoint &glob
   {
     m.insertSeparator();
     if ( style->itemSet( KateAttribute::BGColor) )
-      m.insertItem( i18n("Unset Background Color"), this, TQT_SLOT(unsetColor(int)), 0, 100 );
+      m.insertItem( i18n("Unset Background Color"), this, TQ_SLOT(unsetColor(int)), 0, 100 );
     if ( style->itemSet( KateAttribute::SelectedBGColor ) )
-      m.insertItem( i18n("Unset Selected Background Color"), this, TQT_SLOT(unsetColor(int)), 0, 101 );
+      m.insertItem( i18n("Unset Selected Background Color"), this, TQ_SLOT(unsetColor(int)), 0, 101 );
   }
 
   if ( ! i->isDefault() && ! i->defStyle() ) {
     m.insertSeparator();
-    id = m.insertItem( i18n("Use &Default Style"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::UseDefStyle );
+    id = m.insertItem( i18n("Use &Default Style"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::UseDefStyle );
     m.setItemChecked( id, i->defStyle() );
   }
   m.exec( globalPos );
diff --git a/kate/part/kateschema.h b/kate/part/kateschema.h
index 55f03ebee..63cc210b5 100644
--- a/kate/part/kateschema.h
+++ b/kate/part/kateschema.h
@@ -198,7 +198,7 @@ class KateSchemaConfigColorTab : public TQWidget
     void schemaChanged( int newSchema );
 
   signals:
-    void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged)
+    void changed(); // connected to parentWidget()->parentWidget() TQ_SLOT(slotChanged)
 
   protected slots:
     void slotMarkerColorChanged(const TQColor&);
@@ -223,7 +223,7 @@ class KateSchemaConfigFontTab : public TQWidget
     void schemaChanged( int newSchema );
 
   signals:
-    void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged)
+    void changed(); // connected to parentWidget()->parentWidget() TQ_SLOT(slotChanged)
 
   private:
     class TDEFontChooser *m_fontchooser;
diff --git a/kate/part/katesearch.cpp b/kate/part/katesearch.cpp
index 187bc2fa2..b76af856b 100644
--- a/kate/part/katesearch.cpp
+++ b/kate/part/katesearch.cpp
@@ -58,7 +58,7 @@ KateSearch::KateSearch( KateView* view )
   m_arbitraryHLList = new KateSuperRangeList();
   if (arbitraryHLExample) m_doc->arbitraryHL()->addHighlightToView(m_arbitraryHLList, m_view);
 
-  connect(replacePrompt,TQT_SIGNAL(clicked()),this,TQT_SLOT(replaceSlot()));
+  connect(replacePrompt,TQ_SIGNAL(clicked()),this,TQ_SLOT(replaceSlot()));
 }
 
 KateSearch::~KateSearch()
@@ -68,13 +68,13 @@ KateSearch::~KateSearch()
 
 void KateSearch::createActions( TDEActionCollection* ac )
 {
-  KStdAction::find( this, TQT_SLOT(find()), ac )->setWhatsThis(
+  KStdAction::find( this, TQ_SLOT(find()), ac )->setWhatsThis(
     i18n("Look up the first occurrence of a piece of text or regular expression."));
-  KStdAction::findNext( this, TQT_SLOT(slotFindNext()), ac )->setWhatsThis(
+  KStdAction::findNext( this, TQ_SLOT(slotFindNext()), ac )->setWhatsThis(
     i18n("Look up the next occurrence of the search phrase."));
-  KStdAction::findPrev( this, TQT_SLOT(slotFindPrev()), ac, "edit_find_prev" )->setWhatsThis(
+  KStdAction::findPrev( this, TQ_SLOT(slotFindPrev()), ac, "edit_find_prev" )->setWhatsThis(
     i18n("Look up the previous occurrence of the search phrase."));
-  KStdAction::replace( this, TQT_SLOT(replace()), ac )->setWhatsThis(
+  KStdAction::replace( this, TQ_SLOT(replace()), ac )->setWhatsThis(
     i18n("Look up a piece of text or regular expression and replace the result with some given text."));
 }
 
@@ -732,7 +732,7 @@ bool KateSearch::doSearch( const TQString& text )
     hl->setTextColor(TQt::white);
     hl->setBGColor(TQt::black);
     // destroy the highlight upon change
-    connect(hl, TQT_SIGNAL(contentsChanged()), hl, TQT_SIGNAL(eliminated()));
+    connect(hl, TQ_SIGNAL(contentsChanged()), hl, TQ_SIGNAL(eliminated()));
     m_arbitraryHLList->append(hl);
   }
 
diff --git a/kate/part/katespell.cpp b/kate/part/katespell.cpp
index 84b4337d9..e19f4fb94 100644
--- a/kate/part/katespell.cpp
+++ b/kate/part/katespell.cpp
@@ -53,11 +53,11 @@ KateSpell::~KateSpell()
 
 void KateSpell::createActions( TDEActionCollection* ac )
 {
-   KStdAction::spelling( this, TQT_SLOT(spellcheck()), ac );
-   TDEAction *a = new TDEAction( i18n("Spelling (from cursor)..."), "tools-check-spelling", 0, this, TQT_SLOT(spellcheckFromCursor()), ac, "tools_spelling_from_cursor" );
+   KStdAction::spelling( this, TQ_SLOT(spellcheck()), ac );
+   TDEAction *a = new TDEAction( i18n("Spelling (from cursor)..."), "tools-check-spelling", 0, this, TQ_SLOT(spellcheckFromCursor()), ac, "tools_spelling_from_cursor" );
    a->setWhatsThis(i18n("Check the document's spelling from the cursor and forward"));
 
-   m_spellcheckSelection = new TDEAction( i18n("Spellcheck Selection..."), "tools-check-spelling", 0, this, TQT_SLOT(spellcheckSelection()), ac, "tools_spelling_selection" );
+   m_spellcheckSelection = new TDEAction( i18n("Spellcheck Selection..."), "tools-check-spelling", 0, this, TQ_SLOT(spellcheckSelection()), ac, "tools_spelling_selection" );
    m_spellcheckSelection->setWhatsThis(i18n("Check spelling of the selected text"));
 }
 
@@ -123,17 +123,17 @@ void KateSpell::spellcheck( const KateTextCursor &from, const KateTextCursor &to
     kdDebug(13020)<<"KateSpell::spellCheck(): using encoding: "<<enc<<" and KSpell::Type "<<type<<" (for '"<<mt<<"')"<<endl;
 
   m_tdespell = new KSpell( m_view, i18n("Spellcheck"),
-                         this, TQT_SLOT(ready(KSpell *)), ksc, true, true, type );
+                         this, TQ_SLOT(ready(KSpell *)), ksc, true, true, type );
 
-  connect( m_tdespell, TQT_SIGNAL(death()),
-           this, TQT_SLOT(spellCleanDone()) );
+  connect( m_tdespell, TQ_SIGNAL(death()),
+           this, TQ_SLOT(spellCleanDone()) );
 
-  connect( m_tdespell, TQT_SIGNAL(misspelling(const TQString&, const TQStringList&, unsigned int)),
-           this, TQT_SLOT(misspelling(const TQString&, const TQStringList&, unsigned int)) );
-  connect( m_tdespell, TQT_SIGNAL(corrected(const TQString&, const TQString&, unsigned int)),
-           this, TQT_SLOT(corrected(const TQString&, const TQString&, unsigned int)) );
-  connect( m_tdespell, TQT_SIGNAL(done(const TQString&)),
-           this, TQT_SLOT(spellResult(const TQString&)) );
+  connect( m_tdespell, TQ_SIGNAL(misspelling(const TQString&, const TQStringList&, unsigned int)),
+           this, TQ_SLOT(misspelling(const TQString&, const TQStringList&, unsigned int)) );
+  connect( m_tdespell, TQ_SIGNAL(corrected(const TQString&, const TQString&, unsigned int)),
+           this, TQ_SLOT(corrected(const TQString&, const TQString&, unsigned int)) );
+  connect( m_tdespell, TQ_SIGNAL(done(const TQString&)),
+           this, TQ_SLOT(spellResult(const TQString&)) );
 }
 
 void KateSpell::ready(KSpell *)
diff --git a/kate/part/katesupercursor.cpp b/kate/part/katesupercursor.cpp
index 1d47fcb4e..4b5d02864 100644
--- a/kate/part/katesupercursor.cpp
+++ b/kate/part/katesupercursor.cpp
@@ -328,15 +328,15 @@ void KateSuperRange::init()
   setBehaviour(DoNotExpand);
 
   // Not necessarily the best implementation
-  connect(m_start, TQT_SIGNAL(positionDirectlyChanged()),  TQT_SIGNAL(contentsChanged()));
-  connect(m_end, TQT_SIGNAL(positionDirectlyChanged()),  TQT_SIGNAL(contentsChanged()));
+  connect(m_start, TQ_SIGNAL(positionDirectlyChanged()),  TQ_SIGNAL(contentsChanged()));
+  connect(m_end, TQ_SIGNAL(positionDirectlyChanged()),  TQ_SIGNAL(contentsChanged()));
 
-  connect(m_start, TQT_SIGNAL(positionChanged()),  TQT_SLOT(slotEvaluateChanged()));
-  connect(m_end, TQT_SIGNAL(positionChanged()),  TQT_SLOT(slotEvaluateChanged()));
-  connect(m_start, TQT_SIGNAL(positionUnChanged()), TQT_SLOT(slotEvaluateUnChanged()));
-  connect(m_end, TQT_SIGNAL(positionUnChanged()), TQT_SLOT(slotEvaluateUnChanged()));
-  connect(m_start, TQT_SIGNAL(positionDeleted()), TQT_SIGNAL(boundaryDeleted()));
-  connect(m_end, TQT_SIGNAL(positionDeleted()), TQT_SIGNAL(boundaryDeleted()));
+  connect(m_start, TQ_SIGNAL(positionChanged()),  TQ_SLOT(slotEvaluateChanged()));
+  connect(m_end, TQ_SIGNAL(positionChanged()),  TQ_SLOT(slotEvaluateChanged()));
+  connect(m_start, TQ_SIGNAL(positionUnChanged()), TQ_SLOT(slotEvaluateUnChanged()));
+  connect(m_end, TQ_SIGNAL(positionUnChanged()), TQ_SLOT(slotEvaluateUnChanged()));
+  connect(m_start, TQ_SIGNAL(positionDeleted()), TQ_SIGNAL(boundaryDeleted()));
+  connect(m_end, TQ_SIGNAL(positionDeleted()), TQ_SIGNAL(boundaryDeleted()));
 }
 
 KateSuperRange::~KateSuperRange()
@@ -581,8 +581,8 @@ void KateSuperRangeList::connectAll()
   if (!m_connect) {
     m_connect = true;
     for (KateSuperRange* range = first(); range; range = next()) {
-      connect(range, TQT_SIGNAL(destroyed(TQObject*)), TQT_SLOT(slotDeleted(TQObject*)));
-      connect(range, TQT_SIGNAL(eliminated()), TQT_SLOT(slotEliminated()));
+      connect(range, TQ_SIGNAL(destroyed(TQObject*)), TQ_SLOT(slotDeleted(TQObject*)));
+      connect(range, TQ_SIGNAL(eliminated()), TQ_SLOT(slotEliminated()));
     }
   }
 }
@@ -727,9 +727,9 @@ int KateSuperRangeList::compareItems(TQPtrCollection::Item item1, TQPtrCollectio
 TQPtrCollection::Item KateSuperRangeList::newItem(TQPtrCollection::Item d)
 {
   if (m_connect) {
-    connect(static_cast<KateSuperRange*>(d), TQT_SIGNAL(destroyed(TQObject*)), TQT_SLOT(slotDeleted(TQObject*)));
-    connect(static_cast<KateSuperRange*>(d), TQT_SIGNAL(eliminated()), TQT_SLOT(slotEliminated()));
-    connect(static_cast<KateSuperRange*>(d), TQT_SIGNAL(tagRange(KateSuperRange*)), TQT_SIGNAL(tagRange(KateSuperRange*)));
+    connect(static_cast<KateSuperRange*>(d), TQ_SIGNAL(destroyed(TQObject*)), TQ_SLOT(slotDeleted(TQObject*)));
+    connect(static_cast<KateSuperRange*>(d), TQ_SIGNAL(eliminated()), TQ_SLOT(slotEliminated()));
+    connect(static_cast<KateSuperRange*>(d), TQ_SIGNAL(tagRange(KateSuperRange*)), TQ_SIGNAL(tagRange(KateSuperRange*)));
 
     // HACK HACK
     static_cast<KateSuperRange*>(d)->slotTagRange();
diff --git a/kate/part/katetemplatehandler.cpp b/kate/part/katetemplatehandler.cpp
index 9607f6b9a..5403d0308 100644
--- a/kate/part/katetemplatehandler.cpp
+++ b/kate/part/katetemplatehandler.cpp
@@ -38,7 +38,7 @@ KateTemplateHandler::KateTemplateHandler(
     , m_initOk( false )
     , m_recursion( false )
 {
-  connect( m_doc, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDocumentDestroyed() ) );
+  connect( m_doc, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDocumentDestroyed() ) );
   m_ranges = new KateSuperRangeList( false, this ); //false/*,this*/);
 
   if ( !m_doc->setTabInterceptor( this ) )
@@ -116,13 +116,13 @@ KateTemplateHandler::KateTemplateHandler(
     m_doc->tagLines( ( *it ) ->start().line(), ( *it ) ->end().line() );
   }
 
-  /* connect(doc,TQT_SIGNAL(charactersInteractivelyInserted(int ,int ,const TQString&)),this,
-   TQT_SLOT(slotCharactersInteractivlyInserted(int,int,const TQString&)));
-   connect(doc,TQT_SIGNAL(charactersSemiInteractivelyInserted(int ,int ,const TQString&)),this,
-   TQT_SLOT(slotCharactersInteractivlyInserted(int,int,const TQString&)));*/
-  connect( doc, TQT_SIGNAL( textInserted( int, int ) ), this, TQT_SLOT( slotTextInserted( int, int ) ) );
-  connect( doc, TQT_SIGNAL( aboutToRemoveText( const KateTextRange& ) ), this, TQT_SLOT( slotAboutToRemoveText( const KateTextRange& ) ) );
-  connect( doc, TQT_SIGNAL( textRemoved() ), this, TQT_SLOT( slotTextRemoved() ) );
+  /* connect(doc,TQ_SIGNAL(charactersInteractivelyInserted(int ,int ,const TQString&)),this,
+   TQ_SLOT(slotCharactersInteractivlyInserted(int,int,const TQString&)));
+   connect(doc,TQ_SIGNAL(charactersSemiInteractivelyInserted(int ,int ,const TQString&)),this,
+   TQ_SLOT(slotCharactersInteractivlyInserted(int,int,const TQString&)));*/
+  connect( doc, TQ_SIGNAL( textInserted( int, int ) ), this, TQ_SLOT( slotTextInserted( int, int ) ) );
+  connect( doc, TQ_SIGNAL( aboutToRemoveText( const KateTextRange& ) ), this, TQ_SLOT( slotAboutToRemoveText( const KateTextRange& ) ) );
+  connect( doc, TQ_SIGNAL( textRemoved() ), this, TQ_SLOT( slotTextRemoved() ) );
 
   ( *this ) ( TQt::Key_Tab );
 }
@@ -324,9 +324,9 @@ void KateTemplateHandler::slotAboutToRemoveText( const KateTextRange &range )
 
   if ( m_doc )
   {
-    disconnect( m_doc, TQT_SIGNAL( textInserted( int, int ) ), this, TQT_SLOT( slotTextInserted( int, int ) ) );
-    disconnect( m_doc, TQT_SIGNAL( aboutToRemoveText( const KateTextRange& ) ), this, TQT_SLOT( slotAboutToRemoveText( const KateTextRange& ) ) );
-    disconnect( m_doc, TQT_SIGNAL( textRemoved() ), this, TQT_SLOT( slotTextRemoved() ) );
+    disconnect( m_doc, TQ_SIGNAL( textInserted( int, int ) ), this, TQ_SLOT( slotTextInserted( int, int ) ) );
+    disconnect( m_doc, TQ_SIGNAL( aboutToRemoveText( const KateTextRange& ) ), this, TQ_SLOT( slotAboutToRemoveText( const KateTextRange& ) ) );
+    disconnect( m_doc, TQ_SIGNAL( textRemoved() ), this, TQ_SLOT( slotTextRemoved() ) );
   }
 
   deleteLater();
diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp
index abf2941c7..95e9d1eae 100644
--- a/kate/part/kateview.cpp
+++ b/kate/part/kateview.cpp
@@ -159,8 +159,8 @@ KateView::KateView( KateDocument *doc, TQWidget *parent, const char * name )
 
   slotHlChanged();
   /*test texthint
-  connect(this,TQT_SIGNAL(needTextHint(int, int, TQString &)),
-  this,TQT_SLOT(slotNeedTextHint(int, int, TQString &)));
+  connect(this,TQ_SIGNAL(needTextHint(int, int, TQString &)),
+  this,TQ_SLOT(slotNeedTextHint(int, int, TQString &)));
   enableTextHints(1000);
   test texthint*/
 }
@@ -186,22 +186,22 @@ KateView::~KateView()
 
 void KateView::setupConnections()
 {
-  connect( m_doc, TQT_SIGNAL(undoChanged()),
-           this, TQT_SLOT(slotNewUndo()) );
-  connect( m_doc, TQT_SIGNAL(hlChanged()),
-           this, TQT_SLOT(slotHlChanged()) );
-  connect( m_doc, TQT_SIGNAL(canceled(const TQString&)),
-           this, TQT_SLOT(slotSaveCanceled(const TQString&)) );
-  connect( m_viewInternal, TQT_SIGNAL(dropEventPass(TQDropEvent*)),
-           this,           TQT_SIGNAL(dropEventPass(TQDropEvent*)) );
-  connect(this,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(slotStatusMsg()));
-  connect(this,TQT_SIGNAL(newStatus()),this,TQT_SLOT(slotStatusMsg()));
-  connect(m_doc, TQT_SIGNAL(undoChanged()), this, TQT_SLOT(slotStatusMsg()));
+  connect( m_doc, TQ_SIGNAL(undoChanged()),
+           this, TQ_SLOT(slotNewUndo()) );
+  connect( m_doc, TQ_SIGNAL(hlChanged()),
+           this, TQ_SLOT(slotHlChanged()) );
+  connect( m_doc, TQ_SIGNAL(canceled(const TQString&)),
+           this, TQ_SLOT(slotSaveCanceled(const TQString&)) );
+  connect( m_viewInternal, TQ_SIGNAL(dropEventPass(TQDropEvent*)),
+           this,           TQ_SIGNAL(dropEventPass(TQDropEvent*)) );
+  connect(this,TQ_SIGNAL(cursorPositionChanged()),this,TQ_SLOT(slotStatusMsg()));
+  connect(this,TQ_SIGNAL(newStatus()),this,TQ_SLOT(slotStatusMsg()));
+  connect(m_doc, TQ_SIGNAL(undoChanged()), this, TQ_SLOT(slotStatusMsg()));
 
   if ( m_doc->browserView() )
   {
-    connect( this, TQT_SIGNAL(dropEventPass(TQDropEvent*)),
-             this, TQT_SLOT(slotDropEventPass(TQDropEvent*)) );
+    connect( this, TQ_SIGNAL(dropEventPass(TQDropEvent*)),
+             this, TQ_SLOT(slotDropEventPass(TQDropEvent*)) );
   }
 }
 
@@ -212,84 +212,84 @@ void KateView::setupActions()
 
   m_toggleWriteLock = 0;
 
-  m_cut = a=KStdAction::cut(this, TQT_SLOT(cut()), ac);
+  m_cut = a=KStdAction::cut(this, TQ_SLOT(cut()), ac);
   a->setWhatsThis(i18n("Cut the selected text and move it to the clipboard"));
 
-  m_paste = a=KStdAction::pasteText(this, TQT_SLOT(paste()), ac);
+  m_paste = a=KStdAction::pasteText(this, TQ_SLOT(paste()), ac);
   a->setWhatsThis(i18n("Paste previously copied or cut clipboard contents"));
 
-  m_copy = a=KStdAction::copy(this, TQT_SLOT(copy()), ac);
+  m_copy = a=KStdAction::copy(this, TQ_SLOT(copy()), ac);
   a->setWhatsThis(i18n( "Use this command to copy the currently selected text to the system clipboard."));
 
-  m_copyHTML = a = new TDEAction(i18n("Copy as &HTML"), "edit-copy", 0, this, TQT_SLOT(copyHTML()), ac, "edit_copy_html");
+  m_copyHTML = a = new TDEAction(i18n("Copy as &HTML"), "edit-copy", 0, this, TQ_SLOT(copyHTML()), ac, "edit_copy_html");
   a->setWhatsThis(i18n( "Use this command to copy the currently selected text as HTML to the system clipboard."));
 
   if (!m_doc->readOnly())
   {
-    a=KStdAction::save(this, TQT_SLOT(save()), ac);
+    a=KStdAction::save(this, TQ_SLOT(save()), ac);
     a->setWhatsThis(i18n("Save the current document"));
 
-    a=m_editUndo = KStdAction::undo(m_doc, TQT_SLOT(undo()), ac);
+    a=m_editUndo = KStdAction::undo(m_doc, TQ_SLOT(undo()), ac);
     a->setWhatsThis(i18n("Revert the most recent editing actions"));
 
-    a=m_editRedo = KStdAction::redo(m_doc, TQT_SLOT(redo()), ac);
+    a=m_editRedo = KStdAction::redo(m_doc, TQ_SLOT(redo()), ac);
     a->setWhatsThis(i18n("Revert the most recent undo operation"));
 
-    (new TDEAction(i18n("&Word Wrap Document"), "", 0, this, TQT_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis(
+    (new TDEAction(i18n("&Word Wrap Document"), "", 0, this, TQ_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis(
   i18n("Use this command to wrap all lines of the current document which are longer than the width of the"
     " current view, to fit into this view.<br><br> This is a static word wrap, meaning it is not updated"
     " when the view is resized."));
 
     // setup Tools menu
-    a=new TDEAction(i18n("&Indent"), "format-indent-more", TQt::CTRL+TQt::Key_I, this, TQT_SLOT(indent()), ac, "tools_indent");
+    a=new TDEAction(i18n("&Indent"), "format-indent-more", TQt::CTRL+TQt::Key_I, this, TQ_SLOT(indent()), ac, "tools_indent");
     a->setWhatsThis(i18n("Use this to indent a selected block of text.<br><br>"
         "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog."));
-    a=new TDEAction(i18n("&Unindent"), "format-indent-less", TQt::CTRL+TQt::SHIFT+TQt::Key_I, this, TQT_SLOT(unIndent()), ac, "tools_unindent");
+    a=new TDEAction(i18n("&Unindent"), "format-indent-less", TQt::CTRL+TQt::SHIFT+TQt::Key_I, this, TQ_SLOT(unIndent()), ac, "tools_unindent");
     a->setWhatsThis(i18n("Use this to unindent a selected block of text."));
 
-    a=new TDEAction(i18n("&Clean Indentation"), 0, this, TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent");
+    a=new TDEAction(i18n("&Clean Indentation"), 0, this, TQ_SLOT(cleanIndent()), ac, "tools_cleanIndent");
     a->setWhatsThis(i18n("Use this to clean the indentation of a selected block of text (only tabs/only spaces)<br><br>"
         "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog."));
 
-    a=new TDEAction(i18n("&Align"), 0, this, TQT_SLOT(align()), ac, "tools_align");
+    a=new TDEAction(i18n("&Align"), 0, this, TQ_SLOT(align()), ac, "tools_align");
     a->setWhatsThis(i18n("Use this to align the current line or block of text to its proper indent level."));
 
-    a=new TDEAction(i18n("C&omment"), CTRL+TQt::Key_D, this, TQT_SLOT(comment()),
+    a=new TDEAction(i18n("C&omment"), CTRL+TQt::Key_D, this, TQ_SLOT(comment()),
         ac, "tools_comment");
     a->setWhatsThis(i18n("This command comments out the current line or a selected block of text.<BR><BR>"
         "The characters for single/multiple line comments are defined within the language's highlighting."));
 
-    a=new TDEAction(i18n("Unco&mment"), CTRL+SHIFT+TQt::Key_D, this, TQT_SLOT(uncomment()),
+    a=new TDEAction(i18n("Unco&mment"), CTRL+SHIFT+TQt::Key_D, this, TQ_SLOT(uncomment()),
                                  ac, "tools_uncomment");
     a->setWhatsThis(i18n("This command removes comments from the current line or a selected block of text.<BR><BR>"
     "The characters for single/multiple line comments are defined within the language's highlighting."));
     a = m_toggleWriteLock = new TDEToggleAction(
                 i18n("&Read Only Mode"), 0, 0,
-                this, TQT_SLOT( toggleWriteLock() ),
+                this, TQ_SLOT( toggleWriteLock() ),
                 ac, "tools_toggle_write_lock" );
     a->setWhatsThis( i18n("Lock/unlock the document for writing") );
 
     a = new TDEAction( i18n("Uppercase"), CTRL + TQt::Key_U, this,
-      TQT_SLOT(uppercase()), ac, "tools_uppercase" );
+      TQ_SLOT(uppercase()), ac, "tools_uppercase" );
     a->setWhatsThis( i18n("Convert the selection to uppercase, or the character to the "
       "right of the cursor if no text is selected.") );
 
     a = new TDEAction( i18n("Lowercase"), CTRL + SHIFT + TQt::Key_U, this,
-      TQT_SLOT(lowercase()), ac, "tools_lowercase" );
+      TQ_SLOT(lowercase()), ac, "tools_lowercase" );
     a->setWhatsThis( i18n("Convert the selection to lowercase, or the character to the "
       "right of the cursor if no text is selected.") );
 
     a = new TDEAction( i18n("Capitalize"), CTRL + ALT + TQt::Key_U, this,
-      TQT_SLOT(capitalize()), ac, "tools_capitalize" );
+      TQ_SLOT(capitalize()), ac, "tools_capitalize" );
     a->setWhatsThis( i18n("Capitalize the selection, or the word under the "
       "cursor if no text is selected.") );
 
     a = new TDEAction( i18n("Delete Line"), 0, this, 
-      TQT_SLOT( killLine() ), ac, "tools_delete_line");
+      TQ_SLOT( killLine() ), ac, "tools_delete_line");
     a->setWhatsThis(i18n("Use this to delete the current line."));
     
     a = new TDEAction( i18n("Join Lines"), CTRL + TQt::Key_J, this,
-      TQT_SLOT( joinLines() ), ac, "tools_join_lines" );
+      TQ_SLOT( joinLines() ), ac, "tools_join_lines" );
     a->setWhatsThis(i18n("Use this to join lines together."));
   }
   else
@@ -300,19 +300,19 @@ void KateView::setupActions()
     m_editRedo = 0;
   }
 
-  a=KStdAction::print( m_doc, TQT_SLOT(print()), ac );
+  a=KStdAction::print( m_doc, TQ_SLOT(print()), ac );
   a->setWhatsThis(i18n("Print the current document."));
 
-  a=new TDEAction(i18n("Reloa&d"), "reload", TDEStdAccel::reload(), this, TQT_SLOT(reloadFile()), ac, "file_reload");
+  a=new TDEAction(i18n("Reloa&d"), "reload", TDEStdAccel::reload(), this, TQ_SLOT(reloadFile()), ac, "file_reload");
   a->setWhatsThis(i18n("Reload the current document from disk."));
 
-  a=KStdAction::saveAs(this, TQT_SLOT(saveAs()), ac);
+  a=KStdAction::saveAs(this, TQ_SLOT(saveAs()), ac);
   a->setWhatsThis(i18n("Save the current document to disk, with a name of your choice."));
 
-  a=KStdAction::gotoLine(this, TQT_SLOT(gotoLine()), ac);
+  a=KStdAction::gotoLine(this, TQ_SLOT(gotoLine()), ac);
   a->setWhatsThis(i18n("This command opens a dialog and lets you choose a line that you want the cursor to move to."));
 
-  a=new TDEAction(i18n("&Configure Editor..."), 0, m_doc, TQT_SLOT(configDialog()),ac, "set_confdlg");
+  a=new TDEAction(i18n("&Configure Editor..."), 0, m_doc, TQ_SLOT(configDialog()),ac, "set_confdlg");
   a->setWhatsThis(i18n("Configure various aspects of this editor."));
 
   KateViewHighlightAction *menu = new KateViewHighlightAction (i18n("&Highlighting"), ac, "set_highlight");
@@ -329,45 +329,45 @@ void KateView::setupActions()
   new KateViewIndentationAction (m_doc, i18n("&Indentation"),ac,"tools_indentation");
 
   // html export
-  a = new TDEAction(i18n("E&xport as HTML..."), 0, 0, this, TQT_SLOT(exportAsHTML()), ac, "file_export_html");
+  a = new TDEAction(i18n("E&xport as HTML..."), 0, 0, this, TQ_SLOT(exportAsHTML()), ac, "file_export_html");
   a->setWhatsThis(i18n("This command allows you to export the current document"
                       " with all highlighting information into a HTML document."));
 
-  m_selectAll = a=KStdAction::selectAll(this, TQT_SLOT(selectAll()), ac);
+  m_selectAll = a=KStdAction::selectAll(this, TQ_SLOT(selectAll()), ac);
   a->setWhatsThis(i18n("Select the entire text of the current document."));
 
-  m_deSelect = a=KStdAction::deselect(this, TQT_SLOT(clearSelection()), ac);
+  m_deSelect = a=KStdAction::deselect(this, TQ_SLOT(clearSelection()), ac);
   a->setWhatsThis(i18n("If you have selected something within the current document, this will no longer be selected."));
 
-  a=new TDEAction(i18n("Enlarge Font"), "zoom-in", 0, m_viewInternal, TQT_SLOT(slotIncFontSizes()), ac, "incFontSizes");
+  a=new TDEAction(i18n("Enlarge Font"), "zoom-in", 0, m_viewInternal, TQ_SLOT(slotIncFontSizes()), ac, "incFontSizes");
   a->setWhatsThis(i18n("This increases the display font size."));
 
-  a=new TDEAction(i18n("Shrink Font"), "zoom-out", 0, m_viewInternal, TQT_SLOT(slotDecFontSizes()), ac, "decFontSizes");
+  a=new TDEAction(i18n("Shrink Font"), "zoom-out", 0, m_viewInternal, TQ_SLOT(slotDecFontSizes()), ac, "decFontSizes");
   a->setWhatsThis(i18n("This decreases the display font size."));
 
   a= m_toggleBlockSelection = new TDEToggleAction(
     i18n("Bl&ock Selection Mode"), CTRL + SHIFT + Key_B,
-    this, TQT_SLOT(toggleBlockSelectionMode()),
+    this, TQ_SLOT(toggleBlockSelectionMode()),
     ac, "set_verticalSelect");
   a->setWhatsThis(i18n("This command allows switching between the normal (line based) selection mode and the block selection mode."));
 
   a= m_toggleInsert = new TDEToggleAction(
     i18n("Overwr&ite Mode"), Key_Insert,
-    this, TQT_SLOT(toggleInsert()),
+    this, TQ_SLOT(toggleInsert()),
     ac, "set_insert" );
   a->setWhatsThis(i18n("Choose whether you want the text you type to be inserted or to overwrite existing text."));
 
   TDEToggleAction *toggleAction;
    a= m_toggleDynWrap = toggleAction = new TDEToggleAction(
     i18n("&Dynamic Word Wrap"), Key_F10,
-    this, TQT_SLOT(toggleDynWordWrap()),
+    this, TQ_SLOT(toggleDynWordWrap()),
     ac, "view_dynamic_word_wrap" );
   a->setWhatsThis(i18n("If this option is checked, the text lines will be wrapped at the view border on the screen."));
 
   a= m_setDynWrapIndicators = new TDESelectAction(i18n("Dynamic Word Wrap Indicators"), 0, ac, "dynamic_word_wrap_indicators");
   a->setWhatsThis(i18n("Choose when the Dynamic Word Wrap Indicators should be displayed"));
 
-  connect(m_setDynWrapIndicators, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setDynWrapIndicators(int)));
+  connect(m_setDynWrapIndicators, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setDynWrapIndicators(int)));
   TQStringList list2;
   list2.append(i18n("&Off"));
   list2.append(i18n("Follow &Line Numbers"));
@@ -376,14 +376,14 @@ void KateView::setupActions()
 
   a= toggleAction=m_toggleFoldingMarkers = new TDEToggleAction(
     i18n("Show Folding &Markers"), Key_F9,
-    this, TQT_SLOT(toggleFoldingMarkers()),
+    this, TQ_SLOT(toggleFoldingMarkers()),
     ac, "view_folding_markers" );
   a->setWhatsThis(i18n("You can choose if the codefolding marks should be shown, if codefolding is possible."));
   toggleAction->setCheckedState(i18n("Hide Folding &Markers"));
 
    a= m_toggleIconBar = toggleAction = new TDEToggleAction(
     i18n("Show &Icon Border"), Key_F6,
-    this, TQT_SLOT(toggleIconBorder()),
+    this, TQ_SLOT(toggleIconBorder()),
     ac, "view_border");
   a=toggleAction;
   a->setWhatsThis(i18n("Show/hide the icon border.<BR><BR> The icon border shows bookmark symbols, for instance."));
@@ -391,21 +391,21 @@ void KateView::setupActions()
 
   a= toggleAction=m_toggleLineNumbers = new TDEToggleAction(
      i18n("Show &Line Numbers"), Key_F11,
-     this, TQT_SLOT(toggleLineNumbersOn()),
+     this, TQ_SLOT(toggleLineNumbersOn()),
      ac, "view_line_numbers" );
   a->setWhatsThis(i18n("Show/hide the line numbers on the left hand side of the view."));
   toggleAction->setCheckedState(i18n("Hide &Line Numbers"));
 
   a= m_toggleScrollBarMarks = toggleAction = new TDEToggleAction(
      i18n("Show Scroll&bar Marks"), 0,
-     this, TQT_SLOT(toggleScrollBarMarks()),
+     this, TQ_SLOT(toggleScrollBarMarks()),
      ac, "view_scrollbar_marks");
   a->setWhatsThis(i18n("Show/hide the marks on the vertical scrollbar.<BR><BR>The marks, for instance, show bookmarks."));
   toggleAction->setCheckedState(i18n("Hide Scroll&bar Marks"));
 
   a = toggleAction = m_toggleWWMarker = new TDEToggleAction(
         i18n("Show Static &Word Wrap Marker"), 0,
-        this, TQT_SLOT( toggleWWMarker() ),
+        this, TQ_SLOT( toggleWWMarker() ),
         ac, "view_word_wrap_marker" );
   a->setWhatsThis( i18n(
         "Show/hide the Word Wrap Marker, a vertical line drawn at the word "
@@ -414,7 +414,7 @@ void KateView::setupActions()
 
   a= m_switchCmdLine = new TDEAction(
      i18n("Switch to Command Line"), Key_F7,
-     this, TQT_SLOT(switchToCmdLine()),
+     this, TQ_SLOT(switchToCmdLine()),
      ac, "switch_to_cmd_line" );
   a->setWhatsThis(i18n("Show/hide the command line on the bottom of the view."));
 
@@ -426,7 +426,7 @@ void KateView::setupActions()
   list.append("&Macintosh");
   m_setEndOfLine->setItems(list);
   m_setEndOfLine->setCurrentItem (m_doc->config()->eol());
-  connect(m_setEndOfLine, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setEol(int)));
+  connect(m_setEndOfLine, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setEol(int)));
 
   // encoding menu
   new KateViewEncodingAction (m_doc, this, i18n("E&ncoding"), ac, "set_encoding");
@@ -437,7 +437,7 @@ void KateView::setupActions()
 
   slotSelectionChanged ();
 
-  connect (this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
+  connect (this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()));
 }
 
 void KateView::setupEditActions()
@@ -447,134 +447,134 @@ void KateView::setupEditActions()
 
   new TDEAction(
     i18n("Move Word Left"),                         CTRL + Key_Left,
-    this,TQT_SLOT(wordLeft()),
+    this,TQ_SLOT(wordLeft()),
     ac, "word_left" );
   new TDEAction(
     i18n("Select Character Left"),          SHIFT +        Key_Left,
-    this,TQT_SLOT(shiftCursorLeft()),
+    this,TQ_SLOT(shiftCursorLeft()),
     ac, "select_char_left" );
   new TDEAction(
     i18n("Select Word Left"),               SHIFT + CTRL + Key_Left,
-    this, TQT_SLOT(shiftWordLeft()),
+    this, TQ_SLOT(shiftWordLeft()),
     ac, "select_word_left" );
 
   new TDEAction(
     i18n("Move Word Right"),                        CTRL + Key_Right,
-    this, TQT_SLOT(wordRight()),
+    this, TQ_SLOT(wordRight()),
     ac, "word_right" );
   new TDEAction(
     i18n("Select Character Right"),         SHIFT        + Key_Right,
-    this, TQT_SLOT(shiftCursorRight()),
+    this, TQ_SLOT(shiftCursorRight()),
     ac, "select_char_right" );
   new TDEAction(
     i18n("Select Word Right"),              SHIFT + CTRL + Key_Right,
-    this,TQT_SLOT(shiftWordRight()),
+    this,TQ_SLOT(shiftWordRight()),
     ac, "select_word_right" );
 
   new TDEAction(
     i18n("Move to Beginning of Line"),                      Key_Home,
-    this, TQT_SLOT(home()),
+    this, TQ_SLOT(home()),
     ac, "beginning_of_line" );
   new TDEAction(
     i18n("Move to Beginning of Document"),           TDEStdAccel::home(),
-    this, TQT_SLOT(top()),
+    this, TQ_SLOT(top()),
     ac, "beginning_of_document" );
   new TDEAction(
     i18n("Select to Beginning of Line"),     SHIFT +        Key_Home,
-    this, TQT_SLOT(shiftHome()),
+    this, TQ_SLOT(shiftHome()),
     ac, "select_beginning_of_line" );
   new TDEAction(
     i18n("Select to Beginning of Document"), SHIFT + CTRL + Key_Home,
-    this, TQT_SLOT(shiftTop()),
+    this, TQ_SLOT(shiftTop()),
     ac, "select_beginning_of_document" );
 
   new TDEAction(
     i18n("Move to End of Line"),                            Key_End,
-    this, TQT_SLOT(end()),
+    this, TQ_SLOT(end()),
     ac, "end_of_line" );
   new TDEAction(
     i18n("Move to End of Document"),                 TDEStdAccel::end(),
-    this, TQT_SLOT(bottom()),
+    this, TQ_SLOT(bottom()),
     ac, "end_of_document" );
   new TDEAction(
     i18n("Select to End of Line"),           SHIFT +        Key_End,
-    this, TQT_SLOT(shiftEnd()),
+    this, TQ_SLOT(shiftEnd()),
     ac, "select_end_of_line" );
   new TDEAction(
     i18n("Select to End of Document"),       SHIFT + CTRL + Key_End,
-    this, TQT_SLOT(shiftBottom()),
+    this, TQ_SLOT(shiftBottom()),
     ac, "select_end_of_document" );
 
   new TDEAction(
     i18n("Select to Previous Line"),                SHIFT + Key_Up,
-    this, TQT_SLOT(shiftUp()),
+    this, TQ_SLOT(shiftUp()),
     ac, "select_line_up" );
   new TDEAction(
     i18n("Scroll Line Up"),"",              CTRL +          Key_Up,
-    this, TQT_SLOT(scrollUp()),
+    this, TQ_SLOT(scrollUp()),
     ac, "scroll_line_up" );
 
-  new TDEAction(i18n("Move to Next Line"), Key_Down, this, TQT_SLOT(down()),
+  new TDEAction(i18n("Move to Next Line"), Key_Down, this, TQ_SLOT(down()),
 	      ac, "move_line_down");
 
-  new TDEAction(i18n("Move to Previous Line"), Key_Up, this, TQT_SLOT(up()),
+  new TDEAction(i18n("Move to Previous Line"), Key_Up, this, TQ_SLOT(up()),
 	      ac, "move_line_up");
 
   new TDEAction(i18n("Move Character Right"), Key_Right, this,
-	      TQT_SLOT(cursorRight()), ac, "move_cursor_right");
+	      TQ_SLOT(cursorRight()), ac, "move_cursor_right");
 
-  new TDEAction(i18n("Move Character Left"), Key_Left, this, TQT_SLOT(cursorLeft()),
+  new TDEAction(i18n("Move Character Left"), Key_Left, this, TQ_SLOT(cursorLeft()),
 	      ac, "move_cusor_left");
 
   new TDEAction(
     i18n("Select to Next Line"),                    SHIFT + Key_Down,
-    this, TQT_SLOT(shiftDown()),
+    this, TQ_SLOT(shiftDown()),
     ac, "select_line_down" );
   new TDEAction(
     i18n("Scroll Line Down"),               CTRL +          Key_Down,
-    this, TQT_SLOT(scrollDown()),
+    this, TQ_SLOT(scrollDown()),
     ac, "scroll_line_down" );
 
   new TDEAction(
     i18n("Scroll Page Up"),                         TDEStdAccel::prior(),
-    this, TQT_SLOT(pageUp()),
+    this, TQ_SLOT(pageUp()),
     ac, "scroll_page_up" );
   new TDEAction(
     i18n("Select Page Up"),                         SHIFT + Key_PageUp,
-    this, TQT_SLOT(shiftPageUp()),
+    this, TQ_SLOT(shiftPageUp()),
     ac, "select_page_up" );
   new TDEAction(
     i18n("Move to Top of View"),             CTRL +         Key_PageUp,
-    this, TQT_SLOT(topOfView()),
+    this, TQ_SLOT(topOfView()),
     ac, "move_top_of_view" );
   new TDEAction(
     i18n("Select to Top of View"),             CTRL + SHIFT +  Key_PageUp,
-    this, TQT_SLOT(shiftTopOfView()),
+    this, TQ_SLOT(shiftTopOfView()),
     ac, "select_top_of_view" );
 
   new TDEAction(
     i18n("Scroll Page Down"),                          TDEStdAccel::next(),
-    this, TQT_SLOT(pageDown()),
+    this, TQ_SLOT(pageDown()),
     ac, "scroll_page_down" );
   new TDEAction(
     i18n("Select Page Down"),                       SHIFT + Key_PageDown,
-    this, TQT_SLOT(shiftPageDown()),
+    this, TQ_SLOT(shiftPageDown()),
     ac, "select_page_down" );
   new TDEAction(
     i18n("Move to Bottom of View"),          CTRL +         Key_PageDown,
-    this, TQT_SLOT(bottomOfView()),
+    this, TQ_SLOT(bottomOfView()),
     ac, "move_bottom_of_view" );
   new TDEAction(
     i18n("Select to Bottom of View"),         CTRL + SHIFT + Key_PageDown,
-    this, TQT_SLOT(shiftBottomOfView()),
+    this, TQ_SLOT(shiftBottomOfView()),
     ac, "select_bottom_of_view" );
   new TDEAction(
     i18n("Move to Matching Bracket"),               CTRL + Key_6,
-    this, TQT_SLOT(toMatchingBracket()),
+    this, TQ_SLOT(toMatchingBracket()),
     ac, "to_matching_bracket" );
   new TDEAction(
     i18n("Select to Matching Bracket"),      SHIFT + CTRL + Key_6,
-    this, TQT_SLOT(shiftToMatchingBracket()),
+    this, TQ_SLOT(shiftToMatchingBracket()),
     ac, "select_matching_bracket" );
 
   // anders: shortcuts doing any changes should not be created in browserextension
@@ -582,40 +582,40 @@ void KateView::setupEditActions()
   {
     new TDEAction(
       i18n("Transpose Characters"),           CTRL + Key_T,
-      this, TQT_SLOT(transpose()),
+      this, TQ_SLOT(transpose()),
       ac, "transpose_char" );
 
     new TDEAction(
       i18n("Delete Line"),                    CTRL + Key_K,
-      this, TQT_SLOT(killLine()),
+      this, TQ_SLOT(killLine()),
       ac, "delete_line" );
 
     new TDEAction(
       i18n("Delete Word Left"),               TDEStdAccel::deleteWordBack(),
-      this, TQT_SLOT(deleteWordLeft()),
+      this, TQ_SLOT(deleteWordLeft()),
       ac, "delete_word_left" );
 
     new TDEAction(
       i18n("Delete Word Right"),              TDEStdAccel::deleteWordForward(),
-      this, TQT_SLOT(deleteWordRight()),
+      this, TQ_SLOT(deleteWordRight()),
       ac, "delete_word_right" );
 
     new TDEAction(i18n("Delete Next Character"), Key_Delete,
-                this, TQT_SLOT(keyDelete()),
+                this, TQ_SLOT(keyDelete()),
                 ac, "delete_next_character");
 
     TDEAction *a = new TDEAction(i18n("Backspace"), Key_Backspace,
-                this, TQT_SLOT(backspace()),
+                this, TQ_SLOT(backspace()),
                 ac, "backspace");
     TDEShortcut cut = a->shortcut();
     cut.append( KKey( SHIFT + Key_Backspace ) );
     a->setShortcut( cut );
   }
 
-  connect( this, TQT_SIGNAL(gotFocus(Kate::View*)),
-           this, TQT_SLOT(slotGotFocus()) );
-  connect( this, TQT_SIGNAL(lostFocus(Kate::View*)),
-           this, TQT_SLOT(slotLostFocus()) );
+  connect( this, TQ_SIGNAL(gotFocus(Kate::View*)),
+           this, TQ_SLOT(slotGotFocus()) );
+  connect( this, TQ_SIGNAL(lostFocus(Kate::View*)),
+           this, TQ_SLOT(slotLostFocus()) );
 
   m_editActions->readShortcutSettings( "Katepart Shortcuts" );
 
@@ -631,18 +631,18 @@ void KateView::setupCodeFolding()
 {
   TDEActionCollection *ac=this->actionCollection();
   new TDEAction( i18n("Collapse Toplevel"), CTRL+SHIFT+Key_Minus,
-       m_doc->foldingTree(),TQT_SLOT(collapseToplevelNodes()),ac,"folding_toplevel");
+       m_doc->foldingTree(),TQ_SLOT(collapseToplevelNodes()),ac,"folding_toplevel");
   new TDEAction( i18n("Expand Toplevel"), CTRL+SHIFT+Key_Plus,
-       this,TQT_SLOT(slotExpandToplevel()),ac,"folding_expandtoplevel");
+       this,TQ_SLOT(slotExpandToplevel()),ac,"folding_expandtoplevel");
   new TDEAction( i18n("Collapse One Local Level"), CTRL+Key_Minus,
-       this,TQT_SLOT(slotCollapseLocal()),ac,"folding_collapselocal");
+       this,TQ_SLOT(slotCollapseLocal()),ac,"folding_collapselocal");
   new TDEAction( i18n("Expand One Local Level"), CTRL+Key_Plus,
-       this,TQT_SLOT(slotExpandLocal()),ac,"folding_expandlocal");
+       this,TQ_SLOT(slotExpandLocal()),ac,"folding_expandlocal");
 
 #ifdef DEBUGACCELS
   TDEAccel* debugAccels = new TDEAccel(this,this);
-  debugAccels->insert("KATE_DUMP_REGION_TREE",i18n("Show the code folding region tree"),"","Ctrl+Shift+Alt+D",m_doc,TQT_SLOT(dumpRegionTree()));
-  debugAccels->insert("KATE_TEMPLATE_TEST",i18n("Basic template code test"),"","Ctrl+Shift+Alt+T",m_doc,TQT_SLOT(testTemplateCode()));
+  debugAccels->insert("KATE_DUMP_REGION_TREE",i18n("Show the code folding region tree"),"","Ctrl+Shift+Alt+D",m_doc,TQ_SLOT(dumpRegionTree()));
+  debugAccels->insert("KATE_TEMPLATE_TEST",i18n("Basic template code test"),"","Ctrl+Shift+Alt+T",m_doc,TQ_SLOT(testTemplateCode()));
   debugAccels->setEnabled(true);
 #endif
 }
@@ -669,16 +669,16 @@ void KateView::slotExpandLocal()
 void KateView::setupCodeCompletion()
 {
   m_codeCompletion = new KateCodeCompletion(this);
-  connect( m_codeCompletion, TQT_SIGNAL(completionAborted()),
-           this,             TQT_SIGNAL(completionAborted()));
-  connect( m_codeCompletion, TQT_SIGNAL(completionDone()),
-           this,             TQT_SIGNAL(completionDone()));
-  connect( m_codeCompletion, TQT_SIGNAL(argHintHidden()),
-           this,             TQT_SIGNAL(argHintHidden()));
-  connect( m_codeCompletion, TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry)),
-           this,             TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry)));
-  connect( m_codeCompletion, TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)),
-           this,             TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)));
+  connect( m_codeCompletion, TQ_SIGNAL(completionAborted()),
+           this,             TQ_SIGNAL(completionAborted()));
+  connect( m_codeCompletion, TQ_SIGNAL(completionDone()),
+           this,             TQ_SIGNAL(completionDone()));
+  connect( m_codeCompletion, TQ_SIGNAL(argHintHidden()),
+           this,             TQ_SIGNAL(argHintHidden()));
+  connect( m_codeCompletion, TQ_SIGNAL(completionDone(KTextEditor::CompletionEntry)),
+           this,             TQ_SIGNAL(completionDone(KTextEditor::CompletionEntry)));
+  connect( m_codeCompletion, TQ_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)),
+           this,             TQ_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)));
 }
 
 void KateView::slotGotFocus()
diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp
index eb09efe41..872e7467c 100644
--- a/kate/part/kateviewhelpers.cpp
+++ b/kate/part/kateviewhelpers.cpp
@@ -65,8 +65,8 @@ KateScrollBar::KateScrollBar (Orientation orientation, KateViewInternal* parent,
   , m_savVisibleLines(0)
   , m_showMarks(false)
 {
-  connect(this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderMaybeMoved(int)));
-  connect(m_doc, TQT_SIGNAL(marksChanged()), this, TQT_SLOT(marksChanged()));
+  connect(this, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(sliderMaybeMoved(int)));
+  connect(m_doc, TQ_SIGNAL(marksChanged()), this, TQ_SLOT(marksChanged()));
 
   m_lines.setAutoDelete(true);
 }
@@ -295,8 +295,8 @@ KateCmdLine::KateCmdLine (KateView *view)
   , m_command( 0L )
   , m_oldCompletionObject( 0L )
 {
-  connect (this, TQT_SIGNAL(returnPressed(const TQString &)),
-           this, TQT_SLOT(slotReturnPressed(const TQString &)));
+  connect (this, TQ_SIGNAL(returnPressed(const TQString &)),
+           this, TQ_SLOT(slotReturnPressed(const TQString &)));
 
   completionObject()->insertItems (KateCmd::self()->cmds());
   setAutoDeleteCompletionObject( false );
@@ -375,7 +375,7 @@ void KateCmdLine::slotReturnPressed ( const TQString& text )
   m_cmdend = 0;
 
   m_view->setFocus ();
-  TQTimer::singleShot( 4000, this, TQT_SLOT(hideMe()) );
+  TQTimer::singleShot( 4000, this, TQ_SLOT(hideMe()) );
 }
 
 void KateCmdLine::hideMe () // unless i have focus ;)
@@ -716,7 +716,7 @@ void KateIconBorder::setIconBorderOn( bool enable )
 
   updateGeometry();
 
-  TQTimer::singleShot( 0, this, TQT_SLOT(update()) );
+  TQTimer::singleShot( 0, this, TQ_SLOT(update()) );
 }
 
 void KateIconBorder::setLineNumbersOn( bool enable )
@@ -729,7 +729,7 @@ void KateIconBorder::setLineNumbersOn( bool enable )
 
   updateGeometry();
 
-  TQTimer::singleShot( 0, this, TQT_SLOT(update()) );
+  TQTimer::singleShot( 0, this, TQ_SLOT(update()) );
 }
 
 void KateIconBorder::setDynWrapIndicators( int state )
@@ -742,7 +742,7 @@ void KateIconBorder::setDynWrapIndicators( int state )
 
   updateGeometry ();
 
-  TQTimer::singleShot( 0, this, TQT_SLOT(update()) );
+  TQTimer::singleShot( 0, this, TQ_SLOT(update()) );
 }
 
 void KateIconBorder::setFoldingMarkersOn( bool enable )
@@ -754,7 +754,7 @@ void KateIconBorder::setFoldingMarkersOn( bool enable )
 
   updateGeometry();
 
-  TQTimer::singleShot( 0, this, TQT_SLOT(update()) );
+  TQTimer::singleShot( 0, this, TQ_SLOT(update()) );
 }
 
 TQSize KateIconBorder::sizeHint() const
@@ -1170,7 +1170,7 @@ void KateIconBorder::showMarkMenu( uint line, const TQPoint& pos )
 KateViewEncodingAction::KateViewEncodingAction(KateDocument *_doc, KateView *_view, const TQString& text, TQObject* parent, const char* name)
        : TDEActionMenu (text, parent, name), doc(_doc), view (_view)
 {
-  connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow()));
+  connect(popupMenu(),TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotAboutToShow()));
 }
 
 void KateViewEncodingAction::slotAboutToShow()
@@ -1180,7 +1180,7 @@ void KateViewEncodingAction::slotAboutToShow()
   popupMenu()->clear ();
   for (uint z=0; z<modes.size(); ++z)
   {
-    popupMenu()->insertItem ( modes[z], this, TQT_SLOT(setMode(int)), 0,  z);
+    popupMenu()->insertItem ( modes[z], this, TQ_SLOT(setMode(int)), 0,  z);
 
     bool found = false;
     TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(TDEGlobal::charsets()->encodingForName(modes[z]), found);
diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp
index 8a1ab6f05..0f12f8562 100644
--- a/kate/part/kateviewinternal.cpp
+++ b/kate/part/kateviewinternal.cpp
@@ -116,14 +116,14 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc)
   m_lineLayout->addWidget(m_dummy);
 
   // Hijack the line scroller's controls, so we can scroll nicely for word-wrap
-  connect(m_lineScroll, TQT_SIGNAL(prevPage()), TQT_SLOT(scrollPrevPage()));
-  connect(m_lineScroll, TQT_SIGNAL(nextPage()), TQT_SLOT(scrollNextPage()));
+  connect(m_lineScroll, TQ_SIGNAL(prevPage()), TQ_SLOT(scrollPrevPage()));
+  connect(m_lineScroll, TQ_SIGNAL(nextPage()), TQ_SLOT(scrollNextPage()));
 
-  connect(m_lineScroll, TQT_SIGNAL(prevLine()), TQT_SLOT(scrollPrevLine()));
-  connect(m_lineScroll, TQT_SIGNAL(nextLine()), TQT_SLOT(scrollNextLine()));
+  connect(m_lineScroll, TQ_SIGNAL(prevLine()), TQ_SLOT(scrollPrevLine()));
+  connect(m_lineScroll, TQ_SIGNAL(nextLine()), TQ_SLOT(scrollNextLine()));
 
-  connect(m_lineScroll, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(scrollLines(int)));
-  connect(m_lineScroll, TQT_SIGNAL(sliderMMBMoved(int)), TQT_SLOT(scrollLines(int)));
+  connect(m_lineScroll, TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(scrollLines(int)));
+  connect(m_lineScroll, TQ_SIGNAL(sliderMMBMoved(int)), TQ_SLOT(scrollLines(int)));
 
   // catch wheel events, completing the hijack
   m_lineScroll->installEventFilter(this);
@@ -142,8 +142,8 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc)
   m_columnScroll->setTracking(true);
   m_startX = 0;
 
-  connect( m_columnScroll, TQT_SIGNAL( valueChanged (int) ),
-           this, TQT_SLOT( scrollColumns (int) ) );
+  connect( m_columnScroll, TQ_SIGNAL( valueChanged (int) ),
+           this, TQ_SLOT( scrollColumns (int) ) );
 
   //
   // iconborder ;)
@@ -151,13 +151,13 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc)
   leftBorder = new KateIconBorder( this, m_view );
   leftBorder->show ();
 
-  connect( leftBorder, TQT_SIGNAL(toggleRegionVisibility(unsigned int)),
-           m_doc->foldingTree(), TQT_SLOT(toggleRegionVisibility(unsigned int)));
+  connect( leftBorder, TQ_SIGNAL(toggleRegionVisibility(unsigned int)),
+           m_doc->foldingTree(), TQ_SLOT(toggleRegionVisibility(unsigned int)));
 
-  connect( doc->foldingTree(), TQT_SIGNAL(regionVisibilityChangedAt(unsigned int)),
-           this, TQT_SLOT(slotRegionVisibilityChangedAt(unsigned int)));
-  connect( doc, TQT_SIGNAL(codeFoldingUpdated()),
-           this, TQT_SLOT(slotCodeFoldingChanged()) );
+  connect( doc->foldingTree(), TQ_SIGNAL(regionVisibilityChangedAt(unsigned int)),
+           this, TQ_SLOT(slotRegionVisibilityChangedAt(unsigned int)));
+  connect( doc, TQ_SIGNAL(codeFoldingUpdated()),
+           this, TQ_SLOT(slotCodeFoldingChanged()) );
 
   displayCursor.setPos(0, 0);
   cursor.setPos(0, 0);
@@ -182,21 +182,21 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc)
   dragInfo.state = diNone;
 
   // timers
-  connect( &m_dragScrollTimer, TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( doDragScroll() ) );
+  connect( &m_dragScrollTimer, TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( doDragScroll() ) );
 
-  connect( &m_scrollTimer, TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( scrollTimeout() ) );
+  connect( &m_scrollTimer, TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( scrollTimeout() ) );
 
-  connect( &m_cursorTimer, TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( cursorTimeout() ) );
+  connect( &m_cursorTimer, TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( cursorTimeout() ) );
 
-  connect( &m_textHintTimer, TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( textHintTimeout() ) );
+  connect( &m_textHintTimer, TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( textHintTimeout() ) );
 
   // selection changed to set anchor
-  connect( m_view, TQT_SIGNAL( selectionChanged() ),
-             this, TQT_SLOT( viewSelectionChanged() ) );
+  connect( m_view, TQ_SIGNAL( selectionChanged() ),
+             this, TQ_SLOT( viewSelectionChanged() ) );
 
 
 // this is a work arround for RTL desktops
@@ -2902,7 +2902,7 @@ void KateViewInternal::mouseDoubleClickEvent(TQMouseEvent *e)
       }
 
       possibleTripleClick = true;
-      TQTimer::singleShot ( TQApplication::doubleClickInterval(), this, TQT_SLOT(tripleClickTimeout()) );
+      TQTimer::singleShot ( TQApplication::doubleClickInterval(), this, TQ_SLOT(tripleClickTimeout()) );
 
       scrollX = 0;
       scrollY = 0;
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index be91d6d32..4f4e5692d 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -549,10 +549,10 @@ int main(int argc, char *argv[])
                                                         baseDir,
                                                         args->getOption("output"),
                                                         args->isSet("genoutput"));
-    TQObject::connect(part->browserExtension(), TQT_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)),
-		     regressionTest, TQT_SLOT(slotOpenURL(const KURL&, const KParts::URLArgs &)));
-    TQObject::connect(part->browserExtension(), TQT_SIGNAL(resizeTopLevelWidget( int, int )),
-		     regressionTest, TQT_SLOT(resizeTopLevelWidget( int, int )));
+    TQObject::connect(part->browserExtension(), TQ_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)),
+		     regressionTest, TQ_SLOT(slotOpenURL(const KURL&, const KParts::URLArgs &)));
+    TQObject::connect(part->browserExtension(), TQ_SIGNAL(resizeTopLevelWidget( int, int )),
+		     regressionTest, TQ_SLOT(resizeTopLevelWidget( int, int )));
 
     regressionTest->m_keepOutput = args->isSet("keep-output");
     regressionTest->m_showGui = args->isSet("show");