From 9023ba4a81d597c8694432655833cf23d83c6cde Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Wed, 2 Jan 2013 22:16:52 +0100
Subject: PlaylistVector: use std::list

---
 src/Directory.hxx | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'src/Directory.hxx')

diff --git a/src/Directory.hxx b/src/Directory.hxx
index ab23a6922..710f47921 100644
--- a/src/Directory.hxx
+++ b/src/Directory.hxx
@@ -24,6 +24,7 @@
 #include "util/list.h"
 #include "gcc.h"
 #include "DatabaseVisitor.hxx"
+#include "PlaylistVector.hxx"
 
 #include <glib.h>
 #include <stdbool.h>
@@ -44,12 +45,6 @@
 #define directory_for_each_song_safe(pos, n, directory) \
 	list_for_each_entry_safe(pos, n, &directory->songs, siblings)
 
-#define directory_for_each_playlist(pos, directory) \
-	list_for_each_entry(pos, &directory->playlists, siblings)
-
-#define directory_for_each_playlist_safe(pos, n, directory) \
-	list_for_each_entry_safe(pos, n, &directory->playlists, siblings)
-
 struct song;
 struct db_visitor;
 class SongFilter;
@@ -81,7 +76,7 @@ struct Directory {
 	 */
 	struct list_head songs;
 
-	struct list_head playlists;
+	PlaylistVector playlists;
 
 	Directory *parent;
 	time_t mtime;
@@ -179,7 +174,7 @@ public:
 	bool IsEmpty() const {
 		return list_empty(&children) &&
 			list_empty(&songs) &&
-			list_empty(&playlists);
+			playlists.empty();
 	}
 
 	gcc_pure
-- 
cgit v1.2.3