Fix Amarok FTBFS under Qt4

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/amarok@1242771 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

10 files changed, 34 insertions, 34 deletions

diff --git a/amarok/src/Options1.ui.h b/amarok/src/Options1.ui.h
index e4f8e723..72f2a30b 100644
--- a/amarok/src/Options1.ui.h
+++ b/amarok/src/Options1.ui.h
@@ -47,7 +47,7 @@ void Options1::init()
 
     kComboBox_browser->insertStringList( browsers );
     kLineEdit_customBrowser->setText( AmarokConfig::externalBrowser() );
-    int index = browsers.findIndex( AmarokConfig::externalBrowser() );
+    int index = browsers.tqfindIndex( AmarokConfig::externalBrowser() );
     if( index >= 0 )
         kComboBox_browser->setCurrentItem( index );
     else if( AmarokConfig::externalBrowser() ==
diff --git a/amarok/src/Options2.ui b/amarok/src/Options2.ui
index ba39801a..ec244783 100644
--- a/amarok/src/Options2.ui
+++ b/amarok/src/Options2.ui
@@ -737,9 +737,9 @@
     </connection>
     <connection>
         <sender>styleComboBox</sender>
-        <signal>activated(const QString&amp;)</signal>
+        <signal>activated(const TQString&amp;)</signal>
         <receiver>Options2</receiver>
-        <slot>styleComboBox_activated(const QString&amp;)</slot>
+        <slot>styleComboBox_activated(const TQString&amp;)</slot>
     </connection>
 </connections>
 <includes>
@@ -749,7 +749,7 @@
     <slot>installPushButton_clicked()</slot>
     <slot>retrievePushButton_clicked()</slot>
     <slot>uninstallPushButton_clicked()</slot>
-    <slot>styleComboBox_activated( const QString &amp; s )</slot>
+    <slot>styleComboBox_activated( const TQString &amp; s )</slot>
     <slot>updateStyleComboBox()</slot>
 </Q_SLOTS>
 <functions>
diff --git a/amarok/src/Options5.ui b/amarok/src/Options5.ui
index cc7fc38b..c5782df5 100644
--- a/amarok/src/Options5.ui
+++ b/amarok/src/Options5.ui
@@ -520,8 +520,8 @@
 </Q_SLOTS>
 <functions>
     <function access="private" specifier="non virtual">init()</function>
-    <function access="protected">hideEvent( QHideEvent * )</function>
-    <function access="protected">showEvent( QShowEvent * )</function>
+    <function access="protected">hideEvent( TQHideEvent * )</function>
+    <function access="protected">showEvent( TQShowEvent * )</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
diff --git a/amarok/src/Options8.ui b/amarok/src/Options8.ui
index 7f245e56..66524775 100644
--- a/amarok/src/Options8.ui
+++ b/amarok/src/Options8.ui
@@ -283,16 +283,16 @@
 <connections>
     <connection>
         <sender>kcfg_ScrobblerUsername</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>Options8</receiver>
-        <slot>updateServices(const QString&amp;)</slot>
+        <slot>updateServices(const TQString&amp;)</slot>
     </connection>
 </connections>
 <includes>
     <include location="local" impldecl="in implementation">Options8.ui.h</include>
 </includes>
 <Q_SLOTS>
-    <slot access="protected">updateServices( const QString &amp; s )</slot>
+    <slot access="protected">updateServices( const TQString &amp; s )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
diff --git a/amarok/src/firstrunwizard.ui b/amarok/src/firstrunwizard.ui
index 4cf16752..3ab4cc92 100644
--- a/amarok/src/firstrunwizard.ui
+++ b/amarok/src/firstrunwizard.ui
@@ -282,11 +282,11 @@
 </variables>
 <Q_SLOTS>
     <slot access="private" specifier="non virtual">invokeHandbook()</slot>
-    <slot>openLink( const QString &amp; s )</slot>
+    <slot>openLink( const TQString &amp; s )</slot>
 </Q_SLOTS>
 <functions>
     <function access="private" specifier="non virtual">init()</function>
-    <function access="protected">showPage( QWidget * w )</function>
+    <function access="protected">showPage( TQWidget * w )</function>
     <function specifier="non virtual">writeCollectionConfig()</function>
     <function specifier="non virtual" returnType="FirstRunWizard::Interface">interface()</function>
 </functions>
diff --git a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
index 7bc1bc2d..8a305909 100644
--- a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
+++ b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
@@ -405,9 +405,9 @@
     </connection>
     <connection>
         <sender>m_songLocationBox</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>GenericMediaDeviceConfigDialog</receiver>
-        <slot>updatePreviewLabel(const QString&amp;)</slot>
+        <slot>updatePreviewLabel(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>m_asciiCheck</sender>
@@ -445,12 +445,12 @@
     <slot specifier="non virtual">removeSupportedButtonClicked()</slot>
     <slot specifier="non virtual">supportedListBoxDoubleClicked( TQListBoxItem * item )</slot>
     <slot>updatePreviewLabel()</slot>
-    <slot>updatePreviewLabel( const QString &amp; format )</slot>
+    <slot>updatePreviewLabel( const TQString &amp; format )</slot>
 </Q_SLOTS>
 <functions>
-    <function access="private" specifier="non virtual">updateConfigDialogLists( const QStringList &amp; supportedFileTypes )</function>
-    <function access="private" specifier="non virtual" returnType="TQString">buildDestination( const QString &amp; format, const MetaBundle &amp; mb )</function>
-    <function access="private" specifier="non virtual" returnType="TQString">cleanPath( const QString &amp; component )</function>
+    <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>
+    <function access="private" specifier="non virtual" returnType="TQString">cleanPath( const TQString &amp; component )</function>
     <function specifier="non virtual">setDevice( GenericMediaDevice * device )</function>
     <function access="private" specifier="non virtual" returnType="TQString">buildFormatTip()</function>
     <function access="private" specifier="non virtual">init()</function>
diff --git a/amarok/src/medium.h b/amarok/src/medium.h
index 34c3251b..850b24a4 100644
--- a/amarok/src/medium.h
+++ b/amarok/src/medium.h
@@ -28,7 +28,7 @@
 class LIBAMAROK_EXPORT Medium
 {
 public:
-    typedef TQValueList<const Medium> List;
+    typedef TQValueList<Medium> List;
 
     static const uint AUTODETECTED = 0;
     static const uint ID = 1;
diff --git a/amarok/src/organizecollectiondialog.ui b/amarok/src/organizecollectiondialog.ui
index f63b6b1f..c094a216 100644
--- a/amarok/src/organizecollectiondialog.ui
+++ b/amarok/src/organizecollectiondialog.ui
@@ -488,15 +488,15 @@
     </connection>
     <connection>
         <sender>formatEdit</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>organizeCollectionDialog</receiver>
-        <slot>preview(const QString&amp;)</slot>
+        <slot>preview(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>organizeCollectionDialog</sender>
-        <signal>updatePreview( const QString &amp; )</signal>
+        <signal>updatePreview( const TQString &amp; )</signal>
         <receiver>previewText</receiver>
-        <slot>setText(const QString&amp;)</slot>
+        <slot>setText(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>customschemeCheck</sender>
@@ -548,15 +548,15 @@
     </connection>
     <connection>
         <sender>regexpEdit</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>organizeCollectionDialog</receiver>
-        <slot>update(const QString&amp;)</slot>
+        <slot>update(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>replaceEdit</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>organizeCollectionDialog</receiver>
-        <slot>update(const QString&amp;)</slot>
+        <slot>update(const TQString&amp;)</slot>
     </connection>
 </connections>
 <includes>
@@ -569,20 +569,20 @@
     <variable>bool detailed;</variable>
 </variables>
 <Q_SIGNALS>
-    <signal>updatePreview( const QString &amp; )</signal>
+    <signal>updatePreview( const TQString &amp; )</signal>
 </Q_SIGNALS>
 <Q_SLOTS>
-    <slot>preview( const QString &amp; format )</slot>
+    <slot>preview( const TQString &amp; format )</slot>
     <slot>update( int dummy )</slot>
-    <slot>update( const QString &amp; dummy )</slot>
+    <slot>update( const TQString &amp; dummy )</slot>
     <slot>slotDetails()</slot>
 </Q_SLOTS>
 <functions>
-    <function returnType="TQString">buildDestination( const QString &amp; format, const MetaBundle &amp; mb )</function>
+    <function returnType="TQString">buildDestination( const TQString &amp; format, const MetaBundle &amp; mb )</function>
     <function returnType="TQString">buildFormatTip()</function>
     <function returnType="TQString">buildFormatString()</function>
     <function>setPreviewBundle( const MetaBundle &amp; bundle )</function>
-    <function returnType="TQString">cleanPath( const QString &amp; component )</function>
+    <function returnType="TQString">cleanPath( const TQString &amp; component )</function>
     <function>init()</function>
 </functions>
 <layoutdefaults spacing="6" margin="0"/>
diff --git a/amarok/src/organizecollectiondialog.ui.h b/amarok/src/organizecollectiondialog.ui.h
index 10f51617..7cc46f2d 100644
--- a/amarok/src/organizecollectiondialog.ui.h
+++ b/amarok/src/organizecollectiondialog.ui.h
@@ -202,8 +202,8 @@ void OrganizeCollectionDialog::slotDetails()
     }
 
     if( dynamic_cast<TQWidget *>(tqparent()) ) {
-        static_cast<TQWidget *>(tqparent())->adjustSize();
-        static_cast<TQWidget *>(tqparent())->updateGeometry();
+        TQT_TQWIDGET(tqparent())->adjustSize();
+        TQT_TQWIDGET(tqparent())->updateGeometry();
     }
 }
 
diff --git a/amarok/src/tagguesserconfigdialog.ui b/amarok/src/tagguesserconfigdialog.ui
index eaac3d73..2241f093 100644
--- a/amarok/src/tagguesserconfigdialog.ui
+++ b/amarok/src/tagguesserconfigdialog.ui
@@ -195,7 +195,7 @@ Note that the order in which the schemes appear in the list is relevant, since t
     <slot specifier="non virtual">slotCurrentChanged( TQListViewItem * item )</slot>
     <slot>accept()</slot>
     <slot>reject()</slot>
-    <slot specifier="non virtual">slotRenameItem( TQListViewItem * item, const QPoint &amp;, int c )</slot>
+    <slot specifier="non virtual">slotRenameItem( TQListViewItem * item, const TQPoint &amp;, int c )</slot>
     <slot specifier="non virtual">slotMoveUpClicked()</slot>
     <slot specifier="non virtual">slotMoveDownClicked()</slot>
     <slot specifier="non virtual">slotAddClicked()</slot>