mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-12 09:04:33 +02:00
Code Issues Releases Wiki Activity

* InboxModel doesn't need to merge / set track attributes anymore.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2013-05-16 11:53:24 +02:00
parent daa8a2c6ef
commit 93da4fa36e
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libtomahawk/playlist/InboxModel.cpp
View File

@@ -114,8 +114,8 @@ InboxModel::insertEntries( const QList< Tomahawk::plentry_ptr >& entries, int ro
if ( entry->query()->equals( existingEntry->query(), true /*ignoreCase*/) ) if ( entry->query()->equals( existingEntry->query(), true /*ignoreCase*/) )
{ {
//We got a dupe, let's merge the social actions //We got a dupe, let's merge the social actions
entry->query()->queryTrack()->setAllSocialActions( mergeSocialActions( existingEntry->query()->queryTrack()->allSocialActions(), /* entry->query()->queryTrack()->setAllSocialActions( mergeSocialActions( existingEntry->query()->queryTrack()->allSocialActions(),
entry->query()->queryTrack()->allSocialActions() ) ); entry->query()->queryTrack()->allSocialActions() ) );*/
toInsert.erase( jt ); toInsert.erase( jt );
break; break;
} }
@@ -129,8 +129,8 @@ InboxModel::insertEntries( const QList< Tomahawk::plentry_ptr >& entries, int ro
{ {
if ( plEntry->query()->equals( toInsert.at( i )->query(), true ) ) if ( plEntry->query()->equals( toInsert.at( i )->query(), true ) )
{ {
plEntry->query()->queryTrack()->setAllSocialActions( mergeSocialActions( plEntry->query()->queryTrack()->allSocialActions(), /* plEntry->query()->queryTrack()->setAllSocialActions( mergeSocialActions( plEntry->query()->queryTrack()->allSocialActions(),
toInsert.at( i )->query()->queryTrack()->allSocialActions() ) ); toInsert.at( i )->query()->queryTrack()->allSocialActions() ) );*/
toInsert.removeAt( i ); toInsert.removeAt( i );
dataChanged( index( playlistEntries().indexOf( plEntry ), 0, QModelIndex() ), dataChanged( index( playlistEntries().indexOf( plEntry ), 0, QModelIndex() ),
@@ -215,7 +215,8 @@ InboxModel::tracksLoaded( QList< Tomahawk::query_ptr > incoming )
QList< Tomahawk::SocialAction > actions; QList< Tomahawk::SocialAction > actions;
actions << action; actions << action;
newQuery->queryTrack()->setAllSocialActions( actions ); //FIXME
// newQuery->queryTrack()->setAllSocialActions( actions );
newQuery->setProperty( "data", QVariant() ); //clear newQuery->setProperty( "data", QVariant() ); //clear
} }
@@ -255,7 +256,8 @@ InboxModel::onCurrentIndexChanged()
it->value = false; //listened! it->value = false; //listened!
} }
} }
item->query()->queryTrack()->setAllSocialActions( actions ); //FIXME
// item->query()->queryTrack()->setAllSocialActions( actions );
} }
} }
} }