20 files changed, 44 insertions, 44 deletions
diff --git a/arts/builder/TODO b/arts/builder/TODO
index 8b962aa5..139f22b2 100644
--- a/arts/builder/TODO
+++ b/arts/builder/TODO
@@ -41,7 +41,7 @@ Wishlist for the artsbuilder app:
   this should be very useful in editing objects with lots of properties
   (widgets)
 
-- make _changed Q_SIGNALS visible so you can connect the value_changed of a
+- make _changed signals visible so you can connect the value_changed of a
   poti to the frequency of a filter
 
 - make it possible to edit parent property of widgets (i.e. to insert one
diff --git a/arts/builder/propertypanelbase.ui b/arts/builder/propertypanelbase.ui
index 0ff20382..875f6813 100644
--- a/arts/builder/propertypanelbase.ui
+++ b/arts/builder/propertypanelbase.ui
@@ -355,8 +355,8 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot access="protected">setTitleFont()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/arts/examples/README b/arts/examples/README
index 425da5c0..2132bfc3 100644
--- a/arts/examples/README
+++ b/arts/examples/README
@@ -172,7 +172,7 @@ example_xfade.arts
 
 This example mixes 440 and 880 Hz sine waves using a cross fader.
 Adjust the value of the cross fader's percentage input from -1 to 1 to
-control the mixing of the two Q_SIGNALS.
+control the mixing of the two signals.
 
 example_pscale.arts
 
diff --git a/juk/HACKING b/juk/HACKING
index 4d9f7781..2fb4d392 100644
--- a/juk/HACKING
+++ b/juk/HACKING
@@ -103,15 +103,15 @@ be inline in the headers.  The organization of the members in a class should be
 roughly as follows:
 
 public:
-public Q_SLOTS:
+public slots:
 protected:
-protected Q_SLOTS:
-Q_SIGNALS:
+protected slots:
+signals:
 private: // member funtions
-private Q_SLOTS:
+private slots:
 private: // member variables
 
-If there are no private Q_SLOTS there is no need for two private sections, however
+If there are no private slots there is no need for two private sections, however
 private functions and private variables should be clearly separated.
 
 The implementations files -- .cpp files -- should follow (when possible) the
diff --git a/juk/coverdialogbase.ui b/juk/coverdialogbase.ui
index 3db9862f..ed8ed1f1 100644
--- a/juk/coverdialogbase.ui
+++ b/juk/coverdialogbase.ui
@@ -194,10 +194,10 @@
         <slot>slotContextRequested(TQIconViewItem*,const TQPoint&amp;)</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot>slotArtistClicked(TQListViewItem *item)</slot>
     <slot>slotContextRequested(TQIconViewItem *, const TQPoint &amp;pt)</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <forwards>
     <forward>class TQIconViewItem;</forward>
diff --git a/juk/deletedialogbase.ui b/juk/deletedialogbase.ui
index 24480087..56866bde 100644
--- a/juk/deletedialogbase.ui
+++ b/juk/deletedialogbase.ui
@@ -133,9 +133,9 @@
         <slot>slotShouldDelete(bool)</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot access="protected">slotShouldDelete(bool)</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">tdelistbox.h</include>
diff --git a/juk/exampleoptionsbase.ui b/juk/exampleoptionsbase.ui
index 87563c25..c5a09acf 100644
--- a/juk/exampleoptionsbase.ui
+++ b/juk/exampleoptionsbase.ui
@@ -267,15 +267,15 @@
     <tabstop>m_exampleTrack</tabstop>
     <tabstop>m_exampleYear</tabstop>
 </tabstops>
-<Q_SIGNALS>
+<signals>
     <signal>dataChanged()</signal>
     <signal>fileChanged()</signal>
-</Q_SIGNALS>
-<Q_SLOTS>
+</signals>
+<slots>
     <slot access="protected">exampleSelectionChanged()</slot>
     <slot access="protected">exampleDataChanged()</slot>
     <slot access="protected">exampleFileChanged()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/juk/filerenamerbase.ui b/juk/filerenamerbase.ui
index 2449aead..01649070 100644
--- a/juk/filerenamerbase.ui
+++ b/juk/filerenamerbase.ui
@@ -360,11 +360,11 @@
     <tabstop>m_insertCategory</tabstop>
     <tabstop>m_showExample</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot access="protected">exampleTextChanged()</slot>
     <slot access="protected">toggleExampleDialog()</slot>
     <slot access="protected">insertCategory()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">kcombobox.h</include>
diff --git a/juk/filerenameroptionsbase.ui b/juk/filerenameroptionsbase.ui
index ab3d2f61..061a5c5b 100644
--- a/juk/filerenameroptionsbase.ui
+++ b/juk/filerenameroptionsbase.ui
@@ -413,11 +413,11 @@
         <slot>slotEmptyActionChanged()</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot access="protected">slotBracketsChanged()</slot>
     <slot access="protected">slotTrackWidthChanged()</slot>
     <slot access="protected">slotEmptyActionChanged()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">knuminput.h</include>
diff --git a/kaudiocreator/cdconfig.ui b/kaudiocreator/cdconfig.ui
index c0756c83..50133562 100644
--- a/kaudiocreator/cdconfig.ui
+++ b/kaudiocreator/cdconfig.ui
@@ -54,8 +54,8 @@
         </spacer>
     </vbox>
 </widget>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="non virtual">configureAudioCD()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kaudiocreator/encoderconfig.ui b/kaudiocreator/encoderconfig.ui
index 66a3daaa..338bac68 100644
--- a/kaudiocreator/encoderconfig.ui
+++ b/kaudiocreator/encoderconfig.ui
@@ -286,8 +286,8 @@
 <includes>
     <include location="local" impldecl="in implementation">encoderconfig.ui.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>encoderWizard()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kaudiocreator/general.ui b/kaudiocreator/general.ui
index 3e29240c..2fd465f3 100644
--- a/kaudiocreator/general.ui
+++ b/kaudiocreator/general.ui
@@ -278,8 +278,8 @@
 <includes>
     <include location="local" impldecl="in implementation">general.ui.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="non virtual">updateExample()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kaudiocreator/wizard.ui b/kaudiocreator/wizard.ui
index 970a5e84..0bda9d41 100644
--- a/kaudiocreator/wizard.ui
+++ b/kaudiocreator/wizard.ui
@@ -392,7 +392,7 @@
 <includes>
     <include location="local" impldecl="in implementation">wizard.ui.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot access="private">homePressed()</slot>
     <slot>extensionPressed()</slot>
     <slot access="private">trackTitlePressed()</slot>
@@ -405,6 +405,6 @@
     <slot>artistPressed()</slot>
     <slot>commentPressed()</slot>
     <slot>fileFormatTextChanged( const TQString &amp; text )</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kscd/configWidgetUI.ui b/kscd/configWidgetUI.ui
index 79c06938..14f4435b 100644
--- a/kscd/configWidgetUI.ui
+++ b/kscd/configWidgetUI.ui
@@ -445,10 +445,10 @@
     <tabstop>kcfg_DigitalPlayback</tabstop>
     <tabstop>kcfg_AudioDevice</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot>kcfg_DigitalPlayback_toggled( bool )</slot>
     <slot>kcfg_SelectEncoding_toggled(bool)</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">kcolorbutton.h</include>
diff --git a/kscd/panel.ui b/kscd/panel.ui
index c9f12409..c3fd3a09 100644
--- a/kscd/panel.ui
+++ b/kscd/panel.ui
@@ -451,12 +451,12 @@
     <tabstop>cddbPB</tabstop>
     <tabstop>infoPB</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot>playClicked()</slot>
     <slot>stopClicked()</slot>
     <slot>prevClicked()</slot>
     <slot>ejectClicked()</slot>
     <slot returnType="bool">nextClicked()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/libkcddb/cdinfodialogbase.ui b/libkcddb/cdinfodialogbase.ui
index 65948217..3c6a386f 100644
--- a/libkcddb/cdinfodialogbase.ui
+++ b/libkcddb/cdinfodialogbase.ui
@@ -398,12 +398,12 @@
     <variable access="public">static const unsigned TRACK_TITLE = 2;</variable>
     <variable access="public">static const unsigned TRACK_COMMENT = 3;</variable>
 </variables>
-<Q_SIGNALS>
+<signals>
     <signal>play(int i)</signal>
     <signal>discInfoClicked()</signal>
     <signal>trackInfoClicked(unsigned)</signal>
-</Q_SIGNALS>
-<Q_SLOTS>
+</signals>
+<slots>
     <slot access="protected">slotTrackSelected( TQListViewItem * item )</slot>
     <slot access="protected">slotNextTrack()</slot>
     <slot access="protected">slotTrackDoubleClicked( TQListViewItem * item, const TQPoint &amp;, int column )</slot>
@@ -412,7 +412,7 @@
     <slot>genreChanged( const TQString &amp; newGenre )</slot>
     <slot>slotMultipleArtists( bool hasMultipleArtist )</slot>
     <slot access="private">slotChangeEncoding()</slot>
-</Q_SLOTS>
+</slots>
 <functions>
     <function access="private" specifier="non virtual">init()</function>
     <function access="private" specifier="non virtual">destroy()</function>
diff --git a/libkcddb/kcmcddb/cddbconfigwidgetbase.ui b/libkcddb/kcmcddb/cddbconfigwidgetbase.ui
index 8da249db..8ea060f9 100644
--- a/libkcddb/kcmcddb/cddbconfigwidgetbase.ui
+++ b/libkcddb/kcmcddb/cddbconfigwidgetbase.ui
@@ -580,11 +580,11 @@
     <tabstop>kcfg_port</tabstop>
     <tabstop>kcfg_lookupTransport</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot access="protected">protocolChanged()</slot>
     <slot access="protected">showMirrorList()</slot>
     <slot access="protected">needAuthenticationChanged(bool)</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="11" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
diff --git a/noatun/modules/kaiman/SKIN-SPECS b/noatun/modules/kaiman/SKIN-SPECS
index ae293014..bc3533ad 100644
--- a/noatun/modules/kaiman/SKIN-SPECS
+++ b/noatun/modules/kaiman/SKIN-SPECS
@@ -247,7 +247,7 @@ Digit_Large/Digit_Small_Default: filename
   Image file. Contains digits horizontally from 0 to 9, and a blank space.
 
  These two digits are a convenience function, if you want to use a digit more than
- once it is quicker to load it into on of these two Q_SLOTS. Then when using the digit
+ once it is quicker to load it into on of these two slots. Then when using the digit
  in the number item type below, use the words 'Large' or 'Small' in place of the
  filename.
 
diff --git a/noatun/modules/simple/propertiesdialog.ui b/noatun/modules/simple/propertiesdialog.ui
index ca13195a..9ac59ed1 100644
--- a/noatun/modules/simple/propertiesdialog.ui
+++ b/noatun/modules/simple/propertiesdialog.ui
@@ -341,8 +341,8 @@
     <include location="global" impldecl="in declaration">kmimetype.h</include>
     <include location="local" impldecl="in implementation">propertiesdialog.ui.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot specifier="non virtual">setPlayObject( PlaylistItem pi, Arts::PlayObject po )</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/tdeioslave/audiocd/kcmaudiocd/audiocdconfig.ui b/tdeioslave/audiocd/kcmaudiocd/audiocdconfig.ui
index 25a6d6f5..fba43890 100644
--- a/tdeioslave/audiocd/kcmaudiocd/audiocdconfig.ui
+++ b/tdeioslave/audiocd/kcmaudiocd/audiocdconfig.ui
@@ -619,8 +619,8 @@
     <include location="global" impldecl="in declaration">tdecmodule.h</include>
     <include location="global" impldecl="in implementation">klineedit.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>toggleLowpass()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>