[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [Amarok] 8880871: Fix bad method overloading in collection location
From: Ralf Engels <ralf-engels () gmx ! de>
Date: 2010-12-13 19:49:07
Message-ID: 20101213194907.BEF99A60B0 () git ! kde ! org
[Download RAW message or body]
commit 8880871445f2761110ab6dba360ea47e50e37dd5
branch master
Author: Ralf Engels <ralf-engels@gmx.de>
Date: Mon Dec 13 20:48:57 2010 +0100
Fix bad method overloading in collection location
diff --git a/src/core-impl/collections/mediadevicecollection/MediaDeviceCollectionLocation.cpp \
b/src/core-impl/collections/mediadevicecollection/MediaDeviceCollectionLocation.cpp \
index a858d44..0a902a2 100644
--- a/src/core-impl/collections/mediadevicecollection/MediaDeviceCollectionLocation.cpp
+++ b/src/core-impl/collections/mediadevicecollection/MediaDeviceCollectionLocation.cpp
@@ -68,9 +68,11 @@ MediaDeviceCollectionLocation::remove( const Meta::TrackPtr \
&track ) }
void
-MediaDeviceCollectionLocation::showDestinationDialog( const Meta::TrackList &tracks, \
bool removeSources ) +MediaDeviceCollectionLocation::showDestinationDialog( const \
Meta::TrackList &tracks, bool removeSources, + \
const Transcoding::Configuration &configuration ) {
Q_UNUSED( removeSources )
+ Q_UNUSED( configuration )
if( m_handler->isOrganizable() )
{
QStringList folders;
@@ -112,9 +114,11 @@ MediaDeviceCollectionLocation::getKIOCopyableUrls( const \
Meta::TrackList &tracks
void
-MediaDeviceCollectionLocation::copyUrlsToCollection( const QMap<Meta::TrackPtr, \
KUrl> &sources ) +MediaDeviceCollectionLocation::copyUrlsToCollection( const \
QMap<Meta::TrackPtr, KUrl> &sources, + \
const Transcoding::Configuration &configuration ) {
DEBUG_BLOCK
+ Q_UNUSED( configuration )
if( m_handler->isOrganizable() )
m_handler->setDestinations( m_destinations );
diff --git a/src/core-impl/collections/mediadevicecollection/MediaDeviceCollectionLocation.h \
b/src/core-impl/collections/mediadevicecollection/MediaDeviceCollectionLocation.h \
index f65cd4c..f5d5a2f 100644
--- a/src/core-impl/collections/mediadevicecollection/MediaDeviceCollectionLocation.h
+++ b/src/core-impl/collections/mediadevicecollection/MediaDeviceCollectionLocation.h
@@ -44,11 +44,14 @@ class MEDIADEVICECOLLECTION_EXPORT MediaDeviceCollectionLocation \
: public Collec virtual bool remove( const Meta::TrackPtr &track );
protected:
- virtual void showDestinationDialog( const Meta::TrackList &tracks, bool \
removeSources ); + virtual void showDestinationDialog( const Meta::TrackList \
&tracks, bool removeSources, + const \
Transcoding::Configuration &configuration = Transcoding::Configuration() ); virtual \
void getKIOCopyableUrls( const Meta::TrackList &tracks );
/// Copies these tracks to the Collection using the Handler
- virtual void copyUrlsToCollection( const QMap<Meta::TrackPtr, KUrl> &sources \
); + virtual void copyUrlsToCollection( const QMap<Meta::TrackPtr, KUrl> \
&sources, + const \
Transcoding::Configuration &configuration = Transcoding::Configuration() ); +
virtual void removeUrlsFromCollection( const Meta::TrackList &sources );
diff --git a/src/core-impl/collections/support/PlaylistCollectionLocation.cpp \
b/src/core-impl/collections/support/PlaylistCollectionLocation.cpp index \
774a82d..c885046 100644
--- a/src/core-impl/collections/support/PlaylistCollectionLocation.cpp
+++ b/src/core-impl/collections/support/PlaylistCollectionLocation.cpp
@@ -54,8 +54,10 @@ PlaylistCollectionLocation::remove( const Meta::TrackPtr &track )
}
void
-PlaylistCollectionLocation::copyUrlsToCollection( const QMap<Meta::TrackPtr, KUrl> \
&sources ) +PlaylistCollectionLocation::copyUrlsToCollection( const \
QMap<Meta::TrackPtr, KUrl> &sources, + \
const Transcoding::Configuration &configuration ) {
+ Q_UNUSED( configuration );
Playlists::PlaylistPtr playlist = m_collection->playlist();
foreach( const Meta::TrackPtr &track, sources.keys() )
{
diff --git a/src/core-impl/collections/support/PlaylistCollectionLocation.h \
b/src/core-impl/collections/support/PlaylistCollectionLocation.h index \
20fad52..967d215 100644
--- a/src/core-impl/collections/support/PlaylistCollectionLocation.h
+++ b/src/core-impl/collections/support/PlaylistCollectionLocation.h
@@ -41,7 +41,8 @@ public:
bool remove( const Meta::TrackPtr &track );
protected:
- void copyUrlsToCollection( const QMap<Meta::TrackPtr, KUrl> &sources );
+ void copyUrlsToCollection( const QMap<Meta::TrackPtr, KUrl> &sources,
+ const Transcoding::Configuration &configuration = \
Transcoding::Configuration() ); //why is this called "removeUrls" if the argument \
are only tracks? void removeUrlsFromCollection( const Meta::TrackList &tracks );
diff --git a/src/core/collections/CollectionLocation.cpp \
b/src/core/collections/CollectionLocation.cpp index 22e3c8c..138e6fc 100644
--- a/src/core/collections/CollectionLocation.cpp
+++ b/src/core/collections/CollectionLocation.cpp
@@ -45,7 +45,6 @@ CollectionLocation::CollectionLocation()
CollectionLocation::CollectionLocation( const Collections::Collection* \
parentCollection) :QObject()
- , m_transcodingConfiguration( Transcoding::Configuration() )
, m_destination( 0 )
, m_source( 0 )
, m_sourceTracks()
@@ -53,6 +52,7 @@ CollectionLocation::CollectionLocation( const \
Collections::Collection* parentCol , m_removeSources( false )
, m_isRemoveAction( false )
, m_noRemoveConfirmation( false )
+ , m_transcodingConfiguration( Transcoding::Configuration() )
{
//nothing to do
}
@@ -96,6 +96,7 @@ void
CollectionLocation::prepareCopy( Meta::TrackPtr track, CollectionLocation \
*destination,
const Transcoding::Configuration &configuration )
{
+ debug() << "prepare copy 1 track \
from"<<collection()->collectionId()<<"to"<<destination->collection()->collectionId(); \
Meta::TrackList list; list.append( track );
prepareCopy( list, destination, configuration );
@@ -106,6 +107,7 @@ void
CollectionLocation::prepareCopy( const Meta::TrackList &tracks, CollectionLocation \
*destination,
const Transcoding::Configuration &configuration )
{
+ debug() << "prepare copy"<<tracks.count()<<"tracks \
from"<<collection()->collectionId()<<"to"<<destination->collection()->collectionId(); \
if( !destination->isWritable() ) {
Collections::CollectionLocationDelegate *delegate = \
Amarok::Components::collectionLocationDelegate(); @@ -155,6 +157,7 @@ \
CollectionLocation::prepareMove( Meta::TrackPtr track, CollectionLocation *desti \
void CollectionLocation::prepareMove( const Meta::TrackList &tracks, \
CollectionLocation *destination ) {
+ debug() << "prepare move"<<tracks.count()<<"tracks \
from"<<collection()->collectionId()<<"to"<<(destination->collection()?destination->collection()->collectionId():"no \
destination. probably trash"); DEBUG_BLOCK
if( !destination->isWritable() )
{
@@ -274,6 +277,7 @@ CollectionLocation::copyUrlsToCollection( const \
QMap<Meta::TrackPtr, KUrl> &sour DEBUG_BLOCK
//reimplement in implementations which are writeable
Q_UNUSED( sources )
+ Q_UNUSED( configuration )
slotCopyOperationFinished();
}
@@ -536,11 +540,11 @@ void
CollectionLocation::removeSourceTracks( const Meta::TrackList &tracks )
{
DEBUG_BLOCK
- debug() << "Transfer errors: " << m_tracksWithError.count();
+ debug() << "Transfer errors:" << m_tracksWithError.count() << "of" << \
tracks.count();
foreach( Meta::TrackPtr track, m_tracksWithError.keys() )
{
- debug() << "transfer error for track " << track->playableUrl();
+ debug() << "transfer error for track" << track->playableUrl();
}
QSet<Meta::TrackPtr> toRemove = QSet<Meta::TrackPtr>::fromList( tracks );
diff --git a/src/core/collections/CollectionLocation.h \
b/src/core/collections/CollectionLocation.h index b069a6c..bb56de3 100644
--- a/src/core/collections/CollectionLocation.h
+++ b/src/core/collections/CollectionLocation.h
@@ -346,8 +346,8 @@ class AMAROK_CORE_EXPORT CollectionLocation : public QObject
void setRemoveSources( bool removeSources ) { m_removeSources = \
removeSources; } bool m_removeSources;
bool m_isRemoveAction;
- Transcoding::Configuration m_transcodingConfiguration; //only used when \
copying bool m_noRemoveConfirmation;
+ Transcoding::Configuration m_transcodingConfiguration; //only used when \
copying
//used by the source collection to store the tracks that were successfully
//copied by the destination and can be removed as part of a move
Meta::TrackList m_tracksSuccessfullyTransferred;
diff --git a/src/services/mp3tunes/Mp3tunesServiceCollectionLocation.cpp \
b/src/services/mp3tunes/Mp3tunesServiceCollectionLocation.cpp index cc6d280..acfe9db \
100644
--- a/src/services/mp3tunes/Mp3tunesServiceCollectionLocation.cpp
+++ b/src/services/mp3tunes/Mp3tunesServiceCollectionLocation.cpp
@@ -53,9 +53,12 @@ bool Mp3tunesServiceCollectionLocation::remove( const \
Meta::TrackPtr &/*track*/ return false;
}
void Mp3tunesServiceCollectionLocation::copyUrlsToCollection (
- const QMap<Meta::TrackPtr, KUrl> &sources )
+ const QMap<Meta::TrackPtr, KUrl> &sources,
+ const Transcoding::Configuration &configuration )
{
DEBUG_BLOCK
+ Q_UNUSED( configuration ); // TODO: we might support transcoding here
+
QStringList urls;
QString error;
debug() << "sources has " << sources.count();
diff --git a/src/services/mp3tunes/Mp3tunesServiceCollectionLocation.h \
b/src/services/mp3tunes/Mp3tunesServiceCollectionLocation.h index 384b360..eb399cf \
100644
--- a/src/services/mp3tunes/Mp3tunesServiceCollectionLocation.h
+++ b/src/services/mp3tunes/Mp3tunesServiceCollectionLocation.h
@@ -33,12 +33,12 @@ class Mp3tunesServiceCollectionLocation : public \
ServiceCollectionLocation
Mp3tunesServiceCollectionLocation( Mp3tunesServiceCollection const \
*parentCollection ); virtual ~Mp3tunesServiceCollectionLocation();
-
virtual QString prettyLocation() const;
virtual bool isWritable() const;
virtual bool remove( const Meta::TrackPtr &track );
- virtual void copyUrlsToCollection( const QMap<Meta::TrackPtr, KUrl> &sources \
);
-
+ virtual void copyUrlsToCollection( const QMap<Meta::TrackPtr, KUrl> \
&sources, + const \
Transcoding::Configuration &configuration = Transcoding::Configuration() ); +
private:
Mp3tunesServiceCollection *m_collection;
};
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic