diff options
| author | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-03-12 19:12:05 +0000 |
|---|---|---|
| committer | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-03-12 19:12:05 +0000 |
| commit | d2ca745d50741414e157d9bace9cab2e37ba19f9 (patch) | |
| tree | d012bdda9299ce51d3b41081352a9d715bbb2775 /amarok/src/mediadevice | |
| parent | 2a98648e2c89cbb1265f842903c6370e71f544ae (diff) | |
| download | amarok-d2ca745d50741414e157d9bace9cab2e37ba19f9.tar.gz amarok-d2ca745d50741414e157d9bace9cab2e37ba19f9.zip | |
[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
Diffstat (limited to 'amarok/src/mediadevice')
| -rw-r--r-- | amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui | 6 | ||||
| -rw-r--r-- | amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui index 9782071a..d6e28e2f 100644 --- a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui +++ b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui @@ -449,10 +449,10 @@ </slots> <functions> <function access="private" specifier="non virtual">updateConfigDialogLists( const QStringList & supportedFileTypes )</function> - <function access="private" specifier="non virtual" returnType="QString">buildDestination( const QString & format, const MetaBundle & mb ) const</function> - <function access="private" specifier="non virtual" returnType="QString">cleanPath( const QString & component ) const</function> + <function access="private" specifier="non virtual" returnType="QString">buildDestination( const QString & format, const MetaBundle & mb )</function> + <function access="private" specifier="non virtual" returnType="QString">cleanPath( const QString & 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> diff --git a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h index 192d4fa0..78be94ba 100644 --- a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h +++ b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h @@ -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++ ) |