1 files changed, 5 insertions, 11 deletions
diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp
index e39aba16c..f4a9df273 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 ()
@@ -479,8 +479,6 @@ void KateCSmartIndent::processLine (KateDocCursor &line)
         textLine->stringAtPos (firstChar, "private") ||
         textLine->stringAtPos (firstChar, "protected") ||
         textLine->stringAtPos (firstChar, "signals") ||
-        textLine->stringAtPos (firstChar, "Q_SIGNALS") ||
-        textLine->stringAtPos (firstChar, "Q_SLOTS") ||
         textLine->stringAtPos (firstChar, "slots"))
     {
       indent = findOpeningBrace(line) + indentWidth;
@@ -859,12 +857,8 @@ uint KateCSmartIndent::calcIndent(KateDocCursor &begin, bool needContinue)
           ch = textLine->getChar(specialIndent + 9);
         else if (textLine->stringAtPos(specialIndent, "signals"))
           ch = textLine->getChar(specialIndent + 7);
-        else if (textLine->stringAtPos(specialIndent, "Q_SIGNALS"))
-          ch = textLine->getChar(specialIndent + 9);
         else if (textLine->stringAtPos(specialIndent, "slots"))
           ch = textLine->getChar(specialIndent + 5);
-        else if (textLine->stringAtPos(specialIndent, "Q_SLOTS"))
-          ch = textLine->getChar(specialIndent + 7);
 
         if (ch.isNull() || (!ch.isSpace() && ch != '(' && ch != ':'))
           continue;
@@ -2174,8 +2168,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()