Replace Q_SIGNALS and Q_SLOTS

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 80d93b2c93)
10 months ago · 226522fa9e
parent 5a5b34eb58
commit 226522fa9e
18 changed files with 37 additions and 37 deletions
--- a/amarok/src/Options1.ui
+++ b/amarok/src/Options1.ui
@ -688,9 +688,9 @@
    <include location="global" impldecl="in implementation">klineedit.h</include>
    <include location="global" impldecl="in implementation">kactivelabel.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
    <slot>slotUpdateMoodFrame()</slot>
-</Q_SLOTS>
+</slots>
 <functions>
    <function access="private" specifier="non virtual">init()</function>
 </functions>
--- a/amarok/src/Options2.ui
+++ b/amarok/src/Options2.ui
@ -748,13 +748,13 @@
    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
    <include location="global" impldecl="in implementation">kcombobox.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
    <slot>installPushButton_clicked()</slot>
    <slot>retrievePushButton_clicked()</slot>
    <slot>uninstallPushButton_clicked()</slot>
    <slot>styleComboBox_activated( const TQString &amp; s )</slot>
    <slot>updateStyleComboBox()</slot>
-</Q_SLOTS>
+</slots>
 <functions>
    <function access="private" specifier="non virtual">init()</function>
 </functions>
--- a/amarok/src/Options5.ui
+++ b/amarok/src/Options5.ui
@ -516,14 +516,14 @@
 <variables>
    <variable access="private">OSDPreviewWidget *m_pOSDPreview;</variable>
 </variables>
-<Q_SIGNALS>
+<signals>
    <signal>settingsChanged()</signal>
-</Q_SIGNALS>
-<Q_SLOTS>
+</signals>
+<slots>
    <slot access="protected">slotPositionChanged()</slot>
    <slot access="protected">useCustomColorsToggled( bool on )</slot>
    <slot access="protected">useFakeTransparencyToggled( bool on )</slot>
-</Q_SLOTS>
+</slots>
 <functions>
    <function access="private" specifier="non virtual">init()</function>
    <function access="protected">hideEvent( TQHideEvent * )</function>
--- a/amarok/src/Options8.ui
+++ b/amarok/src/Options8.ui
@ -293,8 +293,8 @@
    <include location="global" impldecl="in implementation">kactivelabel.h</include>
    <include location="global" impldecl="in implementation">klineedit.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
    <slot access="protected">updateServices( const TQString &amp; s )</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
--- a/amarok/src/dbsetup.ui
+++ b/amarok/src/dbsetup.ui
@ -452,9 +452,9 @@
    <include location="global" impldecl="in implementation">klineedit.h</include>
    <include location="global" impldecl="in implementation">kcombobox.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
    <slot>databaseEngine_activated( int )</slot>
-</Q_SLOTS>
+</slots>
 <functions>
    <function access="private">init()</function>
 </functions>
--- a/amarok/src/deletedialogbase.ui
+++ b/amarok/src/deletedialogbase.ui
@ -125,9 +125,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>
--- a/amarok/src/firstrunwizard.ui
+++ b/amarok/src/firstrunwizard.ui
@ -280,10 +280,10 @@
    <variable access="public">enum Interface { XMMS, Compact };</variable>
    <variable access="private">CollectionSetup* m_folderSetup;</variable>
 </variables>
-<Q_SLOTS>
+<slots>
    <slot access="private" specifier="non virtual">invokeHandbook()</slot>
    <slot>openLink( const TQString &amp; s )</slot>
-</Q_SLOTS>
+</slots>
 <functions>
    <function access="private" specifier="non virtual">init()</function>
    <function access="protected">showPage( TQWidget * w )</function>
--- a/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui
+++ b/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui
@ -108,9 +108,9 @@
        <slot>downloadButtonClicked()</slot>
    </connection>
 </connections>
-<Q_SLOTS>
+<slots>
    <slot access="protected">downloadButtonClicked()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
    <include location="global" impldecl="in implementation">kurlrequester.h</include>
--- a/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui
+++ b/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui
@ -698,9 +698,9 @@
    <tabstop>purchaseButton</tabstop>
    <tabstop>cancelButton</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
    <slot>purchase()</slot>
    <slot>cancel()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
--- a/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
+++ b/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
@ -98,10 +98,10 @@
        <slot>selectionChanged()</slot>
    </connection>
 </connections>
-<Q_SLOTS>
+<slots>
    <slot access="protected">redownload()</slot>
    <slot access="protected">selectionChanged()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
    <include location="global" impldecl="in implementation">tdelistview.h</include>
--- a/amarok/src/mediadevice/daap/mongrel/lib/gem_plugin.rb
+++ b/amarok/src/mediadevice/daap/mongrel/lib/gem_plugin.rb
@ -27,7 +27,7 @@ require 'rubygems'
 # people to be able to grab this plugin if they want and use it, because it's snazzy.
 #
 # First thing you do is create a gem of your project and make sure that it depends
-# on "mongrel" AND "gem_plugin".  This Q_SIGNALS to the GemPlugin system that this is
+# on "mongrel" AND "gem_plugin".  This signals to the GemPlugin system that this is
 # a plugin for mongrel.
 #
 # Next you put this code into a file like lib/init.rb (can be anything really):
--- a/amarok/src/mediadevice/daap/mongrel/lib/mongrel.rb
+++ b/amarok/src/mediadevice/daap/mongrel/lib/mongrel.rb
@ -267,7 +267,7 @@ module Mongrel
        # any errors means we should delete the file, including if the file is dumped
        @socket.close rescue Object
        @body.delete if @body.class == Tempfile
-        @body = nil # Q_SIGNALS that there was a problem
+        @body = nil # signals that there was a problem
      end
    end
 
@ -608,7 +608,7 @@ module Mongrel
              request = HttpRequest.new(params, client, notifiers)

              # in the case of large file uploads the user could close the socket, so skip those requests
-              break if request.body == nil  # nil Q_SIGNALS from HttpRequest::initialize that the request was aborted
+              break if request.body == nil  # nil signals from HttpRequest::initialize that the request was aborted

              # request is good so far, continue processing the response
              response = HttpResponse.new(client)
--- a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
+++ b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
@ -438,13 +438,13 @@
    <variable access="private">MetaBundle *m_previewBundle;</variable>
    <variable access="private">GenericMediaDevice *m_device;</variable>
 </variables>
-<Q_SLOTS>
+<slots>
    <slot>addSupportedButtonClicked( int id )</slot>
    <slot specifier="non virtual">removeSupportedButtonClicked()</slot>
    <slot specifier="non virtual">supportedListBoxDoubleClicked( TQListBoxItem * item )</slot>
    <slot>updatePreviewLabel()</slot>
    <slot>updatePreviewLabel( const TQString &amp; format )</slot>
-</Q_SLOTS>
+</slots>
 <functions>
    <function access="private" specifier="non virtual">updateConfigDialogLists( const TQStringList &amp; supportedFileTypes )</function>
    <function access="private" specifier="non virtual" returnType="TQString">buildDestination( const TQString &amp; format, const MetaBundle &amp; mb )</function>
--- a/amarok/src/organizecollectiondialog.ui
+++ b/amarok/src/organizecollectiondialog.ui
@ -571,15 +571,15 @@
    <variable>MetaBundle previewBundle;</variable>
    <variable>bool detailed;</variable>
 </variables>
-<Q_SIGNALS>
+<signals>
    <signal>updatePreview( const TQString &amp; )</signal>
-</Q_SIGNALS>
-<Q_SLOTS>
+</signals>
+<slots>
    <slot>preview( const TQString &amp; format )</slot>
    <slot>update( int dummy )</slot>
    <slot>update( const TQString &amp; dummy )</slot>
    <slot>slotDetails()</slot>
-</Q_SLOTS>
+</slots>
 <functions>
    <function returnType="TQString">buildDestination( const TQString &amp; format, const MetaBundle &amp; mb )</function>
    <function returnType="TQString">buildFormatTip()</function>
--- a/amarok/src/scripts/databasescripts/databaseScripts.rb
+++ b/amarok/src/scripts/databasescripts/databaseScripts.rb
@ -27,7 +27,7 @@ class DatabaseScriptChooser < TQt::Dialog
    attr_reader :m_saveDir
    attr_reader :m_okayButton

-    Q_SLOTS 'optionChanged(int)', 'textChanged(const TQString &)', 'accept()', 'cancel()'
+    slots 'optionChanged(int)', 'textChanged(const TQString &)', 'accept()', 'cancel()'

    def initialize(parent = nil, name = nil, modal = false, fl = 0)
        super
--- a/amarok/src/scripts/graphequalizer/eqdialog.ui
+++ b/amarok/src/scripts/graphequalizer/eqdialog.ui
@ -200,9 +200,9 @@
    <include location="local" impldecl="in implementation">eqdialog.ui.h</include>
    <include location="global" impldecl="in implementation">equalizercanvasview.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
    <slot>eqGroupBox_toggled( bool eqEnabled )</slot>
-</Q_SLOTS>
+</slots>
 <functions>
    <function specifier="non virtual">init()</function>
 </functions>
--- a/amarok/src/scripts/templates/amarok.rb
+++ b/amarok/src/scripts/templates/amarok.rb
@ -19,7 +19,7 @@
 ############################################################################

 class QtIoListener < TQt::Object
-	Q_SLOTS 'dataRecieved()'
+	slots 'dataRecieved()'
 	def initialize(app, iostream, lineHandler)
 		super(app)
 		@lineHandler = lineHandler
--- a/amarok/src/tagguesserconfigdialog.ui
+++ b/amarok/src/tagguesserconfigdialog.ui
@ -193,7 +193,7 @@ Note that the order in which the schemes appear in the list is relevant, since t
    <include location="global" impldecl="in implementation">tdelistview.h</include>
    <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
    <slot specifier="non virtual">slotCurrentChanged( TQListViewItem * item )</slot>
    <slot>accept()</slot>
    <slot>reject()</slot>
@ -203,7 +203,7 @@ Note that the order in which the schemes appear in the list is relevant, since t
    <slot specifier="non virtual">slotAddClicked()</slot>
    <slot specifier="non virtual">slotModifyClicked()</slot>
    <slot specifier="non virtual">slotRemoveClicked()</slot>
-</Q_SLOTS>
+</slots>
 <forwards>
    <forward>class TQListViewItem;</forward>
 </forwards>