From f84128ecbdbd0c3ab24bbd01f77b25f3541ef608 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Wed, 12 Aug 2020 21:33:38 +0200
Subject: [PATCH] Remove unused collection playlist container type

---
 src/collection/collectionitem.h    | 1 -
 src/collection/collectionmodel.cpp | 4 ----
 src/collection/collectionmodel.h   | 2 --
 src/context/contextalbumsmodel.cpp | 5 +----
 src/context/contextalbumsmodel.h   | 1 -
 5 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/collection/collectionitem.h b/src/collection/collectionitem.h
index 806ebc3ec..2942a0b17 100644
--- a/src/collection/collectionitem.h
+++ b/src/collection/collectionitem.h
@@ -33,7 +33,6 @@ class CollectionItem : public SimpleTreeItem<CollectionItem> {
     Type_Divider,
     Type_Container,
     Type_Song,
-    Type_PlaylistContainer,
     Type_LoadingIndicator,
   };
 
diff --git a/src/collection/collectionmodel.cpp b/src/collection/collectionmodel.cpp
index fe0d1edbc..d18096108 100644
--- a/src/collection/collectionmodel.cpp
+++ b/src/collection/collectionmodel.cpp
@@ -97,8 +97,6 @@ CollectionModel::CollectionModel(CollectionBackend *backend, Application *app, Q
       total_album_count_(0),
       artist_icon_(IconLoader::Load("folder-sound")),
       album_icon_(IconLoader::Load("cdcase")),
-      playlists_dir_icon_(IconLoader::Load("folder-sound")),
-      playlist_icon_(IconLoader::Load("albums")),
       init_task_id_(-1),
       use_pretty_covers_(false),
       show_dividers_(true),
@@ -695,8 +693,6 @@ QVariant CollectionModel::data(const CollectionItem *item, const int role) const
 
     case Qt::DecorationRole:
       switch (item->type) {
-        case CollectionItem::Type_PlaylistContainer:
-          return playlists_dir_icon_;
         case CollectionItem::Type_Container:
           switch (container_type) {
             case GroupBy_Album:
diff --git a/src/collection/collectionmodel.h b/src/collection/collectionmodel.h
index 949820b2e..f4e4b33ab 100644
--- a/src/collection/collectionmodel.h
+++ b/src/collection/collectionmodel.h
@@ -280,8 +280,6 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   QIcon album_icon_;
   // Used as a generic icon to show when no cover art is found, fixed to the same size as the artwork (32x32)
   QPixmap no_cover_icon_;
-  QIcon playlists_dir_icon_;
-  QIcon playlist_icon_;
 
   static QNetworkDiskCache *sIconCache;
 
diff --git a/src/context/contextalbumsmodel.cpp b/src/context/contextalbumsmodel.cpp
index d4aee0e27..cb9b73136 100644
--- a/src/context/contextalbumsmodel.cpp
+++ b/src/context/contextalbumsmodel.cpp
@@ -62,8 +62,7 @@ ContextAlbumsModel::ContextAlbumsModel(CollectionBackend *backend, Application *
       SimpleTreeModel<CollectionItem>(new CollectionItem(this), parent),
       backend_(backend),
       app_(app),
-      album_icon_(IconLoader::Load("cdcase")),
-      playlists_dir_icon_(IconLoader::Load("folder-sound")) {
+      album_icon_(IconLoader::Load("cdcase")) {
 
   root_->lazy_loaded = true;
 
@@ -195,8 +194,6 @@ QVariant ContextAlbumsModel::data(const CollectionItem *item, int role) const {
 
     case Qt::DecorationRole:
       switch (item->type) {
-        case CollectionItem::Type_PlaylistContainer:
-          return playlists_dir_icon_;
         case CollectionItem::Type_Container:
           if (item->type == CollectionItem::Type_Container && item->container_level == 0) { return album_icon_; }
           break;
diff --git a/src/context/contextalbumsmodel.h b/src/context/contextalbumsmodel.h
index 1d69777f1..a85e0e4f7 100644
--- a/src/context/contextalbumsmodel.h
+++ b/src/context/contextalbumsmodel.h
@@ -120,7 +120,6 @@ class ContextAlbumsModel : public SimpleTreeModel<CollectionItem> {
   QMap<int, CollectionItem*> song_nodes_;
   QIcon album_icon_;
   QPixmap no_cover_icon_;
-  QIcon playlists_dir_icon_;
   AlbumCoverLoaderOptions cover_loader_options_;
   typedef QPair<CollectionItem*, QString> ItemAndCacheKey;
   QMap<quint64, ItemAndCacheKey> pending_art_;