diff --git a/src/core/metatypes.cpp b/src/core/metatypes.cpp index 2ffb77991..1f2611d2e 100644 --- a/src/core/metatypes.cpp +++ b/src/core/metatypes.cpp @@ -113,8 +113,8 @@ void RegisterMetaTypes() { qRegisterMetaType("GstElement*"); qRegisterMetaType("GstEnginePipeline*"); #endif - qRegisterMetaType("PlaylistItemList"); qRegisterMetaType("PlaylistItemPtr"); + qRegisterMetaType("PlaylistItemList"); qRegisterMetaType>("QList"); qRegisterMetaType("PlaylistSequence::RepeatMode"); qRegisterMetaType("PlaylistSequence::ShuffleMode"); diff --git a/src/playlist/playlistbackend.cpp b/src/playlist/playlistbackend.cpp index e087a8645..e74650ca5 100644 --- a/src/playlist/playlistbackend.cpp +++ b/src/playlist/playlistbackend.cpp @@ -177,9 +177,9 @@ PlaylistBackend::Playlist PlaylistBackend::GetPlaylist(const int id) { } -QList PlaylistBackend::GetPlaylistItems(const int playlist) { +PlaylistItemList PlaylistBackend::GetPlaylistItems(const int playlist) { - QList playlistitems; + PlaylistItemList playlistitems; { @@ -194,7 +194,7 @@ QList PlaylistBackend::GetPlaylistItems(const int playlist) { q.BindValue(":playlist", playlist); if (!q.Exec()) { db_->ReportErrors(q); - return QList(); + return PlaylistItemList(); } // it's probable that we'll have a few songs associated with the same CUE so we're caching results of parsing CUEs diff --git a/src/playlist/playlistbackend.h b/src/playlist/playlistbackend.h index 8362cc7bd..a9844e831 100644 --- a/src/playlist/playlistbackend.h +++ b/src/playlist/playlistbackend.h @@ -75,7 +75,7 @@ class PlaylistBackend : public QObject { PlaylistList GetAllFavoritePlaylists(); PlaylistBackend::Playlist GetPlaylist(const int id); - QList GetPlaylistItems(const int playlist); + PlaylistItemList GetPlaylistItems(const int playlist); SongList GetPlaylistSongs(const int playlist); void SetPlaylistOrder(const QList &ids); diff --git a/src/playlist/playlistitem.h b/src/playlist/playlistitem.h index 0c702d02f..22f7be681 100644 --- a/src/playlist/playlistitem.h +++ b/src/playlist/playlistitem.h @@ -135,7 +135,7 @@ typedef std::shared_ptr PlaylistItemPtr; typedef QList PlaylistItemList; Q_DECLARE_METATYPE(PlaylistItemPtr) -Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(PlaylistItemList) Q_DECLARE_OPERATORS_FOR_FLAGS(PlaylistItem::Options) #endif // PLAYLISTITEM_H