From b0f7c845227cf9d992d6309c3236a040ab75032f Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Wed, 2 Feb 2005 02:19:23 +0000
Subject: [PATCH] Switched to new DoublyLinkedList class.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11191 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 headers/private/kernel/boot/menu.h | 10 ++++------
 src/kernel/boot/loader/menu.cpp    |  3 ++-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/headers/private/kernel/boot/menu.h b/headers/private/kernel/boot/menu.h
index 8b7de9280e..932dfe0871 100644
--- a/headers/private/kernel/boot/menu.h
+++ b/headers/private/kernel/boot/menu.h
@@ -23,7 +23,7 @@ enum menu_item_type {
 	MENU_ITEM_SEPARATOR,
 };
 
-class MenuItem {
+class MenuItem : public DoublyLinkedListLinkImpl<MenuItem> {
 	public:
 		MenuItem(const char *label = NULL, Menu *subMenu = NULL);
 		~MenuItem();
@@ -52,8 +52,6 @@ class MenuItem {
 		const char *Label() const { return fLabel; }
 		Menu *Submenu() const { return fSubMenu; }
 
-		DoublyLinked::Link fLink;
-
 	private:
 		friend class Menu;
 		void SetMenu(Menu *menu);
@@ -69,8 +67,8 @@ class MenuItem {
 		const char		*fHelpText;
 };
 
-typedef DoublyLinked::List<MenuItem> MenuItemList;
-typedef DoublyLinked::Iterator<MenuItem> MenuItemIterator;
+typedef DoublyLinkedList<MenuItem> MenuItemList;
+typedef MenuItemList::Iterator MenuItemIterator;
 
 enum menu_type {
 	MAIN_MENU = 1,
@@ -90,7 +88,7 @@ class Menu {
 		void Show() { fIsHidden = false; }
 		bool IsHidden() const { return fIsHidden; }
 
-		MenuItemIterator ItemIterator() { return fItems.Iterator(); }
+		MenuItemIterator ItemIterator() { return fItems.GetIterator(); }
 		MenuItem *ItemAt(int32 index);
 		int32 IndexOf(MenuItem *item);
 		int32 CountItems() const;
diff --git a/src/kernel/boot/loader/menu.cpp b/src/kernel/boot/loader/menu.cpp
index 9ccb4cea7d..1c4b2be02a 100644
--- a/src/kernel/boot/loader/menu.cpp
+++ b/src/kernel/boot/loader/menu.cpp
@@ -155,7 +155,8 @@ Menu::~Menu()
 	// take all remaining items with us
 
 	MenuItem *item;
-	while ((item = fItems.RemoveHead()) != NULL) {
+	while ((item = fItems.Head()) != NULL) {
+		fItems.Remove(item);
 		delete item;
 	}
 }