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