Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Use the PlaylistItemPtr typedef in more places

This commit is contained in:
David Sansome 2010-10-24 15:34:47 +00:00
parent 6c085defb5
commit 87ce2f6ee2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/playlist/playlistbackend.cpp
View File

@ -74,7 +74,7 @@ PlaylistBackend::Playlist PlaylistBackend::GetPlaylist(int id) {
return p; return p;
} }
QFuture<shared_ptr<PlaylistItem> > PlaylistBackend::GetPlaylistItems(int playlist) { QFuture<PlaylistItemPtr> PlaylistBackend::GetPlaylistItems(int playlist) {
QMutexLocker l(db_->Mutex()); QMutexLocker l(db_->Mutex());
QSqlDatabase db(db_->Connect()); QSqlDatabase db(db_->Connect());
@ -93,7 +93,7 @@ QFuture<shared_ptr<PlaylistItem> > PlaylistBackend::GetPlaylistItems(int playlis
q.bindValue(":playlist", playlist); q.bindValue(":playlist", playlist);
q.exec(); q.exec();
if (db_->CheckErrors(q.lastError())) if (db_->CheckErrors(q.lastError()))
return QFuture<shared_ptr<PlaylistItem> >(); return QFuture<PlaylistItemPtr>();
QList<SqlRow> rows; QList<SqlRow> rows;
@ -104,11 +104,11 @@ QFuture<shared_ptr<PlaylistItem> > PlaylistBackend::GetPlaylistItems(int playlis
return QtConcurrent::mapped(rows, &PlaylistBackend::NewSongFromQuery); return QtConcurrent::mapped(rows, &PlaylistBackend::NewSongFromQuery);
} }
shared_ptr<PlaylistItem> PlaylistBackend::NewSongFromQuery(const SqlRow& row) { PlaylistItemPtr PlaylistBackend::NewSongFromQuery(const SqlRow& row) {
// The song tables gets joined first, plus one each for the song ROWIDs // The song tables gets joined first, plus one each for the song ROWIDs
const int playlist_row = (Song::kColumns.count() + 1) * 2; const int playlist_row = (Song::kColumns.count() + 1) * 2;
shared_ptr<PlaylistItem> item( PlaylistItemPtr item(
PlaylistItem::NewFromType(row.value(playlist_row).toString())); PlaylistItem::NewFromType(row.value(playlist_row).toString()));
if (item) { if (item) {
item->InitFromQuery(row); item->InitFromQuery(row);
@ -146,7 +146,7 @@ void PlaylistBackend::SavePlaylist(int playlist, const PlaylistItemList& items,
return; return;
// Save the new ones // Save the new ones
foreach (shared_ptr<PlaylistItem> item, items) { foreach (PlaylistItemPtr item, items) {
insert.bindValue(0, playlist); insert.bindValue(0, playlist);
item->BindToQuery(&insert); item->BindToQuery(&insert);