Replace Q_SIGNALS and Q_SLOTS

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

33 files changed, 67 insertions, 67 deletions

diff --git a/languages/ada/addclassdlg.ui b/languages/ada/addclassdlg.ui
index 046b06ab..94006be8 100644
--- a/languages/ada/addclassdlg.ui
+++ b/languages/ada/addclassdlg.ui
@@ -420,9 +420,9 @@
     <tabstop>PushButton2</tabstop>
     <tabstop>PushButton3</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot>Public_toggled( bool )</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">keditlistbox.h</include>
     <include location="global" impldecl="in implementation">kcombobox.h</include>
diff --git a/languages/ada/configproblemreporter.ui b/languages/ada/configproblemreporter.ui
index f2e03383..32a9b13d 100644
--- a/languages/ada/configproblemreporter.ui
+++ b/languages/ada/configproblemreporter.ui
@@ -78,12 +78,12 @@
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="local" impldecl="in implementation">configproblemreporter.ui.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>init()</slot>
     <slot>destroy()</slot>
     <slot>accept()</slot>
     <slot>bgParserCheckbox_toggled( bool b )</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/languages/cpp/addattributedialogbase.ui b/languages/cpp/addattributedialogbase.ui
index 793d26b4..86ee3f25 100644
--- a/languages/cpp/addattributedialogbase.ui
+++ b/languages/cpp/addattributedialogbase.ui
@@ -353,14 +353,14 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
     <slot>addAttribute()</slot>
     <slot>deleteCurrentAttribute()</slot>
     <slot>currentChanged(TQListViewItem*)</slot>
     <slot>updateGUI()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
diff --git a/languages/cpp/addmethoddialogbase.ui b/languages/cpp/addmethoddialogbase.ui
index b4af8a5e..83af7489 100644
--- a/languages/cpp/addmethoddialogbase.ui
+++ b/languages/cpp/addmethoddialogbase.ui
@@ -436,7 +436,7 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
     <slot>addMethod()</slot>
@@ -444,7 +444,7 @@
     <slot>currentChanged(TQListViewItem*)</slot>
     <slot>updateGUI()</slot>
     <slot>browseImplementationFile()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
diff --git a/languages/cpp/app_templates/khello2/widgetbase.ui b/languages/cpp/app_templates/khello2/widgetbase.ui
index 365f4cf2..90cac0c6 100644
--- a/languages/cpp/app_templates/khello2/widgetbase.ui
+++ b/languages/cpp/app_templates/khello2/widgetbase.ui
@@ -45,8 +45,8 @@
         <slot>button_clicked()</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot>button_clicked()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kmake/mainview.ui b/languages/cpp/app_templates/kmake/mainview.ui
index 194d8ffe..a5481dd2 100644
--- a/languages/cpp/app_templates/kmake/mainview.ui
+++ b/languages/cpp/app_templates/kmake/mainview.ui
@@ -69,8 +69,8 @@
         <slot>slotHelloButtonClicked()</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot>slotHelloButtonClicked()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kscons_kxt/QUICKSTART b/languages/cpp/app_templates/kscons_kxt/QUICKSTART
index 4d23ce93..7036e4cb 100644
--- a/languages/cpp/app_templates/kscons_kxt/QUICKSTART
+++ b/languages/cpp/app_templates/kscons_kxt/QUICKSTART
@@ -64,7 +64,7 @@ To make scons run (much) faster, consult ./addons/README in bksys
 MOC PROCESSING
 
 In qt programs, when a header 'foo.h' contains a class that has
-Q_SIGNALS and Q_SLOTS, then 'foo.h' must contain the macro TQ_OBJECT
+signals and slots, then 'foo.h' must contain the macro TQ_OBJECT
 in order to compile. foo_moc.cpp is usually generated, and is 
 used to produce foo_moc.o which is linked with the 
 program or the library.
diff --git a/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART b/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART
index 4d23ce93..7036e4cb 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART
+++ b/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART
@@ -64,7 +64,7 @@ To make scons run (much) faster, consult ./addons/README in bksys
 MOC PROCESSING
 
 In qt programs, when a header 'foo.h' contains a class that has
-Q_SIGNALS and Q_SLOTS, then 'foo.h' must contain the macro TQ_OBJECT
+signals and slots, then 'foo.h' must contain the macro TQ_OBJECT
 in order to compile. foo_moc.cpp is usually generated, and is 
 used to produce foo_moc.o which is linked with the 
 program or the library.
diff --git a/languages/cpp/ccconfigwidgetbase.ui b/languages/cpp/ccconfigwidgetbase.ui
index 49b6c553..294deadc 100644
--- a/languages/cpp/ccconfigwidgetbase.ui
+++ b/languages/cpp/ccconfigwidgetbase.ui
@@ -1655,7 +1655,7 @@ you right click on a variable in a header file.</string>
     <tabstop>newPCSButton</tabstop>
     <tabstop>advancedOptions</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot access="protected">implementationFile()</slot>
     <slot access="protected">interfaceFile()</slot>
     <slot access="protected">slotAddPPPath()</slot>
@@ -1676,7 +1676,7 @@ you right click on a variable in a header file.</string>
     <slot>isQMakeExecutable(const TQString&amp;)</slot>
     <slot>isValidQtDir(const TQString&amp;)</slot>
     <slot>openPluginPaths()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
diff --git a/languages/cpp/classgeneratorconfigbase.ui b/languages/cpp/classgeneratorconfigbase.ui
index a047fca3..a0c7f964 100644
--- a/languages/cpp/classgeneratorconfigbase.ui
+++ b/languages/cpp/classgeneratorconfigbase.ui
@@ -253,9 +253,9 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot access="protected">templateTypeChanged(int type)</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/languages/cpp/configproblemreporter.ui b/languages/cpp/configproblemreporter.ui
index d752d715..9085a377 100644
--- a/languages/cpp/configproblemreporter.ui
+++ b/languages/cpp/configproblemreporter.ui
@@ -176,14 +176,14 @@ If disabled, the parser will typically only run when the file is saved.</string>
 <variables>
     <variable>CppSupportPart* m_part;</variable>
 </variables>
-<Q_SLOTS>
+<slots>
     <slot>init()</slot>
     <slot>destroy()</slot>
     <slot>setPart( CppSupportPart * part )</slot>
     <slot>accept()</slot>
     <slot>bgParserCheckbox_toggled( bool b )</slot>
     <slot access="protected">setDelayLabel( int delay )</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/languages/cpp/cppnewclassdlgbase.ui b/languages/cpp/cppnewclassdlgbase.ui
index 6cef7a20..4f827821 100644
--- a/languages/cpp/cppnewclassdlgbase.ui
+++ b/languages/cpp/cppnewclassdlgbase.ui
@@ -1236,7 +1236,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
     <tabstop>gen_config</tabstop>
     <tabstop>constructors_cpp_edit</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot access="protected">updateClassStore()</slot>
     <slot access="protected">access_view_mouseButtonPressed( int button, TQListViewItem * item, const TQPoint &amp; p, int c )</slot>
     <slot access="protected">classNameChanged( const TQString &amp; text )</slot>
@@ -1278,7 +1278,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
     <slot access="protected">scopeboxActivated( int )</slot>
     <slot access="protected">classNamespaceChanged( const TQString &amp; )</slot>
     <slot access="protected">headeronly_box_stateChanged(int val)</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
diff --git a/languages/cpp/creategettersetter.ui b/languages/cpp/creategettersetter.ui
index fcd6e684..1080ffc3 100644
--- a/languages/cpp/creategettersetter.ui
+++ b/languages/cpp/creategettersetter.ui
@@ -219,9 +219,9 @@
     <tabstop>m_btnCancel</tabstop>
     <tabstop>m_btnOk</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot access="protected">slotInlineChanged()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/languages/cpp/createpcsdialogbase.ui b/languages/cpp/createpcsdialogbase.ui
index a128e877..14e859b0 100644
--- a/languages/cpp/createpcsdialogbase.ui
+++ b/languages/cpp/createpcsdialogbase.ui
@@ -159,10 +159,10 @@
 <forwards>
     <forward>class TQListViewItem;</forward>
 </forwards>
-<Q_SLOTS>
+<slots>
     <slot>slotSelected(const TQString&amp;)</slot>
     <slot>slotSelectionChanged(TQListViewItem*)</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/languages/cpp/debugger/debuggertracingdialogbase.ui b/languages/cpp/debugger/debuggertracingdialogbase.ui
index b6e01791..4f42b213 100644
--- a/languages/cpp/debugger/debuggertracingdialogbase.ui
+++ b/languages/cpp/debugger/debuggertracingdialogbase.ui
@@ -130,9 +130,9 @@ If custom format string is not enabled, names and values of all expressions will
         <slot>reject()</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot>enableOrDisable()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/languages/cpp/doc/qt-kdev3.toc b/languages/cpp/doc/qt-kdev3.toc
index ff9826cd..4675d7c2 100644
--- a/languages/cpp/doc/qt-kdev3.toc
+++ b/languages/cpp/doc/qt-kdev3.toc
@@ -16,7 +16,7 @@
 	<tocsect2 name="Designing the program" url="#Designing_the_Program"/>
 	<tocsect2 name="Adding widgets" url="#Adding_Widgets"/>
 	<tocsect2 name="Getting spaced out" url="#Getting_Spaced_Out"/>
-	<tocsect2 name="Signals and Q_SLOTS" url="#Signals_and_Slots"/>
+	<tocsect2 name="Signals and slots" url="#Signals_and_Slots"/>
 	<tocsect2 name="Generating the source" url="#Generating_the_Source"/>
 	<tocsect2 name="Implementing the slot" url="#Implementing_the_Slot"/>
 </tocsect1>
diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui
index 7fc72d0e..5d1ff666 100644
--- a/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui
@@ -55,9 +55,9 @@
         </widget>
     </vbox>
 </widget>
-<Q_SIGNALS>
+<signals>
     <signal>enabled(int)</signal>
-</Q_SIGNALS>
+</signals>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
index efba8920..af41060e 100644
--- a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
@@ -125,12 +125,12 @@ Only the selected entry will be used</string>
 <forwards>
     <forward>class TQListBoxItem;</forward>
 </forwards>
-<Q_SIGNALS>
+<signals>
     <signal>enabled(int)</signal>
-</Q_SIGNALS>
-<Q_SLOTS>
+</signals>
+<slots>
     <slot>slotSelectionChanged(TQListBoxItem*)</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">kcombobox.h</include>
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui
index 8ac0d2db..7253be6d 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui
@@ -118,12 +118,12 @@ Only the selected entry will be used</string>
 <forwards>
     <forward>class TQListBoxItem;</forward>
 </forwards>
-<Q_SIGNALS>
+<signals>
     <signal>enabled(int)</signal>
-</Q_SIGNALS>
-<Q_SLOTS>
+</signals>
+<slots>
     <slot>slotSelectionChanged(TQListBoxItem*)</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
diff --git a/languages/cpp/subclassingdlgbase.ui b/languages/cpp/subclassingdlgbase.ui
index 67dcd97f..1b41e69e 100644
--- a/languages/cpp/subclassingdlgbase.ui
+++ b/languages/cpp/subclassingdlgbase.ui
@@ -233,9 +233,9 @@
         <slot>onChangedClassName()</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot>onChangedClassName()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
diff --git a/languages/java/configproblemreporter.ui b/languages/java/configproblemreporter.ui
index 9bea48d7..c253e1d4 100644
--- a/languages/java/configproblemreporter.ui
+++ b/languages/java/configproblemreporter.ui
@@ -234,7 +234,7 @@
     <tabstop>pushButton5</tabstop>
     <tabstop>pushButton6</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot>init()</slot>
     <slot>destroy()</slot>
     <slot>accept()</slot>
@@ -244,7 +244,7 @@
     <slot>removeSpecialHeader()</slot>
     <slot>moveUpSpecialHeader()</slot>
     <slot>moveDownSpecialHeader()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
diff --git a/languages/kjssupport/subclassingdlgbase.ui b/languages/kjssupport/subclassingdlgbase.ui
index 23ec7b34..250da264 100644
--- a/languages/kjssupport/subclassingdlgbase.ui
+++ b/languages/kjssupport/subclassingdlgbase.ui
@@ -245,9 +245,9 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>onChangedClassName()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/languages/lib/debugger/Mainpage.dox b/languages/lib/debugger/Mainpage.dox
index 9a804a36..c0e6b077 100644
--- a/languages/lib/debugger/Mainpage.dox
+++ b/languages/lib/debugger/Mainpage.dox
@@ -12,7 +12,7 @@ This library contains classes to implement debugger support for a programming la
 Each debugger support plugin must interact with an editor to set breakpoints,
 jump to execution points, etc. This kind of interaction is implemented in
 @ref Debugger class. Your debugger support plugin just need to create
-an instance of @ref Debugger class and connect its Q_SIGNALS, for example:
+an instance of @ref Debugger class and connect its signals, for example:
 @code
 m_debugger = new Debugger( partController() );
 
diff --git a/languages/lib/designer_integration/implementationwidgetbase.ui b/languages/lib/designer_integration/implementationwidgetbase.ui
index d2780bc1..45cebd8e 100644
--- a/languages/lib/designer_integration/implementationwidgetbase.ui
+++ b/languages/lib/designer_integration/implementationwidgetbase.ui
@@ -257,9 +257,9 @@
     <tabstop>okButton</tabstop>
     <tabstop>cancelButton</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot access="protected">classNameChanged(const TQString &amp;)</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/languages/pascal/configproblemreporter.ui b/languages/pascal/configproblemreporter.ui
index 020557a1..3ba64c82 100644
--- a/languages/pascal/configproblemreporter.ui
+++ b/languages/pascal/configproblemreporter.ui
@@ -77,12 +77,12 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>init()</slot>
     <slot>destroy()</slot>
     <slot>accept()</slot>
     <slot>bgParserCheckbox_toggled( bool b )</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/languages/php/phpconfigwidgetbase.ui b/languages/php/phpconfigwidgetbase.ui
index 09124bf8..4213cca5 100644
--- a/languages/php/phpconfigwidgetbase.ui
+++ b/languages/php/phpconfigwidgetbase.ui
@@ -544,12 +544,12 @@ the internal web browser. Please make sure that the webserver was compiled with
     <tabstop>zend_edit</tabstop>
     <tabstop>zend_button</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot>slotAboutClicked()</slot>
     <slot>slotPHPExeButtonClicked()</slot>
     <slot>slotPHPIniButtonClicked()</slot>
     <slot>slotZendButtonClicked()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
diff --git a/languages/python/app_templates/pyqt/templates-ui-mainwin b/languages/python/app_templates/pyqt/templates-ui-mainwin
index 5ce4dec8..62d6d51a 100644
--- a/languages/python/app_templates/pyqt/templates-ui-mainwin
+++ b/languages/python/app_templates/pyqt/templates-ui-mainwin
@@ -400,7 +400,7 @@
         <slot>helpAbout()</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot>fileNew()</slot>
     <slot>fileOpen()</slot>
     <slot>fileSave()</slot>
@@ -416,6 +416,6 @@
     <slot>helpIndex()</slot>
     <slot>helpContents()</slot>
     <slot>helpAbout()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/ruby/app_templates/kapp/app.rb b/languages/ruby/app_templates/kapp/app.rb
index 8d135b19..f5b9927e 100644
--- a/languages/ruby/app_templates/kapp/app.rb
+++ b/languages/ruby/app_templates/kapp/app.rb
@@ -9,7 +9,7 @@
 
 class %{APPNAMESC} < KDE::MainWindow
 
-    Q_SLOTS 'fileNew()',
+    slots 'fileNew()',
           'fileOpen()',
           'fileSave()',
           'fileSaveAs()',
diff --git a/languages/ruby/app_templates/kapp/appview.rb b/languages/ruby/app_templates/kapp/appview.rb
index b81155b0..7ee8133f 100644
--- a/languages/ruby/app_templates/kapp/appview.rb
+++ b/languages/ruby/app_templates/kapp/appview.rb
@@ -15,14 +15,14 @@ class %{APPNAMESC}View < TQt::Widget
     #
     # Use this signal to change the content of the statusbar
     #
-    Q_SIGNALS 'signalChangeStatusbar(const TQString&)'
+    signals 'signalChangeStatusbar(const TQString&)'
 
     #
     # Use this signal to change the content of the caption
     #
-    Q_SIGNALS 'signalChangeCaption(const TQString&)'
+    signals 'signalChangeCaption(const TQString&)'
 
-    Q_SLOTS 'slotOnURL(const TQString&)',
+    slots 'slotOnURL(const TQString&)',
           'slotSetTitle(const TQString&)'
    
     def initialize(parent)
diff --git a/languages/ruby/app_templates/kxt/app.rb b/languages/ruby/app_templates/kxt/app.rb
index f7a18399..4ffcfe51 100644
--- a/languages/ruby/app_templates/kxt/app.rb
+++ b/languages/ruby/app_templates/kxt/app.rb
@@ -9,7 +9,7 @@
 
 class %{APPNAMESC} < KDE::MainWindow
 
-    Q_SLOTS 'fileNew()',
+    slots 'fileNew()',
           'optionsPreferences()',
           'newToolbarConfig()',
           'changeStatusbar(const TQString&)',
diff --git a/languages/ruby/app_templates/kxt/appview.rb b/languages/ruby/app_templates/kxt/appview.rb
index 4f63037f..2557b9da 100644
--- a/languages/ruby/app_templates/kxt/appview.rb
+++ b/languages/ruby/app_templates/kxt/appview.rb
@@ -15,14 +15,14 @@ class %{APPNAMESC}View < %{APPNAMESC}view_base
     #
     # Use this signal to change the content of the statusbar
     #
-    Q_SIGNALS 'signalChangeStatusbar(const TQString&)'
+    signals 'signalChangeStatusbar(const TQString&)'
 
     #
     # Use this signal to change the content of the caption
     #
-    Q_SIGNALS 'signalChangeCaption(const TQString&)'
+    signals 'signalChangeCaption(const TQString&)'
 
-    Q_SLOTS 'switchColors()',
+    slots 'switchColors()',
           'settingsChanged()'
    
     def initialize(parent)
diff --git a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb
index 1f399323..ceae4ad1 100644
--- a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb
+++ b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb
@@ -1,6 +1,6 @@
 class %{APPNAMESC} < TQt::MainWindow
 
-    Q_SLOTS 'newDoc()',
+    slots 'newDoc()',
           'choose()',
           'load( const TQString& )',
           'save()',
diff --git a/languages/sql/sqlconfigwidget.ui b/languages/sql/sqlconfigwidget.ui
index cfa61833..81e20b78 100644
--- a/languages/sql/sqlconfigwidget.ui
+++ b/languages/sql/sqlconfigwidget.ui
@@ -164,10 +164,10 @@
     <variable access="private">TQDomDocument* doc;</variable>
     <variable access="private">bool changed;</variable>
 </variables>
-<Q_SIGNALS>
+<signals>
     <signal>newConfigSaved()</signal>
-</Q_SIGNALS>
-<Q_SLOTS>
+</signals>
+<slots>
     <slot>init()</slot>
     <slot>valueChanged( int, int )</slot>
     <slot>removeDb()</slot>
@@ -176,7 +176,7 @@
     <slot>accept()</slot>
     <slot>setProjectDom( TQDomDocument * doc )</slot>
     <slot>loadConfig()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>