[applications/amarok] hack which allow uic3 generated code to be compiled with gcc 4.5

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/amarok@1224609 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
samelian 14 years ago
parent 2a98648e2c
commit d2ca745d50

@ -3985,7 +3985,7 @@ void CollectionDB::cancelMovingFileJob()
}
bool
CollectionDB::organizeFile( const KURL &src, const OrganizeCollectionDialog &dialog, bool copy )
CollectionDB::organizeFile( const KURL &src, OrganizeCollectionDialog &dialog, bool copy )
{
if( !MetaBundle::isKioUrl( src ) )
return false;

@ -389,7 +389,7 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver
TQDateTime getLastPlay( const TQString &url );
void migrateFile( const TQString &oldURL, const TQString &newURL );
bool moveFile( const TQString &src, const TQString &dest, bool overwrite, bool copy = false );
bool organizeFile( const KURL &src, const OrganizeCollectionDialog &dialog, bool copy );
bool organizeFile( const KURL &src, OrganizeCollectionDialog &dialog, bool copy );
//artist methods
TQStringList similarArtists( const TQString &artist, uint count );

@ -449,10 +449,10 @@
</slots>
<functions>
<function access="private" specifier="non virtual">updateConfigDialogLists( const QStringList &amp; supportedFileTypes )</function>
<function access="private" specifier="non virtual" returnType="QString">buildDestination( const QString &amp; format, const MetaBundle &amp; mb ) const</function>
<function access="private" specifier="non virtual" returnType="QString">cleanPath( const QString &amp; component ) const</function>
<function access="private" specifier="non virtual" returnType="QString">buildDestination( const QString &amp; format, const MetaBundle &amp; mb )</function>
<function access="private" specifier="non virtual" returnType="QString">cleanPath( const QString &amp; component )</function>
<function specifier="non virtual">setDevice( GenericMediaDevice * device )</function>
<function access="private" specifier="non virtual" returnType="QString">buildFormatTip() const</function>
<function access="private" specifier="non virtual" returnType="QString">buildFormatTip()</function>
<function access="private" specifier="non virtual">init()</function>
<function access="private" specifier="non virtual">destroy()</function>
</functions>

@ -157,7 +157,7 @@ GenericMediaDeviceConfigDialog::updateConfigDialogLists( const TQStringList & su
}
QString
GenericMediaDeviceConfigDialog::buildDestination( const TQString &format, const MetaBundle &mb ) const
GenericMediaDeviceConfigDialog::buildDestination( const TQString &format, const MetaBundle &mb )
{
bool isCompilation = mb.compilation() > 0;
TQMap<TQString, TQString> args;
@ -198,7 +198,7 @@ GenericMediaDeviceConfigDialog::buildDestination( const TQString &format, const
return m_device->mountPoint() + tail.replace( TQRegExp( "/\\.*" ), "/" );
}
TQString GenericMediaDeviceConfigDialog::cleanPath( const TQString &component ) const
TQString GenericMediaDeviceConfigDialog::cleanPath( const TQString &component )
{
TQString result = Amarok::cleanPath( component );
@ -246,7 +246,7 @@ GenericMediaDeviceConfigDialog::setDevice( GenericMediaDevice* device )
}
QString
GenericMediaDeviceConfigDialog::buildFormatTip() const
GenericMediaDeviceConfigDialog::buildFormatTip()
{
TQMap<TQString, TQString> args;
for( int i = 0; i < MetaBundle::NUM_COLUMNS; i++ )

@ -578,11 +578,11 @@
<slot>slotDetails()</slot>
</slots>
<functions>
<function returnType="QString">buildDestination( const QString &amp; format, const MetaBundle &amp; mb ) const</function>
<function returnType="QString">buildFormatTip() const</function>
<function returnType="QString">buildFormatString() const</function>
<function returnType="QString">buildDestination( const QString &amp; format, const MetaBundle &amp; mb )</function>
<function returnType="QString">buildFormatTip()</function>
<function returnType="QString">buildFormatString()</function>
<function>setPreviewBundle( const MetaBundle &amp; bundle )</function>
<function returnType="QString">cleanPath( const QString &amp; component ) const</function>
<function returnType="QString">cleanPath( const QString &amp; component )</function>
<function>init()</function>
</functions>
<layoutdefaults spacing="6" margin="0"/>

@ -4,7 +4,7 @@
#include "qstringx.h"
TQString OrganizeCollectionDialog::buildDestination( const TQString &format, const MetaBundle &mb ) const
TQString OrganizeCollectionDialog::buildDestination( const TQString &format, const MetaBundle &mb )
{
bool isCompilation = false;
if( !mb.album().isEmpty() )
@ -55,7 +55,7 @@ TQString OrganizeCollectionDialog::buildDestination( const TQString &format, con
return result.replace( TQRegExp( "/\\.*" ), "/" );
}
TQString OrganizeCollectionDialog::buildFormatTip() const
TQString OrganizeCollectionDialog::buildFormatTip()
{
TQMap<TQString, TQString> args;
for( int i = 0; i < MetaBundle::NUM_COLUMNS; i++ )
@ -92,7 +92,7 @@ TQString OrganizeCollectionDialog::buildFormatTip() const
}
TQString OrganizeCollectionDialog::buildFormatString() const
TQString OrganizeCollectionDialog::buildFormatString()
{
TQString format = "%folder/";
if( filetypeCheck->isChecked() )
@ -131,7 +131,7 @@ void OrganizeCollectionDialog::preview( const TQString &format )
}
TQString OrganizeCollectionDialog::cleanPath( const TQString &component ) const
TQString OrganizeCollectionDialog::cleanPath( const TQString &component )
{
TQString result = component;

Loading…
Cancel
Save