diff --git a/amarok/src/Options1.ui b/amarok/src/Options1.ui
index 0608eaf4..10443a4e 100644
--- a/amarok/src/Options1.ui
+++ b/amarok/src/Options1.ui
@@ -688,9 +688,9 @@
klineedit.h
kactivelabel.h
-
+
slotUpdateMoodFrame()
-
+
init()
diff --git a/amarok/src/Options2.ui b/amarok/src/Options2.ui
index 281e82f3..ac342ae2 100644
--- a/amarok/src/Options2.ui
+++ b/amarok/src/Options2.ui
@@ -748,13 +748,13 @@
kcolorbutton.h
kcombobox.h
-
+
installPushButton_clicked()
retrievePushButton_clicked()
uninstallPushButton_clicked()
styleComboBox_activated( const TQString & s )
updateStyleComboBox()
-
+
init()
diff --git a/amarok/src/Options5.ui b/amarok/src/Options5.ui
index 077b8d43..b3917336 100644
--- a/amarok/src/Options5.ui
+++ b/amarok/src/Options5.ui
@@ -516,14 +516,14 @@
OSDPreviewWidget *m_pOSDPreview;
-
+
settingsChanged()
-
-
+
+
slotPositionChanged()
useCustomColorsToggled( bool on )
useFakeTransparencyToggled( bool on )
-
+
init()
hideEvent( TQHideEvent * )
diff --git a/amarok/src/Options8.ui b/amarok/src/Options8.ui
index 124f7f36..a3e9db6a 100644
--- a/amarok/src/Options8.ui
+++ b/amarok/src/Options8.ui
@@ -293,8 +293,8 @@
kactivelabel.h
klineedit.h
-
+
updateServices( const TQString & s )
-
+
diff --git a/amarok/src/dbsetup.ui b/amarok/src/dbsetup.ui
index 2339a086..30ba2ab1 100644
--- a/amarok/src/dbsetup.ui
+++ b/amarok/src/dbsetup.ui
@@ -452,9 +452,9 @@
klineedit.h
kcombobox.h
-
+
databaseEngine_activated( int )
-
+
init()
diff --git a/amarok/src/deletedialogbase.ui b/amarok/src/deletedialogbase.ui
index f3706f97..eef1b80b 100644
--- a/amarok/src/deletedialogbase.ui
+++ b/amarok/src/deletedialogbase.ui
@@ -125,9 +125,9 @@
slotShouldDelete(bool)
-
+
slotShouldDelete(bool)
-
+
tdelistbox.h
diff --git a/amarok/src/firstrunwizard.ui b/amarok/src/firstrunwizard.ui
index c6613fa6..12ba2c6f 100644
--- a/amarok/src/firstrunwizard.ui
+++ b/amarok/src/firstrunwizard.ui
@@ -280,10 +280,10 @@
enum Interface { XMMS, Compact };
CollectionSetup* m_folderSetup;
-
+
invokeHandbook()
openLink( const TQString & s )
-
+
init()
showPage( TQWidget * w )
diff --git a/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui b/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui
index 6d7499f8..a5992619 100644
--- a/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui
+++ b/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui
@@ -108,9 +108,9 @@
downloadButtonClicked()
-
+
downloadButtonClicked()
-
+
kurlrequester.h
diff --git a/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui b/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui
index 801226f3..bdfeafea 100644
--- a/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui
+++ b/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui
@@ -698,9 +698,9 @@
purchaseButton
cancelButton
-
+
purchase()
cancel()
-
+
diff --git a/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui b/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
index 26a2062d..e1135d36 100644
--- a/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
+++ b/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
@@ -98,10 +98,10 @@
selectionChanged()
-
+
redownload()
selectionChanged()
-
+
tdelistview.h
diff --git a/amarok/src/mediadevice/daap/mongrel/lib/gem_plugin.rb b/amarok/src/mediadevice/daap/mongrel/lib/gem_plugin.rb
index 1d86abf4..27d9f28a 100644
--- 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):
diff --git a/amarok/src/mediadevice/daap/mongrel/lib/mongrel.rb b/amarok/src/mediadevice/daap/mongrel/lib/mongrel.rb
index 3a9b0581..6c348fbc 100644
--- 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)
diff --git a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
index ddf8ce3c..b9b0dcf9 100644
--- a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
+++ b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
@@ -438,13 +438,13 @@
MetaBundle *m_previewBundle;
GenericMediaDevice *m_device;
-
+
addSupportedButtonClicked( int id )
removeSupportedButtonClicked()
supportedListBoxDoubleClicked( TQListBoxItem * item )
updatePreviewLabel()
updatePreviewLabel( const TQString & format )
-
+
updateConfigDialogLists( const TQStringList & supportedFileTypes )
buildDestination( const TQString & format, const MetaBundle & mb )
diff --git a/amarok/src/organizecollectiondialog.ui b/amarok/src/organizecollectiondialog.ui
index 2f5740a6..a2e45c54 100644
--- a/amarok/src/organizecollectiondialog.ui
+++ b/amarok/src/organizecollectiondialog.ui
@@ -571,15 +571,15 @@
MetaBundle previewBundle;
bool detailed;
-
+
updatePreview( const TQString & )
-
-
+
+
preview( const TQString & format )
update( int dummy )
update( const TQString & dummy )
slotDetails()
-
+
buildDestination( const TQString & format, const MetaBundle & mb )
buildFormatTip()
diff --git a/amarok/src/scripts/databasescripts/databaseScripts.rb b/amarok/src/scripts/databasescripts/databaseScripts.rb
index 663ce063..0965be6c 100644
--- 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
diff --git a/amarok/src/scripts/graphequalizer/eqdialog.ui b/amarok/src/scripts/graphequalizer/eqdialog.ui
index 96e869bf..b63327d8 100644
--- a/amarok/src/scripts/graphequalizer/eqdialog.ui
+++ b/amarok/src/scripts/graphequalizer/eqdialog.ui
@@ -200,9 +200,9 @@
eqdialog.ui.h
equalizercanvasview.h
-
+
eqGroupBox_toggled( bool eqEnabled )
-
+
init()
diff --git a/amarok/src/scripts/templates/amarok.rb b/amarok/src/scripts/templates/amarok.rb
index b4170de2..42a7ca0c 100644
--- 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
diff --git a/amarok/src/tagguesserconfigdialog.ui b/amarok/src/tagguesserconfigdialog.ui
index 6556725d..bd3b98cd 100644
--- 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
tdelistview.h
kpushbutton.h
-
+
slotCurrentChanged( TQListViewItem * item )
accept()
reject()
@@ -203,7 +203,7 @@ Note that the order in which the schemes appear in the list is relevant, since t
slotAddClicked()
slotModifyClicked()
slotRemoveClicked()
-
+
class TQListViewItem;