TDE
/
amarok
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/amarok
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix Amarok FTBFS under Qt4

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/amarok@1242771 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 9df0fe41af
commit ebc14f270e
10 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File

2
amarok/src/Options1.ui.h
Unescape View File

@ -47,7 +47,7 @@ void Options1::init()
kComboBox_browser->insertStringList( browsers ); kComboBox_browser->insertStringList( browsers );
kLineEdit_customBrowser->setText( AmarokConfig::externalBrowser() ); kLineEdit_customBrowser->setText( AmarokConfig::externalBrowser() );
int index = browsers.findIndex( AmarokConfig::externalBrowser() ); int index = browsers.tqfindIndex( AmarokConfig::externalBrowser() );
if( index >= 0 ) if( index >= 0 )
kComboBox_browser->setCurrentItem( index ); kComboBox_browser->setCurrentItem( index );
else if( AmarokConfig::externalBrowser() == else if( AmarokConfig::externalBrowser() ==

6
amarok/src/Options2.ui
Unescape View File

@ -737,9 +737,9 @@
</connection> </connection>
<connection> <connection>
<sender>styleComboBox</sender> <sender>styleComboBox</sender>
<signal>activated(const QString&amp;)</signal> <signal>activated(const TQString&amp;)</signal>
<receiver>Options2</receiver> <receiver>Options2</receiver>
<slot>styleComboBox_activated(const QString&amp;)</slot> <slot>styleComboBox_activated(const TQString&amp;)</slot>
</connection> </connection>
</connections> </connections>
<includes> <includes>
@ -749,7 +749,7 @@
<slot>installPushButton_clicked()</slot> <slot>installPushButton_clicked()</slot>
<slot>retrievePushButton_clicked()</slot> <slot>retrievePushButton_clicked()</slot>
<slot>uninstallPushButton_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> <slot>updateStyleComboBox()</slot>
</Q_SLOTS> </Q_SLOTS>
<functions> <functions>

4
amarok/src/Options5.ui
Unescape View File

@ -520,8 +520,8 @@
</Q_SLOTS> </Q_SLOTS>
<functions> <functions>
<function access="private" specifier="non virtual">init()</function> <function access="private" specifier="non virtual">init()</function>
<function access="protected">hideEvent( QHideEvent * )</function> <function access="protected">hideEvent( TQHideEvent * )</function>
<function access="protected">showEvent( QShowEvent * )</function> <function access="protected">showEvent( TQShowEvent * )</function>
</functions> </functions>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>

6
amarok/src/Options8.ui
Unescape View File

@ -283,16 +283,16 @@
<connections> <connections>
<connection> <connection>
<sender>kcfg_ScrobblerUsername</sender> <sender>kcfg_ScrobblerUsername</sender>
<signal>textChanged(const QString&amp;)</signal> <signal>textChanged(const TQString&amp;)</signal>
<receiver>Options8</receiver> <receiver>Options8</receiver>
<slot>updateServices(const QString&amp;)</slot> <slot>updateServices(const TQString&amp;)</slot>
</connection> </connection>
</connections> </connections>
<includes> <includes>
<include location="local" impldecl="in implementation">Options8.ui.h</include> <include location="local" impldecl="in implementation">Options8.ui.h</include>
</includes> </includes>
<Q_SLOTS> <Q_SLOTS>
<slot access="protected">updateServices( const QString &amp; s )</slot> <slot access="protected">updateServices( const TQString &amp; s )</slot>
</Q_SLOTS> </Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>

4
amarok/src/firstrunwizard.ui
Unescape View File

@ -282,11 +282,11 @@
</variables> </variables>
<Q_SLOTS> <Q_SLOTS>
<slot access="private" specifier="non virtual">invokeHandbook()</slot> <slot access="private" specifier="non virtual">invokeHandbook()</slot>
<slot>openLink( const QString &amp; s )</slot> <slot>openLink( const TQString &amp; s )</slot>
</Q_SLOTS> </Q_SLOTS>
<functions> <functions>
<function access="private" specifier="non virtual">init()</function> <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">writeCollectionConfig()</function>
<function specifier="non virtual" returnType="FirstRunWizard::Interface">interface()</function> <function specifier="non virtual" returnType="FirstRunWizard::Interface">interface()</function>
</functions> </functions>

12
amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
Unescape View File

@ -405,9 +405,9 @@
</connection> </connection>
<connection> <connection>
<sender>m_songLocationBox</sender> <sender>m_songLocationBox</sender>
<signal>textChanged(const QString&amp;)</signal> <signal>textChanged(const TQString&amp;)</signal>
<receiver>GenericMediaDeviceConfigDialog</receiver> <receiver>GenericMediaDeviceConfigDialog</receiver>
<slot>updatePreviewLabel(const QString&amp;)</slot> <slot>updatePreviewLabel(const TQString&amp;)</slot>
</connection> </connection>
<connection> <connection>
<sender>m_asciiCheck</sender> <sender>m_asciiCheck</sender>
@ -445,12 +445,12 @@
<slot specifier="non virtual">removeSupportedButtonClicked()</slot> <slot specifier="non virtual">removeSupportedButtonClicked()</slot>
<slot specifier="non virtual">supportedListBoxDoubleClicked( TQListBoxItem * item )</slot> <slot specifier="non virtual">supportedListBoxDoubleClicked( TQListBoxItem * item )</slot>
<slot>updatePreviewLabel()</slot> <slot>updatePreviewLabel()</slot>
<slot>updatePreviewLabel( const QString &amp; format )</slot> <slot>updatePreviewLabel( const TQString &amp; format )</slot>
</Q_SLOTS> </Q_SLOTS>
<functions> <functions>
<function access="private" specifier="non virtual">updateConfigDialogLists( const QStringList &amp; supportedFileTypes )</function> <function access="private" specifier="non virtual">updateConfigDialogLists( const TQStringList &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">buildDestination( const TQString &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" returnType="TQString">cleanPath( const TQString &amp; component )</function>
<function specifier="non virtual">setDevice( GenericMediaDevice * device )</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" returnType="TQString">buildFormatTip()</function>
<function access="private" specifier="non virtual">init()</function> <function access="private" specifier="non virtual">init()</function>

2
amarok/src/medium.h
Unescape View File

@ -28,7 +28,7 @@
class LIBAMAROK_EXPORT Medium class LIBAMAROK_EXPORT Medium
{ {
public: public:
typedef TQValueList<const Medium> List; typedef TQValueList<Medium> List;
static const uint AUTODETECTED = 0; static const uint AUTODETECTED = 0;
static const uint ID = 1; static const uint ID = 1;

26
amarok/src/organizecollectiondialog.ui
Unescape View File

@ -488,15 +488,15 @@
</connection> </connection>
<connection> <connection>
<sender>formatEdit</sender> <sender>formatEdit</sender>
<signal>textChanged(const QString&amp;)</signal> <signal>textChanged(const TQString&amp;)</signal>
<receiver>organizeCollectionDialog</receiver> <receiver>organizeCollectionDialog</receiver>
<slot>preview(const QString&amp;)</slot> <slot>preview(const TQString&amp;)</slot>
</connection> </connection>
<connection> <connection>
<sender>organizeCollectionDialog</sender> <sender>organizeCollectionDialog</sender>
<signal>updatePreview( const QString &amp; )</signal> <signal>updatePreview( const TQString &amp; )</signal>
<receiver>previewText</receiver> <receiver>previewText</receiver>
<slot>setText(const QString&amp;)</slot> <slot>setText(const TQString&amp;)</slot>
</connection> </connection>
<connection> <connection>
<sender>customschemeCheck</sender> <sender>customschemeCheck</sender>
@ -548,15 +548,15 @@
</connection> </connection>
<connection> <connection>
<sender>regexpEdit</sender> <sender>regexpEdit</sender>
<signal>textChanged(const QString&amp;)</signal> <signal>textChanged(const TQString&amp;)</signal>
<receiver>organizeCollectionDialog</receiver> <receiver>organizeCollectionDialog</receiver>
<slot>update(const QString&amp;)</slot> <slot>update(const TQString&amp;)</slot>
</connection> </connection>
<connection> <connection>
<sender>replaceEdit</sender> <sender>replaceEdit</sender>
<signal>textChanged(const QString&amp;)</signal> <signal>textChanged(const TQString&amp;)</signal>
<receiver>organizeCollectionDialog</receiver> <receiver>organizeCollectionDialog</receiver>
<slot>update(const QString&amp;)</slot> <slot>update(const TQString&amp;)</slot>
</connection> </connection>
</connections> </connections>
<includes> <includes>
@ -569,20 +569,20 @@
<variable>bool detailed;</variable> <variable>bool detailed;</variable>
</variables> </variables>
<Q_SIGNALS> <Q_SIGNALS>
<signal>updatePreview( const QString &amp; )</signal> <signal>updatePreview( const TQString &amp; )</signal>
</Q_SIGNALS> </Q_SIGNALS>
<Q_SLOTS> <Q_SLOTS>
<slot>preview( const QString &amp; format )</slot> <slot>preview( const TQString &amp; format )</slot>
<slot>update( int dummy )</slot> <slot>update( int dummy )</slot>
<slot>update( const QString &amp; dummy )</slot> <slot>update( const TQString &amp; dummy )</slot>
<slot>slotDetails()</slot> <slot>slotDetails()</slot>
</Q_SLOTS> </Q_SLOTS>
<functions> <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">buildFormatTip()</function>
<function returnType="TQString">buildFormatString()</function> <function returnType="TQString">buildFormatString()</function>
<function>setPreviewBundle( const MetaBundle &amp; bundle )</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> <function>init()</function>
</functions> </functions>
<layoutdefaults spacing="6" margin="0"/> <layoutdefaults spacing="6" margin="0"/>

4
amarok/src/organizecollectiondialog.ui.h
Unescape View File

@ -202,8 +202,8 @@ void OrganizeCollectionDialog::slotDetails()
} }
if( dynamic_cast<TQWidget *>(tqparent()) ) { if( dynamic_cast<TQWidget *>(tqparent()) ) {
static_cast<TQWidget *>(tqparent())->adjustSize(); TQT_TQWIDGET(tqparent())->adjustSize();
static_cast<TQWidget *>(tqparent())->updateGeometry(); TQT_TQWIDGET(tqparent())->updateGeometry();
} }
} }

2
amarok/src/tagguesserconfigdialog.ui
Unescape View File

@ -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 specifier="non virtual">slotCurrentChanged( TQListViewItem * item )</slot>
<slot>accept()</slot> <slot>accept()</slot>
<slot>reject()</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">slotMoveUpClicked()</slot>
<slot specifier="non virtual">slotMoveDownClicked()</slot> <slot specifier="non virtual">slotMoveDownClicked()</slot>
<slot specifier="non virtual">slotAddClicked()</slot> <slot specifier="non virtual">slotAddClicked()</slot>

Write Preview
Loading…
Cancel
Save