pass ProxySongList around since it already has shared_ptr inside

This commit is contained in:
Andrzej Rybczak
2012-09-16 07:13:54 +02:00
parent ddd18681ba
commit 48cf01f084
19 changed files with 83 additions and 89 deletions

View File

@@ -202,9 +202,9 @@ bool PlaylistEditor::isContentFiltered()
return false;
}
std::shared_ptr<ProxySongList> PlaylistEditor::contentProxyList()
ProxySongList PlaylistEditor::contentProxyList()
{
return mkProxySongList(Content, [](NC::Menu<MPD::Song>::Item &item) {
return ProxySongList(Content, [](NC::Menu<MPD::Song>::Item &item) {
return &item.value();
});
}
@@ -386,9 +386,9 @@ void PlaylistEditor::prevFound(bool wrap)
/***********************************************************************/
std::shared_ptr<ProxySongList> PlaylistEditor::getProxySongList()
ProxySongList PlaylistEditor::proxySongList()
{
auto ptr = nullProxySongList();
auto ptr = ProxySongList();
if (isActiveWindow(Content))
ptr = contentProxyList();
return ptr;