Replace Q_SIGNALS and Q_SLOTS

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

7 files changed, 6 insertions, 18 deletions

diff --git a/kate/data/isocpp.xml b/kate/data/isocpp.xml
index 3d3736723..3bbeb9f01 100644
--- a/kate/data/isocpp.xml
+++ b/kate/data/isocpp.xml
@@ -198,9 +198,7 @@
       <item> TQ_SCRIPTABLE </item>
       <item> TQ_SETS </item>
       <item> TQ_SIGNAL </item>
-      <item> TQ_SIGNALS </item>
       <item> TQ_SLOT </item>
-      <item> TQ_SLOTS </item>
       <item> TQ_UNUSED </item>
       <item> connect </item>
       <item> disconnect </item>
diff --git a/kate/data/objectivec.xml b/kate/data/objectivec.xml
index 7d36b3d0c..a07940916 100644
--- a/kate/data/objectivec.xml
+++ b/kate/data/objectivec.xml
@@ -121,9 +121,7 @@
       <item> TQ_SCRIPTABLE </item>
       <item> TQ_SETS </item>
       <item> TQ_SIGNAL </item>
-      <item> TQ_SIGNALS </item>
       <item> TQ_SLOT </item>
-      <item> TQ_SLOTS </item>
       <item> TQ_UNUSED </item>
       <item> connect </item>
       <item> disconnect </item>
diff --git a/kate/data/objectivecpp.xml b/kate/data/objectivecpp.xml
index 472d17bf6..bfe4298d4 100644
--- a/kate/data/objectivecpp.xml
+++ b/kate/data/objectivecpp.xml
@@ -166,9 +166,7 @@
       <item> TQ_SCRIPTABLE </item>
       <item> TQ_SETS </item>
       <item> TQ_SIGNAL </item>
-      <item> TQ_SIGNALS </item>
       <item> TQ_SLOT </item>
-      <item> TQ_SLOTS </item>
       <item> TQ_UNUSED </item>
       <item> connect </item>
       <item> disconnect </item>
diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp
index b6abe9b84..f4a9df273 100644
--- a/kate/part/kateautoindent.cpp
+++ b/kate/part/kateautoindent.cpp
@@ -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;
diff --git a/tdehtml/kjserrordlg.ui b/tdehtml/kjserrordlg.ui
index 1c105d937..78d33aa8c 100644
--- a/tdehtml/kjserrordlg.ui
+++ b/tdehtml/kjserrordlg.ui
@@ -120,12 +120,12 @@
     <include location="global" impldecl="in declaration">ksqueezedtextlabel.h</include>
     <include location="global" impldecl="in implementation">kactivelabel.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>init()</slot>
     <slot>addError( const TQString &amp; error )</slot>
     <slot>setURL( const TQString &amp; url )</slot>
     <slot>clear()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui b/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui
index ae52f96e0..8f72031e3 100644
--- a/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui
+++ b/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui
@@ -140,12 +140,12 @@
     <include location="global" impldecl="in declaration">kactivelabel.h</include>
     <include location="local" impldecl="in implementation">kbetterthankdialogbase.ui.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot access="private">clicked()</slot>
     <slot>setLabel( const TQString &amp; label )</slot>
     <slot access="private">init()</slot>
     <slot access="protected">accept()</slot>
     <slot access="protected">reject()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/tdeio/misc/tdewalletd/tdewalletwizard.ui b/tdeio/misc/tdewalletd/tdewalletwizard.ui
index 3e034bac1..1cad5f4a0 100644
--- a/tdeio/misc/tdewalletd/tdewalletwizard.ui
+++ b/tdeio/misc/tdewalletd/tdewalletwizard.ui
@@ -534,12 +534,12 @@
     <include location="global" impldecl="in implementation">tdelocale.h</include>
     <include location="local" impldecl="in implementation">tdewalletwizard.ui.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot access="private">passwordPageUpdate()</slot>
     <slot access="private">init()</slot>
     <slot>setAdvanced()</slot>
     <slot>setBasic()</slot>
     <slot access="private">destroy()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>